From: Max Gurtovoy <mgurtovoy@nvidia.com>
To: <jgg@nvidia.com>, <cohuck@redhat.com>, <kvm@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <alex.williamson@redhat.com>
Cc: <liranl@nvidia.com>, <oren@nvidia.com>, <tzahio@nvidia.com>,
<leonro@nvidia.com>, <yarong@nvidia.com>, <aviadye@nvidia.com>,
<shahafs@nvidia.com>, <artemp@nvidia.com>, <kwankhede@nvidia.com>,
<ACurrid@nvidia.com>, <gmataev@nvidia.com>, <cjia@nvidia.com>,
<mjrosato@linux.ibm.com>, <yishaih@nvidia.com>, <aik@ozlabs.ru>,
Max Gurtovoy <mgurtovoy@nvidia.com>
Subject: [PATCH 9/9] vfio/pci: use powernv naming instead of nvlink2
Date: Mon, 1 Feb 2021 16:28:28 +0000 [thread overview]
Message-ID: <20210201162828.5938-10-mgurtovoy@nvidia.com> (raw)
In-Reply-To: <20210201162828.5938-1-mgurtovoy@nvidia.com>
This patch doesn't change any logic but only align to the concept of
vfio_pci_core extensions. Extensions that are related to a platform
and not to a specific vendor of PCI devices should be part of the
core driver. Extensions that are specific for PCI device vendor should go
to a dedicated vendor vfio-pci driver.
For now, powernv extensions will include only nvlink2.
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
---
drivers/vfio/pci/Kconfig | 6 ++++--
drivers/vfio/pci/Makefile | 2 +-
drivers/vfio/pci/vfio_pci_core.c | 4 ++--
drivers/vfio/pci/{vfio_pci_nvlink2.c => vfio_pci_powernv.c} | 0
drivers/vfio/pci/vfio_pci_private.h | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
rename drivers/vfio/pci/{vfio_pci_nvlink2.c => vfio_pci_powernv.c} (100%)
diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig
index c98f2df01a60..fe0264b3d02f 100644
--- a/drivers/vfio/pci/Kconfig
+++ b/drivers/vfio/pci/Kconfig
@@ -47,11 +47,13 @@ config VFIO_PCI_X86
To enable Intel X86 extensions for vfio-pci-core, say Y.
-config VFIO_PCI_NVLINK2
+config VFIO_PCI_POWERNV
def_bool y
depends on VFIO_PCI_CORE && PPC_POWERNV
help
- VFIO PCI support for P9 Witherspoon machine with NVIDIA V100 GPUs
+ VFIO PCI extensions for IBM PowerNV (Non-Virtualized) platform
+
+ To enable POWERNV extensions for vfio-pci-core, say Y.
config VFIO_PCI_S390
bool "VFIO PCI extensions for S390 platform"
diff --git a/drivers/vfio/pci/Makefile b/drivers/vfio/pci/Makefile
index d8ccb70e015a..442b7c78de4c 100644
--- a/drivers/vfio/pci/Makefile
+++ b/drivers/vfio/pci/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_MLX5_VFIO_PCI) += mlx5-vfio-pci.o
vfio-pci-core-y := vfio_pci_core.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o
vfio-pci-core-$(CONFIG_VFIO_PCI_X86) += vfio_pci_x86.o
-vfio-pci-core-$(CONFIG_VFIO_PCI_NVLINK2) += vfio_pci_nvlink2.o
+vfio-pci-core-$(CONFIG_VFIO_PCI_POWERNV) += vfio_pci_powernv.o
vfio-pci-core-$(CONFIG_VFIO_PCI_ZDEV) += vfio_pci_s390.o
vfio-pci-y := vfio_pci.o
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index e0e258c37fb5..90cc728fffc7 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -337,7 +337,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev)
}
if (pdev->vendor == PCI_VENDOR_ID_NVIDIA &&
- IS_ENABLED(CONFIG_VFIO_PCI_NVLINK2)) {
+ IS_ENABLED(CONFIG_VFIO_PCI_POWERNV)) {
ret = vfio_pci_nvdia_v100_nvlink2_init(vdev);
if (ret && ret != -ENODEV) {
pci_warn(pdev, "Failed to setup NVIDIA NV2 RAM region\n");
@@ -346,7 +346,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev)
}
if (pdev->vendor == PCI_VENDOR_ID_IBM &&
- IS_ENABLED(CONFIG_VFIO_PCI_NVLINK2)) {
+ IS_ENABLED(CONFIG_VFIO_PCI_POWERNV)) {
ret = vfio_pci_ibm_npu2_init(vdev);
if (ret && ret != -ENODEV) {
pci_warn(pdev, "Failed to setup NVIDIA NV2 ATSD region\n");
diff --git a/drivers/vfio/pci/vfio_pci_nvlink2.c b/drivers/vfio/pci/vfio_pci_powernv.c
similarity index 100%
rename from drivers/vfio/pci/vfio_pci_nvlink2.c
rename to drivers/vfio/pci/vfio_pci_powernv.c
diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
index efc688525784..dc6a9191a704 100644
--- a/drivers/vfio/pci/vfio_pci_private.h
+++ b/drivers/vfio/pci/vfio_pci_private.h
@@ -173,7 +173,7 @@ static inline int vfio_pci_igd_init(struct vfio_pci_device *vdev)
return -ENODEV;
}
#endif
-#ifdef CONFIG_VFIO_PCI_NVLINK2
+#ifdef CONFIG_VFIO_PCI_POWERNV
extern int vfio_pci_nvdia_v100_nvlink2_init(struct vfio_pci_device *vdev);
extern int vfio_pci_ibm_npu2_init(struct vfio_pci_device *vdev);
#else
--
2.25.4
next prev parent reply other threads:[~2021-02-01 16:30 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 16:28 [PATCH v2 0/9] Introduce vfio-pci-core subsystem Max Gurtovoy
2021-02-01 16:28 ` [PATCH 1/9] vfio-pci: rename vfio_pci.c to vfio_pci_core.c Max Gurtovoy
2021-02-01 16:28 ` [PATCH 2/9] vfio-pci: introduce vfio_pci_core subsystem driver Max Gurtovoy
2021-02-01 16:28 ` [PATCH 3/9] vfio-pci-core: export vfio_pci_register_dev_region function Max Gurtovoy
2021-02-01 16:28 ` [PATCH 4/9] mlx5-vfio-pci: add new vfio_pci driver for mlx5 devices Max Gurtovoy
2021-02-01 16:28 ` [PATCH 5/9] vfio-pci/zdev: remove unused vdev argument Max Gurtovoy
2021-02-01 17:27 ` Matthew Rosato
2021-02-02 7:57 ` Cornelia Huck
2021-02-02 17:21 ` Alex Williamson
2021-02-01 16:28 ` [PATCH 6/9] vfio-pci/zdev: fix possible segmentation fault issue Max Gurtovoy
2021-02-01 16:52 ` Cornelia Huck
2021-02-01 17:08 ` Matthew Rosato
2021-02-01 20:47 ` Alex Williamson
2021-02-02 7:58 ` Cornelia Huck
2021-02-01 16:28 ` [PATCH 7/9] vfio/pci: use s390 naming instead of zdev Max Gurtovoy
2021-02-01 16:28 ` [PATCH 8/9] vfio/pci: use x86 naming instead of igd Max Gurtovoy
2021-02-01 17:14 ` Cornelia Huck
2021-02-01 17:49 ` Matthew Rosato
2021-02-01 18:42 ` Alex Williamson
2021-02-02 16:06 ` Cornelia Huck
2021-02-02 17:10 ` Jason Gunthorpe
2021-02-11 15:47 ` Max Gurtovoy
2021-02-11 16:29 ` Matthew Rosato
2021-02-11 17:39 ` Cornelia Huck
2021-02-02 17:41 ` Max Gurtovoy
2021-02-02 17:54 ` Alex Williamson
2021-02-02 18:50 ` Jason Gunthorpe
2021-02-02 18:55 ` Christoph Hellwig
2021-02-02 19:05 ` Jason Gunthorpe
2021-02-02 19:37 ` Alex Williamson
2021-02-02 20:44 ` Jason Gunthorpe
2021-02-02 20:59 ` Max Gurtovoy
2021-02-02 21:30 ` Alex Williamson
2021-02-02 23:06 ` Jason Gunthorpe
2021-02-02 23:59 ` Alex Williamson
2021-02-03 13:54 ` Jason Gunthorpe
2021-02-11 8:47 ` Christoph Hellwig
2021-02-11 14:30 ` Jason Gunthorpe
2021-02-11 8:44 ` Christoph Hellwig
2021-02-11 19:43 ` Alex Williamson
[not found] ` <806c138e-685c-0955-7c15-93cb1d4fe0d9@ozlabs.ru>
2021-02-03 16:07 ` Max Gurtovoy
[not found] ` <83ef0164-6291-c3d1-0ce5-2c9d6c97469e@ozlabs.ru>
2021-02-04 12:51 ` Jason Gunthorpe
2021-02-05 0:42 ` Alexey Kardashevskiy
2021-02-08 12:44 ` Max Gurtovoy
2021-02-09 1:55 ` Alexey Kardashevskiy
2021-02-08 18:13 ` Jason Gunthorpe
2021-02-09 1:51 ` Alexey Kardashevskiy
2021-02-04 9:12 ` Max Gurtovoy
2021-02-11 8:50 ` Christoph Hellwig
2021-02-11 14:49 ` Jason Gunthorpe
2021-02-01 16:28 ` Max Gurtovoy [this message]
2021-02-01 18:35 ` [PATCH 9/9] vfio/pci: use powernv naming instead of nvlink2 Jason Gunthorpe
2021-02-10 7:52 ` [PATCH v2 0/9] Introduce vfio-pci-core subsystem Tian, Kevin
2021-02-10 13:34 ` Jason Gunthorpe
2021-02-10 16:37 ` Alex Williamson
2021-02-10 17:08 ` Jason Gunthorpe
2021-02-11 8:36 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210201162828.5938-10-mgurtovoy@nvidia.com \
--to=mgurtovoy@nvidia.com \
--cc=ACurrid@nvidia.com \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=artemp@nvidia.com \
--cc=aviadye@nvidia.com \
--cc=cjia@nvidia.com \
--cc=cohuck@redhat.com \
--cc=gmataev@nvidia.com \
--cc=jgg@nvidia.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liranl@nvidia.com \
--cc=mjrosato@linux.ibm.com \
--cc=oren@nvidia.com \
--cc=shahafs@nvidia.com \
--cc=tzahio@nvidia.com \
--cc=yarong@nvidia.com \
--cc=yishaih@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).