/[linux-patches]/genpatches-2.6/tags/2.6.12-12/1315_amd64-cardbus.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.12-12/1315_amd64-cardbus.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 136 - (hide annotations) (download)
Tue Aug 9 21:03:23 2005 UTC (13 years, 2 months ago) by dsd
Original Path: genpatches-2.6/trunk/2.6.12/1315_amd64-cardbus.patch
File size: 1395 byte(s)
Rediff
1 dsd 136 --- linux-2.6.12-gentoo-r8/drivers/pci/probe.c 2005-06-17 20:48:29.000000000 +0100
2     +++ linux-dsd/drivers/pci/probe.c 2005-08-09 21:44:41.000000000 +0100
3     @@ -395,6 +395,16 @@ static void pci_enable_crs(struct pci_de
4 dsd 133 pci_write_config_word(dev, rpcap + PCI_EXP_RTCTL, rpctl);
5     }
6    
7     +static void __devinit pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
8     +{
9     + struct pci_bus *parent = child->parent;
10     + while (parent->parent && parent->subordinate < max) {
11     + parent->subordinate = max;
12     + pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max);
13     + parent = parent->parent;
14     + }
15     +}
16     +
17     unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus);
18    
19     /*
20 dsd 136 @@ -492,7 +502,13 @@ int __devinit pci_scan_bridge(struct pci
21 dsd 133
22     if (!is_cardbus) {
23     child->bridge_ctl = PCI_BRIDGE_CTL_NO_ISA;
24     -
25     + /*
26     + * Adjust subordinate busnr in parent buses.
27     + * We do this before scanning for children because
28     + * some devices may not be detected if the bios
29     + * was lazy.
30     + */
31     + pci_fixup_parent_subordinate_busnr(child, max);
32     /* Now we can scan all subordinate buses... */
33     max = pci_scan_child_bus(child);
34     } else {
35 dsd 136 @@ -502,6 +518,7 @@ int __devinit pci_scan_bridge(struct pci
36     * inserted later.
37     */
38     max += CARDBUS_RESERVE_BUSNR;
39 dsd 133 + pci_fixup_parent_subordinate_busnr(child, max);
40     }
41     /*
42     * Set the subordinate bus number to its real value.

  ViewVC Help
Powered by ViewVC 1.1.20