virtio_pci: use 16-bit accessor for queue_enable.
PATCH 1/1 virtio_pci: use 16-bit accessor for queue_enable.
Since PCI is little endian, 8-bit access might work, but the spec section is very clear on this:
4.1.3.1 Driver Requirements: PCI Device Layout
The driver MUST access each field using the “natural” access method, i.e. 32-bit accesses for 32-bit fields, 16-bit accesses for 16-bit fields and 8-bit accesses for 8-bit fields.
drivers/virtio/virtio_pci_modern.c +2 -2
@@ -294,7 +294,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,/* Check if queue is either not available or already active. */ num =ioread16 (&cfg->queue_size); -if (!num ||ioread8 (&cfg->queue_enable)) +if (!num ||ioread16 (&cfg->queue_enable))return ERR_PTR (-ENOENT );if (num & (num -1 )) {
@@ -394,7 +394,7 @@ static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs,*/ list_for_each_entry (vq, &vdev->vqs, list) {iowrite16 (vq->index, &vp_dev->common->queue_select); -iowrite8 (1 , &vp_dev->common->queue_enable); +iowrite16 (1 , &vp_dev->common->queue_enable); }return 0 ;
Quoted 10 lines · Rusty Russell
Since PCI is little endian, 8-bit access might work, but the spec section is very clear on this:
4.1.3.1 Driver Requirements: PCI Device Layout
The driver MUST access each field using the “natural” access method, i.e. 32-bit accesses for 32-bit fields, 16-bit accesses for 16-bit fields and 8-bit accesses for 8-bit fields.
Signed-off-by Rusty Russell <[email protected]>
Quoted 14 lines
drivers/virtio/virtio_pci_modern.c +1
-1@@ -294,7 +294,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,/* Check if queue is either not available or already active. */ num =ioread16 (&cfg->queue_size); -if (!num ||ioread8 (&cfg->queue_enable)) +if (!num ||ioread16 (&cfg->queue_enable))return ERR_PTR (-ENOENT );if (num & (num -1 )) {
drivers/virtio/virtio_pci_modern.c static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs, · line 400
Quoted 8 lines
drivers/virtio/virtio_pci_modern.c +1
-1@@ -394,7 +394,7 @@ static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs,*/ list_for_each_entry (vq, &vdev->vqs, list) {iowrite16 (vq->index, &vp_dev->common->queue_select); -iowrite8 (1 , &vp_dev->common->queue_enable); +iowrite16 (1 , &vp_dev->common->queue_enable); }return 0 ;
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 10 lines · Rusty Russell
Since PCI is little endian, 8-bit access might work, but the spec section is very clear on this:
4.1.3.1 Driver Requirements: PCI Device Layout
The driver MUST access each field using the “natural” access method, i.e. 32-bit accesses for 32-bit fields, 16-bit accesses for 16-bit fields and 8-bit accesses for 8-bit fields.
Signed-off-by Rusty Russell <[email protected]>
Quoted 22 lines
drivers/virtio/virtio_pci_modern.c +2
-2@@ -294,7 +294,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,/* Check if queue is either not available or already active. */ num =ioread16 (&cfg->queue_size); -if (!num ||ioread8 (&cfg->queue_enable)) +if (!num ||ioread16 (&cfg->queue_enable))return ERR_PTR (-ENOENT );if (num & (num -1 )) {@@ -394,7 +394,7 @@ static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs,*/ list_for_each_entry (vq, &vdev->vqs, list) {iowrite16 (vq->index, &vp_dev->common->queue_select); -iowrite8 (1 , &vp_dev->common->queue_enable); +iowrite16 (1 , &vp_dev->common->queue_enable); }return 0 ;