Commit 47e61593 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jakub Kicinski
Browse files

amd-xgbe: Replace MII_ADDR_C45 with XGBE_ADDR_C45 



The xgbe driver reuses MII_ADDR_C45 for its own purpose. The values
derived with it are never passed to phylib or a linux MDIO bus driver.
In order that MII_ADDR_C45 can be removed, add an XGBE specific

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 070f6186

drivers/net/ethernet/amd/xgbe/xgbe-common.h

+6 −5
Original line number Diff line number Diff line
@@ -1699,20 +1699,21 @@ do { \ 
} while (0)



/* Macros for building, reading or writing register values or bits

 * using MDIO.  Different from above because of the use of standardized

 * Linux include values.  No shifting is performed with the bit

 * operations, everything works on mask values.

 * using MDIO.

 */



#define XGBE_ADDR_C45 BIT(30)



#define XMDIO_READ(_pdata, _mmd, _reg)					\

	((_pdata)->hw_if.read_mmd_regs((_pdata), 0,			\

		MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))

		XGBE_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))



#define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask)			\

	(XMDIO_READ((_pdata), _mmd, _reg) & _mask)



#define XMDIO_WRITE(_pdata, _mmd, _reg, _val)				\

	((_pdata)->hw_if.write_mmd_regs((_pdata), 0,			\

		MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))

		XGBE_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))



#define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val)		\

do {									\

drivers/net/ethernet/amd/xgbe/xgbe-dev.c

+8 −8
Original line number Diff line number Diff line
@@ -1150,8 +1150,8 @@ static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, 
	unsigned int mmd_address, index, offset;

	int mmd_data;



	if (mmd_reg & MII_ADDR_C45)

		mmd_address = mmd_reg & ~MII_ADDR_C45;

	if (mmd_reg & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

		mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff);
@@ -1182,8 +1182,8 @@ static void xgbe_write_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, 
	unsigned long flags;

	unsigned int mmd_address, index, offset;



	if (mmd_reg & MII_ADDR_C45)

		mmd_address = mmd_reg & ~MII_ADDR_C45;

	if (mmd_reg & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

		mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff);
@@ -1213,8 +1213,8 @@ static int xgbe_read_mmd_regs_v1(struct xgbe_prv_data *pdata, int prtad, 
	unsigned int mmd_address;

	int mmd_data;



	if (mmd_reg & MII_ADDR_C45)

		mmd_address = mmd_reg & ~MII_ADDR_C45;

	if (mmd_reg & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

		mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff);
@@ -1241,8 +1241,8 @@ static void xgbe_write_mmd_regs_v1(struct xgbe_prv_data *pdata, int prtad, 
	unsigned int mmd_address;

	unsigned long flags;



	if (mmd_reg & MII_ADDR_C45)

		mmd_address = mmd_reg & ~MII_ADDR_C45;

	if (mmd_reg & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

		mmd_address = (pdata->mdio_mmd << 16) | (mmd_reg & 0xffff);