Skip to content

L
linux
Commit d2953315 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files
Options

x86: lindent mpparse_64.c 

Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4cedb334
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 136 deletions
arch/x86/kernel/mpparse_64.c
View file @ d2953315
......@@ -41,7 +41,7 @@ unsigned int __cpuinitdata maxcpus = NR_CPUS;
* MP-table.
*/
DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
int mp_bus_id_to_pci_bus[MAX_MP_BUSSES] = {[0 ... MAX_MP_BUSSES - 1] = -1 };
static int mp_current_pci_id = 0;
/* I/O APIC entries */
......@@ -56,8 +56,6 @@ int mp_irq_entries;
int nr_ioapics;
unsigned long mp_lapic_addr = 0;
/* Processor that is doing the boot up */
unsigned int boot_cpu_physical_apicid = -1U;
EXPORT_SYMBOL(boot_cpu_physical_apicid);
......@@ -71,12 +69,11 @@ unsigned disabled_cpus __cpuinitdata;
physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata
= { [0 ... NR_CPUS-1] = BAD_APICID };
= {[0 ... NR_CPUS - 1] = BAD_APICID };
void *x86_bios_cpu_apicid_early_ptr;
DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;
EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);
/*
* Intel MP BIOS table parsing routines:
*/
......@@ -153,7 +150,7 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
cpu_set(cpu, cpu_present_map);
}
static void __init MP_bus_info (struct mpc_config_bus *m)
static void __init MP_bus_info(struct mpc_config_bus *m)
{
char str[7];
......@@ -187,13 +184,13 @@ static int bad_ioapic(unsigned long address)
return 0;
}
static void __init MP_ioapic_info (struct mpc_config_ioapic *m)
static void __init MP_ioapic_info(struct mpc_config_ioapic *m)
{
if (!(m->mpc_flags & MPC_APIC_USABLE))
return;
printk("I/O APIC #%d at 0x%X.\n",
m->mpc_apicid, m->mpc_apicaddr);
printk(KERN_INFO "I/O APIC #%d at 0x%X.\n", m->mpc_apicid,
m->mpc_apicaddr);
if (bad_ioapic(m->mpc_apicaddr))
return;
......@@ -202,9 +199,9 @@ static void __init MP_ioapic_info (struct mpc_config_ioapic *m)
nr_ioapics++;
}
static void __init MP_intsrc_info (struct mpc_config_intsrc *m)
static void __init MP_intsrc_info(struct mpc_config_intsrc *m)
{
mp_irqs [mp_irq_entries] = *m;
mp_irqs[mp_irq_entries] = *m;
Dprintk("Int: type %d, pol %d, trig %d, bus %d,"
" IRQ %02x, APIC ID %x, APIC INT %02x\n",
m->mpc_irqtype, m->mpc_irqflag & 3,
......@@ -214,12 +211,12 @@ static void __init MP_intsrc_info (struct mpc_config_intsrc *m)
panic("Max # of irq sources exceeded!!\n");
}
static void __init MP_lintsrc_info (struct mpc_config_lintsrc *m)
static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m)
{
Dprintk("Lint: type %d, pol %d, trig %d, bus %d,"
" IRQ %02x, APIC ID %x, APIC LINT %02x\n",
m->mpc_irqtype, m->mpc_irqflag & 3,
(m->mpc_irqflag >> 2) &3, m->mpc_srcbusid,
(m->mpc_irqflag >> 2) & 3, m->mpc_srcbusid,
m->mpc_srcbusirq, m->mpc_destapic, m->mpc_destapiclint);
}
......@@ -229,22 +226,21 @@ static void __init MP_lintsrc_info (struct mpc_config_lintsrc *m)
static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
{
char str[16];
int count=sizeof(*mpc);
unsigned char *mpt=((unsigned char *)mpc)+count;
int count = sizeof(*mpc);
unsigned char *mpt = ((unsigned char *)mpc) + count;
if (memcmp(mpc->mpc_signature,MPC_SIGNATURE,4)) {
printk("MPTABLE: bad signature [%c%c%c%c]!\n",
if (memcmp(mpc->mpc_signature, MPC_SIGNATURE, 4)) {
printk(KERN_ERR "MPTABLE: bad signature [%c%c%c%c]!\n",
mpc->mpc_signature[0],
mpc->mpc_signature[1],
mpc->mpc_signature[2],
mpc->mpc_signature[3]);
mpc->mpc_signature[2], mpc->mpc_signature[3]);
return 0;
}
if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) {
printk("MPTABLE: checksum error!\n");
if (mpf_checksum((unsigned char *)mpc, mpc->mpc_length)) {
printk(KERN_ERR "MPTABLE: checksum error!\n");
return 0;
}
if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) {
if (mpc->mpc_spec != 0x01 && mpc->mpc_spec != 0x04) {
printk(KERN_ERR "MPTABLE: bad table version (%d)!!\n",
mpc->mpc_spec);
return 0;
......@@ -253,15 +249,15 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
printk(KERN_ERR "MPTABLE: null local APIC address!\n");
return 0;
}
memcpy(str,mpc->mpc_oem,8);
memcpy(str, mpc->mpc_oem, 8);
str[8] = 0;
printk(KERN_INFO "MPTABLE: OEM ID: %s ",str);
printk(KERN_INFO "MPTABLE: OEM ID: %s ", str);
memcpy(str,mpc->mpc_productid,12);
memcpy(str, mpc->mpc_productid, 12);
str[12] = 0;
printk("MPTABLE: Product ID: %s ",str);
printk(KERN_INFO "MPTABLE: Product ID: %s ", str);
printk("MPTABLE: APIC at: 0x%X\n",mpc->mpc_lapic);
printk(KERN_INFO "MPTABLE: APIC at: 0x%X\n", mpc->mpc_lapic);
/* save the local APIC address, it might be non-default */
if (!acpi_lapic)
......@@ -274,10 +270,10 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
* Now process the configuration blocks.
*/
while (count < mpc->mpc_length) {
switch(*mpt) {
switch (*mpt) {
case MP_PROCESSOR:
{
struct mpc_config_processor *m=
struct mpc_config_processor *m =
(struct mpc_config_processor *)mpt;
if (!acpi_lapic)
MP_processor_info(m);
......@@ -287,7 +283,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
}
case MP_BUS:
{
struct mpc_config_bus *m=
struct mpc_config_bus *m =
(struct mpc_config_bus *)mpt;
MP_bus_info(m);
mpt += sizeof(*m);
......@@ -296,7 +292,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
}
case MP_IOAPIC:
{
struct mpc_config_ioapic *m=
struct mpc_config_ioapic *m =
(struct mpc_config_ioapic *)mpt;
MP_ioapic_info(m);
mpt += sizeof(*m);
......@@ -305,7 +301,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
}
case MP_INTSRC:
{
struct mpc_config_intsrc *m=
struct mpc_config_intsrc *m =
(struct mpc_config_intsrc *)mpt;
MP_intsrc_info(m);
......@@ -315,7 +311,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
}
case MP_LINTSRC:
{
struct mpc_config_lintsrc *m=
struct mpc_config_lintsrc *m =
(struct mpc_config_lintsrc *)mpt;
MP_lintsrc_info(m);
mpt += sizeof(*m);
......@@ -360,12 +356,16 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
* If it does, we assume it's valid.
*/
if (mpc_default_type == 5) {
printk(KERN_INFO "ISA/PCI bus type with no IRQ information... falling back to ELCR\n");
printk(KERN_INFO "ISA/PCI bus type with no IRQ information... "
"falling back to ELCR\n");
if (ELCR_trigger(0) || ELCR_trigger(1) || ELCR_trigger(2) || ELCR_trigger(13))
printk(KERN_ERR "ELCR contains invalid data... not using ELCR\n");
if (ELCR_trigger(0) || ELCR_trigger(1) || ELCR_trigger(2) ||
ELCR_trigger(13))
printk(KERN_ERR "ELCR contains invalid data... "
"not using ELCR\n");
else {
printk(KERN_INFO "Using ELCR to identify PCI interrupts\n");
printk(KERN_INFO
"Using ELCR to identify PCI interrupts\n");
ELCR_fallback = 1;
}
}
......@@ -514,7 +514,8 @@ static void __init __get_smp_config(unsigned early)
return;
}
printk(KERN_INFO "Default MP configuration #%d\n", mpf->mpf_feature1);
printk(KERN_INFO "Default MP configuration #%d\n",
mpf->mpf_feature1);
construct_default_ISA_mptable(mpf->mpf_feature1);
} else if (mpf->mpf_physptr) {
......@@ -525,8 +526,10 @@ static void __init __get_smp_config(unsigned early)
*/
if (!smp_read_mpc(phys_to_virt(mpf->mpf_physptr), early)) {
smp_found_config = 0;
printk(KERN_ERR "BIOS bug, MP table errors detected!...\n");
printk(KERN_ERR "... disabling SMP support. (tell your hw vendor)\n");
printk(KERN_ERR
"BIOS bug, MP table errors detected!...\n");
printk(KERN_ERR "... disabling SMP support. "
"(tell your hw vendor)\n");
return;
}
......@@ -540,7 +543,9 @@ static void __init __get_smp_config(unsigned early)
if (!mp_irq_entries) {
struct mpc_config_bus bus;
printk(KERN_ERR "BIOS bug, no explicit IRQ entries, using default mptable. (tell your hw vendor)\n");
printk(KERN_ERR "BIOS bug, no explicit IRQ entries, "
"using default mptable. "
"(tell your hw vendor)\n");
bus.mpc_type = MP_BUS;
bus.mpc_busid = 0;
......@@ -577,7 +582,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
unsigned int *bp = phys_to_virt(base);
struct intel_mp_floating *mpf;
Dprintk("Scan SMP from %p for %ld bytes.\n", bp,length);
Dprintk("Scan SMP from %p for %ld bytes.\n", bp, length);
if (sizeof(*mpf) != 16)
__bad_mpf_size();
......@@ -587,7 +592,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
(mpf->mpf_length == 1) &&
!mpf_checksum((unsigned char *)bp, 16) &&
((mpf->mpf_specification == 1)
|| (mpf->mpf_specification == 4)) ) {
|| (mpf->mpf_specification == 4))) {
smp_found_config = 1;
mpf_found = mpf;
......@@ -620,7 +625,7 @@ static void __init __find_smp_config(unsigned reserve)
* 3) Scan the 64K of bios
*/
if (smp_scan_config(0x0, 0x400, reserve) ||
smp_scan_config(639*0x400, 0x400, reserve) ||
smp_scan_config(639 * 0x400, 0x400, reserve) ||
smp_scan_config(0xF0000, 0x10000, reserve))
return;
/*
......@@ -663,13 +668,13 @@ void __init find_smp_config(void)
void __init mp_register_lapic_address(u64 address)
{
mp_lapic_addr = (unsigned long) address;
mp_lapic_addr = (unsigned long)address;
set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
if (boot_cpu_physical_apicid == -1U)
boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID));
}
void __cpuinit mp_register_lapic (u8 id, u8 enabled)
void __cpuinit mp_register_lapic(u8 id, u8 enabled)
{
struct mpc_config_processor processor;
int boot_cpu = 0;
......@@ -764,8 +769,7 @@ void __init mp_register_ioapic(u8 id, u32 address, u32 gsi_base)
nr_ioapics++;
}
void __init
mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
{
struct mpc_config_intsrc intsrc;
int ioapic = -1;
......@@ -839,7 +843,8 @@ void __init mp_config_acpi_legacy_irqs(void)
struct mpc_config_intsrc *irq = mp_irqs + idx;
/* Do we already have a mapping for this ISA IRQ? */
if (irq->mpc_srcbus == MP_ISA_BUS && irq->mpc_srcbusirq == i)
if (irq->mpc_srcbus == MP_ISA_BUS
&& irq->mpc_srcbusirq == i)
break;
/* Do we already have a mapping for this IOAPIC pin */
......@@ -903,17 +908,17 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity)
ioapic_pin);
return gsi;
}
if ((1<<bit) & mp_ioapic_routing[ioapic].pin_programmed[idx]) {
if ((1 << bit) & mp_ioapic_routing[ioapic].pin_programmed[idx]) {
Dprintk(KERN_DEBUG "Pin %d-%d already programmed\n",
mp_ioapic_routing[ioapic].apic_id, ioapic_pin);
return gsi;
}
mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1 << bit);
io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
return gsi;
}
#endif /*CONFIG_ACPI*/
#endif /* CONFIG_ACPI */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7