linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_core.c between commit da96cfc13335 ("usb: musb:
fix order of conditions for assigning end point operations") from the
usb.current tree and commit 47a82730b54c ("usb: musb: Fix platform code
being unable to override ep access ops") from the usb-gadget tree.
I fixed it up (they are the same patch apart from whitespace and the
comments - I used the comments from the usb-gadget tree) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpQwXIdQUZU0.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/musb/musb_core.c between commit da96cfc13335 (usb: musb: fix order of conditions for assigning end point operations) from the usb.current tree and commit 47a82730b54c (usb: musb: Fix platform code being unable to override ep access ops) from the usb-gadget tree. I fixed it up (they are the same patch apart from whitespace and the comments - I used the comments from the usb-gadget tree) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpQwXIdQUZU0.pgp Description: OpenPGP digital signature
RE: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi,
> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Friday, January 16, 2015 7:24 AM
> To: Felipe Balbi; Greg KH
> Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Robert Baldyga;
> Kaukab, Yousaf
> Subject: linux-next: manual merge of the usb-gadget tree with the usb.current
> tree
>
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 ("usb: dwc2:
> gadget: kill requests with 'force' in s3c_hsotg_udc_stop()") from the
> usb.current
> tree and commit c6f5c050e2a7 ("usb: dwc2: gadget: add bi-directional
> endpoint support") and 1141ea01d5fa ("usb: dwc2: gadget:
> kill requests after disabling ep") from the usb-gadget tree.
commit 62f4f0651ce8 ("usb: dwc2: gadget: kill requests with 'force' in
s3c_hsotg_udc_stop()")
should have been reverted by
http://www.spinics.net/lists/linux-usb/msg119287.html.
Somehow it didn't make it to linux-next.
6b448af46e2a ("drivers: usb: dwc2: remove 'force' parameter from
kill_all_requests()"),
which is added by this merge, is the replacement.
>
> I fixed it up (I think - see below) and can carry the fix as necessary (no
> action is
> required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc drivers/usb/dwc2/gadget.c
> index 79242008085b,882a1a8953f5..
> --- a/drivers/usb/dwc2/gadget.c
> +++ b/drivers/usb/dwc2/gadget.c
> @@@ -2927,8 -2960,12 +2964,12 @@@ static int s3c_hsotg_udc_stop(struct
> us
> mutex_lock(>init_mutex);
>
> /* all endpoints should be shutdown */
> - for (ep = 1; ep < hsotg->num_of_eps; ep++)
> - s3c_hsotg_ep_disable_force(>eps[ep].ep,
> true);
> + for (ep = 1; ep < hsotg->num_of_eps; ep++) {
> + if (hsotg->eps_in[ep])
> -s3c_hsotg_ep_disable(
> >eps_in[ep]->ep);
> ++
> s3c_hsotg_ep_disable_force(>eps_in[ep]->ep, true);
> + if (hsotg->eps_out[ep])
> -s3c_hsotg_ep_disable(
> >eps_out[ep]->ep);
> ++
> s3c_hsotg_ep_disable_force(>eps_out[ep]->ep, true);
> + }
>
> spin_lock_irqsave(>lock, flags);
>
This can work. However, the force argument to s3c_hsotg_ep_disable_force is
unused now. So might just leave s3c_hsotg_ep_disable as is, as done by
c6f5c050e2a7.
BR,
Yousaf
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi,
-Original Message-
From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
Sent: Friday, January 16, 2015 7:24 AM
To: Felipe Balbi; Greg KH
Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Robert Baldyga;
Kaukab, Yousaf
Subject: linux-next: manual merge of the usb-gadget tree with the usb.current
tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 (usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()) from the
usb.current
tree and commit c6f5c050e2a7 (usb: dwc2: gadget: add bi-directional
endpoint support) and 1141ea01d5fa (usb: dwc2: gadget:
kill requests after disabling ep) from the usb-gadget tree.
commit 62f4f0651ce8 (usb: dwc2: gadget: kill requests with 'force' in
s3c_hsotg_udc_stop())
should have been reverted by
http://www.spinics.net/lists/linux-usb/msg119287.html.
Somehow it didn't make it to linux-next.
6b448af46e2a (drivers: usb: dwc2: remove 'force' parameter from
kill_all_requests()),
which is added by this merge, is the replacement.
I fixed it up (I think - see below) and can carry the fix as necessary (no
action is
required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/dwc2/gadget.c
index 79242008085b,882a1a8953f5..
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@@ -2927,8 -2960,12 +2964,12 @@@ static int s3c_hsotg_udc_stop(struct
us
mutex_lock(hsotg-init_mutex);
/* all endpoints should be shutdown */
- for (ep = 1; ep hsotg-num_of_eps; ep++)
- s3c_hsotg_ep_disable_force(hsotg-eps[ep].ep,
true);
+ for (ep = 1; ep hsotg-num_of_eps; ep++) {
+ if (hsotg-eps_in[ep])
-s3c_hsotg_ep_disable(hsotg-
eps_in[ep]-ep);
++
s3c_hsotg_ep_disable_force(hsotg-eps_in[ep]-ep, true);
+ if (hsotg-eps_out[ep])
-s3c_hsotg_ep_disable(hsotg-
eps_out[ep]-ep);
++
s3c_hsotg_ep_disable_force(hsotg-eps_out[ep]-ep, true);
+ }
spin_lock_irqsave(hsotg-lock, flags);
This can work. However, the force argument to s3c_hsotg_ep_disable_force is
unused now. So might just leave s3c_hsotg_ep_disable as is, as done by
c6f5c050e2a7.
BR,
Yousaf
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 ("usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()") from the
usb.current tree and commit c6f5c050e2a7 ("usb: dwc2: gadget: add
bi-directional endpoint support") and 1141ea01d5fa ("usb: dwc2: gadget:
kill requests after disabling ep") from the usb-gadget tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/dwc2/gadget.c
index 79242008085b,882a1a8953f5..
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@@ -2927,8 -2960,12 +2964,12 @@@ static int s3c_hsotg_udc_stop(struct us
mutex_lock(>init_mutex);
/* all endpoints should be shutdown */
- for (ep = 1; ep < hsotg->num_of_eps; ep++)
- s3c_hsotg_ep_disable_force(>eps[ep].ep, true);
+ for (ep = 1; ep < hsotg->num_of_eps; ep++) {
+ if (hsotg->eps_in[ep])
- s3c_hsotg_ep_disable(>eps_in[ep]->ep);
++ s3c_hsotg_ep_disable_force(>eps_in[ep]->ep,
true);
+ if (hsotg->eps_out[ep])
- s3c_hsotg_ep_disable(>eps_out[ep]->ep);
++ s3c_hsotg_ep_disable_force(>eps_out[ep]->ep,
true);
+ }
spin_lock_irqsave(>lock, flags);
pgpBTMQAtxO67.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 (usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()) from the
usb.current tree and commit c6f5c050e2a7 (usb: dwc2: gadget: add
bi-directional endpoint support) and 1141ea01d5fa (usb: dwc2: gadget:
kill requests after disabling ep) from the usb-gadget tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/dwc2/gadget.c
index 79242008085b,882a1a8953f5..
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@@ -2927,8 -2960,12 +2964,12 @@@ static int s3c_hsotg_udc_stop(struct us
mutex_lock(hsotg-init_mutex);
/* all endpoints should be shutdown */
- for (ep = 1; ep hsotg-num_of_eps; ep++)
- s3c_hsotg_ep_disable_force(hsotg-eps[ep].ep, true);
+ for (ep = 1; ep hsotg-num_of_eps; ep++) {
+ if (hsotg-eps_in[ep])
- s3c_hsotg_ep_disable(hsotg-eps_in[ep]-ep);
++ s3c_hsotg_ep_disable_force(hsotg-eps_in[ep]-ep,
true);
+ if (hsotg-eps_out[ep])
- s3c_hsotg_ep_disable(hsotg-eps_out[ep]-ep);
++ s3c_hsotg_ep_disable_force(hsotg-eps_out[ep]-ep,
true);
+ }
spin_lock_irqsave(hsotg-lock, flags);
pgpBTMQAtxO67.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc/bdc/bdc_ep.c between commit f26d29e34e20 ("usb:
gadget: udc: avoid dereference before NULL check in ep_queue") from the
usb.current tree and commit d71b0d7764a7 ("usb: gadget: udc: remove
bogus NULL check") from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/gadget/udc/bdc/bdc_ep.c
index d4fe8d769bd6,fdc0e9fc39d0..
--- a/drivers/usb/gadget/udc/bdc/bdc_ep.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c
@@@ -718,11 -718,10 +718,11 @@@ static int ep_queue(struct bdc_ep *ep,
struct bdc *bdc;
int ret = 0;
- if (!req || !ep || !ep->usb_ep.desc)
- bdc = ep->bdc;
+ if (!req || !ep->usb_ep.desc)
return -EINVAL;
+ bdc = ep->bdc;
+
req->usb_req.actual = 0;
req->usb_req.status = -EINPROGRESS;
req->epnum = ep->ep_num;
pgp7n7P9J8ltI.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 ("usb: dwc2:
gadget: kill requests with 'force' in s3c_hsotg_udc_stop()") from the
usb.current tree and commit 6b448af46e2a ("drivers: usb: dwc2: remove
'force' parameter from kill_all_requests()") from the usb-gadget tree.
I fixed it up (I used the latter version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp4bekKVcCQr.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/dwc2/gadget.c between commit 62f4f0651ce8 (usb: dwc2: gadget: kill requests with 'force' in s3c_hsotg_udc_stop()) from the usb.current tree and commit 6b448af46e2a (drivers: usb: dwc2: remove 'force' parameter from kill_all_requests()) from the usb-gadget tree. I fixed it up (I used the latter version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp4bekKVcCQr.pgp Description: OpenPGP digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/udc/bdc/bdc_ep.c between commit f26d29e34e20 (usb: gadget: udc: avoid dereference before NULL check in ep_queue) from the usb.current tree and commit d71b0d7764a7 (usb: gadget: udc: remove bogus NULL check) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/usb/gadget/udc/bdc/bdc_ep.c index d4fe8d769bd6,fdc0e9fc39d0.. --- a/drivers/usb/gadget/udc/bdc/bdc_ep.c +++ b/drivers/usb/gadget/udc/bdc/bdc_ep.c @@@ -718,11 -718,10 +718,11 @@@ static int ep_queue(struct bdc_ep *ep, struct bdc *bdc; int ret = 0; - if (!req || !ep || !ep-usb_ep.desc) - bdc = ep-bdc; + if (!req || !ep-usb_ep.desc) return -EINVAL; + bdc = ep-bdc; + req-usb_req.actual = 0; req-usb_req.status = -EINPROGRESS; req-epnum = ep-ep_num; pgp7n7P9J8ltI.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
On Mon, Sep 08, 2014 at 05:02:12PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
> 36687e305651 ("doc: dt: mxs-phy: add compatible string for
> imx6sx-usbphy") from the usb.current tree and commit d0ee68b59e6a
> ("usb: phy: mxs: Add VF610 USB PHY support") from the usb-gadget tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thank you, that's the correct fix.
--
balbi
signature.asc
Description: Digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mxs-usb.c between commit 43f3634ff7e2 ("usb: phy:
mxs: add imx6sx support") from the usb.current tree and commit
d0ee68b59e6a ("usb: phy: mxs: Add VF610 USB PHY support") from the
usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/phy/phy-mxs-usb.c
index 00972eca04e7,8c2f23b75d6d..
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@@ -125,13 -125,12 +125,18 @@@ static const struct mxs_phy_data imx6sl
MXS_PHY_NEED_IP_FIX,
};
+static const struct mxs_phy_data imx6sx_phy_data = {
+ .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+ MXS_PHY_NEED_IP_FIX,
+};
+
+ static const struct mxs_phy_data vf610_phy_data = {
+ .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+ MXS_PHY_NEED_IP_FIX,
+ };
+
static const struct of_device_id mxs_phy_dt_ids[] = {
+ { .compatible = "fsl,imx6sx-usbphy", .data = _phy_data, },
{ .compatible = "fsl,imx6sl-usbphy", .data = _phy_data, },
{ .compatible = "fsl,imx6q-usbphy", .data = _phy_data, },
{ .compatible = "fsl,imx23-usbphy", .data = _phy_data, },
signature.asc
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
36687e305651 ("doc: dt: mxs-phy: add compatible string for
imx6sx-usbphy") from the usb.current tree and commit d0ee68b59e6a
("usb: phy: mxs: Add VF610 USB PHY support") from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc Documentation/devicetree/bindings/usb/mxs-phy.txt
index 96681c93b86d,fe3eed89e4c3..
--- a/Documentation/devicetree/bindings/usb/mxs-phy.txt
+++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt
@@@ -5,7 -5,7 +5,8 @@@ Required properties
* "fsl,imx23-usbphy" for imx23 and imx28
* "fsl,imx6q-usbphy" for imx6dq and imx6dl
* "fsl,imx6sl-usbphy" for imx6sl
+ * "fsl,imx6sx-usbphy" for imx6sx
+ * "fsl,vf610-usbphy" for Vybrid vf610
"fsl,imx23-usbphy" is still a fallback for other strings
- reg: Should contain registers location and length
- interrupts: Should contain phy interrupt
signature.asc
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in Documentation/devicetree/bindings/usb/mxs-phy.txt between commit 36687e305651 (doc: dt: mxs-phy: add compatible string for imx6sx-usbphy) from the usb.current tree and commit d0ee68b59e6a (usb: phy: mxs: Add VF610 USB PHY support) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc Documentation/devicetree/bindings/usb/mxs-phy.txt index 96681c93b86d,fe3eed89e4c3.. --- a/Documentation/devicetree/bindings/usb/mxs-phy.txt +++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt @@@ -5,7 -5,7 +5,8 @@@ Required properties * fsl,imx23-usbphy for imx23 and imx28 * fsl,imx6q-usbphy for imx6dq and imx6dl * fsl,imx6sl-usbphy for imx6sl + * fsl,imx6sx-usbphy for imx6sx + * fsl,vf610-usbphy for Vybrid vf610 fsl,imx23-usbphy is still a fallback for other strings - reg: Should contain registers location and length - interrupts: Should contain phy interrupt signature.asc Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mxs-usb.c between commit 43f3634ff7e2 (usb: phy:
mxs: add imx6sx support) from the usb.current tree and commit
d0ee68b59e6a (usb: phy: mxs: Add VF610 USB PHY support) from the
usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/phy/phy-mxs-usb.c
index 00972eca04e7,8c2f23b75d6d..
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@@ -125,13 -125,12 +125,18 @@@ static const struct mxs_phy_data imx6sl
MXS_PHY_NEED_IP_FIX,
};
+static const struct mxs_phy_data imx6sx_phy_data = {
+ .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+ MXS_PHY_NEED_IP_FIX,
+};
+
+ static const struct mxs_phy_data vf610_phy_data = {
+ .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+ MXS_PHY_NEED_IP_FIX,
+ };
+
static const struct of_device_id mxs_phy_dt_ids[] = {
+ { .compatible = fsl,imx6sx-usbphy, .data = imx6sx_phy_data, },
{ .compatible = fsl,imx6sl-usbphy, .data = imx6sl_phy_data, },
{ .compatible = fsl,imx6q-usbphy, .data = imx6q_phy_data, },
{ .compatible = fsl,imx23-usbphy, .data = imx23_phy_data, },
signature.asc
Description: PGP signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
On Mon, Sep 08, 2014 at 05:02:12PM +1000, Stephen Rothwell wrote: Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in Documentation/devicetree/bindings/usb/mxs-phy.txt between commit 36687e305651 (doc: dt: mxs-phy: add compatible string for imx6sx-usbphy) from the usb.current tree and commit d0ee68b59e6a (usb: phy: mxs: Add VF610 USB PHY support) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Thank you, that's the correct fix. -- balbi signature.asc Description: Digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_cppi41.c between commit c58d80f523ff ("usb: musb:
Ensure that cppi41 timer gets armed on premature DMA TX irq") from the
usb.current tree and commit 50aea6fca771 ("usb: musb: cppi41: fire
hrtimer according to programmed channel length") from the usb-gadget
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/musb/musb_cppi41.c
index 5341bb223b7c,adfffe884891..
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@@ -312,15 -271,13 +271,13 @@@ static void cppi41_dma_callback(void *p
goto out;
}
}
- if (is_isoc(hw_ep, 0)) {
- schedule_work(_channel->dma_completion);
- goto out;
- }
list_add_tail(_channel->tx_check,
>early_tx_list);
- if (!hrtimer_active(>early_tx)) {
+ if (!hrtimer_is_queued(>early_tx)) {
+ unsigned long usecs = cppi41_channel->total_len / 10;
+
hrtimer_start_range_ns(>early_tx,
- ktime_set(0, 140 * NSEC_PER_USEC),
+ ktime_set(0, usecs * NSEC_PER_USEC),
40 * NSEC_PER_USEC,
HRTIMER_MODE_REL);
}
signature.asc
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/musb/musb_cppi41.c between commit c58d80f523ff (usb: musb:
Ensure that cppi41 timer gets armed on premature DMA TX irq) from the
usb.current tree and commit 50aea6fca771 (usb: musb: cppi41: fire
hrtimer according to programmed channel length) from the usb-gadget
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/musb/musb_cppi41.c
index 5341bb223b7c,adfffe884891..
--- a/drivers/usb/musb/musb_cppi41.c
+++ b/drivers/usb/musb/musb_cppi41.c
@@@ -312,15 -271,13 +271,13 @@@ static void cppi41_dma_callback(void *p
goto out;
}
}
- if (is_isoc(hw_ep, 0)) {
- schedule_work(cppi41_channel-dma_completion);
- goto out;
- }
list_add_tail(cppi41_channel-tx_check,
controller-early_tx_list);
- if (!hrtimer_active(controller-early_tx)) {
+ if (!hrtimer_is_queued(controller-early_tx)) {
+ unsigned long usecs = cppi41_channel-total_len / 10;
+
hrtimer_start_range_ns(controller-early_tx,
- ktime_set(0, 140 * NSEC_PER_USEC),
+ ktime_set(0, usecs * NSEC_PER_USEC),
40 * NSEC_PER_USEC,
HRTIMER_MODE_REL);
}
signature.asc
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/Kconfig between commit 7cd0c298f6e0 ("usb: phy: fix
driver dependencies") from the usb.current tree and commit e1d2e31975e1
("usb: phy: Add OTG FSM configuration option") from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/phy/Kconfig
index 2b41c636a52a,54bebba39e91..
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@@ -19,9 -27,8 +27,9 @@@ config AB8500_US
in host mode, low speed.
config FSL_USB2_OTG
- bool "Freescale USB OTG Transceiver Driver"
+ tristate "Freescale USB OTG Transceiver Driver"
- depends on USB_EHCI_FSL && USB_FSL_USB2 && PM_RUNTIME
+ depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM_RUNTIME
+ depends on USB
select USB_OTG
select USB_PHY
help
pgpFXY7nMpuc8.pgp
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/phy/Kconfig between commit 7cd0c298f6e0 (usb: phy: fix driver dependencies) from the usb.current tree and commit e1d2e31975e1 (usb: phy: Add OTG FSM configuration option) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/usb/phy/Kconfig index 2b41c636a52a,54bebba39e91.. --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@@ -19,9 -27,8 +27,9 @@@ config AB8500_US in host mode, low speed. config FSL_USB2_OTG - bool Freescale USB OTG Transceiver Driver + tristate Freescale USB OTG Transceiver Driver - depends on USB_EHCI_FSL USB_FSL_USB2 PM_RUNTIME + depends on USB_EHCI_FSL USB_FSL_USB2 USB_OTG_FSM PM_RUNTIME + depends on USB select USB_OTG select USB_PHY help pgpFXY7nMpuc8.pgp Description: PGP signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi,
On Tue, Jul 30, 2013 at 02:08:10PM +1000, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/gadget/udc-core.c between commit 1894870eb424 ("usb: gadget:
> udc-core: fix the typo of udc state attribute") from the usb.current tree
> and commit 5702f75375aa ("usb: gadget: udc-core: move sysfs_notify() to a
> workqueue") from the usb-gadget tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc drivers/usb/gadget/udc-core.c
> index 13e25f8,3122ab9..000
> --- a/drivers/usb/gadget/udc-core.c
> +++ b/drivers/usb/gadget/udc-core.c
> @@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ
>
> /*
> - */
>
> + static void usb_gadget_state_work(struct work_struct *work)
> + {
> + struct usb_gadget *gadget = work_to_gadget(work);
> +
> -sysfs_notify(>dev.kobj, NULL, "status");
> ++sysfs_notify(>dev.kobj, NULL, "state");
> + }
this is the same fix used in my master branch, looks good. :-)
Thanks
--
balbi
signature.asc
Description: Digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc-core.c between commit 1894870eb424 ("usb: gadget:
udc-core: fix the typo of udc state attribute") from the usb.current tree
and commit 5702f75375aa ("usb: gadget: udc-core: move sysfs_notify() to a
workqueue") from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/gadget/udc-core.c
index 13e25f8,3122ab9..000
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ
/* -
*/
+ static void usb_gadget_state_work(struct work_struct *work)
+ {
+ struct usb_gadget *gadget = work_to_gadget(work);
+
- sysfs_notify(>dev.kobj, NULL, "status");
++ sysfs_notify(>dev.kobj, NULL, "state");
+ }
+
void usb_gadget_set_state(struct usb_gadget *gadget,
enum usb_device_state state)
{
pgprWdL2R3Sde.pgp
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc-core.c between commit 1894870eb424 (usb: gadget:
udc-core: fix the typo of udc state attribute) from the usb.current tree
and commit 5702f75375aa (usb: gadget: udc-core: move sysfs_notify() to a
workqueue) from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/gadget/udc-core.c
index 13e25f8,3122ab9..000
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ
/* -
*/
+ static void usb_gadget_state_work(struct work_struct *work)
+ {
+ struct usb_gadget *gadget = work_to_gadget(work);
+
- sysfs_notify(gadget-dev.kobj, NULL, status);
++ sysfs_notify(gadget-dev.kobj, NULL, state);
+ }
+
void usb_gadget_set_state(struct usb_gadget *gadget,
enum usb_device_state state)
{
pgprWdL2R3Sde.pgp
Description: PGP signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi,
On Tue, Jul 30, 2013 at 02:08:10PM +1000, Stephen Rothwell wrote:
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc-core.c between commit 1894870eb424 (usb: gadget:
udc-core: fix the typo of udc state attribute) from the usb.current tree
and commit 5702f75375aa (usb: gadget: udc-core: move sysfs_notify() to a
workqueue) from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/gadget/udc-core.c
index 13e25f8,3122ab9..000
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ
/*
- */
+ static void usb_gadget_state_work(struct work_struct *work)
+ {
+ struct usb_gadget *gadget = work_to_gadget(work);
+
-sysfs_notify(gadget-dev.kobj, NULL, status);
++sysfs_notify(gadget-dev.kobj, NULL, state);
+ }
this is the same fix used in my master branch, looks good. :-)
Thanks
--
balbi
signature.asc
Description: Digital signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
On Fri, Mar 22, 2013 at 02:31:35PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget:
> net2280: remove leftover driver->unbind call in error pathway") from the
> usb.current tree and commit 68abc94f8de8 ("usb: gadget: net2280: don't
> touch gadget.dev.driver") from the usb-gadget tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc drivers/usb/gadget/net2280.c
> index 3bd0f99,691cc65..000
> --- a/drivers/usb/gadget/net2280.c
> +++ b/drivers/usb/gadget/net2280.c
> @@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad
> err_func:
> device_remove_file (>pdev->dev, _attr_function);
> err_unbind:
> - dev->gadget.dev.driver = NULL;
> -driver->unbind (>gadget);
This also looks correct. Thank you
--
balbi
signature.asc
Description: Digital signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi,
On Fri, Mar 22, 2013 at 02:28:11PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/gadget/net2272.c between commit eda81bea894e ("usb: gadget:
> net2272: finally convert "CONFIG_USB_GADGET_NET2272_DMA"") from the
> usb.current tree and commit c36cbfc045bf ("usb: gadget: net2272: remove
> unused DMA_ADDR_INVALID") from the usb-gadget tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc drivers/usb/gadget/net2272.c
> index 32524b63,03e4104..000
> --- a/drivers/usb/gadget/net2272.c
> +++ b/drivers/usb/gadget/net2272.c
> @@@ -58,8 -58,7 +58,7 @@@ static const char * const ep_name[] =
> "ep-a", "ep-b", "ep-c",
> };
>
> - #define DMA_ADDR_INVALID(~(dma_addr_t)0)
> -#ifdef CONFIG_USB_GADGET_NET2272_DMA
> +#ifdef CONFIG_USB_NET2272_DMA
Resolution is correct, thanks Stephen.
--
balbi
signature.asc
Description: Digital signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi, On Fri, Mar 22, 2013 at 02:28:11PM +1100, Stephen Rothwell wrote: Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/net2272.c between commit eda81bea894e (usb: gadget: net2272: finally convert CONFIG_USB_GADGET_NET2272_DMA) from the usb.current tree and commit c36cbfc045bf (usb: gadget: net2272: remove unused DMA_ADDR_INVALID) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/usb/gadget/net2272.c index 32524b63,03e4104..000 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@@ -58,8 -58,7 +58,7 @@@ static const char * const ep_name[] = ep-a, ep-b, ep-c, }; - #define DMA_ADDR_INVALID(~(dma_addr_t)0) -#ifdef CONFIG_USB_GADGET_NET2272_DMA +#ifdef CONFIG_USB_NET2272_DMA Resolution is correct, thanks Stephen. -- balbi signature.asc Description: Digital signature
Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree
On Fri, Mar 22, 2013 at 02:31:35PM +1100, Stephen Rothwell wrote: Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/net2280.c between commit 8119b55aed81 (USB: gadget: net2280: remove leftover driver-unbind call in error pathway) from the usb.current tree and commit 68abc94f8de8 (usb: gadget: net2280: don't touch gadget.dev.driver) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/usb/gadget/net2280.c index 3bd0f99,691cc65..000 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c @@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad err_func: device_remove_file (dev-pdev-dev, dev_attr_function); err_unbind: - dev-gadget.dev.driver = NULL; -driver-unbind (dev-gadget); This also looks correct. Thank you -- balbi signature.asc Description: Digital signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget:
net2280: remove leftover driver->unbind call in error pathway") from the
usb.current tree and commit 68abc94f8de8 ("usb: gadget: net2280: don't
touch gadget.dev.driver") from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/gadget/net2280.c
index 3bd0f99,691cc65..000
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad
err_func:
device_remove_file (>pdev->dev, _attr_function);
err_unbind:
- dev->gadget.dev.driver = NULL;
- driver->unbind (>gadget);
dev->driver = NULL;
return retval;
}
pgpxkqywCaU__.pgp
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/net2272.c between commit eda81bea894e ("usb: gadget:
net2272: finally convert "CONFIG_USB_GADGET_NET2272_DMA"") from the
usb.current tree and commit c36cbfc045bf ("usb: gadget: net2272: remove
unused DMA_ADDR_INVALID") from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/usb/gadget/net2272.c
index 32524b63,03e4104..000
--- a/drivers/usb/gadget/net2272.c
+++ b/drivers/usb/gadget/net2272.c
@@@ -58,8 -58,7 +58,7 @@@ static const char * const ep_name[] =
"ep-a", "ep-b", "ep-c",
};
- #define DMA_ADDR_INVALID (~(dma_addr_t)0)
-#ifdef CONFIG_USB_GADGET_NET2272_DMA
+#ifdef CONFIG_USB_NET2272_DMA
/*
* use_dma: the NET2272 can use an external DMA controller.
* Note that since there is no generic DMA api, some functions,
pgp91RrxiqNKC.pgp
Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/net2272.c between commit eda81bea894e (usb: gadget: net2272: finally convert CONFIG_USB_GADGET_NET2272_DMA) from the usb.current tree and commit c36cbfc045bf (usb: gadget: net2272: remove unused DMA_ADDR_INVALID) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/usb/gadget/net2272.c index 32524b63,03e4104..000 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@@ -58,8 -58,7 +58,7 @@@ static const char * const ep_name[] = ep-a, ep-b, ep-c, }; - #define DMA_ADDR_INVALID (~(dma_addr_t)0) -#ifdef CONFIG_USB_GADGET_NET2272_DMA +#ifdef CONFIG_USB_NET2272_DMA /* * use_dma: the NET2272 can use an external DMA controller. * Note that since there is no generic DMA api, some functions, pgp91RrxiqNKC.pgp Description: PGP signature
linux-next: manual merge of the usb-gadget tree with the usb.current tree
Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/net2280.c between commit 8119b55aed81 (USB: gadget: net2280: remove leftover driver-unbind call in error pathway) from the usb.current tree and commit 68abc94f8de8 (usb: gadget: net2280: don't touch gadget.dev.driver) from the usb-gadget tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/usb/gadget/net2280.c index 3bd0f99,691cc65..000 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c @@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad err_func: device_remove_file (dev-pdev-dev, dev_attr_function); err_unbind: - dev-gadget.dev.driver = NULL; - driver-unbind (dev-gadget); dev-driver = NULL; return retval; } pgpxkqywCaU__.pgp Description: PGP signature
