Re: [PATCH] (1/2) x440 discontig support on 2.5.62: early, early ioremap

Dave Hansen
2003-02-19T18:19:47Z

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

Patricia Gaughen wrote:
> This patch was written by Dave Hansen, I just brought it forward to
> 2.5.62 :-)
>
> This patch is used by the x440 discontigmem to map the srat tables
> into low memory so that the memory can be setup. This remap function
> is used very early in the boot process... at the start of
> setup_arch().
>
> Dave posted this previously to linux-kernel. Here's a pointer to his
> email:
> http://marc.theaimsgroup.com/?l=linux-kernel&m=104515534619345&w=2

Here's a patch that makes the early ioremap conditional on Summit, and
NUMA.

--
Dave Hansen
haveblue@us.ibm.com

[-- Attachment #2: linux-2.5.62-config_early_ioremap_A0.patch --]
[-- Type: text/plain, Size: 1228 bytes --]

diff -ur linux-2.5.62-disco/arch/i386/Kconfig linux-2.5.62-disco.new/arch/i386/Kconfig
--- linux-2.5.62-disco/arch/i386/Kconfig Wed Feb 19 10:14:34 2003
+++ linux-2.5.62-disco.new/arch/i386/Kconfig Wed Feb 19 10:24:43 2003
@@ -754,6 +754,13 @@
depends on (SMP || PREEMPT) && X86_CMPXCHG
default y

+# turning this on wastes a bunch of space.
+# Summit needs it only when NUMA is on
+config BOOT_IOREMAP
+ bool
+ depends on (X86_SUMMIT && NUMA)
+ default y
+
endmenu

Only in linux-2.5.62-disco.new/arch/i386: Kconfig~
diff -ur linux-2.5.62-disco/arch/i386/mm/Makefile linux-2.5.62-disco.new/arch/i386/mm/Makefile
--- linux-2.5.62-disco/arch/i386/mm/Makefile Wed Feb 19 10:14:30 2003
+++ linux-2.5.62-disco.new/arch/i386/mm/Makefile Wed Feb 19 10:15:42 2003
@@ -2,8 +2,9 @@
# Makefile for the linux i386-specific parts of the memory manager.
#

-obj-y := init.o pgtable.o fault.o ioremap.o extable.o pageattr.o boot_ioremap.o
+obj-y := init.o pgtable.o fault.o ioremap.o extable.o pageattr.o

obj-$(CONFIG_DISCONTIGMEM) += discontig.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_HIGHMEM) += highmem.o
+obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap.o
Only in linux-2.5.62-disco.new/scripts: elfconfig.h