Skip to contentSkip to conversation

Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed"

PATCH Applied Qian Cai 4 participants 4 messages Oct 14, 2020 – Oct 16, 2020

Subsystems (2)
lore
Share & tools
lore

Qian Cai

author
#0 lore raw

PATCH 1/1 Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed"

This reverts commit 3a3181e16fbde752007759f8759d25e0ff1fc425 which causes memory corruptions on POWER9 NV.

---
 arch/powerpc/include/asm/pci-bridge.h |   6 --
 arch/powerpc/kernel/pci-common.c      | 114 --------------------------
 2 files changed, 120 deletions(-)
arch/powerpc/include/asm/pci-bridge.h +0 -6
index d21e070352dc..d2a2a14e56f9 100644
@@ -48,9 +48,6 @@ struct pci_controller_ops {
 
 /*
  * Structure of a PCI controller (host bridge)
- *
- * @irq_count: number of interrupt mappings
- * @irq_map: interrupt mappings
  */
 struct pci_controller {
 	struct pci_bus *bus;
@@ -130,9 +127,6 @@ struct pci_controller {
 
 	void *private_data;
 	struct npu *npu;
-
-	unsigned int irq_count;
-	unsigned int *irq_map;
 };
 
 /* These are used for config access before all the PCI probing
arch/powerpc/kernel/pci-common.c +0 -114

132 lines not on this page · raw message

Signature · 1 line
2.28.0
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Qian Cai

This reverts commit 3a3181e16fbde752007759f8759d25e0ff1fc425 which causes memory corruptions on POWER9 NV.

I was going to post this along with a fix for Cedric's original bug, but I can do that separately so:

#2 lore raw

Hi Oliver,

Quoted 10 lines · On Thu, 15 Oct 2020 10:00:49 +1100 "Oliver O'Halloran" <[email protected]> wrote:
Quoted 3 lines · Qian Cai

This reverts commit 3a3181e16fbde752007759f8759d25e0ff1fc425 which causes memory corruptions on POWER9 NV.

I was going to post this along with a fix for Cedric's original bug, but I can do that separately so:

I added that to linux-next today.

Signature · 2 lines
Cheers,
Stephen Rothwell