Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/4xx: Workaround for PPC440EPx/GRx PCI_28 Errata

The 440EPx/GRx chips don't support PCI MRM commands. Drivers determine this
by looking for a zero value in the PCI cache line size register. However,
some drivers write to this register upon initialization. This can cause
MRMs to be used on these chips, which may cause deadlocks on PLB4.

The workaround implemented here introduces a new indirect_type flag, called
PPC_INDIRECT_TYPE_BROKEN_MRM. This is set in the pci_controller structure in
the pci fixup function for 4xx PCI bridges by determining if the bridge is
compatible with 440EPx/GRx. The flag is checked in the indirect_write_config
function, and forces any writes to the PCI_CACHE_LINE_SIZE register to be
zero, which will disable MRMs for these chips.

A similar workaround has been tested by AMCC on various PCI cards, such as
the Silicon Image ATA card and Intel E1000 GIGE card. Hangs were seen with
the Silicon Image card, and MRMs were seen on the bus with a PCI analyzer.
With the workaround in place, the card functioned properly and only Memory
Reads were seen on the bus with the analyzer.

Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

+14
+6
arch/powerpc/sysdev/indirect_pci.c
··· 123 123 (bus->number == hose->first_busno)) 124 124 val &= 0xffffff00; 125 125 126 + /* Workaround for PCI_28 Errata in 440EPx/GRx */ 127 + if ((hose->indirect_type & PPC_INDIRECT_TYPE_BROKEN_MRM) && 128 + offset == PCI_CACHE_LINE_SIZE) { 129 + val = 0; 130 + } 131 + 126 132 /* 127 133 * Note: the caller has already checked that offset is 128 134 * suitably aligned and that len is 1, 2 or 4.
+5
arch/powerpc/sysdev/ppc4xx_pci.c
··· 75 75 !of_device_is_compatible(hose->dn, "ibm,plb-pci")) 76 76 return; 77 77 78 + if (of_device_is_compatible(hose->dn, "ibm,plb440epx-pci") || 79 + of_device_is_compatible(hose->dn, "ibm,plb440grx-pci")) { 80 + hose->indirect_type |= PPC_INDIRECT_TYPE_BROKEN_MRM; 81 + } 82 + 78 83 /* Hide the PCI host BARs from the kernel as their content doesn't 79 84 * fit well in the resource management 80 85 */
+3
include/asm-powerpc/pci-bridge.h
··· 92 92 * anything but the PHB. Only allow talking to the PHB if this is 93 93 * set. 94 94 * BIG_ENDIAN - cfg_addr is a big endian register 95 + * BROKEN_MRM - the 440EPx/GRx chips have an errata that causes hangs on 96 + * the PLB4. Effectively disable MRM commands by setting this. 95 97 */ 96 98 #define PPC_INDIRECT_TYPE_SET_CFG_TYPE 0x00000001 97 99 #define PPC_INDIRECT_TYPE_EXT_REG 0x00000002 98 100 #define PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS 0x00000004 99 101 #define PPC_INDIRECT_TYPE_NO_PCIE_LINK 0x00000008 100 102 #define PPC_INDIRECT_TYPE_BIG_ENDIAN 0x00000010 103 + #define PPC_INDIRECT_TYPE_BROKEN_MRM 0x00000020 101 104 u32 indirect_type; 102 105 #endif /* !CONFIG_PPC64 */ 103 106 /* Currently, we limit ourselves to 1 IO range and 3 mem