moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio_pci_modern: correct sparse tags for notify

Browse Source 
When switching virtio_pci_modern to use a helper for mappings we lost an
__iomem tag. Restore it.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 9e3bb9b79a ("virtio_pci_modern: introduce helper to map vq notify area")
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin
2021-05-04 04:17:20 -04:00
parent 0f8a0b0b09
commit d7bce85aa7
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/virtio/virtio_pci_modern_dev.c
View File

@@ -605,8 +605,8 @@ static u16 vp_modern_get_queue_notify_off(struct virtio_pci_modern_device *mdev,
* *
* Returns the address of the notification area * Returns the address of the notification area
*/ */
void *vp_modern_map_vq_notify(struct virtio_pci_modern_device *mdev, void __iomem *vp_modern_map_vq_notify(struct virtio_pci_modern_device *mdev,
u16 index, resource_size_t *pa) u16 index, resource_size_t *pa)
{ {
u16 off = vp_modern_get_queue_notify_off(mdev, index); u16 off = vp_modern_get_queue_notify_off(mdev, index);
@@ -624,10 +624,9 @@ void *vp_modern_map_vq_notify(struct virtio_pci_modern_device *mdev,
if (pa) if (pa)
*pa = mdev->notify_pa + *pa = mdev->notify_pa +
off * mdev->notify_offset_multiplier; off * mdev->notify_offset_multiplier;
return (void __force *)mdev->notify_base + return mdev->notify_base + off * mdev->notify_offset_multiplier;
off * mdev->notify_offset_multiplier;
} else { } else {
return (void __force *)vp_modern_map_capability(mdev, return 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, pa); NULL, pa);

4
include/linux/virtio_pci_modern.h
View File

@@ -101,8 +101,8 @@ void vp_modern_set_queue_size(struct virtio_pci_modern_device *mdev,
u16 vp_modern_get_queue_size(struct virtio_pci_modern_device *mdev, u16 vp_modern_get_queue_size(struct virtio_pci_modern_device *mdev,
u16 idx); u16 idx);
u16 vp_modern_get_num_queues(struct virtio_pci_modern_device *mdev); u16 vp_modern_get_num_queues(struct virtio_pci_modern_device *mdev);
void *vp_modern_map_vq_notify(struct virtio_pci_modern_device *mdev, void __iomem * vp_modern_map_vq_notify(struct virtio_pci_modern_device *mdev,
u16 index, resource_size_t *pa); u16 index, resource_size_t *pa);
int vp_modern_probe(struct virtio_pci_modern_device *mdev); int vp_modern_probe(struct virtio_pci_modern_device *mdev);
void vp_modern_remove(struct virtio_pci_modern_device *mdev); void vp_modern_remove(struct virtio_pci_modern_device *mdev);
#endif #endif