Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] Make sparc64 use setup-res.c

There were three changes necessary in order to allow
sparc64 to use setup-res.c:

1) Sparc64 roots the PCI I/O and MEM address space using
parent resources contained in the PCI controller structure.
I'm actually surprised no other platforms do this, especially
ones like Alpha and PPC{,64}. These resources get linked into the
iomem/ioport tree when PCI controllers are probed.

So the hierarchy looks like this:

iomem --|
PCI controller 1 MEM space --|
device 1
device 2
etc.
PCI controller 2 MEM space --|
...
ioport --|
PCI controller 1 IO space --|
...
PCI controller 2 IO space --|
...

You get the idea. The drivers/pci/setup-res.c code allocates
using plain iomem_space and ioport_space as the root, so that
wouldn't work with the above setup.

So I added a pcibios_select_root() that is used to handle this.
It uses the PCI controller struct's io_space and mem_space on
sparc64, and io{port,mem}_resource on every other platform to
keep current behavior.

2) quirk_io_region() is buggy. It takes in raw BUS view addresses
and tries to use them as a PCI resource.

pci_claim_resource() expects the resource to be fully formed when
it gets called. The sparc64 implementation would do the translation
but that's absolutely wrong, because if the same resource gets
released then re-claimed we'll adjust things twice.

So I fixed up quirk_io_region() to do the proper pcibios_bus_to_resource()
conversion before passing it on to pci_claim_resource().

3) I was mistakedly __init'ing the function methods the PCI controller
drivers provide on sparc64 to implement some parts of these
routines. This was, of course, easy to fix.

So we end up with the following, and that nasty SPARC64 makefile
ifdef in drivers/pci/Makefile is finally zapped.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

David S. Miller and committed by
Greg Kroah-Hartman
085ae41f 064b53db

+166 -196
+5 -128
arch/sparc64/kernel/pci.c
··· 359 359 pbus->resource[1] = &pbm->mem_space; 360 360 } 361 361 362 - int pci_claim_resource(struct pci_dev *pdev, int resource) 362 + struct resource *pcibios_select_root(struct pci_dev *pdev, struct resource *r) 363 363 { 364 364 struct pci_pbm_info *pbm = pdev->bus->sysdata; 365 - struct resource *res = &pdev->resource[resource]; 366 - struct resource *root; 365 + struct resource *root = NULL; 367 366 368 - if (!pbm) 369 - return -EINVAL; 370 - 371 - if (res->flags & IORESOURCE_IO) 367 + if (r->flags & IORESOURCE_IO) 372 368 root = &pbm->io_space; 373 - else 369 + if (r->flags & IORESOURCE_MEM) 374 370 root = &pbm->mem_space; 375 371 376 - pbm->parent->resource_adjust(pdev, res, root); 377 - 378 - return request_resource(root, res); 379 - } 380 - 381 - /* 382 - * Given the PCI bus a device resides on, try to 383 - * find an acceptable resource allocation for a 384 - * specific device resource.. 385 - */ 386 - static int pci_assign_bus_resource(const struct pci_bus *bus, 387 - struct pci_dev *dev, 388 - struct resource *res, 389 - unsigned long size, 390 - unsigned long min, 391 - int resno) 392 - { 393 - unsigned int type_mask; 394 - int i; 395 - 396 - type_mask = IORESOURCE_IO | IORESOURCE_MEM; 397 - for (i = 0 ; i < 4; i++) { 398 - struct resource *r = bus->resource[i]; 399 - if (!r) 400 - continue; 401 - 402 - /* type_mask must match */ 403 - if ((res->flags ^ r->flags) & type_mask) 404 - continue; 405 - 406 - /* Ok, try it out.. */ 407 - if (allocate_resource(r, res, size, min, -1, size, NULL, NULL) < 0) 408 - continue; 409 - 410 - /* PCI config space updated by caller. */ 411 - return 0; 412 - } 413 - return -EBUSY; 414 - } 415 - 416 - void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) 417 - { 418 - /* Not implemented for sparc64... */ 419 - BUG(); 420 - } 421 - 422 - int pci_assign_resource(struct pci_dev *pdev, int resource) 423 - { 424 - struct pcidev_cookie *pcp = pdev->sysdata; 425 - struct pci_pbm_info *pbm = pcp->pbm; 426 - struct resource *res = &pdev->resource[resource]; 427 - unsigned long min, size; 428 - int err; 429 - 430 - if (res->flags & IORESOURCE_IO) 431 - min = pbm->io_space.start + 0x400UL; 432 - else 433 - min = pbm->mem_space.start; 434 - 435 - size = res->end - res->start + 1; 436 - 437 - err = pci_assign_bus_resource(pdev->bus, pdev, res, size, min, resource); 438 - 439 - if (err < 0) { 440 - printk("PCI: Failed to allocate resource %d for %s\n", 441 - resource, pci_name(pdev)); 442 - } else { 443 - /* Update PCI config space. */ 444 - pbm->parent->base_address_update(pdev, resource); 445 - } 446 - 447 - return err; 448 - } 449 - 450 - /* Sort resources by alignment */ 451 - void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head) 452 - { 453 - int i; 454 - 455 - for (i = 0; i < PCI_NUM_RESOURCES; i++) { 456 - struct resource *r; 457 - struct resource_list *list, *tmp; 458 - unsigned long r_align; 459 - 460 - r = &dev->resource[i]; 461 - r_align = r->end - r->start; 462 - 463 - if (!(r->flags) || r->parent) 464 - continue; 465 - if (!r_align) { 466 - printk(KERN_WARNING "PCI: Ignore bogus resource %d " 467 - "[%lx:%lx] of %s\n", 468 - i, r->start, r->end, pci_name(dev)); 469 - continue; 470 - } 471 - r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start; 472 - for (list = head; ; list = list->next) { 473 - unsigned long align = 0; 474 - struct resource_list *ln = list->next; 475 - int idx; 476 - 477 - if (ln) { 478 - idx = ln->res - &ln->dev->resource[0]; 479 - align = (idx < PCI_BRIDGE_RESOURCES) ? 480 - ln->res->end - ln->res->start + 1 : 481 - ln->res->start; 482 - } 483 - if (r_align > align) { 484 - tmp = kmalloc(sizeof(*tmp), GFP_KERNEL); 485 - if (!tmp) 486 - panic("pdev_sort_resources(): " 487 - "kmalloc() failed!\n"); 488 - tmp->next = ln; 489 - tmp->res = r; 490 - tmp->dev = dev; 491 - list->next = tmp; 492 - break; 493 - } 494 - } 495 - } 372 + return root; 496 373 } 497 374 498 375 void pcibios_update_irq(struct pci_dev *pdev, int irq)
+17 -17
arch/sparc64/kernel/pci_psycho.c
··· 307 307 /*0x32*/15, /* Power Management */ 308 308 }; 309 309 310 - static int __init psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 310 + static int psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 311 311 { 312 312 int ret; 313 313 ··· 344 344 return ret; 345 345 } 346 346 347 - static unsigned int __init psycho_irq_build(struct pci_pbm_info *pbm, 348 - struct pci_dev *pdev, 349 - unsigned int ino) 347 + static unsigned int psycho_irq_build(struct pci_pbm_info *pbm, 348 + struct pci_dev *pdev, 349 + unsigned int ino) 350 350 { 351 351 struct ino_bucket *bucket; 352 352 unsigned long imap, iclr; ··· 1024 1024 #define PSYCHO_CE_INO 0x2f 1025 1025 #define PSYCHO_PCIERR_A_INO 0x30 1026 1026 #define PSYCHO_PCIERR_B_INO 0x31 1027 - static void __init psycho_register_error_handlers(struct pci_controller_info *p) 1027 + static void psycho_register_error_handlers(struct pci_controller_info *p) 1028 1028 { 1029 1029 struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */ 1030 1030 unsigned long base = p->pbm_A.controller_regs; ··· 1091 1091 } 1092 1092 1093 1093 /* PSYCHO boot time probing and initialization. */ 1094 - static void __init psycho_resource_adjust(struct pci_dev *pdev, 1095 - struct resource *res, 1096 - struct resource *root) 1094 + static void psycho_resource_adjust(struct pci_dev *pdev, 1095 + struct resource *res, 1096 + struct resource *root) 1097 1097 { 1098 1098 res->start += root->start; 1099 1099 res->end += root->start; 1100 1100 } 1101 1101 1102 - static void __init psycho_base_address_update(struct pci_dev *pdev, int resource) 1102 + static void psycho_base_address_update(struct pci_dev *pdev, int resource) 1103 1103 { 1104 1104 struct pcidev_cookie *pcp = pdev->sysdata; 1105 1105 struct pci_pbm_info *pbm = pcp->pbm; ··· 1144 1144 pci_write_config_dword(pdev, where + 4, 0); 1145 1145 } 1146 1146 1147 - static void __init pbm_config_busmastering(struct pci_pbm_info *pbm) 1147 + static void pbm_config_busmastering(struct pci_pbm_info *pbm) 1148 1148 { 1149 1149 u8 *addr; 1150 1150 ··· 1161 1161 pci_config_write8(addr, 64); 1162 1162 } 1163 1163 1164 - static void __init pbm_scan_bus(struct pci_controller_info *p, 1165 - struct pci_pbm_info *pbm) 1164 + static void pbm_scan_bus(struct pci_controller_info *p, 1165 + struct pci_pbm_info *pbm) 1166 1166 { 1167 1167 struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL); 1168 1168 ··· 1189 1189 pci_setup_busmastering(pbm, pbm->pci_bus); 1190 1190 } 1191 1191 1192 - static void __init psycho_scan_bus(struct pci_controller_info *p) 1192 + static void psycho_scan_bus(struct pci_controller_info *p) 1193 1193 { 1194 1194 pbm_config_busmastering(&p->pbm_B); 1195 1195 p->pbm_B.is_66mhz_capable = 0; ··· 1204 1204 psycho_register_error_handlers(p); 1205 1205 } 1206 1206 1207 - static void __init psycho_iommu_init(struct pci_controller_info *p) 1207 + static void psycho_iommu_init(struct pci_controller_info *p) 1208 1208 { 1209 1209 struct pci_iommu *iommu = p->pbm_A.iommu; 1210 1210 unsigned long tsbbase, i; ··· 1327 1327 psycho_write(p->pbm_A.controller_regs + PSYCHO_PCIB_DIAG, tmp); 1328 1328 } 1329 1329 1330 - static void __init pbm_register_toplevel_resources(struct pci_controller_info *p, 1331 - struct pci_pbm_info *pbm) 1330 + static void pbm_register_toplevel_resources(struct pci_controller_info *p, 1331 + struct pci_pbm_info *pbm) 1332 1332 { 1333 1333 char *name = pbm->name; 1334 1334 ··· 1481 1481 1482 1482 #define PSYCHO_CONFIGSPACE 0x001000000UL 1483 1483 1484 - void __init psycho_init(int node, char *model_name) 1484 + void psycho_init(int node, char *model_name) 1485 1485 { 1486 1486 struct linux_prom64_registers pr_regs[3]; 1487 1487 struct pci_controller_info *p;
+18 -18
arch/sparc64/kernel/pci_sabre.c
··· 554 554 /*0x32*/15, /* Power Management */ 555 555 }; 556 556 557 - static int __init sabre_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 557 + static int sabre_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 558 558 { 559 559 int ret; 560 560 ··· 612 612 sabre_read(sync_reg); 613 613 } 614 614 615 - static unsigned int __init sabre_irq_build(struct pci_pbm_info *pbm, 616 - struct pci_dev *pdev, 617 - unsigned int ino) 615 + static unsigned int sabre_irq_build(struct pci_pbm_info *pbm, 616 + struct pci_dev *pdev, 617 + unsigned int ino) 618 618 { 619 619 struct ino_bucket *bucket; 620 620 unsigned long imap, iclr; ··· 1009 1009 #define SABRE_UE_INO 0x2e 1010 1010 #define SABRE_CE_INO 0x2f 1011 1011 #define SABRE_PCIERR_INO 0x30 1012 - static void __init sabre_register_error_handlers(struct pci_controller_info *p) 1012 + static void sabre_register_error_handlers(struct pci_controller_info *p) 1013 1013 { 1014 1014 struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */ 1015 1015 unsigned long base = pbm->controller_regs; ··· 1056 1056 sabre_write(base + SABRE_PCICTRL, tmp); 1057 1057 } 1058 1058 1059 - static void __init sabre_resource_adjust(struct pci_dev *pdev, 1060 - struct resource *res, 1061 - struct resource *root) 1059 + static void sabre_resource_adjust(struct pci_dev *pdev, 1060 + struct resource *res, 1061 + struct resource *root) 1062 1062 { 1063 1063 struct pci_pbm_info *pbm = pdev->bus->sysdata; 1064 1064 unsigned long base; ··· 1072 1072 res->end += base; 1073 1073 } 1074 1074 1075 - static void __init sabre_base_address_update(struct pci_dev *pdev, int resource) 1075 + static void sabre_base_address_update(struct pci_dev *pdev, int resource) 1076 1076 { 1077 1077 struct pcidev_cookie *pcp = pdev->sysdata; 1078 1078 struct pci_pbm_info *pbm = pcp->pbm; ··· 1118 1118 pci_write_config_dword(pdev, where + 4, 0); 1119 1119 } 1120 1120 1121 - static void __init apb_init(struct pci_controller_info *p, struct pci_bus *sabre_bus) 1121 + static void apb_init(struct pci_controller_info *p, struct pci_bus *sabre_bus) 1122 1122 { 1123 1123 struct pci_dev *pdev; 1124 1124 ··· 1181 1181 return cookie; 1182 1182 } 1183 1183 1184 - static void __init sabre_scan_bus(struct pci_controller_info *p) 1184 + static void sabre_scan_bus(struct pci_controller_info *p) 1185 1185 { 1186 1186 static int once; 1187 1187 struct pci_bus *sabre_bus, *pbus; ··· 1262 1262 sabre_register_error_handlers(p); 1263 1263 } 1264 1264 1265 - static void __init sabre_iommu_init(struct pci_controller_info *p, 1266 - int tsbsize, unsigned long dvma_offset, 1267 - u32 dma_mask) 1265 + static void sabre_iommu_init(struct pci_controller_info *p, 1266 + int tsbsize, unsigned long dvma_offset, 1267 + u32 dma_mask) 1268 1268 { 1269 1269 struct pci_iommu *iommu = p->pbm_A.iommu; 1270 1270 unsigned long tsbbase, i, order; ··· 1345 1345 } 1346 1346 } 1347 1347 1348 - static void __init pbm_register_toplevel_resources(struct pci_controller_info *p, 1349 - struct pci_pbm_info *pbm) 1348 + static void pbm_register_toplevel_resources(struct pci_controller_info *p, 1349 + struct pci_pbm_info *pbm) 1350 1350 { 1351 1351 char *name = pbm->name; 1352 1352 unsigned long ibase = p->pbm_A.controller_regs + SABRE_IOSPACE; ··· 1415 1415 &pbm->mem_space); 1416 1416 } 1417 1417 1418 - static void __init sabre_pbm_init(struct pci_controller_info *p, int sabre_node, u32 dma_begin) 1418 + static void sabre_pbm_init(struct pci_controller_info *p, int sabre_node, u32 dma_begin) 1419 1419 { 1420 1420 struct pci_pbm_info *pbm; 1421 1421 char namebuf[128]; ··· 1552 1552 } 1553 1553 } 1554 1554 1555 - void __init sabre_init(int pnode, char *model_name) 1555 + void sabre_init(int pnode, char *model_name) 1556 1556 { 1557 1557 struct linux_prom64_registers pr_regs[2]; 1558 1558 struct pci_controller_info *p;
+24 -24
arch/sparc64/kernel/pci_schizo.c
··· 285 285 /*0x3f*/0, /* Reserved for NewLink */ 286 286 }; 287 287 288 - static int __init schizo_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 288 + static int schizo_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 289 289 { 290 290 int ret; 291 291 ··· 1221 1221 * PCI bus units of the same Tomatillo. I still have not really 1222 1222 * figured this out... 1223 1223 */ 1224 - static void __init tomatillo_register_error_handlers(struct pci_controller_info *p) 1224 + static void tomatillo_register_error_handlers(struct pci_controller_info *p) 1225 1225 { 1226 1226 struct pci_pbm_info *pbm; 1227 1227 unsigned int irq; ··· 1359 1359 (SCHIZO_SAFIRQCTRL_EN | (BUS_ERROR_UNMAP))); 1360 1360 } 1361 1361 1362 - static void __init schizo_register_error_handlers(struct pci_controller_info *p) 1362 + static void schizo_register_error_handlers(struct pci_controller_info *p) 1363 1363 { 1364 1364 struct pci_pbm_info *pbm; 1365 1365 unsigned int irq; ··· 1505 1505 (SCHIZO_SAFIRQCTRL_EN | (BUS_ERROR_UNMAP))); 1506 1506 } 1507 1507 1508 - static void __init pbm_config_busmastering(struct pci_pbm_info *pbm) 1508 + static void pbm_config_busmastering(struct pci_pbm_info *pbm) 1509 1509 { 1510 1510 u8 *addr; 1511 1511 ··· 1522 1522 pci_config_write8(addr, 64); 1523 1523 } 1524 1524 1525 - static void __init pbm_scan_bus(struct pci_controller_info *p, 1526 - struct pci_pbm_info *pbm) 1525 + static void pbm_scan_bus(struct pci_controller_info *p, 1526 + struct pci_pbm_info *pbm) 1527 1527 { 1528 1528 struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL); 1529 1529 ··· 1550 1550 pci_setup_busmastering(pbm, pbm->pci_bus); 1551 1551 } 1552 1552 1553 - static void __init __schizo_scan_bus(struct pci_controller_info *p, 1554 - int chip_type) 1553 + static void __schizo_scan_bus(struct pci_controller_info *p, 1554 + int chip_type) 1555 1555 { 1556 1556 if (!p->pbm_B.prom_node || !p->pbm_A.prom_node) { 1557 1557 printk("PCI: Only one PCI bus module of controller found.\n"); ··· 1577 1577 schizo_register_error_handlers(p); 1578 1578 } 1579 1579 1580 - static void __init schizo_scan_bus(struct pci_controller_info *p) 1580 + static void schizo_scan_bus(struct pci_controller_info *p) 1581 1581 { 1582 1582 __schizo_scan_bus(p, PBM_CHIP_TYPE_SCHIZO); 1583 1583 } 1584 1584 1585 - static void __init tomatillo_scan_bus(struct pci_controller_info *p) 1585 + static void tomatillo_scan_bus(struct pci_controller_info *p) 1586 1586 { 1587 1587 __schizo_scan_bus(p, PBM_CHIP_TYPE_TOMATILLO); 1588 1588 } 1589 1589 1590 - static void __init schizo_base_address_update(struct pci_dev *pdev, int resource) 1590 + static void schizo_base_address_update(struct pci_dev *pdev, int resource) 1591 1591 { 1592 1592 struct pcidev_cookie *pcp = pdev->sysdata; 1593 1593 struct pci_pbm_info *pbm = pcp->pbm; ··· 1632 1632 pci_write_config_dword(pdev, where + 4, 0); 1633 1633 } 1634 1634 1635 - static void __init schizo_resource_adjust(struct pci_dev *pdev, 1636 - struct resource *res, 1637 - struct resource *root) 1635 + static void schizo_resource_adjust(struct pci_dev *pdev, 1636 + struct resource *res, 1637 + struct resource *root) 1638 1638 { 1639 1639 res->start += root->start; 1640 1640 res->end += root->start; ··· 1702 1702 pbm->mem_space.start); 1703 1703 } 1704 1704 1705 - static void __init pbm_register_toplevel_resources(struct pci_controller_info *p, 1706 - struct pci_pbm_info *pbm) 1705 + static void pbm_register_toplevel_resources(struct pci_controller_info *p, 1706 + struct pci_pbm_info *pbm) 1707 1707 { 1708 1708 pbm->io_space.name = pbm->mem_space.name = pbm->name; 1709 1709 ··· 1932 1932 #define TOMATILLO_PCI_IOC_TDIAG (0x2250UL) 1933 1933 #define TOMATILLO_PCI_IOC_DDIAG (0x2290UL) 1934 1934 1935 - static void __init schizo_pbm_hw_init(struct pci_pbm_info *pbm) 1935 + static void schizo_pbm_hw_init(struct pci_pbm_info *pbm) 1936 1936 { 1937 1937 u64 tmp; 1938 1938 ··· 1986 1986 } 1987 1987 } 1988 1988 1989 - static void __init schizo_pbm_init(struct pci_controller_info *p, 1990 - int prom_node, u32 portid, 1991 - int chip_type) 1989 + static void schizo_pbm_init(struct pci_controller_info *p, 1990 + int prom_node, u32 portid, 1991 + int chip_type) 1992 1992 { 1993 1993 struct linux_prom64_registers pr_regs[4]; 1994 1994 unsigned int busrange[2]; ··· 2145 2145 return (x == y); 2146 2146 } 2147 2147 2148 - static void __init __schizo_init(int node, char *model_name, int chip_type) 2148 + static void __schizo_init(int node, char *model_name, int chip_type) 2149 2149 { 2150 2150 struct pci_controller_info *p; 2151 2151 struct pci_iommu *iommu; ··· 2213 2213 schizo_pbm_init(p, node, portid, chip_type); 2214 2214 } 2215 2215 2216 - void __init schizo_init(int node, char *model_name) 2216 + void schizo_init(int node, char *model_name) 2217 2217 { 2218 2218 __schizo_init(node, model_name, PBM_CHIP_TYPE_SCHIZO); 2219 2219 } 2220 2220 2221 - void __init schizo_plus_init(int node, char *model_name) 2221 + void schizo_plus_init(int node, char *model_name) 2222 2222 { 2223 2223 __schizo_init(node, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS); 2224 2224 } 2225 2225 2226 - void __init tomatillo_init(int node, char *model_name) 2226 + void tomatillo_init(int node, char *model_name) 2227 2227 { 2228 2228 __schizo_init(node, model_name, PBM_CHIP_TYPE_TOMATILLO); 2229 2229 }
+1 -5
drivers/pci/Makefile
··· 3 3 # 4 4 5 5 obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ 6 - pci-driver.o search.o pci-sysfs.o rom.o 6 + pci-driver.o search.o pci-sysfs.o rom.o setup-res.o 7 7 obj-$(CONFIG_PROC_FS) += proc.o 8 - 9 - ifndef CONFIG_SPARC64 10 - obj-y += setup-res.o 11 - endif 12 8 13 9 obj-$(CONFIG_HOTPLUG) += hotplug.o 14 10
+7
drivers/pci/quirks.c
··· 245 245 { 246 246 region &= ~(size-1); 247 247 if (region) { 248 + struct pci_bus_region bus_region; 248 249 struct resource *res = dev->resource + nr; 249 250 250 251 res->name = pci_name(dev); 251 252 res->start = region; 252 253 res->end = region + size - 1; 253 254 res->flags = IORESOURCE_IO; 255 + 256 + /* Convert from PCI bus to resource space. */ 257 + bus_region.start = res->start; 258 + bus_region.end = res->end; 259 + pcibios_bus_to_resource(dev, res, &bus_region); 260 + 254 261 pci_claim_resource(dev, nr); 255 262 } 256 263 }
+1 -4
drivers/pci/setup-res.c
··· 97 97 char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge"; 98 98 int err; 99 99 100 - if (res->flags & IORESOURCE_IO) 101 - root = &ioport_resource; 102 - if (res->flags & IORESOURCE_MEM) 103 - root = &iomem_resource; 100 + root = pcibios_select_root(dev, res); 104 101 105 102 err = -EINVAL; 106 103 if (root != NULL)
+13
include/asm-alpha/pci.h
··· 254 254 extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 255 255 struct pci_bus_region *region); 256 256 257 + static inline struct resource * 258 + pcibios_select_root(struct pci_dev *pdev, struct resource *res) 259 + { 260 + struct resource *root = NULL; 261 + 262 + if (res->flags & IORESOURCE_IO) 263 + root = &ioport_resource; 264 + if (res->flags & IORESOURCE_MEM) 265 + root = &iomem_resource; 266 + 267 + return root; 268 + } 269 + 257 270 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index 258 271 259 272 static inline int pci_proc_domain(struct pci_bus *bus)
+13
include/asm-arm/pci.h
··· 64 64 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 65 65 struct pci_bus_region *region); 66 66 67 + static inline struct resource * 68 + pcibios_select_root(struct pci_dev *pdev, struct resource *res) 69 + { 70 + struct resource *root = NULL; 71 + 72 + if (res->flags & IORESOURCE_IO) 73 + root = &ioport_resource; 74 + if (res->flags & IORESOURCE_MEM) 75 + root = &iomem_resource; 76 + 77 + return root; 78 + } 79 + 67 80 static inline void pcibios_add_platform_entries(struct pci_dev *dev) 68 81 { 69 82 }
+13
include/asm-generic/pci.h
··· 30 30 res->end = region->end; 31 31 } 32 32 33 + static inline struct resource * 34 + pcibios_select_root(struct pci_dev *pdev, struct resource *res) 35 + { 36 + struct resource *root = NULL; 37 + 38 + if (res->flags & IORESOURCE_IO) 39 + root = &ioport_resource; 40 + if (res->flags & IORESOURCE_MEM) 41 + root = &iomem_resource; 42 + 43 + return root; 44 + } 45 + 33 46 #define pcibios_scan_all_fns(a, b) 0 34 47 35 48 #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
+13
include/asm-ia64/pci.h
··· 156 156 extern void pcibios_bus_to_resource(struct pci_dev *dev, 157 157 struct resource *res, struct pci_bus_region *region); 158 158 159 + static inline struct resource * 160 + pcibios_select_root(struct pci_dev *pdev, struct resource *res) 161 + { 162 + struct resource *root = NULL; 163 + 164 + if (res->flags & IORESOURCE_IO) 165 + root = &ioport_resource; 166 + if (res->flags & IORESOURCE_MEM) 167 + root = &iomem_resource; 168 + 169 + return root; 170 + } 171 + 159 172 #define pcibios_scan_all_fns(a, b) 0 160 173 161 174 #endif /* _ASM_IA64_PCI_H */
+13
include/asm-parisc/pci.h
··· 257 257 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 258 258 struct pci_bus_region *region); 259 259 260 + static inline struct resource * 261 + pcibios_select_root(struct pci_dev *pdev, struct resource *res) 262 + { 263 + struct resource *root = NULL; 264 + 265 + if (res->flags & IORESOURCE_IO) 266 + root = &ioport_resource; 267 + if (res->flags & IORESOURCE_MEM) 268 + root = &iomem_resource; 269 + 270 + return root; 271 + } 272 + 260 273 static inline void pcibios_add_platform_entries(struct pci_dev *dev) 261 274 { 262 275 }
+13
include/asm-ppc/pci.h
··· 109 109 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 110 110 struct pci_bus_region *region); 111 111 112 + static inline struct resource * 113 + pcibios_select_root(struct pci_dev *pdev, struct resource *res) 114 + { 115 + struct resource *root = NULL; 116 + 117 + if (res->flags & IORESOURCE_IO) 118 + root = &ioport_resource; 119 + if (res->flags & IORESOURCE_MEM) 120 + root = &iomem_resource; 121 + 122 + return root; 123 + } 124 + 112 125 extern void pcibios_add_platform_entries(struct pci_dev *dev); 113 126 114 127 struct file;
+13
include/asm-ppc64/pci.h
··· 138 138 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 139 139 struct pci_bus_region *region); 140 140 141 + static inline struct resource * 142 + pcibios_select_root(struct pci_dev *pdev, struct resource *res) 143 + { 144 + struct resource *root = NULL; 145 + 146 + if (res->flags & IORESOURCE_IO) 147 + root = &ioport_resource; 148 + if (res->flags & IORESOURCE_MEM) 149 + root = &iomem_resource; 150 + 151 + return root; 152 + } 153 + 141 154 extern int 142 155 unmap_bus_range(struct pci_bus *bus); 143 156
+2
include/asm-sparc64/pci.h
··· 269 269 pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, 270 270 struct pci_bus_region *region); 271 271 272 + extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *); 273 + 272 274 static inline void pcibios_add_platform_entries(struct pci_dev *dev) 273 275 { 274 276 }