Skip to content

Commit 562d1e2

Browse files
Christoph Hellwigmpe
authored andcommitted
powerpc/powernv: remove the nvlink support
This code was only used by the vfio-nvlink2 code, which itself had no proper use. Drop this huge chunk of code build into every powernv or generic build. Signed-off-by: Christoph Hellwig <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 17ae69a commit 562d1e2

File tree

10 files changed

+8
-948
lines changed

10 files changed

+8
-948
lines changed

arch/powerpc/include/asm/opal.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ extern struct device_node *opal_node;
2828

2929
/* API functions */
3030
int64_t opal_invalid_call(void);
31-
int64_t opal_npu_destroy_context(uint64_t phb_id, uint64_t pid, uint64_t bdf);
32-
int64_t opal_npu_init_context(uint64_t phb_id, int pasid, uint64_t msr,
33-
uint64_t bdf);
3431
int64_t opal_npu_map_lpar(uint64_t phb_id, uint64_t bdf, uint64_t lparid,
3532
uint64_t lpcr);
3633
int64_t opal_npu_spa_setup(uint64_t phb_id, uint32_t bdfn,

arch/powerpc/include/asm/pci-bridge.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ struct pci_controller {
126126
#endif /* CONFIG_PPC64 */
127127

128128
void *private_data;
129-
struct npu *npu;
130129
};
131130

132131
/* These are used for config access before all the PCI probing

arch/powerpc/include/asm/pci.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,4 @@ extern void pcibios_scan_phb(struct pci_controller *hose);
119119

120120
#endif /* __KERNEL__ */
121121

122-
extern struct pci_dev *pnv_pci_get_gpu_dev(struct pci_dev *npdev);
123-
extern struct pci_dev *pnv_pci_get_npu_dev(struct pci_dev *gpdev, int index);
124-
extern int pnv_npu2_init(struct pci_controller *hose);
125-
extern int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid,
126-
unsigned long msr);
127-
extern int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev);
128-
129122
#endif /* __ASM_POWERPC_PCI_H */

arch/powerpc/platforms/powernv/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ obj-$(CONFIG_SMP) += smp.o subcore.o subcore-asm.o
1010
obj-$(CONFIG_FA_DUMP) += opal-fadump.o
1111
obj-$(CONFIG_PRESERVE_FA_DUMP) += opal-fadump.o
1212
obj-$(CONFIG_OPAL_CORE) += opal-core.o
13-
obj-$(CONFIG_PCI) += pci.o pci-ioda.o npu-dma.o pci-ioda-tce.o
13+
obj-$(CONFIG_PCI) += pci.o pci-ioda.o pci-ioda-tce.o
1414
obj-$(CONFIG_PCI_IOV) += pci-sriov.o
1515
obj-$(CONFIG_CXL_BASE) += pci-cxl.o
1616
obj-$(CONFIG_EEH) += eeh-powernv.o

0 commit comments

Comments
 (0)