299a180aec
Update numaq such that it calls numa_add_memblk() and sets numa_nodes_parsed instead of directly diddling with NUMA states. The original get_memcfg_numaq() is renamed to numaq_numa_init() and new get_memcfg_numaq() is created in numa_32.c. The shim numa_add_memblk() implementation handles node_start/end_pfn[] and node_set_online() for nodes with memory. The new get_memcfg_numaq() exactly the same with get_memcfg_from_srat() other than calling the numaq init function. Things get_memcfgs_numaq() do are not strictly necessary for numaq but added for consistency and to help unifying NUMA init handling. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com>
171 lines
6.1 KiB
C
171 lines
6.1 KiB
C
/*
|
|
* Written by: Patricia Gaughen, IBM Corporation
|
|
*
|
|
* Copyright (C) 2002, IBM Corp.
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
* Send feedback to <gone@us.ibm.com>
|
|
*/
|
|
|
|
#ifndef _ASM_X86_NUMAQ_H
|
|
#define _ASM_X86_NUMAQ_H
|
|
|
|
#ifdef CONFIG_X86_NUMAQ
|
|
|
|
extern int found_numaq;
|
|
extern int numaq_numa_init(void);
|
|
extern int pci_numaq_init(void);
|
|
|
|
extern void *xquad_portio;
|
|
|
|
#define XQUAD_PORTIO_BASE 0xfe400000
|
|
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
|
|
#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
|
|
|
|
/*
|
|
* SYS_CFG_DATA_PRIV_ADDR, struct eachquadmem, and struct sys_cfg_data are the
|
|
*/
|
|
#define SYS_CFG_DATA_PRIV_ADDR 0x0009d000 /* place for scd in private
|
|
quad space */
|
|
|
|
/*
|
|
* Communication area for each processor on lynxer-processor tests.
|
|
*
|
|
* NOTE: If you change the size of this eachproc structure you need
|
|
* to change the definition for EACH_QUAD_SIZE.
|
|
*/
|
|
struct eachquadmem {
|
|
unsigned int priv_mem_start; /* Starting address of this */
|
|
/* quad's private memory. */
|
|
/* This is always 0. */
|
|
/* In MB. */
|
|
unsigned int priv_mem_size; /* Size of this quad's */
|
|
/* private memory. */
|
|
/* In MB. */
|
|
unsigned int low_shrd_mem_strp_start;/* Starting address of this */
|
|
/* quad's low shared block */
|
|
/* (untranslated). */
|
|
/* In MB. */
|
|
unsigned int low_shrd_mem_start; /* Starting address of this */
|
|
/* quad's low shared memory */
|
|
/* (untranslated). */
|
|
/* In MB. */
|
|
unsigned int low_shrd_mem_size; /* Size of this quad's low */
|
|
/* shared memory. */
|
|
/* In MB. */
|
|
unsigned int lmmio_copb_start; /* Starting address of this */
|
|
/* quad's local memory */
|
|
/* mapped I/O in the */
|
|
/* compatibility OPB. */
|
|
/* In MB. */
|
|
unsigned int lmmio_copb_size; /* Size of this quad's local */
|
|
/* memory mapped I/O in the */
|
|
/* compatibility OPB. */
|
|
/* In MB. */
|
|
unsigned int lmmio_nopb_start; /* Starting address of this */
|
|
/* quad's local memory */
|
|
/* mapped I/O in the */
|
|
/* non-compatibility OPB. */
|
|
/* In MB. */
|
|
unsigned int lmmio_nopb_size; /* Size of this quad's local */
|
|
/* memory mapped I/O in the */
|
|
/* non-compatibility OPB. */
|
|
/* In MB. */
|
|
unsigned int io_apic_0_start; /* Starting address of I/O */
|
|
/* APIC 0. */
|
|
unsigned int io_apic_0_sz; /* Size I/O APIC 0. */
|
|
unsigned int io_apic_1_start; /* Starting address of I/O */
|
|
/* APIC 1. */
|
|
unsigned int io_apic_1_sz; /* Size I/O APIC 1. */
|
|
unsigned int hi_shrd_mem_start; /* Starting address of this */
|
|
/* quad's high shared memory.*/
|
|
/* In MB. */
|
|
unsigned int hi_shrd_mem_size; /* Size of this quad's high */
|
|
/* shared memory. */
|
|
/* In MB. */
|
|
unsigned int mps_table_addr; /* Address of this quad's */
|
|
/* MPS tables from BIOS, */
|
|
/* in system space.*/
|
|
unsigned int lcl_MDC_pio_addr; /* Port-I/O address for */
|
|
/* local access of MDC. */
|
|
unsigned int rmt_MDC_mmpio_addr; /* MM-Port-I/O address for */
|
|
/* remote access of MDC. */
|
|
unsigned int mm_port_io_start; /* Starting address of this */
|
|
/* quad's memory mapped Port */
|
|
/* I/O space. */
|
|
unsigned int mm_port_io_size; /* Size of this quad's memory*/
|
|
/* mapped Port I/O space. */
|
|
unsigned int mm_rmt_io_apic_start; /* Starting address of this */
|
|
/* quad's memory mapped */
|
|
/* remote I/O APIC space. */
|
|
unsigned int mm_rmt_io_apic_size; /* Size of this quad's memory*/
|
|
/* mapped remote I/O APIC */
|
|
/* space. */
|
|
unsigned int mm_isa_start; /* Starting address of this */
|
|
/* quad's memory mapped ISA */
|
|
/* space (contains MDC */
|
|
/* memory space). */
|
|
unsigned int mm_isa_size; /* Size of this quad's memory*/
|
|
/* mapped ISA space (contains*/
|
|
/* MDC memory space). */
|
|
unsigned int rmt_qmi_addr; /* Remote addr to access QMI.*/
|
|
unsigned int lcl_qmi_addr; /* Local addr to access QMI. */
|
|
};
|
|
|
|
/*
|
|
* Note: This structure must be NOT be changed unless the multiproc and
|
|
* OS are changed to reflect the new structure.
|
|
*/
|
|
struct sys_cfg_data {
|
|
unsigned int quad_id;
|
|
unsigned int bsp_proc_id; /* Boot Strap Processor in this quad. */
|
|
unsigned int scd_version; /* Version number of this table. */
|
|
unsigned int first_quad_id;
|
|
unsigned int quads_present31_0; /* 1 bit for each quad */
|
|
unsigned int quads_present63_32; /* 1 bit for each quad */
|
|
unsigned int config_flags;
|
|
unsigned int boot_flags;
|
|
unsigned int csr_start_addr; /* Absolute value (not in MB) */
|
|
unsigned int csr_size; /* Absolute value (not in MB) */
|
|
unsigned int lcl_apic_start_addr; /* Absolute value (not in MB) */
|
|
unsigned int lcl_apic_size; /* Absolute value (not in MB) */
|
|
unsigned int low_shrd_mem_base; /* 0 or 512MB or 1GB */
|
|
unsigned int low_shrd_mem_quad_offset; /* 0,128M,256M,512M,1G */
|
|
/* may not be totally populated */
|
|
unsigned int split_mem_enbl; /* 0 for no low shared memory */
|
|
unsigned int mmio_sz; /* Size of total system memory mapped I/O */
|
|
/* (in MB). */
|
|
unsigned int quad_spin_lock; /* Spare location used for quad */
|
|
/* bringup. */
|
|
unsigned int nonzero55; /* For checksumming. */
|
|
unsigned int nonzeroaa; /* For checksumming. */
|
|
unsigned int scd_magic_number;
|
|
unsigned int system_type;
|
|
unsigned int checksum;
|
|
/*
|
|
* memory configuration area for each quad
|
|
*/
|
|
struct eachquadmem eq[MAX_NUMNODES]; /* indexed by quad id */
|
|
};
|
|
|
|
void numaq_tsc_disable(void);
|
|
|
|
#endif /* CONFIG_X86_NUMAQ */
|
|
#endif /* _ASM_X86_NUMAQ_H */
|
|
|