[PATCH 60/83] crypto/ccp: move alignment attribute on types

[Tyler Retzlaff]

Move location of __rte_aligned(a) to new conventional location. The new
placement between {struct,union} and the tag allows the desired
alignment to be imparted on the type regardless of the toolchain being
used for both C and C++. Additionally, it avoids confusion by Doxygen
when generating documentation.

Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
 drivers/crypto/ccp/ccp_crypto.h      | 4 ++--
 drivers/crypto/ccp/ccp_dev.h         | 8 ++++----
 drivers/crypto/ccp/ccp_pmd_private.h | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/ccp/ccp_crypto.h b/drivers/crypto/ccp/ccp_crypto.h
index d307f73..d0b417c 100644
--- a/drivers/crypto/ccp/ccp_crypto.h
+++ b/drivers/crypto/ccp/ccp_crypto.h
@@ -246,7 +246,7 @@ enum ccp_hash_op {
 };
 
 /* CCP crypto private session structure */
-struct ccp_session {
+struct __rte_cache_aligned ccp_session {
        bool auth_opt;
        enum ccp_cmd_order cmd_id;
        /**< chain order mode */
@@ -314,7 +314,7 @@ struct ccp_session {
        /**< AEAD Algorithm */
 
        uint32_t reserved;
-} __rte_cache_aligned;
+};
 
 extern uint8_t ccp_cryptodev_driver_id;
 
diff --git a/drivers/crypto/ccp/ccp_dev.h b/drivers/crypto/ccp/ccp_dev.h
index e3ec481..cd63830 100644
--- a/drivers/crypto/ccp/ccp_dev.h
+++ b/drivers/crypto/ccp/ccp_dev.h
@@ -178,7 +178,7 @@ static inline uint32_t ccp_pci_reg_read(void *base, int 
offset)
 /**
  * A structure describing a CCP command queue.
  */
-struct ccp_queue {
+struct __rte_cache_aligned ccp_queue {
        struct ccp_device *dev;
        char memz_name[RTE_MEMZONE_NAMESIZE];
 
@@ -214,12 +214,12 @@ struct ccp_queue {
        /**< lsb assigned for sha ctx */
        uint32_t sb_hmac;
        /**< lsb assigned for hmac ctx */
-} __rte_cache_aligned;
+};
 
 /**
  * A structure describing a CCP device.
  */
-struct ccp_device {
+struct __rte_cache_aligned ccp_device {
        TAILQ_ENTRY(ccp_device) next;
        int id;
        /**< ccp dev id on platform */
@@ -237,7 +237,7 @@ struct ccp_device {
        /**< current queue index */
        int hwrng_retries;
        /**< retry counter for CCP TRNG */
-} __rte_cache_aligned;
+};
 
 /**< CCP H/W engine related */
 /**
diff --git a/drivers/crypto/ccp/ccp_pmd_private.h 
b/drivers/crypto/ccp/ccp_pmd_private.h
index 6704e39..390442f 100644
--- a/drivers/crypto/ccp/ccp_pmd_private.h
+++ b/drivers/crypto/ccp/ccp_pmd_private.h
@@ -46,7 +46,7 @@ struct ccp_private {
 };
 
 /* CCP batch info */
-struct ccp_batch_info {
+struct __rte_cache_aligned ccp_batch_info {
        struct rte_crypto_op *op[CCP_MAX_BURST];
        /**< optable populated at enque time from app*/
        int op_idx;
@@ -66,10 +66,10 @@ struct ccp_batch_info {
        int lsb_buf_idx;
        uint16_t auth_ctr;
        /**< auth only ops batch for CPU based auth */
-} __rte_cache_aligned;
+};
 
 /**< CCP crypto queue pair */
-struct ccp_qp {
+struct __rte_cache_aligned ccp_qp {
        uint16_t id;
        /**< Queue Pair Identifier */
        char name[RTE_CRYPTODEV_NAME_MAX_LEN];
@@ -91,7 +91,7 @@ struct ccp_qp {
         * by the driver when verifying a digest provided
         * by the user (using authentication verify operation)
         */
-} __rte_cache_aligned;
+};
 
 
 /**< device specific operations function pointer structure */
-- 
1.8.3.1