raw/ifpga/base: enhance driver reliability in multi-process

[dpdk.git] / drivers / raw / ifpga / base / ifpga_fme.c

diff --git a/drivers/raw/ifpga/base/ifpga_fme.c b/drivers/raw/ifpga/base/ifpga_fme.c
index 9057087..540bb11 100644 (file)
--- a/drivers/raw/ifpga/base/ifpga_fme.c
+++ b/drivers/raw/ifpga/base/ifpga_fme.c
@@ -919,6 +919,25 @@ static int spi_self_checking(struct intel_max10_device *dev)
        return 0;
 }
 
+static void init_spi_share_data(struct ifpga_fme_hw *fme,
+                               struct altera_spi_device *spi)
+{
+       struct ifpga_hw *hw = (struct ifpga_hw *)fme->parent;
+       opae_share_data *sd = NULL;
+
+       if (hw && hw->adapter && hw->adapter->shm.ptr) {
+               dev_info(NULL, "transfer share data to spi\n");
+               sd = (opae_share_data *)hw->adapter->shm.ptr;
+               spi->mutex = &sd->spi_mutex;
+               spi->dtb_sz_ptr = &sd->dtb_size;
+               spi->dtb = sd->dtb;
+       } else {
+               spi->mutex = NULL;
+               spi->dtb_sz_ptr = NULL;
+               spi->dtb = NULL;
+       }
+}
+
 static int fme_spi_init(struct ifpga_feature *feature)
 {
        struct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;
@@ -935,6 +954,7 @@ static int fme_spi_init(struct ifpga_feature *feature)
        spi_master = altera_spi_alloc(feature->addr, TYPE_SPI);
        if (!spi_master)
                return -ENODEV;
+       init_spi_share_data(fme, spi_master);
 
        altera_spi_init(spi_master);
 
@@ -945,7 +965,6 @@ static int fme_spi_init(struct ifpga_feature *feature)
                goto spi_fail;
        }
 
-
        fme->max10_dev = max10;
 
        /* SPI self test */
@@ -1084,11 +1103,15 @@ static int fme_nios_spi_init(struct ifpga_feature *feature)
        spi_master = altera_spi_alloc(feature->addr, TYPE_NIOS_SPI);
        if (!spi_master)
                return -ENODEV;
+       init_spi_share_data(fme, spi_master);
 
        /**
         * 1. wait A10 NIOS initial finished and
         * release the SPI master to Host
         */
+       if (spi_master->mutex)
+               pthread_mutex_lock(spi_master->mutex);
+
        ret = nios_spi_wait_init_done(spi_master);
        if (ret != 0) {
                dev_err(fme, "FME NIOS_SPI init fail\n");
@@ -1101,6 +1124,9 @@ static int fme_nios_spi_init(struct ifpga_feature *feature)
        if (nios_spi_check_error(spi_master))
                dev_info(fme, "NIOS_SPI INIT done, but found some error\n");
 
+       if (spi_master->mutex)
+               pthread_mutex_unlock(spi_master->mutex);
+
        /* 3. init the spi master*/
        altera_spi_init(spi_master);
 
@@ -1112,11 +1138,12 @@ static int fme_nios_spi_init(struct ifpga_feature *feature)
                goto release_dev;
        }
 
+       fme->max10_dev = max10;
+
        max10->bus = hw->pci_data->bus;
 
        fme_get_board_interface(fme);
 
-       fme->max10_dev = max10;
        mgr->sensor_list = &max10->opae_sensor_list;
 
        /* SPI self test */
@@ -1178,6 +1205,25 @@ static int i2c_mac_rom_test(struct altera_i2c_dev *dev)
        return 0;
 }
 
+static void init_i2c_mutex(struct ifpga_fme_hw *fme)
+{
+       struct ifpga_hw *hw = (struct ifpga_hw *)fme->parent;
+       struct altera_i2c_dev *i2c_dev;
+       opae_share_data *sd = NULL;
+
+       if (fme->i2c_master) {
+               i2c_dev = (struct altera_i2c_dev *)fme->i2c_master;
+               if (hw && hw->adapter && hw->adapter->shm.ptr) {
+                       dev_info(NULL, "use multi-process mutex in i2c\n");
+                       sd = (opae_share_data *)hw->adapter->shm.ptr;
+                       i2c_dev->mutex = &sd->i2c_mutex;
+               } else {
+                       dev_info(NULL, "use multi-thread mutex in i2c\n");
+                       i2c_dev->mutex = &i2c_dev->lock;
+               }
+       }
+}
+
 static int fme_i2c_init(struct ifpga_feature *feature)
 {
        struct feature_fme_i2c *i2c;
@@ -1191,6 +1237,8 @@ static int fme_i2c_init(struct ifpga_feature *feature)
        if (!fme->i2c_master)
                return -ENODEV;
 
+       init_i2c_mutex(fme);
+
        /* MAC ROM self test */
        i2c_mac_rom_test(fme->i2c_master);