diff options
-rw-r--r-- | drivers/pci/probe.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 2f75d695eed7..c5ca3134513a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -455,22 +455,6 @@ struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int | |||
455 | return child; | 455 | return child; |
456 | } | 456 | } |
457 | 457 | ||
458 | static void pci_enable_crs(struct pci_dev *dev) | ||
459 | { | ||
460 | u16 cap, rpctl; | ||
461 | int rpcap = pci_find_capability(dev, PCI_CAP_ID_EXP); | ||
462 | if (!rpcap) | ||
463 | return; | ||
464 | |||
465 | pci_read_config_word(dev, rpcap + PCI_CAP_FLAGS, &cap); | ||
466 | if (((cap & PCI_EXP_FLAGS_TYPE) >> 4) != PCI_EXP_TYPE_ROOT_PORT) | ||
467 | return; | ||
468 | |||
469 | pci_read_config_word(dev, rpcap + PCI_EXP_RTCTL, &rpctl); | ||
470 | rpctl |= PCI_EXP_RTCTL_CRSSVE; | ||
471 | pci_write_config_word(dev, rpcap + PCI_EXP_RTCTL, rpctl); | ||
472 | } | ||
473 | |||
474 | static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) | 458 | static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) |
475 | { | 459 | { |
476 | struct pci_bus *parent = child->parent; | 460 | struct pci_bus *parent = child->parent; |
@@ -517,8 +501,6 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass | |||
517 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, | 501 | pci_write_config_word(dev, PCI_BRIDGE_CONTROL, |
518 | bctl & ~PCI_BRIDGE_CTL_MASTER_ABORT); | 502 | bctl & ~PCI_BRIDGE_CTL_MASTER_ABORT); |
519 | 503 | ||
520 | pci_enable_crs(dev); | ||
521 | |||
522 | if ((buses & 0xffff00) && !pcibios_assign_all_busses() && !is_cardbus) { | 504 | if ((buses & 0xffff00) && !pcibios_assign_all_busses() && !is_cardbus) { |
523 | unsigned int cmax, busnr; | 505 | unsigned int cmax, busnr; |
524 | /* | 506 | /* |