2023-06-12 09:34:26

by Bartosz Golaszewski

Subject: [PATCH 16/26] net: stmmac: dwmac-qcom-ethqos: prepare the driver for more PHY modes

From: Bartosz Golaszewski <[email protected]>

In preparation for supporting SGMII, let's make the code a bit more
generic. Add a new callback for MAC configuration so that we can assign
a different variant of it in the future.

Signed-off-by: Bartosz Golaszewski <[email protected]>
---
.../stmicro/stmmac/dwmac-qcom-ethqos.c | 31 ++++++++++++++++---
1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 21f329d2f7eb..2f96f2c11278 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -92,12 +92,14 @@ struct ethqos_emac_driver_data {
struct qcom_ethqos {
struct platform_device *pdev;
void __iomem *rgmii_base;
+ int (*configure_func)(struct qcom_ethqos *ethqos);

unsigned int rgmii_clk_rate;
struct clk *rgmii_clk;
struct clk *phyaux_clk;
struct phy *serdes_phy;
unsigned int speed;
+ int phy_mode;

const struct ethqos_emac_por *por;
unsigned int num_por;
@@ -332,13 +334,11 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
{
struct device *dev = &ethqos->pdev->dev;
int phase_shift;
- int phy_mode;
int loopback;

/* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */
- phy_mode = device_get_phy_mode(dev);
- if (phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
- phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
+ if (ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
+ ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
phase_shift = 0;
else
phase_shift = RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN;
@@ -485,7 +485,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
return 0;
}

-static int ethqos_configure(struct qcom_ethqos *ethqos)
+static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos)
{
struct device *dev = &ethqos->pdev->dev;
volatile unsigned int dll_lock;
@@ -561,6 +561,11 @@ static int ethqos_configure(struct qcom_ethqos *ethqos)
return 0;
}

+static int ethqos_configure(struct qcom_ethqos *ethqos)
+{
+ return ethqos->configure_func(ethqos);
+}
+
static void ethqos_fix_mac_speed(void *priv, unsigned int speed)
{
struct qcom_ethqos *ethqos = priv;
@@ -660,6 +665,22 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
goto out_config_dt;
}

+ ethqos->phy_mode = device_get_phy_mode(dev);
+ switch (ethqos->phy_mode) {
+ case PHY_INTERFACE_MODE_RGMII:
+ case PHY_INTERFACE_MODE_RGMII_ID:
+ case PHY_INTERFACE_MODE_RGMII_RXID:
+ case PHY_INTERFACE_MODE_RGMII_TXID:
+ ethqos->configure_func = ethqos_configure_rgmii;
+ break;
+ case -ENODEV:
+ ret = -ENODEV;
+ goto out_config_dt;
+ default:
+ ret = -EINVAL;
+ goto out_config_dt;
+ }
+
ethqos->pdev = pdev;
ethqos->rgmii_base = devm_platform_ioremap_resource_byname(pdev, "rgmii");
if (IS_ERR(ethqos->rgmii_base)) {
--
2.39.2

2023-06-13 17:53:07

by Andrew Halaney

Subject: Re: [PATCH 16/26] net: stmmac: dwmac-qcom-ethqos: prepare the driver for more PHY modes

On Mon, Jun 12, 2023 at 11:23:45AM +0200, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[email protected]>
>
> In preparation for supporting SGMII, let's make the code a bit more
> generic. Add a new callback for MAC configuration so that we can assign
> a different variant of it in the future.
>
> Signed-off-by: Bartosz Golaszewski <[email protected]>

Reviewed-by: Andrew Halaney <[email protected]>

> ---
> .../stmicro/stmmac/dwmac-qcom-ethqos.c | 31 ++++++++++++++++---
> 1 file changed, 26 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
> index 21f329d2f7eb..2f96f2c11278 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
> @@ -92,12 +92,14 @@ struct ethqos_emac_driver_data {
> struct qcom_ethqos {
> struct platform_device *pdev;
> void __iomem *rgmii_base;
> + int (*configure_func)(struct qcom_ethqos *ethqos);
>
> unsigned int rgmii_clk_rate;
> struct clk *rgmii_clk;
> struct clk *phyaux_clk;
> struct phy *serdes_phy;
> unsigned int speed;
> + int phy_mode;
>
> const struct ethqos_emac_por *por;
> unsigned int num_por;
> @@ -332,13 +334,11 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
> {
> struct device *dev = &ethqos->pdev->dev;
> int phase_shift;
> - int phy_mode;
> int loopback;
>
> /* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */
> - phy_mode = device_get_phy_mode(dev);
> - if (phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
> - phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
> + if (ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
> + ethqos->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
> phase_shift = 0;
> else
> phase_shift = RGMII_CONFIG2_TX_CLK_PHASE_SHIFT_EN;
> @@ -485,7 +485,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
> return 0;
> }
>
> -static int ethqos_configure(struct qcom_ethqos *ethqos)
> +static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos)
> {
> struct device *dev = &ethqos->pdev->dev;
> volatile unsigned int dll_lock;
> @@ -561,6 +561,11 @@ static int ethqos_configure(struct qcom_ethqos *ethqos)
> return 0;
> }
>
> +static int ethqos_configure(struct qcom_ethqos *ethqos)
> +{
> + return ethqos->configure_func(ethqos);
> +}
> +
> static void ethqos_fix_mac_speed(void *priv, unsigned int speed)
> {
> struct qcom_ethqos *ethqos = priv;
> @@ -660,6 +665,22 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
> goto out_config_dt;
> }
>
> + ethqos->phy_mode = device_get_phy_mode(dev);
> + switch (ethqos->phy_mode) {
> + case PHY_INTERFACE_MODE_RGMII:
> + case PHY_INTERFACE_MODE_RGMII_ID:
> + case PHY_INTERFACE_MODE_RGMII_RXID:
> + case PHY_INTERFACE_MODE_RGMII_TXID:
> + ethqos->configure_func = ethqos_configure_rgmii;
> + break;
> + case -ENODEV:
> + ret = -ENODEV;
> + goto out_config_dt;
> + default:
> + ret = -EINVAL;
> + goto out_config_dt;
> + }
> +
> ethqos->pdev = pdev;
> ethqos->rgmii_base = devm_platform_ioremap_resource_byname(pdev, "rgmii");
> if (IS_ERR(ethqos->rgmii_base)) {
> --
> 2.39.2
>