[U-Boot] [PATCH 0/2] usb: Extend ehci and ohci generic drivers
From: Patrice Chotard patrice.chotard@st.com
Add generic PHY framework support to ehci-generic.c Add RESET, CLOCK and generic PHY frameworks support to ohci-generic.c
Patrice Chotard (2): usb: extend generic EHCI driver with PHY usb: extend generic OHCI with CLOCK, RESET and PHY
drivers/usb/host/ehci-generic.c | 11 +++++++++-- drivers/usb/host/ohci-generic.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 8 deletions(-)
From: Patrice Chotard patrice.chotard@st.com
Add support of generic PHY framework Replace printf() by error()
Signed-off-by: Patrice Chotard patrice.chotard@st.com --- drivers/usb/host/ehci-generic.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 2190adb..d744a57 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -6,6 +6,8 @@
#include <common.h> #include <clk.h> +#include <fdtdec.h> +#include <generic-phy.h> #include <reset.h> #include <asm/io.h> #include <dm.h> @@ -24,6 +26,7 @@ static int ehci_usb_probe(struct udevice *dev) { struct ehci_hccr *hccr; struct ehci_hcor *hcor; + struct phy usb_phy; int i;
for (i = 0; ; i++) { @@ -34,7 +37,7 @@ static int ehci_usb_probe(struct udevice *dev) if (ret < 0) break; if (clk_enable(&clk)) - printf("failed to enable clock %d\n", i); + error("failed to enable clock %d\n", i); clk_free(&clk); }
@@ -46,10 +49,14 @@ static int ehci_usb_probe(struct udevice *dev) if (ret < 0) break; if (reset_deassert(&reset)) - printf("failed to deassert reset %d\n", i); + error("failed to deassert reset %d\n", i); reset_free(&reset); }
+ if (!generic_phy_get_by_index(dev, 0, &usb_phy)) + if (generic_phy_init(&usb_phy)) + error("failed to init usb phy %d\n", i); + hccr = map_physmem(dev_get_addr(dev), 0x100, MAP_NOCACHE); hcor = (struct ehci_hcor *)((uintptr_t)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
On 05/12/2017 03:13 PM, patrice.chotard@st.com wrote:
From: Patrice Chotard patrice.chotard@st.com
Add support of generic PHY framework Replace printf() by error()
Signed-off-by: Patrice Chotard patrice.chotard@st.com
drivers/usb/host/ehci-generic.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 2190adb..d744a57 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -6,6 +6,8 @@
#include <common.h> #include <clk.h> +#include <fdtdec.h> +#include <generic-phy.h> #include <reset.h> #include <asm/io.h> #include <dm.h> @@ -24,6 +26,7 @@ static int ehci_usb_probe(struct udevice *dev) { struct ehci_hccr *hccr; struct ehci_hcor *hcor;
struct phy usb_phy; int i;
for (i = 0; ; i++) {
@@ -34,7 +37,7 @@ static int ehci_usb_probe(struct udevice *dev) if (ret < 0) break; if (clk_enable(&clk))
printf("failed to enable clock %d\n", i);
error("failed to enable clock %d\n", i);
Separate patch please
clk_free(&clk);}
@@ -46,10 +49,14 @@ static int ehci_usb_probe(struct udevice *dev) if (ret < 0) break; if (reset_deassert(&reset))
printf("failed to deassert reset %d\n", i);
error("failed to deassert reset %d\n", i);
DTTO
reset_free(&reset);}
- if (!generic_phy_get_by_index(dev, 0, &usb_phy))
if (generic_phy_init(&usb_phy))error("failed to init usb phy %d\n", i);
Is there any de-init for the PHY ?
hccr = map_physmem(dev_get_addr(dev), 0x100, MAP_NOCACHE); hcor = (struct ehci_hcor *)((uintptr_t)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
Hi Marek
On 05/12/2017 03:20 PM, Marek Vasut wrote:
On 05/12/2017 03:13 PM, patrice.chotard@st.com wrote:
From: Patrice Chotard patrice.chotard@st.com
Add support of generic PHY framework Replace printf() by error()
Signed-off-by: Patrice Chotard patrice.chotard@st.com
drivers/usb/host/ehci-generic.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 2190adb..d744a57 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -6,6 +6,8 @@
#include <common.h> #include <clk.h> +#include <fdtdec.h> +#include <generic-phy.h> #include <reset.h> #include <asm/io.h> #include <dm.h> @@ -24,6 +26,7 @@ static int ehci_usb_probe(struct udevice *dev) { struct ehci_hccr *hccr; struct ehci_hcor *hcor;
struct phy usb_phy; int i;
for (i = 0; ; i++) {
@@ -34,7 +37,7 @@ static int ehci_usb_probe(struct udevice *dev) if (ret < 0) break; if (clk_enable(&clk))
printf("failed to enable clock %d\n", i);
error("failed to enable clock %d\n", i);Separate patch please
Ok
clk_free(&clk);}
@@ -46,10 +49,14 @@ static int ehci_usb_probe(struct udevice *dev) if (ret < 0) break; if (reset_deassert(&reset))
printf("failed to deassert reset %d\n", i);
error("failed to deassert reset %d\n", i);DTTO
reset_free(&reset);}
- if (!generic_phy_get_by_index(dev, 0, &usb_phy))
if (generic_phy_init(&usb_phy))error("failed to init usb phy %d\n", i);Is there any de-init for the PHY ?
There is a generic_phy_exit(). As mentionned in PATCH 2 comments, i will add an error path and add a remove callback.
Patrice
hccr = map_physmem(dev_get_addr(dev), 0x100, MAP_NOCACHE); hcor = (struct ehci_hcor *)((uintptr_t)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
From: Patrice Chotard patrice.chotard@st.com
Add CLOCK, RESET and generic PHY frameworks support
Signed-off-by: Patrice Chotard patrice.chotard@st.com --- drivers/usb/host/ohci-generic.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index f3307f4..c9d8b74 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -5,7 +5,12 @@ */
#include <common.h> +#include <clk.h> #include <dm.h> +#include <fdtdec.h> +#include <generic-phy.h> +#include <reset.h> + #include "ohci.h"
#if !defined(CONFIG_USB_OHCI_NEW) @@ -19,13 +24,36 @@ struct generic_ohci { static int ohci_usb_probe(struct udevice *dev) { struct ohci_regs *regs = (struct ohci_regs *)dev_get_addr(dev); + struct phy usb_phy; + int i, ret;
- return ohci_register(dev, regs); -} + for (i = 0; ; i++) { + struct clk clk;
-static int ohci_usb_remove(struct udevice *dev) -{ - return ohci_deregister(dev); + ret = clk_get_by_index(dev, i, &clk); + if (ret < 0) + break; + if (clk_enable(&clk)) + error("failed to enable clock %d\n", i); + clk_free(&clk); + } + + for (i = 0; ; i++) { + struct reset_ctl reset; + + ret = reset_get_by_index(dev, i, &reset); + if (ret < 0) + break; + if (reset_deassert(&reset)) + error("failed to deassert reset %d\n", i); + reset_free(&reset); + } + + if (!generic_phy_get_by_index(dev, 0, &usb_phy)) + if (generic_phy_init(&usb_phy)) + error("failed to init usb phy %d\n", i); + + return ohci_register(dev, regs); }
static const struct udevice_id ohci_usb_ids[] = { @@ -38,7 +66,7 @@ U_BOOT_DRIVER(ohci_generic) = { .id = UCLASS_USB, .of_match = ohci_usb_ids, .probe = ohci_usb_probe, - .remove = ohci_usb_remove, + .remove = ohci_deregister, .ops = &ohci_usb_ops, .priv_auto_alloc_size = sizeof(struct generic_ohci), .flags = DM_FLAG_ALLOC_PRIV_DMA,
On 05/12/2017 03:13 PM, patrice.chotard@st.com wrote:
From: Patrice Chotard patrice.chotard@st.com
Add CLOCK, RESET and generic PHY frameworks support
Signed-off-by: Patrice Chotard patrice.chotard@st.com
drivers/usb/host/ohci-generic.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index f3307f4..c9d8b74 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -5,7 +5,12 @@ */
#include <common.h> +#include <clk.h> #include <dm.h> +#include <fdtdec.h> +#include <generic-phy.h> +#include <reset.h>
#include "ohci.h"
#if !defined(CONFIG_USB_OHCI_NEW) @@ -19,13 +24,36 @@ struct generic_ohci { static int ohci_usb_probe(struct udevice *dev) { struct ohci_regs *regs = (struct ohci_regs *)dev_get_addr(dev);
- struct phy usb_phy;
- int i, ret;
- return ohci_register(dev, regs);
-}
- for (i = 0; ; i++) {
struct clk clk;-static int ohci_usb_remove(struct udevice *dev) -{
- return ohci_deregister(dev);
ret = clk_get_by_index(dev, i, &clk);if (ret < 0)break;if (clk_enable(&clk))error("failed to enable clock %d\n", i);clk_free(&clk);
Who disables the clock if this loop fails mid-way through ?
- }
- for (i = 0; ; i++) {
struct reset_ctl reset;ret = reset_get_by_index(dev, i, &reset);if (ret < 0)break;if (reset_deassert(&reset))error("failed to deassert reset %d\n", i);
DTTO here, plus you'll likely only have one reset .
reset_free(&reset);- }
- if (!generic_phy_get_by_index(dev, 0, &usb_phy))
if (generic_phy_init(&usb_phy))error("failed to init usb phy %d\n", i);- return ohci_register(dev, regs);
}
static const struct udevice_id ohci_usb_ids[] = { @@ -38,7 +66,7 @@ U_BOOT_DRIVER(ohci_generic) = { .id = UCLASS_USB, .of_match = ohci_usb_ids, .probe = ohci_usb_probe,
- .remove = ohci_usb_remove,
- .remove = ohci_deregister, .ops = &ohci_usb_ops, .priv_auto_alloc_size = sizeof(struct generic_ohci), .flags = DM_FLAG_ALLOC_PRIV_DMA,
Hi Marek
On 05/12/2017 03:21 PM, Marek Vasut wrote:
On 05/12/2017 03:13 PM, patrice.chotard@st.com wrote:
From: Patrice Chotard patrice.chotard@st.com
Add CLOCK, RESET and generic PHY frameworks support
Signed-off-by: Patrice Chotard patrice.chotard@st.com
drivers/usb/host/ohci-generic.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c index f3307f4..c9d8b74 100644 --- a/drivers/usb/host/ohci-generic.c +++ b/drivers/usb/host/ohci-generic.c @@ -5,7 +5,12 @@ */
#include <common.h> +#include <clk.h> #include <dm.h> +#include <fdtdec.h> +#include <generic-phy.h> +#include <reset.h>
#include "ohci.h"
#if !defined(CONFIG_USB_OHCI_NEW) @@ -19,13 +24,36 @@ struct generic_ohci { static int ohci_usb_probe(struct udevice *dev) { struct ohci_regs *regs = (struct ohci_regs *)dev_get_addr(dev);
- struct phy usb_phy;
- int i, ret;
- return ohci_register(dev, regs);
-}
- for (i = 0; ; i++) {
struct clk clk;-static int ohci_usb_remove(struct udevice *dev) -{
- return ohci_deregister(dev);
ret = clk_get_by_index(dev, i, &clk);if (ret < 0)break;if (clk_enable(&clk))error("failed to enable clock %d\n", i);clk_free(&clk);Who disables the clock if this loop fails mid-way through ?
Ok, i will add an error path where all previous enable clocks will be released
I will also add a remove callback instead of calling ohci_deregister() in which clocks will be disabled, reset asserted and phy de-init.
- }
- for (i = 0; ; i++) {
struct reset_ctl reset;ret = reset_get_by_index(dev, i, &reset);if (ret < 0)break;if (reset_deassert(&reset))error("failed to deassert reset %d\n", i);DTTO here, plus you'll likely only have one reset .
same as clocks
Patrice
reset_free(&reset);- }
- if (!generic_phy_get_by_index(dev, 0, &usb_phy))
if (generic_phy_init(&usb_phy))error("failed to init usb phy %d\n", i);- return ohci_register(dev, regs);
}
static const struct udevice_id ohci_usb_ids[] = { @@ -38,7 +66,7 @@ U_BOOT_DRIVER(ohci_generic) = { .id = UCLASS_USB, .of_match = ohci_usb_ids, .probe = ohci_usb_probe,
- .remove = ohci_usb_remove,
- .remove = ohci_deregister, .ops = &ohci_usb_ops, .priv_auto_alloc_size = sizeof(struct generic_ohci), .flags = DM_FLAG_ALLOC_PRIV_DMA,
participants (3)
-
Marek Vasut -
Patrice CHOTARD -
patrice.chotard＠st.com