mirror of
https://github.com/torvalds/linux.git
synced 2024-11-28 15:11:31 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
384 lines
9.7 KiB
C
384 lines
9.7 KiB
C
/*
|
|
* ichxrom.c
|
|
*
|
|
* Normal mappings of chips in physical memory
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/io.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/map.h>
|
|
#include <linux/mtd/cfi.h>
|
|
#include <linux/mtd/flashchip.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/pci_ids.h>
|
|
#include <linux/list.h>
|
|
|
|
#define xstr(s) str(s)
|
|
#define str(s) #s
|
|
#define MOD_NAME xstr(KBUILD_BASENAME)
|
|
|
|
#define ADDRESS_NAME_LEN 18
|
|
|
|
#define ROM_PROBE_STEP_SIZE (64*1024) /* 64KiB */
|
|
|
|
#define BIOS_CNTL 0x4e
|
|
#define FWH_DEC_EN1 0xE3
|
|
#define FWH_DEC_EN2 0xF0
|
|
#define FWH_SEL1 0xE8
|
|
#define FWH_SEL2 0xEE
|
|
|
|
struct ichxrom_window {
|
|
void __iomem* virt;
|
|
unsigned long phys;
|
|
unsigned long size;
|
|
struct list_head maps;
|
|
struct resource rsrc;
|
|
struct pci_dev *pdev;
|
|
};
|
|
|
|
struct ichxrom_map_info {
|
|
struct list_head list;
|
|
struct map_info map;
|
|
struct mtd_info *mtd;
|
|
struct resource rsrc;
|
|
char map_name[sizeof(MOD_NAME) + 2 + ADDRESS_NAME_LEN];
|
|
};
|
|
|
|
static struct ichxrom_window ichxrom_window = {
|
|
.maps = LIST_HEAD_INIT(ichxrom_window.maps),
|
|
};
|
|
|
|
static void ichxrom_cleanup(struct ichxrom_window *window)
|
|
{
|
|
struct ichxrom_map_info *map, *scratch;
|
|
u16 word;
|
|
|
|
/* Disable writes through the rom window */
|
|
pci_read_config_word(window->pdev, BIOS_CNTL, &word);
|
|
pci_write_config_word(window->pdev, BIOS_CNTL, word & ~1);
|
|
pci_dev_put(window->pdev);
|
|
|
|
/* Free all of the mtd devices */
|
|
list_for_each_entry_safe(map, scratch, &window->maps, list) {
|
|
if (map->rsrc.parent)
|
|
release_resource(&map->rsrc);
|
|
del_mtd_device(map->mtd);
|
|
map_destroy(map->mtd);
|
|
list_del(&map->list);
|
|
kfree(map);
|
|
}
|
|
if (window->rsrc.parent)
|
|
release_resource(&window->rsrc);
|
|
if (window->virt) {
|
|
iounmap(window->virt);
|
|
window->virt = NULL;
|
|
window->phys = 0;
|
|
window->size = 0;
|
|
window->pdev = NULL;
|
|
}
|
|
}
|
|
|
|
|
|
static int __devinit ichxrom_init_one (struct pci_dev *pdev,
|
|
const struct pci_device_id *ent)
|
|
{
|
|
static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
|
|
struct ichxrom_window *window = &ichxrom_window;
|
|
struct ichxrom_map_info *map = NULL;
|
|
unsigned long map_top;
|
|
u8 byte;
|
|
u16 word;
|
|
|
|
/* For now I just handle the ichx and I assume there
|
|
* are not a lot of resources up at the top of the address
|
|
* space. It is possible to handle other devices in the
|
|
* top 16MB but it is very painful. Also since
|
|
* you can only really attach a FWH to an ICHX there
|
|
* a number of simplifications you can make.
|
|
*
|
|
* Also you can page firmware hubs if an 8MB window isn't enough
|
|
* but don't currently handle that case either.
|
|
*/
|
|
window->pdev = pdev;
|
|
|
|
/* Find a region continuous to the end of the ROM window */
|
|
window->phys = 0;
|
|
pci_read_config_byte(pdev, FWH_DEC_EN1, &byte);
|
|
if (byte == 0xff) {
|
|
window->phys = 0xffc00000;
|
|
pci_read_config_byte(pdev, FWH_DEC_EN2, &byte);
|
|
if ((byte & 0x0f) == 0x0f) {
|
|
window->phys = 0xff400000;
|
|
}
|
|
else if ((byte & 0x0e) == 0x0e) {
|
|
window->phys = 0xff500000;
|
|
}
|
|
else if ((byte & 0x0c) == 0x0c) {
|
|
window->phys = 0xff600000;
|
|
}
|
|
else if ((byte & 0x08) == 0x08) {
|
|
window->phys = 0xff700000;
|
|
}
|
|
}
|
|
else if ((byte & 0xfe) == 0xfe) {
|
|
window->phys = 0xffc80000;
|
|
}
|
|
else if ((byte & 0xfc) == 0xfc) {
|
|
window->phys = 0xffd00000;
|
|
}
|
|
else if ((byte & 0xf8) == 0xf8) {
|
|
window->phys = 0xffd80000;
|
|
}
|
|
else if ((byte & 0xf0) == 0xf0) {
|
|
window->phys = 0xffe00000;
|
|
}
|
|
else if ((byte & 0xe0) == 0xe0) {
|
|
window->phys = 0xffe80000;
|
|
}
|
|
else if ((byte & 0xc0) == 0xc0) {
|
|
window->phys = 0xfff00000;
|
|
}
|
|
else if ((byte & 0x80) == 0x80) {
|
|
window->phys = 0xfff80000;
|
|
}
|
|
|
|
if (window->phys == 0) {
|
|
printk(KERN_ERR MOD_NAME ": Rom window is closed\n");
|
|
goto out;
|
|
}
|
|
window->phys -= 0x400000UL;
|
|
window->size = (0xffffffffUL - window->phys) + 1UL;
|
|
|
|
/* Enable writes through the rom window */
|
|
pci_read_config_word(pdev, BIOS_CNTL, &word);
|
|
if (!(word & 1) && (word & (1<<1))) {
|
|
/* The BIOS will generate an error if I enable
|
|
* this device, so don't even try.
|
|
*/
|
|
printk(KERN_ERR MOD_NAME ": firmware access control, I can't enable writes\n");
|
|
goto out;
|
|
}
|
|
pci_write_config_word(pdev, BIOS_CNTL, word | 1);
|
|
|
|
/*
|
|
* Try to reserve the window mem region. If this fails then
|
|
* it is likely due to the window being "reseved" by the BIOS.
|
|
*/
|
|
window->rsrc.name = MOD_NAME;
|
|
window->rsrc.start = window->phys;
|
|
window->rsrc.end = window->phys + window->size - 1;
|
|
window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
|
|
if (request_resource(&iomem_resource, &window->rsrc)) {
|
|
window->rsrc.parent = NULL;
|
|
printk(KERN_DEBUG MOD_NAME
|
|
": %s(): Unable to register resource"
|
|
" 0x%.16llx-0x%.16llx - kernel bug?\n",
|
|
__func__,
|
|
(unsigned long long)window->rsrc.start,
|
|
(unsigned long long)window->rsrc.end);
|
|
}
|
|
|
|
/* Map the firmware hub into my address space. */
|
|
window->virt = ioremap_nocache(window->phys, window->size);
|
|
if (!window->virt) {
|
|
printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
|
|
window->phys, window->size);
|
|
goto out;
|
|
}
|
|
|
|
/* Get the first address to look for an rom chip at */
|
|
map_top = window->phys;
|
|
if ((window->phys & 0x3fffff) != 0) {
|
|
map_top = window->phys + 0x400000;
|
|
}
|
|
#if 1
|
|
/* The probe sequence run over the firmware hub lock
|
|
* registers sets them to 0x7 (no access).
|
|
* Probe at most the last 4M of the address space.
|
|
*/
|
|
if (map_top < 0xffc00000) {
|
|
map_top = 0xffc00000;
|
|
}
|
|
#endif
|
|
/* Loop through and look for rom chips */
|
|
while((map_top - 1) < 0xffffffffUL) {
|
|
struct cfi_private *cfi;
|
|
unsigned long offset;
|
|
int i;
|
|
|
|
if (!map) {
|
|
map = kmalloc(sizeof(*map), GFP_KERNEL);
|
|
}
|
|
if (!map) {
|
|
printk(KERN_ERR MOD_NAME ": kmalloc failed");
|
|
goto out;
|
|
}
|
|
memset(map, 0, sizeof(*map));
|
|
INIT_LIST_HEAD(&map->list);
|
|
map->map.name = map->map_name;
|
|
map->map.phys = map_top;
|
|
offset = map_top - window->phys;
|
|
map->map.virt = (void __iomem *)
|
|
(((unsigned long)(window->virt)) + offset);
|
|
map->map.size = 0xffffffffUL - map_top + 1UL;
|
|
/* Set the name of the map to the address I am trying */
|
|
sprintf(map->map_name, "%s @%08Lx",
|
|
MOD_NAME, (unsigned long long)map->map.phys);
|
|
|
|
/* Firmware hubs only use vpp when being programmed
|
|
* in a factory setting. So in-place programming
|
|
* needs to use a different method.
|
|
*/
|
|
for(map->map.bankwidth = 32; map->map.bankwidth;
|
|
map->map.bankwidth >>= 1)
|
|
{
|
|
char **probe_type;
|
|
/* Skip bankwidths that are not supported */
|
|
if (!map_bankwidth_supported(map->map.bankwidth))
|
|
continue;
|
|
|
|
/* Setup the map methods */
|
|
simple_map_init(&map->map);
|
|
|
|
/* Try all of the probe methods */
|
|
probe_type = rom_probe_types;
|
|
for(; *probe_type; probe_type++) {
|
|
map->mtd = do_map_probe(*probe_type, &map->map);
|
|
if (map->mtd)
|
|
goto found;
|
|
}
|
|
}
|
|
map_top += ROM_PROBE_STEP_SIZE;
|
|
continue;
|
|
found:
|
|
/* Trim the size if we are larger than the map */
|
|
if (map->mtd->size > map->map.size) {
|
|
printk(KERN_WARNING MOD_NAME
|
|
" rom(%llu) larger than window(%lu). fixing...\n",
|
|
(unsigned long long)map->mtd->size, map->map.size);
|
|
map->mtd->size = map->map.size;
|
|
}
|
|
if (window->rsrc.parent) {
|
|
/*
|
|
* Registering the MTD device in iomem may not be possible
|
|
* if there is a BIOS "reserved" and BUSY range. If this
|
|
* fails then continue anyway.
|
|
*/
|
|
map->rsrc.name = map->map_name;
|
|
map->rsrc.start = map->map.phys;
|
|
map->rsrc.end = map->map.phys + map->mtd->size - 1;
|
|
map->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
|
|
if (request_resource(&window->rsrc, &map->rsrc)) {
|
|
printk(KERN_ERR MOD_NAME
|
|
": cannot reserve MTD resource\n");
|
|
map->rsrc.parent = NULL;
|
|
}
|
|
}
|
|
|
|
/* Make the whole region visible in the map */
|
|
map->map.virt = window->virt;
|
|
map->map.phys = window->phys;
|
|
cfi = map->map.fldrv_priv;
|
|
for(i = 0; i < cfi->numchips; i++) {
|
|
cfi->chips[i].start += offset;
|
|
}
|
|
|
|
/* Now that the mtd devices is complete claim and export it */
|
|
map->mtd->owner = THIS_MODULE;
|
|
if (add_mtd_device(map->mtd)) {
|
|
map_destroy(map->mtd);
|
|
map->mtd = NULL;
|
|
goto out;
|
|
}
|
|
|
|
|
|
/* Calculate the new value of map_top */
|
|
map_top += map->mtd->size;
|
|
|
|
/* File away the map structure */
|
|
list_add(&map->list, &window->maps);
|
|
map = NULL;
|
|
}
|
|
|
|
out:
|
|
/* Free any left over map structures */
|
|
kfree(map);
|
|
|
|
/* See if I have any map structures */
|
|
if (list_empty(&window->maps)) {
|
|
ichxrom_cleanup(window);
|
|
return -ENODEV;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void __devexit ichxrom_remove_one (struct pci_dev *pdev)
|
|
{
|
|
struct ichxrom_window *window = &ichxrom_window;
|
|
ichxrom_cleanup(window);
|
|
}
|
|
|
|
static struct pci_device_id ichxrom_pci_tbl[] __devinitdata = {
|
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0,
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
|
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
|
{ 0, },
|
|
};
|
|
|
|
#if 0
|
|
MODULE_DEVICE_TABLE(pci, ichxrom_pci_tbl);
|
|
|
|
static struct pci_driver ichxrom_driver = {
|
|
.name = MOD_NAME,
|
|
.id_table = ichxrom_pci_tbl,
|
|
.probe = ichxrom_init_one,
|
|
.remove = ichxrom_remove_one,
|
|
};
|
|
#endif
|
|
|
|
static int __init init_ichxrom(void)
|
|
{
|
|
struct pci_dev *pdev;
|
|
struct pci_device_id *id;
|
|
|
|
pdev = NULL;
|
|
for (id = ichxrom_pci_tbl; id->vendor; id++) {
|
|
pdev = pci_get_device(id->vendor, id->device, NULL);
|
|
if (pdev) {
|
|
break;
|
|
}
|
|
}
|
|
if (pdev) {
|
|
return ichxrom_init_one(pdev, &ichxrom_pci_tbl[0]);
|
|
}
|
|
return -ENXIO;
|
|
#if 0
|
|
return pci_register_driver(&ichxrom_driver);
|
|
#endif
|
|
}
|
|
|
|
static void __exit cleanup_ichxrom(void)
|
|
{
|
|
ichxrom_remove_one(ichxrom_window.pdev);
|
|
}
|
|
|
|
module_init(init_ichxrom);
|
|
module_exit(cleanup_ichxrom);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Eric Biederman <ebiederman@lnxi.com>");
|
|
MODULE_DESCRIPTION("MTD map driver for BIOS chips on the ICHX southbridge");
|