This is a note to let you know that I've just added the patch titled
Revert "x86/ioapic: Add register level checks to detect bogus io-apic
entries"
to the 3.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-x86-ioapic-add-register-level-checks-to-detect.patch
and it can be found in the queue-3.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From dd97ac4172cb1c7a4c848bc37302e11540732856 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <[email protected]>
Date: Tue, 10 Apr 2012 16:04:49 -0700
Subject: Revert "x86/ioapic: Add register level checks to detect bogus io-apic
entries"
This reverts commit c2ec63edaf48c90c3495eeb0b75bb05102fbf71a
[73d63d038ee9f769f5e5b46792d227fe20e442c5 upstream]
It causes problems, so needs to be reverted from 3.2-stable for now.
Reported-by: Konrad Rzeszutek Wilk <[email protected]>
Cc: Jon Dufresne <[email protected]>
Cc: Suresh Siddha <[email protected]>
Cc: <[email protected]>
Cc: Josh Boyer <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Teck Choon Giam <[email protected]>
Cc: Ben Guthro <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/x86/kernel/apic/io_apic.c | 40 ++++++++--------------------------------
1 file changed, 8 insertions(+), 32 deletions(-)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3927,36 +3927,18 @@ int mp_find_ioapic_pin(int ioapic, u32 g
static __init int bad_ioapic(unsigned long address)
{
if (nr_ioapics >= MAX_IO_APICS) {
- pr_warn("WARNING: Max # of I/O APICs (%d) exceeded (found %d),
skipping\n",
- MAX_IO_APICS, nr_ioapics);
+ printk(KERN_WARNING "WARNING: Max # of I/O APICs (%d) exceeded "
+ "(found %d), skipping\n", MAX_IO_APICS, nr_ioapics);
return 1;
}
if (!address) {
- pr_warn("WARNING: Bogus (zero) I/O APIC address found in table,
skipping!\n");
+ printk(KERN_WARNING "WARNING: Bogus (zero) I/O APIC address"
+ " found in table, skipping!\n");
return 1;
}
return 0;
}
-static __init int bad_ioapic_register(int idx)
-{
- union IO_APIC_reg_00 reg_00;
- union IO_APIC_reg_01 reg_01;
- union IO_APIC_reg_02 reg_02;
-
- reg_00.raw = io_apic_read(idx, 0);
- reg_01.raw = io_apic_read(idx, 1);
- reg_02.raw = io_apic_read(idx, 2);
-
- if (reg_00.raw == -1 && reg_01.raw == -1 && reg_02.raw == -1) {
- pr_warn("I/O APIC 0x%x registers return all ones, skipping!\n",
- mpc_ioapic_addr(idx));
- return 1;
- }
-
- return 0;
-}
-
void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
{
int idx = 0;
@@ -3973,12 +3955,6 @@ void __init mp_register_ioapic(int id, u
ioapics[idx].mp_config.apicaddr = address;
set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
-
- if (bad_ioapic_register(idx)) {
- clear_fixmap(FIX_IO_APIC_BASE_0 + idx);
- return;
- }
-
ioapics[idx].mp_config.apicid = io_apic_unique_id(id);
ioapics[idx].mp_config.apicver = io_apic_get_version(idx);
@@ -3999,10 +3975,10 @@ void __init mp_register_ioapic(int id, u
if (gsi_cfg->gsi_end >= gsi_top)
gsi_top = gsi_cfg->gsi_end + 1;
- pr_info("IOAPIC[%d]: apic_id %d, version %d, address 0x%x, GSI %d-%d\n",
- idx, mpc_ioapic_id(idx),
- mpc_ioapic_ver(idx), mpc_ioapic_addr(idx),
- gsi_cfg->gsi_base, gsi_cfg->gsi_end);
+ printk(KERN_INFO "IOAPIC[%d]: apic_id %d, version %d, address 0x%x, "
+ "GSI %d-%d\n", idx, mpc_ioapic_id(idx),
+ mpc_ioapic_ver(idx), mpc_ioapic_addr(idx),
+ gsi_cfg->gsi_base, gsi_cfg->gsi_end);
nr_ioapics++;
}
Patches currently in stable-queue which might be from
[email protected] are
queue-3.0/drm-i915-sanitize-bios-debugging-bits-from-pipeconf.patch
queue-3.0/x86-pci-use-host-bridge-_crs-info-on-msi-ms-7253.patch
queue-3.0/mmc-atmel-mci-correct-data-timeout-computation.patch
queue-3.0/drm-i915-quirk-away-broken-opregion-vbt.patch
queue-3.0/drm-i915-no-lvds-quirk-on-msi-dc500.patch
queue-3.0/tracing-fix-ftrace-stack-trace-entries.patch
queue-3.0/kgdbts-1-of-2-fix-single-step-awareness-to-work-correctly-with-smp.patch
queue-3.0/modpost-fix-modpost-license-checking-of-vmlinux.o.patch
queue-3.0/pnpacpi-fix-device-ref-leaking-in-acpi_pnp_match.patch
queue-3.0/rose_dev-fix-memcpy-bug-in-rose_set_mac_address.patch
queue-3.0/net-usb-cdc_eem-fix-mtu.patch
queue-3.0/drm-validate-requested-virtual-size-against-allocated-fb-size.patch
queue-3.0/acpi-do-cpufreq-clamping-for-throttling-per-package-v2.patch
queue-3.0/mtd-lart-initialize-writebufsize.patch
queue-3.0/kgdbts-fix-kernel-oops-with-config_debug_rodata.patch
queue-3.0/mac80211-fix-possible-tid_rx-reorder_timer-use-after-free.patch
queue-3.0/acer-wmi-no-wifi-rfkill-on-sony-machines.patch
queue-3.0/x86-kgdb-fix-debug_rodata-limitation-using-text_poke.patch
queue-3.0/sysctl-fix-write-access-to-dmesg_restrict-kptr_restrict.patch
queue-3.0/genirq-adjust-irq-thread-affinity-on-irq_set_mask_ok_nocopy-return-value.patch
queue-3.0/m68k-mac-add-missing-platform-check-before-registering-platform-devices.patch
queue-3.0/usb-add-motorola-rokr-e6-id-to-the-usbnet-driver-zaurus.patch
queue-3.0/x86-bpf_jit-fix-a-bug-in-emitting-the-16-bit-immediate-operand-of-and.patch
queue-3.0/kgdbts-2-of-2-fix-single-step-awareness-to-work-correctly-with-smp.patch
queue-3.0/mtd-m25p80-set-writebufsize.patch
queue-3.0/kgdb-debug_core-pass-the-breakpoint-struct-instead-of-address-and-memory.patch
queue-3.0/modpost-fix-all_init_data_sections.patch
queue-3.0/sched-x86-fix-overflow-in-cyc2ns_offset.patch
queue-3.0/x86-pci-do-not-tie-msi-ms-7253-use_crs-quirk-to-bios-version.patch
queue-3.0/drm-i915-add-lock-on-drm_helper_resume_force_mode.patch
queue-3.0/acpica-fix-regression-in-fadt-revision-checks.patch
queue-3.0/modpost-fix-modpost-s-license-checking-v3.patch
queue-3.0/mtd-block2mtd-initialize-writebufsize.patch
queue-3.0/drm-radeon-kms-fix-fans-after-resume.patch
queue-3.0/mtd-sst25l-initialize-writebufsize.patch
queue-3.0/revert-x86-ioapic-add-register-level-checks-to-detect.patch
queue-3.0/mfd-clear-twl6030-irq-status-register-only-once.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
