| Message ID | 20170825143805.21733-1-clabbe.montjoie@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 25, 2017 at 04:38:05PM +0200, Corentin Labbe wrote: > The current dwmac_sun8i module cannot be rmmod/modprobe due to that > the reset controller was not released when removed. > > This patch remove ambiguity, by using of_reset_control_get_exclusive and > add the missing reset_control_put(). > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > index fffd6d5fc907..675a09629d85 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > @@ -782,6 +782,7 @@ static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) > > clk_disable_unprepare(gmac->ephy_clk); > reset_control_assert(gmac->rst_ephy); > + reset_control_put(gmac->rst_ephy); > return 0; > } > > @@ -942,7 +943,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) > return -EINVAL; > } > > - gmac->rst_ephy = of_reset_control_get(plat_dat->phy_node, NULL); > + gmac->rst_ephy = of_reset_control_get_exclusive(plat_dat->phy_node, NULL); Why not just use devm_reset_control_get? Maxime
On Fri, Aug 25, 2017 at 04:48:32PM +0200, Maxime Ripard wrote: > On Fri, Aug 25, 2017 at 04:38:05PM +0200, Corentin Labbe wrote: > > The current dwmac_sun8i module cannot be rmmod/modprobe due to that > > the reset controller was not released when removed. > > > > This patch remove ambiguity, by using of_reset_control_get_exclusive and > > add the missing reset_control_put(). > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > --- > > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > index fffd6d5fc907..675a09629d85 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > @@ -782,6 +782,7 @@ static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) > > > > clk_disable_unprepare(gmac->ephy_clk); > > reset_control_assert(gmac->rst_ephy); > > + reset_control_put(gmac->rst_ephy); > > return 0; > > } > > > > @@ -942,7 +943,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) > > return -EINVAL; > > } > > > > - gmac->rst_ephy = of_reset_control_get(plat_dat->phy_node, NULL); > > + gmac->rst_ephy = of_reset_control_get_exclusive(plat_dat->phy_node, NULL); > > Why not just use devm_reset_control_get? > Because there no devm_ functions with of_ Regards
On Fri, Aug 25, 2017 at 05:17:33PM +0200, Corentin Labbe wrote: > On Fri, Aug 25, 2017 at 04:48:32PM +0200, Maxime Ripard wrote: > > On Fri, Aug 25, 2017 at 04:38:05PM +0200, Corentin Labbe wrote: > > > The current dwmac_sun8i module cannot be rmmod/modprobe due to that > > > the reset controller was not released when removed. > > > > > > This patch remove ambiguity, by using of_reset_control_get_exclusive and > > > add the missing reset_control_put(). > > > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > > --- > > > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > > index fffd6d5fc907..675a09629d85 100644 > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > > @@ -782,6 +782,7 @@ static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) > > > > > > clk_disable_unprepare(gmac->ephy_clk); > > > reset_control_assert(gmac->rst_ephy); > > > + reset_control_put(gmac->rst_ephy); > > > return 0; > > > } > > > > > > @@ -942,7 +943,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) > > > return -EINVAL; > > > } > > > > > > - gmac->rst_ephy = of_reset_control_get(plat_dat->phy_node, NULL); > > > + gmac->rst_ephy = of_reset_control_get_exclusive(plat_dat->phy_node, NULL); > > > > Why not just use devm_reset_control_get? > > > > Because there no devm_ functions with of_ devm_reset_control_get uses of_reset_control_get internally. Maxime
On Fri, Aug 25, 2017 at 07:12:33PM +0200, Maxime Ripard wrote: > On Fri, Aug 25, 2017 at 05:17:33PM +0200, Corentin Labbe wrote: > > On Fri, Aug 25, 2017 at 04:48:32PM +0200, Maxime Ripard wrote: > > > On Fri, Aug 25, 2017 at 04:38:05PM +0200, Corentin Labbe wrote: > > > > The current dwmac_sun8i module cannot be rmmod/modprobe due to that > > > > the reset controller was not released when removed. > > > > > > > > This patch remove ambiguity, by using of_reset_control_get_exclusive and > > > > add the missing reset_control_put(). > > > > > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > > > --- > > > > drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 ++- > > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > > > index fffd6d5fc907..675a09629d85 100644 > > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c > > > > @@ -782,6 +782,7 @@ static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) > > > > > > > > clk_disable_unprepare(gmac->ephy_clk); > > > > reset_control_assert(gmac->rst_ephy); > > > > + reset_control_put(gmac->rst_ephy); > > > > return 0; > > > > } > > > > > > > > @@ -942,7 +943,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) > > > > return -EINVAL; > > > > } > > > > > > > > - gmac->rst_ephy = of_reset_control_get(plat_dat->phy_node, NULL); > > > > + gmac->rst_ephy = of_reset_control_get_exclusive(plat_dat->phy_node, NULL); > > > > > > Why not just use devm_reset_control_get? > > > > > > > Because there no devm_ functions with of_ > > devm_reset_control_get uses of_reset_control_get internally. Hello You are right. But since the ephy reset is in a child node, devm_ does not find it. Regards
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index fffd6d5fc907..675a09629d85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -782,6 +782,7 @@ static int sun8i_dwmac_unpower_internal_phy(struct sunxi_priv_data *gmac) clk_disable_unprepare(gmac->ephy_clk); reset_control_assert(gmac->rst_ephy); + reset_control_put(gmac->rst_ephy); return 0; } @@ -942,7 +943,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) return -EINVAL; } - gmac->rst_ephy = of_reset_control_get(plat_dat->phy_node, NULL); + gmac->rst_ephy = of_reset_control_get_exclusive(plat_dat->phy_node, NULL); if (IS_ERR(gmac->rst_ephy)) { ret = PTR_ERR(gmac->rst_ephy); if (ret == -EPROBE_DEFER)
The current dwmac_sun8i module cannot be rmmod/modprobe due to that the reset controller was not released when removed. This patch remove ambiguity, by using of_reset_control_get_exclusive and add the missing reset_control_put(). Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)