From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Cc: shahafs@mellanox.com
Subject: [PATCH V2 15/19] virito-pci-modern: rename map_capability() to vp_modern_map_capability()
Date: Fri, 4 Dec 2020 12:03:49 +0800 [thread overview]
Message-ID: <20201204040353.21679-16-jasowang@redhat.com> (raw)
In-Reply-To: <20201204040353.21679-1-jasowang@redhat.com>
To ease the split, map_capability() was renamed to
vp_modern_map_capability(). While at it, add the comments for the
arguments and switch to use virtio_pci_modern_device as the first
parameter.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/virtio/virtio_pci_modern.c | 46 +++++++++++++++++++-----------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 217573f2588d..a5e3a5e40323 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -63,12 +63,25 @@ static void vp_iowrite64_twopart(u64 val,
vp_iowrite32(val >> 32, hi);
}
-static void __iomem *map_capability(struct pci_dev *dev, int off,
- size_t minlen,
- u32 align,
- u32 start, u32 size,
- size_t *len)
+/*
+ * vp_modern_map_capability - map a part of virtio pci capability
+ * @mdev: the modern virtio-pci device
+ * @off: offset of the capability
+ * @minlen: minimal length of the capability
+ * @align: align requirement
+ * @start: start from the capability
+ * @size: map size
+ * @len: the length that is actually mapped
+ *
+ * Returns the io address of for the part of the capability
+ */
+void __iomem *vp_modern_map_capability(struct virtio_pci_modern_device *mdev, int off,
+ size_t minlen,
+ u32 align,
+ u32 start, u32 size,
+ size_t *len)
{
+ struct pci_dev *dev = mdev->pci_dev;
u8 bar;
u32 offset, length;
void __iomem *p;
@@ -582,7 +595,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
vq->priv = (void __force *)mdev->notify_base +
off * mdev->notify_offset_multiplier;
} else {
- vq->priv = (void __force *)map_capability(mdev->pci_dev,
+ vq->priv = (void __force *)vp_modern_map_capability(mdev,
mdev->notify_map_cap, 2, 2,
off * mdev->notify_offset_multiplier, 2,
NULL);
@@ -956,15 +969,15 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev)
return err;
err = -EINVAL;
- mdev->common = map_capability(pci_dev, common,
+ mdev->common = vp_modern_map_capability(mdev, common,
sizeof(struct virtio_pci_common_cfg), 4,
0, sizeof(struct virtio_pci_common_cfg),
NULL);
if (!mdev->common)
goto err_map_common;
- mdev->isr = map_capability(pci_dev, isr, sizeof(u8), 1,
- 0, 1,
- NULL);
+ mdev->isr = vp_modern_map_capability(mdev, isr, sizeof(u8), 1,
+ 0, 1,
+ NULL);
if (!mdev->isr)
goto err_map_isr;
@@ -989,9 +1002,10 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev)
* Otherwise, map each VQ individually later.
*/
if ((u64)notify_length + (notify_offset % PAGE_SIZE) <= PAGE_SIZE) {
- mdev->notify_base = map_capability(pci_dev, notify, 2, 2,
- 0, notify_length,
- &mdev->notify_len);
+ mdev->notify_base = vp_modern_map_capability(mdev, notify,
+ 2, 2,
+ 0, notify_length,
+ &mdev->notify_len);
if (!mdev->notify_base)
goto err_map_notify;
} else {
@@ -1002,9 +1016,9 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev)
* is more than enough for all existing devices.
*/
if (device) {
- mdev->device = map_capability(pci_dev, device, 0, 4,
- 0, PAGE_SIZE,
- &mdev->device_len);
+ mdev->device = vp_modern_map_capability(mdev, device, 0, 4,
+ 0, PAGE_SIZE,
+ &mdev->device_len);
if (!mdev->device)
goto err_map_device;
}
--
2.25.1
next prev parent reply other threads:[~2020-12-04 4:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 4:03 [PATCH V2 00/19] vDPA driver for virtio-pci device Jason Wang
2020-12-04 4:03 ` [PATCH V2 01/19] virtio-pci: do not access iomem via struct virtio_pci_device directly Jason Wang
2020-12-04 4:03 ` [PATCH V2 02/19] virtio-pci: split out modern device Jason Wang
2020-12-04 4:03 ` [PATCH V2 03/19] virtio-pci-modern: factor out modern device initialization logic Jason Wang
2020-12-04 4:03 ` [PATCH V2 04/19] virtio-pci-modern: introduce vp_modern_remove() Jason Wang
2020-12-04 4:03 ` [PATCH V2 05/19] virtio-pci-modern: introduce helper to set config vector Jason Wang
2020-12-04 4:03 ` [PATCH V2 06/19] virtio-pci-modern: introduce helpers for setting and getting status Jason Wang
2020-12-04 4:03 ` [PATCH V2 07/19] virtio-pci-modern: introduce helpers for setting and getting features Jason Wang
2020-12-04 4:03 ` [PATCH V2 08/19] virtio-pci-modern: introduce vp_modern_generation() Jason Wang
2020-12-04 4:03 ` [PATCH V2 09/19] virtio-pci-modern: introduce vp_modern_set_queue_vector() Jason Wang
2020-12-04 4:03 ` [PATCH V2 10/19] virtio-pci-modern: introduce vp_modern_queue_address() Jason Wang
2020-12-04 4:03 ` [PATCH V2 11/19] virtio-pci-modern: introduce helper to set/get queue_enable Jason Wang
2020-12-04 4:03 ` [PATCH V2 12/19] virtio-pci-modern: introduce helper for setting/geting queue size Jason Wang
2020-12-04 4:03 ` [PATCH V2 13/19] virtio-pci-modern: introduce helper for getting queue nums Jason Wang
2020-12-04 4:03 ` [PATCH V2 14/19] virtio-pci-modern: introduce helper to get notification offset Jason Wang
2020-12-04 4:03 ` Jason Wang [this message]
2020-12-04 4:03 ` [PATCH V2 16/19] virtio-pci: introduce modern device module Jason Wang
2020-12-04 17:10 ` Randy Dunlap
2021-01-04 3:22 ` Jason Wang
2020-12-04 4:03 ` [PATCH V2 17/19] vdpa: set the virtqueue num during register Jason Wang
2020-12-04 14:30 ` Stefano Garzarella
2020-12-04 4:03 ` [PATCH V2 18/19] virtio_vdpa: don't warn when fail to disable vq Jason Wang
2020-12-04 4:03 ` [PATCH V2 19/19] vdpa: introduce virtio pci driver Jason Wang
2020-12-04 15:20 ` Stefano Garzarella
2020-12-04 17:12 ` Randy Dunlap
2020-12-07 3:29 ` Jason Wang
2021-01-04 3:28 ` Jason Wang
2020-12-31 3:52 ` [PATCH V2 00/19] vDPA driver for virtio-pci device Jason Wang
2021-01-03 12:37 ` Michael S. Tsirkin
2021-01-04 6:58 ` Jason Wang
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=20201204040353.21679-16-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=shahafs@mellanox.com \
--cc=virtualization@lists.linux-foundation.org \
/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).