Skip to content

Commit

Permalink
net: pcs: rearrange C73 functions to prepare for C37 support later
Browse files Browse the repository at this point in the history 
The current implementation for XPCS is validated for C73, so we rename them
to have _c73 suffix and introduce a set of functions to use an_mode flag
to switch between C73 and C37 AN later.

Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ong Boon Leong authored and David S. Miller committed Mar 15, 2021
1 parent 29c35da commit 07a4bc5
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 28 deletions.
94 changes: 66 additions & 28 deletions drivers/net/pcs/pcs-xpcs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,22 +125,26 @@ static struct xpcs_id {
u32 mask;
const int *supported;
const phy_interface_t *interface;
int an_mode;
} xpcs_id_list[] = {
{
.id = SYNOPSYS_XPCS_USXGMII_ID,
.mask = SYNOPSYS_XPCS_MASK,
.supported = xpcs_usxgmii_features,
.interface = xpcs_usxgmii_interfaces,
.an_mode = DW_AN_C73,
}, {
.id = SYNOPSYS_XPCS_10GKR_ID,
.mask = SYNOPSYS_XPCS_MASK,
.supported = xpcs_10gkr_features,
.interface = xpcs_10gkr_interfaces,
.an_mode = DW_AN_C73,
}, {
.id = SYNOPSYS_XPCS_XLGMII_ID,
.mask = SYNOPSYS_XPCS_MASK,
.supported = xpcs_xlgmii_features,
.interface = xpcs_xlgmii_interfaces,
.an_mode = DW_AN_C73,
},
};

Expand Down Expand Up @@ -195,9 +199,17 @@ 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, int dev)
static int xpcs_soft_reset(struct mdio_xpcs_args *xpcs)
{
int ret;
int ret, dev;

switch (xpcs->an_mode) {
case DW_AN_C73:
dev = MDIO_MMD_PCS;
break;
default:
return -1;
}

ret = xpcs_write(xpcs, dev, MDIO_CTRL1, MDIO_CTRL1_RESET);
if (ret < 0)
Expand All @@ -212,8 +224,8 @@ static int xpcs_soft_reset(struct mdio_xpcs_args *xpcs, int dev)
dev_warn(&(__xpcs)->bus->dev, ##__args); \
})

static int xpcs_read_fault(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
static int xpcs_read_fault_c73(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
{
int ret;

Expand Down Expand Up @@ -263,7 +275,7 @@ static int xpcs_read_fault(struct mdio_xpcs_args *xpcs,
return 0;
}

static int xpcs_read_link(struct mdio_xpcs_args *xpcs, bool an)
static int xpcs_read_link_c73(struct mdio_xpcs_args *xpcs, bool an)
{
bool link = true;
int ret;
Expand Down Expand Up @@ -357,7 +369,7 @@ static int xpcs_config_usxgmii(struct mdio_xpcs_args *xpcs, int speed)
return xpcs_write_vpcs(xpcs, MDIO_CTRL1, ret | DW_USXGMII_RST);
}

static int xpcs_config_aneg_c73(struct mdio_xpcs_args *xpcs)
static int _xpcs_config_aneg_c73(struct mdio_xpcs_args *xpcs)
{
int ret, adv;

Expand Down Expand Up @@ -401,11 +413,11 @@ 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(struct mdio_xpcs_args *xpcs)
static int xpcs_config_aneg_c73(struct mdio_xpcs_args *xpcs)
{
int ret;

ret = xpcs_config_aneg_c73(xpcs);
ret = _xpcs_config_aneg_c73(xpcs);
if (ret < 0)
return ret;

Expand All @@ -418,8 +430,8 @@ static int xpcs_config_aneg(struct mdio_xpcs_args *xpcs)
return xpcs_write(xpcs, MDIO_MMD_AN, MDIO_CTRL1, ret);
}

static int xpcs_aneg_done(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
static int xpcs_aneg_done_c73(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
{
int ret;

Expand All @@ -434,7 +446,7 @@ static int xpcs_aneg_done(struct mdio_xpcs_args *xpcs,

/* Check if Aneg outcome is valid */
if (!(ret & DW_C73_AN_ADV_SF)) {
xpcs_config_aneg(xpcs);
xpcs_config_aneg_c73(xpcs);
return 0;
}

Expand All @@ -444,8 +456,8 @@ static int xpcs_aneg_done(struct mdio_xpcs_args *xpcs,
return 0;
}

static int xpcs_read_lpa(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
static int xpcs_read_lpa_c73(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
{
int ret;

Expand Down Expand Up @@ -493,8 +505,8 @@ static int xpcs_read_lpa(struct mdio_xpcs_args *xpcs,
return 0;
}

static void xpcs_resolve_lpa(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
static void xpcs_resolve_lpa_c73(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
{
int max_speed = xpcs_get_max_usxgmii_speed(state->lp_advertising);

Expand Down Expand Up @@ -590,27 +602,33 @@ static int xpcs_config(struct mdio_xpcs_args *xpcs,
{
int ret;

if (state->an_enabled) {
ret = xpcs_config_aneg(xpcs);
if (ret)
return ret;
switch (xpcs->an_mode) {
case DW_AN_C73:
if (state->an_enabled) {
ret = xpcs_config_aneg_c73(xpcs);
if (ret)
return ret;
}
break;
default:
return -1;
}

return 0;
}

static int xpcs_get_state(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
static int xpcs_get_state_c73(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
{
int ret;

/* Link needs to be read first ... */
state->link = xpcs_read_link(xpcs, state->an_enabled) > 0 ? 1 : 0;
state->link = xpcs_read_link_c73(xpcs, state->an_enabled) > 0 ? 1 : 0;

/* ... and then we check the faults. */
ret = xpcs_read_fault(xpcs, state);
ret = xpcs_read_fault_c73(xpcs, state);
if (ret) {
ret = xpcs_soft_reset(xpcs, MDIO_MMD_PCS);
ret = xpcs_soft_reset(xpcs);
if (ret)
return ret;

Expand All @@ -619,10 +637,10 @@ static int xpcs_get_state(struct mdio_xpcs_args *xpcs,
return xpcs_config(xpcs, state);
}

if (state->an_enabled && xpcs_aneg_done(xpcs, state)) {
if (state->an_enabled && xpcs_aneg_done_c73(xpcs, state)) {
state->an_complete = true;
xpcs_read_lpa(xpcs, state);
xpcs_resolve_lpa(xpcs, state);
xpcs_read_lpa_c73(xpcs, state);
xpcs_resolve_lpa_c73(xpcs, state);
} else if (state->an_enabled) {
state->link = 0;
} else if (state->link) {
Expand All @@ -632,6 +650,24 @@ static int xpcs_get_state(struct mdio_xpcs_args *xpcs,
return 0;
}

static int xpcs_get_state(struct mdio_xpcs_args *xpcs,
struct phylink_link_state *state)
{
int ret;

switch (xpcs->an_mode) {
case DW_AN_C73:
ret = xpcs_get_state_c73(xpcs, state);
if (ret)
return ret;
break;
default:
return -1;
}

return 0;
}

static int xpcs_link_up(struct mdio_xpcs_args *xpcs, int speed,
phy_interface_t interface)
{
Expand Down Expand Up @@ -676,6 +712,8 @@ static bool xpcs_check_features(struct mdio_xpcs_args *xpcs,
for (i = 0; match->supported[i] != __ETHTOOL_LINK_MODE_MASK_NBITS; i++)
set_bit(match->supported[i], xpcs->supported);

xpcs->an_mode = match->an_mode;

return true;
}

Expand All @@ -692,7 +730,7 @@ static int xpcs_probe(struct mdio_xpcs_args *xpcs, phy_interface_t interface)
match = entry;

if (xpcs_check_features(xpcs, match, interface))
return xpcs_soft_reset(xpcs, MDIO_MMD_PCS);
return xpcs_soft_reset(xpcs);
}
}

Expand Down
4 changes: 4 additions & 0 deletions include/linux/pcs/pcs-xpcs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@
#include <linux/phy.h>
#include <linux/phylink.h>

/* AN mode */
#define DW_AN_C73 1

struct mdio_xpcs_args {
__ETHTOOL_DECLARE_LINK_MODE_MASK(supported);
struct mii_bus *bus;
int addr;
int an_mode;
};

struct mdio_xpcs_ops {
Expand Down

0 comments on commit 07a4bc5

Please sign in to comment.