Re: [RFC PATCH 2/3] powerpc/pci: Remove MVE code

[Michael Ellerman]

Joel Stanley  writes:
> With IODA1 support gone the OPAL calls to set MVE are dead code. Remove
> them.
>
> TODO: Do we have rules for removing unused OPAL APIs? Should we leave it
> in opal.h? opal-call.c?

I don't think we have any rules for removal.

When skiboot was being actively developed Stewart and I did try to keep
the skiboot and kernel opal-api.h in sync, but I haven't checked on the
state of that for a few years. ... And I just checked and boy they are
*not* in sync anymore.

But anyway opal.h and opal-call.c are just kernel internal, so I think
we just remove unused code there as normal.

cheers

[RFC PATCH 2/3] powerpc/pci: Remove MVE code

[Joel Stanley]

With IODA1 support gone the OPAL calls to set MVE are dead code. Remove
them.

TODO: Do we have rules for removing unused OPAL APIs? Should we leave it
in opal.h? opal-call.c?

Signed-off-by: Joel Stanley 
---
 arch/powerpc/include/asm/opal.h|  3 ---
 arch/powerpc/platforms/powernv/opal-call.c |  2 --
 arch/powerpc/platforms/powernv/pci-ioda.c  | 23 +-
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index 726125a534de..a9b31cc258fc 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -112,9 +112,6 @@ int64_t opal_pci_set_pe(uint64_t phb_id, uint64_t 
pe_number, uint64_t bus_dev_fu
uint8_t pe_action);
 int64_t opal_pci_set_peltv(uint64_t phb_id, uint32_t parent_pe, uint32_t 
child_pe,
   uint8_t state);
-int64_t opal_pci_set_mve(uint64_t phb_id, uint32_t mve_number, uint32_t 
pe_number);
-int64_t opal_pci_set_mve_enable(uint64_t phb_id, uint32_t mve_number,
-   uint32_t state);
 int64_t opal_pci_get_xive_reissue(uint64_t phb_id, uint32_t xive_number,
  uint8_t *p_bit, uint8_t *q_bit);
 int64_t opal_pci_set_xive_reissue(uint64_t phb_id, uint32_t xive_number,
diff --git a/arch/powerpc/platforms/powernv/opal-call.c 
b/arch/powerpc/platforms/powernv/opal-call.c
index f812c74c61e5..021b0ec29e24 100644
--- a/arch/powerpc/platforms/powernv/opal-call.c
+++ b/arch/powerpc/platforms/powernv/opal-call.c
@@ -167,8 +167,6 @@ OPAL_CALL(opal_pci_map_pe_mmio_window,  
OPAL_PCI_MAP_PE_MMIO_WINDOW);
 OPAL_CALL(opal_pci_set_phb_table_memory,   OPAL_PCI_SET_PHB_TABLE_MEMORY);
 OPAL_CALL(opal_pci_set_pe, OPAL_PCI_SET_PE);
 OPAL_CALL(opal_pci_set_peltv,  OPAL_PCI_SET_PELTV);
-OPAL_CALL(opal_pci_set_mve,OPAL_PCI_SET_MVE);
-OPAL_CALL(opal_pci_set_mve_enable, OPAL_PCI_SET_MVE_ENABLE);
 OPAL_CALL(opal_pci_get_xive_reissue,   OPAL_PCI_GET_XIVE_REISSUE);
 OPAL_CALL(opal_pci_set_xive_reissue,   OPAL_PCI_SET_XIVE_REISSUE);
 OPAL_CALL(opal_pci_set_xive_pe,OPAL_PCI_SET_XIVE_PE);
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c 
b/arch/powerpc/platforms/powernv/pci-ioda.c
index 2c4e842c2749..c2af5a55a434 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -865,29 +865,8 @@ int pnv_ioda_configure_pe(struct pnv_phb *phb, struct 
pnv_ioda_pe *pe)
for (rid = pe->rid; rid < rid_end; rid++)
phb->ioda.pe_rmap[rid] = pe->pe_number;
 
-   /* Setup one MVTs on IODA1 */
-   if (phb->type != PNV_PHB_IODA1) {
-   pe->mve_number = 0;
-   goto out;
-   }
+   pe->mve_number = 0;
 
-   pe->mve_number = pe->pe_number;
-   rc = opal_pci_set_mve(phb->opal_id, pe->mve_number, pe->pe_number);
-   if (rc != OPAL_SUCCESS) {
-   pe_err(pe, "OPAL error %ld setting up MVE %x\n",
-  rc, pe->mve_number);
-   pe->mve_number = -1;
-   } else {
-   rc = opal_pci_set_mve_enable(phb->opal_id,
-pe->mve_number, OPAL_ENABLE_MVE);
-   if (rc) {
-   pe_err(pe, "OPAL error %ld enabling MVE %x\n",
-  rc, pe->mve_number);
-   pe->mve_number = -1;
-   }
-   }
-
-out:
return 0;
 }
 
-- 
2.39.2