[Skiboot] [PATCH] phb4: Add an option for disabling EEH MMIO in nvram

Russell Currey ruscur at russell.cc
Thu Apr 20 10:55:23 AEST 2017


Having the option to disable EEH for MMIO without rebuilding skiboot
could be useful for testing, so check for disable-eeh-mmio=true in nvram.

Signed-off-by: Russell Currey <ruscur at russell.cc>
---
 hw/phb4.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/hw/phb4.c b/hw/phb4.c
index e9c59c52..59fd6407 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -53,6 +53,7 @@
 #include <chip.h>
 #include <chiptod.h>
 #include <xive.h>
+#include <nvram.h>
 
 /* Enable this to disable error interrupts for debug purposes */
 #define DISABLE_ERR_INTS
@@ -2841,9 +2842,13 @@ static void phb4_init_hw(struct phb4 *p, bool first_init)
 	out_be64(p->regs + PHB_PCIE_CRESET,			   creset);
 
 	/* Init_16 - PHB Control */
-	out_be64(p->regs + PHB_CTRLR,
-		 PHB_CTRLR_IRQ_PGSZ_64K |
-		 SETFIELD(PHB_CTRLR_TVT_ADDR_SEL, 0ull, TVT_2_PER_PE));
+	val = PHB_CTRLR_IRQ_PGSZ_64K |
+		SETFIELD(PHB_CTRLR_TVT_ADDR_SEL, 0ull, TVT_2_PER_PE);
+
+	if (nvram_query_eq("disable-eeh-mmio", "true"))
+		val |= PHB_CTRLR_MMIO_EEH_DISABLE;
+
+	out_be64(p->regs + PHB_CTRLR, val);
 
 	/* Init_17..40 - Architected IODA3 inits */
 	phb4_init_ioda3(p);
-- 
2.12.2



More information about the Skiboot mailing list