[PATCH 0/9] usb: fix PHY error handling

[PATCH 0/9] usb: fix PHY error handling

[Felipe Balbi]

Hi Folks,

this patch set depends on [1] which makes PHY layer
*always* return an error as suggested by Alan Stern.

I have compiled what I could, please go over the
patches and give your Acked-by or NAK it if you think
there's something wrong with any of the patches.

cheers

[1] http://marc.info/?l=linux-usb&m=136327710513124

Felipe Balbi (9):
  usb: dwc3: fix PHY error handling
  usb: gadget: mv_udc_core: fix PHY error handling
  usb: gadget: s3c-hsotg: fix PHY error handling
  usb: musb: omap2430: fix PHY error handling
  usb: host: ehci-msm: fix PHY error handling
  usb: host: ehci-mv: fix PHY error handling
  usb: host: ehci-s5p: fix PHY error handling
  usb: host: ehci-tegra: fix PHY error handling
  usb: host: ohci-exynos: fix PHY error handling

 drivers/usb/dwc3/core.c          | 24 ++++++++++++++++++++++--
 drivers/usb/gadget/mv_udc_core.c | 11 +++++++----
 drivers/usb/gadget/s3c-hsotg.c   |  2 +-
 drivers/usb/host/ehci-msm.c      |  2 +-
 drivers/usb/host/ehci-mv.c       | 19 +++++++++----------
 drivers/usb/host/ehci-s5p.c      |  2 +-
 drivers/usb/host/ehci-tegra.c    | 12 +++---------
 drivers/usb/host/ohci-exynos.c   |  2 +-
 drivers/usb/musb/omap2430.c      |  7 ++++++-
 9 files changed, 51 insertions(+), 30 deletions(-)

-- 
1.8.2

[PATCH 1/9] usb: dwc3: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL. It will
return -ENXIO when PHY layer isn't enabled
and we can use that to bail out instead of
request a probe deferral.

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/dwc3/core.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index c845e70..e2325ad 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -434,12 +434,32 @@ static int dwc3_probe(struct platform_device *pdev)
 		dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
 	}
 
-	if (IS_ERR_OR_NULL(dwc->usb2_phy)) {
+	if (IS_ERR(dwc->usb2_phy)) {
+		ret = PTR_ERR(dwc->usb2_phy);
+
+		/*
+		 * if -ENXIO is returned, it means PHY layer wasn't
+		 * enabled, so it makes no sense to return -EPROBE_DEFER
+		 * in that case, since no PHY driver will ever probe.
+		 */
+		if (ret == -ENXIO)
+			return ret;
+
 		dev_err(dev, "no usb2 phy configured\n");
 		return -EPROBE_DEFER;
 	}
 
-	if (IS_ERR_OR_NULL(dwc->usb3_phy)) {
+	if (IS_ERR(dwc->usb3_phy)) {
+		ret = PTR_ERR(dwc->usb2_phy);
+
+		/*
+		 * if -ENXIO is returned, it means PHY layer wasn't
+		 * enabled, so it makes no sense to return -EPROBE_DEFER
+		 * in that case, since no PHY driver will ever probe.
+		 */
+		if (ret == -ENXIO)
+			return ret;
+
 		dev_err(dev, "no usb3 phy configured\n");
 		return -EPROBE_DEFER;
 	}
-- 
1.8.2

--
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

[PATCH 2/9] usb: gadget: mv_udc_core: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL. It will
return -ENXIO when PHY layer isn't enabled
and we can use that to bail out instead of
request a probe deferral.

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/gadget/mv_udc_core.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index d550b21..9a68c05 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -2127,16 +2127,19 @@ static int mv_udc_probe(struct platform_device *pdev)
 
 	udc->dev = pdev;
 
-#if IS_ENABLED(CONFIG_USB_PHY)
 	if (pdata->mode == MV_USB_MODE_OTG) {
 		udc->transceiver = devm_usb_get_phy(&pdev->dev,
 					USB_PHY_TYPE_USB2);
-		if (IS_ERR_OR_NULL(udc->transceiver)) {
+		if (IS_ERR(udc->transceiver)) {
+			retval = PTR_ERR(udc->transceiver);
+
+			if (retval == -ENXIO)
+				return retval;
+
 			udc->transceiver = NULL;
-			return -ENODEV;
+			return -EPROBE_DEFER;
 		}
 	}
-#endif
 
 	udc->clknum = pdata->clknum;
 	for (clk_i = 0; clk_i < udc->clknum; clk_i++) {
-- 
1.8.2

--
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

[PATCH 3/9] usb: gadget: s3c-hsotg: fix PHY error handling

[Felipe Balbi]

PHY laye rno longer return NULL. We need to
switch over from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/gadget/s3c-hsotg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index f1ceabf..a3cdc32 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -3467,7 +3467,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 	}
 
 	phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
-	if (IS_ERR_OR_NULL(phy)) {
+	if (IS_ERR(phy)) {
 		/* Fallback for pdata */
 		plat = pdev->dev.platform_data;
 		if (!plat) {
-- 
1.8.2

--
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

[PATCH 4/9] usb: musb: omap2430: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL. It will
return -ENXIO when PHY layer isn't enabled
and we can use that to bail out instead of
request a probe deferral.

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/musb/omap2430.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index ec460ea..798e029 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -353,7 +353,12 @@ static int omap2430_musb_init(struct musb *musb)
 	else
 		musb->xceiv = devm_usb_get_phy_dev(dev, 0);
 
-	if (IS_ERR_OR_NULL(musb->xceiv)) {
+	if (IS_ERR(musb->xceiv)) {
+		status = PTR_ERR(musb->xceiv);
+
+		if (status == -ENXIO)
+			return status;
+
 		pr_err("HS USB OTG: no transceiver configured\n");
 		return -EPROBE_DEFER;
 	}
-- 
1.8.2

--
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

[PATCH 5/9] usb: host: ehci-msm: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL. We must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-msm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 88a49c8..ebf4103 100644
--- a/drivers/usb/host/ehci-msm.c
+++ b/drivers/usb/host/ehci-msm.c
@@ -145,7 +145,7 @@ static int ehci_msm_probe(struct platform_device *pdev)
 	 * management.
 	 */
 	phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-	if (IS_ERR_OR_NULL(phy)) {
+	if (IS_ERR(phy)) {
 		dev_err(&pdev->dev, "unable to find transceiver\n");
 		ret = -ENODEV;
 		goto put_hcd;
-- 
1.8.2

--
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

[PATCH 6/9] usb: host: ehci-mv: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL. We must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-mv.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index 9751823..3804820 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -240,12 +240,16 @@ static int mv_ehci_probe(struct platform_device *pdev)
 
 	ehci_mv->mode = pdata->mode;
 	if (ehci_mv->mode == MV_USB_MODE_OTG) {
-#if IS_ENABLED(CONFIG_USB_PHY)
 		ehci_mv->otg = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-		if (IS_ERR_OR_NULL(ehci_mv->otg)) {
-			dev_err(&pdev->dev,
-				"unable to find transceiver\n");
-			retval = -ENODEV;
+		if (IS_ERR(ehci_mv->otg)) {
+			retval = PTR_ERR(ehci_mv->otg);
+
+			if (retval == -ENXIO)
+				dev_info(&pdev->dev, "MV_USB_MODE_OTG "
+						"must have CONFIG_USB_PHY enabled\n");
+			else
+				dev_err(&pdev->dev,
+						"unable to find transceiver\n");
 			goto err_disable_clk;
 		}
 
@@ -258,11 +262,6 @@ static int mv_ehci_probe(struct platform_device *pdev)
 		}
 		/* otg will enable clock before use as host */
 		mv_ehci_disable(ehci_mv);
-#else
-		dev_info(&pdev->dev, "MV_USB_MODE_OTG "
-			 "must have CONFIG_USB_PHY enabled\n");
-		goto err_disable_clk;
-#endif
 	} else {
 		if (pdata->set_vbus)
 			pdata->set_vbus(1);
-- 
1.8.2

--
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

[PATCH 7/9] usb: host: ehci-s5p: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL. We must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-s5p.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 20ebf6a..867a923 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -139,7 +139,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-	if (IS_ERR_OR_NULL(phy)) {
+	if (IS_ERR(phy)) {
 		/* Fallback to pdata */
 		if (!pdata) {
 			dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
-- 
1.8.2

--
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

[PATCH 8/9] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL, we must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ehci-tegra.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index fafbc81..1d2488c 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -768,14 +768,12 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 		goto fail;
 	}
 
-#if IS_ENABLED(CONFIG_USB_PHY)
 	if (pdata->operating_mode == TEGRA_USB_OTG) {
 		tegra->transceiver =
 			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-		if (!IS_ERR_OR_NULL(tegra->transceiver))
+		if (!IS_ERR(tegra->transceiver))
 			otg_set_host(tegra->transceiver->otg, &hcd->self);
 	}
-#endif
 
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err) {
@@ -794,10 +792,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	return err;
 
 fail:
-#if IS_ENABLED(CONFIG_USB_PHY)
-	if (!IS_ERR_OR_NULL(tegra->transceiver))
+	if (!IS_ERR(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-#endif
 	usb_phy_shutdown(hcd->phy);
 fail_io:
 	clk_disable_unprepare(tegra->clk);
@@ -815,10 +811,8 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 	pm_runtime_disable(&pdev->dev);
 	pm_runtime_put_noidle(&pdev->dev);
 
-#if IS_ENABLED(CONFIG_USB_PHY)
-	if (!IS_ERR_OR_NULL(tegra->transceiver))
+	if (!IS_ERR(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-#endif
 
 	usb_phy_shutdown(hcd->phy);
 	usb_remove_hcd(hcd);
-- 
1.8.2

[PATCH 9/9] usb: host: ohci-exynos: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL. We must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---
 drivers/usb/host/ohci-exynos.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index e3b7e85..4b469e0 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -128,7 +128,7 @@ static int exynos_ohci_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-	if (IS_ERR_OR_NULL(phy)) {
+	if (IS_ERR(phy)) {
 		/* Fallback to pdata */
 		if (!pdata) {
 			dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
-- 
1.8.2

--
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 0/9] usb: fix PHY error handling

[Alan Stern]

On Fri, 15 Mar 2013, Felipe Balbi wrote:

> Hi Folks,
> 
> this patch set depends on [1] which makes PHY layer
> *always* return an error as suggested by Alan Stern.
> 
> I have compiled what I could, please go over the
> patches and give your Acked-by or NAK it if you think
> there's something wrong with any of the patches.
> 
> cheers
> 
> [1] http://marc.info/?l=linux-usb&m=136327710513124
> 
> Felipe Balbi (9):
>   usb: dwc3: fix PHY error handling
>   usb: gadget: mv_udc_core: fix PHY error handling
>   usb: gadget: s3c-hsotg: fix PHY error handling
>   usb: musb: omap2430: fix PHY error handling
>   usb: host: ehci-msm: fix PHY error handling
>   usb: host: ehci-mv: fix PHY error handling
>   usb: host: ehci-s5p: fix PHY error handling
>   usb: host: ehci-tegra: fix PHY error handling
>   usb: host: ohci-exynos: fix PHY error handling

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

for all the EHCI and OHCI changes.  But it would be good to have 
somebody test them.

Alan Stern

--
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 8/9] usb: host: ehci-tegra: fix PHY error handling

[Stephen Warren]

On 03/15/2013 03:12 AM, Felipe Balbi wrote:
> PHY layer no longer returns NULL, we must
> switch from IS_ERR_OR_NULL() to IS_ERR().

This change will definitely conflict with some Tegra EHCI/USB-PHY
changes that Venu plans to submit very soon, for 3.10. This is relevant
since we'd previously discussed you ack'ing Venu's patches, and my
applying them to the Tegra tree, due to dependencies between the Tegra
device tree files and his USB changes.

To resolve this, we can do the following:

1) I will create a tiny topic branch containing just the Tegra DT
changes that must happen before the USB driver changes. This can be
based on v3.9-rc1 or similar, and be entirely self-contained.

2) You can merge that topic branch into your USB tree, so that the
changes are present there.

3) I will merge that topic branch into the Tegra tree.

(2) and (3) are both needed so that the exact same commit ID is present
in each of our branches. It's needed in yours as a pre-cursor to Venu's
changes. It's needed in Tegra's because I still hope to activate usage
of the C pre-processor on the Tegra DT files, and that needs to build on
top of the same DT change of Venu's that you also need.

4) Once you've done that, you can take Venu's USB patches through your
USB tree rather than my applying them to the Tegra tree. This will allow
you to resolve any conflicts between your changes and Venu's changes
entirely within your branch simply by applying the patches one after the
other. Nice and simple, and just like any other USB change.

However, this goes against your statement that you "don't accept pull
requests". Perhaps you can make an exception for this case?
--
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 8/9] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 2077 bytes --]

Hi,

On Fri, Mar 15, 2013 at 03:12:08PM -0600, Stephen Warren wrote:
> On 03/15/2013 03:12 AM, Felipe Balbi wrote:
> > PHY layer no longer returns NULL, we must
> > switch from IS_ERR_OR_NULL() to IS_ERR().
> 
> This change will definitely conflict with some Tegra EHCI/USB-PHY
> changes that Venu plans to submit very soon, for 3.10. This is relevant

but this is such a small change that, even if it conflicts, resolution
will be trivial.

> since we'd previously discussed you ack'ing Venu's patches, and my
> applying them to the Tegra tree, due to dependencies between the Tegra
> device tree files and his USB changes.
> 
> To resolve this, we can do the following:
> 
> 1) I will create a tiny topic branch containing just the Tegra DT
> changes that must happen before the USB driver changes. This can be
> based on v3.9-rc1 or similar, and be entirely self-contained.
> 
> 2) You can merge that topic branch into your USB tree, so that the
> changes are present there.
> 
> 3) I will merge that topic branch into the Tegra tree.
> 
> (2) and (3) are both needed so that the exact same commit ID is present
> in each of our branches. It's needed in yours as a pre-cursor to Venu's
> changes. It's needed in Tegra's because I still hope to activate usage
> of the C pre-processor on the Tegra DT files, and that needs to build on
> top of the same DT change of Venu's that you also need.
> 
> 4) Once you've done that, you can take Venu's USB patches through your
> USB tree rather than my applying them to the Tegra tree. This will allow
> you to resolve any conflicts between your changes and Venu's changes
> entirely within your branch simply by applying the patches one after the
> other. Nice and simple, and just like any other USB change.
> 
> However, this goes against your statement that you "don't accept pull
> requests". Perhaps you can make an exception for this case?

Greg won't like seeing merges from my pull request and I kinda agree
with him. We can sort out the conflicts later.

Greg ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 8/9] usb: host: ehci-tegra: fix PHY error handling

[Stephen Warren]

On 03/18/2013 02:02 AM, Felipe Balbi wrote:
> Hi,
> 
> On Fri, Mar 15, 2013 at 03:12:08PM -0600, Stephen Warren wrote:
>> On 03/15/2013 03:12 AM, Felipe Balbi wrote:
>>> PHY layer no longer returns NULL, we must switch from
>>> IS_ERR_OR_NULL() to IS_ERR().
>> 
>> This change will definitely conflict with some Tegra
>> EHCI/USB-PHY changes that Venu plans to submit very soon, for
>> 3.10. This is relevant
> 
> but this is such a small change that, even if it conflicts,
> resolution will be trivial.

Well, Venu's changes re-organize exactly the code you're modifying.
Wouldn't it be simpler to simply take all the Tegra USB patches
through the PHY tree and avoid any conflicts at all?

>> since we'd previously discussed you ack'ing Venu's patches, and
>> my applying them to the Tegra tree, due to dependencies between
>> the Tegra device tree files and his USB changes.
>> 
>> To resolve this, we can do the following:
>> 
>> 1) I will create a tiny topic branch containing just the Tegra
>> DT changes that must happen before the USB driver changes. This
>> can be based on v3.9-rc1 or similar, and be entirely
>> self-contained.
>> 
>> 2) You can merge that topic branch into your USB tree, so that
>> the changes are present there.
>> 
>> 3) I will merge that topic branch into the Tegra tree.
>> 
>> (2) and (3) are both needed so that the exact same commit ID is
>> present in each of our branches. It's needed in yours as a
>> pre-cursor to Venu's changes. It's needed in Tegra's because I
>> still hope to activate usage of the C pre-processor on the Tegra
>> DT files, and that needs to build on top of the same DT change of
>> Venu's that you also need.
>> 
>> 4) Once you've done that, you can take Venu's USB patches through
>> your USB tree rather than my applying them to the Tegra tree.
>> This will allow you to resolve any conflicts between your changes
>> and Venu's changes entirely within your branch simply by applying
>> the patches one after the other. Nice and simple, and just like
>> any other USB change.
>> 
>> However, this goes against your statement that you "don't accept
>> pull requests". Perhaps you can make an exception for this case?
> 
> Greg won't like seeing merges from my pull request and I kinda
> agree with him. We can sort out the conflicts later.

That seems odd. There are plenty of cases of merges in other trees.

Re: [PATCH 8/9] usb: host: ehci-tegra: fix PHY error handling

[Greg KH]

On Mon, Mar 18, 2013 at 10:02:45AM +0200, Felipe Balbi wrote:
> Hi,
> 
> On Fri, Mar 15, 2013 at 03:12:08PM -0600, Stephen Warren wrote:
> > On 03/15/2013 03:12 AM, Felipe Balbi wrote:
> > > PHY layer no longer returns NULL, we must
> > > switch from IS_ERR_OR_NULL() to IS_ERR().
> > 
> > This change will definitely conflict with some Tegra EHCI/USB-PHY
> > changes that Venu plans to submit very soon, for 3.10. This is relevant
> 
> but this is such a small change that, even if it conflicts, resolution
> will be trivial.
> 
> > since we'd previously discussed you ack'ing Venu's patches, and my
> > applying them to the Tegra tree, due to dependencies between the Tegra
> > device tree files and his USB changes.
> > 
> > To resolve this, we can do the following:
> > 
> > 1) I will create a tiny topic branch containing just the Tegra DT
> > changes that must happen before the USB driver changes. This can be
> > based on v3.9-rc1 or similar, and be entirely self-contained.
> > 
> > 2) You can merge that topic branch into your USB tree, so that the
> > changes are present there.
> > 
> > 3) I will merge that topic branch into the Tegra tree.
> > 
> > (2) and (3) are both needed so that the exact same commit ID is present
> > in each of our branches. It's needed in yours as a pre-cursor to Venu's
> > changes. It's needed in Tegra's because I still hope to activate usage
> > of the C pre-processor on the Tegra DT files, and that needs to build on
> > top of the same DT change of Venu's that you also need.
> > 
> > 4) Once you've done that, you can take Venu's USB patches through your
> > USB tree rather than my applying them to the Tegra tree. This will allow
> > you to resolve any conflicts between your changes and Venu's changes
> > entirely within your branch simply by applying the patches one after the
> > other. Nice and simple, and just like any other USB change.
> > 
> > However, this goes against your statement that you "don't accept pull
> > requests". Perhaps you can make an exception for this case?
> 
> Greg won't like seeing merges from my pull request and I kinda agree
> with him. We can sort out the conflicts later.
> 
> Greg ?

Ick, what a mess.  If you need to take patches for the Tegra stuff this
way, I guess it can work out.  I'll defer to you as to how you want to
handle it.

greg k-h

Re: [PATCH 8/9] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]

On Mon, Mar 18, 2013 at 09:25:34AM -0600, Stephen Warren wrote:
> On 03/18/2013 02:02 AM, Felipe Balbi wrote:
> > Hi,
> > 
> > On Fri, Mar 15, 2013 at 03:12:08PM -0600, Stephen Warren wrote:
> >> On 03/15/2013 03:12 AM, Felipe Balbi wrote:
> >>> PHY layer no longer returns NULL, we must switch from
> >>> IS_ERR_OR_NULL() to IS_ERR().
> >> 
> >> This change will definitely conflict with some Tegra
> >> EHCI/USB-PHY changes that Venu plans to submit very soon, for
> >> 3.10. This is relevant
> > 
> > but this is such a small change that, even if it conflicts,
> > resolution will be trivial.
> 
> Well, Venu's changes re-organize exactly the code you're modifying.
> Wouldn't it be simpler to simply take all the Tegra USB patches
> through the PHY tree and avoid any conflicts at all?

alright, I will take all patches, so please create a very small
immutable branch which I can merge then I'll take all other patches.

Let's just try to avoid this sort of situation whenever possible.

cheers

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]