net/ice/base: update VSI handle to remaining VSI

[dpdk.git] / drivers / baseband / fpga_lte_fec / fpga_lte_fec.c

diff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
index 7e05b94..abc5a1b 100644 (file)
--- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
+++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
@@ -114,7 +114,7 @@ enum {
 };
 
 /* FPGA LTE FEC DMA Encoding Request Descriptor */
-struct __attribute__((__packed__)) fpga_dma_enc_desc {
+struct __rte_packed fpga_dma_enc_desc {
        uint32_t done:1,
                rsrvd0:11,
                error:4,
@@ -151,7 +151,7 @@ struct __attribute__((__packed__)) fpga_dma_enc_desc {
 };
 
 /* FPGA LTE FEC DMA Decoding Request Descriptor */
-struct __attribute__((__packed__)) fpga_dma_dec_desc {
+struct __rte_packed fpga_dma_dec_desc {
        uint32_t done:1,
                iter:5,
                rsrvd0:2,
@@ -197,7 +197,7 @@ union fpga_dma_desc {
 };
 
 /* FPGA LTE FEC Ring Control Register */
-struct __attribute__((__packed__)) fpga_ring_ctrl_reg {
+struct __rte_packed fpga_ring_ctrl_reg {
        uint64_t ring_base_addr;
        uint64_t ring_head_addr;
        uint16_t ring_size:11;
@@ -889,7 +889,7 @@ fpga_queue_stop(struct rte_bbdev *dev, uint16_t queue_id)
         * completed. If completion flag is not updated within 1ms it is
         * considered as a failure.
         */
-       while (!(*((uint8_t *)d->flush_queue_status + q->q_idx) & payload)) {
+       while (!(*((volatile uint8_t *)d->flush_queue_status + q->q_idx) & payload)) {
                if (counter > timeout) {
                        rte_bbdev_log(ERR, "FPGA Queue Flush failed for queue %d",
                                        queue_id);
@@ -2307,7 +2307,7 @@ fpga_dequeue_dec(struct rte_bbdev_queue_data *q_data,
 
 /* Initialization Function */
 static void
-fpga_lte_fec_init(struct rte_bbdev *dev)
+fpga_lte_fec_init(struct rte_bbdev *dev, struct rte_pci_driver *drv)
 {
        struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
 
@@ -2318,7 +2318,7 @@ fpga_lte_fec_init(struct rte_bbdev *dev)
        dev->dequeue_dec_ops = fpga_dequeue_dec;
 
        ((struct fpga_lte_fec_device *) dev->data->dev_private)->pf_device =
-                       !strcmp(dev->device->driver->name,
+                       !strcmp(drv->driver.name,
                                        RTE_STR(FPGA_LTE_FEC_PF_DRIVER_NAME));
        ((struct fpga_lte_fec_device *) dev->data->dev_private)->mmio_base =
                        pci_dev->mem_resource[0].addr;
@@ -2331,7 +2331,7 @@ fpga_lte_fec_init(struct rte_bbdev *dev)
 }
 
 static int
-fpga_lte_fec_probe(struct rte_pci_driver *pci_drv __rte_unused,
+fpga_lte_fec_probe(struct rte_pci_driver *pci_drv,
        struct rte_pci_device *pci_dev)
 {
        struct rte_bbdev *bbdev = NULL;
@@ -2368,7 +2368,7 @@ fpga_lte_fec_probe(struct rte_pci_driver *pci_drv __rte_unused,
        bbdev->data->socket_id = pci_dev->device.numa_node;
 
        /* Invoke FEC FPGA device initialization function */
-       fpga_lte_fec_init(bbdev);
+       fpga_lte_fec_init(bbdev, pci_drv);
 
        rte_bbdev_log_debug("bbdev id = %u [%s]",
                        bbdev->data->dev_id, dev_name);