Hi Jesse, I am considering putting this patch plus the two followup patches in my next set of fixes to Linus. However, the two followup patches are really more PCI-related than x86-related, so I would appreciate your OK. I'm using this version (-v3) because the latter cleanup (removing probe_rom_32.c for example) do not seem to be .34 material. For the followup patches: http://marc.info/?i=4BC4E0E9.7000203@xxxxxxxxxx http://marc.info/?i=4BC4E115.90805@xxxxxxxxxx -hpa On 04/13/2010 02:22 PM, Yinghai wrote: > > > Update e820 at first, and later put them resource tree. > > Reserved that early, will not be allocated to unassigned PCI BAR > > Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> > Cc: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx> > Cc: Andy Isaacson <adi@xxxxxxxxxxxxx> > Tested-by: Andy Isaacson <adi@xxxxxxxxxxxxx> > Cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx> > Acked-by: H. Peter Anvin <hpa@xxxxxxxxx> > > --- > arch/x86/include/asm/setup.h | 1 - > arch/x86/kernel/head32.c | 1 - > arch/x86/kernel/setup.c | 19 +------------------ > 3 files changed, 1 insertion(+), 20 deletions(-) > > Index: linux-2.6/arch/x86/include/asm/setup.h > =================================================================== > --- linux-2.6.orig/arch/x86/include/asm/setup.h > +++ linux-2.6/arch/x86/include/asm/setup.h > @@ -44,7 +44,6 @@ static inline void visws_early_detect(vo > extern unsigned long saved_video_mode; > > extern void reserve_standard_io_resources(void); > -extern void i386_reserve_resources(void); > extern void setup_default_timer_irq(void); > > #ifdef CONFIG_X86_MRST > Index: linux-2.6/arch/x86/kernel/head32.c > =================================================================== > --- linux-2.6.orig/arch/x86/kernel/head32.c > +++ linux-2.6/arch/x86/kernel/head32.c > @@ -22,7 +22,6 @@ static void __init i386_default_early_se > { > /* Initilize 32bit specific setup functions */ > x86_init.resources.probe_roms = probe_roms; > - x86_init.resources.reserve_resources = i386_reserve_resources; > x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc; > > reserve_ebda_region(); > Index: linux-2.6/arch/x86/kernel/setup.c > =================================================================== > --- linux-2.6.orig/arch/x86/kernel/setup.c > +++ linux-2.6/arch/x86/kernel/setup.c > @@ -693,7 +693,7 @@ static void __init trim_bios_range(void) > * area (640->1Mb) as ram even though it is not. > * take them out. > */ > - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1); > + e820_add_region(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RESERVED); > sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); > } > > @@ -1052,20 +1052,3 @@ void __init setup_arch(char **cmdline_p) > > mcheck_init(); > } > - > -#ifdef CONFIG_X86_32 > - > -static struct resource video_ram_resource = { > - .name = "Video RAM area", > - .start = 0xa0000, > - .end = 0xbffff, > - .flags = IORESOURCE_BUSY | IORESOURCE_MEM > -}; > - > -void __init i386_reserve_resources(void) > -{ > - request_resource(&iomem_resource, &video_ram_resource); > - reserve_standard_io_resources(); > -} > - > -#endif /* CONFIG_X86_32 */ -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
