1. Patchew
  2. linux
  3. [PATCH net-next 0/5] net: fec: do some cleanup for the driver
  4. View patch

[PATCH net-next 5/5] net: fec: remove duplicate macros of the BD status

Wei Fang posted 5 patches 2 months, 4 weeks ago
There is a newer version of this series
[PATCH net-next 5/5] net: fec: remove duplicate macros of the BD status
Posted by Wei Fang 2 months, 4 weeks ago 
There are two sets of macros used to define the status bits of TX and RX
BDs, one is the BD_SC_xx macros, the other one is the BD_ENET_xx macros.
For the BD_SC_xx macros, only BD_SC_WRAP is used in the driver. But the
BD_ENET_xx macros are more widely used in the driver, and they define
more bits of the BD status. Therefore, let us remove the BD_SC_xx macros
from now on.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 drivers/net/ethernet/freescale/fec.h      | 17 -----------------
 drivers/net/ethernet/freescale/fec_main.c |  8 ++++----
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index a25dca9c7d71..7b4d1fc8e7eb 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -240,23 +240,6 @@ struct bufdesc_ex {
 	__fec16 res0[4];
 };
 
-/*
- *	The following definitions courtesy of commproc.h, which where
- *	Copyright (c) 1997 Dan Malek (dmalek@jlc.net).
- */
-#define BD_SC_EMPTY	((ushort)0x8000)	/* Receive is empty */
-#define BD_SC_READY	((ushort)0x8000)	/* Transmit is ready */
-#define BD_SC_WRAP	((ushort)0x2000)	/* Last buffer descriptor */
-#define BD_SC_INTRPT	((ushort)0x1000)	/* Interrupt on change */
-#define BD_SC_CM	((ushort)0x0200)	/* Continuous mode */
-#define BD_SC_ID	((ushort)0x0100)	/* Rec'd too many idles */
-#define BD_SC_P		((ushort)0x0100)	/* xmt preamble */
-#define BD_SC_BR	((ushort)0x0020)	/* Break received */
-#define BD_SC_FR	((ushort)0x0010)	/* Framing error */
-#define BD_SC_PR	((ushort)0x0008)	/* Parity error */
-#define BD_SC_OV	((ushort)0x0002)	/* Overrun */
-#define BD_SC_CD	((ushort)0x0001)	/* ?? */
-
 /* Buffer descriptor control/status used by Ethernet receive.
  */
 #define BD_ENET_RX_EMPTY	((ushort)0x8000)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index cf598d5260fb..3d227c9c5ba5 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1010,7 +1010,7 @@ static void fec_enet_bd_init(struct net_device *dev)
 
 		/* Set the last buffer to wrap */
 		bdp = fec_enet_get_prevdesc(bdp, &rxq->bd);
-		bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
+		bdp->cbd_sc |= cpu_to_fec16(BD_ENET_RX_WRAP);
 
 		rxq->bd.cur = rxq->bd.base;
 	}
@@ -1060,7 +1060,7 @@ static void fec_enet_bd_init(struct net_device *dev)
 
 		/* Set the last buffer to wrap */
 		bdp = fec_enet_get_prevdesc(bdp, &txq->bd);
-		bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
+		bdp->cbd_sc |= cpu_to_fec16(BD_ENET_TX_WRAP);
 		txq->dirty_tx = bdp;
 	}
 }
@@ -3456,7 +3456,7 @@ fec_enet_alloc_rxq_buffers(struct net_device *ndev, unsigned int queue)
 
 	/* Set the last buffer to wrap. */
 	bdp = fec_enet_get_prevdesc(bdp, &rxq->bd);
-	bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
+	bdp->cbd_sc |= cpu_to_fec16(BD_ENET_RX_WRAP);
 	return 0;
 
  err_alloc:
@@ -3492,7 +3492,7 @@ fec_enet_alloc_txq_buffers(struct net_device *ndev, unsigned int queue)
 
 	/* Set the last buffer to wrap. */
 	bdp = fec_enet_get_prevdesc(bdp, &txq->bd);
-	bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
+	bdp->cbd_sc |= cpu_to_fec16(BD_ENET_TX_WRAP);
 
 	return 0;
 
-- 
2.34.1
Re: [PATCH net-next 5/5] net: fec: remove duplicate macros of the BD status
Posted by Frank Li 2 months, 4 weeks ago 
On Tue, Nov 11, 2025 at 06:00:57PM +0800, Wei Fang wrote:
> There are two sets of macros used to define the status bits of TX and RX
> BDs, one is the BD_SC_xx macros, the other one is the BD_ENET_xx macros.
> For the BD_SC_xx macros, only BD_SC_WRAP is used in the driver. But the
> BD_ENET_xx macros are more widely used in the driver, and they define
> more bits of the BD status. Therefore, let us remove the BD_SC_xx macros
> from now on.

nit: remove "let us",

Reviewed-by: Frank Li <Frank.Li@nxp.com>
>
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
> ---
>  drivers/net/ethernet/freescale/fec.h      | 17 -----------------
>  drivers/net/ethernet/freescale/fec_main.c |  8 ++++----
>  2 files changed, 4 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
> index a25dca9c7d71..7b4d1fc8e7eb 100644
> --- a/drivers/net/ethernet/freescale/fec.h
> +++ b/drivers/net/ethernet/freescale/fec.h
> @@ -240,23 +240,6 @@ struct bufdesc_ex {
>  	__fec16 res0[4];
>  };
>
> -/*
> - *	The following definitions courtesy of commproc.h, which where
> - *	Copyright (c) 1997 Dan Malek (dmalek@jlc.net).
> - */
> -#define BD_SC_EMPTY	((ushort)0x8000)	/* Receive is empty */
> -#define BD_SC_READY	((ushort)0x8000)	/* Transmit is ready */
> -#define BD_SC_WRAP	((ushort)0x2000)	/* Last buffer descriptor */
> -#define BD_SC_INTRPT	((ushort)0x1000)	/* Interrupt on change */
> -#define BD_SC_CM	((ushort)0x0200)	/* Continuous mode */
> -#define BD_SC_ID	((ushort)0x0100)	/* Rec'd too many idles */
> -#define BD_SC_P		((ushort)0x0100)	/* xmt preamble */
> -#define BD_SC_BR	((ushort)0x0020)	/* Break received */
> -#define BD_SC_FR	((ushort)0x0010)	/* Framing error */
> -#define BD_SC_PR	((ushort)0x0008)	/* Parity error */
> -#define BD_SC_OV	((ushort)0x0002)	/* Overrun */
> -#define BD_SC_CD	((ushort)0x0001)	/* ?? */
> -
>  /* Buffer descriptor control/status used by Ethernet receive.
>   */
>  #define BD_ENET_RX_EMPTY	((ushort)0x8000)
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index cf598d5260fb..3d227c9c5ba5 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1010,7 +1010,7 @@ static void fec_enet_bd_init(struct net_device *dev)
>
>  		/* Set the last buffer to wrap */
>  		bdp = fec_enet_get_prevdesc(bdp, &rxq->bd);
> -		bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
> +		bdp->cbd_sc |= cpu_to_fec16(BD_ENET_RX_WRAP);
>
>  		rxq->bd.cur = rxq->bd.base;
>  	}
> @@ -1060,7 +1060,7 @@ static void fec_enet_bd_init(struct net_device *dev)
>
>  		/* Set the last buffer to wrap */
>  		bdp = fec_enet_get_prevdesc(bdp, &txq->bd);
> -		bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
> +		bdp->cbd_sc |= cpu_to_fec16(BD_ENET_TX_WRAP);
>  		txq->dirty_tx = bdp;
>  	}
>  }
> @@ -3456,7 +3456,7 @@ fec_enet_alloc_rxq_buffers(struct net_device *ndev, unsigned int queue)
>
>  	/* Set the last buffer to wrap. */
>  	bdp = fec_enet_get_prevdesc(bdp, &rxq->bd);
> -	bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
> +	bdp->cbd_sc |= cpu_to_fec16(BD_ENET_RX_WRAP);
>  	return 0;
>
>   err_alloc:
> @@ -3492,7 +3492,7 @@ fec_enet_alloc_txq_buffers(struct net_device *ndev, unsigned int queue)
>
>  	/* Set the last buffer to wrap. */
>  	bdp = fec_enet_get_prevdesc(bdp, &txq->bd);
> -	bdp->cbd_sc |= cpu_to_fec16(BD_SC_WRAP);
> +	bdp->cbd_sc |= cpu_to_fec16(BD_ENET_TX_WRAP);
>
>  	return 0;
>
> --
> 2.34.1
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.