common/cnxk: support tunnel header verification

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

diff --git a/drivers/raw/ifpga/base/opae_spi_transaction.c b/drivers/raw/ifpga/base/opae_spi_transaction.c
index 013efee..006cdb4 100644 (file)
--- a/drivers/raw/ifpga/base/opae_spi_transaction.c
+++ b/drivers/raw/ifpga/base/opae_spi_transaction.c
@@ -166,7 +166,7 @@ static int byte_to_core_convert(struct spi_transaction_dev *dev,
                current_byte = send_data[i];
                switch (current_byte) {
                case SPI_BYTE_IDLE:
-                       *p++ = SPI_BYTE_IDLE;
+                       *p++ = SPI_BYTE_ESC;
                        *p++ = xor_20(current_byte);
                        break;
                case SPI_BYTE_ESC:
@@ -434,11 +434,11 @@ int spi_transaction_read(struct spi_transaction_dev *dev, unsigned int addr,
 {
        int ret;
 
-       pthread_mutex_lock(&dev->lock);
+       pthread_mutex_lock(dev->mutex);
        ret = do_transaction(dev, addr, size, data,
                        (size > SPI_REG_BYTES) ?
                        SPI_TRAN_SEQ_READ : SPI_TRAN_NON_SEQ_READ);
-       pthread_mutex_unlock(&dev->lock);
+       pthread_mutex_unlock(dev->mutex);
 
        return ret;
 }
@@ -448,11 +448,11 @@ int spi_transaction_write(struct spi_transaction_dev *dev, unsigned int addr,
 {
        int ret;
 
-       pthread_mutex_lock(&dev->lock);
+       pthread_mutex_lock(dev->mutex);
        ret = do_transaction(dev, addr, size, data,
                        (size > SPI_REG_BYTES) ?
                        SPI_TRAN_SEQ_WRITE : SPI_TRAN_NON_SEQ_WRITE);
-       pthread_mutex_unlock(&dev->lock);
+       pthread_mutex_unlock(dev->mutex);
 
        return ret;
 }
@@ -479,6 +479,13 @@ struct spi_transaction_dev *spi_transaction_init(struct altera_spi_device *dev,
                dev_err(spi_tran_dev, "fail to init mutex lock\n");
                goto err;
        }
+       if (dev->mutex) {
+               dev_info(NULL, "use multi-process mutex in spi\n");
+               spi_tran_dev->mutex = dev->mutex;
+       } else {
+               dev_info(NULL, "use multi-thread mutex in spi\n");
+               spi_tran_dev->mutex = &spi_tran_dev->lock;
+       }
 
        return spi_tran_dev;