[PATCH 0/2] usb: tegra: modifying port reset based on instance number

[PATCH 0/2] usb: tegra: modifying port reset based on instance number

[Venu Byravarasu]

Tegra USB host driver is using port instance number,
to handle some of the hardware issues on SOC e.g. reset PORT0
twice etc. As instance number based handling looks ugly,
added a new property to USB DT node for this purpose.
Modified host driver to make use of the information passed
through DT to reset the port second time.


Venu Byravarasu (2):
  arm: tegra: Add new DT property to USB node.
  usb: host: tegra: Resetting PORT0 based on information received via
    DT.

 .../bindings/usb/nvidia,tegra20-ehci.txt           |    2 ++
 arch/arm/boot/dts/tegra20.dtsi                     |    1 +
 drivers/usb/host/ehci-tegra.c                      |    6 +++++-
 3 files changed, 8 insertions(+), 1 deletions(-)

[PATCH 1/2] arm: tegra: Add new DT property to USB node.

[Venu Byravarasu]

As Tegra USB host driver is using instance number for resetting
PORT0 twice, adding a new DT property for handling this.

Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
---
 .../bindings/usb/nvidia,tegra20-ehci.txt           |    2 ++
 arch/arm/boot/dts/tegra20.dtsi                     |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
index e9b005d..443a2b4 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
@@ -27,3 +27,5 @@ Optional properties:
     registers are accessed through the APB_MISC base address instead of
     the USB controller. Since this is a legacy issue it probably does not
     warrant a compatible string of its own.
+  - nvidia,needs-double-reset : boolean is to be set for some of the Tegra2
+    USB ports, which need reset twice due to hardware issues.
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index b8effa1..3ebbd0c 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -364,6 +364,7 @@
 		phy_type = "utmi";
 		nvidia,has-legacy-mode;
 		status = "disabled";
+		nvidia,needs-double-reset;
 	};
 
 	usb@c5004000 {
-- 
1.7.0.4

Re: [PATCH 1/2] arm: tegra: Add new DT property to USB node.

[Stephen Warren]

On 12/13/2012 11:59 PM, Venu Byravarasu wrote:
> As Tegra USB host driver is using instance number for resetting
> PORT0 twice, adding a new DT property for handling this.

Alan, Greg, Felip,e

This series looks fine to me.

I'd like to take all the Tegra-related USB patches through the Tegra
tree for 3.9 if possible (so I'm looking for your acks here). I believe
Venu plans to significantly clean up the EHCI/PHY driver split for
Tegra, rework the drivers, and add support for Tegra30 in addition to
Tegra20. Some of this requires changes to some Tegra board files and
device trees to maintain "git bisect" I don't know for sure yet, but I
believe that rework may also end up conflicting with other clock-related
rework that will show up for Tegra in 3.9. Are you OK with this? I'll
certainly look for your review/acks on the patches before picking them
up though.

Thanks.

Re: [PATCH 1/2] arm: tegra: Add new DT property to USB node.

[Greg KH]

On Mon, Dec 17, 2012 at 02:07:59PM -0700, Stephen Warren wrote:
> On 12/13/2012 11:59 PM, Venu Byravarasu wrote:
> > As Tegra USB host driver is using instance number for resetting
> > PORT0 twice, adding a new DT property for handling this.
> 
> Alan, Greg, Felip,e
> 
> This series looks fine to me.
> 
> I'd like to take all the Tegra-related USB patches through the Tegra
> tree for 3.9 if possible (so I'm looking for your acks here). I believe
> Venu plans to significantly clean up the EHCI/PHY driver split for
> Tegra, rework the drivers, and add support for Tegra30 in addition to
> Tegra20. Some of this requires changes to some Tegra board files and
> device trees to maintain "git bisect" I don't know for sure yet, but I
> believe that rework may also end up conflicting with other clock-related
> rework that will show up for Tegra in 3.9. Are you OK with this? I'll
> certainly look for your review/acks on the patches before picking them
> up though.

You can't pick anything up for 3.9 until after 3.8-rc1 is out, according
to the rules of linux-next, so please wait until that kernel is out
before doing anything.  Given the timing of 3.8-rc1, and my current
vacation schedule, I'm not going to be able to do _any_ code review for
the rest of the year, sorry.

After that, I'll be glad to review this.

greg k-h

Re: [PATCH 1/2] arm: tegra: Add new DT property to USB node.

[Alan Stern]

On Mon, 17 Dec 2012, Greg KH wrote:

> You can't pick anything up for 3.9 until after 3.8-rc1 is out, according
> to the rules of linux-next

Well, you can accept a submission and store it in a private tree until 
then.  You just can't put it in any tree that feeds into linux-next.

Alan Stern

Re: [PATCH 1/2] arm: tegra: Add new DT property to USB node.

[Alan Stern]

On Mon, 17 Dec 2012, Stephen Warren wrote:

> On 12/13/2012 11:59 PM, Venu Byravarasu wrote:
> > As Tegra USB host driver is using instance number for resetting
> > PORT0 twice, adding a new DT property for handling this.
> 
> Alan, Greg, Felip,e
> 
> This series looks fine to me.
> 
> I'd like to take all the Tegra-related USB patches through the Tegra
> tree for 3.9 if possible (so I'm looking for your acks here). I believe
> Venu plans to significantly clean up the EHCI/PHY driver split for
> Tegra, rework the drivers, and add support for Tegra30 in addition to
> Tegra20. Some of this requires changes to some Tegra board files and
> device trees to maintain "git bisect" I don't know for sure yet, but I
> believe that rework may also end up conflicting with other clock-related
> rework that will show up for Tegra in 3.9. Are you OK with this? I'll
> certainly look for your review/acks on the patches before picking them
> up though.

Regarding the changes to drivers/usb/host/ehci-tegra.c:

Acked-by: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] arm: tegra: Add new DT property to USB node.

[Greg KH]

On Mon, Dec 17, 2012 at 05:04:41PM -0500, Alan Stern wrote:
> On Mon, 17 Dec 2012, Stephen Warren wrote:
> 
> > On 12/13/2012 11:59 PM, Venu Byravarasu wrote:
> > > As Tegra USB host driver is using instance number for resetting
> > > PORT0 twice, adding a new DT property for handling this.
> > 
> > Alan, Greg, Felip,e
> > 
> > This series looks fine to me.
> > 
> > I'd like to take all the Tegra-related USB patches through the Tegra
> > tree for 3.9 if possible (so I'm looking for your acks here). I believe
> > Venu plans to significantly clean up the EHCI/PHY driver split for
> > Tegra, rework the drivers, and add support for Tegra30 in addition to
> > Tegra20. Some of this requires changes to some Tegra board files and
> > device trees to maintain "git bisect" I don't know for sure yet, but I
> > believe that rework may also end up conflicting with other clock-related
> > rework that will show up for Tegra in 3.9. Are you OK with this? I'll
> > certainly look for your review/acks on the patches before picking them
> > up though.
> 
> Regarding the changes to drivers/usb/host/ehci-tegra.c:
> 
> Acked-by: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>

That's fine with me as well, feel free to think that I have now dropped
all tegra-related patches from my queue, you can take them all :)

thanks,

greg k-h

Re: [PATCH 1/2] arm: tegra: Add new DT property to USB node.

[Stephen Warren]

On 01/11/2013 05:14 PM, Greg KH wrote:
> On Mon, Dec 17, 2012 at 05:04:41PM -0500, Alan Stern wrote:
>> On Mon, 17 Dec 2012, Stephen Warren wrote:
>>
>>> On 12/13/2012 11:59 PM, Venu Byravarasu wrote:
>>>> As Tegra USB host driver is using instance number for resetting
>>>> PORT0 twice, adding a new DT property for handling this.
>>>
>>> Alan, Greg, Felip,e
>>>
>>> This series looks fine to me.
>>>
>>> I'd like to take all the Tegra-related USB patches through the Tegra
>>> tree for 3.9 if possible (so I'm looking for your acks here). I believe
>>> Venu plans to significantly clean up the EHCI/PHY driver split for
>>> Tegra, rework the drivers, and add support for Tegra30 in addition to
>>> Tegra20. Some of this requires changes to some Tegra board files and
>>> device trees to maintain "git bisect" I don't know for sure yet, but I
>>> believe that rework may also end up conflicting with other clock-related
>>> rework that will show up for Tegra in 3.9. Are you OK with this? I'll
>>> certainly look for your review/acks on the patches before picking them
>>> up though.
>>
>> Regarding the changes to drivers/usb/host/ehci-tegra.c:
>>
>> Acked-by: Alan Stern <stern@rowland.harvard.edu>
> 
> That's fine with me as well, feel free to think that I have now dropped
> all tegra-related patches from my queue, you can take them all :)

Thanks, applied to Tegra's for-3.9/usb branch.

[PATCH 2/2] usb: host: tegra: Resetting PORT0 based on information received via DT.

[Venu Byravarasu]

Tegra USB host driver is using port instance number,
to handle some of the hardware issues on SOC e.g. reset PORT0
twice etc. As instance number based handling looks ugly,
making use of information passed through DT for achieving this.

Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
---
 drivers/usb/host/ehci-tegra.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index acf1755..55a9cde 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -43,6 +43,7 @@ struct tegra_ehci_hcd {
 	struct usb_phy *transceiver;
 	int host_resumed;
 	int port_resuming;
+	bool needs_double_reset;
 	enum tegra_usb_phy_port_speed port_speed;
 };
 
@@ -184,7 +185,7 @@ static int tegra_ehci_hub_control(
 	}
 
 	/* For USB1 port we need to issue Port Reset twice internally */
-	if (tegra->phy->instance == 0 &&
+	if (tegra->needs_double_reset &&
 	   (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_RESET)) {
 		spin_unlock_irqrestore(&ehci->lock, flags);
 		return tegra_ehci_internal_port_reset(ehci, status_reg);
@@ -666,6 +667,9 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	clk_prepare_enable(tegra->emc_clk);
 	clk_set_rate(tegra->emc_clk, 400000000);
 
+	tegra->needs_double_reset = of_property_read_bool(pdev->dev.of_node,
+		"nvidia,needs-double-reset");
+
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "Failed to get I/O memory\n");
-- 
1.7.0.4