| Submitter | Peter Stuge |
|---|---|
| Date | 2009-10-16 15:04:52 |
| Message ID | <20091016150452.5952.qmail@stuge.se> |
| Download | mbox | patch |
| Permalink | /patch/422/ |
| State | Accepted |
| Headers | show |
Comments
On Fri, Oct 16, 2009 at 8:04 AM, Peter Stuge <peter@stuge.se> wrote: > ron minnich wrote: >> I doubt we need it any more. > > Thanks for the explanations, Myles and Ron! See patch. Thanks for finding that. Acked-by: Ronald G. Minnich <rminnich@gmail.com>
On Fri, Oct 16, 2009 at 9:04 AM, Peter Stuge <peter@stuge.se> wrote: > ron minnich wrote: > > I doubt we need it any more. > > Thanks for the explanations, Myles and Ron! See patch. > ## Setting this number very high will make pci_locate_device() take a long ## time when it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 3 The comments should disappear too. ... -define CONFIG_MAX_PCI_BUSES default 255 export always comment "Maximum number of PCI buses to search for devices" The rest of this has to go. Thanks, Myles
Myles Watson wrote: > ## Setting this number very high will make pci_locate_device() take a long > ## time when it can't find a device. > ## > -default CONFIG_MAX_PCI_BUSES = 3 > The comments should disappear too. > ... > -define CONFIG_MAX_PCI_BUSES > default 255 > export always > comment "Maximum number of PCI buses to search for devices" > The rest of this has to go. Duh! Thanks for finding it! Uwe Hermann wrote: > > Drop CONFIG_MAX_PCI_BUSES > > > > It was added by rsmith in r2273 on 20060424, when pci_locate_device() in > > src/arch/i386/include/arch/romcc_io.h in fact scanned all busses: > > > > - for(; dev <= PCI_DEV(255, 31, 7); dev += PCI_DEV(0,0,1)) { > > + for(; dev <= PCI_DEV(CONFIG_MAX_PCI_BUSES, 31, 7); dev += PCI_DEV(0,0,1)) { > > > > Today this looks like: > > > > for(; dev <= PCI_DEV(255|(((1<<CONFIG_PCI_BUS_SEGN_BITS)-1)<<8), 31, 7); dev += PCI_DEV(0,0,1)) { > > > > and CONFIG_MAX_PCI_BUSES is never used anywhere. > > > > Signed-off-by: Peter Stuge <peter@stuge.se> > > Looks like you were faster, but here's my patch nonetheless. > It removeѕ some additional useless comments. Also, the change in > src/config/Options.lb is not correct and will likely break the > build. Good stuff! Thanks for finding what I missed. Feel free to grab some parts from my commit message and go for it! > Drop unused and useless CONFIG_MAX_PCI_BUSES. > > Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Peter Stuge <peter@stuge.se>
On Fri, Oct 16, 2009 at 05:22:47PM +0200, Peter Stuge wrote: > Good stuff! Thanks for finding what I missed. Feel free to grab some > parts from my commit message and go for it! > > Acked-by: Peter Stuge <peter@stuge.se> Done, r4789. Uwe.
Patch
Index: src/mainboard/bcom/winnetp680/Options.lb =================================================================== --- src/mainboard/bcom/winnetp680/Options.lb (revision 4787) +++ src/mainboard/bcom/winnetp680/Options.lb (working copy) @@ -61,7 +61,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -98,6 +97,5 @@ ## Setting this number very high will make pci_locate_device() take a long ## time when it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 3 end Index: src/mainboard/via/epia-m700/Options.lb =================================================================== --- src/mainboard/via/epia-m700/Options.lb (revision 4787) +++ src/mainboard/via/epia-m700/Options.lb (working copy) @@ -59,7 +59,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -141,6 +140,5 @@ ## Setting this number very high will make pci_locate_device() take a long ## time when it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 3 end Index: src/mainboard/via/vt8454c/Options.lb =================================================================== --- src/mainboard/via/vt8454c/Options.lb (revision 4787) +++ src/mainboard/via/vt8454c/Options.lb (working copy) @@ -72,7 +72,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_SMP uses CONFIG_IOAPIC @@ -191,7 +190,6 @@ ## pci_locate_device take a long time when ## it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 0x80 ## ## Disable the gdb stub by default Index: src/mainboard/via/epia-m/Options.lb =================================================================== --- src/mainboard/via/epia-m/Options.lb (revision 4787) +++ src/mainboard/via/epia-m/Options.lb (working copy) @@ -41,7 +41,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD ## CONFIG_ROM_SIZE is the size of boot ROM that this board will use. @@ -134,7 +133,6 @@ ## pci_locate_device take a long time when ## it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 5 default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8 default CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 Index: src/mainboard/via/epia-n/Options.lb =================================================================== --- src/mainboard/via/epia-n/Options.lb (revision 4787) +++ src/mainboard/via/epia-n/Options.lb (working copy) @@ -64,7 +64,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -114,5 +113,4 @@ ## Setting this number very high will make pci_locate_device() take a long ## time when it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 3 end Index: src/mainboard/via/epia-cn/Options.lb =================================================================== --- src/mainboard/via/epia-cn/Options.lb (revision 4787) +++ src/mainboard/via/epia-cn/Options.lb (working copy) @@ -61,7 +61,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -99,5 +98,4 @@ ## Setting this number very high will make pci_locate_device() take a long ## time when it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 3 end Index: src/mainboard/via/pc2500e/Options.lb =================================================================== --- src/mainboard/via/pc2500e/Options.lb (revision 4787) +++ src/mainboard/via/pc2500e/Options.lb (working copy) @@ -62,7 +62,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_TTYS0_BASE uses CONFIG_TTYS0_LCS @@ -101,7 +100,6 @@ default CONFIG_CROSS_COMPILE = "" default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32 -fno-stack-protector" default HOSTCC = "gcc" -default CONFIG_MAX_PCI_BUSES = 3 default CONFIG_CONSOLE_SERIAL8250 = 1 default CONFIG_TTYS0_BAUD = 115200 default CONFIG_TTYS0_BASE = 0x3f8 Index: src/mainboard/jetway/j7f24/Options.lb =================================================================== --- src/mainboard/jetway/j7f24/Options.lb (revision 4787) +++ src/mainboard/jetway/j7f24/Options.lb (working copy) @@ -61,7 +61,6 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -99,6 +98,5 @@ ## Setting this number very high will make pci_locate_device() take a long ## time when it can't find a device. ## -default CONFIG_MAX_PCI_BUSES = 3 end Index: src/config/Options.lb =================================================================== --- src/config/Options.lb (revision 4787) +++ src/config/Options.lb (working copy) @@ -562,7 +562,6 @@ export used comment "System clock frequency in MHz" end -define CONFIG_MAX_PCI_BUSES default 255 export always comment "Maximum number of PCI buses to search for devices"