d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rte_vhost: make vtpci macros lowercase

Browse Source 
In preparation to replace them with
standard functions. As these macros
are used to assign values as well,
changing them to functions is done
in a separate patch as a part of
reworking vtpci init/deinit.

Change-Id: I4f6398342b06dc9036afece3f902506e9b72a301
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/381310
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-10-04 13:12:00 +02:00 committed by Jim Harris
parent 283189d370
commit d63013de11
5 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/bdev/virtio/rte_virtio/virtio_dev.c
View File

@ -108,7 +108,7 @@ virtio_init_queue(struct virtio_dev *dev, uint16_t vtpci_queue_idx)
* Read the virtqueue size from the Queue Size field * Read the virtqueue size from the Queue Size field
* Always power of 2 and if 0 virtqueue does not exist * Always power of 2 and if 0 virtqueue does not exist
*/ */
vq_size = VTPCI_OPS(dev)->get_queue_num(dev, vtpci_queue_idx); vq_size = vtpci_ops(dev)->get_queue_num(dev, vtpci_queue_idx);
PMD_INIT_LOG(DEBUG, "vq_size: %u", vq_size); PMD_INIT_LOG(DEBUG, "vq_size: %u", vq_size);
if (vq_size == 0) { if (vq_size == 0) {
PMD_INIT_LOG(ERR, "virtqueue does not exist"); PMD_INIT_LOG(ERR, "virtqueue does not exist");
@ -172,7 +172,7 @@ virtio_init_queue(struct virtio_dev *dev, uint16_t vtpci_queue_idx)
vq->mz = mz; vq->mz = mz;
if (VTPCI_OPS(dev)->setup_queue(dev, vq) < 0) { if (vtpci_ops(dev)->setup_queue(dev, vq) < 0) {
PMD_INIT_LOG(ERR, "setup_queue failed"); PMD_INIT_LOG(ERR, "setup_queue failed");
return -EINVAL; return -EINVAL;
} }
@ -249,7 +249,7 @@ virtio_negotiate_features(struct virtio_dev *dev, uint64_t req_features)
req_features); req_features);
/* Read device(host) feature bits */ /* Read device(host) feature bits */
host_features = VTPCI_OPS(dev)->get_features(dev); host_features = vtpci_ops(dev)->get_features(dev);
PMD_INIT_LOG(DEBUG, "host_features before negotiate = %" PRIx64, PMD_INIT_LOG(DEBUG, "host_features before negotiate = %" PRIx64,
host_features); host_features);
@ -319,7 +319,7 @@ void
virtio_dev_free(struct virtio_dev *dev) virtio_dev_free(struct virtio_dev *dev)
{ {
virtio_free_queues(dev); virtio_free_queues(dev);
VTPCI_OPS(dev)->free_vdev(dev); vtpci_ops(dev)->free_vdev(dev);
/* FIXME clear VTPCI_OPS(dev) */ /* FIXME clear VTPCI_OPS(dev) */
} }

74
lib/bdev/virtio/rte_virtio/virtio_pci.c
View File

@ -122,17 +122,17 @@ legacy_read_dev_config(struct virtio_dev *dev, size_t offset,
while (length > 0) { while (length > 0) {
if (length >= 4) { if (length >= 4) {
size = 4; size = 4;
rte_pci_ioport_read(VTPCI_IO(dev), dst, size, rte_pci_ioport_read(vtpci_io(dev), dst, size,
VIRTIO_PCI_CONFIG(dev) + offset); VIRTIO_PCI_CONFIG(dev) + offset);
*(uint32_t *)dst = rte_be_to_cpu_32(*(uint32_t *)dst); *(uint32_t *)dst = rte_be_to_cpu_32(*(uint32_t *)dst);
} else if (length >= 2) { } else if (length >= 2) {
size = 2; size = 2;
rte_pci_ioport_read(VTPCI_IO(dev), dst, size, rte_pci_ioport_read(vtpci_io(dev), dst, size,
VIRTIO_PCI_CONFIG(dev) + offset); VIRTIO_PCI_CONFIG(dev) + offset);
*(uint16_t *)dst = rte_be_to_cpu_16(*(uint16_t *)dst); *(uint16_t *)dst = rte_be_to_cpu_16(*(uint16_t *)dst);
} else { } else {
size = 1; size = 1;
rte_pci_ioport_read(VTPCI_IO(dev), dst, size, rte_pci_ioport_read(vtpci_io(dev), dst, size,
VIRTIO_PCI_CONFIG(dev) + offset); VIRTIO_PCI_CONFIG(dev) + offset);
} }
@ -141,7 +141,7 @@ legacy_read_dev_config(struct virtio_dev *dev, size_t offset,
length -= size; length -= size;
} }
#else #else
rte_pci_ioport_read(VTPCI_IO(dev), dst, length, rte_pci_ioport_read(vtpci_io(dev), dst, length,
VIRTIO_PCI_CONFIG(hw) + offset); VIRTIO_PCI_CONFIG(hw) + offset);
#endif #endif
} }
@ -162,16 +162,16 @@ legacy_write_dev_config(struct virtio_dev *dev, size_t offset,
if (length >= 4) { if (length >= 4) {
size = 4; size = 4;
tmp.u32 = rte_cpu_to_be_32(*(const uint32_t *)src); tmp.u32 = rte_cpu_to_be_32(*(const uint32_t *)src);
rte_pci_ioport_write(VTPCI_IO(hw), &tmp.u32, size, rte_pci_ioport_write(vtpci_io(hw), &tmp.u32, size,
VIRTIO_PCI_CONFIG(hw) + offset); VIRTIO_PCI_CONFIG(hw) + offset);
} else if (length >= 2) { } else if (length >= 2) {
size = 2; size = 2;
tmp.u16 = rte_cpu_to_be_16(*(const uint16_t *)src); tmp.u16 = rte_cpu_to_be_16(*(const uint16_t *)src);
rte_pci_ioport_write(VTPCI_IO(hw), &tmp.u16, size, rte_pci_ioport_write(vtpci_io(hw), &tmp.u16, size,
VIRTIO_PCI_CONFIG(hw) + offset); VIRTIO_PCI_CONFIG(hw) + offset);
} else { } else {
size = 1; size = 1;
rte_pci_ioport_write(VTPCI_IO(hw), src, size, rte_pci_ioport_write(vtpci_io(hw), src, size,
VIRTIO_PCI_CONFIG(hw) + offset); VIRTIO_PCI_CONFIG(hw) + offset);
} }
@ -180,7 +180,7 @@ legacy_write_dev_config(struct virtio_dev *dev, size_t offset,
length -= size; length -= size;
} }
#else #else
rte_pci_ioport_write(VTPCI_IO(dev), src, length, rte_pci_ioport_write(vtpci_io(dev), src, length,
VIRTIO_PCI_CONFIG(hw) + offset); VIRTIO_PCI_CONFIG(hw) + offset);
#endif #endif
} }
@ -190,7 +190,7 @@ legacy_get_features(struct virtio_dev *dev)
{ {
uint32_t dst; uint32_t dst;
rte_pci_ioport_read(VTPCI_IO(dev), &dst, 4, VIRTIO_PCI_HOST_FEATURES); rte_pci_ioport_read(vtpci_io(dev), &dst, 4, VIRTIO_PCI_HOST_FEATURES);
return dst; return dst;
} }
@ -202,7 +202,7 @@ legacy_set_features(struct virtio_dev *dev, uint64_t features)
"only 32 bit features are allowed for legacy virtio!"); "only 32 bit features are allowed for legacy virtio!");
return; return;
} }
rte_pci_ioport_write(VTPCI_IO(dev), &features, 4, rte_pci_ioport_write(vtpci_io(dev), &features, 4,
VIRTIO_PCI_GUEST_FEATURES); VIRTIO_PCI_GUEST_FEATURES);
} }
@ -211,14 +211,14 @@ legacy_get_status(struct virtio_dev *dev)
{ {
uint8_t dst; uint8_t dst;
rte_pci_ioport_read(VTPCI_IO(dev), &dst, 1, VIRTIO_PCI_STATUS); rte_pci_ioport_read(vtpci_io(dev), &dst, 1, VIRTIO_PCI_STATUS);
return dst; return dst;
} }
static void static void
legacy_set_status(struct virtio_dev *dev, uint8_t status) legacy_set_status(struct virtio_dev *dev, uint8_t status)
{ {
rte_pci_ioport_write(VTPCI_IO(dev), &status, 1, VIRTIO_PCI_STATUS); rte_pci_ioport_write(vtpci_io(dev), &status, 1, VIRTIO_PCI_STATUS);
} }
static uint8_t static uint8_t
@ -226,7 +226,7 @@ legacy_get_isr(struct virtio_dev *dev)
{ {
uint8_t dst; uint8_t dst;
rte_pci_ioport_read(VTPCI_IO(dev), &dst, 1, VIRTIO_PCI_ISR); rte_pci_ioport_read(vtpci_io(dev), &dst, 1, VIRTIO_PCI_ISR);
return dst; return dst;
} }
@ -236,8 +236,8 @@ legacy_set_config_irq(struct virtio_dev *dev, uint16_t vec)
{ {
uint16_t dst; uint16_t dst;
rte_pci_ioport_write(VTPCI_IO(dev), &vec, 2, VIRTIO_MSI_CONFIG_VECTOR); rte_pci_ioport_write(vtpci_io(dev), &vec, 2, VIRTIO_MSI_CONFIG_VECTOR);
rte_pci_ioport_read(VTPCI_IO(dev), &dst, 2, VIRTIO_MSI_CONFIG_VECTOR); rte_pci_ioport_read(vtpci_io(dev), &dst, 2, VIRTIO_MSI_CONFIG_VECTOR);
return dst; return dst;
} }
@ -246,10 +246,10 @@ legacy_set_queue_irq(struct virtio_dev *dev, struct virtqueue *vq, uint16_t vec)
{ {
uint16_t dst; uint16_t dst;
rte_pci_ioport_write(VTPCI_IO(dev), &vq->vq_queue_index, 2, rte_pci_ioport_write(vtpci_io(dev), &vq->vq_queue_index, 2,
VIRTIO_PCI_QUEUE_SEL); VIRTIO_PCI_QUEUE_SEL);
rte_pci_ioport_write(VTPCI_IO(dev), &vec, 2, VIRTIO_MSI_QUEUE_VECTOR); rte_pci_ioport_write(vtpci_io(dev), &vec, 2, VIRTIO_MSI_QUEUE_VECTOR);
rte_pci_ioport_read(VTPCI_IO(dev), &dst, 2, VIRTIO_MSI_QUEUE_VECTOR); rte_pci_ioport_read(vtpci_io(dev), &dst, 2, VIRTIO_MSI_QUEUE_VECTOR);
return dst; return dst;
} }
@ -258,8 +258,8 @@ legacy_get_queue_num(struct virtio_dev *dev, uint16_t queue_id)
{ {
uint16_t dst; uint16_t dst;
rte_pci_ioport_write(VTPCI_IO(dev), &queue_id, 2, VIRTIO_PCI_QUEUE_SEL); rte_pci_ioport_write(vtpci_io(dev), &queue_id, 2, VIRTIO_PCI_QUEUE_SEL);
rte_pci_ioport_read(VTPCI_IO(dev), &dst, 2, VIRTIO_PCI_QUEUE_NUM); rte_pci_ioport_read(vtpci_io(dev), &dst, 2, VIRTIO_PCI_QUEUE_NUM);
return dst; return dst;
} }
@ -271,10 +271,10 @@ legacy_setup_queue(struct virtio_dev *dev, struct virtqueue *vq)
if (!check_vq_phys_addr_ok(vq)) if (!check_vq_phys_addr_ok(vq))
return -1; return -1;
rte_pci_ioport_write(VTPCI_IO(dev), &vq->vq_queue_index, 2, rte_pci_ioport_write(vtpci_io(dev), &vq->vq_queue_index, 2,
VIRTIO_PCI_QUEUE_SEL); VIRTIO_PCI_QUEUE_SEL);
src = vq->vq_ring_mem >> VIRTIO_PCI_QUEUE_ADDR_SHIFT; src = vq->vq_ring_mem >> VIRTIO_PCI_QUEUE_ADDR_SHIFT;
rte_pci_ioport_write(VTPCI_IO(dev), &src, 4, VIRTIO_PCI_QUEUE_PFN); rte_pci_ioport_write(vtpci_io(dev), &src, 4, VIRTIO_PCI_QUEUE_PFN);
return 0; return 0;
} }
@ -284,15 +284,15 @@ legacy_del_queue(struct virtio_dev *dev, struct virtqueue *vq)
{ {
uint32_t src = 0; uint32_t src = 0;
rte_pci_ioport_write(VTPCI_IO(dev), &vq->vq_queue_index, 2, rte_pci_ioport_write(vtpci_io(dev), &vq->vq_queue_index, 2,
VIRTIO_PCI_QUEUE_SEL); VIRTIO_PCI_QUEUE_SEL);
rte_pci_ioport_write(VTPCI_IO(dev), &src, 4, VIRTIO_PCI_QUEUE_PFN); rte_pci_ioport_write(vtpci_io(dev), &src, 4, VIRTIO_PCI_QUEUE_PFN);
} }
static void static void
legacy_notify_queue(struct virtio_dev *dev, struct virtqueue *vq) legacy_notify_queue(struct virtio_dev *dev, struct virtqueue *vq)
{ {
rte_pci_ioport_write(VTPCI_IO(dev), &vq->vq_queue_index, 2, rte_pci_ioport_write(vtpci_io(dev), &vq->vq_queue_index, 2,
VIRTIO_PCI_QUEUE_NOTIFY); VIRTIO_PCI_QUEUE_NOTIFY);
} }
@ -519,14 +519,14 @@ void
vtpci_read_dev_config(struct virtio_dev *dev, size_t offset, vtpci_read_dev_config(struct virtio_dev *dev, size_t offset,
void *dst, int length) void *dst, int length)
{ {
VTPCI_OPS(dev)->read_dev_cfg(dev, offset, dst, length); vtpci_ops(dev)->read_dev_cfg(dev, offset, dst, length);
} }
void void
vtpci_write_dev_config(struct virtio_dev *dev, size_t offset, vtpci_write_dev_config(struct virtio_dev *dev, size_t offset,
const void *src, int length) const void *src, int length)
{ {
VTPCI_OPS(dev)->write_dev_cfg(dev, offset, src, length); vtpci_ops(dev)->write_dev_cfg(dev, offset, src, length);
} }
uint64_t uint64_t
@ -539,7 +539,7 @@ vtpci_negotiate_features(struct virtio_dev *dev, uint64_t host_features)
* host all support. * host all support.
*/ */
features = host_features & dev->req_guest_features; features = host_features & dev->req_guest_features;
VTPCI_OPS(dev)->set_features(dev, features); vtpci_ops(dev)->set_features(dev, features);
return features; return features;
} }
@ -547,9 +547,9 @@ vtpci_negotiate_features(struct virtio_dev *dev, uint64_t host_features)
void void
vtpci_reset(struct virtio_dev *dev) vtpci_reset(struct virtio_dev *dev)
{ {
VTPCI_OPS(dev)->set_status(dev, VIRTIO_CONFIG_STATUS_RESET); vtpci_ops(dev)->set_status(dev, VIRTIO_CONFIG_STATUS_RESET);
/* flush status write */ /* flush status write */
VTPCI_OPS(dev)->get_status(dev); vtpci_ops(dev)->get_status(dev);
} }
void void
@ -562,21 +562,21 @@ void
vtpci_set_status(struct virtio_dev *dev, uint8_t status) vtpci_set_status(struct virtio_dev *dev, uint8_t status)
{ {
if (status != VIRTIO_CONFIG_STATUS_RESET) if (status != VIRTIO_CONFIG_STATUS_RESET)
status |= VTPCI_OPS(dev)->get_status(dev); status |= vtpci_ops(dev)->get_status(dev);
VTPCI_OPS(dev)->set_status(dev, status); vtpci_ops(dev)->set_status(dev, status);
} }
uint8_t uint8_t
vtpci_get_status(struct virtio_dev *dev) vtpci_get_status(struct virtio_dev *dev)
{ {
return VTPCI_OPS(dev)->get_status(dev); return vtpci_ops(dev)->get_status(dev);
} }
uint8_t uint8_t
vtpci_isr(struct virtio_dev *dev) vtpci_isr(struct virtio_dev *dev)
{ {
return VTPCI_OPS(dev)->get_isr(dev); return vtpci_ops(dev)->get_isr(dev);
} }
static void * static void *
@ -724,7 +724,7 @@ pci_enum_virtio_probe_cb(void *ctx, struct spdk_pci_device *pci_dev)
*/ */
if (virtio_read_caps(hw) == 0) { if (virtio_read_caps(hw) == 0) {
PMD_INIT_LOG(INFO, "modern virtio pci detected."); PMD_INIT_LOG(INFO, "modern virtio pci detected.");
VTPCI_OPS(vdev) = &modern_ops; vtpci_ops(vdev) = &modern_ops;
vdev->modern = 1; vdev->modern = 1;
TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq); TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq);
return 0; return 0;
@ -732,7 +732,7 @@ pci_enum_virtio_probe_cb(void *ctx, struct spdk_pci_device *pci_dev)
#if 0 #if 0
PMD_INIT_LOG(INFO, "trying with legacy virtio pci."); PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
if (rte_pci_ioport_map(dev, 0, VTPCI_IO(hw)) < 0) { if (rte_pci_ioport_map(dev, 0, vtpci_io(hw)) < 0) {
if (dev->kdrv == RTE_KDRV_UNKNOWN && if (dev->kdrv == RTE_KDRV_UNKNOWN &&
(!dev->device.devargs || (!dev->device.devargs ||
dev->device.devargs->type != dev->device.devargs->type !=
@ -745,7 +745,7 @@ pci_enum_virtio_probe_cb(void *ctx, struct spdk_pci_device *pci_dev)
} }
#endif #endif
VTPCI_OPS(vdev) = &legacy_ops; vtpci_ops(vdev) = &legacy_ops;
vdev->modern = 0; vdev->modern = 0;
vtpci_read_dev_config(vdev, offsetof(struct virtio_scsi_config, num_queues), vtpci_read_dev_config(vdev, offsetof(struct virtio_scsi_config, num_queues),

4
lib/bdev/virtio/rte_virtio/virtio_pci.h
View File

@ -242,8 +242,8 @@ struct vtpci_internal {
struct rte_pci_ioport io; struct rte_pci_ioport io;
}; };
#define VTPCI_OPS(dev) (g_virtio_driver.internal[(dev)->port_id].vtpci_ops) #define vtpci_ops(dev) (g_virtio_driver.internal[(dev)->port_id].vtpci_ops)
#define VTPCI_IO(dev) (&g_virtio_driver.internal[(dev)->port_id].io) #define vtpci_io(dev) (&g_virtio_driver.internal[(dev)->port_id].io)
struct virtio_driver { struct virtio_driver {
struct vtpci_internal internal[128]; struct vtpci_internal internal[128];

2
lib/bdev/virtio/rte_virtio/virtio_queue.h
View File

@ -175,7 +175,7 @@ virtqueue_notify(struct virtqueue *vq)
* For virtio on IA, the notificaiton is through io port operation * For virtio on IA, the notificaiton is through io port operation
* which is a serialization instruction itself. * which is a serialization instruction itself.
*/ */
VTPCI_OPS(vq->vdev)->notify_queue(vq->vdev, vq); vtpci_ops(vq->vdev)->notify_queue(vq->vdev, vq);
} }
#endif /* _VIRTQUEUE_H_ */ #endif /* _VIRTQUEUE_H_ */

2
lib/bdev/virtio/rte_virtio/virtio_user/virtio_user_dev.c
View File

@ -199,7 +199,7 @@ virtio_user_dev_init(char *path, int queue_size)
vdev = &dev->vdev; vdev = &dev->vdev;
vdev->is_hw = 0; vdev->is_hw = 0;
VTPCI_OPS(vdev) = &virtio_user_ops; vtpci_ops(vdev) = &virtio_user_ops;
snprintf(dev->path, PATH_MAX, "%s", path); snprintf(dev->path, PATH_MAX, "%s", path);
dev->queue_size = queue_size; dev->queue_size = queue_size;