Commit 326b3f8c authored by Joel Stanley's avatar Joel Stanley Committed by Michael Ellerman
Browse files

powerpc/powernv/pci: Remove MVE code 



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

Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230613045202.294451-3-joel@jms.id.au
parent 5ac129cd

arch/powerpc/include/asm/opal.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -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);

			uint8_t pe_action);

int64_t opal_pci_set_peltv(uint64_t phb_id, uint32_t parent_pe, uint32_t child_pe,

int64_t opal_pci_set_peltv(uint64_t phb_id, uint32_t parent_pe, uint32_t child_pe,

			   uint8_t state);

			   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,

int64_t opal_pci_get_xive_reissue(uint64_t phb_id, uint32_t xive_number,

				  uint8_t *p_bit, uint8_t *q_bit);

				  uint8_t *p_bit, uint8_t *q_bit);

int64_t opal_pci_set_xive_reissue(uint64_t phb_id, uint32_t xive_number,

int64_t opal_pci_set_xive_reissue(uint64_t phb_id, uint32_t xive_number,

arch/powerpc/platforms/powernv/opal-call.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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_phb_table_memory,	OPAL_PCI_SET_PHB_TABLE_MEMORY);

OPAL_CALL(opal_pci_set_pe,			OPAL_PCI_SET_PE);

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_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_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_reissue,		OPAL_PCI_SET_XIVE_REISSUE);

OPAL_CALL(opal_pci_set_xive_pe,			OPAL_PCI_SET_XIVE_PE);

OPAL_CALL(opal_pci_set_xive_pe,			OPAL_PCI_SET_XIVE_PE);

arch/powerpc/platforms/powernv/pci-ioda.c

+1 −22
Original line number Original line Diff line number Diff line
@@ -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++)

	for (rid = pe->rid; rid < rid_end; rid++)

		phb->ioda.pe_rmap[rid] = pe->pe_number;

		phb->ioda.pe_rmap[rid] = pe->pe_number;





	/* Setup one MVTs on IODA1 */

	if (phb->type != PNV_PHB_IODA1) {

	pe->mve_number = 0;

	pe->mve_number = 0;

		goto out;

	}





	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;

	return 0;

}

}