Commit d3b8c9b3 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: descs: use u32 for descriptors 



Use u32 rather than unsigned int for 32-bit descriptor variables.
This will allow the u32 bitfield helpers to be used. Note, we use
__le32 for the in-memory descriptor structures.

Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vdtvx-00000002Gth-32RU@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ec3fde9e

drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c

+9 −11
Original line number Diff line number Diff line
@@ -17,11 +17,9 @@ static int dwmac4_wrback_get_tx_status(struct stmmac_extra_stats *x, 
				       struct dma_desc *p,

				       void __iomem *ioaddr)

{

	unsigned int tdes3;

	u32 tdes3 = le32_to_cpu(p->des3);

	int ret = tx_done;



	tdes3 = le32_to_cpu(p->des3);



	/* Get tx owner first */

	if (unlikely(tdes3 & TDES3_OWN))

		return tx_dma_own;
@@ -73,9 +71,9 @@ static int dwmac4_wrback_get_tx_status(struct stmmac_extra_stats *x, 
static int dwmac4_wrback_get_rx_status(struct stmmac_extra_stats *x,

				       struct dma_desc *p)

{

	unsigned int rdes1 = le32_to_cpu(p->des1);

	unsigned int rdes2 = le32_to_cpu(p->des2);

	unsigned int rdes3 = le32_to_cpu(p->des3);

	u32 rdes1 = le32_to_cpu(p->des1);

	u32 rdes2 = le32_to_cpu(p->des2);

	u32 rdes3 = le32_to_cpu(p->des3);

	int message_type;

	int ret = good_frame;
@@ -255,9 +253,9 @@ static inline void dwmac4_get_timestamp(void *desc, u32 ats, u64 *ts) 
static int dwmac4_rx_check_timestamp(void *desc)

{

	struct dma_desc *p = (struct dma_desc *)desc;

	unsigned int rdes0 = le32_to_cpu(p->des0);

	unsigned int rdes1 = le32_to_cpu(p->des1);

	unsigned int rdes3 = le32_to_cpu(p->des3);

	u32 rdes0 = le32_to_cpu(p->des0);

	u32 rdes1 = le32_to_cpu(p->des1);

	u32 rdes3 = le32_to_cpu(p->des3);

	u32 own, ctxt;

	int ret = 1;
@@ -327,7 +325,7 @@ static void dwmac4_rd_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, 
				      bool csum_flag, int mode, bool tx_own,

				      bool ls, unsigned int tot_pkt_len)

{

	unsigned int tdes3 = le32_to_cpu(p->des3);

	u32 tdes3 = le32_to_cpu(p->des3);



	p->des2 |= cpu_to_le32(len & TDES2_BUFFER1_SIZE_MASK);
@@ -366,7 +364,7 @@ static void dwmac4_rd_prepare_tso_tx_desc(struct dma_desc *p, int is_fs, 
					  bool ls, unsigned int tcphdrlen,

					  unsigned int tcppayloadlen)

{

	unsigned int tdes3 = le32_to_cpu(p->des3);

	u32 tdes3 = le32_to_cpu(p->des3);



	if (len1)

		p->des2 |= cpu_to_le32((len1 & TDES2_BUFFER1_SIZE_MASK));

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c

+7 −7
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
static int dwxgmac2_get_tx_status(struct stmmac_extra_stats *x,

				  struct dma_desc *p, void __iomem *ioaddr)

{

	unsigned int tdes3 = le32_to_cpu(p->des3);

	u32 tdes3 = le32_to_cpu(p->des3);

	int ret = tx_done;



	if (unlikely(tdes3 & XGMAC_TDES3_OWN))
@@ -26,7 +26,7 @@ static int dwxgmac2_get_tx_status(struct stmmac_extra_stats *x, 
static int dwxgmac2_get_rx_status(struct stmmac_extra_stats *x,

				  struct dma_desc *p)

{

	unsigned int rdes3 = le32_to_cpu(p->des3);

	u32 rdes3 = le32_to_cpu(p->des3);



	if (unlikely(rdes3 & XGMAC_RDES3_OWN))

		return dma_own;
@@ -114,7 +114,7 @@ static inline void dwxgmac2_get_timestamp(void *desc, u32 ats, u64 *ts) 
static int dwxgmac2_rx_check_timestamp(void *desc)

{

	struct dma_desc *p = (struct dma_desc *)desc;

	unsigned int rdes3 = le32_to_cpu(p->des3);

	u32 rdes3 = le32_to_cpu(p->des3);

	bool desc_valid, ts_valid;



	dma_rmb();
@@ -135,7 +135,7 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc, 
					    u32 ats)

{

	struct dma_desc *p = (struct dma_desc *)desc;

	unsigned int rdes3 = le32_to_cpu(p->des3);

	u32 rdes3 = le32_to_cpu(p->des3);

	int ret = -EBUSY;



	if (likely(rdes3 & XGMAC_RDES3_CDA))
@@ -162,7 +162,7 @@ static void dwxgmac2_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, 
				     bool csum_flag, int mode, bool tx_own,

				     bool ls, unsigned int tot_pkt_len)

{

	unsigned int tdes3 = le32_to_cpu(p->des3);

	u32 tdes3 = le32_to_cpu(p->des3);



	p->des2 |= cpu_to_le32(len & XGMAC_TDES2_B1L);
@@ -201,7 +201,7 @@ static void dwxgmac2_prepare_tso_tx_desc(struct dma_desc *p, int is_fs, 
					 bool ls, unsigned int tcphdrlen,

					 unsigned int tcppayloadlen)

{

	unsigned int tdes3 = le32_to_cpu(p->des3);

	u32 tdes3 = le32_to_cpu(p->des3);



	if (len1)

		p->des2 |= cpu_to_le32(len1 & XGMAC_TDES2_B1L);
@@ -274,7 +274,7 @@ static void dwxgmac2_clear(struct dma_desc *p) 
static int dwxgmac2_get_rx_hash(struct dma_desc *p, u32 *hash,

				enum pkt_hash_types *type)

{

	unsigned int rdes3 = le32_to_cpu(p->des3);

	u32 rdes3 = le32_to_cpu(p->des3);

	u32 ptype;



	if (rdes3 & XGMAC_RDES3_RSV) {

drivers/net/ethernet/stmicro/stmmac/enh_desc.c

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
static int enh_desc_get_tx_status(struct stmmac_extra_stats *x,

				  struct dma_desc *p, void __iomem *ioaddr)

{

	unsigned int tdes0 = le32_to_cpu(p->des0);

	u32 tdes0 = le32_to_cpu(p->des0);

	int ret = tx_done;



	/* Get tx owner first */
@@ -117,8 +117,8 @@ static int enh_desc_coe_rdes0(int ipc_err, int type, int payload_err) 
static void enh_desc_get_ext_status(struct stmmac_extra_stats *x,

				    struct dma_extended_desc *p)

{

	unsigned int rdes0 = le32_to_cpu(p->basic.des0);

	unsigned int rdes4 = le32_to_cpu(p->des4);

	u32 rdes0 = le32_to_cpu(p->basic.des0);

	u32 rdes4 = le32_to_cpu(p->des4);



	if (unlikely(rdes0 & ERDES0_RX_MAC_ADDR)) {

		int message_type = (rdes4 & ERDES4_MSG_TYPE_MASK) >> 8;
@@ -181,7 +181,7 @@ static void enh_desc_get_ext_status(struct stmmac_extra_stats *x, 
static int enh_desc_get_rx_status(struct stmmac_extra_stats *x,

				  struct dma_desc *p)

{

	unsigned int rdes0 = le32_to_cpu(p->des0);

	u32 rdes0 = le32_to_cpu(p->des0);

	int ret = good_frame;



	if (unlikely(rdes0 & RDES0_OWN))
@@ -312,7 +312,7 @@ static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, 
				     bool csum_flag, int mode, bool tx_own,

				     bool ls, unsigned int tot_pkt_len)

{

	unsigned int tdes0 = le32_to_cpu(p->des0);

	u32 tdes0 = le32_to_cpu(p->des0);



	if (mode == STMMAC_CHAIN_MODE)

		enh_set_tx_desc_len_on_chain(p, len);

drivers/net/ethernet/stmicro/stmmac/norm_desc.c

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
static int ndesc_get_tx_status(struct stmmac_extra_stats *x,

			       struct dma_desc *p, void __iomem *ioaddr)

{

	unsigned int tdes0 = le32_to_cpu(p->des0);

	unsigned int tdes1 = le32_to_cpu(p->des1);

	u32 tdes0 = le32_to_cpu(p->des0);

	u32 tdes1 = le32_to_cpu(p->des1);

	int ret = tx_done;



	/* Get tx owner first */
@@ -69,8 +69,8 @@ static int ndesc_get_tx_len(struct dma_desc *p) 
static int ndesc_get_rx_status(struct stmmac_extra_stats *x,

			       struct dma_desc *p)

{

	u32 rdes0 = le32_to_cpu(p->des0);

	int ret = good_frame;

	unsigned int rdes0 = le32_to_cpu(p->des0);



	if (unlikely(rdes0 & RDES0_OWN))

		return dma_own;
@@ -178,7 +178,7 @@ static void ndesc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len, 
				  bool csum_flag, int mode, bool tx_own,

				  bool ls, unsigned int tot_pkt_len)

{

	unsigned int tdes1 = le32_to_cpu(p->des1);

	u32 tdes1 = le32_to_cpu(p->des1);



	if (is_fs)

		tdes1 |= TDES1_FIRST_SEGMENT;