2021-11-30 09:57:12

by Horatiu Vultur

Subject: [PATCH net-next] net: mdio: mscc-miim: Set back the optional resource.

In the blamed commit, the second memory resource was not considered
anymore as optional. On some platforms like sparx5 the second resource
is optional. So add it back as optional and restore the comment that
says so.

Fixes: a27a762828375a ("net: mdio: mscc-miim: convert to a regmap implementation")
Signed-off-by: Horatiu Vultur <[email protected]>
---
drivers/net/mdio/mdio-mscc-miim.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c
index 2d420c9d7520..7d2abaf2b2c9 100644
--- a/drivers/net/mdio/mdio-mscc-miim.c
+++ b/drivers/net/mdio/mdio-mscc-miim.c
@@ -219,9 +219,10 @@ EXPORT_SYMBOL(mscc_miim_setup);

static int mscc_miim_probe(struct platform_device *pdev)
{
- struct regmap *mii_regmap, *phy_regmap;
+ struct regmap *mii_regmap, *phy_regmap = NULL;
void __iomem *regs, *phy_regs;
struct mscc_miim_dev *miim;
+ struct resource *res;
struct mii_bus *bus;
int ret;

@@ -239,17 +240,21 @@ static int mscc_miim_probe(struct platform_device *pdev)
return PTR_ERR(mii_regmap);
}

- phy_regs = devm_platform_ioremap_resource(pdev, 1);
- if (IS_ERR(phy_regs)) {
- dev_err(&pdev->dev, "Unable to map internal phy registers\n");
- return PTR_ERR(phy_regs);
- }
+ /* This resource is optional */
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ if (res) {
+ phy_regs = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(phy_regs)) {
+ dev_err(&pdev->dev, "Unable to map internal phy registers\n");
+ return PTR_ERR(phy_regs);
+ }

- phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs,
- &mscc_miim_regmap_config);
- if (IS_ERR(phy_regmap)) {
- dev_err(&pdev->dev, "Unable to create phy register regmap\n");
- return PTR_ERR(phy_regmap);
+ phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs,
+ &mscc_miim_regmap_config);
+ if (IS_ERR(phy_regmap)) {
+ dev_err(&pdev->dev, "Unable to create phy register regmap\n");
+ return PTR_ERR(phy_regmap);
+ }
}

ret = mscc_miim_setup(&pdev->dev, &bus, "mscc_miim", mii_regmap, 0);
--
2.33.0

2021-11-30 12:30:29

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next] net: mdio: mscc-miim: Set back the optional resource.

Hello:

This patch was applied to netdev/net-next.git (master)
by David S. Miller <[email protected]>:

On Tue, 30 Nov 2021 10:57:45 +0100 you wrote:
> In the blamed commit, the second memory resource was not considered
> anymore as optional. On some platforms like sparx5 the second resource
> is optional. So add it back as optional and restore the comment that
> says so.
>
> Fixes: a27a762828375a ("net: mdio: mscc-miim: convert to a regmap implementation")
> Signed-off-by: Horatiu Vultur <[email protected]>
>
> [...]

Here is the summary with links:
- [net-next] net: mdio: mscc-miim: Set back the optional resource.
https://git.kernel.org/netdev/net-next/c/c448c898ae89

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html