ppc/pnv: Fix number of registers in the PCIe controller on POWER9
PATCH 1/1 ppc/pnv: Fix number of registers in the PCIe controller on POWER9
The spec defines 3 registers, even though only index 0 and 2 are valid on POWER9. The same model is used on POWER10. Register 1 is defined there but we currently don't use it in skiboot. So we can keep reporting an error on write.
Reported by Coverity (CID 1487176).
--- include/hw/pci-host/pnv_phb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/pci-host/pnv_phb4.h +1 -1
@@ -180,7 +180,7 @@ struct PnvPhb4PecState {MemoryRegion nest_regs_mr;/* PCI registers, excluding per-stack */ -#define PHB4_PEC_PCI_REGS_COUNT 0x2 +#define PHB4_PEC_PCI_REGS_COUNT 0x3uint64_t pci_regs[PHB4_PEC_PCI_REGS_COUNT ];MemoryRegion pci_regs_mr;
Signature · 1 line
2.35.1
Quoted 11 lines · Frederic Barrat
The spec defines 3 registers, even though only index 0 and 2 are valid on POWER9. The same model is used on POWER10. Register 1 is defined there but we currently don't use it in skiboot. So we can keep reporting an error on write.
Reported by Coverity (CID 1487176).
Fixes 4f9924c4d4cf ("ppc/pnv: Add models for POWER9 PHB4 PCIe Host bridge")Suggested-by Benjamin Herrenschmidt <[email protected]>Signed-off-by Frederic Barrat <[email protected]>---
Quoted 16 lines
include/hw/pci-host/pnv_phb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/hw/pci-host/pnv_phb4.h +1
-1@@ -180,7 +180,7 @@ struct PnvPhb4PecState {MemoryRegion nest_regs_mr;/* PCI registers, excluding per-stack */ -#define PHB4_PEC_PCI_REGS_COUNT 0x2 +#define PHB4_PEC_PCI_REGS_COUNT 0x3uint64_t pci_regs[PHB4_PEC_PCI_REGS_COUNT ];MemoryRegion pci_regs_mr;
Quoted 5 lines · Frederic Barrat
The spec defines 3 registers, even though only index 0 and 2 are valid on POWER9. The same model is used on POWER10. Register 1 is defined there but we currently don't use it in skiboot. So we can keep reporting an error on write.
Quoted 8 lines
Reported by Coverity (CID 1487176).
Fixes 4f9924c4d4cf ("ppc/pnv: Add models for POWER9 PHB4 PCIe Host bridge")Suggested-by Benjamin Herrenschmidt <[email protected]>Signed-off-by Frederic Barrat <[email protected]>--- include/hw/pci-host/pnv_phb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Queued for ppc-7.0
Thanks,
C.
Quoted 14 lines
include/hw/pci-host/pnv_phb4.h +1
-1@@ -180,7 +180,7 @@ struct PnvPhb4PecState {MemoryRegion nest_regs_mr;/* PCI registers, excluding per-stack */ -#define PHB4_PEC_PCI_REGS_COUNT 0x2 +#define PHB4_PEC_PCI_REGS_COUNT 0x3uint64_t pci_regs[PHB4_PEC_PCI_REGS_COUNT ];MemoryRegion pci_regs_mr;