qat: fix build on 32-bit systems
authorJohn Griffin <john.griffin@intel.com>
Thu, 18 Feb 2016 10:57:32 +0000 (10:57 +0000)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Wed, 24 Feb 2016 14:31:02 +0000 (15:31 +0100)
Fixing build on 32-bit systems on quick assist driver - for example:
drivers/crypto/qat/qat_crypto.c: In function ‘qat_alg_write_mbuf_entry’:
drivers/crypto/qat/qat_crypto.c:408:34: error:
cast from pointer to integer of different size [-Werror=pointer-to-int-cast]

Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices")

Signed-off-by: John Griffin <john.griffin@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
drivers/crypto/qat/qat_crypto.c
scripts/test-build.sh

index 129e96d..828756b 100644 (file)
@@ -342,7 +342,7 @@ qat_crypto_pkt_rx_burst(void *qp, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
        while (*(uint32_t *)resp_msg != ADF_RING_EMPTY_SIG &&
                        msg_counter != nb_pkts) {
-               rx_mbuf = (struct rte_mbuf *)(resp_msg->opaque_data);
+               rx_mbuf = (struct rte_mbuf *)(uintptr_t)(resp_msg->opaque_data);
                ol = rte_pktmbuf_offload_get(rx_mbuf, RTE_PKTMBUF_OL_CRYPTO);
 
                if (ICP_QAT_FW_COMN_STATUS_FLAG_OK !=
@@ -405,7 +405,7 @@ qat_alg_write_mbuf_entry(struct rte_mbuf *mbuf, uint8_t *out_msg)
        ctx = (struct qat_session *)ol->op.crypto.session->_private;
        qat_req = (struct icp_qat_fw_la_bulk_req *)out_msg;
        *qat_req = ctx->fw_req;
-       qat_req->comn_mid.opaque_data = (uint64_t)mbuf;
+       qat_req->comn_mid.opaque_data = (uint64_t)(uintptr_t)mbuf;
 
        /*
         * The following code assumes:
index 6d28c5d..92eba01 100755 (executable)
@@ -125,7 +125,6 @@ config () # <directory> <target> <options>
                echo $3 | grep -q 'shared.*combined' || \
                sed -ri       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
                test "$DPDK_DEP_SSL" != y || \
-               echo $2 | grep -q '^i686' || \
                echo $3 | grep -q 'shared.*combined' || \
                sed -ri            's,(PMD_QAT=)n,\1y,' $1/.config
                sed -ri        's,(KNI_VHOST.*=)n,\1y,' $1/.config