diff options
author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2014-10-03 00:58:32 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-14 20:27:34 -0400 |
commit | 179ea48bc7c04dba3526d66d9f358c2f4f3b3776 (patch) | |
tree | 741d0fba2142db23993b256b853b97623bf1d259 | |
parent | c59004cc83c3f8b182c32ca9d366d222a59ab63f (diff) |
powerpc/eeh: Block CFG upon frozen Shiner adapter
The Broadcom Shiner 2-ports 10G ethernet adapter has same problem
commit 6f20bda0 ("powerpc/eeh: Block PCI config access upon frozen
PE") fixes. Put it to the black list as well.
# lspci -s 0004:01:00.0
0004:01:00.0 Ethernet controller: Broadcom Corporation \
NetXtreme II BCM57810 10 Gigabit Ethernet (rev 10)
# lspci -n -s 0004:01:00.0
0004:01:00.0 0200: 14e4:168e (rev 10)
Reported-by: John Walthour <jwalthour@us.ibm.com>
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/platforms/powernv/eeh-powernv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c index 443ce965a5b0..1d19e7917d7f 100644 --- a/arch/powerpc/platforms/powernv/eeh-powernv.c +++ b/arch/powerpc/platforms/powernv/eeh-powernv.c | |||
@@ -182,9 +182,10 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag) | |||
182 | * that PE to block its config space. | 182 | * that PE to block its config space. |
183 | * | 183 | * |
184 | * Broadcom Austin 4-ports NICs (14e4:1657) | 184 | * Broadcom Austin 4-ports NICs (14e4:1657) |
185 | * Broadcom Shiner 2-ports 10G NICs (14e4:168e) | ||
185 | */ | 186 | */ |
186 | if (dev->vendor == PCI_VENDOR_ID_BROADCOM && | 187 | if ((dev->vendor == PCI_VENDOR_ID_BROADCOM && dev->device == 0x1657) || |
187 | dev->device == 0x1657) | 188 | (dev->vendor == PCI_VENDOR_ID_BROADCOM && dev->device == 0x168e)) |
188 | edev->pe->state |= EEH_PE_CFG_RESTRICTED; | 189 | edev->pe->state |= EEH_PE_CFG_RESTRICTED; |
189 | 190 | ||
190 | /* | 191 | /* |