]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
powerpc/iommu: Remove the dependency on EEH struct in DDW mechanism
authorGuilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Mon, 11 Apr 2016 19:17:23 +0000 (16:17 -0300)
committerSasha Levin <alexander.levin@verizon.com>
Mon, 22 Aug 2016 16:23:29 +0000 (12:23 -0400)
commit79babf8a249dfd04a15b07c85f089ee2c0f449bb
tree5b747d2bbd817e150198afdd0ba931578a4c0f86
parent8bc7adafc3a58801319873cbfa38f4fc8e0047b4
powerpc/iommu: Remove the dependency on EEH struct in DDW mechanism

[ Upstream commit 8445a87f7092bc8336ea1305be9306f26b846d93 ]

Commit 39baadbf36ce ("powerpc/eeh: Remove eeh information from pci_dn")
changed the pci_dn struct by removing its EEH-related members.
As part of this clean-up, DDW mechanism was modified to read the device
configuration address from eeh_dev struct.

As a consequence, now if we disable EEH mechanism on kernel command-line
for example, the DDW mechanism will fail, generating a kernel oops by
dereferencing a NULL pointer (which turns to be the eeh_dev pointer).

This patch just changes the configuration address calculation on DDW
functions to a manual calculation based on pci_dn members instead of
using eeh_dev-based address.

No functional changes were made. This was tested on pSeries, both
in PHyp and qemu guest.

Fixes: 39baadbf36ce ("powerpc/eeh: Remove eeh information from pci_dn")
Cc: stable@vger.kernel.org # v3.4+
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
arch/powerpc/platforms/pseries/iommu.c