diff mbox

[07/10] capi: Dynamically calculate which CAPP port to use

Message ID 1423706279-12170-7-git-send-email-mikey@neuling.org
State Superseded
Headers show

Commit Message

Michael Neuling Feb. 12, 2015, 1:57 a.m. UTC
Currently we hardware the CAPP to use PHB0.  This works for tuleta but not for
other systems.

This makes the port mapping dynamic so that first PHB to request a mode change
to CAPI will get the CAPP port mapped to it.

Calls to switch addition PHBs to CAPI mode will fail.

Signed-off-by: Michael Neuling <mikey@neuling.org>
---
 hw/phb3.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/hw/phb3.c b/hw/phb3.c
index b27bac3..56f68a7 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -3083,17 +3083,34 @@  static int64_t capp_load_ucode(struct phb3 *p)
 
 static void phb3_init_capp_regs(struct phb3 *p)
 {
-	/* writing field vals directly */
 	uint64_t reg;
 
 	xscom_read(p->chip_id, APC_MASTER_PB_CTRL, &reg);
 	reg |= PPC_BIT(3);
 	xscom_write(p->chip_id, APC_MASTER_PB_CTRL, reg);
-	/*      port0    port1
-	 * 100   PHB0   disabled
-	 * we're told it's the same for Venice
-         */
-	xscom_write(p->chip_id, APC_MASTER_CAPI_CTRL, 	0x4070000000000000);
+
+	/* Dynamically workout which PHB to connect to port 0 of the CAPP.
+	 * Here is the table from the CAPP workbook:
+	 *	     APC_MASTER		CAPP		CAPP
+	 *	      bits 1:3		port0		port1
+	 *		000		 disabled	 disabled
+	 *	     *	001		 PHB2		 disabled
+	 *	     *	010		 PHB1		 disabled
+	 *		011		 PHB1		 PHB2
+	 *	     *	100		 PHB0		 disabled
+	 *		101		 PHB0		 PHB2
+	 *		110		 PHB0		 PHB1
+	 *
+	 * We don't use port1 so only those stared above are used.
+	 * Hence reduce table to:
+	 *    PHB0 -> APC MASTER(bits 1:3) = 0b100
+	 *    PHB1 -> APC MASTER(bits 1:3) = 0b010
+	 *    PHB2 -> APC MASTER(bits 1:3) = 0b001
+	 */
+	reg = 0x4000000000000000ULL >> p->index;
+	reg |= 0x0070000000000000;
+	xscom_write(p->chip_id, APC_MASTER_CAPI_CTRL,reg);
+	PHBINF(p, "CAPP: port attached\n");
 
 	/* tlb and mmio */
 	xscom_write(p->chip_id, TRANSPORT_CONTROL, 	0x4028000104000000);