diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index 93a7cb89493c4..244974ffe496b 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -474,10 +474,120 @@ static int sparx5_init_switchcore(struct sparx5 *sparx5)
return 0;
}
+struct lan969x_core_pll_dividers {
+ u32 divfi;
+ u32 divff;
+ u32 divr;
+ u32 divq;
+};
+
+static const struct lan969x_core_pll_dividers lan969x_core_pll_328mhz[] = {
+ [SPX5_CORE_CLOCK_REF_25MHZ] = {
+ .divfi = 64, .divff = 0xa36076, .divr = 3, .divq = 10,
+ },
+ [SPX5_CORE_CLOCK_REF_39MHZ] = {
+ .divfi = 72, .divff = 0x83c361, .divr = 6, .divq = 10,
+ },
+};
+
+static int lan969x_init_core_pll(struct sparx5 *sparx5)
+{
+ const struct lan969x_core_pll_dividers *div;
+ u32 hw_stat, pll_cfg, freq_cfg;
+ enum sparx5_core_clockref ref;
+ int err;
+
+ hw_stat = spx5_rd(sparx5, CHIP_TOP_HW_STAT);
+ ref = CHIP_TOP_HW_STAT_REFCLK_SEL_GET(hw_stat) ?
+ SPX5_CORE_CLOCK_REF_39MHZ : SPX5_CORE_CLOCK_REF_25MHZ;
+ div = &lan969x_core_pll_328mhz[ref];
+ sparx5->coreclockref = ref;
+
+ /* Already configured by an earlier probe? */
+ pll_cfg = spx5_rd(sparx5, CHIP_TOP_CORE_PLL_CFG);
+ freq_cfg = spx5_rd(sparx5, CHIP_TOP_CORE_PLL_FREQ_CFG);
+ if (CHIP_TOP_CORE_PLL_CFG_ENA_CFG_GET(pll_cfg) &&
+ CHIP_TOP_CORE_PLL_FREQ_CFG_DIVFI_GET(freq_cfg) == div->divfi &&
+ CHIP_TOP_CORE_PLL_FREQ_CFG_DIVFF_GET(freq_cfg) == div->divff)
+ return 0;
+
+ spx5_rmw(CHIP_TOP_CORE_PLL_FREQ_CFG_DIVFI_SET(div->divfi) |
+ CHIP_TOP_CORE_PLL_FREQ_CFG_DIVFF_SET(div->divff),
+ CHIP_TOP_CORE_PLL_FREQ_CFG_DIVFI |
+ CHIP_TOP_CORE_PLL_FREQ_CFG_DIVFF,
+ sparx5, CHIP_TOP_CORE_PLL_FREQ_CFG);
+
+ /* Set the reference and output dividers, select the reference clock
+ * from the strapping pin and use fractional mode.
+ */
+ spx5_rmw(CHIP_TOP_CORE_PLL_CFG_DIVQ_SET(div->divq) |
+ CHIP_TOP_CORE_PLL_CFG_DIVR_SET(div->divr) |
+ CHIP_TOP_CORE_PLL_CFG_REF_CLK_SEL_SET(0) |
+ CHIP_TOP_CORE_PLL_CFG_FILTER_RANGE_SET(0),
+ CHIP_TOP_CORE_PLL_CFG_DIVQ |
+ CHIP_TOP_CORE_PLL_CFG_DIVR |
+ CHIP_TOP_CORE_PLL_CFG_REF_CLK_SEL |
+ CHIP_TOP_CORE_PLL_CFG_FILTER_RANGE,
+ sparx5, CHIP_TOP_CORE_PLL_CFG);
+
+ /* Switch the PLL from its reset defaults to the register settings */
+ spx5_rmw(CHIP_TOP_CORE_PLL_CFG_ENA_CFG_SET(1),
+ CHIP_TOP_CORE_PLL_CFG_ENA_CFG,
+ sparx5, CHIP_TOP_CORE_PLL_CFG);
+
+ spx5_rmw(CHIP_TOP_CORE_PLL_CFG_NEWDIV_SET(1),
+ CHIP_TOP_CORE_PLL_CFG_NEWDIV,
+ sparx5, CHIP_TOP_CORE_PLL_CFG);
+
+ err = read_poll_timeout(spx5_rd,
+ pll_cfg,
+ CHIP_TOP_CORE_PLL_CFG_DIVACK_GET(pll_cfg),
+ 100,
+ 10000,
+ false,
+ sparx5,
+ CHIP_TOP_CORE_PLL_CFG);
+
+ spx5_rmw(CHIP_TOP_CORE_PLL_CFG_NEWDIV_SET(0),
+ CHIP_TOP_CORE_PLL_CFG_NEWDIV,
+ sparx5, CHIP_TOP_CORE_PLL_CFG);
+
+ if (err) {
+ dev_err(sparx5->dev,
+ "Failed to change the core PLL dividers\n");
+ goto err_disable;
+ }
+
+ /* LOCK_STAT resets to 1, so sleep before the first read */
+ err = read_poll_timeout(spx5_rd,
+ pll_cfg,
+ CHIP_TOP_CORE_PLL_CFG_LOCK_STAT_GET(pll_cfg),
+ 100,
+ 10000,
+ true,
+ sparx5,
+ CHIP_TOP_CORE_PLL_CFG);
+ if (err) {
+ dev_err(sparx5->dev, "Failed to lock the core PLL\n");
+ goto err_disable;
+ }
+
+ return 0;
+
+err_disable:
+ /* Make the next probe redo the change */
+ spx5_rmw(CHIP_TOP_CORE_PLL_CFG_ENA_CFG_SET(0),
+ CHIP_TOP_CORE_PLL_CFG_ENA_CFG,
+ sparx5, CHIP_TOP_CORE_PLL_CFG);
+
+ return err;
+}
+
static int sparx5_init_coreclock(struct sparx5 *sparx5)
{
enum sparx5_core_clockfreq freq = sparx5->coreclock;
u32 clk_div, clk_period, pol_upd_int, idx;
+ int err;
/* Verify if core clock frequency is supported on target.
* If 'VTSS_CORE_CLOCK_DEFAULT' then the highest supported@@ -573,6 +683,15 @@ static int sparx5_init_coreclock(struct sparx5 *sparx5)
CLKGEN_LCPLL1_CORE_CLK_CFG_CORE_CLK_ENA,
sparx5, CLKGEN_LCPLL1_CORE_CLK_CFG);
} else {
+ if (freq != SPX5_CORE_CLOCK_328MHZ) {
+ dev_err(sparx5->dev,
+ "%d coreclock not supported\n",
+ freq);
+ return -EINVAL;
+ }
+ err = lan969x_init_core_pll(sparx5);
+ if (err)
+ return err;
pol_upd_int = 820; // SPX5_CORE_CLOCK_328MHZ
}
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
index ad29db91ce91e..f6316086e6ecb 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h
@@ -266,6 +266,12 @@ struct sparx5_port {
} tas_lists[SPX5_TAS_ENTRIES_PER_PORT];
};
+/* lan969x core PLL reference clock, from CHIP_TOP:HW_STAT.REFCLK_SEL */
+enum sparx5_core_clockref {
+ SPX5_CORE_CLOCK_REF_25MHZ,
+ SPX5_CORE_CLOCK_REF_39MHZ,
+};
+
enum sparx5_core_clockfreq {
SPX5_CORE_CLOCK_DEFAULT, /* Defaults to the highest supported frequency */
SPX5_CORE_CLOCK_250MHZ, /* 250MHZ core clock frequency */@@ -415,6 +421,7 @@ struct sparx5 {
/* port structures are in net device */
struct sparx5_port *ports[SPX5_PORTS];
enum sparx5_core_clockfreq coreclock;
+ enum sparx5_core_clockref coreclockref;
/* Statistics */
u32 num_stats;
u32 num_ethtool_stats;diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c b/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c
index 9f61692b243b7..544e9513a9a53 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c
@@ -62,7 +62,10 @@ static u64 sparx5_ptp_get_nominal_value(struct sparx5 *sparx5)
res = 0x1FF0000000000000;
break;
case SPX5_CORE_CLOCK_328MHZ:
- res = 0x18604697DD0F9B5B;
+ if (sparx5->coreclockref == SPX5_CORE_CLOCK_REF_25MHZ)
+ res = 0x186044FEF1EA9C10;
+ else
+ res = 0x18604697DD0F9B5B;
break;
case SPX5_CORE_CLOCK_500MHZ:
res = 0x0FF8000000000000;
--
2.34.1