Commit 5673ef86 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: pcs: xpcs: rename mdio_xpcs_args to dw_xpcs 



The struct mdio_xpcs_args is reminiscent of when a similarly named
struct mdio_xpcs_ops existed. Now that that is removed, we can shorten
the name to dw_xpcs (dw for DesignWare).

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6e49699

drivers/net/ethernet/stmicro/stmmac/common.h

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ struct mac_device_info { 
	const struct stmmac_hwtimestamp *ptp;

	const struct stmmac_tc_ops *tc;

	const struct stmmac_mmc_ops *mmc;

	struct mdio_xpcs_args *xpcs;

	struct dw_xpcs *xpcs;

	struct mii_regs mii;	/* MII register Addresses */

	struct mac_link link;

	void __iomem *pcsr;     /* vpointer to device CSRs */

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ int stmmac_xpcs_setup(struct mii_bus *bus) 
{

	int mode, addr;

	struct net_device *ndev = bus->priv;

	struct mdio_xpcs_args *xpcs;

	struct dw_xpcs *xpcs;

	struct stmmac_priv *priv;

	struct mdio_device *mdiodev;

drivers/net/pcs/pcs-xpcs.c

+36 −37
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
#define DW_VR_MII_EEE_TRN_LPI		BIT(0)	/* Transparent Mode Enable */



#define phylink_pcs_to_xpcs(pl_pcs) \

	container_of((pl_pcs), struct mdio_xpcs_args, pcs)

	container_of((pl_pcs), struct dw_xpcs, pcs)



static const int xpcs_usxgmii_features[] = {

	ETHTOOL_LINK_MODE_Pause_BIT,
@@ -236,7 +236,7 @@ static const struct xpcs_compat *xpcs_find_compat(const struct xpcs_id *id, 
	return NULL;

}



int xpcs_get_an_mode(struct mdio_xpcs_args *xpcs, phy_interface_t interface)

int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface)

{

	const struct xpcs_compat *compat;
@@ -263,7 +263,7 @@ static bool __xpcs_linkmode_supported(const struct xpcs_compat *compat, 
#define xpcs_linkmode_supported(compat, mode) \

	__xpcs_linkmode_supported(compat, ETHTOOL_LINK_MODE_ ## mode ## _BIT)



static int xpcs_read(struct mdio_xpcs_args *xpcs, int dev, u32 reg)

static int xpcs_read(struct dw_xpcs *xpcs, int dev, u32 reg)

{

	u32 reg_addr = mdiobus_c45_addr(dev, reg);

	struct mii_bus *bus = xpcs->mdiodev->bus;
@@ -272,7 +272,7 @@ static int xpcs_read(struct mdio_xpcs_args *xpcs, int dev, u32 reg) 
	return mdiobus_read(bus, addr, reg_addr);

}



static int xpcs_write(struct mdio_xpcs_args *xpcs, int dev, u32 reg, u16 val)

static int xpcs_write(struct dw_xpcs *xpcs, int dev, u32 reg, u16 val)

{

	u32 reg_addr = mdiobus_c45_addr(dev, reg);

	struct mii_bus *bus = xpcs->mdiodev->bus;
@@ -281,28 +281,28 @@ static int xpcs_write(struct mdio_xpcs_args *xpcs, int dev, u32 reg, u16 val) 
	return mdiobus_write(bus, addr, reg_addr, val);

}



static int xpcs_read_vendor(struct mdio_xpcs_args *xpcs, int dev, u32 reg)

static int xpcs_read_vendor(struct dw_xpcs *xpcs, int dev, u32 reg)

{

	return xpcs_read(xpcs, dev, DW_VENDOR | reg);

}



static int xpcs_write_vendor(struct mdio_xpcs_args *xpcs, int dev, int reg,

static int xpcs_write_vendor(struct dw_xpcs *xpcs, int dev, int reg,

			     u16 val)

{

	return xpcs_write(xpcs, dev, DW_VENDOR | reg, val);

}



static int xpcs_read_vpcs(struct mdio_xpcs_args *xpcs, int reg)

static int xpcs_read_vpcs(struct dw_xpcs *xpcs, int reg)

{

	return xpcs_read_vendor(xpcs, MDIO_MMD_PCS, reg);

}



static int xpcs_write_vpcs(struct mdio_xpcs_args *xpcs, int reg, u16 val)

static int xpcs_write_vpcs(struct dw_xpcs *xpcs, int reg, u16 val)

{

	return xpcs_write_vendor(xpcs, MDIO_MMD_PCS, reg, val);

}



static int xpcs_poll_reset(struct mdio_xpcs_args *xpcs, int dev)

static int xpcs_poll_reset(struct dw_xpcs *xpcs, int dev)

{

	/* Poll until the reset bit clears (50ms per retry == 0.6 sec) */

	unsigned int retries = 12;
@@ -318,7 +318,7 @@ static int xpcs_poll_reset(struct mdio_xpcs_args *xpcs, int dev) 
	return (ret & MDIO_CTRL1_RESET) ? -ETIMEDOUT : 0;

}



static int xpcs_soft_reset(struct mdio_xpcs_args *xpcs,

static int xpcs_soft_reset(struct dw_xpcs *xpcs,

			   const struct xpcs_compat *compat)

{

	int ret, dev;
@@ -348,7 +348,7 @@ static int xpcs_soft_reset(struct mdio_xpcs_args *xpcs, 
		dev_warn(&(__xpcs)->mdiodev->dev, ##__args); \

})



static int xpcs_read_fault_c73(struct mdio_xpcs_args *xpcs,

static int xpcs_read_fault_c73(struct dw_xpcs *xpcs,

			       struct phylink_link_state *state)

{

	int ret;
@@ -399,7 +399,7 @@ static int xpcs_read_fault_c73(struct mdio_xpcs_args *xpcs, 
	return 0;

}



static int xpcs_read_link_c73(struct mdio_xpcs_args *xpcs, bool an)

static int xpcs_read_link_c73(struct dw_xpcs *xpcs, bool an)

{

	bool link = true;

	int ret;
@@ -439,7 +439,7 @@ static int xpcs_get_max_usxgmii_speed(const unsigned long *supported) 
	return max;

}



static void xpcs_config_usxgmii(struct mdio_xpcs_args *xpcs, int speed)

static void xpcs_config_usxgmii(struct dw_xpcs *xpcs, int speed)

{

	int ret, speed_sel;
@@ -500,7 +500,7 @@ static void xpcs_config_usxgmii(struct mdio_xpcs_args *xpcs, int speed) 
	pr_err("%s: XPCS access returned %pe\n", __func__, ERR_PTR(ret));

}



static int _xpcs_config_aneg_c73(struct mdio_xpcs_args *xpcs,

static int _xpcs_config_aneg_c73(struct dw_xpcs *xpcs,

				 const struct xpcs_compat *compat)

{

	int ret, adv;
@@ -545,7 +545,7 @@ static int _xpcs_config_aneg_c73(struct mdio_xpcs_args *xpcs, 
	return xpcs_write(xpcs, MDIO_MMD_AN, DW_SR_AN_ADV1, adv);

}



static int xpcs_config_aneg_c73(struct mdio_xpcs_args *xpcs,

static int xpcs_config_aneg_c73(struct dw_xpcs *xpcs,

				const struct xpcs_compat *compat)

{

	int ret;
@@ -563,7 +563,7 @@ static int xpcs_config_aneg_c73(struct mdio_xpcs_args *xpcs, 
	return xpcs_write(xpcs, MDIO_MMD_AN, MDIO_CTRL1, ret);

}



static int xpcs_aneg_done_c73(struct mdio_xpcs_args *xpcs,

static int xpcs_aneg_done_c73(struct dw_xpcs *xpcs,

			      struct phylink_link_state *state,

			      const struct xpcs_compat *compat)

{
@@ -590,7 +590,7 @@ static int xpcs_aneg_done_c73(struct mdio_xpcs_args *xpcs, 
	return 0;

}



static int xpcs_read_lpa_c73(struct mdio_xpcs_args *xpcs,

static int xpcs_read_lpa_c73(struct dw_xpcs *xpcs,

			     struct phylink_link_state *state)

{

	int ret;
@@ -639,7 +639,7 @@ static int xpcs_read_lpa_c73(struct mdio_xpcs_args *xpcs, 
	return 0;

}



static void xpcs_resolve_lpa_c73(struct mdio_xpcs_args *xpcs,

static void xpcs_resolve_lpa_c73(struct dw_xpcs *xpcs,

				 struct phylink_link_state *state)

{

	int max_speed = xpcs_get_max_usxgmii_speed(state->lp_advertising);
@@ -649,7 +649,7 @@ static void xpcs_resolve_lpa_c73(struct mdio_xpcs_args *xpcs, 
	state->duplex = DUPLEX_FULL;

}



static int xpcs_get_max_xlgmii_speed(struct mdio_xpcs_args *xpcs,

static int xpcs_get_max_xlgmii_speed(struct dw_xpcs *xpcs,

				     struct phylink_link_state *state)

{

	unsigned long *adv = state->advertising;
@@ -703,7 +703,7 @@ static int xpcs_get_max_xlgmii_speed(struct mdio_xpcs_args *xpcs, 
	return speed;

}



static void xpcs_resolve_pma(struct mdio_xpcs_args *xpcs,

static void xpcs_resolve_pma(struct dw_xpcs *xpcs,

			     struct phylink_link_state *state)

{

	state->pause = MLO_PAUSE_TX | MLO_PAUSE_RX;
@@ -722,7 +722,7 @@ static void xpcs_resolve_pma(struct mdio_xpcs_args *xpcs, 
	}

}



void xpcs_validate(struct mdio_xpcs_args *xpcs, unsigned long *supported,

void xpcs_validate(struct dw_xpcs *xpcs, unsigned long *supported,

		   struct phylink_link_state *state)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(xpcs_supported);
@@ -752,8 +752,7 @@ void xpcs_validate(struct mdio_xpcs_args *xpcs, unsigned long *supported, 
}

EXPORT_SYMBOL_GPL(xpcs_validate);



int xpcs_config_eee(struct mdio_xpcs_args *xpcs, int mult_fact_100ns,

		    int enable)

int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns, int enable)

{

	int ret;
@@ -786,7 +785,7 @@ int xpcs_config_eee(struct mdio_xpcs_args *xpcs, int mult_fact_100ns, 
}

EXPORT_SYMBOL_GPL(xpcs_config_eee);



static int xpcs_config_aneg_c37_sgmii(struct mdio_xpcs_args *xpcs)

static int xpcs_config_aneg_c37_sgmii(struct dw_xpcs *xpcs)

{

	int ret;
@@ -827,7 +826,7 @@ static int xpcs_config_aneg_c37_sgmii(struct mdio_xpcs_args *xpcs) 
	return xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_DIG_CTRL1, ret);

}



static int xpcs_config_2500basex(struct mdio_xpcs_args *xpcs)

static int xpcs_config_2500basex(struct dw_xpcs *xpcs)

{

	int ret;
@@ -849,8 +848,8 @@ static int xpcs_config_2500basex(struct mdio_xpcs_args *xpcs) 
	return xpcs_write(xpcs, MDIO_MMD_VEND2, DW_VR_MII_MMD_CTRL, ret);

}



static int xpcs_do_config(struct mdio_xpcs_args *xpcs,

			  phy_interface_t interface, unsigned int mode)

static int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,

			  unsigned int mode)

{

	const struct xpcs_compat *compat;

	int ret;
@@ -889,12 +888,12 @@ static int xpcs_config(struct phylink_pcs *pcs, unsigned int mode, 
		       const unsigned long *advertising,

		       bool permit_pause_to_mac)

{

	struct mdio_xpcs_args *xpcs = phylink_pcs_to_xpcs(pcs);

	struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);



	return xpcs_do_config(xpcs, interface, mode);

}



static int xpcs_get_state_c73(struct mdio_xpcs_args *xpcs,

static int xpcs_get_state_c73(struct dw_xpcs *xpcs,

			      struct phylink_link_state *state,

			      const struct xpcs_compat *compat)

{
@@ -928,7 +927,7 @@ static int xpcs_get_state_c73(struct mdio_xpcs_args *xpcs, 
	return 0;

}



static int xpcs_get_state_c37_sgmii(struct mdio_xpcs_args *xpcs,

static int xpcs_get_state_c37_sgmii(struct dw_xpcs *xpcs,

				    struct phylink_link_state *state)

{

	int ret;
@@ -972,7 +971,7 @@ static int xpcs_get_state_c37_sgmii(struct mdio_xpcs_args *xpcs, 
static void xpcs_get_state(struct phylink_pcs *pcs,

			   struct phylink_link_state *state)

{

	struct mdio_xpcs_args *xpcs = phylink_pcs_to_xpcs(pcs);

	struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);

	const struct xpcs_compat *compat;

	int ret;
@@ -1004,13 +1003,13 @@ static void xpcs_get_state(struct phylink_pcs *pcs, 
static void xpcs_link_up(struct phylink_pcs *pcs, unsigned int mode,

			 phy_interface_t interface, int speed, int duplex)

{

	struct mdio_xpcs_args *xpcs = phylink_pcs_to_xpcs(pcs);

	struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);



	if (interface == PHY_INTERFACE_MODE_USXGMII)

		return xpcs_config_usxgmii(xpcs, speed);

}



static u32 xpcs_get_id(struct mdio_xpcs_args *xpcs)

static u32 xpcs_get_id(struct dw_xpcs *xpcs)

{

	int ret;

	u32 id;
@@ -1095,10 +1094,10 @@ static const struct phylink_pcs_ops xpcs_phylink_ops = { 
	.pcs_link_up = xpcs_link_up,

};



struct mdio_xpcs_args *xpcs_create(struct mdio_device *mdiodev,

struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,

			    phy_interface_t interface)

{

	struct mdio_xpcs_args *xpcs;

	struct dw_xpcs *xpcs;

	u32 xpcs_id;

	int i, ret;
@@ -1144,7 +1143,7 @@ struct mdio_xpcs_args *xpcs_create(struct mdio_device *mdiodev, 
}

EXPORT_SYMBOL_GPL(xpcs_create);



void xpcs_destroy(struct mdio_xpcs_args *xpcs)

void xpcs_destroy(struct dw_xpcs *xpcs)

{

	kfree(xpcs);

}

include/linux/pcs/pcs-xpcs.h

+7 −7
Original line number Diff line number Diff line
@@ -17,19 +17,19 @@ 


struct xpcs_id;



struct mdio_xpcs_args {

struct dw_xpcs {

	struct mdio_device *mdiodev;

	const struct xpcs_id *id;

	struct phylink_pcs pcs;

};



int xpcs_get_an_mode(struct mdio_xpcs_args *xpcs, phy_interface_t interface);

void xpcs_validate(struct mdio_xpcs_args *xpcs, unsigned long *supported,

int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface);

void xpcs_validate(struct dw_xpcs *xpcs, unsigned long *supported,

		   struct phylink_link_state *state);

int xpcs_config_eee(struct mdio_xpcs_args *xpcs, int mult_fact_100ns,

int xpcs_config_eee(struct dw_xpcs *xpcs, int mult_fact_100ns,

		    int enable);

struct mdio_xpcs_args *xpcs_create(struct mdio_device *mdiodev,

struct dw_xpcs *xpcs_create(struct mdio_device *mdiodev,

			    phy_interface_t interface);

void xpcs_destroy(struct mdio_xpcs_args *xpcs);

void xpcs_destroy(struct dw_xpcs *xpcs);



#endif /* __LINUX_PCS_XPCS_H */