[PATCH 1/2] MAINTAINERS: Add thunderbolt.rst to the Thunderbolt driver entry

[PATCH 1/2] MAINTAINERS: Add thunderbolt.rst to the Thunderbolt driver entry

[Mika Westerberg]

Make sure Thunderbolt maintainers get to see patches that touch
documentation of the Thunderbolt driver as well.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index aa71ab52fd76..478e4d342c2a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13471,6 +13471,7 @@ M:	Mika Westerberg <mika.westerberg@linux.intel.com>
 M:	Yehezkel Bernat <yehezkel.bernat@intel.com>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
 S:	Maintained
+F:	Documentation/admin-guide/thunderbolt.rst
 F:	drivers/thunderbolt/
 F:	include/linux/thunderbolt.h
 
-- 
2.15.0

[PATCH 2/2] thunderbolt: Mask ring interrupt properly when polling starts

[Mika Westerberg]

When ring enters polling mode we are expected to mask the ring interrupt
before the callback is called. However, the current code actually
unmasks it probably because of a copy-paste mistake.

Mask the interrupt properly from now on.

Fixes: 4ffe722eefcb ("thunderbolt: Add polling mode for rings")
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
 drivers/thunderbolt/nhi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 419a7a90bce0..f45bcbc63738 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -339,7 +339,7 @@ static void __ring_interrupt(struct tb_ring *ring)
 		return;
 
 	if (ring->start_poll) {
-		__ring_interrupt_mask(ring, false);
+		__ring_interrupt_mask(ring, true);
 		ring->start_poll(ring->poll_data);
 	} else {
 		schedule_work(&ring->work);
-- 
2.15.0

Re: [PATCH 2/2] thunderbolt: Mask ring interrupt properly when polling starts

[Bernat, Yehezkel]

On Mon, 2017-11-27 at 14:48 +0300, Mika Westerberg wrote:
> When ring enters polling mode we are expected to mask the ring
> interrupt
> before the callback is called. However, the current code actually
> unmasks it probably because of a copy-paste mistake.
> 
> Mask the interrupt properly from now on.
> 
> Fixes: 4ffe722eefcb ("thunderbolt: Add polling mode for rings")
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> ---
>  drivers/thunderbolt/nhi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
> index 419a7a90bce0..f45bcbc63738 100644
> --- a/drivers/thunderbolt/nhi.c
> +++ b/drivers/thunderbolt/nhi.c
> @@ -339,7 +339,7 @@ static void __ring_interrupt(struct tb_ring
> *ring)
>  		return;
>  
>  	if (ring->start_poll) {
> -		__ring_interrupt_mask(ring, false);
> +		__ring_interrupt_mask(ring, true);
>  		ring->start_poll(ring->poll_data);
>  	} else {
>  		schedule_work(&ring->work);

Acked-by: Yehezkel Bernat <yehezkel.bernat@intel.com>

Re: [PATCH 1/2] MAINTAINERS: Add thunderbolt.rst to the Thunderbolt driver entry

[Mika Westerberg]

On Mon, Nov 27, 2017 at 02:48:57PM +0300, Mika Westerberg wrote:
> Make sure Thunderbolt maintainers get to see patches that touch
> documentation of the Thunderbolt driver as well.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Applied.

Re: [PATCH 2/2] thunderbolt: Mask ring interrupt properly when polling starts

[mika.westerberg]

On Mon, Nov 27, 2017 at 04:21:34PM +0000, Bernat, Yehezkel wrote:
> On Mon, 2017-11-27 at 14:48 +0300, Mika Westerberg wrote:
> > When ring enters polling mode we are expected to mask the ring
> > interrupt
> > before the callback is called. However, the current code actually
> > unmasks it probably because of a copy-paste mistake.
> > 
> > Mask the interrupt properly from now on.
> > 
> > Fixes: 4ffe722eefcb ("thunderbolt: Add polling mode for rings")
> > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> > ---
> >  drivers/thunderbolt/nhi.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
> > index 419a7a90bce0..f45bcbc63738 100644
> > --- a/drivers/thunderbolt/nhi.c
> > +++ b/drivers/thunderbolt/nhi.c
> > @@ -339,7 +339,7 @@ static void __ring_interrupt(struct tb_ring
> > *ring)
> >  		return;
> >  
> >  	if (ring->start_poll) {
> > -		__ring_interrupt_mask(ring, false);
> > +		__ring_interrupt_mask(ring, true);
> >  		ring->start_poll(ring->poll_data);
> >  	} else {
> >  		schedule_work(&ring->work);
> 
> Acked-by: Yehezkel Bernat <yehezkel.bernat@intel.com>

Applied with Yehezkel's ACK.