From: Zhu Lingshan <lingshan.zhu@intel.com>
To: jasowang@redhat.com, mst@redhat.com
Cc: virtualization@lists.linux.dev, Zhu Lingshan <lingshan.zhu@intel.com>
Subject: [PATCH] ifcvf/vDPA: ifcvf drives standard virtio pci devices
Date: Tue, 14 May 2024 05:27:07 +0800 [thread overview]
Message-ID: <20240513212707.9894-1-lingshan.zhu@intel.com> (raw)
Most of ifcvf code work for standard virtio pci,
except for bar4. This commit makes bar4 only effective
for Intel products, thereby turning ifcvf into
a standard virtio pci driver.
Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
---
drivers/vdpa/Kconfig | 2 +-
drivers/vdpa/ifcvf/ifcvf_base.c | 17 ++++++++++++-----
drivers/vdpa/ifcvf/ifcvf_main.c | 5 ++++-
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/vdpa/Kconfig b/drivers/vdpa/Kconfig
index 656c1cb541de..dbf09f35bcef 100644
--- a/drivers/vdpa/Kconfig
+++ b/drivers/vdpa/Kconfig
@@ -44,7 +44,7 @@ config VDPA_USER
in a userspace program.
config IFCVF
- tristate "Intel IFC VF vDPA driver"
+ tristate "Intel IFC VF and standard virtio-pci vDPA driver"
depends on PCI_MSI
help
This kernel module can drive Intel IFC VF NIC to offload
diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c
index 472daa588a9d..47bc9b11c678 100644
--- a/drivers/vdpa/ifcvf/ifcvf_base.c
+++ b/drivers/vdpa/ifcvf/ifcvf_base.c
@@ -178,7 +178,8 @@ int ifcvf_init_hw(struct ifcvf_hw *hw, struct pci_dev *pdev)
hw->vring[i].irq = -EINVAL;
}
- hw->lm_cfg = hw->base[IFCVF_LM_BAR];
+ if (hw->pdev->subsystem_vendor == PCI_VENDOR_ID_INTEL)
+ hw->lm_cfg = hw->base[IFCVF_LM_BAR];
IFCVF_DBG(pdev,
"PCI capability mapping: common cfg: %p, notify base: %p\n, isr cfg: %p, device cfg: %p, multiplier: %u\n",
@@ -330,18 +331,24 @@ u16 ifcvf_get_vq_state(struct ifcvf_hw *hw, u16 qid)
struct ifcvf_lm_cfg __iomem *lm_cfg = hw->lm_cfg;
u16 last_avail_idx;
- last_avail_idx = vp_ioread16(&lm_cfg->vq_state_region + qid * 2);
+ if (lm_cfg) {
+ last_avail_idx = vp_ioread16(&lm_cfg->vq_state_region + qid * 2);
+ return last_avail_idx;
+ }
- return last_avail_idx;
+ return -EOPNOTSUPP;
}
int ifcvf_set_vq_state(struct ifcvf_hw *hw, u16 qid, u16 num)
{
struct ifcvf_lm_cfg __iomem *lm_cfg = hw->lm_cfg;
- vp_iowrite16(num, &lm_cfg->vq_state_region + qid * 2);
+ if (lm_cfg) {
+ vp_iowrite16(num, &lm_cfg->vq_state_region + qid * 2);
+ return 0;
+ }
- return 0;
+ return -EOPNOTSUPP;
}
void ifcvf_set_vq_num(struct ifcvf_hw *hw, u16 qid, u32 num)
diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index 80d0a0460885..e89fd4d96ff1 100644
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Intel IFC VF NIC driver for virtio dataplane offloading
+ * This driver also drives standard virtio-pci hardwares
*
* Copyright (C) 2020 Intel Corporation.
*
@@ -880,7 +881,9 @@ static struct pci_device_id ifcvf_pci_ids[] = {
VIRTIO_TRANS_ID_BLOCK,
PCI_VENDOR_ID_INTEL,
VIRTIO_ID_BLOCK) },
-
+ /* standard virtio pci devices */
+ { PCI_DEVICE(PCI_VENDOR_ID_REDHAT_QUMRANET,
+ PCI_ANY_ID) },
{ 0 },
};
MODULE_DEVICE_TABLE(pci, ifcvf_pci_ids);
--
2.43.0
next reply other threads:[~2024-05-13 13:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-13 21:27 Zhu Lingshan [this message]
2024-05-13 13:36 ` [PATCH] ifcvf/vDPA: ifcvf drives standard virtio pci devices Parav Pandit
2024-05-14 1:27 ` Zhu, Lingshan
2024-05-14 3:33 ` Parav Pandit
2024-05-14 5:25 ` Zhu, Lingshan
2024-05-13 13:38 ` Michael S. Tsirkin
2024-05-14 1:22 ` Zhu, Lingshan
2024-05-14 13:44 ` Michael S. Tsirkin
2024-05-15 7:28 ` Zhu, Lingshan
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=20240513212707.9894-1-lingshan.zhu@intel.com \
--to=lingshan.zhu@intel.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=virtualization@lists.linux.dev \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).