| Message ID | 20231016-dwc3-refactor-v1-5-ab4a84165470@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | usb: dwc3: qcom: Flatten dwc3 structure | expand |
On Mon, Oct 16, 2023, Bjorn Andersson wrote: > In the case that the dwc3 core driver is instantiated from the same > memory resource information as the glue driver, the dwc_res memory > region will overlap with the memory region already mapped by the glue. > > As the DWC3 core driver already does math on the passed memory region to > exclude the XHCI region, also adjust the end address, to avoid having to > pass an adjusted region from the glue explicitly. > > Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com> > --- > drivers/usb/dwc3/core.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 71e376bebb16..5d86b803fab0 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -1908,6 +1908,7 @@ struct dwc3 *dwc3_probe(struct platform_device *pdev) > */ > dwc_res = *res; > dwc_res.start += DWC3_GLOBALS_REGS_START; > + dwc_res.end = res->start + DWC3_OTG_REGS_END; DWC3_OTG_REGS_END shouldn't really be the end. What offset does qcom start overlapping? Can the end be 0xda00 for now? (This can change) BR, Thinh > > if (dev->of_node) { > struct device_node *parent = of_get_parent(dev->of_node); > @@ -1915,6 +1916,7 @@ struct dwc3 *dwc3_probe(struct platform_device *pdev) > if (of_device_is_compatible(parent, "realtek,rtd-dwc3")) { > dwc_res.start -= DWC3_GLOBALS_REGS_START; > dwc_res.start += DWC3_RTK_RTD_GLOBALS_REGS_START; > + dwc_res.end = dwc_res.start + DWC3_OTG_REGS_END; > } > > of_node_put(parent); > > -- > 2.25.1 >
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 71e376bebb16..5d86b803fab0 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1908,6 +1908,7 @@ struct dwc3 *dwc3_probe(struct platform_device *pdev) */ dwc_res = *res; dwc_res.start += DWC3_GLOBALS_REGS_START; + dwc_res.end = res->start + DWC3_OTG_REGS_END; if (dev->of_node) { struct device_node *parent = of_get_parent(dev->of_node); @@ -1915,6 +1916,7 @@ struct dwc3 *dwc3_probe(struct platform_device *pdev) if (of_device_is_compatible(parent, "realtek,rtd-dwc3")) { dwc_res.start -= DWC3_GLOBALS_REGS_START; dwc_res.start += DWC3_RTK_RTD_GLOBALS_REGS_START; + dwc_res.end = dwc_res.start + DWC3_OTG_REGS_END; } of_node_put(parent);
In the case that the dwc3 core driver is instantiated from the same memory resource information as the glue driver, the dwc_res memory region will overlap with the memory region already mapped by the glue. As the DWC3 core driver already does math on the passed memory region to exclude the XHCI region, also adjust the end address, to avoid having to pass an adjusted region from the glue explicitly. Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com> --- drivers/usb/dwc3/core.c | 2 ++ 1 file changed, 2 insertions(+)