Enhance the ehci-platform driver to also accept no_io_watchdog as a platform
data parameter. When no_io_watchdog is set to 1, the ehci controller will set
ehci->need_io_watchdog to 0. Since most EHCI controllers do need the I/O
watchdog to be on, only let those which need it to turn the watchdog off.
Signed-off-by: Florian Fainelli <[email protected]>
---
Changes since v1:
- reworked patch to introduce "no_io_watchdog" instead of "need_io_watchdog"
- reworded commit message accordingly
drivers/usb/host/ehci-platform.c | 2 ++
include/linux/usb/ehci_pdriver.h | 3 +++
2 files changed, 5 insertions(+)
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 764e010..83b486e 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -32,6 +32,8 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
ehci->big_endian_desc = pdata->big_endian_desc;
ehci->big_endian_mmio = pdata->big_endian_mmio;
+ if (pdata->no_io_watchdog)
+ ehci->need_io_watchdog = 0;
ehci->caps = hcd->regs + pdata->caps_offset;
retval = ehci_setup(hcd);
diff --git a/include/linux/usb/ehci_pdriver.h b/include/linux/usb/ehci_pdriver.h
index c9d09f8..67ac74b 100644
--- a/include/linux/usb/ehci_pdriver.h
+++ b/include/linux/usb/ehci_pdriver.h
@@ -29,6 +29,8 @@
* initialization.
* @port_power_off: set to 1 if the controller needs to be powered down
* after initialization.
+ * @no_io_watchdog: set to 1 if the controller does not need the I/O
+ * watchdog to run.
*
* These are general configuration options for the EHCI controller. All of
* these options are activating more or less workarounds for some hardware.
@@ -41,6 +43,7 @@ struct usb_ehci_pdata {
unsigned big_endian_mmio:1;
unsigned port_power_on:1;
unsigned port_power_off:1;
+ unsigned no_io_watchdog:1;
/* Turn on all power and clocks */
int (*power_on)(struct platform_device *pdev);
--
1.7.9.5
On Thu, 4 Oct 2012, Florian Fainelli wrote:
> Enhance the ehci-platform driver to also accept no_io_watchdog as a platform
> data parameter. When no_io_watchdog is set to 1, the ehci controller will set
> ehci->need_io_watchdog to 0. Since most EHCI controllers do need the I/O
> watchdog to be on, only let those which need it to turn the watchdog off.
>
> Signed-off-by: Florian Fainelli <[email protected]>
> ---
> Changes since v1:
> - reworked patch to introduce "no_io_watchdog" instead of "need_io_watchdog"
> - reworded commit message accordingly
Very good except for one thing...
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> @@ -32,6 +32,8 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
> ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
> ehci->big_endian_desc = pdata->big_endian_desc;
> ehci->big_endian_mmio = pdata->big_endian_mmio;
> + if (pdata->no_io_watchdog)
> + ehci->need_io_watchdog = 0;
>
> ehci->caps = hcd->regs + pdata->caps_offset;
> retval = ehci_setup(hcd);
ehci_setup calls ehci_init, which unconditionally sets
need_io_watchdog. Your new "if" statement has to come after this call.
Alan Stern