[Skiboot] [PATCH] phb4: Finish removing P9 DD1 workaround on LSIs

Cédric Le Goater clg at kaod.org
Tue Sep 29 21:41:49 AEST 2020


Commit ad7e9a67c4e4 ("xive/p9: obsolete OPAL_XIVE_IRQ_SHIFT_BUG
flags") forgot to remove the internal flag.

Signed-off-by: Cédric Le Goater <clg at kaod.org>
---

 And it should compile.

 include/xive.h | 1 -
 hw/phb4.c      | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/include/xive.h b/include/xive.h
index fb8967eec24d..477d3801dcbb 100644
--- a/include/xive.h
+++ b/include/xive.h
@@ -41,7 +41,6 @@ __attrconst uint32_t xive_get_notify_base(uint32_t girq);
 #define XIVE_SRC_EOI_PAGE1	0x02 /* EOI on the second page */
 #define XIVE_SRC_STORE_EOI	0x04 /* EOI using stores supported */
 #define XIVE_SRC_LSI		0x08 /* Interrupt is an LSI */
-#define XIVE_SRC_SHIFT_BUG	0x10 /* ESB update offset << 4 (PHB4 LSI DD1) */
 
 struct irq_source_ops;
 void xive_register_hw_source(uint32_t base, uint32_t count, uint32_t shift,
diff --git a/hw/phb4.c b/hw/phb4.c
index 17a233f39ff1..afcec264c43b 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -5861,12 +5861,9 @@ static void phb4_create(struct dt_node *np)
 	xive_register_hw_source(p->base_msi, p->num_irqs - 8, 16,
 				p->int_mmio, irq_flags, NULL, NULL);
 
-	/* XIVE_SRC_SHIFT_BUG is a DD1 workaround */
 	xive_register_hw_source(p->base_lsi, 8, 16,
 				p->int_mmio + ((p->num_irqs - 8) << 16),
-				XIVE_SRC_LSI | XIVE_SRC_SHIFT_BUG,
-				p,
-				&phb4_lsi_ops);
+				XIVE_SRC_LSI, p, &phb4_lsi_ops);
 
 	/* Platform additional setup */
 	if (platform.pci_setup_phb)
-- 
2.25.4



More information about the Skiboot mailing list