The POWER8NVL chip has two CAPI ports. Configure the PSL to route
data to the port corresponding to the CAPP unit.
Signed-off-by: Philippe Bergheaud <fe...@linux.vnet.ibm.com>
---
V2:
- Complete rewrite after Mikey's review
drivers/misc/cxl/pci.c | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 0c6c17a1..924ba63 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -22,6 +22,7 @@
#include <asm/pci-bridge.h> /* for struct pci_controller */
#include <asm/pnv-pci.h>
#include <asm/io.h>
+#include <asm/reg.h>
#include "cxl.h"
#include <misc/cxl.h>
@@ -340,12 +341,35 @@ static void dump_afu_descriptor(struct cxl_afu *afu)
#undef show_reg
}
+#define CAPP_UNIT0_ID 0xBA
+#define CAPP_UNIT1_ID 0XBE
+
+static u64 capp_unit_id(struct device_node *np)
+{
+ const __be32 *prop;
+ u64 phb_index;
+
+ /* For chips other than POWER8NVL, we only have CAPP 0,
+ * irrespective of which PHB is used */
+ if (!pvr_version_is(PVR_POWER8NVL))
+ return CAPP_UNIT0_ID ;
+
+ /* For POWER8NVL, assume CAPP 0 is attached to PHB0 and
+ * CAPP 1 is attached to PHB1 */
+ prop = of_get_property(np, "ibm,phb-index", NULL);
+ if (!prop)
+ return 0;
+ phb_index = be32_to_cpup(prop);
+ return phb_index ? CAPP_UNIT1_ID : CAPP_UNIT0_ID;
+}
+
static int init_implementation_adapter_regs(struct cxl *adapter, struct
pci_dev *dev)
{
struct device_node *np;
const __be32 *prop;
u64 psl_dsnctl;
u64 chipid;
+ u64 cappunitid;
if (!(np = pnv_pci_get_phb_node(dev)))
return -ENODEV;
@@ -355,10 +379,15 @@ static int init_implementation_adapter_regs(struct cxl
*adapter, struct pci_dev
if (!np)
return -ENODEV;
chipid = be32_to_cpup(prop);
+ cappunitid = capp_unit_id(np);
of_node_put(np);
+ if (!cappunitid)
+ return -ENODEV;
/* Tell PSL where to route data to */
- psl_dsnctl = 0x02E8900002000000ULL | (chipid << (63-5));
+ psl_dsnctl = 0x0000900002000000ULL | (chipid << (63-5));
+ psl_dsnctl |= (cappunitid << (63-13));
+
cxl_p1_write(adapter, CXL_PSL_DSNDCTL, psl_dsnctl);
cxl_p1_write(adapter, CXL_PSL_RESLCKTO, 0x20000000200ULL);
/* snoop write mask */
--
2.1.0
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
