Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ef81297 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

x86: lindent mpparse_32.c 



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 31d2092e

arch/x86/kernel/mpparse_32.c

+214 −206
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ int pic_mode; 
 * Intel MP BIOS table parsing routines:

 */





/*

 * Checksum an MP configuration block.

 */
@@ -76,7 +75,8 @@ static int __init mpf_checksum(unsigned char *mp, int len) 
 */



static int mpc_record;

static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __cpuinitdata;

static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY]

    __cpuinitdata;

#endif



static void __cpuinit MP_processor_info(struct mpc_config_processor *m)
@@ -87,15 +87,13 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m) 
		disabled_cpus++;

		return;

	}



#ifdef CONFIG_X86_NUMAQ

	apicid = mpc_apic_id(m, translation_table[mpc_record]);

#else

	Dprintk("Processor #%d %u:%u APIC version %d\n",

		m->mpc_apicid,

		(m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,

		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,

		m->mpc_apicver);

		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, m->mpc_apicver);

	apicid = m->mpc_apicid;

#endif
@@ -146,7 +144,6 @@ static void __cpuinit MP_processor_info(struct mpc_config_processor *m) 
		Dprintk("    Thermal Monitor present.\n");

	/* 30, 31 Reserved */





	if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) {

		Dprintk("    Bootup CPU\n");

		boot_cpu_physical_apicid = m->mpc_apicid;
@@ -257,7 +254,10 @@ static void __init MP_lintsrc_info (struct mpc_config_lintsrc *m) 
#ifdef CONFIG_X86_NUMAQ

static void __init MP_translation_info(struct mpc_config_translation *m)

{

	printk(KERN_INFO "Translation: record %d, type %d, quad %d, global %d, local %d\n", mpc_record, m->trans_type, m->trans_quad, m->trans_global, m->trans_local);

	printk(KERN_INFO

	       "Translation: record %d, type %d, quad %d, global %d, local %d\n",

	       mpc_record, m->trans_type, m->trans_quad, m->trans_global,

	       m->trans_local);



	if (mpc_record >= MAX_MPC_ENTRY)

		printk(KERN_ERR "MAX_MPC_ENTRY exceeded!\n");
@@ -271,25 +271,23 @@ static void __init MP_translation_info (struct mpc_config_translation *m) 
 * Read/parse the MPC oem tables

 */



static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable, \

static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable,

				    unsigned short oemsize)

{

	int count = sizeof(*oemtable);	/* the header size */

	unsigned char *oemptr = ((unsigned char *)oemtable) + count;



	mpc_record = 0;

	printk(KERN_INFO "Found an OEM MPC table at %8p - parsing it ... \n", oemtable);

	if (memcmp(oemtable->oem_signature,MPC_OEM_SIGNATURE,4))

	{

		printk(KERN_WARNING "SMP mpc oemtable: bad signature [%c%c%c%c]!\n",

			oemtable->oem_signature[0],

			oemtable->oem_signature[1],

			oemtable->oem_signature[2],

			oemtable->oem_signature[3]);

	printk(KERN_INFO "Found an OEM MPC table at %8p - parsing it ... \n",

	       oemtable);

	if (memcmp(oemtable->oem_signature, MPC_OEM_SIGNATURE, 4)) {

		printk(KERN_WARNING

		       "SMP mpc oemtable: bad signature [%c%c%c%c]!\n",

		       oemtable->oem_signature[0], oemtable->oem_signature[1],

		       oemtable->oem_signature[2], oemtable->oem_signature[3]);

		return;

	}

	if (mpf_checksum((unsigned char *)oemtable,oemtable->oem_length))

	{

	if (mpf_checksum((unsigned char *)oemtable, oemtable->oem_length)) {

		printk(KERN_WARNING "SMP oem mptable: checksum error!\n");

		return;

	}
@@ -307,7 +305,9 @@ static void __init smp_read_mpc_oem(struct mp_config_oemtable *oemtable, \ 
			}

		default:

			{

				printk(KERN_WARNING "Unrecognised OEM table entry type! - %d\n", (int) *oemptr);

				printk(KERN_WARNING

				       "Unrecognised OEM table entry type! - %d\n",

				       (int)*oemptr);

				return;

			}

		}
@@ -481,12 +481,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_WARNING "ELCR contains invalid data... not using ELCR\n");

		if (ELCR_trigger(0) || ELCR_trigger(1) || ELCR_trigger(2)

		    || ELCR_trigger(13))

			printk(KERN_WARNING

			       "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;

		}

	}
@@ -551,8 +555,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) 
	processor.mpc_apicver = mpc_default_type > 4 ? 0x10 : 0x01;

	processor.mpc_cpuflag = CPU_ENABLED;

	processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) |

				   (boot_cpu_data.x86_model << 4) |

				   boot_cpu_data.x86_mask;

	    (boot_cpu_data.x86_model << 4) | boot_cpu_data.x86_mask;

	processor.mpc_featureflag = boot_cpu_data.x86_capability[0];

	processor.mpc_reserved[0] = 0;

	processor.mpc_reserved[1] = 0;
@@ -628,13 +631,15 @@ void __init get_smp_config (void) 
	 * processors, where MPS only supports physical.

	 */

	if (acpi_lapic && acpi_ioapic) {

		printk(KERN_INFO "Using ACPI (MADT) for SMP configuration information\n");

		printk(KERN_INFO

		       "Using ACPI (MADT) for SMP configuration information\n");

		return;

	}

	else if (acpi_lapic)

		printk(KERN_INFO "Using ACPI for processor (LAPIC) configuration information\n");

	} else if (acpi_lapic)

		printk(KERN_INFO

		       "Using ACPI for processor (LAPIC) configuration information\n");



	printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n", mpf->mpf_specification);

	printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",

	       mpf->mpf_specification);

	if (mpf->mpf_feature2 & (1 << 7)) {

		printk(KERN_INFO "    IMCR and PIC compatibility mode.\n");

		pic_mode = 1;
@@ -648,7 +653,8 @@ void __init get_smp_config (void) 
	 */

	if (mpf->mpf_feature1 != 0) {



		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) {
@@ -659,8 +665,10 @@ void __init get_smp_config (void) 
		 */

		if (!smp_read_mpc(phys_to_virt(mpf->mpf_physptr))) {

			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;

		}
@@ -673,7 +681,8 @@ void __init get_smp_config (void) 
		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;
@@ -847,14 +856,12 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) 
	       "GSI %d-%d\n", idx, mp_ioapics[idx].mpc_apicid,

	       mp_ioapics[idx].mpc_apicver,

	       mp_ioapics[idx].mpc_apicaddr,

	       mp_ioapic_routing[idx].gsi_base,

	       mp_ioapic_routing[idx].gsi_end);

	       mp_ioapic_routing[idx].gsi_base, mp_ioapic_routing[idx].gsi_end);



	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;
@@ -941,7 +948,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 */