target/linux/ath79/patches-4.19/701-mdio-bus-dont-use-managed-reset-controller.patch

   1 From 32085f25d7b68404055f3525c780142fc72e543f Mon Sep 17 00:00:00 2001
   2 From: David Bauer <mail@david-bauer.net>
   3 Date: Fri, 22 Nov 2019 22:44:51 +0100
   4 Subject: [PATCH] mdio_bus: don't use managed reset-controller
   5
   6 Geert Uytterhoeven reported that using devm_reset_controller_get leads
   7 to a WARNING when probing a reset-controlled PHY. This is because the
   8 device devm_reset_controller_get gets supplied is not actually the
   9 one being probed.
  10
  11 Acquire an unmanaged reset-control as well as free the reset_control on
  12 unregister to fix this.
  13
  14 Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
  15 CC: Andrew Lunn <andrew@lunn.ch>
  16 Signed-off-by: David Bauer <mail@david-bauer.net>
  17 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  18 Signed-off-by: David S. Miller <davem@davemloft.net>
  19 ---
  20  drivers/net/phy/mdio_bus.c | 6 ++++--
  21  1 file changed, 4 insertions(+), 2 deletions(-)
  22
  23 --- a/drivers/net/phy/mdio_bus.c
  24 +++ b/drivers/net/phy/mdio_bus.c
  25 @@ -74,8 +74,8 @@ static int mdiobus_register_reset(struct
  26         struct reset_control *reset = NULL;
  27
  28         if (mdiodev->dev.of_node)
  29 -               reset = devm_reset_control_get_exclusive(&mdiodev->dev,
  30 -                                                        "phy");
  31 +               reset = of_reset_control_get_exclusive(mdiodev->dev.of_node,
  32 +                                                      "phy");
  33         if (PTR_ERR(reset) == -ENOENT ||
  34             PTR_ERR(reset) == -ENOTSUPP)
  35                 reset = NULL;
  36 @@ -118,6 +118,8 @@ int mdiobus_unregister_device(struct mdi
  37         if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev)
  38                 return -EINVAL;
  39
  40 +       reset_control_put(mdiodev->reset_ctrl);
  41 +
  42         mdiodev->bus->mdio_map[mdiodev->addr] = NULL;
  43
  44         return 0;