minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 20:52:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

usb: ehci: exynos: Fix multiple FDT decode

Browse Source 
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.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
This commit is contained in:
Vivek Gautam 2013-03-06 14:18:32 +05:30 committed by Marek Vasut
parent 83301b4f8b
commit 24a4775f91
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/usb/host/ehci-exynos.c
View File

@ -42,11 +42,14 @@ DECLARE_GLOBAL_DATA_PTR;
*/ */
struct exynos_ehci { struct exynos_ehci {
struct exynos_usb_phy *usb; 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) static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos)
{ {
fdt_addr_t addr;
unsigned int node; unsigned int node;
int depth; 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 * Get the base address for EHCI controller from the device node
*/ */
exynos->hcd = (unsigned int *)fdtdec_get_addr(blob, node, "reg"); addr = fdtdec_get_addr(blob, node, "reg");
if (exynos->hcd == NULL) { if (addr == FDT_ADDR_T_NONE) {
debug("Can't get the EHCI register address\n"); debug("Can't get the EHCI register address\n");
return -ENXIO; return -ENXIO;
} }
exynos->hcd = (struct ehci_hccr *)addr;
depth = 0; depth = 0;
node = fdtdec_next_compatible_subnode(blob, node, node = fdtdec_next_compatible_subnode(blob, node,
COMPAT_SAMSUNG_EXYNOS_USB_PHY, &depth); 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) 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 *) if (exynos_usb_parse_dt(gd->fdt_blob, ctx)) {
kzalloc(sizeof(struct exynos_ehci), GFP_KERNEL); debug("Unable to parse device tree for ehci-exynos\n");
if (!exynos) { return -ENODEV;
debug("failed to allocate exynos ehci context\n");
return -ENOMEM;
} }
exynos_usb_parse_dt(gd->fdt_blob, exynos); setup_usb_phy(ctx->usb);
setup_usb_phy(exynos->usb); *hccr = ctx->hcd;
*hccr = (struct ehci_hccr *)(exynos->hcd);
*hcor = (struct ehci_hcor *)((uint32_t) *hccr *hcor = (struct ehci_hcor *)((uint32_t) *hccr
+ HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase))); + 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)*hccr, (uint32_t)*hcor,
(uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase))); (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
kfree(exynos);
return 0; 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) int ehci_hcd_stop(int index)
{ {
struct exynos_ehci *exynos = NULL; struct exynos_ehci *ctx = &exynos;
exynos = (struct exynos_ehci *) reset_usb_phy(ctx->usb);
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);
kfree(exynos);
return 0; return 0;
} }