misc: mic: Fix endianness issues.
Endianness issues are now consistent as per the documentation in host/mic_virtio.h. Sparse warnings related to endianness are also fixed. Note that the MIC driver implementation assumes that the host can be both BE or LE whereas the card is always LE. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com> Reviewed-by: Nikhil Rao <nikhil.rao@intel.com> Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

کامیت شده توسط
Greg Kroah-Hartman

والد
1e31aa9270
کامیت
173c072787
@@ -248,17 +248,16 @@ static struct virtqueue *mic_find_vq(struct virtio_device *vdev,
|
||||
/* First assign the vring's allocated in host memory */
|
||||
vqconfig = mic_vq_config(mvdev->desc) + index;
|
||||
memcpy_fromio(&config, vqconfig, sizeof(config));
|
||||
_vr_size = vring_size(config.num, MIC_VIRTIO_RING_ALIGN);
|
||||
_vr_size = vring_size(le16_to_cpu(config.num), MIC_VIRTIO_RING_ALIGN);
|
||||
vr_size = PAGE_ALIGN(_vr_size + sizeof(struct _mic_vring_info));
|
||||
va = mic_card_map(mvdev->mdev, config.address, vr_size);
|
||||
va = mic_card_map(mvdev->mdev, le64_to_cpu(config.address), vr_size);
|
||||
if (!va)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
mvdev->vr[index] = va;
|
||||
memset_io(va, 0x0, _vr_size);
|
||||
vq = vring_new_virtqueue(index,
|
||||
config.num, MIC_VIRTIO_RING_ALIGN, vdev,
|
||||
false,
|
||||
va, mic_notify, callback, name);
|
||||
vq = vring_new_virtqueue(index, le16_to_cpu(config.num),
|
||||
MIC_VIRTIO_RING_ALIGN, vdev, false, va,
|
||||
mic_notify, callback, name);
|
||||
if (!vq) {
|
||||
err = -ENOMEM;
|
||||
goto unmap;
|
||||
@@ -273,7 +272,8 @@ static struct virtqueue *mic_find_vq(struct virtio_device *vdev,
|
||||
|
||||
/* Allocate and reassign used ring now */
|
||||
mvdev->used_size[index] = PAGE_ALIGN(sizeof(__u16) * 3 +
|
||||
sizeof(struct vring_used_elem) * config.num);
|
||||
sizeof(struct vring_used_elem) *
|
||||
le16_to_cpu(config.num));
|
||||
used = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
|
||||
get_order(mvdev->used_size[index]));
|
||||
if (!used) {
|
||||
|
@@ -62,7 +62,7 @@ void mic_bootparam_init(struct mic_device *mdev)
|
||||
{
|
||||
struct mic_bootparam *bootparam = mdev->dp;
|
||||
|
||||
bootparam->magic = MIC_MAGIC;
|
||||
bootparam->magic = cpu_to_le32(MIC_MAGIC);
|
||||
bootparam->c2h_shutdown_db = mdev->shutdown_db;
|
||||
bootparam->h2c_shutdown_db = -1;
|
||||
bootparam->h2c_config_db = -1;
|
||||
|
@@ -293,8 +293,8 @@ static void mic_virtio_init_post(struct mic_vdev *mvdev)
|
||||
continue;
|
||||
}
|
||||
mvdev->mvr[i].vrh.vring.used =
|
||||
mvdev->mdev->aper.va +
|
||||
le64_to_cpu(vqconfig[i].used_address);
|
||||
mvdev->mdev->aper.va
|
||||
+ le64_to_cpu(vqconfig[i].used_address);
|
||||
}
|
||||
|
||||
mvdev->dc->used_address_updated = 0;
|
||||
@@ -525,6 +525,7 @@ int mic_virtio_add_device(struct mic_vdev *mvdev,
|
||||
char irqname[10];
|
||||
struct mic_bootparam *bootparam = mdev->dp;
|
||||
u16 num;
|
||||
dma_addr_t vr_addr;
|
||||
|
||||
mutex_lock(&mdev->mic_mutex);
|
||||
|
||||
@@ -559,17 +560,16 @@ int mic_virtio_add_device(struct mic_vdev *mvdev,
|
||||
}
|
||||
vr->len = vr_size;
|
||||
vr->info = vr->va + vring_size(num, MIC_VIRTIO_RING_ALIGN);
|
||||
vr->info->magic = MIC_MAGIC + mvdev->virtio_id + i;
|
||||
vqconfig[i].address = mic_map_single(mdev,
|
||||
vr->va, vr_size);
|
||||
if (mic_map_error(vqconfig[i].address)) {
|
||||
vr->info->magic = cpu_to_le32(MIC_MAGIC + mvdev->virtio_id + i);
|
||||
vr_addr = mic_map_single(mdev, vr->va, vr_size);
|
||||
if (mic_map_error(vr_addr)) {
|
||||
free_pages((unsigned long)vr->va, get_order(vr_size));
|
||||
ret = -ENOMEM;
|
||||
dev_err(mic_dev(mvdev), "%s %d err %d\n",
|
||||
__func__, __LINE__, ret);
|
||||
goto err;
|
||||
}
|
||||
vqconfig[i].address = cpu_to_le64(vqconfig[i].address);
|
||||
vqconfig[i].address = cpu_to_le64(vr_addr);
|
||||
|
||||
vring_init(&vr->vr, num, vr->va, MIC_VIRTIO_RING_ALIGN);
|
||||
ret = vringh_init_kern(&mvr->vrh,
|
||||
|
@@ -397,8 +397,8 @@ mic_x100_load_ramdisk(struct mic_device *mdev)
|
||||
* so copy over the ramdisk @ 128M.
|
||||
*/
|
||||
memcpy_toio(mdev->aper.va + (mdev->bootaddr << 1), fw->data, fw->size);
|
||||
iowrite32(cpu_to_le32(mdev->bootaddr << 1), &bp->hdr.ramdisk_image);
|
||||
iowrite32(cpu_to_le32(fw->size), &bp->hdr.ramdisk_size);
|
||||
iowrite32(mdev->bootaddr << 1, &bp->hdr.ramdisk_image);
|
||||
iowrite32(fw->size, &bp->hdr.ramdisk_size);
|
||||
release_firmware(fw);
|
||||
error:
|
||||
return rc;
|
||||
|
مرجع در شماره جدید
Block a user