mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
x86/numachip: Cleanup Numachip support
Drop unused code and includes in Numachip header files and APIC driver. Additionally, use the 'numachip1' prefix on Numachip1-specific functions; this prepares for adding Numachip2 support in later patches. Signed-off-by: Daniel J Blueman <daniel@numascale.com> Acked-by: Steffen Persvold <sp@numascale.com> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Link: http://lkml.kernel.org/r/1442768522-19217-1-git-send-email-daniel@numascale.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Daniel J Blueman
Thomas Gleixner
parent
1f93e4a96c
commit
db1003a719
2 changed files with 44 additions and 178 deletions
|
|
@ -11,30 +11,20 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/errno.h>
|
||||
#include <linux/threads.h>
|
||||
#include <linux/cpumask.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/hardirq.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
#include <asm/numachip/numachip.h>
|
||||
#include <asm/numachip/numachip_csr.h>
|
||||
#include <asm/smp.h>
|
||||
#include <asm/apic.h>
|
||||
#include <asm/ipi.h>
|
||||
#include <asm/apic_flat_64.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/pci_x86.h>
|
||||
|
||||
static int numachip_system __read_mostly;
|
||||
u8 numachip_system __read_mostly;
|
||||
static const struct apic apic_numachip1;
|
||||
static void (*numachip_apic_icr_write)(int apicid, unsigned int val) __read_mostly;
|
||||
|
||||
static const struct apic apic_numachip;
|
||||
|
||||
static unsigned int get_apic_id(unsigned long x)
|
||||
static unsigned int numachip1_get_apic_id(unsigned long x)
|
||||
{
|
||||
unsigned long value;
|
||||
unsigned int id = (x >> 24) & 0xff;
|
||||
|
|
@ -47,7 +37,7 @@ static unsigned int get_apic_id(unsigned long x)
|
|||
return id;
|
||||
}
|
||||
|
||||
static unsigned long set_apic_id(unsigned int id)
|
||||
static unsigned long numachip1_set_apic_id(unsigned int id)
|
||||
{
|
||||
unsigned long x;
|
||||
|
||||
|
|
@ -55,11 +45,6 @@ static unsigned long set_apic_id(unsigned int id)
|
|||
return x;
|
||||
}
|
||||
|
||||
static unsigned int read_xapic_id(void)
|
||||
{
|
||||
return get_apic_id(apic_read(APIC_ID));
|
||||
}
|
||||
|
||||
static int numachip_apic_id_valid(int apicid)
|
||||
{
|
||||
/* Trust what bootloader passes in MADT */
|
||||
|
|
@ -68,7 +53,7 @@ static int numachip_apic_id_valid(int apicid)
|
|||
|
||||
static int numachip_apic_id_registered(void)
|
||||
{
|
||||
return physid_isset(read_xapic_id(), phys_cpu_present_map);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
|
||||
|
|
@ -76,36 +61,27 @@ static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
|
|||
return initial_apic_id >> index_msb;
|
||||
}
|
||||
|
||||
static void numachip1_apic_icr_write(int apicid, unsigned int val)
|
||||
{
|
||||
write_lcsr(CSR_G3_EXT_IRQ_GEN, (apicid << 16) | val);
|
||||
}
|
||||
|
||||
static int numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)
|
||||
{
|
||||
union numachip_csr_g3_ext_irq_gen int_gen;
|
||||
|
||||
int_gen.s._destination_apic_id = phys_apicid;
|
||||
int_gen.s._vector = 0;
|
||||
int_gen.s._msgtype = APIC_DM_INIT >> 8;
|
||||
int_gen.s._index = 0;
|
||||
|
||||
write_lcsr(CSR_G3_EXT_IRQ_GEN, int_gen.v);
|
||||
|
||||
int_gen.s._msgtype = APIC_DM_STARTUP >> 8;
|
||||
int_gen.s._vector = start_rip >> 12;
|
||||
|
||||
write_lcsr(CSR_G3_EXT_IRQ_GEN, int_gen.v);
|
||||
numachip_apic_icr_write(phys_apicid, APIC_DM_INIT);
|
||||
numachip_apic_icr_write(phys_apicid, APIC_DM_STARTUP |
|
||||
(start_rip >> 12));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void numachip_send_IPI_one(int cpu, int vector)
|
||||
{
|
||||
union numachip_csr_g3_ext_irq_gen int_gen;
|
||||
int apicid = per_cpu(x86_cpu_to_apicid, cpu);
|
||||
unsigned int dmode;
|
||||
|
||||
int_gen.s._destination_apic_id = apicid;
|
||||
int_gen.s._vector = vector;
|
||||
int_gen.s._msgtype = (vector == NMI_VECTOR ? APIC_DM_NMI : APIC_DM_FIXED) >> 8;
|
||||
int_gen.s._index = 0;
|
||||
|
||||
write_lcsr(CSR_G3_EXT_IRQ_GEN, int_gen.v);
|
||||
dmode = (vector == NMI_VECTOR) ? APIC_DM_NMI : APIC_DM_FIXED;
|
||||
numachip_apic_icr_write(apicid, dmode | vector);
|
||||
}
|
||||
|
||||
static void numachip_send_IPI_mask(const struct cpumask *mask, int vector)
|
||||
|
|
@ -149,9 +125,9 @@ static void numachip_send_IPI_self(int vector)
|
|||
apic_write(APIC_SELF_IPI, vector);
|
||||
}
|
||||
|
||||
static int __init numachip_probe(void)
|
||||
static int __init numachip1_probe(void)
|
||||
{
|
||||
return apic == &apic_numachip;
|
||||
return apic == &apic_numachip1;
|
||||
}
|
||||
|
||||
static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
|
||||
|
|
@ -172,34 +148,38 @@ static void fixup_cpu_id(struct cpuinfo_x86 *c, int node)
|
|||
|
||||
static int __init numachip_system_init(void)
|
||||
{
|
||||
if (!numachip_system)
|
||||
/* Map the LCSR area and set up the apic_icr_write function */
|
||||
switch (numachip_system) {
|
||||
case 1:
|
||||
init_extra_mapping_uc(NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_SIZE);
|
||||
numachip_apic_icr_write = numachip1_apic_icr_write;
|
||||
x86_init.pci.arch_init = pci_numachip_init;
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
|
||||
init_extra_mapping_uc(NUMACHIP_LCSR_BASE, NUMACHIP_LCSR_SIZE);
|
||||
init_extra_mapping_uc(NUMACHIP_GCSR_BASE, NUMACHIP_GCSR_SIZE);
|
||||
}
|
||||
|
||||
x86_cpuinit.fixup_cpu_id = fixup_cpu_id;
|
||||
x86_init.pci.arch_init = pci_numachip_init;
|
||||
|
||||
return 0;
|
||||
}
|
||||
early_initcall(numachip_system_init);
|
||||
|
||||
static int numachip_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
|
||||
static int numachip1_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
|
||||
{
|
||||
if (!strncmp(oem_id, "NUMASC", 6)) {
|
||||
numachip_system = 1;
|
||||
return 1;
|
||||
}
|
||||
if ((strncmp(oem_id, "NUMASC", 6) != 0) ||
|
||||
(strncmp(oem_table_id, "NCONNECT", 8) != 0))
|
||||
return 0;
|
||||
|
||||
return 0;
|
||||
numachip_system = 1;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static const struct apic apic_numachip __refconst = {
|
||||
|
||||
static const struct apic apic_numachip1 __refconst = {
|
||||
.name = "NumaConnect system",
|
||||
.probe = numachip_probe,
|
||||
.acpi_madt_oem_check = numachip_acpi_madt_oem_check,
|
||||
.probe = numachip1_probe,
|
||||
.acpi_madt_oem_check = numachip1_acpi_madt_oem_check,
|
||||
.apic_id_valid = numachip_apic_id_valid,
|
||||
.apic_id_registered = numachip_apic_id_registered,
|
||||
|
||||
|
|
@ -221,8 +201,8 @@ static const struct apic apic_numachip __refconst = {
|
|||
.check_phys_apicid_present = default_check_phys_apicid_present,
|
||||
.phys_pkg_id = numachip_phys_pkg_id,
|
||||
|
||||
.get_apic_id = get_apic_id,
|
||||
.set_apic_id = set_apic_id,
|
||||
.get_apic_id = numachip1_get_apic_id,
|
||||
.set_apic_id = numachip1_set_apic_id,
|
||||
.apic_id_mask = 0xffU << 24,
|
||||
|
||||
.cpu_mask_to_apicid_and = default_cpu_mask_to_apicid_and,
|
||||
|
|
@ -244,5 +224,5 @@ static const struct apic apic_numachip __refconst = {
|
|||
.wait_icr_idle = native_apic_wait_icr_idle,
|
||||
.safe_wait_icr_idle = native_safe_apic_wait_icr_idle,
|
||||
};
|
||||
apic_driver(apic_numachip);
|
||||
|
||||
apic_driver(apic_numachip1);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue