* [v2,3/4] usb: musb: Extract set toggle as a separate interface
@ 2019-01-15 1:43 min.guo
0 siblings, 0 replies; 5+ messages in thread
From: min.guo @ 2019-01-15 1:43 UTC (permalink / raw)
To: Bin Liu, Rob Herring
Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
chunfeng.yun, linux-usb, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek, Min Guo
From: Min Guo <min.guo@mediatek.com>
Add a common interface for set data toggle
Signed-off-by: Min Guo <min.guo@mediatek.com>
---
drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index b59ce9a..16d0ba4 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in,
usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0);
}
+static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in,
+ struct urb *urb)
+{
+ u16 csr = 0;
+ u16 toggle = 0;
+
+ toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in);
+
+ if (is_in)
+ csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE
+ | MUSB_RXCSR_H_DATATOGGLE) : 0;
+ else
+ csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE
+ | MUSB_TXCSR_H_DATATOGGLE)
+ : MUSB_TXCSR_CLRDATATOG;
+
+ return csr;
+}
+
/*
* Advance this hardware endpoint's queue, completing the specified URB and
* advancing to either the next URB queued to that qh, or else invalidating
@@ -772,13 +791,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
);
csr |= MUSB_TXCSR_MODE;
- if (!hw_ep->tx_double_buffered) {
- if (usb_gettoggle(urb->dev, qh->epnum, 1))
- csr |= MUSB_TXCSR_H_WR_DATATOGGLE
- | MUSB_TXCSR_H_DATATOGGLE;
- else
- csr |= MUSB_TXCSR_CLRDATATOG;
- }
+ if (!hw_ep->tx_double_buffered)
+ csr |= musb_set_toggle(qh, !is_out, urb);
musb_writew(epio, MUSB_TXCSR, csr);
/* REVISIT may need to clear FLUSHFIFO ... */
@@ -860,17 +874,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
/* IN/receive */
} else {
- u16 csr;
+ u16 csr = 0;
if (hw_ep->rx_reinit) {
musb_rx_reinit(musb, qh, epnum);
+ csr |= musb_set_toggle(qh, !is_out, urb);
- /* init new state: toggle and NYET, maybe DMA later */
- if (usb_gettoggle(urb->dev, qh->epnum, 0))
- csr = MUSB_RXCSR_H_WR_DATATOGGLE
- | MUSB_RXCSR_H_DATATOGGLE;
- else
- csr = 0;
if (qh->type == USB_ENDPOINT_XFER_INT)
csr |= MUSB_RXCSR_DISNYET;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [v2,3/4] usb: musb: Extract set toggle as a separate interface
@ 2019-01-15 15:19 Matthias Brugger
0 siblings, 0 replies; 5+ messages in thread
From: Matthias Brugger @ 2019-01-15 15:19 UTC (permalink / raw)
To: min.guo, Bin Liu, Rob Herring
Cc: Greg Kroah-Hartman, Mark Rutland, Alan Stern, chunfeng.yun,
linux-usb, devicetree, linux-kernel, linux-arm-kernel,
linux-mediatek
On 15/01/2019 02:43, min.guo@mediatek.com wrote:
> From: Min Guo <min.guo@mediatek.com>
>
> Add a common interface for set data toggle
>
> Signed-off-by: Min Guo <min.guo@mediatek.com>
> ---
> drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++--------------
> 1 file changed, 23 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> index b59ce9a..16d0ba4 100644
> --- a/drivers/usb/musb/musb_host.c
> +++ b/drivers/usb/musb/musb_host.c
> @@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in,
> usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0);
> }
>
> +static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in,
> + struct urb *urb)
> +{
> + u16 csr = 0;
> + u16 toggle = 0;
> +
> + toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in);
> +
> + if (is_in)
> + csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE
> + | MUSB_RXCSR_H_DATATOGGLE) : 0;
> + else
> + csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE
> + | MUSB_TXCSR_H_DATATOGGLE)
> + : MUSB_TXCSR_CLRDATATOG;
Can we switch the if and use is_out logic as function parameter. This would make
the code easier to understand.
Regards,
Matthias
> +
> + return csr;
> +}
> +
> /*
> * Advance this hardware endpoint's queue, completing the specified URB and
> * advancing to either the next URB queued to that qh, or else invalidating
> @@ -772,13 +791,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
> );
> csr |= MUSB_TXCSR_MODE;
>
> - if (!hw_ep->tx_double_buffered) {
> - if (usb_gettoggle(urb->dev, qh->epnum, 1))
> - csr |= MUSB_TXCSR_H_WR_DATATOGGLE
> - | MUSB_TXCSR_H_DATATOGGLE;
> - else
> - csr |= MUSB_TXCSR_CLRDATATOG;
> - }
> + if (!hw_ep->tx_double_buffered)
> + csr |= musb_set_toggle(qh, !is_out, urb);
>
> musb_writew(epio, MUSB_TXCSR, csr);
> /* REVISIT may need to clear FLUSHFIFO ... */
> @@ -860,17 +874,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
>
> /* IN/receive */
> } else {
> - u16 csr;
> + u16 csr = 0;
>
> if (hw_ep->rx_reinit) {
> musb_rx_reinit(musb, qh, epnum);
> + csr |= musb_set_toggle(qh, !is_out, urb);
>
> - /* init new state: toggle and NYET, maybe DMA later */
> - if (usb_gettoggle(urb->dev, qh->epnum, 0))
> - csr = MUSB_RXCSR_H_WR_DATATOGGLE
> - | MUSB_RXCSR_H_DATATOGGLE;
> - else
> - csr = 0;
> if (qh->type == USB_ENDPOINT_XFER_INT)
> csr |= MUSB_RXCSR_DISNYET;
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [v2,3/4] usb: musb: Extract set toggle as a separate interface
@ 2019-01-15 20:40 Bin Liu
0 siblings, 0 replies; 5+ messages in thread
From: Bin Liu @ 2019-01-15 20:40 UTC (permalink / raw)
To: Matthias Brugger
Cc: min.guo, Rob Herring, Greg Kroah-Hartman, Mark Rutland,
Alan Stern, chunfeng.yun, linux-usb, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek
Hi Min,
On Tue, Jan 15, 2019 at 04:19:42PM +0100, Matthias Brugger wrote:
>
>
> On 15/01/2019 02:43, min.guo@mediatek.com wrote:
> > From: Min Guo <min.guo@mediatek.com>
> >
> > Add a common interface for set data toggle
> >
> > Signed-off-by: Min Guo <min.guo@mediatek.com>
> > ---
> > drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++--------------
> > 1 file changed, 23 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> > index b59ce9a..16d0ba4 100644
> > --- a/drivers/usb/musb/musb_host.c
> > +++ b/drivers/usb/musb/musb_host.c
> > @@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in,
> > usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0);
> > }
> >
> > +static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in,
> > + struct urb *urb)
> > +{
> > + u16 csr = 0;
> > + u16 toggle = 0;
> > +
> > + toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in);
> > +
> > + if (is_in)
> > + csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE
> > + | MUSB_RXCSR_H_DATATOGGLE) : 0;
> > + else
> > + csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE
> > + | MUSB_TXCSR_H_DATATOGGLE)
> > + : MUSB_TXCSR_CLRDATATOG;
>
> Can we switch the if and use is_out logic as function parameter. This would make
> the code easier to understand.
based on the current implementation in patch 4/4, I don't think we need
this separate patch any more, but Matthias' comments still apply.
Regards,
-Bin.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [v2,3/4] usb: musb: Extract set toggle as a separate interface
@ 2019-01-16 2:43 min.guo
0 siblings, 0 replies; 5+ messages in thread
From: min.guo @ 2019-01-16 2:43 UTC (permalink / raw)
To: Bin Liu
Cc: Matthias Brugger, Rob Herring, Greg Kroah-Hartman, Mark Rutland,
Alan Stern, chunfeng.yun, linux-usb, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek
Hi Bin,
On Tue, 2019-01-15 at 14:40 -0600, Bin Liu wrote:
> Hi Min,
>
> On Tue, Jan 15, 2019 at 04:19:42PM +0100, Matthias Brugger wrote:
> >
> >
> > On 15/01/2019 02:43, min.guo@mediatek.com wrote:
> > > From: Min Guo <min.guo@mediatek.com>
> > >
> > > Add a common interface for set data toggle
> > >
> > > Signed-off-by: Min Guo <min.guo@mediatek.com>
> > > ---
> > > drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++--------------
> > > 1 file changed, 23 insertions(+), 14 deletions(-)
> > >
> > > diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> > > index b59ce9a..16d0ba4 100644
> > > --- a/drivers/usb/musb/musb_host.c
> > > +++ b/drivers/usb/musb/musb_host.c
> > > @@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in,
> > > usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0);
> > > }
> > >
> > > +static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in,
> > > + struct urb *urb)
> > > +{
> > > + u16 csr = 0;
> > > + u16 toggle = 0;
> > > +
> > > + toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in);
> > > +
> > > + if (is_in)
> > > + csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE
> > > + | MUSB_RXCSR_H_DATATOGGLE) : 0;
> > > + else
> > > + csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE
> > > + | MUSB_TXCSR_H_DATATOGGLE)
> > > + : MUSB_TXCSR_CLRDATATOG;
> >
> > Can we switch the if and use is_out logic as function parameter. This would make
> > the code easier to understand.
>
> based on the current implementation in patch 4/4, I don't think we need
> this separate patch any more, but Matthias' comments still apply.
Okay.
> Regards,
> -Bin.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [v2,3/4] usb: musb: Extract set toggle as a separate interface
@ 2019-01-16 2:44 min.guo
0 siblings, 0 replies; 5+ messages in thread
From: min.guo @ 2019-01-16 2:44 UTC (permalink / raw)
To: Matthias Brugger
Cc: Bin Liu, Rob Herring, Greg Kroah-Hartman, Mark Rutland,
Alan Stern, chunfeng.yun, linux-usb, devicetree, linux-kernel,
linux-arm-kernel, linux-mediatek
Hi Matthias,
On Tue, 2019-01-15 at 16:19 +0100, Matthias Brugger wrote:
>
> On 15/01/2019 02:43, min.guo@mediatek.com wrote:
> > From: Min Guo <min.guo@mediatek.com>
> >
> > Add a common interface for set data toggle
> >
> > Signed-off-by: Min Guo <min.guo@mediatek.com>
> > ---
> > drivers/usb/musb/musb_host.c | 37 +++++++++++++++++++++++--------------
> > 1 file changed, 23 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> > index b59ce9a..16d0ba4 100644
> > --- a/drivers/usb/musb/musb_host.c
> > +++ b/drivers/usb/musb/musb_host.c
> > @@ -306,6 +306,25 @@ static inline void musb_save_toggle(struct musb_qh *qh, int is_in,
> > usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0);
> > }
> >
> > +static inline u16 musb_set_toggle(struct musb_qh *qh, int is_in,
> > + struct urb *urb)
> > +{
> > + u16 csr = 0;
> > + u16 toggle = 0;
> > +
> > + toggle = usb_gettoggle(urb->dev, qh->epnum, !is_in);
> > +
> > + if (is_in)
> > + csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE
> > + | MUSB_RXCSR_H_DATATOGGLE) : 0;
> > + else
> > + csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE
> > + | MUSB_TXCSR_H_DATATOGGLE)
> > + : MUSB_TXCSR_CLRDATATOG;
>
> Can we switch the if and use is_out logic as function parameter. This would make
> the code easier to understand.
Okay.
> Regards,
> Matthias
>
> > +
> > + return csr;
> > +}
> > +
> > /*
> > * Advance this hardware endpoint's queue, completing the specified URB and
> > * advancing to either the next URB queued to that qh, or else invalidating
> > @@ -772,13 +791,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
> > );
> > csr |= MUSB_TXCSR_MODE;
> >
> > - if (!hw_ep->tx_double_buffered) {
> > - if (usb_gettoggle(urb->dev, qh->epnum, 1))
> > - csr |= MUSB_TXCSR_H_WR_DATATOGGLE
> > - | MUSB_TXCSR_H_DATATOGGLE;
> > - else
> > - csr |= MUSB_TXCSR_CLRDATATOG;
> > - }
> > + if (!hw_ep->tx_double_buffered)
> > + csr |= musb_set_toggle(qh, !is_out, urb);
> >
> > musb_writew(epio, MUSB_TXCSR, csr);
> > /* REVISIT may need to clear FLUSHFIFO ... */
> > @@ -860,17 +874,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
> >
> > /* IN/receive */
> > } else {
> > - u16 csr;
> > + u16 csr = 0;
> >
> > if (hw_ep->rx_reinit) {
> > musb_rx_reinit(musb, qh, epnum);
> > + csr |= musb_set_toggle(qh, !is_out, urb);
> >
> > - /* init new state: toggle and NYET, maybe DMA later */
> > - if (usb_gettoggle(urb->dev, qh->epnum, 0))
> > - csr = MUSB_RXCSR_H_WR_DATATOGGLE
> > - | MUSB_RXCSR_H_DATATOGGLE;
> > - else
> > - csr = 0;
> > if (qh->type == USB_ENDPOINT_XFER_INT)
> > csr |= MUSB_RXCSR_DISNYET;
> >
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-16 2:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-15 20:40 [v2,3/4] usb: musb: Extract set toggle as a separate interface Bin Liu
-- strict thread matches above, loose matches on Subject: below --
2019-01-16 2:44 min.guo
2019-01-16 2:43 min.guo
2019-01-15 15:19 Matthias Brugger
2019-01-15 1:43 min.guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).