Commit bd314907 authored by Wei Fang's avatar Wei Fang Committed by Jakub Kicinski
Browse files

net: fec: remove duplicate macros of the BD status 



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, remove the BD_SC_xx macros from
now on.

Signed-off-by: default avatarWei Fang <wei.fang@nxp.com>
Reviewed-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20251119025148.2817602-6-wei.fang@nxp.com


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

drivers/net/ethernet/freescale/fec.h

+0 −17
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/freescale/fec_main.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

}
@@ -3472,7 +3472,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:
@@ -3508,7 +3508,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;