Commit c5c4d3a3 authored by David Daney's avatar David Daney Committed by Bjorn Helgaas

PCI: thunder-pem: Add support for cn81xx and cn83xx SoCs

The pci-thunder-pem driver was initially developed for cn88xx SoCs.  The
cn81xx and cn83xx members of the same family of SoCs have a slightly
different configuration of interrupt resources in the PEM hardware, which
prevents the INTA legacy interrupt source from functioning with the current
driver.

There are two fixes required:

1) Don't fixup the PME interrupt on the newer SoCs as it already has the
proper value.

2) Report MSI-X Capability Table Size of 2 for the newer SoCs, so the core
MSI-X code doesn't inadvertently clobber the INTA machinery that happens to
reside immediately following the table.
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7ce7d89f
...@@ -36,7 +36,7 @@ struct thunder_pem_pci { ...@@ -36,7 +36,7 @@ struct thunder_pem_pci {
static int thunder_pem_bridge_read(struct pci_bus *bus, unsigned int devfn, static int thunder_pem_bridge_read(struct pci_bus *bus, unsigned int devfn,
int where, int size, u32 *val) int where, int size, u32 *val)
{ {
u64 read_val; u64 read_val, tmp_val;
struct pci_config_window *cfg = bus->sysdata; struct pci_config_window *cfg = bus->sysdata;
struct thunder_pem_pci *pem_pci = (struct thunder_pem_pci *)cfg->priv; struct thunder_pem_pci *pem_pci = (struct thunder_pem_pci *)cfg->priv;
...@@ -65,13 +65,28 @@ static int thunder_pem_bridge_read(struct pci_bus *bus, unsigned int devfn, ...@@ -65,13 +65,28 @@ static int thunder_pem_bridge_read(struct pci_bus *bus, unsigned int devfn,
read_val |= 0x00007000; /* Skip MSI CAP */ read_val |= 0x00007000; /* Skip MSI CAP */
break; break;
case 0x70: /* Express Cap */ case 0x70: /* Express Cap */
/* PME interrupt on vector 2*/ /*
* Change PME interrupt to vector 2 on T88 where it
* reads as 0, else leave it alone.
*/
if (!(read_val & (0x1f << 25)))
read_val |= (2u << 25); read_val |= (2u << 25);
break; break;
case 0xb0: /* MSI-X Cap */ case 0xb0: /* MSI-X Cap */
/* TableSize=4, Next Cap is EA */ /* TableSize=2 or 4, Next Cap is EA */
read_val &= 0xc00000ff; read_val &= 0xc00000ff;
/*
* If Express Cap(0x70) raw PME vector reads as 0 we are on
* T88 and TableSize is reported as 4, else TableSize
* is 2.
*/
writeq(0x70, pem_pci->pem_reg_base + PEM_CFG_RD);
tmp_val = readq(pem_pci->pem_reg_base + PEM_CFG_RD);
tmp_val >>= 32;
if (!(tmp_val & (0x1f << 25)))
read_val |= 0x0003bc00; read_val |= 0x0003bc00;
else
read_val |= 0x0001bc00;
break; break;
case 0xb4: case 0xb4:
/* Table offset=0, BIR=0 */ /* Table offset=0, BIR=0 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment