thunderbolt fixes for v4.15-rc2

PATCH In review Mika Westerberg 2 participants 8 messages Dec 1, 2017 – Dec 16, 2017

Subsystems (2)

Documentation Thunderbolt driver

lore

Share & tools

lore

Mika Westerberg

author

2017-12-01 12:08 UTC #0 lore raw

cover thunderbolt fixes for v4.15-rc2

Hi Greg,

Here are two Thunderbolt fixes and one related MAINTAINERS update for the next -rc:

- Use shorter path for force_power attribute in thunderbolt.rst
- Ring interrupts were not masked properly when Rx polling starts
- Add thunderbolt.rst to the Thunderbolt driver MAINTAINERS entry

Thanks!

Andy Shevchenko (1):
thunderbolt: Make pathname to force_power shorter

Mika Westerberg (2):
MAINTAINERS: Add thunderbolt.rst to the Thunderbolt driver entry
thunderbolt: Mask ring interrupt properly when polling starts

 Documentation/admin-guide/thunderbolt.rst | 2 +-
 MAINTAINERS                               | 1 +
 drivers/thunderbolt/nhi.c                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

Signature · 1 line

2.15.0

Mika Westerberg

author

2017-12-01 12:09 UTC #1 lore raw

PATCH 1/3 thunderbolt: Make pathname to force_power shorter

From: Andy Shevchenko <[email protected]>

WMI is the bus inside kernel, so, we may access the GUID via /sys/bus/wmi instead of doing this through /sys/devices path.

Signed-off-by Andy Shevchenko <[email protected]>

Acked-by Mario Limonciello <[email protected]>

Signed-off-by Mika Westerberg <[email protected]>

---
 Documentation/admin-guide/thunderbolt.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Documentation/admin-guide/thunderbolt.rst +1 -1

index de50a8561774..9b55952039a6 100644
@@ -230,7 +230,7 @@ If supported by your machine this will be exposed by the WMI bus with
 a sysfs attribute called "force_power".
 
 For example the intel-wmi-thunderbolt driver exposes this attribute in:
-  /sys/devices/platform/PNP0C14:00/wmi_bus/wmi_bus-PNP0C14:00/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
+  /sys/bus/wmi/devices/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
 
   To force the power to on, write 1 to this attribute file.
   To disable force power, write 0 to this attribute file.

Signature · 1 line

2.15.0

Mika Westerberg

author

2017-12-01 12:08 UTC #2 lore raw

PATCH 2/3 MAINTAINERS: Add thunderbolt.rst to the Thunderbolt driver entry

In reply to Mika Westerberg

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

Signed-off-by Mika Westerberg <[email protected]>

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

MAINTAINERS +1 -0

index aa71ab52fd76..478e4d342c2a 100644
@@ -13471,6 +13471,7 @@ M:	Mika Westerberg <[email protected]>
 M:	Yehezkel Bernat <[email protected]>
 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

Signature · 1 line

2.15.0

Mika Westerberg

author

2017-12-01 12:08 UTC #3 lore raw

PATCH 3/3 thunderbolt: Mask ring interrupt properly when polling starts

In reply to 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 <[email protected]>

Acked-by Yehezkel Bernat <[email protected]>

---
 drivers/thunderbolt/nhi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/thunderbolt/nhi.c +1 -1

index 419a7a90bce0..f45bcbc63738 100644
@@ -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);

Signature · 1 line

2.15.0

Mika Westerberg

author

2017-12-05 08:49 UTC #4 lore raw

In reply to Mika Westerberg

Quoted 10 lines · Mika Westerberg

Hi Greg,
Here are two Thunderbolt fixes and one related MAINTAINERS update for the next -rc:
- Use shorter path for force_power attribute in thunderbolt.rst
- Ring interrupts were not masked properly when Rx polling starts
- Add thunderbolt.rst to the Thunderbolt driver MAINTAINERS entry
Thanks!

Hi Greg,

I wonder if I missed something in this series? These are fixes I picked up to my tree and then forwarded to you to be included in your char-misc repository for -rc.

Thanks!

Greg Kroah-Hartman

2017-12-05 08:52 UTC #5 lore raw

Quoted 10 lines · Mika Westerberg

Quoted 9 lines · Mika Westerberg
Hi Greg,
Here are two Thunderbolt fixes and one related MAINTAINERS update for the next -rc:
- Use shorter path for force_power attribute in thunderbolt.rst
- Ring interrupts were not masked properly when Rx polling starts
- Add thunderbolt.rst to the Thunderbolt driver MAINTAINERS entry

Quoted 7 lines

Quoted 1 line
Thanks!
Hi Greg,
I wonder if I missed something in this series? These are fixes I picked up to my tree and then forwarded to you to be included in your char-misc repository for -rc.

I was traveling all last week, please give me a chance to catch up on patches :)

thanks,

greg k-h

Mika Westerberg

author

2017-12-16 08:54 UTC #6 lore raw

Quoted 13 lines · Greg Kroah-Hartman

Quoted 12 lines · Mika Westerberg
Quoted 10 lines · Mika Westerberg
Hi Greg,
Here are two Thunderbolt fixes and one related MAINTAINERS update for the next -rc:
- Use shorter path for force_power attribute in thunderbolt.rst
- Ring interrupts were not masked properly when Rx polling starts
- Add thunderbolt.rst to the Thunderbolt driver MAINTAINERS entry
Thanks!

Quoted 8 lines

Quoted 5 lines
Hi Greg,
I wonder if I missed something in this series? These are fixes I picked up to my tree and then forwarded to you to be included in your char-misc repository for -rc.
I was traveling all last week, please give me a chance to catch up on patches :)

Hi Greg,

Any change to get these fixes for next -rc? They have been on relevant mailing list since v4.15-rc1 and all Thunderbolt maintainers have seen them. I picked them up to our Thunderbolt tree and forwarded to you. Isn't that how the process is supposed to work?

Thanks again.

Greg Kroah-Hartman

2017-12-16 16:11 UTC #7 lore raw

Quoted 23 lines · Mika Westerberg

Quoted 13 lines · Greg Kroah-Hartman
Quoted 12 lines · Mika Westerberg
Quoted 10 lines · Mika Westerberg
Hi Greg,
Here are two Thunderbolt fixes and one related MAINTAINERS update for the next -rc:
- Use shorter path for force_power attribute in thunderbolt.rst
- Ring interrupts were not masked properly when Rx polling starts
- Add thunderbolt.rst to the Thunderbolt driver MAINTAINERS entry
Thanks!
Quoted 8 lines
Quoted 5 lines
Hi Greg,
I wonder if I missed something in this series? These are fixes I picked up to my tree and then forwarded to you to be included in your char-misc repository for -rc.
I was traveling all last week, please give me a chance to catch up on patches :)

Quoted 6 lines

Hi Greg,
Any change to get these fixes for next -rc? They have been on relevant mailing list since v4.15-rc1 and all Thunderbolt maintainers have seen them. I picked them up to our Thunderbolt tree and forwarded to you. Isn't that how the process is supposed to work?

Yeah, sorry for the delay, I knew I just had to get them in before -final, so they were at the bottom of the pile. Now queued up.

greg k-h