December 2022 - Linux-stable-mirror

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.85 release. There are 17 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 21 Dec 2022 18:29:31 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.85-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.15.85-rc1 Rasmus Villemoes <linux(a)rasmusvillemoes.dk> net: loopback: use NET_NAME_PREDICTABLE for name_assign_type Tiezhu Yang <yangtiezhu(a)loongson.cn> selftests: net: Use "grep -E" instead of "egrep" Sungwoo Kim <iam(a)sung-woo.kim> Bluetooth: L2CAP: Fix u8 overflow José Expósito <jose.exposito89(a)gmail.com> HID: uclogic: Add HID_QUIRK_HIDINPUT_FORCE quirk Ferry Toth <ftoth(a)exalondelft.nl> usb: ulpi: defer ulpi_register on ulpi_read_id timeout Shruthi Sanil <shruthi.sanil(a)intel.com> usb: dwc3: pci: Update PCIe device ID for USB3 controller on CPU sub-system for Raptor Lake Tony Nguyen <anthony.l.nguyen(a)intel.com> igb: Initialize mailbox message for VF reset Reka Norman <rekanorman(a)chromium.org> xhci: Apply XHCI_RESET_TO_DEFAULT quirk to ADL-N Johan Hovold <johan(a)kernel.org> USB: serial: f81534: fix division by zero on line-speed change Johan Hovold <johan(a)kernel.org> USB: serial: f81232: fix division by zero on line-speed change Bruno Thomsen <bruno.thomsen(a)gmail.com> USB: serial: cp210x: add Kamstrup RF sniffer PIDs Duke Xin <duke_xinanwen(a)163.com> USB: serial: option: add Quectel EM05-G modem Szymon Heidrich <szymon.heidrich(a)gmail.com> usb: gadget: uvc: Prevent buffer overflow in setup handler Jan Kara <jack(a)suse.cz> udf: Fix extending file within last block Jan Kara <jack(a)suse.cz> udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size Jan Kara <jack(a)suse.cz> udf: Fix preallocation discarding at indirect extent boundary Jan Kara <jack(a)suse.cz> udf: Discard preallocation before extending file with a hole ------------- Diffstat: Makefile | 4 +- drivers/hid/hid-uclogic-core.c | 1 + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/loopback.c | 2 +- drivers/usb/common/ulpi.c | 2 +- drivers/usb/dwc3/dwc3-pci.c | 2 +- drivers/usb/gadget/function/f_uvc.c | 5 +- drivers/usb/host/xhci-pci.c | 4 +- drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/f81232.c | 12 +++-- drivers/usb/serial/f81534.c | 12 +++-- drivers/usb/serial/option.c | 3 ++ fs/udf/inode.c | 76 ++++++++++++++----------------- fs/udf/truncate.c | 48 ++++++------------- net/bluetooth/l2cap_core.c | 3 +- tools/testing/selftests/net/toeplitz.sh | 2 +- 16 files changed, 84 insertions(+), 96 deletions(-)

2 years

9
27
0 0

[PATCH 5.10 00/18] 5.10.161-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.161 release. There are 18 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 21 Dec 2022 18:29:31 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.161-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.10.161-rc1 Rasmus Villemoes <linux(a)rasmusvillemoes.dk> net: loopback: use NET_NAME_PREDICTABLE for name_assign_type Sungwoo Kim <iam(a)sung-woo.kim> Bluetooth: L2CAP: Fix u8 overflow José Expósito <jose.exposito89(a)gmail.com> HID: uclogic: Add HID_QUIRK_HIDINPUT_FORCE quirk Hans de Goede <hdegoede(a)redhat.com> HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch V 10 Hans de Goede <hdegoede(a)redhat.com> HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch 10E Hans de Goede <hdegoede(a)redhat.com> HID: ite: Add support for Acer S1002 keyboard-dock Ferry Toth <ftoth(a)exalondelft.nl> usb: ulpi: defer ulpi_register on ulpi_read_id timeout Tony Nguyen <anthony.l.nguyen(a)intel.com> igb: Initialize mailbox message for VF reset Reka Norman <rekanorman(a)chromium.org> xhci: Apply XHCI_RESET_TO_DEFAULT quirk to ADL-N Johan Hovold <johan(a)kernel.org> USB: serial: f81534: fix division by zero on line-speed change Johan Hovold <johan(a)kernel.org> USB: serial: f81232: fix division by zero on line-speed change Bruno Thomsen <bruno.thomsen(a)gmail.com> USB: serial: cp210x: add Kamstrup RF sniffer PIDs Duke Xin <duke_xinanwen(a)163.com> USB: serial: option: add Quectel EM05-G modem Szymon Heidrich <szymon.heidrich(a)gmail.com> usb: gadget: uvc: Prevent buffer overflow in setup handler Jan Kara <jack(a)suse.cz> udf: Fix extending file within last block Jan Kara <jack(a)suse.cz> udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size Jan Kara <jack(a)suse.cz> udf: Fix preallocation discarding at indirect extent boundary Jan Kara <jack(a)suse.cz> udf: Discard preallocation before extending file with a hole ------------- Diffstat: Makefile | 4 +- drivers/hid/hid-ids.h | 2 + drivers/hid/hid-ite.c | 26 ++++++++++- drivers/hid/hid-uclogic-core.c | 1 + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/loopback.c | 2 +- drivers/usb/common/ulpi.c | 2 +- drivers/usb/gadget/function/f_uvc.c | 5 +- drivers/usb/host/xhci-pci.c | 4 +- drivers/usb/serial/cp210x.c | 2 + drivers/usb/serial/f81232.c | 12 +++-- drivers/usb/serial/f81534.c | 12 +++-- drivers/usb/serial/option.c | 3 ++ fs/udf/inode.c | 76 ++++++++++++++----------------- fs/udf/truncate.c | 48 ++++++------------- net/bluetooth/l2cap_core.c | 3 +- 16 files changed, 108 insertions(+), 96 deletions(-)

2 years

9
28
0 0

FAILED: patch "[PATCH] staging: r8188eu: fix led register settings" failed to apply to 6.0-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.0-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: 12c6223fc180 ("staging: r8188eu: fix led register settings") 647085006beb ("staging: r8188eu: don't check bSurpriseRemoved in SwLedOff") 8f60cb9534e4 ("staging: r8188eu: remove duplicate bSurpriseRemoved check") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 12c6223fc1804fd9295dc50d358294539b4a4184 Mon Sep 17 00:00:00 2001 From: Martin Kaiser <martin(a)kaiser.cx> Date: Sat, 15 Oct 2022 17:11:06 +0200 Subject: [PATCH] staging: r8188eu: fix led register settings Using an InterTech DMG-02 dongle, the led remains on when the system goes into standby mode. After wakeup, it's no longer possible to control the led. It turned out that the register settings to enable or disable the led were not correct. They worked for some dongles like the Edimax V2 but not for others like the InterTech DMG-02. This patch fixes the register settings. Bit 3 in the led_cfg2 register controls the led status, bit 5 must always be set to be able to control the led, bit 6 has no influence on the led. Setting the mac_pinmux_cfg register is not necessary. These settings were tested with Edimax V2 and InterTech DMG-02. Cc: stable(a)vger.kernel.org Fixes: 8cd574e6af54 ("staging: r8188eu: introduce new hal dir for RTL8188eu driver") Suggested-by: Michael Straube <straube.linux(a)gmail.com> Signed-off-by: Martin Kaiser <martin(a)kaiser.cx> Tested-by: Michael Straube <straube.linux(a)gmail.com> # InterTech DMG-02, Tested-by: Philipp Hortmann <philipp.g.hortmann(a)gmail.com> # Edimax N150 Link: https://lore.kernel.org/r/20221015151115.232095-2-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c index 2527c252c3e9..5b214488571b 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -31,40 +31,19 @@ static void ResetLedStatus(struct led_priv *pLed) static void SwLedOn(struct adapter *padapter, struct led_priv *pLed) { - u8 LedCfg; - int res; - if (padapter->bDriverStopped) return; - res = rtw_read8(padapter, REG_LEDCFG2, &LedCfg); - if (res) - return; - - rtw_write8(padapter, REG_LEDCFG2, (LedCfg & 0xf0) | BIT(5) | BIT(6)); /* SW control led0 on. */ + rtw_write8(padapter, REG_LEDCFG2, BIT(5)); /* SW control led0 on. */ pLed->bLedOn = true; } static void SwLedOff(struct adapter *padapter, struct led_priv *pLed) { - u8 LedCfg; - int res; - if (padapter->bDriverStopped) goto exit; - res = rtw_read8(padapter, REG_LEDCFG2, &LedCfg);/* 0x4E */ - if (res) - goto exit; - - LedCfg &= 0x90; /* Set to software control. */ - rtw_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3))); - res = rtw_read8(padapter, REG_MAC_PINMUX_CFG, &LedCfg); - if (res) - goto exit; - - LedCfg &= 0xFE; - rtw_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg); + rtw_write8(padapter, REG_LEDCFG2, BIT(5) | BIT(3)); exit: pLed->bLedOn = false; }

2 years

2
1
0 0

+ gcov-add-support-for-checksum-field.patch added to mm-hotfixes-unstable branch

by Andrew Morton

The patch titled Subject: gcov: add support for checksum field has been added to the -mm mm-hotfixes-unstable branch. Its filename is gcov-add-support-for-checksum-field.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patche… This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Rickard x Andersson <rickaran(a)axis.com> Subject: gcov: add support for checksum field Date: Tue, 20 Dec 2022 11:23:18 +0100 In GCC version 12.1 a checksum field was added. This patch fixes a kernel crash occurring during boot when using gcov-kernel with GCC version 12.2. The crash occurred on a system running on i.MX6SX. Link: https://lkml.kernel.org/r/20221220102318.3418501-1-rickaran@axis.com Fixes: 977ef30a7d88 ("gcov: support GCC 12.1 and newer compilers") Signed-off-by: Rickard x Andersson <rickaran(a)axis.com> Reviewed-by: Peter Oberparleiter <oberpar(a)linux.ibm.com> Tested-by: Peter Oberparleiter <oberpar(a)linux.ibm.com> Reviewed-By: Martin Liska <mliska(a)suse.cz> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- kernel/gcov/gcc_4_7.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/kernel/gcov/gcc_4_7.c~gcov-add-support-for-checksum-field +++ a/kernel/gcov/gcc_4_7.c @@ -82,6 +82,7 @@ struct gcov_fn_info { * @version: gcov version magic indicating the gcc version used for compilation * @next: list head for a singly-linked list * @stamp: uniquifying time stamp + * @checksum: unique object checksum * @filename: name of the associated gcov data file * @merge: merge functions (null for unused counter type) * @n_functions: number of instrumented functions @@ -94,6 +95,10 @@ struct gcov_info { unsigned int version; struct gcov_info *next; unsigned int stamp; + /* Since GCC 12.1 a checksum field is added. */ +#if (__GNUC__ >= 12) + unsigned int checksum; +#endif const char *filename; void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); unsigned int n_functions; _ Patches currently in -mm which might be from rickaran(a)axis.com are gcov-add-support-for-checksum-field.patch

2 years

1
0
0 0

[PATCH v2] gcov: Add support for checksum field

by Rickard Andersson

From: Rickard x Andersson <rickaran(a)axis.com> In GCC version 12.1 a checksum field was added. This patch fixes a kernel crash occurring during boot when using gcov-kernel with GCC version 12.2. The crash occurred on a system running on i.MX6SX. Fixes: 977ef30a7d88 ("gcov: support GCC 12.1 and newer compilers") Signed-off-by: Rickard x Andersson <rickaran(a)axis.com> Reviewed-by: Peter Oberparleiter <oberpar(a)linux.ibm.com> Tested-by: Peter Oberparleiter <oberpar(a)linux.ibm.com> Cc: <stable(a)vger.kernel.org> --- kernel/gcov/gcc_4_7.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index c699feda21ac..04880d8fba25 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c @@ -85,6 +85,7 @@ struct gcov_fn_info { * @version: gcov version magic indicating the gcc version used for compilation * @next: list head for a singly-linked list * @stamp: uniquifying time stamp + * @checksum: unique object checksum * @filename: name of the associated gcov data file * @merge: merge functions (null for unused counter type) * @n_functions: number of instrumented functions @@ -97,6 +98,10 @@ struct gcov_info { unsigned int version; struct gcov_info *next; unsigned int stamp; + /* Since GCC 12.1 a checksum field is added. */ +#if (__GNUC__ >= 12) + unsigned int checksum; +#endif const char *filename; void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); unsigned int n_functions; -- 2.30.2

2 years

2
2
0 0

Re: [PATCH 2/2] ACPI: x86: s2idle: Stop using AMD specific codepath for Rembrandt+

by francois＠fanf.eu

Am Thu, Dec 15, 2022 at 01:16:16PM -0600 schrieb Mario Limonciello: > After we introduced a module parameter and quirk infrastructure for > picking the Microsoft GUID over the SOC vendor GUID we discovered > that lots and lots of systems are getting this wrong. > > The table continues to grow, and is becoming unwieldy. > > We don't really have any benefit to forcing vendors to populate the > AMD GUID. This is just extra work, and more and more vendors seem > to mess it up. As the Microsoft GUID is used by Windows as well, > it's very likely that it won't be messed up like this. > > So drop all the quirks forcing it and the Rembrandt behavior. This > means that Cezanne or later effectively only run the Microsoft GUID > codepath with the exception of HP Elitebook 8*5 G9. > > Fixes: fd894f05cf30 ("ACPI: x86: s2idle: If a new AMD _HID is missing assume Rembrandt") > Cc: stable(a)vger.kernel.org # 6.1 > Reported-by: Benjamin Cheng <ben(a)bcheng.me> > Reported-by: bilkow(a)tutanota.com > Reported-by: Paul <paul(a)zogpog.com> > Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2292 > Link: https://bugzilla.kernel.org/show_bug.cgi?id=216768 > Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> Tested-by: François ARMAND <francois(a)fanf.eu> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2307 Regards - and thanks for the help Mario! François

2 years

1
0
0 0

[PATCH v6] x86/resctrl: Fix task CLOSID/RMID update race

by Peter Newman

When the user moves a running task to a new rdtgroup using the tasks file interface or by deleting its rdtgroup, the resulting change in CLOSID/RMID must be immediately propagated to the PQR_ASSOC MSR on the task(s) CPUs. x86 allows reordering loads with prior stores, so if the task starts running between a task_curr() check that the CPU hoisted before the stores in the CLOSID/RMID update then it can start running with the old CLOSID/RMID until it is switched again because __rdtgroup_move_task() failed to determine that it needs to be interrupted to obtain the new CLOSID/RMID. Refer to the diagram below: CPU 0 CPU 1 ----- ----- __rdtgroup_move_task(): curr <- t1->cpu->rq->curr __schedule(): rq->curr <- t1 resctrl_sched_in(): t1->{closid,rmid} -> {1,1} t1->{closid,rmid} <- {2,2} if (curr == t1) // false IPI(t1->cpu) A similar race impacts rdt_move_group_tasks(), which updates tasks in a deleted rdtgroup. In a memory bandwidth-metered compute host, malicious jobs could exploit this race to remain in a previous CLOSID or RMID in order to dodge a class-of-service downgrade imposed by an admin or to steal bandwidth. In both cases, use smp_mb() to order the task_struct::{closid,rmid} stores before the loads in task_curr(). In particular, in the rdt_move_group_tasks() case, simply execute an smp_mb() on every iteration with a matching task. It is possible to use a single smp_mb() in rdt_move_group_tasks(), but this would require two passes and a means of remembering which task_structs were updated in the first loop. However, benchmarking results below showed too little performance impact in the simple approach to justify implementing the two-pass approach. Times below were collected using `perf stat` to measure the time to remove a group containing a 1600-task, parallel workload. CPU: Intel(R) Xeon(R) Platinum P-8136 CPU @ 2.00GHz (112 threads) # mkdir /sys/fs/resctrl/test # echo $$ > /sys/fs/resctrl/test/tasks # perf bench sched messaging -g 40 -l 100000 task-clock time ranges collected using: # perf stat rmdir /sys/fs/resctrl/test Baseline: 1.54 - 1.60 ms smp_mb() every matching task: 1.57 - 1.67 ms Fixes: ae28d1aae48a ("x86/resctrl: Use an IPI instead of task_work_add() to update PQR_ASSOC MSR") Fixes: 0efc89be9471 ("x86/intel_rdt: Update task closid immediately on CPU in rmdir and unmount") Signed-off-by: Peter Newman <peternewman(a)google.com> Reviewed-by: Reinette Chatre <reinette.chatre(a)intel.com> Cc: stable(a)vger.kernel.org --- Patch history: v6: - Explain exploit case in changelog for stable - Add Fixes: lines v5: - Just put an smp_mb() between CLOSID/RMID stores and task_curr() calls - Add a diagram detailing the race to the changelog v4: - Reorder the patches so that justification for sending more IPIs can reference the patch fixing __rdtgroup_move_task(). - Correct tense of wording used in changelog and comments v3: - Split the handling of multi-task and single-task operations into separate patches, now that they're handled differently. - Clarify justification in the commit message, including moving some of it out of inline code comment. v2: - Following Reinette's suggestion: use task_call_func() for single task, IPI broadcast for group movements. - Rebased to v6.1-rc4 v1: https://lore.kernel.org/lkml/20221103141641.3055981-1-peternewman@google.co… v2: https://lore.kernel.org/lkml/20221110135346.2209839-1-peternewman@google.co… v3: https://lore.kernel.org/lkml/20221115141953.816851-1-peternewman@google.com/ v4: https://lore.kernel.org/lkml/20221129111055.953833-1-peternewman@google.com/ v5: https://lore.kernel.org/lkml/20221214114447.1935755-1-peternewman@google.co… --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index e5a48f05e787..5993da21d822 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -580,8 +580,10 @@ static int __rdtgroup_move_task(struct task_struct *tsk, /* * Ensure the task's closid and rmid are written before determining if * the task is current that will decide if it will be interrupted. + * This pairs with the full barrier between the rq->curr update and + * resctrl_sched_in() during context switch. */ - barrier(); + smp_mb(); /* * By now, the task's closid and rmid are set. If the task is current @@ -2401,6 +2403,14 @@ static void rdt_move_group_tasks(struct rdtgroup *from, struct rdtgroup *to, WRITE_ONCE(t->closid, to->closid); WRITE_ONCE(t->rmid, to->mon.rmid); + /* + * Order the closid/rmid stores above before the loads + * in task_curr(). This pairs with the full barrier + * between the rq->curr update and resctrl_sched_in() + * during context switch. + */ + smp_mb(); + /* * If the task is on a CPU, set the CPU in the mask. * The detection is inaccurate as tasks might move or base-commit: 830b3c68c1fb1e9176028d02ef86f3cf76aa2476 -- 2.39.0.314.g84b9a713c41-goog

2 years

1
1
0 0

[PATCH v9 01/10] imx: Fix typo

by Allen Webb

A one character difference in the name supplied to MODULE_DEVICE_TABLE breaks a future patch set, so fix the typo. Cc: stable(a)vger.kernel.org Fixes: 556f5cf9568a ("soc: imx: add i.MX8MP HSIO blk-ctrl") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Allen Webb <allenwebb(a)google.com> --- drivers/soc/imx/imx8mp-blk-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/imx/imx8mp-blk-ctrl.c b/drivers/soc/imx/imx8mp-blk-ctrl.c index 0e3b6ba22f94..344a0a71df14 100644 --- a/drivers/soc/imx/imx8mp-blk-ctrl.c +++ b/drivers/soc/imx/imx8mp-blk-ctrl.c @@ -743,7 +743,7 @@ static const struct of_device_id imx8mp_blk_ctrl_of_match[] = { /* Sentinel */ } }; -MODULE_DEVICE_TABLE(of, imx8m_blk_ctrl_of_match); +MODULE_DEVICE_TABLE(of, imx8mp_blk_ctrl_of_match); static struct platform_driver imx8mp_blk_ctrl_driver = { .probe = imx8mp_blk_ctrl_probe, -- 2.37.3

2 years

3
5
0 0

[PATCH] HID: wacom: Ensure bootloader PID is usable in hidraw mode

by Jason Gerecke

From: Jason Gerecke <killertofu(a)gmail.com> Some Wacom devices have a special "bootloader" mode that is used for firmware flashing. When operating in this mode, the device cannot be used for input, and the HID descriptor is not able to be processed by the driver. The driver generates an "Unknown device_type" warning and then returns an error code from wacom_probe(). This is a problem because userspace still needs to be able to interact with the device via hidraw to perform the firmware flash. This commit adds a non-generic device definition for 056a:0094 which is used when devices are in "bootloader" mode. It marks the devices with a special BOOTLOADER type that is recognized by wacom_probe() and wacom_raw_event(). When we see this type we ensure a hidraw device is created and otherwise keep our hands off so that userspace is in full control. Signed-off-by: Jason Gerecke <jason.gerecke(a)wacom.com> Tested-by: Tatsunosuke Tobita <tatsunosuke.tobita(a)wacom.com> Cc: <stable(a)vger.kernel.org> --- drivers/hid/wacom_sys.c | 8 ++++++++ drivers/hid/wacom_wac.c | 4 ++++ drivers/hid/wacom_wac.h | 1 + 3 files changed, 13 insertions(+) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 634263e4556b..fb538a6c4add 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -155,6 +155,9 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report, { struct wacom *wacom = hid_get_drvdata(hdev); + if (wacom->wacom_wac.features.type == BOOTLOADER) + return 0; + if (size > WACOM_PKGLEN_MAX) return 1; @@ -2785,6 +2788,11 @@ static int wacom_probe(struct hid_device *hdev, return error; } + if (features->type == BOOTLOADER) { + hid_warn(hdev, "Using device in hidraw-only mode"); + return hid_hw_start(hdev, HID_CONNECT_HIDRAW); + } + error = wacom_parse_and_register(wacom, false); if (error) return error; diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 0f3d57b42684..9312d611db8e 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -4882,6 +4882,9 @@ static const struct wacom_features wacom_features_0x3dd = static const struct wacom_features wacom_features_HID_ANY_ID = { "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID }; +static const struct wacom_features wacom_features_0x94 = + { "Wacom Bootloader", .type = BOOTLOADER }; + #define USB_DEVICE_WACOM(prod) \ HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ .driver_data = (kernel_ulong_t)&wacom_features_##prod @@ -4955,6 +4958,7 @@ const struct hid_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x84) }, { USB_DEVICE_WACOM(0x90) }, { USB_DEVICE_WACOM(0x93) }, + { USB_DEVICE_WACOM(0x94) }, { USB_DEVICE_WACOM(0x97) }, { USB_DEVICE_WACOM(0x9A) }, { USB_DEVICE_WACOM(0x9F) }, diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index 5ca6c06d143b..16f221388563 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -243,6 +243,7 @@ enum { MTTPC, MTTPC_B, HID_GENERIC, + BOOTLOADER, MAX_TYPE }; -- 2.38.1

2 years

2
2
0 0

commit b079d3775237 in 5.15.y

by Rasmus Villemoes

Hi, I think something went slightly wrong when 7c7f9bc98 (serial: Deassert Transmit Enable on probe in driver-specific way) got backported to 5.15.y. In fsl_lpuart.c, the original had this failed_irq_request: -failed_get_rs485: uart_remove_one_port(&lpuart_reg, &sport->port); failed_attach_port: +failed_get_rs485: failed_reset: lpuart_disable_clks(sport); return ret; in the error path, but that is missing in the backport. So if we now hit the 'goto failed_get_rs485;', we'll do uart_remove_one_port() while uart_add_one_port() hasn't been done. Rasmus

2 years

2
2
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2022