Commit 8000a6b6 authored by Jason Wang's avatar Jason Wang Committed by Michael S. Tsirkin

virito-pci-modern: rename map_capability() to vp_modern_map_capability()

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: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210104065503.199631-16-jasowang@redhat.comSigned-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 1bfd8413
...@@ -63,12 +63,25 @@ static void vp_iowrite64_twopart(u64 val, ...@@ -63,12 +63,25 @@ static void vp_iowrite64_twopart(u64 val,
vp_iowrite32(val >> 32, hi); vp_iowrite32(val >> 32, hi);
} }
static void __iomem *map_capability(struct pci_dev *dev, int off, /*
* 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, size_t minlen,
u32 align, u32 align,
u32 start, u32 size, u32 start, u32 size,
size_t *len) size_t *len)
{ {
struct pci_dev *dev = mdev->pci_dev;
u8 bar; u8 bar;
u32 offset, length; u32 offset, length;
void __iomem *p; void __iomem *p;
...@@ -582,7 +595,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev, ...@@ -582,7 +595,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
vq->priv = (void __force *)mdev->notify_base + vq->priv = (void __force *)mdev->notify_base +
off * mdev->notify_offset_multiplier; off * mdev->notify_offset_multiplier;
} else { } 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, mdev->notify_map_cap, 2, 2,
off * mdev->notify_offset_multiplier, 2, off * mdev->notify_offset_multiplier, 2,
NULL); NULL);
...@@ -956,13 +969,13 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev) ...@@ -956,13 +969,13 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev)
return err; return err;
err = -EINVAL; err = -EINVAL;
mdev->common = map_capability(pci_dev, common, mdev->common = vp_modern_map_capability(mdev, common,
sizeof(struct virtio_pci_common_cfg), 4, sizeof(struct virtio_pci_common_cfg), 4,
0, sizeof(struct virtio_pci_common_cfg), 0, sizeof(struct virtio_pci_common_cfg),
NULL); NULL);
if (!mdev->common) if (!mdev->common)
goto err_map_common; goto err_map_common;
mdev->isr = map_capability(pci_dev, isr, sizeof(u8), 1, mdev->isr = vp_modern_map_capability(mdev, isr, sizeof(u8), 1,
0, 1, 0, 1,
NULL); NULL);
if (!mdev->isr) if (!mdev->isr)
...@@ -989,7 +1002,8 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev) ...@@ -989,7 +1002,8 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev)
* Otherwise, map each VQ individually later. * Otherwise, map each VQ individually later.
*/ */
if ((u64)notify_length + (notify_offset % PAGE_SIZE) <= PAGE_SIZE) { if ((u64)notify_length + (notify_offset % PAGE_SIZE) <= PAGE_SIZE) {
mdev->notify_base = map_capability(pci_dev, notify, 2, 2, mdev->notify_base = vp_modern_map_capability(mdev, notify,
2, 2,
0, notify_length, 0, notify_length,
&mdev->notify_len); &mdev->notify_len);
if (!mdev->notify_base) if (!mdev->notify_base)
...@@ -1002,7 +1016,7 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev) ...@@ -1002,7 +1016,7 @@ static int vp_modern_probe(struct virtio_pci_modern_device *mdev)
* is more than enough for all existing devices. * is more than enough for all existing devices.
*/ */
if (device) { if (device) {
mdev->device = map_capability(pci_dev, device, 0, 4, mdev->device = vp_modern_map_capability(mdev, device, 0, 4,
0, PAGE_SIZE, 0, PAGE_SIZE,
&mdev->device_len); &mdev->device_len);
if (!mdev->device) if (!mdev->device)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment