On 3/9/24 03:11, Marek Vasut wrote:
> From: Christophe Roullier <christophe.roull...@st.com>
>
> Manage 2 ethernet instances, select which instance to configure with mask
> If mask is not present in DT, it is stm32mp15 platform.
>
> Signed-off-by: Christophe Roullier <christophe.roull...@st.com>
> Signed-off-by: Marek Vasut <ma...@denx.de> # Rework the code
> ---
> Cc: Christophe Roullier <christophe.roull...@st.com>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Patrice Chotard <patrice.chot...@foss.st.com>
> Cc: Patrick Delaunay <patrick.delau...@foss.st.com>
> Cc: Ramon Fried <rfried....@gmail.com>
> Cc: u-b...@dh-electronics.com
> Cc: uboot-st...@st-md-mailman.stormreply.com
> ---
> drivers/net/dwc_eth_qos_stm32.c | 82 ++++++++++++++++++++++++++-------
> 1 file changed, 66 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/dwc_eth_qos_stm32.c b/drivers/net/dwc_eth_qos_stm32.c
> index 4db18130765..00bf6d45568 100644
> --- a/drivers/net/dwc_eth_qos_stm32.c
> +++ b/drivers/net/dwc_eth_qos_stm32.c
> @@ -23,6 +23,7 @@
> #include <net.h>
> #include <netdev.h>
> #include <phy.h>
> +#include <regmap.h>
> #include <reset.h>
> #include <syscon.h>
> #include <wait_bit.h>
> @@ -33,11 +34,16 @@
>
> /* SYSCFG registers */
> #define SYSCFG_PMCSETR 0x04
> -#define SYSCFG_PMCCLRR 0x44
> +#define SYSCFG_PMCCLRR_MP13 0x08
> +#define SYSCFG_PMCCLRR_MP15 0x44
> +
> +#define SYSCFG_PMCSETR_ETH1_MASK GENMASK(23, 16)
> +#define SYSCFG_PMCSETR_ETH2_MASK GENMASK(31, 24)
>
> #define SYSCFG_PMCSETR_ETH_CLK_SEL BIT(16)
> #define SYSCFG_PMCSETR_ETH_REF_CLK_SEL BIT(17)
>
> +/* STM32MP15xx specific bit */
> #define SYSCFG_PMCSETR_ETH_SELMII BIT(20)
>
> #define SYSCFG_PMCSETR_ETH_SEL_MASK GENMASK(23, 21)
> @@ -45,6 +51,11 @@
> #define SYSCFG_PMCSETR_ETH_SEL_RGMII 0x1
> #define SYSCFG_PMCSETR_ETH_SEL_RMII 0x4
>
> +/* CLOCK feed to PHY */
> +#define ETH_CK_F_25M 25000000
> +#define ETH_CK_F_50M 50000000
> +#define ETH_CK_F_125M 125000000
> +
> static ulong eqos_get_tick_clk_rate_stm32(struct udevice *dev)
> {
> struct eqos_priv __maybe_unused *eqos = dev_get_priv(dev);
> @@ -130,34 +141,65 @@ static int eqos_probe_syscfg_stm32(struct udevice *dev,
> {
> /* Ethernet 50MHz RMII clock selection */
> const bool eth_ref_clk_sel = dev_read_bool(dev, "st,eth-ref-clk-sel");
> + /* SoC is STM32MP13xx with two ethernet MACs */
> + const bool is_mp13 = device_is_compatible(dev, "st,stm32mp13-dwmac");
> /* Gigabit Ethernet 125MHz clock selection. */
> const bool eth_clk_sel = dev_read_bool(dev, "st,eth-clk-sel");
> - u8 *syscfg;
> + /* Ethernet PHY have no crystal */
> + const bool ext_phyclk = dev_read_bool(dev, "st,ext-phyclk");
> + struct eqos_priv *eqos = dev_get_priv(dev);
> + struct regmap *regmap;
> + u32 regmap_mask;
> + ulong rate = 0;
> u32 value;
>
> - syscfg = (u8 *)syscon_get_first_range(STM32MP_SYSCON_SYSCFG);
> - if (!syscfg)
> - return -ENODEV;
> + regmap = syscon_regmap_lookup_by_phandle(dev, "st,syscon");
> + if (IS_ERR(regmap))
> + return PTR_ERR(regmap);
> +
> + regmap_mask = dev_read_u32_index_default(dev, "st,syscon", 2,
> + SYSCFG_PMCSETR_ETH1_MASK);
> +
> + if (clk_valid(&eqos->clk_ck))
> + rate = clk_get_rate(&eqos->clk_ck);
>
> switch (interface_type) {
> case PHY_INTERFACE_MODE_MII:
> dev_dbg(dev, "PHY_INTERFACE_MODE_MII\n");
> value = FIELD_PREP(SYSCFG_PMCSETR_ETH_SEL_MASK,
> SYSCFG_PMCSETR_ETH_SEL_GMII_MII);
> - value |= SYSCFG_PMCSETR_ETH_REF_CLK_SEL;
> + /*
> + * STM32MP15xx supports both MII and GMII, STM32MP13xx MII only.
> + * SYSCFG_PMCSETR ETH_SELMII is present only on STM32MP15xx and
> + * acts as a selector between 0:GMII and 1:MII. As STM32MP13xx
> + * supports only MII, ETH_SELMII is not present.
> + */
> + if (!is_mp13) /* Select MII mode on STM32MP15xx */
> + value |= SYSCFG_PMCSETR_ETH_SELMII;
> break;
> - case PHY_INTERFACE_MODE_GMII:
> + case PHY_INTERFACE_MODE_GMII: /* STM32MP15xx only */
> dev_dbg(dev, "PHY_INTERFACE_MODE_GMII\n");
> value = FIELD_PREP(SYSCFG_PMCSETR_ETH_SEL_MASK,
> SYSCFG_PMCSETR_ETH_SEL_GMII_MII);
> - if (eth_clk_sel)
> + /*
> + * If eth_clk_sel is set, use internal ETH_CLKx clock from RCC,
> + * otherwise use external clock from IO pin (requires matching
> + * GPIO block AF setting of that pin).
> + */
> + if (rate == ETH_CK_F_25M && (eth_clk_sel || ext_phyclk))
> value |= SYSCFG_PMCSETR_ETH_CLK_SEL;
> break;
> case PHY_INTERFACE_MODE_RMII:
> dev_dbg(dev, "PHY_INTERFACE_MODE_RMII\n");
> value = FIELD_PREP(SYSCFG_PMCSETR_ETH_SEL_MASK,
> SYSCFG_PMCSETR_ETH_SEL_RMII);
> - if (eth_ref_clk_sel)
> + /*
> + * If eth_ref_clk_sel is set, use internal clock from RCC,
> + * otherwise use external clock from ETHn_RX_CLK/ETHn_REF_CLK
> + * IO pin (requires matching GPIO block AF setting of that
> + * pin).
> + */
> + if (rate == ETH_CK_F_50M && (eth_ref_clk_sel || ext_phyclk))
> value |= SYSCFG_PMCSETR_ETH_REF_CLK_SEL;
> break;
> case PHY_INTERFACE_MODE_RGMII:
> @@ -167,7 +209,13 @@ static int eqos_probe_syscfg_stm32(struct udevice *dev,
> dev_dbg(dev, "PHY_INTERFACE_MODE_RGMII\n");
> value = FIELD_PREP(SYSCFG_PMCSETR_ETH_SEL_MASK,
> SYSCFG_PMCSETR_ETH_SEL_RGMII);
> - if (eth_clk_sel)
> + /*
> + * If eth_clk_sel is set, use internal ETH_CLKx clock from RCC,
> + * otherwise use external clock from ETHx_CLK125 pin (requires
> + * matching GPIO block AF setting of that pin).
> + */
> + if ((rate == ETH_CK_F_25M || rate == ETH_CK_F_125M) &&
> + (eth_clk_sel || ext_phyclk))
> value |= SYSCFG_PMCSETR_ETH_CLK_SEL;
> break;
> default:
> @@ -177,13 +225,15 @@ static int eqos_probe_syscfg_stm32(struct udevice *dev,
> return -EINVAL;
> }
>
> - /* clear and set ETH configuration bits */
> - writel(SYSCFG_PMCSETR_ETH_SEL_MASK | SYSCFG_PMCSETR_ETH_SELMII |
> - SYSCFG_PMCSETR_ETH_REF_CLK_SEL | SYSCFG_PMCSETR_ETH_CLK_SEL,
> - syscfg + SYSCFG_PMCCLRR);
> - writel(value, syscfg + SYSCFG_PMCSETR);
> + /* Shift value at correct ethernet MAC offset in SYSCFG_PMCSETR */
> + value <<= ffs(regmap_mask) - ffs(SYSCFG_PMCSETR_ETH1_MASK);
>
> - return 0;
> + /* Update PMCCLRR (clear register) */
> + regmap_write(regmap, is_mp13 ?
> + SYSCFG_PMCCLRR_MP13 : SYSCFG_PMCCLRR_MP15,
> + regmap_mask);
> +
> + return regmap_update_bits(regmap, SYSCFG_PMCSETR, regmap_mask, value);
> }
>
> static int eqos_probe_resources_stm32(struct udevice *dev)
Reviewed-by: Patrice Chotard <patrice.chot...@foss.st.com>
Thanks
Patrice
