July 2022 - Linux-stable-mirror

[PATCH 5.15 0/3] can: kvaser_usb: CAN clock frequency regression

by Jimmy Assarsson

Backport of upstream patch series [1]. When fixing the CAN clock frequency, fb12797ab1fe ("can: kvaser_usb: get CAN clock frequency from device"), I introduced a regression. For Leaf devices based on M32C, the firmware expects bittiming parameters calculated for 16MHz clock. Regardless of the actual clock frequency. This regression affects M32C based Leaf devices with non-16MHz clock. Also correct the bittiming constants in kvaser_usb_leaf.c, where the limits are different depending on which firmware/device being used. [1] https://lore.kernel.org/linux-can/20220603083820.800246-1-extja@kvaser.com/ Jimmy Assarsson (3): can: kvaser_usb: replace run-time checks with struct kvaser_usb_driver_info can: kvaser_usb: kvaser_usb_leaf: fix CAN clock frequency regression can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 25 +- .../net/can/usb/kvaser_usb/kvaser_usb_core.c | 286 ++++++++++-------- .../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 4 +- .../net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 119 ++++---- 4 files changed, 244 insertions(+), 190 deletions(-) -- 2.36.1

2 years, 6 months

2
4
0 0

[PATCH] net: dsa: qca8k: reset cpu port on MTU change

by Christian Marangi

commit 386228c694bf1e7a7688e44412cb33500b0ac585 upstream. It was discovered that the Documentation lacks of a fundamental detail on how to correctly change the MAX_FRAME_SIZE of the switch. In fact if the MAX_FRAME_SIZE is changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required. To correctly handle this, turn off the cpu ports before changing the MAX_FRAME_SIZE and turn on again after the value is applied. Fixes: f58d2598cf70 ("net: dsa: qca8k: implement the port MTU callbacks") Cc: stable(a)vger.kernel.org Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> Link: https://lore.kernel.org/r/20220621151122.10220-1-ansuelsmth@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> [ backport: fix conflict using the old port_sts struct instead of bitmap ] --- drivers/net/dsa/qca8k.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index a984f06f6f04..67869c8cbeaa 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -1599,7 +1599,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; - int i, mtu = 0; + int ret, i, mtu = 0; priv->port_mtu[port] = new_mtu; @@ -1607,8 +1607,27 @@ qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) if (priv->port_mtu[i] > mtu) mtu = priv->port_mtu[i]; + /* To change the MAX_FRAME_SIZE the cpu ports must be off or + * the switch panics. + * Turn off both cpu ports before applying the new value to prevent + * this. + */ + if (priv->port_sts[0].enabled) + qca8k_port_set_status(priv, 0, 0); + + if (priv->port_sts[6].enabled) + qca8k_port_set_status(priv, 6, 0); + /* Include L2 header / FCS length */ - return qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN); + ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, mtu + ETH_HLEN + ETH_FCS_LEN); + + if (priv->port_sts[0].enabled) + qca8k_port_set_status(priv, 0, 1); + + if (priv->port_sts[6].enabled) + qca8k_port_set_status(priv, 6, 1); + + return ret; } static int -- 2.36.1

2 years, 6 months

2
2
0 0

[PATCH 1/2] security: introduce CONFIG_SECURITY_WRITABLE_HOOKS

by theflamefire89＠gmail.com

From: James Morris <jmorris(a)namei.org> commit dd0859dccbe291cf8179a96390f5c0e45cb9af1d upstream. Subsequent patches will add RO hardening to LSM hooks, however, SELinux still needs to be able to perform runtime disablement after init to handle architectures where init-time disablement via boot parameters is not feasible. Introduce a new kernel configuration parameter CONFIG_SECURITY_WRITABLE_HOOKS, and a helper macro __lsm_ro_after_init, to handle this case. Signed-off-by: James Morris <james.l.morris(a)oracle.com> Acked-by: Stephen Smalley <sds(a)tycho.nsa.gov> Acked-by: Casey Schaufler <casey(a)schaufler-ca.com> Acked-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Alexander Grund <git(a)grundis.de> --- include/linux/lsm_hooks.h | 7 +++++++ security/Kconfig | 5 +++++ security/selinux/Kconfig | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 53ac461f342b..65dfda2623c2 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -1921,6 +1921,13 @@ static inline void security_delete_hooks(struct security_hook_list *hooks, } #endif /* CONFIG_SECURITY_SELINUX_DISABLE */ +/* Currently required to handle SELinux runtime hook disable. */ +#ifdef CONFIG_SECURITY_WRITABLE_HOOKS +#define __lsm_ro_after_init +#else +#define __lsm_ro_after_init __ro_after_init +#endif /* CONFIG_SECURITY_WRITABLE_HOOKS */ + extern int __init security_module_enable(const char *module); extern void __init capability_add_hooks(void); #ifdef CONFIG_SECURITY_YAMA diff --git a/security/Kconfig b/security/Kconfig index 32f36b40e9f0..7d6edc5829a1 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -31,6 +31,11 @@ config SECURITY If you are unsure how to answer this question, answer N. +config SECURITY_WRITABLE_HOOKS + depends on SECURITY + bool + default n + config PAGE_TABLE_ISOLATION bool "Remove the kernel mapping in user mode" default y diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig index ea7e3efbe0f7..8af7a690eb40 100644 --- a/security/selinux/Kconfig +++ b/security/selinux/Kconfig @@ -40,6 +40,7 @@ config SECURITY_SELINUX_BOOTPARAM_VALUE config SECURITY_SELINUX_DISABLE bool "NSA SELinux runtime disable" depends on SECURITY_SELINUX + select SECURITY_WRITABLE_HOOKS default n help This option enables writing to a selinuxfs node 'disable', which @@ -50,6 +51,11 @@ config SECURITY_SELINUX_DISABLE portability across platforms where boot parameters are difficult to employ. + NOTE: selecting this option will disable the '__ro_after_init' + kernel hardening feature for security hooks. Please consider + using the selinux=0 boot parameter instead of enabling this + option. + If you are unsure how to answer this question, answer N. config SECURITY_SELINUX_DEVELOP -- 2.25.1

2 years, 6 months

3
5
0 0

[GIT 4.9] LSM,security,selinux,smack: Backport of LSM changes

by Alexander Grund

The following changes since commit 445514206988935e5ef0e80588d7481aa3cd3b7b: Linux 4.9.322 (2022-07-07 17:30:12 +0200) are available in the Git repository at: https://github.com/Flamefire/android_kernel_sony_msm8998.git lsm_hooks_backport_4.9 for you to fetch changes up to 911aa0e49633be52c7a2de8c99de87b6bf3a7604: LSM: Initialize security_hook_heads upon registration. (2022-07-09 12:51:42 +0200) All commits are cherry-picks/backports from mainline. The intend was to apply the last commit ("LSM: Initialize security_hook_heads upon registration.") with as few changes as possible. This revealed added/removed/changed hooks and related changes which seem valuable to have in 4.9 and via the CIP in 4.4 SLTS. For additional Context: I initially backported those directly to CIPs v4.4-st14 and tested those on an ARM64 Android device from SONY. [1] I'm open for breaking down the changes into smaller batches. If that is beneficial please advice on how/where to split this batch. But for now I thought it would be useful to see the full set of changes intended. References: - https://lore.kernel.org/all/1478812710-17190-2-git-send-email-agruenba@redh… - https://lkml.org/lkml/2016/6/24/564 - https://patchwork.kernel.org/project/linux-hardening/patch/alpine.LRH.2.20.… - https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2415740.html - https://lkml.org/lkml/2016/6/24/564 ---------------------------------------------------------------- Andreas Gruenbacher (4): proc: Pass file mode to proc_pid_make_inode selinux: Minor cleanups selinux: Clean up initialization of isec->sclass selinux: Convert isec->lock into a spinlock Casey Schaufler (1): LSM: Add /sys/kernel/security/lsm James Morris (2): security: introduce CONFIG_SECURITY_WRITABLE_HOOKS security: mark LSM hooks as __ro_after_init Ondrej Mosnacek (1): selinux: drop super_block backpointer from superblock_security_struct Paul Moore (2): selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling lsm,selinux: pass flowi_common instead of flowi to the LSM hooks Stephen Smalley (2): prlimit,security,selinux: add a security hook for prlimit security,selinux,smack: kill security_task_wait hook Tetsuo Handa (1): LSM: Initialize security_hook_heads upon registration. Tianyue Ren (1): selinux: fix error initialization in inode_doinit_with_dentry() bauen1 (1): selinux: allow dontauditx and auditallowx rules to take effect without allowx Documentation/security/LSM.txt | 7 ++ fs/proc/base.c | 23 ++-- fs/proc/fd.c | 6 +- fs/proc/internal.h | 2 +- fs/proc/namespaces.c | 3 +- include/linux/lsm_hooks.h | 50 +++++---- include/linux/security.h | 42 +++++--- include/net/flow.h | 10 ++ include/net/route.h | 6 +- kernel/exit.c | 19 +--- kernel/sys.c | 30 +++--- net/dccp/ipv4.c | 2 +- net/dccp/ipv6.c | 6 +- net/ipv4/icmp.c | 4 +- net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/ip_output.c | 2 +- net/ipv4/ping.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/syncookies.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/af_inet6.c | 2 +- net/ipv6/icmp.c | 6 +- net/ipv6/inet6_connection_sock.c | 4 +- net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 +- net/ipv6/netfilter/nf_reject_ipv6.c | 2 +- net/ipv6/ping.c | 2 +- net/ipv6/raw.c | 2 +- net/ipv6/syncookies.c | 2 +- net/ipv6/tcp_ipv6.c | 4 +- net/ipv6/udp.c | 2 +- net/l2tp/l2tp_ip6.c | 2 +- net/xfrm/xfrm_state.c | 6 +- security/Kconfig | 5 + security/apparmor/lsm.c | 5 +- security/commoncap.c | 5 +- security/inode.c | 26 ++++- security/security.c | 426 +++++++++++--------------------------------------------------------------- security/selinux/Kconfig | 6 ++ security/selinux/hooks.c | 156 +++++++++++++++++---------- security/selinux/include/classmap.h | 2 +- security/selinux/include/objsec.h | 6 +- security/selinux/include/xfrm.h | 2 +- security/selinux/selinuxfs.c | 4 +- security/selinux/ss/services.c | 4 +- security/selinux/xfrm.c | 8 +- security/smack/smack_lsm.c | 24 +---- security/tomoyo/tomoyo.c | 4 +- security/yama/yama_lsm.c | 4 +- 48 files changed, 359 insertions(+), 588 deletions(-)

2 years, 6 months

2
7
0 0

My name is Mrs. Aisha gaddafi

by AISHA GADDAFI

My name is Mrs. Aisha gaddafi May i use this medium to open a mutual communication with you, and seeking your acceptance towards investing in your country under your management as my partner, My name is Aisha Gaddafi and presently living in Oman, i am a Widow and single Mother with three Children, the only biological Daughter of late Libyan President (Late Colonel Muammar Gaddafi) and presently i am under political asylum protection by the Omani Government. I have funds worth “Twenty Seven Million Five Hundred Thousand United State Dollars” -$27.500.000.00 US Dollars which i want to entrust on you for investment project in your country. If you are willing to handle this project on my behalf, i wait for your responds

2 years, 6 months

1
0
0 0

Urgent Call to Rescue

by Robert Avtandilyan.

-- Hello, Greetings from Moscow - Russia. I got your contact from the internet, though I didn't keep record of the exact website on the internet since I'm not sure if you would be interested in the deal. I closed my Oil & Gas deal in Russia because of US, EU & NATO Members Sanctions on Russia from making wire transfer to all over Europe, America and Asia due to Russia military invasion on Ukraine. But before the sanction i have pulled my money $125, 500, 000. 00 USD from my bank accounts in Russia and i want you to help me and receive the money cash in suitcases for safe keeping place / account for investment. Please the earlier the better. You are entitled to 10% of the total sum for your help, and another 15% of profit accruing from profit on investments as your share benefits. I look forward to your reply for further details ASAP. Yours truly, Robert Avtandilyan.

2 years, 6 months

1
0
0 0

stable-rc/queue/4.9 baseline: 104 runs, 19 regressions (v4.9.322-5-g657e02f59a91)

by kernelci.org bot

stable-rc/queue/4.9 baseline: 104 runs, 19 regressions (v4.9.322-5-g657e02f59a91) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ at91sam9g20ek | arm | lab-broonie | gcc-10 | at91_dt_defconfig | 1 jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 jetson-tk1 | arm | lab-baylibre | gcc-10 | tegra_defconfig | 1 qemu_arm64-virt-gicv2 | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv2 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 qemu_arm64-virt-gicv2 | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv2 | arm64 | lab-broonie | gcc-10 | defconfig | 1 qemu_arm64-virt-gicv2-uefi | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv2-uefi | arm64 | lab-baylibre | gcc-10 | defconfig | 1 qemu_arm64-virt-gicv2-uefi | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv2-uefi | arm64 | lab-broonie | gcc-10 | defconfig | 1 qemu_arm64-virt-gicv3 | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv3 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 qemu_arm64-virt-gicv3 | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv3 | arm64 | lab-broonie | gcc-10 | defconfig | 1 qemu_arm64-virt-gicv3-uefi | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv3-uefi | arm64 | lab-baylibre | gcc-10 | defconfig | 1 qemu_arm64-virt-gicv3-uefi | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 qemu_arm64-virt-gicv3-uefi | arm64 | lab-broonie | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/queue%2F4.9/kernel/v4.9.322-… Test: baseline Tree: stable-rc Branch: queue/4.9 Describe: v4.9.322-5-g657e02f59a91 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 657e02f59a912cb27418200cee297f047e3f20a4 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ at91sam9g20ek | arm | lab-broonie | gcc-10 | at91_dt_defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90641430cce18c5a39bd6 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: at91_dt_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90641430cce18c5a39bd7 new failure (last pass: v4.9.322-5-g292a71a8b92b) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90c7d09ed4765bea39c3a Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90c7d09ed4765bea39c3b failing since 46 days (last pass: v4.9.313-7-gbabb34651fcb2, first fail: v4.9.315-25-gebb662d6916b) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ jetson-tk1 | arm | lab-baylibre | gcc-10 | tegra_defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90b2bbe2151f96ea39bcd Results: 0 PASS, 1 FAIL, 0 SKIP Full config: tegra_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90b2bbe2151f96ea39bce failing since 46 days (last pass: v4.9.313-7-gbabb34651fcb2, first fail: v4.9.315-25-gebb662d6916b) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2 | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c90910dbe6e8078fa39bdf Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90910dbe6e8078fa39be0 failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90aa048dcd73cdda39bfb Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90aa048dcd73cdda39bfc failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2 | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c90a86cc76df75eba39bcd Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90a86cc76df75eba39bce failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2 | arm64 | lab-broonie | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90bee063d1febc3a39bfa Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90bee063d1febc3a39bfb failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2-uefi | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c9090edbe6e8078fa39bd9 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c9090edbe6e8078fa39bda failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2-uefi | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90a8948dcd73cdda39bd1 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90a8948dcd73cdda39bd2 failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2-uefi | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c90920a4b33340f2a39bec Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90920a4b33340f2a39bed failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv2-uefi | arm64 | lab-broonie | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90a8748dcd73cdda39bce Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90a8748dcd73cdda39bcf failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3 | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c9090da4b33340f2a39bd2 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c9090da4b33340f2a39bd3 failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3 | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90a9f48dcd73cdda39bf8 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90a9f48dcd73cdda39bf9 failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3 | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c9091fa4b33340f2a39be9 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c9091fa4b33340f2a39bea failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3 | arm64 | lab-broonie | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90b4eb187404085a39c40 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90b4eb187404085a39c41 failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3-uefi | arm64 | lab-baylibre | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c9090fa4b33340f2a39bd8 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c9090fa4b33340f2a39bd9 failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3-uefi | arm64 | lab-baylibre | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90a9d48dcd73cdda39bee Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90a9d48dcd73cdda39bef failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3-uefi | arm64 | lab-broonie | gcc-10 | defconfig+arm64-chromebook | 1 Details: https://kernelci.org/test/plan/id/62c909e621bcbf77f9a39c16 Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig+arm64-chromebook Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c909e621bcbf77f9a39c17 failing since 59 days (last pass: v4.9.312-43-g8ccd2ae24f47, first fail: v4.9.312-64-g69b9f3e8fce2) platform | arch | lab | compiler | defconfig | regressions ---------------------------+-------+--------------+----------+----------------------------+------------ qemu_arm64-virt-gicv3-uefi | arm64 | lab-broonie | gcc-10 | defconfig | 1 Details: https://kernelci.org/test/plan/id/62c90ad62193b96163a39bfb Results: 0 PASS, 1 FAIL, 0 SKIP Full config: defconfig Compiler: gcc-10 (aarch64-linux-gnu-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… HTML log: https://storage.kernelci.org//stable-rc/queue-4.9/v4.9.322-5-g657e02f59a91/… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2022… * baseline.login: https://kernelci.org/test/case/id/62c90ad62193b96163a39bfc failing since 59 days (last pass: v4.9.312-43-g5b8113699dd5, first fail: v4.9.312-64-g69b9f3e8fce2)

2 years, 6 months

1
0
0 0

FAILED: patch "[PATCH] ACPI: CPPC: Only probe for _CPC if CPPC v2 is acked" failed to apply to 5.15-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.15-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>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7feec7430edddb87c24b0a86b08a03d0b496a755 Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello(a)amd.com> Date: Tue, 5 Jul 2022 13:29:14 -0500 Subject: [PATCH] ACPI: CPPC: Only probe for _CPC if CPPC v2 is acked Previously the kernel used to ignore whether the firmware masked CPPC or CPPCv2 and would just pretend that it worked. When support for the USB4 bit in _OSC was introduced from commit 9e1f561afb ("ACPI: Execute platform _OSC also with query bit clear") the kernel began to look at the return when the query bit was clear. This caused regressions that were misdiagnosed and attempted to be solved as part of commit 2ca8e6285250 ("Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag""). This caused a different regression where non-Intel systems weren't able to negotiate _OSC properly. This was reverted in commit 2ca8e6285250 ("Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag"") and attempted to be fixed by commit c42fa24b4475 ("ACPI: bus: Avoid using CPPC if not supported by firmware") but the regression still returned. These systems with the regression only load support for CPPC from an SSDT dynamically when _OSC reports CPPC v2. Avoid the problem by not letting CPPC satisfy the requirement in `acpi_cppc_processor_probe`. Reported-by: CUI Hao <cuihao.leo(a)gmail.com> Reported-by: maxim.novozhilov(a)gmail.com Reported-by: lethe.tree(a)protonmail.com Reported-by: garystephenwright(a)gmail.com Reported-by: galaxyking0419(a)gmail.com Fixes: c42fa24b4475 ("ACPI: bus: Avoid using CPPC if not supported by firmware") Fixes: 2ca8e6285250 ("Revert "ACPI Pass the same capabilities to the _OSC regardless of the query flag"") Link: https://bugzilla.kernel.org/show_bug.cgi?id=213023 Link: https://bugzilla.redhat.com/show_bug.cgi?id=2075387 Reviewed-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Tested-by: CUI Hao <cuihao.leo(a)gmail.com> Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 86fa61a21826..e2db1bdd9dd2 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -298,7 +298,7 @@ EXPORT_SYMBOL_GPL(osc_cpc_flexible_adr_space_confirmed); bool osc_sb_native_usb4_support_confirmed; EXPORT_SYMBOL_GPL(osc_sb_native_usb4_support_confirmed); -bool osc_sb_cppc_not_supported; +bool osc_sb_cppc2_support_acked; static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48"; static void acpi_bus_osc_negotiate_platform_control(void) @@ -358,11 +358,6 @@ static void acpi_bus_osc_negotiate_platform_control(void) return; } -#ifdef CONFIG_ACPI_CPPC_LIB - osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD] & - (OSC_SB_CPC_SUPPORT | OSC_SB_CPCV2_SUPPORT)); -#endif - /* * Now run _OSC again with query flag clear and with the caps * supported by both the OS and the platform. @@ -376,6 +371,10 @@ static void acpi_bus_osc_negotiate_platform_control(void) capbuf_ret = context.ret.pointer; if (context.ret.length > OSC_SUPPORT_DWORD) { +#ifdef CONFIG_ACPI_CPPC_LIB + osc_sb_cppc2_support_acked = capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_CPCV2_SUPPORT; +#endif + osc_sb_apei_support_acked = capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT; osc_pc_lpi_support_confirmed = diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 903528f7e187..d64facbda0fb 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -684,8 +684,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) acpi_status status; int ret = -ENODATA; - if (osc_sb_cppc_not_supported) + if (!osc_sb_cppc2_support_acked) { + pr_debug("CPPC v2 _OSC not acked\n"); return -ENODEV; + } /* Parse the ACPI _CPC table for this CPU. */ status = acpi_evaluate_object_typed(handle, "_CPC", NULL, &output, diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4f82a5bc6d98..44975c1bbe12 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -584,7 +584,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); extern bool osc_sb_apei_support_acked; extern bool osc_pc_lpi_support_confirmed; extern bool osc_sb_native_usb4_support_confirmed; -extern bool osc_sb_cppc_not_supported; +extern bool osc_sb_cppc2_support_acked; extern bool osc_cpc_flexible_adr_space_confirmed; /* USB4 Capabilities */

2 years, 6 months

1
0
0 0

FAILED: patch "[PATCH] ACPI: CPPC: Only probe for _CPC if CPPC v2 is acked" failed to apply to 5.18-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.18-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>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 7feec7430edddb87c24b0a86b08a03d0b496a755 Mon Sep 17 00:00:00 2001 From: Mario Limonciello <mario.limonciello(a)amd.com> Date: Tue, 5 Jul 2022 13:29:14 -0500 Subject: [PATCH] ACPI: CPPC: Only probe for _CPC if CPPC v2 is acked Previously the kernel used to ignore whether the firmware masked CPPC or CPPCv2 and would just pretend that it worked. When support for the USB4 bit in _OSC was introduced from commit 9e1f561afb ("ACPI: Execute platform _OSC also with query bit clear") the kernel began to look at the return when the query bit was clear. This caused regressions that were misdiagnosed and attempted to be solved as part of commit 2ca8e6285250 ("Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag""). This caused a different regression where non-Intel systems weren't able to negotiate _OSC properly. This was reverted in commit 2ca8e6285250 ("Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag"") and attempted to be fixed by commit c42fa24b4475 ("ACPI: bus: Avoid using CPPC if not supported by firmware") but the regression still returned. These systems with the regression only load support for CPPC from an SSDT dynamically when _OSC reports CPPC v2. Avoid the problem by not letting CPPC satisfy the requirement in `acpi_cppc_processor_probe`. Reported-by: CUI Hao <cuihao.leo(a)gmail.com> Reported-by: maxim.novozhilov(a)gmail.com Reported-by: lethe.tree(a)protonmail.com Reported-by: garystephenwright(a)gmail.com Reported-by: galaxyking0419(a)gmail.com Fixes: c42fa24b4475 ("ACPI: bus: Avoid using CPPC if not supported by firmware") Fixes: 2ca8e6285250 ("Revert "ACPI Pass the same capabilities to the _OSC regardless of the query flag"") Link: https://bugzilla.kernel.org/show_bug.cgi?id=213023 Link: https://bugzilla.redhat.com/show_bug.cgi?id=2075387 Reviewed-by: Mika Westerberg <mika.westerberg(a)linux.intel.com> Tested-by: CUI Hao <cuihao.leo(a)gmail.com> Signed-off-by: Mario Limonciello <mario.limonciello(a)amd.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 86fa61a21826..e2db1bdd9dd2 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -298,7 +298,7 @@ EXPORT_SYMBOL_GPL(osc_cpc_flexible_adr_space_confirmed); bool osc_sb_native_usb4_support_confirmed; EXPORT_SYMBOL_GPL(osc_sb_native_usb4_support_confirmed); -bool osc_sb_cppc_not_supported; +bool osc_sb_cppc2_support_acked; static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48"; static void acpi_bus_osc_negotiate_platform_control(void) @@ -358,11 +358,6 @@ static void acpi_bus_osc_negotiate_platform_control(void) return; } -#ifdef CONFIG_ACPI_CPPC_LIB - osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD] & - (OSC_SB_CPC_SUPPORT | OSC_SB_CPCV2_SUPPORT)); -#endif - /* * Now run _OSC again with query flag clear and with the caps * supported by both the OS and the platform. @@ -376,6 +371,10 @@ static void acpi_bus_osc_negotiate_platform_control(void) capbuf_ret = context.ret.pointer; if (context.ret.length > OSC_SUPPORT_DWORD) { +#ifdef CONFIG_ACPI_CPPC_LIB + osc_sb_cppc2_support_acked = capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_CPCV2_SUPPORT; +#endif + osc_sb_apei_support_acked = capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT; osc_pc_lpi_support_confirmed = diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 903528f7e187..d64facbda0fb 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -684,8 +684,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) acpi_status status; int ret = -ENODATA; - if (osc_sb_cppc_not_supported) + if (!osc_sb_cppc2_support_acked) { + pr_debug("CPPC v2 _OSC not acked\n"); return -ENODEV; + } /* Parse the ACPI _CPC table for this CPU. */ status = acpi_evaluate_object_typed(handle, "_CPC", NULL, &output, diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4f82a5bc6d98..44975c1bbe12 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -584,7 +584,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); extern bool osc_sb_apei_support_acked; extern bool osc_pc_lpi_support_confirmed; extern bool osc_sb_native_usb4_support_confirmed; -extern bool osc_sb_cppc_not_supported; +extern bool osc_sb_cppc2_support_acked; extern bool osc_cpc_flexible_adr_space_confirmed; /* USB4 Capabilities */

2 years, 6 months

1
0
0 0

FAILED: patch "[PATCH] PM: runtime: Fix supplier device management during consumer" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-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>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 887371066039011144b4a94af97d9328df6869a2 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com> Date: Thu, 30 Jun 2022 21:16:41 +0200 Subject: [PATCH] PM: runtime: Fix supplier device management during consumer probe Because pm_runtime_get_suppliers() bumps up the rpm_active counter of each device link to a supplier of the given device in addition to bumping up the supplier's PM-runtime usage counter, a runtime suspend of the consumer device may case the latter to go down to 0 when pm_runtime_put_suppliers() is running on a remote CPU. If that happens after pm_runtime_put_suppliers() has released power.lock for the consumer device, and a runtime resume of that device takes place immediately after it, before pm_runtime_put() is called for the supplier, that pm_runtime_put() call may cause the supplier to be suspended even though the consumer is active. To prevent that from happening, modify pm_runtime_get_suppliers() to call pm_runtime_get_sync() for the given device's suppliers without touching the rpm_active counters of the involved device links Accordingly, modify pm_runtime_put_suppliers() to call pm_runtime_put() for the given device's suppliers without looking at the rpm_active counters of the device links at hand. [This is analogous to what happened before commit 4c06c4e6cf63 ("driver core: Fix possible supplier PM-usage counter imbalance").] Since pm_runtime_get_suppliers() sets supplier_preactivated for each device link where the supplier's PM-runtime usage counter has been incremented and pm_runtime_put_suppliers() calls pm_runtime_put() for the suppliers whose device links have supplier_preactivated set, the PM-runtime usage counter is balanced for each supplier and this is independent of the runtime suspend and resume of the consumer device. However, in case a device link with DL_FLAG_PM_RUNTIME set is dropped during the consumer device probe, so pm_runtime_get_suppliers() bumps up the supplier's PM-runtime usage counter, but it cannot be dropped by pm_runtime_put_suppliers(), make device_link_release_fn() take care of that. Fixes: 4c06c4e6cf63 ("driver core: Fix possible supplier PM-usage counter imbalance") Reported-by: Peter Wang <peter.wang(a)mediatek.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Reviewed-by: Peter Wang <peter.wang(a)mediatek.com> Cc: 5.1+ <stable(a)vger.kernel.org> # 5.1+ diff --git a/drivers/base/core.c b/drivers/base/core.c index 58aa49527d3a..460d6f163e41 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -487,6 +487,16 @@ static void device_link_release_fn(struct work_struct *work) device_link_synchronize_removal(); pm_runtime_release_supplier(link); + /* + * If supplier_preactivated is set, the link has been dropped between + * the pm_runtime_get_suppliers() and pm_runtime_put_suppliers() calls + * in __driver_probe_device(). In that case, drop the supplier's + * PM-runtime usage counter to remove the reference taken by + * pm_runtime_get_suppliers(). + */ + if (link->supplier_preactivated) + pm_runtime_put_noidle(link->supplier); + pm_request_idle(link->supplier); put_device(link->consumer); diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 23cc4c377d77..949907e2e242 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1768,7 +1768,6 @@ void pm_runtime_get_suppliers(struct device *dev) if (link->flags & DL_FLAG_PM_RUNTIME) { link->supplier_preactivated = true; pm_runtime_get_sync(link->supplier); - refcount_inc(&link->rpm_active); } device_links_read_unlock(idx); @@ -1788,19 +1787,8 @@ void pm_runtime_put_suppliers(struct device *dev) list_for_each_entry_rcu(link, &dev->links.suppliers, c_node, device_links_read_lock_held()) if (link->supplier_preactivated) { - bool put; - link->supplier_preactivated = false; - - spin_lock_irq(&dev->power.lock); - - put = pm_runtime_status_suspended(dev) && - refcount_dec_not_one(&link->rpm_active); - - spin_unlock_irq(&dev->power.lock); - - if (put) - pm_runtime_put(link->supplier); + pm_runtime_put(link->supplier); } device_links_read_unlock(idx);

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2022