Commit 2d440716 authored by Raju Rangoju's avatar Raju Rangoju Committed by Paolo Abeni
Browse files

amd-xgbe: reorganize the code of XPCS access 



The xgbe_{read/write}_mmd_regs_v* functions have common code which can
be moved to helper functions. Add new helper functions to calculate the
mmd_address for v1/v2 of xpcs access.

Signed-off-by: default avatarRaju Rangoju <Raju.Rangoju@amd.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250509155325.720499-2-Raju.Rangoju@amd.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 42bd96cb

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

+29 −36
Original line number Diff line number Diff line
@@ -1053,18 +1053,19 @@ static int xgbe_set_gpio(struct xgbe_prv_data *pdata, unsigned int gpio) 
	return 0;

}



static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad,

static unsigned int xgbe_get_mmd_address(struct xgbe_prv_data *pdata,

					 int mmd_reg)

{

	unsigned long flags;

	unsigned int mmd_address, index, offset;

	int mmd_data;



	if (mmd_reg & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

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

	return (mmd_reg & XGBE_ADDR_C45) ?

		mmd_reg & ~XGBE_ADDR_C45 :

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

}



static void xgbe_get_pcs_index_and_offset(struct xgbe_prv_data *pdata,

					  unsigned int mmd_address,

					  unsigned int *index,

					  unsigned int *offset)

{

	/* The PCS registers are accessed using mmio. The underlying

	 * management interface uses indirect addressing to access the MMD

	 * register sets. This requires accessing of the PCS register in two
@@ -1075,8 +1076,20 @@ static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad, 
	 * offset 1 bit and reading 16 bits of data.

	 */

	mmd_address <<= 1;

	index = mmd_address & ~pdata->xpcs_window_mask;

	offset = pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask);

	*index = mmd_address & ~pdata->xpcs_window_mask;

	*offset = pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask);

}



static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad,

				 int mmd_reg)

{

	unsigned int mmd_address, index, offset;

	unsigned long flags;

	int mmd_data;



	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);



	xgbe_get_pcs_index_and_offset(pdata, mmd_address, &index, &offset);



	spin_lock_irqsave(&pdata->xpcs_lock, flags);

	XPCS32_IOWRITE(pdata, pdata->xpcs_window_sel_reg, index);
@@ -1092,23 +1105,9 @@ 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 & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

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

	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);



	/* The PCS registers are accessed using mmio. The underlying

	 * management interface uses indirect addressing to access the MMD

	 * register sets. This requires accessing of the PCS register in two

	 * phases, an address phase and a data phase.

	 *

	 * The mmio interface is based on 16-bit offsets and values. All

	 * register offsets must therefore be adjusted by left shifting the

	 * offset 1 bit and writing 16 bits of data.

	 */

	mmd_address <<= 1;

	index = mmd_address & ~pdata->xpcs_window_mask;

	offset = pdata->xpcs_window + (mmd_address & pdata->xpcs_window_mask);

	xgbe_get_pcs_index_and_offset(pdata, mmd_address, &index, &offset);



	spin_lock_irqsave(&pdata->xpcs_lock, flags);

	XPCS32_IOWRITE(pdata, pdata->xpcs_window_sel_reg, index);
@@ -1123,10 +1122,7 @@ static int xgbe_read_mmd_regs_v1(struct xgbe_prv_data *pdata, int prtad, 
	unsigned int mmd_address;

	int mmd_data;



	if (mmd_reg & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

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

	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);



	/* The PCS registers are accessed using mmio. The underlying APB3

	 * management interface uses indirect addressing to access the MMD
@@ -1151,10 +1147,7 @@ static void xgbe_write_mmd_regs_v1(struct xgbe_prv_data *pdata, int prtad, 
	unsigned int mmd_address;

	unsigned long flags;



	if (mmd_reg & XGBE_ADDR_C45)

		mmd_address = mmd_reg & ~XGBE_ADDR_C45;

	else

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

	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);



	/* The PCS registers are accessed using mmio. The underlying APB3

	 * management interface uses indirect addressing to access the MMD