[PATCH v2 07/83] net/cxgbe: move alignment attribute on types

[Tyler Retzlaff <roretzla@linux.microsoft.com>]

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 <roretzla@linux.microsoft.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 drivers/net/cxgbe/base/adapter.h | 14 +++++++-------
 drivers/net/cxgbe/cxgbe_ofld.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/cxgbe/base/adapter.h b/drivers/net/cxgbe/base/adapter.h
index 7bee5cf..d490c6f 100644
--- a/drivers/net/cxgbe/base/adapter.h
+++ b/drivers/net/cxgbe/base/adapter.h
@@ -155,12 +155,12 @@ struct sge_eth_rx_stats {	/* Ethernet rx queue statistics */
 	u64 rx_drops;		/* # of packets dropped due to no mem */
 };
 
-struct sge_eth_rxq {                /* a SW Ethernet Rx queue */
+struct __rte_cache_aligned sge_eth_rxq {                /* a SW Ethernet Rx queue */
 	unsigned int flags;         /* flags for state of the queue */
 	struct sge_rspq rspq;
 	struct sge_fl fl;
 	struct sge_eth_rx_stats stats;
-} __rte_cache_aligned;
+};
 
 /*
  * Currently there are two types of coalesce WR. Type 0 needs 48 bytes per
@@ -252,7 +252,7 @@ struct sge_eth_tx_stats {	/* Ethernet tx queue statistics */
 	u64 coal_pkts;          /* # of coalesced packets */
 };
 
-struct sge_eth_txq {                   /* state for an SGE Ethernet Tx queue */
+struct __rte_cache_aligned sge_eth_txq {                   /* state for an SGE Ethernet Tx queue */
 	struct sge_txq q;
 	struct rte_eth_dev *eth_dev;   /* port that this queue belongs to */
 	struct rte_eth_dev_data *data;
@@ -260,21 +260,21 @@ struct sge_eth_txq {                   /* state for an SGE Ethernet Tx queue */
 	rte_spinlock_t txq_lock;
 
 	unsigned int flags;            /* flags for state of the queue */
-} __rte_cache_aligned;
+};
 
-struct sge_ctrl_txq {                /* State for an SGE control Tx queue */
+struct __rte_cache_aligned sge_ctrl_txq {                /* State for an SGE control Tx queue */
 	struct sge_txq q;            /* txq */
 	struct adapter *adapter;     /* adapter associated with this queue */
 	rte_spinlock_t ctrlq_lock;   /* control queue lock */
 	u8 full;                     /* the Tx ring is full */
 	u64 txp;                     /* number of transmits */
 	struct rte_mempool *mb_pool; /* mempool to generate ctrl pkts */
-} __rte_cache_aligned;
+};
 
 struct sge {
 	struct sge_eth_txq *ethtxq;
 	struct sge_eth_rxq *ethrxq;
-	struct sge_rspq fw_evtq __rte_cache_aligned;
+	alignas(RTE_CACHE_LINE_SIZE) struct sge_rspq fw_evtq;
 	struct sge_ctrl_txq ctrlq[MAX_CTRL_QUEUES];
 
 	u16 max_ethqsets;           /* # of available Ethernet queue sets */
diff --git a/drivers/net/cxgbe/cxgbe_ofld.h b/drivers/net/cxgbe/cxgbe_ofld.h
index 33697c7..7a4e30d 100644
--- a/drivers/net/cxgbe/cxgbe_ofld.h
+++ b/drivers/net/cxgbe/cxgbe_ofld.h
@@ -65,7 +65,7 @@ struct tid_info {
 	u32 hash_tids_in_use;
 	u32 conns_in_use;
 
-	rte_spinlock_t atid_lock __rte_cache_aligned;
+	alignas(RTE_CACHE_LINE_SIZE) rte_spinlock_t atid_lock;
 	rte_spinlock_t ftid_lock;
 };
 
-- 
1.8.3.1