tags 665420 + moreinfo
quit
janek wrote:
> I cannot see drives and can't boot system
[...]
> https://lkml.org/lkml/2012/3/23/27
Thanks. Please test the attached patch, following instructions
from [1] or the following instructions:
0. Prerequisites.
apt-get install git build-essential
1. Get a copy of the kernel history, if you don't already have it.
git clone \
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
2. Test linus's latest.
cd linux
git fetch origin
git checkout origin/master
cp /boot/config-$(uname -r) .config; # current configuration
make localmodconfig; # optional: minimize configuration
make deb-pkg; # optionally with -j<num> for parallel build
dpkg -i ../<name of package>; # as root
reboot
3. Hopefully it reproduces the bug. So try the patch:
cd linux
git am -3sc <path to patch>
make deb-pkg; # maybe with -j4
dpkg -i ../<name of package>; # as root
reboot
[1]
http://kernel-handbook.alioth.debian.org/ch-common-tasks.html#s-common-official
or the corresponding page in the debian-kernel-handbook package
From: Matthew Garrett <m...@redhat.com>
Date: Tue, 27 Mar 2012 10:17:41 -0400
Subject: ASPM: Fix pcie devices with non-pcie children
Commit 4949be16822e92a18ea0cc1616319926628092ee 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 us to hit
a BUG_ON later on. Move the aspm_disabled check so we continue to honour
that scenario.
Signed-off-by: Matthew Garrett <m...@redhat.com>
Cc: sta...@vger.kernel.org
Tested-by: Hatem Masmoudi <hatem.masmo...@gmail.com> # Dell Latitude E5520
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
drivers/pci/pcie/aspm.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 4bdef24cd412..b500840a143b 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -508,9 +508,6 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
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 pci_dev *pdev)
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
--
1.7.10.rc1
