The patch titled
Subject: ASPM: fix pcie devices with non-pcie children
has been removed from the -mm tree. Its filename was
aspm-fix-pcie-devices-with-non-pcie-children.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Matthew Garrett <mjg@xxxxxxxxxx>
Subject: ASPM: fix pcie devices with non-pcie children
Since 3.2.12 and 3.3, some systems are failing to boot with a BUG_ON.
Some other systems using the pata_jmicron driver fail to boot because no
disks are detected. Passing pcie_aspm=force on the kernel command line
works around it.
The cause: commit 4949be16822e ("PCI: ignore pre-1.1 ASPM quirking when
ASPM is disabled") changed the behaviour of pcie_aspm_sanity_check() to
always return 0 if aspm is disabled, in order to avoid cases where we
changed ASPM state on pre-PCIe 1.1 devices. This skipped the secondary
function of pcie_aspm_sanity_check which was to avoid us enabling ASPM on
devices that had non-PCIe children, causing trouble later on. Move the
aspm_disabled check so we continue to honour that scenario.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=42979 and
http://bugs.debian.org/665420
[jn: with more symptoms in log message]
Reported-by: Romain Francoise <romain@xxxxxxxxxxxxx> # kernel panic
Reported-by: Chris Holland <bandidoirlandes@xxxxxxxxx> # disk detection trouble
Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Tested-by: Hatem Masmoudi <hatem.masmoudi@xxxxxxxxx> # Dell Latitude E5520
Tested-by: janek <jan0x6c@xxxxxxxxx> # pata_jmicron with JMB362/JMB363
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/pcie/aspm.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff -puN drivers/pci/pcie/aspm.c~aspm-fix-pcie-devices-with-non-pcie-children drivers/pci/pcie/aspm.c
--- a/drivers/pci/pcie/aspm.c~aspm-fix-pcie-devices-with-non-pcie-children
+++ a/drivers/pci/pcie/aspm.c
@@ -508,9 +508,6 @@ static int pcie_aspm_sanity_check(struct
int pos;
u32 reg32;
- if (aspm_disabled)
- return 0;
-
/*
* Some functions in a slot might not all be PCIe functions,
* very strange. Disable ASPM for the whole slot
@@ -519,6 +516,16 @@ static int pcie_aspm_sanity_check(struct
pos = pci_pcie_cap(child);
if (!pos)
return -EINVAL;
+
+ /*
+ * If ASPM is disabled then we're not going to change
+ * the BIOS state. It's safe to continue even if it's a
+ * pre-1.1 device
+ */
+
+ if (aspm_disabled)
+ continue;
+
/*
* Disable ASPM for pre-1.1 PCIe device, we follow MS to use
* RBER bit to determine if a function is 1.1 version device
_
Patches currently in -mm which might be from mjg@xxxxxxxxxx are
linux-next.patch
acerhdf-add-support-for-aspire-1410-bios-v13314.patch
acerhdf-add-support-for-new-hardware.patch
acerhdf-lowered-default-temp-fanon-fanoff-values.patch
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch
intel_mid_powerbtn-mark-irq-as-irqf_no_suspend.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
