From: Gavin Shan Date: Tue, 12 Nov 2013 06:49:21 +0000 (+0800) Subject: powerpc/eeh: Enable PCI_COMMAND_MASTER for PCI bridges X-Git-Tag: v3.13-rc1~16^2~12 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bf898ec5cbd33be11147743bee27b66b10cb2f85;p=~emulex%2Finfiniband.git powerpc/eeh: Enable PCI_COMMAND_MASTER for PCI bridges On PHB3, we will fail to fetch IODA tables without PCI_COMMAND_MASTER on PCI bridges. According to one experiment I had, the MSIx interrupts didn't raise from the adapter without the bit applied to all upstream PCI bridges including root port of the adapter. The patch forces to have that bit enabled accordingly. Signed-off-by: Gavin Shan CC: Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 67130206534..4bd687d5e7a 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -686,6 +686,15 @@ void eeh_save_bars(struct eeh_dev *edev) for (i = 0; i < 16; i++) eeh_ops->read_config(dn, i * 4, 4, &edev->config_space[i]); + + /* + * For PCI bridges including root port, we need enable bus + * master explicitly. Otherwise, it can't fetch IODA table + * entries correctly. So we cache the bit in advance so that + * we can restore it after reset, either PHB range or PE range. + */ + if (edev->mode & EEH_DEV_BRIDGE) + edev->config_space[1] |= PCI_COMMAND_MASTER; } /**