2020-05-05 02:05:34

by Dejin Zheng

Subject: [PATCH net v1] net: broadcom: fix a mistake about ioremap resource

Commit d7a5502b0bb8b ("net: broadcom: convert to
devm_platform_ioremap_resource_byname()") will broke this driver.
idm_base and nicpm_base were optional, after this change, they are
mandatory. it will probe fails with -22 when the dtb doesn't have them
defined. so revert part of this commit and make idm_base and nicpm_base
as optional.

Fixes: d7a5502b0bb8bde ("net: broadcom: convert to devm_platform_ioremap_resource_byname()")
Reported-by: Jonathan Richardson <[email protected]>
Cc: Scott Branden <[email protected]>
Cc: Ray Jui <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: David S. Miller <[email protected]>
Signed-off-by: Dejin Zheng <[email protected]>
---
.../net/ethernet/broadcom/bgmac-platform.c | 24 ++++++++++++-------
1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index a5d1a6cb9ce3..6795b6d95f54 100644
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -172,6 +172,7 @@ static int bgmac_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct bgmac *bgmac;
+ struct resource *regs;
const u8 *mac_addr;

bgmac = bgmac_alloc(&pdev->dev);
@@ -206,16 +207,21 @@ static int bgmac_probe(struct platform_device *pdev)
if (IS_ERR(bgmac->plat.base))
return PTR_ERR(bgmac->plat.base);

- bgmac->plat.idm_base =
- devm_platform_ioremap_resource_byname(pdev, "idm_base");
- if (IS_ERR(bgmac->plat.idm_base))
- return PTR_ERR(bgmac->plat.idm_base);
- bgmac->feature_flags &= ~BGMAC_FEAT_IDM_MASK;
+ regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "idm_base");
+ if (regs) {
+ bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);
+ if (IS_ERR(bgmac->plat.idm_base))
+ return PTR_ERR(bgmac->plat.idm_base);
+ bgmac->feature_flags &= ~BGMAC_FEAT_IDM_MASK;
+ }

- bgmac->plat.nicpm_base =
- devm_platform_ioremap_resource_byname(pdev, "nicpm_base");
- if (IS_ERR(bgmac->plat.nicpm_base))
- return PTR_ERR(bgmac->plat.nicpm_base);
+ regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nicpm_base");
+ if (regs) {
+ bgmac->plat.nicpm_base = devm_ioremap_resource(&pdev->dev,
+ regs);
+ if (IS_ERR(bgmac->plat.nicpm_base))
+ return PTR_ERR(bgmac->plat.nicpm_base);
+ }

bgmac->read = platform_bgmac_read;
bgmac->write = platform_bgmac_write;
--
2.25.0

2020-05-05 03:30:40

by Florian Fainelli

Subject: Re: [PATCH net v1] net: broadcom: fix a mistake about ioremap resource

On 5/4/2020 7:03 PM, Dejin Zheng wrote:
> Commit d7a5502b0bb8b ("net: broadcom: convert to
> devm_platform_ioremap_resource_byname()") will broke this driver.
> idm_base and nicpm_base were optional, after this change, they are
> mandatory. it will probe fails with -22 when the dtb doesn't have them
> defined. so revert part of this commit and make idm_base and nicpm_base
> as optional.
>
> Fixes: d7a5502b0bb8bde ("net: broadcom: convert to devm_platform_ioremap_resource_byname()")
> Reported-by: Jonathan Richardson <[email protected]>
> Cc: Scott Branden <[email protected]>
> Cc: Ray Jui <[email protected]>
> Cc: Florian Fainelli <[email protected]>
> Cc: David S. Miller <[email protected]>
> Signed-off-by: Dejin Zheng <[email protected]>

Acked-by: Florian Fainelli <[email protected]>
--
Florian

2020-05-05 06:54:08

by Dejin Zheng

Subject: Re: [PATCH net v1] net: broadcom: fix a mistake about ioremap resource

On Mon, May 04, 2020 at 08:28:52PM -0700, Florian Fainelli wrote:
>
>
> On 5/4/2020 7:03 PM, Dejin Zheng wrote:
> > Commit d7a5502b0bb8b ("net: broadcom: convert to
> > devm_platform_ioremap_resource_byname()") will broke this driver.
> > idm_base and nicpm_base were optional, after this change, they are
> > mandatory. it will probe fails with -22 when the dtb doesn't have them
> > defined. so revert part of this commit and make idm_base and nicpm_base
> > as optional.
> >
> > Fixes: d7a5502b0bb8bde ("net: broadcom: convert to devm_platform_ioremap_resource_byname()")
> > Reported-by: Jonathan Richardson <[email protected]>
> > Cc: Scott Branden <[email protected]>
> > Cc: Ray Jui <[email protected]>
> > Cc: Florian Fainelli <[email protected]>
> > Cc: David S. Miller <[email protected]>
> > Signed-off-by: Dejin Zheng <[email protected]>
>
> Acked-by: Florian Fainelli <[email protected]>

Florian, Thank you very much for helping me as always!

BR,
Dejin

> --
> Florian

2020-05-05 18:14:30

by David Miller

Subject: Re: [PATCH net v1] net: broadcom: fix a mistake about ioremap resource

From: Dejin Zheng <[email protected]>
Date: Tue, 5 May 2020 10:03:29 +0800

> Commit d7a5502b0bb8b ("net: broadcom: convert to
> devm_platform_ioremap_resource_byname()") will broke this driver.
> idm_base and nicpm_base were optional, after this change, they are
> mandatory. it will probe fails with -22 when the dtb doesn't have them
> defined. so revert part of this commit and make idm_base and nicpm_base
> as optional.
>
> Fixes: d7a5502b0bb8bde ("net: broadcom: convert to devm_platform_ioremap_resource_byname()")
> Reported-by: Jonathan Richardson <[email protected]>
> Signed-off-by: Dejin Zheng <[email protected]>

Applied, thank you.