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: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vdtvx-00000002Gth-32RU@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
index c84b26d5176043a882a59fc1aecc749c552ed85a..cdef27c8043f928e5b83c5eecea1db7ee467dbdd 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
@@ -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));

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
index a2980482fccea99f955f476e23d31a083c67dde7..b13d24c8b52a7adfba2116e9147cd57c50bfb49e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
@@ -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) {

diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
index 937b7a0466fcad8b935de534e9cd2d5763a0c98e..9263be969c3673b2dbe3687461c8005d203102a7 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
@@ -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);

diff --git a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
index 68a7cfcb1d8f3fd5628bb2c77084d11c24d1fb96..dbfff25947b05a7e360e073134425b08f9477dda 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
+++ b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
@@ -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;