The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
Possible dependencies:
2efb6edd52dc ("comedi: adv_pci1760: Fix PWM instruction handling")
8ffdff6a8cfb ("staging: comedi: move out of staging directory")
5b7b4ce1d116 ("staging: comedi: tests: example_test: Rename to 'comedi_example_test'")
a98f670e41a9 ("Merge tag 'media/v5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2efb6edd52dc50273f5e68ad863dd1b1fb2f2d1c Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti(a)mev.co.uk>
Date: Tue, 3 Jan 2023 14:37:54 +0000
Subject: [PATCH] comedi: adv_pci1760: Fix PWM instruction handling
(Actually, this is fixing the "Read the Current Status" command sent to
the device's outgoing mailbox, but it is only currently used for the PWM
instructions.)
The PCI-1760 is operated mostly by sending commands to a set of Outgoing
Mailbox registers, waiting for the command to complete, and reading the
result from the Incoming Mailbox registers. One of these commands is
the "Read the Current Status" command. The number of this command is
0x07 (see the User's Manual for the PCI-1760 at
<https://advdownload.advantech.com/productfile/Downloadfile2/1-11P6653/PCI-1…>.
The `PCI1760_CMD_GET_STATUS` macro defined in the driver should expand
to this command number 0x07, but unfortunately it currently expands to
0x03. (Command number 0x03 is not defined in the User's Manual.)
Correct the definition of the `PCI1760_CMD_GET_STATUS` macro to fix it.
This is used by all the PWM subdevice related instructions handled by
`pci1760_pwm_insn_config()` which are probably all broken. The effect
of sending the undefined command number 0x03 is not known.
Fixes: 14b93bb6bbf0 ("staging: comedi: adv_pci_dio: separate out PCI-1760 support")
Cc: <stable(a)vger.kernel.org> # v4.5+
Signed-off-by: Ian Abbott <abbotti(a)mev.co.uk>
Link: https://lore.kernel.org/r/20230103143754.17564-1-abbotti@mev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
diff --git a/drivers/comedi/drivers/adv_pci1760.c b/drivers/comedi/drivers/adv_pci1760.c
index fcfc2e299110..27f3890f471d 100644
--- a/drivers/comedi/drivers/adv_pci1760.c
+++ b/drivers/comedi/drivers/adv_pci1760.c
@@ -58,7 +58,7 @@
#define PCI1760_CMD_CLR_IMB2 0x00 /* Clears IMB2 */
#define PCI1760_CMD_SET_DO 0x01 /* Set output state */
#define PCI1760_CMD_GET_DO 0x02 /* Read output status */
-#define PCI1760_CMD_GET_STATUS 0x03 /* Read current status */
+#define PCI1760_CMD_GET_STATUS 0x07 /* Read current status */
#define PCI1760_CMD_GET_FW_VER 0x0e /* Read firmware version */
#define PCI1760_CMD_GET_HW_VER 0x0f /* Read hardware version */
#define PCI1760_CMD_SET_PWM_HI(x) (0x10 + (x) * 2) /* Set "hi" period */
On 22.01.23 05:28, Sasha Levin wrote:
> This is a note to let you know that I've just added the patch titled
>
> wifi: mac80211: Drop support for TX push path
>
> to the 6.1-stable tree which can be found at:
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum…
>
> The filename of the patch is:
> wifi-mac80211-drop-support-for-tx-push-path.patch
> and it can be found in the queue-6.1 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable(a)vger.kernel.org> know about it.
>
We should at least have a discussion about that.
While I think we have sorted out all related regressions it's still way
too early to be sure.
The patch is also changing most mac80211 driver interfaces from queuing
to non-queuing and is thus nothing I would do within a fix release.
All in all it's more likely to cause issues than fix them, at last at
this point in time.
So do we really want to backport that to (all) stable kernels?
I've also just backported the two for stable relevant patches which
depend on the iTXQ transformation:
https://lore.kernel.org/r/20230121223330.389255-2-alexander@wetzel-home.dehttps://lore.kernel.org/r/20230121223330.389255-2-alexander@wetzel-home.de
If there are more patches can point them out to me and I'll should be
able port them, too.
All in all I see no pressing need to retire the old push path for stable
kernels at that time.
Question is also where to stop if we back port it now:
The transition to iTXQ is only the first step to get rid of the old push
path in mac80211. Working patch titels are:
1) wifi: mac80211: Always provide the MMPDU TXQ
2) wifi: mac80211: Convert vif->txq to an array
3) wifi: mac80211: add new iTXQs to replace remaining legacy TX
4) wifi: mac80211: Stop using legacy TX path
5) wifi: mac80211: Cleanup legacy TX path - AMPDU
6) WIP: Drop pending
7) wifi: mac80211: integrate PS buffering into iTXQ
8) wifi: mac80211: handle filtered frames within iTXQs
Patch 6) is only a rough skeleton so far and 4-8 still need at least
some moderate work. All in all thinks seem to hash out quite well and
I'm hoping to get them merged for 6.4.
Together they are fundamentally altering the TX path and nothing I would
like to backport to stable.
Alexander