[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <izezculld3evoafk2eot5xx3fwnfughgu37silhq3qv5orwi4w@iy75t6wl2tsr>
Date: Tue, 2 Jul 2024 12:46:07 +0300
From: Serge Semin <fancer.lancer@...il.com>
To: Yanteng Si <siyanteng@...ngson.cn>
Cc: andrew@...n.ch, hkallweit1@...il.com, peppe.cavallaro@...com,
alexandre.torgue@...s.st.com, joabreu@...opsys.com, Jose.Abreu@...opsys.com,
chenhuacai@...nel.org, linux@...linux.org.uk, guyinggang@...ngson.cn,
netdev@...r.kernel.org, chris.chenfeiyang@...il.com, si.yanteng@...ux.dev
Subject: Re: [PATCH net-next v13 11/15] net: stmmac: dwmac-loongson: Add
loongson_dwmac_dt_config
On Wed, May 29, 2024 at 06:20:27PM +0800, Yanteng Si wrote:
> While at it move the np initialization procedure into a dedicated
> method. It will be useful in one of the subsequent commit adding the
> Loongson GNET device support.
As I just mentioned please merge in this patch content into the
previous patch:
[PATCH net-next v13 10/15] net: stmmac: dwmac-loongson: Add DT-less GMAC PCI-device support
-Serge(y)
>
> Signed-off-by: Feiyang Chen <chenfeiyang@...ngson.cn>
> Signed-off-by: Yinggang Gu <guyinggang@...ngson.cn>
> Signed-off-by: Yanteng Si <siyanteng@...ngson.cn>
> ---
> .../ethernet/stmicro/stmmac/dwmac-loongson.c | 90 ++++++++++---------
> 1 file changed, 50 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> index 8bcf9d522781..fdd25ff33d02 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> @@ -67,16 +67,60 @@ static struct stmmac_pci_info loongson_gmac_pci_info = {
> .setup = loongson_gmac_data,
> };
>
> +static int loongson_dwmac_dt_config(struct pci_dev *pdev,
> + struct plat_stmmacenet_data *plat,
> + struct stmmac_resources *res)
> +{
> + struct device_node *np = dev_of_node(&pdev->dev);
> + int ret;
> +
> + plat->mdio_node = of_get_child_by_name(np, "mdio");
> + if (plat->mdio_node) {
> + dev_info(&pdev->dev, "Found MDIO subnode\n");
> + plat->mdio_bus_data->needs_reset = true;
> + }
> +
> + ret = of_alias_get_id(np, "ethernet");
> + if (ret >= 0)
> + plat->bus_id = ret;
> +
> + res->irq = of_irq_get_byname(np, "macirq");
> + if (res->irq < 0) {
> + dev_err(&pdev->dev, "IRQ macirq not found\n");
> + return -ENODEV;
> + }
> +
> + res->wol_irq = of_irq_get_byname(np, "eth_wake_irq");
> + if (res->wol_irq < 0) {
> + dev_info(&pdev->dev,
> + "IRQ eth_wake_irq not found, using macirq\n");
> + res->wol_irq = res->irq;
> + }
> +
> + res->lpi_irq = of_irq_get_byname(np, "eth_lpi");
> + if (res->lpi_irq < 0) {
> + dev_err(&pdev->dev, "IRQ eth_lpi not found\n");
> + return -ENODEV;
> + }
> +
> + ret = device_get_phy_mode(&pdev->dev);
> + if (ret < 0) {
> + dev_err(&pdev->dev, "phy_mode not found\n");
> + return -ENODEV;
> + }
> +
> + plat->phy_interface = ret;
> +
> + return 0;
> +}
> +
> static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> {
> struct plat_stmmacenet_data *plat;
> struct stmmac_pci_info *info;
> struct stmmac_resources res;
> - struct device_node *np;
> int ret, i;
>
> - np = dev_of_node(&pdev->dev);
> -
> plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
> if (!plat)
> return -ENOMEM;
> @@ -115,44 +159,10 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
>
> pci_set_master(pdev);
>
> - if (np) {
> - plat->mdio_node = of_get_child_by_name(np, "mdio");
> - if (plat->mdio_node) {
> - dev_info(&pdev->dev, "Found MDIO subnode\n");
> - plat->mdio_bus_data->needs_reset = true;
> - }
> -
> - ret = of_alias_get_id(np, "ethernet");
> - if (ret >= 0)
> - plat->bus_id = ret;
> -
> - ret = device_get_phy_mode(&pdev->dev);
> - if (ret < 0) {
> - dev_err(&pdev->dev, "phy_mode not found\n");
> + if (dev_of_node(&pdev->dev)) {
> + ret = loongson_dwmac_dt_config(pdev, plat, &res);
> + if (ret)
> goto err_disable_device;
> - }
> -
> - plat->phy_interface = ret;
> -
> - res.irq = of_irq_get_byname(np, "macirq");
> - if (res.irq < 0) {
> - dev_err(&pdev->dev, "IRQ macirq not found\n");
> - ret = -ENODEV;
> - goto err_disable_msi;
> - }
> -
> - res.wol_irq = of_irq_get_byname(np, "eth_wake_irq");
> - if (res.wol_irq < 0) {
> - dev_info(&pdev->dev, "IRQ eth_wake_irq not found, using macirq\n");
> - res.wol_irq = res.irq;
> - }
> -
> - res.lpi_irq = of_irq_get_byname(np, "eth_lpi");
> - if (res.lpi_irq < 0) {
> - dev_err(&pdev->dev, "IRQ eth_lpi not found\n");
> - ret = -ENODEV;
> - goto err_disable_msi;
> - }
> } else {
> res.irq = pdev->irq;
> }
> --
> 2.31.4
>
Powered by blists - more mailing lists