x86: avoid low BIOS area when allocating address space
This implements arch_remove_reservations() so allocate_resource() can avoid any arch-specific reserved areas. This currently just avoids the BIOS area (the first 1MB), but could be used for E820 reserved areas if that turns out to be necessary. We previously avoided this area in pcibios_align_resource(). This patch moves the test from that PCI-specific path to a generic path, so *all* resource allocations will avoid this area. Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
		
					parent
					
						
							
								fcb119183c
							
						
					
				
			
			
				commit
				
					
						30919b0bf3
					
				
			
		
					 3 changed files with 12 additions and 3 deletions
				
			
		| 
						 | 
					@ -45,6 +45,7 @@ obj-y			+= pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
 | 
				
			||||||
obj-y			+= alternative.o i8253.o pci-nommu.o hw_breakpoint.o
 | 
					obj-y			+= alternative.o i8253.o pci-nommu.o hw_breakpoint.o
 | 
				
			||||||
obj-y			+= tsc.o io_delay.o rtc.o
 | 
					obj-y			+= tsc.o io_delay.o rtc.o
 | 
				
			||||||
obj-y			+= pci-iommu_table.o
 | 
					obj-y			+= pci-iommu_table.o
 | 
				
			||||||
 | 
					obj-y			+= resource.o
 | 
				
			||||||
 | 
					
 | 
				
			||||||
obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o
 | 
					obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoline.o
 | 
				
			||||||
obj-y				+= process.o
 | 
					obj-y				+= process.o
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										11
									
								
								arch/x86/kernel/resource.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								arch/x86/kernel/resource.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,11 @@
 | 
				
			||||||
 | 
					#include <linux/ioport.h>
 | 
				
			||||||
 | 
					#include <asm/e820.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void arch_remove_reservations(struct resource *avail)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						/* Trim out BIOS area (low 1MB) */
 | 
				
			||||||
 | 
						if (avail->flags & IORESOURCE_MEM) {
 | 
				
			||||||
 | 
							if (avail->start < BIOS_END)
 | 
				
			||||||
 | 
								avail->start = BIOS_END;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -72,9 +72,6 @@ pcibios_align_resource(void *data, const struct resource *res,
 | 
				
			||||||
			return start;
 | 
								return start;
 | 
				
			||||||
		if (start & 0x300)
 | 
							if (start & 0x300)
 | 
				
			||||||
			start = (start + 0x3ff) & ~0x3ff;
 | 
								start = (start + 0x3ff) & ~0x3ff;
 | 
				
			||||||
	} else if (res->flags & IORESOURCE_MEM) {
 | 
					 | 
				
			||||||
		if (start < BIOS_END)
 | 
					 | 
				
			||||||
			start = BIOS_END;
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return start;
 | 
						return start;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue