Skip to content

Commit

Permalink
phy: sparx5-serdes: add ops to match data
Browse files Browse the repository at this point in the history
We need to handle code differently in a few places. Add a struct:
sparx5_serdes_ops for this purpose, and populate it a with function to
set the SERDES type.

Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Link: https://lore.kernel.org/r/20240909-sparx5-lan969x-serdes-driver-v2-4-d695bcb57b84@microchip.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Daniel Machon authored and Vinod Koul committed Oct 21, 2024
1 parent 5206ba9 commit d61d42a
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 21 deletions.
29 changes: 19 additions & 10 deletions drivers/phy/microchip/sparx5_serdes.c
Original file line number Diff line number Diff line change
Expand Up @@ -2373,6 +2373,20 @@ static const struct phy_ops sparx5_serdes_ops = {
.owner = THIS_MODULE,
};

static void sparx5_serdes_type_set(struct sparx5_serdes_macro *macro, int sidx)
{
if (sidx < SPX5_SERDES_10G_START) {
macro->serdestype = SPX5_SDT_6G;
macro->stpidx = macro->sidx;
} else if (sidx < SPX5_SERDES_25G_START) {
macro->serdestype = SPX5_SDT_10G;
macro->stpidx = macro->sidx - SPX5_SERDES_10G_START;
} else {
macro->serdestype = SPX5_SDT_25G;
macro->stpidx = macro->sidx - SPX5_SERDES_25G_START;
}
}

static int sparx5_phy_create(struct sparx5_serdes_private *priv,
int idx, struct phy **phy)
{
Expand All @@ -2389,16 +2403,8 @@ static int sparx5_phy_create(struct sparx5_serdes_private *priv,
macro->sidx = idx;
macro->priv = priv;
macro->speed = SPEED_UNKNOWN;
if (idx < SPX5_SERDES_10G_START) {
macro->serdestype = SPX5_SDT_6G;
macro->stpidx = macro->sidx;
} else if (idx < SPX5_SERDES_25G_START) {
macro->serdestype = SPX5_SDT_10G;
macro->stpidx = macro->sidx - SPX5_SERDES_10G_START;
} else {
macro->serdestype = SPX5_SDT_25G;
macro->stpidx = macro->sidx - SPX5_SERDES_25G_START;
}

priv->data->ops.serdes_type_set(macro, idx);

phy_set_drvdata(*phy, macro);

Expand Down Expand Up @@ -2512,6 +2518,9 @@ static const struct sparx5_serdes_match_data sparx5_desc = {
.sd_max = 33,
.cmu_max = 14,
},
.ops = {
.serdes_type_set = &sparx5_serdes_type_set,
},
};

/* Client lookup function, uses serdes index */
Expand Down
27 changes: 16 additions & 11 deletions drivers/phy/microchip/sparx5_serdes.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,29 @@ enum sparx5_serdes_mode {
SPX5_SD_MODE_SFI,
};

struct sparx5_serdes_macro {
struct sparx5_serdes_private *priv;
u32 sidx;
u32 stpidx;
enum sparx5_serdes_type serdestype;
enum sparx5_serdes_mode serdesmode;
phy_interface_t portmode;
int speed;
enum phy_media media;
};

struct sparx5_serdes_consts {
int sd_max;
int cmu_max;
};

struct sparx5_serdes_ops {
void (*serdes_type_set)(struct sparx5_serdes_macro *macro, int sidx);
};

struct sparx5_serdes_match_data {
const struct sparx5_serdes_consts consts;
const struct sparx5_serdes_ops ops;
const struct sparx5_serdes_io_resource *iomap;
int iomap_size;
};
Expand All @@ -45,17 +61,6 @@ struct sparx5_serdes_private {
const struct sparx5_serdes_match_data *data;
};

struct sparx5_serdes_macro {
struct sparx5_serdes_private *priv;
u32 sidx;
u32 stpidx;
enum sparx5_serdes_type serdestype;
enum sparx5_serdes_mode serdesmode;
phy_interface_t portmode;
int speed;
enum phy_media media;
};

/* Read, Write and modify registers content.
* The register definition macros start at the id
*/
Expand Down

0 comments on commit d61d42a

Please sign in to comment.