netdev - Re: [PATCH 3/3] net: ethernet: ixp4xx: Use OF MDIO bus registration

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 20 Apr 2021 03:47:20 +0200
From:   Andrew Lunn <andrew@...n.ch>
To:     Linus Walleij <linus.walleij@...aro.org>
Cc:     netdev@...r.kernel.org, "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Zoltan HERPAI <wigyori@...0.hu>,
        Raylynn Knight <rayknight@...com>
Subject: Re: [PATCH 3/3] net: ethernet: ixp4xx: Use OF MDIO bus registration

> @@ -1381,25 +1382,12 @@ static struct eth_plat_info *ixp4xx_of_get_platdata(struct device *dev)
>  	/* NPE ID 0x00, 0x10, 0x20... */
>  	plat->npe = (val << 4);
>  
> -	phy_np = of_parse_phandle(np, "phy-handle", 0);
> -	if (phy_np) {
> -		ret = of_property_read_u32(phy_np, "reg", &val);
> -		if (ret) {
> -			dev_err(dev, "cannot find phy reg\n");
> -			return NULL;
> -		}
> -		of_node_put(phy_np);
> -	} else {
> -		dev_err(dev, "cannot find phy instance\n");
> -		val = 0;
> -	}
> -	plat->phy = val;
> -

Isn't this code you just added in the previous patch?

>  	/* Check if this device has an MDIO bus */
>  	mdio_np = of_get_child_by_name(np, "mdio");
>  	if (mdio_np) {
>  		plat->has_mdio = true;
> -		of_node_put(mdio_np);
> +		mdio_bus_np = mdio_np;
> +		/* DO NOT put the mdio_np, it will be used */
>  	}
>  
>  	/* Get the rx queue as a resource from queue manager */
> @@ -1539,10 +1527,14 @@ static int ixp4xx_eth_probe(struct platform_device *pdev)
>  	__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
>  	udelay(50);
>  
> -	snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
> -		 mdio_bus->id, plat->phy);
> -	phydev = phy_connect(ndev, phy_id, &ixp4xx_adjust_link,
> -			     PHY_INTERFACE_MODE_MII);
> +	if (np) {
> +		phydev = of_phy_get_and_connect(ndev, np, ixp4xx_adjust_link);
> +	} else {
> +		snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
> +			 mdio_bus->id, plat->phy);

mdiobus_get_phy() and phy_connect_direct() might be better.

	  Andrew