usb: ehci: exynos: Fixes for non-fdt systems
Subsystems (3)
v4 cover usb: ehci: exynos: Fixes for non-fdt systems
Based on 'master' branch of u-boot-samsung.
Changes from v3:
- Adding necesasry check for return error of exynos_usb_parse_dt() and returning accordingly from ehci_hcd_init().
- Removing unnecessary parentheses around ctx->hcd.
Vivek Gautam (2):
usb: ehci: exynos: Fix multiple FDT decode
usb: ehci: exynos: Enable non-dt path
drivers/usb/host/ehci-exynos.c | 51 ++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 28 deletions(-)
Signature · 1 line
1.7.6.5
PATCH v4 1/2 usb: ehci: exynos: Fix multiple FDT decode
With current FDT support driver tries to parse device node twice in ehci_hcd_init() and ehci_hcd_stop(), which shouldn't happen ideally.
Making provision to store data in a global structure and thereby passing its pointer when needed.
---
Changes from v3:
- Checking for error return in exynos_usb_parse_dt() and returning there only in case of failure for DT systems.
- Removed unnecesassry parentheses.
Changes from v2:
- Using hcd as "struct ehci_hccr *" rather than "unsigned int" to avoid unnecessary typecasting later in the code.
- Further using local variable of type "fdt_addr_t" in exynos_usb_parse_dt() and modifying the code as required.
Changes from v1:
- Added patch to fix problem of multiple FDT decode.
drivers/usb/host/ehci-exynos.c | 44 ++++++++++++++------------------------- 1 files changed, 16 insertions(+), 28 deletions(-)
drivers/usb/host/ehci-exynos.c +16 -28
@@ -42,11 +42,14 @@ DECLARE_GLOBAL_DATA_PTR;*/ struct exynos_ehci {struct exynos_usb_phy *usb; -unsigned int *hcd; +struct ehci_hccr *hcd; }; +static struct exynos_ehci exynos; +static int exynos_usb_parse_dt (const void *blob,struct exynos_ehci *exynos) { +fdt_addr_t addr;unsigned int node;int depth;
@@ -59,12 +62,14 @@ static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos)/* * Get the base address for EHCI controller from the device node */ - exynos->hcd = (unsigned int *)fdtdec_get_addr (blob, node,"reg" ); -if (exynos->hcd ==NULL ) { + addr =fdtdec_get_addr (blob, node,"reg" ); +if (addr ==FDT_ADDR_T_NONE ) {debug ("Can't get the EHCI register address\n" );return -ENXIO ; } + exynos->hcd = (struct ehci_hccr *)addr; + depth =0 ; node =fdtdec_next_compatible_subnode (blob, node,COMPAT_SAMSUNG_EXYNOS_USB_PHY , &depth);
@@ -144,20 +149,16 @@ static void reset_usb_phy(struct exynos_usb_phy *usb)*/ int ehci_hcd_init (int index,struct ehci_hccr **hccr,struct ehci_hcor **hcor) { -struct exynos_ehci *exynos =NULL ; +struct exynos_ehci *ctx = &exynos; - exynos = (struct exynos_ehci *) -kzalloc (sizeof (struct exynos_ehci ),GFP_KERNEL ); -if (!exynos) { -debug ("failed to allocate exynos ehci context\n" ); -return -ENOMEM ; +if (exynos_usb_parse_dt (gd->fdt_blob, ctx)) { +debug ("Unable to parse device tree for ehci-exynos\n" ); +return -ENODEV ; } -exynos_usb_parse_dt (gd->fdt_blob, exynos); +setup_usb_phy (ctx->usb); -setup_usb_phy (exynos->usb); - - *hccr = (struct ehci_hccr *)(exynos->hcd); + *hccr = ctx->hcd; *hcor = (struct ehci_hcor *)((uint32_t ) *hccr +HC_LENGTH (ehci_readl (&(*hccr)->cr_capbase)));
@@ -165,8 +166,6 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) (uint32_t )*hccr, (uint32_t )*hcor, (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase))); -kfree (exynos); -return 0 ; }
@@ -176,20 +175,9 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)*/ int ehci_hcd_stop (int index) { -struct exynos_ehci *exynos =NULL ; - - exynos = (struct exynos_ehci *) -kzalloc (sizeof (struct exynos_ehci ),GFP_KERNEL ); -if (!exynos) { -debug ("failed to allocate exynos ehci context\n" ); -return -ENOMEM ; - } - -exynos_usb_parse_dt (gd->fdt_blob, exynos); - -reset_usb_phy (exynos->usb); +struct exynos_ehci *ctx = &exynos; -kfree (exynos); +reset_usb_phy (ctx->usb);return 0 ; }
Signature · 1 line
1.7.6.5
PATCH v4 1/2 usb: ehci: exynos: Fix multiple FDT decode
Quoted 7 lines · Vivek Gautam
With current FDT support driver tries to parse device node twice in
ehci_hcd_init()andehci_hcd_stop(), which shouldn't happen ideally.
Making provision to store data in a global structure and thereby passing its pointer when needed.Signed-off-by Vivek Gautam <[email protected]>
Quoted 19 lines
---
Changes from v3:
- Checking for error return inexynos_usb_parse_dt()and returning there only in case of failure for DT systems.
- Removed unnecesassry parentheses.Changes from v2:
- Using hcd as "structehci_hccr*" rather than "unsigned int" to avoid unnecessary typecasting later in the code.
- Further using local variable of type "fdt_addr_t" inexynos_usb_parse_dt()and modifying the code as required.Changes from v1:
- Added patch to fix problem of multiple FDT decode.drivers/usb/host/ehci-exynos.c | 44 ++++++++++++++------------------------- 1 files changed, 16 insertions(+), 28 deletions(-)
PATCH v4 2/2 usb: ehci: exynos: Enable non-dt path
In reply to Vivek GautamEnabling the non-dt path for the driver so that we don't get any build errors for non-dt configuration.
---
Changes from v3:
- No change
Changes from v2:
- Adding necessary typecast (struct ehci_hccr *) for ctx->hcd.
Changes from v1:
- Using CONFIG_OF_CONTROL around exynos_usb_parse_dt() definition since it is used for DT systems only.
drivers/usb/host/ehci-exynos.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/usb/host/ehci-exynos.c +7 -0
@@ -47,6 +47,7 @@ struct exynos_ehci {static struct exynos_ehci exynos; +#ifdef CONFIG_OF_CONTROL static int exynos_usb_parse_dt (const void *blob,struct exynos_ehci *exynos) {fdt_addr_t addr;
@@ -90,6 +91,7 @@ static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos) return 0; } +#endif /* Setup the EHCI host controller. */ static void setup_usb_phy (struct exynos_usb_phy *usb)
@@ -151,10 +153,15 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) {struct exynos_ehci *ctx = &exynos; +#ifdef CONFIG_OF_CONTROL if (exynos_usb_parse_dt (gd->fdt_blob, ctx)) {debug ("Unable to parse device tree for ehci-exynos\n" );return -ENODEV ; } +#else + ctx->usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy (); + ctx->hcd = (struct ehci_hccr *)samsung_get_base_usb_ehci (); +#endif setup_usb_phy (ctx->usb);
Signature · 1 line
1.7.6.5
v4 cover usb: ehci: exynos: Fixes for non-fdt systems
In reply to Vivek GautamDear Vivek Gautam,
Quoted 7 lines
Based on 'master' branch of u-boot-samsung.
Changes from v3:
- Adding necesasry check for return error ofexynos_usb_parse_dt()and returning accordingly fromehci_hcd_init().
- Removing unnecessary parentheses aroundctx->hcd.
Quoted 7 lines
Vivek Gautam (2):
usb: ehci: exynos: Fix multiple FDT decode
usb: ehci: exynos: Enable non-dt pathdrivers/usb/host/ehci-exynos.c | 51++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 28 deletions(-)
applied both, please check u-boot-usb.git if all your patches are in place. If not, let me know ASAP.
Best regards,
Marek Vasut
v4 cover usb: ehci: exynos: Fixes for non-fdt systems
Hi Marek,
Quoted 13 lines · Marek Vasut
Dear Vivek Gautam,
Quoted 11 lines
Based on 'master' branch of u-boot-samsung.
Changes from v3:
- Adding necesasry check for return error ofexynos_usb_parse_dt()and returning accordingly fromehci_hcd_init().
- Removing unnecessary parentheses aroundctx->hcd.Vivek Gautam (2):
usb: ehci: exynos: Fix multiple FDT decode
usb: ehci: exynos: Enable non-dt path
Quoted 7 lines
Quoted 3 lines
drivers/usb/host/ehci-exynos.c | 51++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 28 deletions(-)
applied both, please check u-boot-usb.git if all your patches are in place. If not, let me know ASAP.
Patches have been applied fine. Thanks :-)
Quoted 6 lines
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
Thanks & Regards Vivek
v4 cover usb: ehci: exynos: Fixes for non-fdt systems
Quoted 21 lines · Vivek Gautam
Hi Marek,
Quoted 17 lines · Marek Vasut
Dear Vivek Gautam,
Quoted 14 lines
Based on 'master' branch of u-boot-samsung.
Changes from v3:
- Adding necesasry check for return error ofexynos_usb_parse_dt()and returning accordingly fromehci_hcd_init().
- Removing unnecessary parentheses aroundctx->hcd.Vivek Gautam (2):
usb: ehci: exynos: Fix multiple FDT decode
usb: ehci: exynos: Enable non-dt pathdrivers/usb/host/ehci-exynos.c | 51++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 28 deletions(-)
Quoted 5 lines
Quoted 3 lines
applied both, please check u-boot-usb.git if all your patches are in place. If not, let me know ASAP.
Patches have been applied fine. Thanks :-)
"[PATCH v4 1/2] usb: ehci: exynos: Fix multiple FDT decode" is just missing Simon's Ack which he gave. ;-)
Quoted 13 lines
Quoted 7 lines
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot--
Thanks & Regards
Vivek
Signature · 2 lines
Thanks & Regards Vivek