diff options
| author | Ryan Grimm <grimm@linux.vnet.ibm.com> | 2015-01-19 11:52:50 -0600 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-22 17:31:52 +1100 |
| commit | 1212aa1c8c9ca34642f7737e1edaa96c9ce3d7dd (patch) | |
| tree | bd2838b54d66c203e4e55db01299880aeb7e26a5 /arch/powerpc/include | |
| parent | 95bc11bcd1428afdb48400ec84dc6d5a83926138 (diff) | |
| download | op-kernel-dev-1212aa1c8c9ca34642f7737e1edaa96c9ce3d7dd.zip op-kernel-dev-1212aa1c8c9ca34642f7737e1edaa96c9ce3d7dd.tar.gz | |
cxl: Enable CAPP recovery
Turning snoops on is the last step in CAPP recovery. Sapphire is expected to
have reinitialized the PHB and done the previous recovery steps.
Add mode argument to opal call to do this. Driver can turn snoops off although
it does not currently.
Signed-off-by: Ryan Grimm <grimm@linux.vnet.ibm.com>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/opal.h | 8 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/pnv-pci.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index eb95b67..2baf8a5 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -595,6 +595,14 @@ enum { OPAL_PHB3_NUM_PEST_REGS = 256 }; +/* CAPI modes for PHB */ +enum { + OPAL_PHB_CAPI_MODE_PCIE = 0, + OPAL_PHB_CAPI_MODE_CAPI = 1, + OPAL_PHB_CAPI_MODE_SNOOP_OFF = 2, + OPAL_PHB_CAPI_MODE_SNOOP_ON = 3, +}; + struct OpalIoPhbErrorCommon { __be32 version; __be32 ioType; diff --git a/arch/powerpc/include/asm/pnv-pci.h b/arch/powerpc/include/asm/pnv-pci.h index f09a22f..3c00d64 100644 --- a/arch/powerpc/include/asm/pnv-pci.h +++ b/arch/powerpc/include/asm/pnv-pci.h @@ -13,7 +13,7 @@ #include <linux/pci.h> #include <misc/cxl.h> -int pnv_phb_to_cxl(struct pci_dev *dev); +int pnv_phb_to_cxl_mode(struct pci_dev *dev, uint64_t mode); int pnv_cxl_ioda_msi_setup(struct pci_dev *dev, unsigned int hwirq, unsigned int virq); int pnv_cxl_alloc_hwirqs(struct pci_dev *dev, int num); |
