Re: [PATCH 1/2] phy: Extend generic_setup_phy() with PHY mode and submode

Caleb Connolly Mon, 17 Jun 2024 00:07:37 -0700



On 16/06/2024 17:04, Marek Vasut wrote:

Extend generic_setup_phy() parameter list with PHY mode and submode and
call generic_phy_set_mode() in generic_setup_phy(), so the generic PHY
setup function can configure the PHY into correct mode before powering
the PHY up.

Update all call sites of generic_setup_phy() as well, all of which are
USB host related, except for DM test which now behaves as a USB host
test.

Note that if the PHY driver does not implement the .set_mode callback,
generic_phy_set_mode() call returns 0 and does not error out, so this
should not break any existing systems.

Signed-off-by: Marek Vasut <marek.vasut+rene...@mailbox.org>


Acked-by: Caleb Connolly <caleb.conno...@linaro.org> # ehci-msm

---
Cc: Caleb Connolly <caleb.conno...@linaro.org>
Cc: Fabio Estevam <feste...@gmail.com>
Cc: Fabrice Gasnier <fabrice.gasn...@foss.st.com>
Cc: Jonas Karlman <jo...@kwiboo.se>
Cc: Mathieu Othacehe <othac...@gnu.org>
Cc: Mattijs Korpershoek <mkorpersh...@baylibre.com>
Cc: Neil Armstrong <neil.armstr...@linaro.org>
Cc: Nishanth Menon <n...@ti.com>
Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Cc: Sean Anderson <sean...@gmail.com>
Cc: Simon Glass <s...@chromium.org>
Cc: Sumit Garg <sumit.g...@linaro.org>
Cc: Tim Harvey <thar...@gateworks.com>
Cc: Tom Rini <tr...@konsulko.com>
Cc: Xavier Drudis Ferran <xdru...@tinet.cat>
Cc: u-boot-q...@groups.io
Cc: u-boot@lists.denx.de
---
  drivers/phy/phy-uclass.c        | 7 ++++++-
  drivers/usb/host/ehci-generic.c | 2 +-
  drivers/usb/host/ehci-msm.c     | 2 +-
  drivers/usb/host/ehci-mx6.c     | 2 +-
  drivers/usb/host/ehci-pci.c     | 2 +-
  drivers/usb/host/ohci-generic.c | 2 +-
  include/generic-phy.h           | 5 ++++-
  test/dm/phy.c                   | 8 ++++----
  8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index acdcda15b5b..bbaf95112c5 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -508,7 +508,8 @@ int generic_phy_power_off_bulk(struct phy_bulk *bulk)
        return ret;
  }

-int generic_setup_phy(struct udevice *dev, struct phy *phy, int index)

+int generic_setup_phy(struct udevice *dev, struct phy *phy, int index,
+                     enum phy_mode mode, int submode)
  {
        int ret;

@@ -520,6 +521,10 @@ int generic_setup_phy(struct udevice *dev, struct phy *phy, int index)

        if (ret)
                return ret;

+ ret = generic_phy_set_mode(phy, mode, submode);

+       if (ret)
+               generic_phy_exit(phy);
+
        ret = generic_phy_power_on(phy);
        if (ret)
                generic_phy_exit(phy);
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index 23c3ed25554..1ae3619ce25 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -94,7 +94,7 @@ static int ehci_usb_probe(struct udevice *dev)
        if (err)
                goto reset_err;

- err = generic_setup_phy(dev, &priv->phy, 0);

+       err = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
        if (err)
                goto regulator_err;

diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c

index a081f71b187..b0c060b8173 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -56,7 +56,7 @@ static int ehci_usb_probe(struct udevice *dev)
        hcor = (struct ehci_hcor *)((phys_addr_t)hccr +
                        HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));

- ret = generic_setup_phy(dev, &p->phy, 0);

+       ret = generic_setup_phy(dev, &p->phy, 0, PHY_MODE_USB_HOST, 0);
        if (ret)
                return ret;

diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c

index 31cd8a50f4a..a93fa5d5455 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -703,7 +703,7 @@ static int ehci_usb_probe(struct udevice *dev)
        usb_phy_enable(ehci, priv->phy_addr);
  #endif
  #else
-       ret = generic_setup_phy(dev, &priv->phy, 0);
+       ret = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
        if (ret)
                goto err_regulator;
  #endif
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 572686580cd..8d05b14e898 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -30,7 +30,7 @@ static int ehci_pci_init(struct udevice *dev, struct 
ehci_hccr **ret_hccr,
        int ret;
        u32 cmd;

- ret = generic_setup_phy(dev, &priv->phy, 0);

+       ret = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
        if (ret)
                return ret;

diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c

index f1325cd4953..cc44226f5e0 100644
--- a/drivers/usb/host/ohci-generic.c
+++ b/drivers/usb/host/ohci-generic.c
@@ -50,7 +50,7 @@ static int ohci_usb_probe(struct udevice *dev)
                goto reset_err;
        }

- err = generic_setup_phy(dev, &priv->phy, 0);

+       err = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
        if (err)
                goto reset_err;

diff --git a/include/generic-phy.h b/include/generic-phy.h

index eaab7491660..47962023236 100644
--- a/include/generic-phy.h
+++ b/include/generic-phy.h
@@ -415,10 +415,13 @@ int generic_phy_power_off_bulk(struct phy_bulk *bulk);
   * @dev:      The consumer device.
   * @phy:      A pointer to the PHY port
   * @index:    The index in the list of available PHYs
+ * @mode:      PHY mode
+ * @submode:   PHY submode
   *
   * Return: 0 if OK, or negative error code.
   */
-int generic_setup_phy(struct udevice *dev, struct phy *phy, int index);
+int generic_setup_phy(struct udevice *dev, struct phy *phy, int index,
+                     enum phy_mode mode, int submode);

/**

   * generic_shutdown_phy() - Power off and de-initialize phy.
diff --git a/test/dm/phy.c b/test/dm/phy.c
index d14117f6f7a..a90881b12ab 100644
--- a/test/dm/phy.c
+++ b/test/dm/phy.c
@@ -243,20 +243,20 @@ static int dm_test_phy_setup(struct unit_test_state *uts)
                                              "gen_phy_user", &parent));

/* normal */

-       ut_assertok(generic_setup_phy(parent, &phy, 0));
+       ut_assertok(generic_setup_phy(parent, &phy, 0, PHY_MODE_USB_HOST, 0));
        ut_assertok(generic_shutdown_phy(&phy));

/* power_off fail with -EIO */

-       ut_assertok(generic_setup_phy(parent, &phy, 1));
+       ut_assertok(generic_setup_phy(parent, &phy, 1, PHY_MODE_USB_HOST, 0));
        ut_asserteq(-EIO, generic_shutdown_phy(&phy));

/* power_on fail with -EIO */

-       ut_asserteq(-EIO, generic_setup_phy(parent, &phy, 2));
+       ut_asserteq(-EIO, generic_setup_phy(parent, &phy, 2, PHY_MODE_USB_HOST, 
0));
        ut_assertok(generic_shutdown_phy(&phy));

/* generic_phy_get_by_index fail with -ENOENT */

        ut_asserteq(-ENOENT, generic_phy_get_by_index(parent, 3, &phy));
-       ut_assertok(generic_setup_phy(parent, &phy, 3));
+       ut_assertok(generic_setup_phy(parent, &phy, 3, PHY_MODE_USB_HOST, 0));
        ut_assertok(generic_shutdown_phy(&phy));

return 0;


--
// Caleb (they/them)

Re: [PATCH 1/2] phy: Extend generic_setup_phy() with PHY mode and submode

Reply via email to