[PATCH net-next 03/15] net: macb: remove gap in MACB_CAPS_* flags

Théo Lebrun posted 15 patches 2 months ago
[PATCH net-next 03/15] net: macb: remove gap in MACB_CAPS_* flags
Posted by Théo Lebrun 2 months ago
MACB_CAPS_* are bit constants that get used in bp->caps. They occupy
bits 0..12 + 24..31. Remove 11..23 gap by moving bits 24..31 to 13..20.

Occupation bitfields:

   31  29  27  25  23  21  19  17  15  13  11  09  07  05  03  01
     30  28  26  24  22  20  18  16  14  12  10  08  06  04  02  00
   -- Before ------------------------------------------------------
    1 1 1 1 1 1 1 1                       1 1 1 1 1 1 1 1 1 1 1 1 1
                    0 0 0 0 0 0 0 0 0 0 0
   -- After -------------------------------------------------------
                          1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
    0 0 0 0 0 0 0 0 0 0 0

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
---
 drivers/net/ethernet/cadence/macb.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 869d02284707cb771233276a073e1afdeeba43ce..9d21ec482c8c62da28f9d5ff35d5ca46f293eb64 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -769,14 +769,14 @@
 #define MACB_CAPS_NEED_TSUCLK			BIT(10)
 #define MACB_CAPS_QUEUE_DISABLE			BIT(11)
 #define MACB_CAPS_QBV				BIT(12)
-#define MACB_CAPS_PCS				BIT(24)
-#define MACB_CAPS_HIGH_SPEED			BIT(25)
-#define MACB_CAPS_CLK_HW_CHG			BIT(26)
-#define MACB_CAPS_MACB_IS_EMAC			BIT(27)
-#define MACB_CAPS_FIFO_MODE			BIT(28)
-#define MACB_CAPS_GIGABIT_MODE_AVAILABLE	BIT(29)
-#define MACB_CAPS_SG_DISABLED			BIT(30)
-#define MACB_CAPS_MACB_IS_GEM			BIT(31)
+#define MACB_CAPS_PCS				BIT(13)
+#define MACB_CAPS_HIGH_SPEED			BIT(14)
+#define MACB_CAPS_CLK_HW_CHG			BIT(15)
+#define MACB_CAPS_MACB_IS_EMAC			BIT(16)
+#define MACB_CAPS_FIFO_MODE			BIT(17)
+#define MACB_CAPS_GIGABIT_MODE_AVAILABLE	BIT(18)
+#define MACB_CAPS_SG_DISABLED			BIT(19)
+#define MACB_CAPS_MACB_IS_GEM			BIT(20)
 
 /* LSO settings */
 #define MACB_LSO_UFO_ENABLE			0x01

-- 
2.51.0

Re: [PATCH net-next 03/15] net: macb: remove gap in MACB_CAPS_* flags
Posted by Andrew Lunn 2 months ago
On Tue, Oct 14, 2025 at 05:25:04PM +0200, Théo Lebrun wrote:
> MACB_CAPS_* are bit constants that get used in bp->caps. They occupy
> bits 0..12 + 24..31. Remove 11..23 gap by moving bits 24..31 to 13..20.
> 
> Occupation bitfields:
> 
>    31  29  27  25  23  21  19  17  15  13  11  09  07  05  03  01
>      30  28  26  24  22  20  18  16  14  12  10  08  06  04  02  00
>    -- Before ------------------------------------------------------
>     1 1 1 1 1 1 1 1                       1 1 1 1 1 1 1 1 1 1 1 1 1
>                     0 0 0 0 0 0 0 0 0 0 0
>    -- After -------------------------------------------------------
>                           1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
>     0 0 0 0 0 0 0 0 0 0 0
> 
> Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew