Hello,
I discovered /proc/iomem is broken for system memory resources.
Apparently since highmem support went in. Here are fixes and a few
updates as follows:
1. Resource areas are measured in bytes and not pages (that's the problem
metioned above). Includes fixes for off-by-one errors for upper limits.
2. Moved mips bootmem allocation and resource reservation to bootmem_init
similarly to mips64.
3. Added resource reservation for mips64.
OK to apply?
Maciej
--
+ Maciej W. Rozycki, Technical University of Gdansk, Poland +
+--------------------------------------------------------------+
+ e-mail: macro@ds2.pg.gda.pl, PGP key available +
patch-mips-2.4.19-rc1-20020821-mem-regions-3
diff -up --recursive --new-file linux-mips-2.4.19-rc1-20020821.macro/arch/mips/kernel/setup.c linux-mips-2.4.19-rc1-20020821/arch/mips/kernel/setup.c
--- linux-mips-2.4.19-rc1-20020821.macro/arch/mips/kernel/setup.c 2002-08-21 02:56:52.000000000 +0000
+++ linux-mips-2.4.19-rc1-20020821/arch/mips/kernel/setup.c 2002-08-25 15:05:17.000000000 +0000
@@ -7,7 +7,7 @@
* Copyright (C) 1995 Waldorf Electronics
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Ralf Baechle
* Copyright (C) 1996 Stoned Elipot
- * Copyright (C) 2000, 2001 Maciej W. Rozycki
+ * Copyright (C) 2000, 2001, 2002 Maciej W. Rozycki
*/
#include <linux/config.h>
#include <linux/errno.h>
@@ -236,204 +236,16 @@ static inline void parse_mem_cmdline(voi
}
}
-void __init setup_arch(char **cmdline_p)
+static void bootmem_init(void)
{
- void atlas_setup(void);
- void baget_setup(void);
- void cobalt_setup(void);
- void ddb_setup(void);
- void decstation_setup(void);
- void deskstation_setup(void);
- void jazz_setup(void);
- void sni_rm200_pci_setup(void);
- void ip22_setup(void);
- void ev96100_setup(void);
- void malta_setup(void);
- void sead_setup(void);
- void ikos_setup(void);
- void momenco_ocelot_setup(void);
- void nino_setup(void);
- void nec_osprey_setup(void);
- void nec_eagle_setup(void);
- void zao_capcella_setup(void);
- void jmr3927_setup(void);
- void it8172_setup(void);
- void swarm_setup(void);
- void hp_setup(void);
-
- unsigned long bootmap_size;
- unsigned long start_pfn, max_pfn, max_low_pfn, first_usable_pfn;
#ifdef CONFIG_BLK_DEV_INITRD
unsigned long tmp;
- unsigned long* initrd_header;
+ unsigned long *initrd_header;
#endif
-
+ unsigned long bootmap_size;
+ unsigned long start_pfn, max_pfn, max_low_pfn, first_usable_pfn;
int i;
-
-#ifdef CONFIG_BLK_DEV_FD
- fd_ops = &no_fd_ops;
-#endif
-
-#ifdef CONFIG_BLK_DEV_IDE
- ide_ops = &no_ide_ops;
-#endif
-
-#ifdef CONFIG_PC_KEYB
- kbd_ops = &no_kbd_ops;
-#endif
-
- rtc_ops = &no_rtc_ops;
-
- switch(mips_machgroup)
- {
-#ifdef CONFIG_BAGET_MIPS
- case MACH_GROUP_BAGET:
- baget_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_COBALT
- case MACH_GROUP_COBALT:
- cobalt_setup();
- break;
-#endif
-#ifdef CONFIG_DECSTATION
- case MACH_GROUP_DEC:
- decstation_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_ATLAS
- case MACH_GROUP_UNKNOWN:
- atlas_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_JAZZ
- case MACH_GROUP_JAZZ:
- jazz_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_MALTA
- case MACH_GROUP_UNKNOWN:
- malta_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_SEAD
- case MACH_GROUP_UNKNOWN:
- sead_setup();
- break;
-#endif
-#ifdef CONFIG_MOMENCO_OCELOT
- case MACH_GROUP_MOMENCO:
- momenco_ocelot_setup();
- break;
-#endif
-#ifdef CONFIG_SGI_IP22
- /* As of now this is only IP22. */
- case MACH_GROUP_SGI:
- ip22_setup();
- break;
-#endif
-#ifdef CONFIG_SNI_RM200_PCI
- case MACH_GROUP_SNI_RM:
- sni_rm200_pci_setup();
- break;
-#endif
-#ifdef CONFIG_DDB5074
- case MACH_GROUP_NEC_DDB:
- ddb_setup();
- break;
-#endif
-#ifdef CONFIG_DDB5476
- case MACH_GROUP_NEC_DDB:
- ddb_setup();
- break;
-#endif
-#ifdef CONFIG_DDB5477
- case MACH_GROUP_NEC_DDB:
- ddb_setup();
- break;
-#endif
-#ifdef CONFIG_CPU_VR41XX
- case MACH_GROUP_NEC_VR41XX:
- switch (mips_machtype) {
-#ifdef CONFIG_NEC_OSPREY
- case MACH_NEC_OSPREY:
- nec_osprey_setup();
- break;
-#endif
-#ifdef CONFIG_NEC_EAGLE
- case MACH_NEC_EAGLE:
- nec_eagle_setup();
- break;
-#endif
-#ifdef CONFIG_ZAO_CAPCELLA
- case MACH_ZAO_CAPCELLA:
- zao_capcella_setup();
- break;
-#endif
- }
- break;
-#endif
-#ifdef CONFIG_MIPS_EV96100
- case MACH_GROUP_GALILEO:
- ev96100_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_EV64120
- case MACH_GROUP_GALILEO:
- ev64120_setup();
- break;
-#endif
-#if defined(CONFIG_MIPS_IVR) || defined(CONFIG_MIPS_ITE8172)
- case MACH_GROUP_ITE:
- case MACH_GROUP_GLOBESPAN:
- it8172_setup();
- break;
-#endif
-#ifdef CONFIG_NINO
- case MACH_GROUP_PHILIPS:
- nino_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_PB1000
- case MACH_GROUP_ALCHEMY:
- au1000_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_PB1100
- case MACH_GROUP_ALCHEMY:
- au1100_setup();
- break;
-#endif
-#ifdef CONFIG_MIPS_PB1500
- case MACH_GROUP_ALCHEMY:
- au1500_setup();
- break;
-#endif
-#ifdef CONFIG_TOSHIBA_JMR3927
- case MACH_GROUP_TOSHIBA:
- jmr3927_setup();
- break;
-#endif
-#ifdef CONFIG_SIBYTE_SWARM
- case MACH_GROUP_SIBYTE:
- swarm_setup();
- break;
-#endif
-#ifdef CONFIG_HP_LASERJET
- case MACH_GROUP_HP_LJ:
- hp_setup();
- break;
-#endif
- default:
- panic("Unsupported architecture");
- }
-
- strncpy(command_line, arcs_cmdline, sizeof command_line);
- command_line[sizeof command_line - 1] = 0;
- strcpy(saved_command_line, command_line);
- *cmdline_p = command_line;
-
- parse_mem_cmdline();
+ extern char _end;
#define PFN_UP(x) (((x) + PAGE_SIZE - 1) >> PAGE_SHIFT)
#define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
@@ -586,7 +398,7 @@ void __init setup_arch(char **cmdline_p)
initrd_size);
if (PHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) {
printk("initrd extends beyond end of memory "
- "(0x%lx > 0x%p)\ndisabling initrd\n",
+ "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
PHYSADDR(initrd_end),
PFN_PHYS(max_low_pfn));
initrd_start = initrd_end = 0;
@@ -594,8 +406,6 @@ void __init setup_arch(char **cmdline_p)
}
#endif /* CONFIG_BLK_DEV_INITRD */
- paging_init();
-
code_resource.start = virt_to_bus(&_ftext);
code_resource.end = virt_to_bus(&_etext) - 1;
data_resource.start = virt_to_bus(&_fdata);
@@ -606,7 +416,7 @@ void __init setup_arch(char **cmdline_p)
*/
for (i = 0; i < boot_mem_map.nr_map; i++) {
struct resource *res;
- unsigned long addr_pfn, end_pfn;
+ unsigned long start, end;
res = alloc_bootmem(sizeof(struct resource));
switch (boot_mem_map.map[i].type) {
@@ -618,16 +428,17 @@ void __init setup_arch(char **cmdline_p)
default:
res->name = "reserved";
}
- addr_pfn = PFN_UP(boot_mem_map.map[i].addr);
- end_pfn = PFN_UP(boot_mem_map.map[i].addr+boot_mem_map.map[i].size);
- if (addr_pfn > max_low_pfn)
+
+ start = boot_mem_map.map[i].addr;
+ end = boot_mem_map.map[i].addr + boot_mem_map.map[i].size - 1;
+ if (start >= PFN_PHYS(max_low_pfn))
continue;
- res->start = boot_mem_map.map[i].addr;
- if (end_pfn < max_low_pfn) {
- res->end = res->start + boot_mem_map.map[i].size - 1;
- } else {
- res->end = max_low_pfn - 1;
+ if (end >= PFN_PHYS(max_low_pfn)) {
+ res->end = PFN_PHYS(max_low_pfn) - 1;
}
+ res->start = start;
+ res->end = end;
+
res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
request_resource(&iomem_resource, res);
@@ -641,6 +452,201 @@ void __init setup_arch(char **cmdline_p)
}
}
+void __init setup_arch(char **cmdline_p)
+{
+ void atlas_setup(void);
+ void baget_setup(void);
+ void cobalt_setup(void);
+ void ddb_setup(void);
+ void decstation_setup(void);
+ void deskstation_setup(void);
+ void jazz_setup(void);
+ void sni_rm200_pci_setup(void);
+ void ip22_setup(void);
+ void ev96100_setup(void);
+ void malta_setup(void);
+ void sead_setup(void);
+ void ikos_setup(void);
+ void momenco_ocelot_setup(void);
+ void nino_setup(void);
+ void nec_osprey_setup(void);
+ void nec_eagle_setup(void);
+ void zao_capcella_setup(void);
+ void jmr3927_setup(void);
+ void it8172_setup(void);
+ void swarm_setup(void);
+ void hp_setup(void);
+
+#ifdef CONFIG_BLK_DEV_FD
+ fd_ops = &no_fd_ops;
+#endif
+
+#ifdef CONFIG_BLK_DEV_IDE
+ ide_ops = &no_ide_ops;
+#endif
+
+#ifdef CONFIG_PC_KEYB
+ kbd_ops = &no_kbd_ops;
+#endif
+
+ rtc_ops = &no_rtc_ops;
+
+ switch(mips_machgroup)
+ {
+#ifdef CONFIG_BAGET_MIPS
+ case MACH_GROUP_BAGET:
+ baget_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_COBALT
+ case MACH_GROUP_COBALT:
+ cobalt_setup();
+ break;
+#endif
+#ifdef CONFIG_DECSTATION
+ case MACH_GROUP_DEC:
+ decstation_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_ATLAS
+ case MACH_GROUP_UNKNOWN:
+ atlas_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_JAZZ
+ case MACH_GROUP_JAZZ:
+ jazz_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_MALTA
+ case MACH_GROUP_UNKNOWN:
+ malta_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_SEAD
+ case MACH_GROUP_UNKNOWN:
+ sead_setup();
+ break;
+#endif
+#ifdef CONFIG_MOMENCO_OCELOT
+ case MACH_GROUP_MOMENCO:
+ momenco_ocelot_setup();
+ break;
+#endif
+#ifdef CONFIG_SGI_IP22
+ /* As of now this is only IP22. */
+ case MACH_GROUP_SGI:
+ ip22_setup();
+ break;
+#endif
+#ifdef CONFIG_SNI_RM200_PCI
+ case MACH_GROUP_SNI_RM:
+ sni_rm200_pci_setup();
+ break;
+#endif
+#ifdef CONFIG_DDB5074
+ case MACH_GROUP_NEC_DDB:
+ ddb_setup();
+ break;
+#endif
+#ifdef CONFIG_DDB5476
+ case MACH_GROUP_NEC_DDB:
+ ddb_setup();
+ break;
+#endif
+#ifdef CONFIG_DDB5477
+ case MACH_GROUP_NEC_DDB:
+ ddb_setup();
+ break;
+#endif
+#ifdef CONFIG_CPU_VR41XX
+ case MACH_GROUP_NEC_VR41XX:
+ switch (mips_machtype) {
+#ifdef CONFIG_NEC_OSPREY
+ case MACH_NEC_OSPREY:
+ nec_osprey_setup();
+ break;
+#endif
+#ifdef CONFIG_NEC_EAGLE
+ case MACH_NEC_EAGLE:
+ nec_eagle_setup();
+ break;
+#endif
+#ifdef CONFIG_ZAO_CAPCELLA
+ case MACH_ZAO_CAPCELLA:
+ zao_capcella_setup();
+ break;
+#endif
+ }
+ break;
+#endif
+#ifdef CONFIG_MIPS_EV96100
+ case MACH_GROUP_GALILEO:
+ ev96100_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_EV64120
+ case MACH_GROUP_GALILEO:
+ ev64120_setup();
+ break;
+#endif
+#if defined(CONFIG_MIPS_IVR) || defined(CONFIG_MIPS_ITE8172)
+ case MACH_GROUP_ITE:
+ case MACH_GROUP_GLOBESPAN:
+ it8172_setup();
+ break;
+#endif
+#ifdef CONFIG_NINO
+ case MACH_GROUP_PHILIPS:
+ nino_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_PB1000
+ case MACH_GROUP_ALCHEMY:
+ au1000_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_PB1100
+ case MACH_GROUP_ALCHEMY:
+ au1100_setup();
+ break;
+#endif
+#ifdef CONFIG_MIPS_PB1500
+ case MACH_GROUP_ALCHEMY:
+ au1500_setup();
+ break;
+#endif
+#ifdef CONFIG_TOSHIBA_JMR3927
+ case MACH_GROUP_TOSHIBA:
+ jmr3927_setup();
+ break;
+#endif
+#ifdef CONFIG_SIBYTE_SWARM
+ case MACH_GROUP_SIBYTE:
+ swarm_setup();
+ break;
+#endif
+#ifdef CONFIG_HP_LASERJET
+ case MACH_GROUP_HP_LJ:
+ hp_setup();
+ break;
+#endif
+ default:
+ panic("Unsupported architecture");
+ }
+
+ strncpy(command_line, arcs_cmdline, sizeof command_line);
+ command_line[sizeof command_line - 1] = 0;
+ strcpy(saved_command_line, command_line);
+ *cmdline_p = command_line;
+
+ parse_mem_cmdline();
+
+ bootmem_init();
+
+ paging_init();
+}
+
static int __init fpu_disable(char *s)
{
mips_cpu.options &= ~MIPS_CPU_FPU;
diff -up --recursive --new-file linux-mips-2.4.19-rc1-20020821.macro/arch/mips64/kernel/setup.c linux-mips-2.4.19-rc1-20020821/arch/mips64/kernel/setup.c
--- linux-mips-2.4.19-rc1-20020821.macro/arch/mips64/kernel/setup.c 2002-07-26 02:57:49.000000000 +0000
+++ linux-mips-2.4.19-rc1-20020821/arch/mips64/kernel/setup.c 2002-08-25 14:25:41.000000000 +0000
@@ -13,6 +13,7 @@
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
+#include <linux/ioport.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@ -88,8 +89,7 @@ unsigned long mips_machgroup = MACH_GROU
struct boot_mem_map boot_mem_map;
unsigned char aux_device_present;
-
-extern void load_mmu(void);
+extern char _ftext, _etext, _fdata, _edata, _end;
static char command_line[CL_SIZE] = { 0, };
char saved_command_line[CL_SIZE];
@@ -112,6 +112,9 @@ extern void load_mmu(void);
extern ATTRIB_NORET asmlinkage void start_kernel(void);
extern void prom_init(int, char **, char **, int *);
+static struct resource code_resource = { "Kernel code" };
+static struct resource data_resource = { "Kernel data" };
+
asmlinkage void __init init_arch(int argc, char **argv, char **envp,
int *prom_vec)
{
@@ -236,7 +239,7 @@ static inline void parse_mem_cmdline(voi
}
}
-void bootmem_init(void)
+static void bootmem_init(void)
{
#ifdef CONFIG_BLK_DEV_INITRD
unsigned long tmp;
@@ -245,7 +248,6 @@ void bootmem_init(void)
unsigned long bootmap_size;
unsigned long start_pfn, max_pfn;
int i;
- extern int _end;
#define PFN_UP(x) (((x) + PAGE_SIZE - 1) >> PAGE_SHIFT)
#define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
@@ -343,6 +345,45 @@ void bootmem_init(void)
}
#endif
+ code_resource.start = virt_to_bus(&_ftext);
+ code_resource.end = virt_to_bus(&_etext) - 1;
+ data_resource.start = virt_to_bus(&_fdata);
+ data_resource.end = virt_to_bus(&_edata) - 1;
+
+ /*
+ * Request address space for all standard RAM.
+ */
+ for (i = 0; i < boot_mem_map.nr_map; i++) {
+ struct resource *res;
+ unsigned long start, end;
+
+ res = alloc_bootmem(sizeof(struct resource));
+ switch (boot_mem_map.map[i].type) {
+ case BOOT_MEM_RAM:
+ case BOOT_MEM_ROM_DATA:
+ res->name = "System RAM";
+ break;
+ case BOOT_MEM_RESERVED:
+ default:
+ res->name = "reserved";
+ }
+
+ res->start = boot_mem_map.map[i].addr;
+ res->end = boot_mem_map.map[i].addr +
+ boot_mem_map.map[i].size - 1;
+
+ res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+ request_resource(&iomem_resource, res);
+
+ /*
+ * We dont't know which RAM region contains kernel data,
+ * so we try it repeatedly and let the resource manager
+ * test it.
+ */
+ request_resource(res, &code_resource);
+ request_resource(res, &data_resource);
+ }
+
#undef PFN_UP
#undef PFN_DOWN
#undef PFN_PHYS
