]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/powernv: Fix iommu initialization again
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 1 Jul 2013 07:54:09 +0000 (17:54 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 1 Jul 2013 08:10:29 +0000 (18:10 +1000)
commitc6652fa9b00db18ac013a146633b8864c67d662f
treed463b49c185831ba4ee38c11f3414f4abdd9f951
parentfe843cf5829e29e71f1d7860fdf906fb1bca06f8
powerpc/powernv: Fix iommu initialization again

So because those things always end up in trainwrecks... In c9cba0c0c
we moved back the iommu initialization earlier, essentially undoing
5cb0ae5ae which was causing us endless trouble... except that in the
meantime we had merged d9f5333318 (to workaround the original breakage)
which is now ... broken :-)

This fixes it by doing a partial revert of the latter (we keep the
ppc_md. path which will be needed in the hotplug case, which happens
also during some EEH error recovery situations).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: <stable@vger.kernel.org> [v3.10]
arch/powerpc/platforms/powernv/pci-ioda.c