x86: remove extern declarations for code, data, bss resources
This patch removes the extern struct resource declarations for data_resource, code_resource and bss_resource on x86 and declares that three structures as static as done on other architectures like IA64. On i386, these structures are moved to setup_32.c (from e820_32.c) because that's code that is not specific to e820 and also required on EFI systems. That makes the "extern" reference superfluous. On x86_64, data_resource, code_resource and bss_resource are passed to e820_reserve_resources() as arguments just as done on i386 and IA64. That also avoids the "extern" reference and it's possible to make it static. Signed-off-by: Bernhard Walle <bwalle@suse.de> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
9773db2a30
commit
c9cce83dd1
|
@ -37,26 +37,6 @@ unsigned long pci_mem_start = 0x10000000;
|
||||||
EXPORT_SYMBOL(pci_mem_start);
|
EXPORT_SYMBOL(pci_mem_start);
|
||||||
#endif
|
#endif
|
||||||
extern int user_defined_memmap;
|
extern int user_defined_memmap;
|
||||||
struct resource data_resource = {
|
|
||||||
.name = "Kernel data",
|
|
||||||
.start = 0,
|
|
||||||
.end = 0,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
|
||||||
};
|
|
||||||
|
|
||||||
struct resource code_resource = {
|
|
||||||
.name = "Kernel code",
|
|
||||||
.start = 0,
|
|
||||||
.end = 0,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
|
||||||
};
|
|
||||||
|
|
||||||
struct resource bss_resource = {
|
|
||||||
.name = "Kernel bss",
|
|
||||||
.start = 0,
|
|
||||||
.end = 0,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct resource system_rom_resource = {
|
static struct resource system_rom_resource = {
|
||||||
.name = "System ROM",
|
.name = "System ROM",
|
||||||
|
@ -111,60 +91,6 @@ static struct resource video_rom_resource = {
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
|
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct resource video_ram_resource = {
|
|
||||||
.name = "Video RAM area",
|
|
||||||
.start = 0xa0000,
|
|
||||||
.end = 0xbffff,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct resource standard_io_resources[] = { {
|
|
||||||
.name = "dma1",
|
|
||||||
.start = 0x0000,
|
|
||||||
.end = 0x001f,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "pic1",
|
|
||||||
.start = 0x0020,
|
|
||||||
.end = 0x0021,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "timer0",
|
|
||||||
.start = 0x0040,
|
|
||||||
.end = 0x0043,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "timer1",
|
|
||||||
.start = 0x0050,
|
|
||||||
.end = 0x0053,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "keyboard",
|
|
||||||
.start = 0x0060,
|
|
||||||
.end = 0x006f,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "dma page reg",
|
|
||||||
.start = 0x0080,
|
|
||||||
.end = 0x008f,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "pic2",
|
|
||||||
.start = 0x00a0,
|
|
||||||
.end = 0x00a1,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "dma2",
|
|
||||||
.start = 0x00c0,
|
|
||||||
.end = 0x00df,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
}, {
|
|
||||||
.name = "fpu",
|
|
||||||
.start = 0x00f0,
|
|
||||||
.end = 0x00ff,
|
|
||||||
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
|
||||||
} };
|
|
||||||
|
|
||||||
#define ROMSIGNATURE 0xaa55
|
#define ROMSIGNATURE 0xaa55
|
||||||
|
|
||||||
static int __init romsignature(const unsigned char *rom)
|
static int __init romsignature(const unsigned char *rom)
|
||||||
|
@ -260,10 +186,9 @@ static void __init probe_roms(void)
|
||||||
* Request address space for all standard RAM and ROM resources
|
* Request address space for all standard RAM and ROM resources
|
||||||
* and also for regions reported as reserved by the e820.
|
* and also for regions reported as reserved by the e820.
|
||||||
*/
|
*/
|
||||||
static void __init
|
void __init legacy_init_iomem_resources(struct resource *code_resource,
|
||||||
legacy_init_iomem_resources(struct resource *code_resource,
|
struct resource *data_resource,
|
||||||
struct resource *data_resource,
|
struct resource *bss_resource)
|
||||||
struct resource *bss_resource)
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -305,35 +230,6 @@ legacy_init_iomem_resources(struct resource *code_resource,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Request address space for all standard resources
|
|
||||||
*
|
|
||||||
* This is called just before pcibios_init(), which is also a
|
|
||||||
* subsys_initcall, but is linked in later (in arch/i386/pci/common.c).
|
|
||||||
*/
|
|
||||||
static int __init request_standard_resources(void)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
printk("Setting up standard PCI resources\n");
|
|
||||||
if (efi_enabled)
|
|
||||||
efi_initialize_iomem_resources(&code_resource,
|
|
||||||
&data_resource, &bss_resource);
|
|
||||||
else
|
|
||||||
legacy_init_iomem_resources(&code_resource,
|
|
||||||
&data_resource, &bss_resource);
|
|
||||||
|
|
||||||
/* EFI systems may still have VGA */
|
|
||||||
request_resource(&iomem_resource, &video_ram_resource);
|
|
||||||
|
|
||||||
/* request I/O space for devices used on all i[345]86 PCs */
|
|
||||||
for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)
|
|
||||||
request_resource(&ioport_resource, &standard_io_resources[i]);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
subsys_initcall(request_standard_resources);
|
|
||||||
|
|
||||||
#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
|
#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
|
||||||
/**
|
/**
|
||||||
* e820_mark_nosave_regions - Find the ranges of physical addresses that do not
|
* e820_mark_nosave_regions - Find the ranges of physical addresses that do not
|
||||||
|
|
|
@ -47,8 +47,6 @@ unsigned long end_pfn_map;
|
||||||
*/
|
*/
|
||||||
static unsigned long __initdata end_user_pfn = MAXMEM>>PAGE_SHIFT;
|
static unsigned long __initdata end_user_pfn = MAXMEM>>PAGE_SHIFT;
|
||||||
|
|
||||||
extern struct resource code_resource, data_resource, bss_resource;
|
|
||||||
|
|
||||||
/* Check for some hardcoded bad areas that early boot is not allowed to touch */
|
/* Check for some hardcoded bad areas that early boot is not allowed to touch */
|
||||||
static inline int bad_addr(unsigned long *addrp, unsigned long size)
|
static inline int bad_addr(unsigned long *addrp, unsigned long size)
|
||||||
{
|
{
|
||||||
|
@ -213,7 +211,8 @@ unsigned long __init e820_end_of_ram(void)
|
||||||
/*
|
/*
|
||||||
* Mark e820 reserved areas as busy for the resource manager.
|
* Mark e820 reserved areas as busy for the resource manager.
|
||||||
*/
|
*/
|
||||||
void __init e820_reserve_resources(void)
|
void __init e820_reserve_resources(struct resource *code_resource,
|
||||||
|
struct resource *data_resource, struct resource *bss_resource)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < e820.nr_map; i++) {
|
for (i = 0; i < e820.nr_map; i++) {
|
||||||
|
@ -235,9 +234,9 @@ void __init e820_reserve_resources(void)
|
||||||
* so we try it repeatedly and let the resource manager
|
* so we try it repeatedly and let the resource manager
|
||||||
* test it.
|
* test it.
|
||||||
*/
|
*/
|
||||||
request_resource(res, &code_resource);
|
request_resource(res, code_resource);
|
||||||
request_resource(res, &data_resource);
|
request_resource(res, data_resource);
|
||||||
request_resource(res, &bss_resource);
|
request_resource(res, bss_resource);
|
||||||
#ifdef CONFIG_KEXEC
|
#ifdef CONFIG_KEXEC
|
||||||
if (crashk_res.start != crashk_res.end)
|
if (crashk_res.start != crashk_res.end)
|
||||||
request_resource(res, &crashk_res);
|
request_resource(res, &crashk_res);
|
||||||
|
|
|
@ -73,9 +73,80 @@ int disable_pse __cpuinitdata = 0;
|
||||||
/*
|
/*
|
||||||
* Machine setup..
|
* Machine setup..
|
||||||
*/
|
*/
|
||||||
extern struct resource code_resource;
|
static struct resource data_resource = {
|
||||||
extern struct resource data_resource;
|
.name = "Kernel data",
|
||||||
extern struct resource bss_resource;
|
.start = 0,
|
||||||
|
.end = 0,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct resource code_resource = {
|
||||||
|
.name = "Kernel code",
|
||||||
|
.start = 0,
|
||||||
|
.end = 0,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct resource bss_resource = {
|
||||||
|
.name = "Kernel bss",
|
||||||
|
.start = 0,
|
||||||
|
.end = 0,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct resource video_ram_resource = {
|
||||||
|
.name = "Video RAM area",
|
||||||
|
.start = 0xa0000,
|
||||||
|
.end = 0xbffff,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct resource standard_io_resources[] = { {
|
||||||
|
.name = "dma1",
|
||||||
|
.start = 0x0000,
|
||||||
|
.end = 0x001f,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "pic1",
|
||||||
|
.start = 0x0020,
|
||||||
|
.end = 0x0021,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "timer0",
|
||||||
|
.start = 0x0040,
|
||||||
|
.end = 0x0043,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "timer1",
|
||||||
|
.start = 0x0050,
|
||||||
|
.end = 0x0053,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "keyboard",
|
||||||
|
.start = 0x0060,
|
||||||
|
.end = 0x006f,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "dma page reg",
|
||||||
|
.start = 0x0080,
|
||||||
|
.end = 0x008f,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "pic2",
|
||||||
|
.start = 0x00a0,
|
||||||
|
.end = 0x00a1,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "dma2",
|
||||||
|
.start = 0x00c0,
|
||||||
|
.end = 0x00df,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
}, {
|
||||||
|
.name = "fpu",
|
||||||
|
.start = 0x00f0,
|
||||||
|
.end = 0x00ff,
|
||||||
|
.flags = IORESOURCE_BUSY | IORESOURCE_IO
|
||||||
|
} };
|
||||||
|
|
||||||
/* cpu data as detected by the assembly code in head.S */
|
/* cpu data as detected by the assembly code in head.S */
|
||||||
struct cpuinfo_x86 new_cpu_data __cpuinitdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
|
struct cpuinfo_x86 new_cpu_data __cpuinitdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
|
||||||
|
@ -693,3 +764,32 @@ void __init setup_arch(char **cmdline_p)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Request address space for all standard resources
|
||||||
|
*
|
||||||
|
* This is called just before pcibios_init(), which is also a
|
||||||
|
* subsys_initcall, but is linked in later (in arch/i386/pci/common.c).
|
||||||
|
*/
|
||||||
|
static int __init request_standard_resources(void)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
printk(KERN_INFO "Setting up standard PCI resources\n");
|
||||||
|
if (efi_enabled)
|
||||||
|
efi_initialize_iomem_resources(&code_resource,
|
||||||
|
&data_resource, &bss_resource);
|
||||||
|
else
|
||||||
|
legacy_init_iomem_resources(&code_resource,
|
||||||
|
&data_resource, &bss_resource);
|
||||||
|
|
||||||
|
/* EFI systems may still have VGA */
|
||||||
|
request_resource(&iomem_resource, &video_ram_resource);
|
||||||
|
|
||||||
|
/* request I/O space for devices used on all i[345]86 PCs */
|
||||||
|
for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)
|
||||||
|
request_resource(&ioport_resource, &standard_io_resources[i]);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
subsys_initcall(request_standard_resources);
|
||||||
|
|
|
@ -123,19 +123,19 @@ struct resource standard_io_resources[] = {
|
||||||
|
|
||||||
#define IORESOURCE_RAM (IORESOURCE_BUSY | IORESOURCE_MEM)
|
#define IORESOURCE_RAM (IORESOURCE_BUSY | IORESOURCE_MEM)
|
||||||
|
|
||||||
struct resource data_resource = {
|
static struct resource data_resource = {
|
||||||
.name = "Kernel data",
|
.name = "Kernel data",
|
||||||
.start = 0,
|
.start = 0,
|
||||||
.end = 0,
|
.end = 0,
|
||||||
.flags = IORESOURCE_RAM,
|
.flags = IORESOURCE_RAM,
|
||||||
};
|
};
|
||||||
struct resource code_resource = {
|
static struct resource code_resource = {
|
||||||
.name = "Kernel code",
|
.name = "Kernel code",
|
||||||
.start = 0,
|
.start = 0,
|
||||||
.end = 0,
|
.end = 0,
|
||||||
.flags = IORESOURCE_RAM,
|
.flags = IORESOURCE_RAM,
|
||||||
};
|
};
|
||||||
struct resource bss_resource = {
|
static struct resource bss_resource = {
|
||||||
.name = "Kernel bss",
|
.name = "Kernel bss",
|
||||||
.start = 0,
|
.start = 0,
|
||||||
.end = 0,
|
.end = 0,
|
||||||
|
@ -438,7 +438,7 @@ void __init setup_arch(char **cmdline_p)
|
||||||
/*
|
/*
|
||||||
* We trust e820 completely. No explicit ROM probing in memory.
|
* We trust e820 completely. No explicit ROM probing in memory.
|
||||||
*/
|
*/
|
||||||
e820_reserve_resources();
|
e820_reserve_resources(&code_resource, &data_resource, &bss_resource);
|
||||||
e820_mark_nosave_regions();
|
e820_mark_nosave_regions();
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,6 +12,8 @@
|
||||||
#ifndef __E820_HEADER
|
#ifndef __E820_HEADER
|
||||||
#define __E820_HEADER
|
#define __E820_HEADER
|
||||||
|
|
||||||
|
#include <linux/ioport.h>
|
||||||
|
|
||||||
#define HIGH_MEMORY (1024*1024)
|
#define HIGH_MEMORY (1024*1024)
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
@ -26,6 +28,9 @@ extern void register_bootmem_low_pages(unsigned long max_low_pfn);
|
||||||
extern void e820_register_memory(void);
|
extern void e820_register_memory(void);
|
||||||
extern void limit_regions(unsigned long long size);
|
extern void limit_regions(unsigned long long size);
|
||||||
extern void print_memory_map(char *who);
|
extern void print_memory_map(char *who);
|
||||||
|
extern void legacy_init_iomem_resources(struct resource *code_resource,
|
||||||
|
struct resource *data_resource,
|
||||||
|
struct resource *bss_resource);
|
||||||
|
|
||||||
#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
|
#if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION)
|
||||||
extern void e820_mark_nosave_regions(void);
|
extern void e820_mark_nosave_regions(void);
|
||||||
|
@ -35,5 +40,6 @@ static inline void e820_mark_nosave_regions(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#endif/*!__ASSEMBLY__*/
|
#endif/*!__ASSEMBLY__*/
|
||||||
#endif/*__E820_HEADER*/
|
#endif/*__E820_HEADER*/
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
#ifndef __E820_HEADER
|
#ifndef __E820_HEADER
|
||||||
#define __E820_HEADER
|
#define __E820_HEADER
|
||||||
|
|
||||||
|
#include <linux/ioport.h>
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
extern unsigned long find_e820_area(unsigned long start, unsigned long end,
|
extern unsigned long find_e820_area(unsigned long start, unsigned long end,
|
||||||
unsigned size);
|
unsigned size);
|
||||||
|
@ -19,7 +21,8 @@ extern void add_memory_region(unsigned long start, unsigned long size,
|
||||||
extern void setup_memory_region(void);
|
extern void setup_memory_region(void);
|
||||||
extern void contig_e820_setup(void);
|
extern void contig_e820_setup(void);
|
||||||
extern unsigned long e820_end_of_ram(void);
|
extern unsigned long e820_end_of_ram(void);
|
||||||
extern void e820_reserve_resources(void);
|
extern void e820_reserve_resources(struct resource *code_resource,
|
||||||
|
struct resource *data_resource, struct resource *bss_resource);
|
||||||
extern void e820_mark_nosave_regions(void);
|
extern void e820_mark_nosave_regions(void);
|
||||||
extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
|
extern int e820_any_mapped(unsigned long start, unsigned long end, unsigned type);
|
||||||
extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
|
extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type);
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#ifndef _LINUX_IOPORT_H
|
#ifndef _LINUX_IOPORT_H
|
||||||
#define _LINUX_IOPORT_H
|
#define _LINUX_IOPORT_H
|
||||||
|
|
||||||
|
#ifndef __ASSEMBLY__
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
/*
|
/*
|
||||||
|
@ -153,4 +154,5 @@ extern struct resource * __devm_request_region(struct device *dev,
|
||||||
extern void __devm_release_region(struct device *dev, struct resource *parent,
|
extern void __devm_release_region(struct device *dev, struct resource *parent,
|
||||||
resource_size_t start, resource_size_t n);
|
resource_size_t start, resource_size_t n);
|
||||||
|
|
||||||
|
#endif /* __ASSEMBLY__ */
|
||||||
#endif /* _LINUX_IOPORT_H */
|
#endif /* _LINUX_IOPORT_H */
|
||||||
|
|
Loading…
Reference in a new issue