From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2A80ECAAD8 for ; Fri, 16 Sep 2022 10:18:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230272AbiIPKSX (ORCPT ); Fri, 16 Sep 2022 06:18:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231542AbiIPKRI (ORCPT ); Fri, 16 Sep 2022 06:17:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8635AAF482; Fri, 16 Sep 2022 03:12:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CE3E0B8253F; Fri, 16 Sep 2022 10:11:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19B2BC433D6; Fri, 16 Sep 2022 10:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323083; bh=gN+TChiF6PLFreSWeA3c6I1/So0dZbAUn8vkHPJ6KfQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jf+6zINhEvN7Qna/U1GpQiZfs59KiT286sLC8COvS6TwrO/nkfQJqlYfqBIQMuAnK rcNd2fPcBS/xzAAX2i3mC/kl1wilos3MHj9gPVMhvEoPiF51duxzlzKwRjlJ4qJOmg 4aGUWktZc8ESmk6FmM9WA+kqJL9tCw7EuQCo/96E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Wysochanski , Trond Myklebust Subject: [PATCH 5.15 01/35] NFS: Fix WARN_ON due to unionization of nfs_inode.nrequests Date: Fri, 16 Sep 2022 12:08:24 +0200 Message-Id: <20220916100446.997792525@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Dave Wysochanski commit 0ebeebcf59601bcfa0284f4bb7abdec051eb856d upstream. Fixes the following WARN_ON WARNING: CPU: 2 PID: 18678 at fs/nfs/inode.c:123 nfs_clear_inode+0x3b/0x50 = [nfs] ... Call Trace: nfs4_evict_inode+0x57/0x70 [nfsv4] evict+0xd1/0x180 dispose_list+0x48/0x60 evict_inodes+0x156/0x190 generic_shutdown_super+0x37/0x110 nfs_kill_super+0x1d/0x40 [nfs] deactivate_locked_super+0x36/0xa0 Signed-off-by: Dave Wysochanski Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- include/linux/nfs_fs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -593,7 +593,9 @@ bool nfs_commit_end(struct nfs_mds_commi static inline int nfs_have_writebacks(struct inode *inode) { - return atomic_long_read(&NFS_I(inode)->nrequests) !=3D 0; + if (S_ISREG(inode->i_mode)) + return atomic_long_read(&NFS_I(inode)->nrequests) !=3D 0; + return 0; } =20 /* From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 268A0C54EE9 for ; Fri, 16 Sep 2022 10:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231726AbiIPKUd (ORCPT ); Fri, 16 Sep 2022 06:20:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231765AbiIPKSo (ORCPT ); Fri, 16 Sep 2022 06:18:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0204DAF498; Fri, 16 Sep 2022 03:12:33 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5B013B82539; Fri, 16 Sep 2022 10:11:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A56FFC433D6; Fri, 16 Sep 2022 10:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323114; bh=lRrjMYNEhc4hIHbSe8kC+g2BSPOxlDMtXBXG3XUb/uA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fVd403p7jK8Q9QET7uRQ7uUPJx2wZLDNjPBhux69tr75X/qQe7inXhjys/GbfOhZN vI5orem4nCabjIVF4USxgkbsUYRu4P9WLxVVgTSvNBEH2AkXIj/nOc5LidTqGZsopl vT+rA+yRxANPYUYaLZY1hURRnS7JQf0Zx0oi7pCs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mario Limonciello , Chuanhong Guo , XiaoYan Li , "Rafael J. Wysocki" Subject: [PATCH 5.15 02/35] ACPI: resource: skip IRQ override on AMD Zen platforms Date: Fri, 16 Sep 2022 12:08:25 +0200 Message-Id: <20220916100447.037928911@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chuanhong Guo commit 9946e39fe8d0a5da9eb947d8e40a7ef204ba016e upstream. IRQ override isn't needed on modern AMD Zen systems. There's an active low keyboard IRQ on AMD Ryzen 6000 and it will stay this way on newer platforms. This IRQ override breaks keyboards for almost all Ryzen 6000 laptops currently on the market. Skip this IRQ override for all AMD Zen platforms because this IRQ override is supposed to be a workaround for buggy ACPI DSDT and we can't have a long list of all future AMD CPUs/Laptops in the kernel code. If a device with buggy ACPI DSDT shows up, a separated list containing just them should be created. Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D216118 Suggested-by: Mario Limonciello Signed-off-by: Chuanhong Guo Acked-by: Mario Limonciello Tested-by: XiaoYan Li Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/acpi/resource.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -416,6 +416,16 @@ static bool acpi_dev_irq_override(u32 gs { int i; =20 +#ifdef CONFIG_X86 + /* + * IRQ override isn't needed on modern AMD Zen systems and + * this override breaks active low IRQs on AMD Ryzen 6000 and + * newer systems. Skip it. + */ + if (boot_cpu_has(X86_FEATURE_ZEN)) + return false; +#endif + for (i =3D 0; i < ARRAY_SIZE(skip_override_table); i++) { const struct irq_override_cmp *entry =3D &skip_override_table[i]; From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E1CBC54EE9 for ; Fri, 16 Sep 2022 10:19:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231464AbiIPKTs (ORCPT ); Fri, 16 Sep 2022 06:19:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231540AbiIPKR7 (ORCPT ); Fri, 16 Sep 2022 06:17:59 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86D8EAF4BC; Fri, 16 Sep 2022 03:12:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 95FD6B82549; Fri, 16 Sep 2022 10:11:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF9B6C433C1; Fri, 16 Sep 2022 10:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323117; bh=BdWoA8ZFojBjOxpJATXbIL+4X+xDWOomOVbhhuWZ4Wg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LpictGM0mJOHrwgERRQSLLXXGA+Z7ZVjasCpg2brtTifxmC3q4mv2Op1vTXMYj456 GOC0UMdHVUE2PS3BGHQKhGwtyZEApJR+sjASPEG4IpziQ0anE/sMIj9uKF6ISME5kZ rRL8LxPOSba5nc7y6+Rp0cCOUfoMqZUsQW7fgTcw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Kozlowski , Shawn Guo , Sasha Levin Subject: [PATCH 5.15 03/35] ARM: dts: imx: align SPI NOR node name with dtschema Date: Fri, 16 Sep 2022 12:08:26 +0200 Message-Id: <20220916100447.079001545@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Krzysztof Kozlowski [ Upstream commit ba9fe460dc2cfe90dc115b22af14dd3f13cffa0f ] The node names should be generic and SPI NOR dtschema expects "flash". Signed-off-by: Krzysztof Kozlowski Signed-off-by: Shawn Guo Stable-dep-of: af7d78c95701 ("ARM: dts: imx6qdl-kontron-samx6i: fix spi-fla= sh compatible") Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- arch/arm/boot/dts/imx28-evk.dts | 2 +- arch/arm/boot/dts/imx28-m28evk.dts | 2 +- arch/arm/boot/dts/imx28-sps1.dts | 2 +- arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 2 +- arch/arm/boot/dts/imx6q-cm-fx6.dts | 2 +- arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- arch/arm/boot/dts/imx6q-dms-ba16.dts | 2 +- arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- arch/arm/boot/dts/imx6q-marsboard.dts | 2 +- arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- arch/arm/boot/dts/imx6sl-evk.dts | 2 +- arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 ++-- arch/arm/boot/dts/imx6sx-sdb.dts | 4 ++-- arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 +- arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi | 2 +- arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi | 2 +- arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 2 +- arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi | 2 +- 32 files changed, 34 insertions(+), 34 deletions(-) diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.= dts index 7e2b0f198dfad..1053b7c584d81 100644 --- a/arch/arm/boot/dts/imx28-evk.dts +++ b/arch/arm/boot/dts/imx28-evk.dts @@ -129,7 +129,7 @@ pinctrl-0 =3D <&spi2_pins_a>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "sst,sst25vf016b", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m= 28evk.dts index f3bddc5ada4b8..13acdc7916b9b 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts @@ -33,7 +33,7 @@ pinctrl-0 =3D <&spi2_pins_a>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "m25p80", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps= 1.dts index 43be7a6a769bc..90928db0df701 100644 --- a/arch/arm/boot/dts/imx28-sps1.dts +++ b/arch/arm/boot/dts/imx28-sps1.dts @@ -51,7 +51,7 @@ pinctrl-0 =3D <&spi2_pins_a>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "everspin,mr25h256", "mr25h256"; diff --git a/arch/arm/boot/dts/imx6dl-rex-basic.dts b/arch/arm/boot/dts/imx= 6dl-rex-basic.dts index 0f1616bfa9a80..b72f8ea1e6f6c 100644 --- a/arch/arm/boot/dts/imx6dl-rex-basic.dts +++ b/arch/arm/boot/dts/imx6dl-rex-basic.dts @@ -19,7 +19,7 @@ }; =20 &ecspi3 { - flash: m25p80@0 { + flash: flash@0 { compatible =3D "sst,sst25vf016b", "jedec,spi-nor"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6q-ba16.dtsi b/arch/arm/boot/dts/imx6q-ba= 16.dtsi index 6330d75f8f390..f266f1b7e0cfc 100644 --- a/arch/arm/boot/dts/imx6q-ba16.dtsi +++ b/arch/arm/boot/dts/imx6q-ba16.dtsi @@ -142,7 +142,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: n25q032@0 { + flash: flash@0 { compatible =3D "jedec,spi-nor"; #address-cells =3D <1>; #size-cells =3D <1>; diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-= bx50v3.dtsi index 10922375c51e1..ead83091e193a 100644 --- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi +++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi @@ -160,7 +160,7 @@ pinctrl-0 =3D <&pinctrl_ecspi5>; status =3D "okay"; =20 - m25_eeprom: m25p80@0 { + m25_eeprom: flash@0 { compatible =3D "atmel,at25"; spi-max-frequency =3D <10000000>; size =3D <0x8000>; diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-c= m-fx6.dts index bfb530f29d9de..1ad41c944b4b9 100644 --- a/arch/arm/boot/dts/imx6q-cm-fx6.dts +++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts @@ -260,7 +260,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - m25p80@0 { + flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "st,m25p", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/im= x6q-dmo-edmqmx6.dts index c713ac03b3b92..9591848cbd37c 100644 --- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts @@ -102,7 +102,7 @@ cs-gpios =3D <&gpio1 12 GPIO_ACTIVE_LOW>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "m25p80", "jedec,spi-nor"; spi-max-frequency =3D <40000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6q-dms-ba16.dts b/arch/arm/boot/dts/imx6q= -dms-ba16.dts index 48fb47e715f6d..137db38f0d27b 100644 --- a/arch/arm/boot/dts/imx6q-dms-ba16.dts +++ b/arch/arm/boot/dts/imx6q-dms-ba16.dts @@ -47,7 +47,7 @@ pinctrl-0 =3D <&pinctrl_ecspi5>; status =3D "okay"; =20 - m25_eeprom: m25p80@0 { + m25_eeprom: flash@0 { compatible =3D "atmel,at25256B", "atmel,at25"; spi-max-frequency =3D <20000000>; size =3D <0x8000>; diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q= -gw5400-a.dts index 4cde45d5c90c8..e894faba571f9 100644 --- a/arch/arm/boot/dts/imx6q-gw5400-a.dts +++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts @@ -137,7 +137,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "sst,w25q256", "jedec,spi-nor"; spi-max-frequency =3D <30000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6= q-marsboard.dts index 05ee283882290..cc18010023942 100644 --- a/arch/arm/boot/dts/imx6q-marsboard.dts +++ b/arch/arm/boot/dts/imx6q-marsboard.dts @@ -100,7 +100,7 @@ cs-gpios =3D <&gpio2 30 GPIO_ACTIVE_LOW>; status =3D "okay"; =20 - m25p80@0 { + flash@0 { compatible =3D "microchip,sst25vf016b"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6q-rex-pro.dts b/arch/arm/boot/dts/imx6q-= rex-pro.dts index 1767e1a3cd53a..271f4b2d9b9f0 100644 --- a/arch/arm/boot/dts/imx6q-rex-pro.dts +++ b/arch/arm/boot/dts/imx6q-rex-pro.dts @@ -19,7 +19,7 @@ }; =20 &ecspi3 { - flash: m25p80@0 { + flash: flash@0 { compatible =3D "sst,sst25vf032b", "jedec,spi-nor"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi b/arch/arm/boot/dt= s/imx6qdl-aristainetos.dtsi index e21f6ac864e54..baa197c90060e 100644 --- a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi +++ b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi @@ -96,7 +96,7 @@ pinctrl-0 =3D <&pinctrl_ecspi4>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "micron,n25q128a11", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi b/arch/arm/boot/d= ts/imx6qdl-aristainetos2.dtsi index 563bf9d44fe0d..2ba577e602e7f 100644 --- a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi @@ -131,7 +131,7 @@ pinctrl-0 =3D <&pinctrl_ecspi4>; status =3D "okay"; =20 - flash: m25p80@1 { + flash: flash@1 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "micron,n25q128a11", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi b/arch/arm/boot/d= ts/imx6qdl-dfi-fs700-m60.dtsi index 648f5fcb72e65..2c1d6f28e6950 100644 --- a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi +++ b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi @@ -35,7 +35,7 @@ pinctrl-0 =3D <&pinctrl_ecspi3>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "sst,sst25vf040b", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/= dts/imx6qdl-kontron-samx6i.dtsi index 9a3e5f7827152..f159c58b9edba 100644 --- a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi @@ -248,7 +248,7 @@ status =3D "okay"; =20 /* default boot source: workaround #1 for errata ERR006282 */ - smarc_flash: spi-flash@0 { + smarc_flash: flash@0 { compatible =3D "winbond,w25q16dw", "jedec,spi-nor"; reg =3D <0>; spi-max-frequency =3D <20000000>; diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/i= mx6qdl-nit6xlite.dtsi index ac34709e97413..0ad4cb4f1e828 100644 --- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi @@ -179,7 +179,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "microchip,sst25vf016b"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/d= ts/imx6qdl-nitrogen6_max.dtsi index c96f4d7e1e0d8..beaa2dcd436ce 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi @@ -321,7 +321,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "microchip,sst25vf016b"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/= dts/imx6qdl-nitrogen6_som2.dtsi index 92d09a3ebe0ee..ee7e2371f94bd 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi @@ -252,7 +252,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "microchip,sst25vf016b"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/= imx6qdl-nitrogen6x.dtsi index 49da30d7510c4..904d5d051d63c 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi @@ -237,7 +237,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "sst,sst25vf016b", "jedec,spi-nor"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/i= mx6qdl-sabreauto.dtsi index 5e58740d40c5b..1368a47620372 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -272,7 +272,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; status =3D "disabled"; /* pin conflict with WEIM NOR */ =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "st,m25p32", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/i= mx6qdl-sabrelite.dtsi index eb9a0b104f1c3..901b9a761b66e 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi @@ -313,7 +313,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "sst,sst25vf016b", "jedec,spi-nor"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx= 6qdl-sabresd.dtsi index 0c0105468a2fe..37482a9023fce 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -197,7 +197,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "st,m25p32", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-ev= k.dts index 25f6f2fb1555e..f16c830f1e918 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts @@ -137,7 +137,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "st,m25p32", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/i= mx6sx-nitrogen6sx.dts index 66af78e83b701..a2c79bcf9a11c 100644 --- a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts +++ b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts @@ -107,7 +107,7 @@ pinctrl-0 =3D <&pinctrl_ecspi1>; status =3D "okay"; =20 - flash: m25p80@0 { + flash: flash@0 { compatible =3D "microchip,sst25vf016b"; spi-max-frequency =3D <20000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6= sx-sdb-reva.dts index dce5dcf96c255..7dda42553f4bc 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-reva.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts @@ -123,7 +123,7 @@ pinctrl-0 =3D <&pinctrl_qspi2>; status =3D "okay"; =20 - flash0: s25fl128s@0 { + flash0: flash@0 { reg =3D <0>; #address-cells =3D <1>; #size-cells =3D <1>; @@ -133,7 +133,7 @@ spi-tx-bus-width =3D <4>; }; =20 - flash1: s25fl128s@2 { + flash1: flash@2 { reg =3D <2>; #address-cells =3D <1>; #size-cells =3D <1>; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sd= b.dts index 99f4cf777a384..969cfe920d252 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -108,7 +108,7 @@ pinctrl-0 =3D <&pinctrl_qspi2>; status =3D "okay"; =20 - flash0: n25q256a@0 { + flash0: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "micron,n25q256a", "jedec,spi-nor"; @@ -118,7 +118,7 @@ reg =3D <0>; }; =20 - flash1: n25q256a@2 { + flash1: flash@2 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "micron,n25q256a", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/im= x6ul-14x14-evk.dtsi index a3fde3316c736..1a18c41ce385a 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -286,7 +286,7 @@ pinctrl-0 =3D <&pinctrl_qspi>; status =3D "okay"; =20 - flash0: n25q256a@0 { + flash0: flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "micron,n25q256a", "jedec,spi-nor"; diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi b/arch/arm/boo= t/dts/imx6ul-kontron-n6310-som.dtsi index 47d3ce5d255fa..acd936540d898 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi @@ -19,7 +19,7 @@ }; =20 &qspi { - spi-flash@0 { + flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "spi-nand"; diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi b/arch/arm/boo= t/dts/imx6ul-kontron-n6311-som.dtsi index a095a7654ac65..29ed38dce5802 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi +++ b/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi @@ -18,7 +18,7 @@ }; =20 &qspi { - spi-flash@0 { + flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "spi-nand"; diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi b/arch/= arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi index 2a449a3c1ae27..09a83dbdf6510 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi +++ b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi @@ -19,7 +19,7 @@ pinctrl-0 =3D <&pinctrl_ecspi2>; status =3D "okay"; =20 - spi-flash@0 { + flash@0 { compatible =3D "mxicy,mx25v8035f", "jedec,spi-nor"; spi-max-frequency =3D <50000000>; reg =3D <0>; diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi b/arch/arm/bo= ot/dts/imx6ull-kontron-n6411-som.dtsi index b7e984284e1ad..d000606c07049 100644 --- a/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi +++ b/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi @@ -18,7 +18,7 @@ }; =20 &qspi { - spi-flash@0 { + flash@0 { #address-cells =3D <1>; #size-cells =3D <1>; compatible =3D "spi-nand"; --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9D55ECAAD8 for ; Fri, 16 Sep 2022 10:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231687AbiIPKUT (ORCPT ); Fri, 16 Sep 2022 06:20:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231703AbiIPKS0 (ORCPT ); Fri, 16 Sep 2022 06:18:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8688AAF4BB; Fri, 16 Sep 2022 03:12:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C4A10629E6; Fri, 16 Sep 2022 10:12:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1771C433C1; Fri, 16 Sep 2022 10:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323120; bh=aE3XUsx9yhCv47JRVJw4tRPM/gRu82FTTx4OBbvS8zM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izkDt8jqHJLd/CI6iuwo5CAjBEzRUiPNf4xsWzBR5K4w0Cwgy8rZKmRcOPWOANznz 12ouQODg+5VbAaDbn559W1fWSN4rWpEKt//VsvWbYsO8OcQTLxLDph85GxvY71gCAz L6Av++mJbWLPHri15CjcC9G8/rsnwtOU6/iXP+zs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marco Felsch , Shawn Guo , Sasha Levin Subject: [PATCH 5.15 04/35] ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible Date: Fri, 16 Sep 2022 12:08:27 +0200 Message-Id: <20220916100447.120642135@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Marco Felsch [ Upstream commit af7d78c957017f8b3a0986769f6f18e57f9362ea ] Drop the "winbond,w25q16dw" compatible since it causes to set the MODALIAS to w25q16dw which is not specified within spi-nor id table. Fix this by use the common "jedec,spi-nor" compatible. Fixes: 2125212785c9 ("ARM: dts: imx6qdl-kontron-samx6i: add Kontron SMARC S= oM Support") Signed-off-by: Marco Felsch Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/= dts/imx6qdl-kontron-samx6i.dtsi index f159c58b9edba..6b791d515e294 100644 --- a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi @@ -249,7 +249,7 @@ =20 /* default boot source: workaround #1 for errata ERR006282 */ smarc_flash: flash@0 { - compatible =3D "winbond,w25q16dw", "jedec,spi-nor"; + compatible =3D "jedec,spi-nor"; reg =3D <0>; spi-max-frequency =3D <20000000>; }; --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAFD2C54EE9 for ; Fri, 16 Sep 2022 10:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229725AbiIPKUZ (ORCPT ); Fri, 16 Sep 2022 06:20:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231727AbiIPKSj (ORCPT ); Fri, 16 Sep 2022 06:18:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBDAFAFACC; Fri, 16 Sep 2022 03:12:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5048EB82521; Fri, 16 Sep 2022 10:12:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7B47C433B5; Fri, 16 Sep 2022 10:12:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323123; bh=d3RriZ1gtEVgmpI5vEczQFM4evlZwypu38PWRi8Uqfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G6gPW7uKFZTXl+sGYKk6iXqgXRoZPo2bZFro5jzd06lEUfhS9Czlp9p9MKcciRyqv aR/QjZrZubYkkpFc5wnu6FQOy6SeIb6ybqM5ui2zdN9l+W1R4zBm1aXP81xqQEK1Ht 6x9R7/PCV5quvbPnYFVV8jB5xykEid+iyLckfOus= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Claudiu Beznea , Nicolas Ferre , Sasha Levin Subject: [PATCH 5.15 05/35] ARM: dts: at91: fix low limit for CPU regulator Date: Fri, 16 Sep 2022 12:08:28 +0200 Message-Id: <20220916100447.162758761@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Claudiu Beznea [ Upstream commit 279d626d737486363233b9b99c30b5696c389b41 ] Fix low limit for CPU regulator. Otherwise setting voltages lower than 1.125V will not be allowed (CPUFreq will not be allowed to set proper voltages on proper frequencies). Signed-off-by: Claudiu Beznea Signed-off-by: Nicolas Ferre Link: https://lore.kernel.org/r/20220113144900.906370-7-claudiu.beznea@micr= ochip.com Stable-dep-of: 7f41d52ced9e ("ARM: dts: at91: sama7g5ek: specify proper reg= ulator output ranges") Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- arch/arm/boot/dts/at91-sama7g5ek.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-= sama7g5ek.dts index bac0e49cc5770..be51c1dbb4595 100644 --- a/arch/arm/boot/dts/at91-sama7g5ek.dts +++ b/arch/arm/boot/dts/at91-sama7g5ek.dts @@ -228,7 +228,7 @@ =20 vddcpu: VDD_OTHER { regulator-name =3D "VDD_OTHER"; - regulator-min-microvolt =3D <1125000>; + regulator-min-microvolt =3D <1050000>; regulator-max-microvolt =3D <1850000>; regulator-initial-mode =3D <2>; regulator-allowed-modes =3D <2>, <4>; --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4903EC54EE9 for ; Fri, 16 Sep 2022 10:21:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230106AbiIPKVC (ORCPT ); Fri, 16 Sep 2022 06:21:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231795AbiIPKSs (ORCPT ); Fri, 16 Sep 2022 06:18:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BF45B029D; Fri, 16 Sep 2022 03:12:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0D02E61F48; Fri, 16 Sep 2022 10:12:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01646C43470; Fri, 16 Sep 2022 10:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323126; bh=mTZV9uIoiN3zypdx+uxbkdn32avLDqSrpGnceQ7EIvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kgr9x2R5RLDJG8UorrDowkZHSAxE+COq9/jefYC8KPCKhjn45vCWtAj/WlpvULbSw nVgler4negBTJz/0Dp74PGUKW17F3Q3GVZLz2OdK5a5bg+kaVeOZBqf/S+x6aSZUsS y3le844OuA3DVbbcUhdzhpWie5hr/F3IGBwWakqs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Claudiu Beznea , Sasha Levin Subject: [PATCH 5.15 06/35] ARM: dts: at91: sama7g5ek: specify proper regulator output ranges Date: Fri, 16 Sep 2022 12:08:29 +0200 Message-Id: <20220916100447.204243843@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Claudiu Beznea [ Upstream commit 7f41d52ced9e1b7ed4ff8e1ae9cacbf46b64e6db ] Min and max output ranges of regulators need to satisfy board requirements not PMIC requirements. Thus adjust device tree to cope with this. Fixes: 7540629e2fc7 ("ARM: dts: at91: add sama7g5 SoC DT and sama7g5-ek") Signed-off-by: Claudiu Beznea Link: https://lore.kernel.org/r/20220826083927.3107272-7-claudiu.beznea@mic= rochip.com Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- arch/arm/boot/dts/at91-sama7g5ek.dts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-= sama7g5ek.dts index be51c1dbb4595..2038e387be288 100644 --- a/arch/arm/boot/dts/at91-sama7g5ek.dts +++ b/arch/arm/boot/dts/at91-sama7g5ek.dts @@ -169,8 +169,8 @@ regulators { vdd_3v3: VDD_IO { regulator-name =3D "VDD_IO"; - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <3700000>; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; regulator-initial-mode =3D <2>; regulator-allowed-modes =3D <2>, <4>; regulator-always-on; @@ -188,8 +188,8 @@ =20 vddioddr: VDD_DDR { regulator-name =3D "VDD_DDR"; - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1450000>; + regulator-min-microvolt =3D <1350000>; + regulator-max-microvolt =3D <1350000>; regulator-initial-mode =3D <2>; regulator-allowed-modes =3D <2>, <4>; regulator-always-on; @@ -209,8 +209,8 @@ =20 vddcore: VDD_CORE { regulator-name =3D "VDD_CORE"; - regulator-min-microvolt =3D <1100000>; - regulator-max-microvolt =3D <1850000>; + regulator-min-microvolt =3D <1150000>; + regulator-max-microvolt =3D <1150000>; regulator-initial-mode =3D <2>; regulator-allowed-modes =3D <2>, <4>; regulator-always-on; @@ -229,7 +229,7 @@ vddcpu: VDD_OTHER { regulator-name =3D "VDD_OTHER"; regulator-min-microvolt =3D <1050000>; - regulator-max-microvolt =3D <1850000>; + regulator-max-microvolt =3D <1250000>; regulator-initial-mode =3D <2>; regulator-allowed-modes =3D <2>, <4>; regulator-ramp-delay =3D <3125>; @@ -248,8 +248,8 @@ =20 vldo1: LDO1 { regulator-name =3D "LDO1"; - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <3700000>; + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; regulator-always-on; =20 regulator-state-standby { --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7E03C54EE9 for ; Fri, 16 Sep 2022 10:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231737AbiIPKUg (ORCPT ); Fri, 16 Sep 2022 06:20:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231776AbiIPKSq (ORCPT ); Fri, 16 Sep 2022 06:18:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 097F7AFAE0; Fri, 16 Sep 2022 03:12:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EB5E6B8254A; Fri, 16 Sep 2022 10:12:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44F4DC4347C; Fri, 16 Sep 2022 10:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323129; bh=31cipC14mZdElOYJ3XaK0RkFetdmF8bn+WnQfJyPShA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJgfZUpm0J6mNvyBTPHBDu7Abi9OEetaOYJlM+2pkSG/oXJe4n/ukaagANFBwJKlQ OjQ/ajUwrri9BVe8qbHNoRksrIMvx2h7DOKcKW7urTRYhgt1q3jg3tYeO921S1rXGC EspJddEvZoDUzJMTky9Y4tnyXyUn7CLnArDPcQkk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nick Desaulniers , "Peter Zijlstra (Intel)" , Waiman Long , Sasha Levin Subject: [PATCH 5.15 07/35] lockdep: Fix -Wunused-parameter for _THIS_IP_ Date: Fri, 16 Sep 2022 12:08:30 +0200 Message-Id: <20220916100447.248166318@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Nick Desaulniers [ Upstream commit 8b023accc8df70e72f7704d29fead7ca914d6837 ] While looking into a bug related to the compiler's handling of addresses of labels, I noticed some uses of _THIS_IP_ seemed unused in lockdep. Drive by cleanup. -Wunused-parameter: kernel/locking/lockdep.c:1383:22: warning: unused parameter 'ip' kernel/locking/lockdep.c:4246:48: warning: unused parameter 'ip' kernel/locking/lockdep.c:4844:19: warning: unused parameter 'ip' Signed-off-by: Nick Desaulniers Signed-off-by: Peter Zijlstra (Intel) Acked-by: Waiman Long Link: https://lore.kernel.org/r/20220314221909.2027027-1-ndesaulniers@googl= e.com Stable-dep-of: 54c3931957f6 ("tracing: hold caller_addr to hardirq_{enable,= disable}_ip") Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- arch/arm64/kernel/entry-common.c | 8 ++++---- arch/x86/kvm/x86.h | 2 +- include/linux/irqflags.h | 4 ++-- include/linux/kvm_host.h | 2 +- kernel/entry/common.c | 6 +++--- kernel/locking/lockdep.c | 22 ++++++++-------------- kernel/sched/idle.c | 2 +- kernel/trace/trace_preemptirq.c | 4 ++-- 8 files changed, 22 insertions(+), 28 deletions(-) diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-com= mon.c index 32f9796c4ffe7..60225bc09b017 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -72,7 +72,7 @@ static __always_inline void __exit_to_kernel_mode(struct = pt_regs *regs) if (interrupts_enabled(regs)) { if (regs->exit_rcu) { trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); rcu_irq_exit(); lockdep_hardirqs_on(CALLER_ADDR0); return; @@ -117,7 +117,7 @@ static __always_inline void enter_from_user_mode(struct= pt_regs *regs) static __always_inline void __exit_to_user_mode(void) { trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); user_enter_irqoff(); lockdep_hardirqs_on(CALLER_ADDR0); } @@ -175,7 +175,7 @@ static void noinstr arm64_exit_nmi(struct pt_regs *regs) ftrace_nmi_exit(); if (restore) { trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); } =20 rcu_nmi_exit(); @@ -211,7 +211,7 @@ static void noinstr arm64_exit_el1_dbg(struct pt_regs *= regs) =20 if (restore) { trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); } =20 rcu_nmi_exit(); diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index 4d6f7a70bdd14..cd0c93ec72fad 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -26,7 +26,7 @@ static __always_inline void kvm_guest_enter_irqoff(void) */ instrumentation_begin(); trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); instrumentation_end(); =20 guest_enter_irqoff(); diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h index 600c10da321a7..747f40e0c3260 100644 --- a/include/linux/irqflags.h +++ b/include/linux/irqflags.h @@ -20,13 +20,13 @@ #ifdef CONFIG_PROVE_LOCKING extern void lockdep_softirqs_on(unsigned long ip); extern void lockdep_softirqs_off(unsigned long ip); - extern void lockdep_hardirqs_on_prepare(unsigned long ip); + extern void lockdep_hardirqs_on_prepare(void); extern void lockdep_hardirqs_on(unsigned long ip); extern void lockdep_hardirqs_off(unsigned long ip); #else static inline void lockdep_softirqs_on(unsigned long ip) { } static inline void lockdep_softirqs_off(unsigned long ip) { } - static inline void lockdep_hardirqs_on_prepare(unsigned long ip) { } + static inline void lockdep_hardirqs_on_prepare(void) { } static inline void lockdep_hardirqs_on(unsigned long ip) { } static inline void lockdep_hardirqs_off(unsigned long ip) { } #endif diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index fb70dd4ff3b60..38b7e9ab48b84 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -436,7 +436,7 @@ static __always_inline void guest_state_enter_irqoff(vo= id) { instrumentation_begin(); trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); instrumentation_end(); =20 guest_context_enter_irqoff(); diff --git a/kernel/entry/common.c b/kernel/entry/common.c index d5a61d565ad5d..998bdb7b8bf7f 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -124,7 +124,7 @@ static __always_inline void __exit_to_user_mode(void) { instrumentation_begin(); trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); instrumentation_end(); =20 user_enter_irqoff(); @@ -412,7 +412,7 @@ noinstr void irqentry_exit(struct pt_regs *regs, irqent= ry_state_t state) instrumentation_begin(); /* Tell the tracer that IRET will enable interrupts */ trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); instrumentation_end(); rcu_irq_exit(); lockdep_hardirqs_on(CALLER_ADDR0); @@ -465,7 +465,7 @@ void noinstr irqentry_nmi_exit(struct pt_regs *regs, ir= qentry_state_t irq_state) ftrace_nmi_exit(); if (irq_state.lockdep) { trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); } instrumentation_end(); =20 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 120bbdacd58bb..e6a282bc16652 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -1368,7 +1368,7 @@ static struct lock_list *alloc_list_entry(void) */ static int add_lock_to_list(struct lock_class *this, struct lock_class *links_to, struct list_head *head, - unsigned long ip, u16 distance, u8 dep, + u16 distance, u8 dep, const struct lock_trace *trace) { struct lock_list *entry; @@ -3121,19 +3121,15 @@ check_prev_add(struct task_struct *curr, struct hel= d_lock *prev, * to the previous lock's dependency list: */ ret =3D add_lock_to_list(hlock_class(next), hlock_class(prev), - &hlock_class(prev)->locks_after, - next->acquire_ip, distance, - calc_dep(prev, next), - *trace); + &hlock_class(prev)->locks_after, distance, + calc_dep(prev, next), *trace); =20 if (!ret) return 0; =20 ret =3D add_lock_to_list(hlock_class(prev), hlock_class(next), - &hlock_class(next)->locks_before, - next->acquire_ip, distance, - calc_depb(prev, next), - *trace); + &hlock_class(next)->locks_before, distance, + calc_depb(prev, next), *trace); if (!ret) return 0; =20 @@ -4224,14 +4220,13 @@ static void __trace_hardirqs_on_caller(void) =20 /** * lockdep_hardirqs_on_prepare - Prepare for enabling interrupts - * @ip: Caller address * * Invoked before a possible transition to RCU idle from exit to user or * guest mode. This ensures that all RCU operations are done before RCU * stops watching. After the RCU transition lockdep_hardirqs_on() has to be * invoked to set the final state. */ -void lockdep_hardirqs_on_prepare(unsigned long ip) +void lockdep_hardirqs_on_prepare(void) { if (unlikely(!debug_locks)) return; @@ -4828,8 +4823,7 @@ EXPORT_SYMBOL_GPL(__lockdep_no_validate__); =20 static void print_lock_nested_lock_not_held(struct task_struct *curr, - struct held_lock *hlock, - unsigned long ip) + struct held_lock *hlock) { if (!debug_locks_off()) return; @@ -5005,7 +4999,7 @@ static int __lock_acquire(struct lockdep_map *lock, u= nsigned int subclass, chain_key =3D iterate_chain_key(chain_key, hlock_id(hlock)); =20 if (nest_lock && !__lock_is_held(nest_lock, -1)) { - print_lock_nested_lock_not_held(curr, hlock, ip); + print_lock_nested_lock_not_held(curr, hlock); return 0; } =20 diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index d17b0a5ce6ac3..499a3e286cd05 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -105,7 +105,7 @@ void __cpuidle default_idle_call(void) * last -- this is very similar to the entry code. */ trace_hardirqs_on_prepare(); - lockdep_hardirqs_on_prepare(_THIS_IP_); + lockdep_hardirqs_on_prepare(); rcu_idle_enter(); lockdep_hardirqs_on(_THIS_IP_); =20 diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptir= q.c index f4938040c2286..95b58bd757ce4 100644 --- a/kernel/trace/trace_preemptirq.c +++ b/kernel/trace/trace_preemptirq.c @@ -46,7 +46,7 @@ void trace_hardirqs_on(void) this_cpu_write(tracing_irq_cpu, 0); } =20 - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); lockdep_hardirqs_on(CALLER_ADDR0); } EXPORT_SYMBOL(trace_hardirqs_on); @@ -94,7 +94,7 @@ __visible void trace_hardirqs_on_caller(unsigned long cal= ler_addr) this_cpu_write(tracing_irq_cpu, 0); } =20 - lockdep_hardirqs_on_prepare(CALLER_ADDR0); + lockdep_hardirqs_on_prepare(); lockdep_hardirqs_on(CALLER_ADDR0); } EXPORT_SYMBOL(trace_hardirqs_on_caller); --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C978C54EE9 for ; Fri, 16 Sep 2022 10:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231747AbiIPKUl (ORCPT ); Fri, 16 Sep 2022 06:20:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231781AbiIPKSr (ORCPT ); Fri, 16 Sep 2022 06:18:47 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD80AAFAE9; Fri, 16 Sep 2022 03:12:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E6FE8B82540; Fri, 16 Sep 2022 10:12:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55F19C433D6; Fri, 16 Sep 2022 10:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323132; bh=GORTeHk9Pi4q+Pl7Z3N7sG96h1kbXrotZRIhHBUhLOw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UIT7Y8N0SFY2Z+td5oh4FzgnCcOXvtlxXpi44wy7Dk7Bj1u3IwVfuacLIZ7iS94pV FzWLpXhk25Sizpnr9Qs/JDkDi/PPRfs9NUZPMXtxFCLWuNlMiCa7FGB2wAKJ94fzG5 Wci1lER7taQcFGopyGHregOC3m7PuIGchBYQBPgA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Borislav Petkov , "Peter Zijlstra (Intel)" , Sasha Levin Subject: [PATCH 5.15 08/35] x86/mm: Force-inline __phys_addr_nodebug() Date: Fri, 16 Sep 2022 12:08:31 +0200 Message-Id: <20220916100447.289010893@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Borislav Petkov [ Upstream commit ace1a98519270c586c0d4179419292df67441cd1 ] Fix: vmlinux.o: warning: objtool: __sev_es_nmi_complete()+0x8b: call to __phys= _addr_nodebug() leaves .noinstr.text section Signed-off-by: Borislav Petkov Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20220324183607.31717-4-bp@alien8.de Stable-dep-of: 54c3931957f6 ("tracing: hold caller_addr to hardirq_{enable,= disable}_ip") Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- arch/x86/include/asm/page_64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index 4bde0dc66100c..56891399fa2a6 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -15,7 +15,7 @@ extern unsigned long page_offset_base; extern unsigned long vmalloc_base; extern unsigned long vmemmap_base; =20 -static inline unsigned long __phys_addr_nodebug(unsigned long x) +static __always_inline unsigned long __phys_addr_nodebug(unsigned long x) { unsigned long y =3D x - __START_KERNEL_map; =20 --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DCBAC54EE9 for ; Fri, 16 Sep 2022 10:21:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231838AbiIPKV1 (ORCPT ); Fri, 16 Sep 2022 06:21:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231972AbiIPKTR (ORCPT ); Fri, 16 Sep 2022 06:19:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F6A3B07D1; Fri, 16 Sep 2022 03:13:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 102EFB82547; Fri, 16 Sep 2022 10:12:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FB3FC433D6; Fri, 16 Sep 2022 10:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323135; bh=l7ifI2D61ypQD6Xd9t895tJj406Be87y8pTmmgihQz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PeSucU/qqRSaNJjsLT8vJrhZfv7Aiunww6TyGIZfpMFcxM2it2pPx37dd19R1K0d1 9a+zSgiLUygVMluPyF0Plr0bfpKKp8z68v5/87g6alKxe+j0qFSL0k3P7JK+Ls1Taf bGJ12kivpPr/9diwU5pQSXsAYhvz+qXNe6/m3CsM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Borislav Petkov , "Peter Zijlstra (Intel)" , Sasha Levin Subject: [PATCH 5.15 09/35] task_stack, x86/cea: Force-inline stack helpers Date: Fri, 16 Sep 2022 12:08:32 +0200 Message-Id: <20220916100447.330584007@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Borislav Petkov [ Upstream commit e87f4152e542610d0b4c6c8548964a68a59d2040 ] Force-inline two stack helpers to fix the following objtool warnings: vmlinux.o: warning: objtool: in_task_stack()+0xc: call to task_stack_page= () leaves .noinstr.text section vmlinux.o: warning: objtool: in_entry_stack()+0x10: call to cpu_entry_sta= ck() leaves .noinstr.text section Signed-off-by: Borislav Petkov Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20220324183607.31717-2-bp@alien8.de Stable-dep-of: 54c3931957f6 ("tracing: hold caller_addr to hardirq_{enable,= disable}_ip") Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- arch/x86/include/asm/cpu_entry_area.h | 2 +- include/linux/sched/task_stack.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/cpu_entry_area.h b/arch/x86/include/asm/c= pu_entry_area.h index dd5ea1bdf04c5..75efc4c6f0766 100644 --- a/arch/x86/include/asm/cpu_entry_area.h +++ b/arch/x86/include/asm/cpu_entry_area.h @@ -143,7 +143,7 @@ extern void cea_set_pte(void *cea_vaddr, phys_addr_t pa= , pgprot_t flags); =20 extern struct cpu_entry_area *get_cpu_entry_area(int cpu); =20 -static inline struct entry_stack *cpu_entry_stack(int cpu) +static __always_inline struct entry_stack *cpu_entry_stack(int cpu) { return &get_cpu_entry_area(cpu)->entry_stack_page.stack; } diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_st= ack.h index d10150587d819..1009b6b5ce403 100644 --- a/include/linux/sched/task_stack.h +++ b/include/linux/sched/task_stack.h @@ -16,7 +16,7 @@ * try_get_task_stack() instead. task_stack_page will return a pointer * that could get freed out from under you. */ -static inline void *task_stack_page(const struct task_struct *task) +static __always_inline void *task_stack_page(const struct task_struct *tas= k) { return task->stack; } --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBE4CECAAD8 for ; Fri, 16 Sep 2022 10:18:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231598AbiIPKSR (ORCPT ); Fri, 16 Sep 2022 06:18:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231543AbiIPKRJ (ORCPT ); Fri, 16 Sep 2022 06:17:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0869FAF486; Fri, 16 Sep 2022 03:12:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0822DB82542; Fri, 16 Sep 2022 10:11:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B00AC433D7; Fri, 16 Sep 2022 10:11:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323086; bh=P53QdZZFSJ/F9zvjV/u3B2BVYcTSEk5IMiu3Bl0qHc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UAmKFuaC+QhaEyjKJTaix+pIXT24EJTiph8WqmT8hHMZa5QhKZ2vg/QGz4DH2yIN5 e7mxyFtKN/qLQQCsjEE3yXbvk23rnKnu3VjaSXej26g9JNHY8WKHlcGN+dLdJ6M7yw c2+R6iNZJ5EfifmoAKpbtyfJullSvkxr6PxKT8WU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yipeng Zou , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.15 10/35] tracing: hold caller_addr to hardirq_{enable,disable}_ip Date: Fri, 16 Sep 2022 12:08:33 +0200 Message-Id: <20220916100447.371727278@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Yipeng Zou [ Upstream commit 54c3931957f6a6194d5972eccc36d052964b2abe ] Currently, The arguments passing to lockdep_hardirqs_{on,off} was fixed in CALLER_ADDR0. The function trace_hardirqs_on_caller should have been intended to use caller_addr to represent the address that caller wants to be traced. For example, lockdep log in riscv showing the last {enabled,disabled} at __trace_hardirqs_{on,off} all the time(if called by): [ 57.853175] hardirqs last enabled at (2519): __trace_hardirqs_on+0xc/0x= 14 [ 57.853848] hardirqs last disabled at (2520): __trace_hardirqs_off+0xc/0= x14 After use trace_hardirqs_xx_caller, we can get more effective information: [ 53.781428] hardirqs last enabled at (2595): restore_all+0xe/0x66 [ 53.782185] hardirqs last disabled at (2596): ret_from_exception+0xa/0x10 Link: https://lkml.kernel.org/r/20220901104515.135162-2-zouyipeng@huawei.com Cc: stable@vger.kernel.org Fixes: c3bc8fd637a96 ("tracing: Centralize preemptirq tracepoints and unify= their usage") Signed-off-by: Yipeng Zou Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- kernel/trace/trace_preemptirq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptir= q.c index 95b58bd757ce4..1e130da1b742c 100644 --- a/kernel/trace/trace_preemptirq.c +++ b/kernel/trace/trace_preemptirq.c @@ -95,14 +95,14 @@ __visible void trace_hardirqs_on_caller(unsigned long c= aller_addr) } =20 lockdep_hardirqs_on_prepare(); - lockdep_hardirqs_on(CALLER_ADDR0); + lockdep_hardirqs_on(caller_addr); } EXPORT_SYMBOL(trace_hardirqs_on_caller); NOKPROBE_SYMBOL(trace_hardirqs_on_caller); =20 __visible void trace_hardirqs_off_caller(unsigned long caller_addr) { - lockdep_hardirqs_off(CALLER_ADDR0); + lockdep_hardirqs_off(caller_addr); =20 if (!this_cpu_read(tracing_irq_cpu)) { this_cpu_write(tracing_irq_cpu, 1); --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00B1DC6FA8B for ; Fri, 16 Sep 2022 10:18:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231683AbiIPKSM (ORCPT ); Fri, 16 Sep 2022 06:18:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231534AbiIPKRH (ORCPT ); Fri, 16 Sep 2022 06:17:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2D52ABD5A; Fri, 16 Sep 2022 03:12:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 490A462A24; Fri, 16 Sep 2022 10:11:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C493C433D6; Fri, 16 Sep 2022 10:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323089; bh=WtsQJAZofaUELrCVXiJTrZu1q+N1CUo+xSp1xN6POGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x7UAqpf49CwgKVyy1IpVndDBlAHgpl13LR9t0y9DFOih0ZZ4iZ87q0cvr4ScsFmw4 IAXGzH/V6MgUKQQgRim0iGt4IGAt58KdlGLKjvNTNuJuQ4UOnEaRlzbTfYRH2iSodP PLRgTzcSYYMPYHGrGZ4OmyOTfQxGGmFqn/3yYMbY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brian Norris , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.15 11/35] tracefs: Only clobber mode/uid/gid on remount if asked Date: Fri, 16 Sep 2022 12:08:34 +0200 Message-Id: <20220916100447.413009805@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Brian Norris [ Upstream commit 47311db8e8f33011d90dee76b39c8886120cdda4 ] Users may have explicitly configured their tracefs permissions; we shouldn't overwrite those just because a second mount appeared. Only clobber if the options were provided at mount time. Note: the previous behavior was especially surprising in the presence of automounted /sys/kernel/debug/tracing/. Existing behavior: ## Pre-existing status: tracefs is 0755. # stat -c '%A' /sys/kernel/tracing/ drwxr-xr-x ## (Re)trigger the automount. # umount /sys/kernel/debug/tracing # stat -c '%A' /sys/kernel/debug/tracing/. drwx------ ## Unexpected: the automount changed mode for other mount instances. # stat -c '%A' /sys/kernel/tracing/ drwx------ New behavior (after this change): ## Pre-existing status: tracefs is 0755. # stat -c '%A' /sys/kernel/tracing/ drwxr-xr-x ## (Re)trigger the automount. # umount /sys/kernel/debug/tracing # stat -c '%A' /sys/kernel/debug/tracing/. drwxr-xr-x ## Expected: the automount does not change other mount instances. # stat -c '%A' /sys/kernel/tracing/ drwxr-xr-x Link: https://lkml.kernel.org/r/20220826174353.2.Iab6e5ea57963d6deca5311b27= fb7226790d44406@changeid Cc: stable@vger.kernel.org Fixes: 4282d60689d4f ("tracefs: Add new tracefs file system") Signed-off-by: Brian Norris Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- fs/tracefs/inode.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c index f2625a372a3ae..066e8344934de 100644 --- a/fs/tracefs/inode.c +++ b/fs/tracefs/inode.c @@ -141,6 +141,8 @@ struct tracefs_mount_opts { kuid_t uid; kgid_t gid; umode_t mode; + /* Opt_* bitfield. */ + unsigned int opts; }; =20 enum { @@ -241,6 +243,7 @@ static int tracefs_parse_options(char *data, struct tra= cefs_mount_opts *opts) kgid_t gid; char *p; =20 + opts->opts =3D 0; opts->mode =3D TRACEFS_DEFAULT_MODE; =20 while ((p =3D strsep(&data, ",")) !=3D NULL) { @@ -275,24 +278,36 @@ static int tracefs_parse_options(char *data, struct t= racefs_mount_opts *opts) * but traditionally tracefs has ignored all mount options */ } + + opts->opts |=3D BIT(token); } =20 return 0; } =20 -static int tracefs_apply_options(struct super_block *sb) +static int tracefs_apply_options(struct super_block *sb, bool remount) { struct tracefs_fs_info *fsi =3D sb->s_fs_info; struct inode *inode =3D sb->s_root->d_inode; struct tracefs_mount_opts *opts =3D &fsi->mount_opts; =20 - inode->i_mode &=3D ~S_IALLUGO; - inode->i_mode |=3D opts->mode; + /* + * On remount, only reset mode/uid/gid if they were provided as mount + * options. + */ + + if (!remount || opts->opts & BIT(Opt_mode)) { + inode->i_mode &=3D ~S_IALLUGO; + inode->i_mode |=3D opts->mode; + } =20 - inode->i_uid =3D opts->uid; + if (!remount || opts->opts & BIT(Opt_uid)) + inode->i_uid =3D opts->uid; =20 - /* Set all the group ids to the mount option */ - set_gid(sb->s_root, opts->gid); + if (!remount || opts->opts & BIT(Opt_gid)) { + /* Set all the group ids to the mount option */ + set_gid(sb->s_root, opts->gid); + } =20 return 0; } @@ -307,7 +322,7 @@ static int tracefs_remount(struct super_block *sb, int = *flags, char *data) if (err) goto fail; =20 - tracefs_apply_options(sb); + tracefs_apply_options(sb, true); =20 fail: return err; @@ -359,7 +374,7 @@ static int trace_fill_super(struct super_block *sb, voi= d *data, int silent) =20 sb->s_op =3D &tracefs_super_operations; =20 - tracefs_apply_options(sb); + tracefs_apply_options(sb, false); =20 return 0; =20 --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0078AC54EE9 for ; Fri, 16 Sep 2022 10:19:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231643AbiIPKTz (ORCPT ); Fri, 16 Sep 2022 06:19:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231590AbiIPKSM (ORCPT ); Fri, 16 Sep 2022 06:18:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEF79AC26F; Fri, 16 Sep 2022 03:12:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 897FD62A20; Fri, 16 Sep 2022 10:11:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E085C433C1; Fri, 16 Sep 2022 10:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323093; bh=LRRMg89awfRIwvKA8yTo6KSIu04EZVF1BJm2jCaOKsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IKVCa6uvmBlJuo+zPdFPdE9poVGhpj3xDHDMsuX9WQHLwKJGWfWYGnw69ykxn+kOS g4mGAEeBVFLTZ7b7LvqufG/bBRePyfjIdunB3JL8kAaTUAgU7rEubfGAtRgT4VzPai MnLzgUaVRzEbyEcnHRSJnZbg1VhQrByChh9mwCko= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Snitselaar , Wen Jin , Lu Baolu , Joerg Roedel , Sasha Levin Subject: [PATCH 5.15 12/35] iommu/vt-d: Fix kdump kernels boot failure with scalable mode Date: Fri, 16 Sep 2022 12:08:35 +0200 Message-Id: <20220916100447.454737005@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Lu Baolu [ Upstream commit 0c5f6c0d8201a809a6585b07b6263e9db2c874a3 ] The translation table copying code for kdump kernels is currently based on the extended root/context entry formats of ECS mode defined in older VT-d v2.5, and doesn't handle the scalable mode formats. This causes the kexec capture kernel boot failure with DMAR faults if the IOMMU was enabled in scalable mode by the previous kernel. The ECS mode has already been deprecated by the VT-d spec since v3.0 and Intel IOMMU driver doesn't support this mode as there's no real hardware implementation. Hence this converts ECS checking in copying table code into scalable mode. The existing copying code consumes a bit in the context entry as a mark of copied entry. It needs to work for the old format as well as for the extended context entries. As it's hard to find such a common bit for both legacy and scalable mode context entries. This replaces it with a per- IOMMU bitmap. Fixes: 7373a8cc38197 ("iommu/vt-d: Setup context and enable RID2PASID suppo= rt") Cc: stable@vger.kernel.org Reported-by: Jerry Snitselaar Tested-by: Wen Jin Signed-off-by: Lu Baolu Link: https://lore.kernel.org/r/20220817011035.3250131-1-baolu.lu@linux.int= el.com Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/iommu/intel/iommu.c | 100 ++++++++++++++++-------------------- include/linux/intel-iommu.h | 9 ++-- 2 files changed, 50 insertions(+), 59 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index bc5444daca9b4..2affdccb58e47 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -191,38 +191,6 @@ static phys_addr_t root_entry_uctp(struct root_entry *= re) return re->hi & VTD_PAGE_MASK; } =20 -static inline void context_clear_pasid_enable(struct context_entry *contex= t) -{ - context->lo &=3D ~(1ULL << 11); -} - -static inline bool context_pasid_enabled(struct context_entry *context) -{ - return !!(context->lo & (1ULL << 11)); -} - -static inline void context_set_copied(struct context_entry *context) -{ - context->hi |=3D (1ull << 3); -} - -static inline bool context_copied(struct context_entry *context) -{ - return !!(context->hi & (1ULL << 3)); -} - -static inline bool __context_present(struct context_entry *context) -{ - return (context->lo & 1); -} - -bool context_present(struct context_entry *context) -{ - return context_pasid_enabled(context) ? - __context_present(context) : - __context_present(context) && !context_copied(context); -} - static inline void context_set_present(struct context_entry *context) { context->lo |=3D 1; @@ -270,6 +238,26 @@ static inline void context_clear_entry(struct context_= entry *context) context->hi =3D 0; } =20 +static inline bool context_copied(struct intel_iommu *iommu, u8 bus, u8 de= vfn) +{ + if (!iommu->copied_tables) + return false; + + return test_bit(((long)bus << 8) | devfn, iommu->copied_tables); +} + +static inline void +set_context_copied(struct intel_iommu *iommu, u8 bus, u8 devfn) +{ + set_bit(((long)bus << 8) | devfn, iommu->copied_tables); +} + +static inline void +clear_context_copied(struct intel_iommu *iommu, u8 bus, u8 devfn) +{ + clear_bit(((long)bus << 8) | devfn, iommu->copied_tables); +} + /* * This domain is a statically identity mapping domain. * 1. This domain creats a static 1:1 mapping to all usable memory. @@ -792,6 +780,13 @@ struct context_entry *iommu_context_addr(struct intel_= iommu *iommu, u8 bus, struct context_entry *context; u64 *entry; =20 + /* + * Except that the caller requested to allocate a new entry, + * returning a copied context entry makes no sense. + */ + if (!alloc && context_copied(iommu, bus, devfn)) + return NULL; + entry =3D &root->lo; if (sm_supported(iommu)) { if (devfn >=3D 0x80) { @@ -1899,6 +1894,11 @@ static void free_dmar_iommu(struct intel_iommu *iomm= u) iommu->domain_ids =3D NULL; } =20 + if (iommu->copied_tables) { + bitmap_free(iommu->copied_tables); + iommu->copied_tables =3D NULL; + } + g_iommus[iommu->seq_id] =3D NULL; =20 /* free context mapping */ @@ -2107,7 +2107,7 @@ static int domain_context_mapping_one(struct dmar_dom= ain *domain, goto out_unlock; =20 ret =3D 0; - if (context_present(context)) + if (context_present(context) && !context_copied(iommu, bus, devfn)) goto out_unlock; =20 /* @@ -2119,7 +2119,7 @@ static int domain_context_mapping_one(struct dmar_dom= ain *domain, * in-flight DMA will exist, and we don't need to worry anymore * hereafter. */ - if (context_copied(context)) { + if (context_copied(iommu, bus, devfn)) { u16 did_old =3D context_domain_id(context); =20 if (did_old < cap_ndoms(iommu->cap)) { @@ -2130,6 +2130,8 @@ static int domain_context_mapping_one(struct dmar_dom= ain *domain, iommu->flush.flush_iotlb(iommu, did_old, 0, 0, DMA_TLB_DSI_FLUSH); } + + clear_context_copied(iommu, bus, devfn); } =20 context_clear_entry(context); @@ -3024,32 +3026,14 @@ static int copy_context_table(struct intel_iommu *i= ommu, /* Now copy the context entry */ memcpy(&ce, old_ce + idx, sizeof(ce)); =20 - if (!__context_present(&ce)) + if (!context_present(&ce)) continue; =20 did =3D context_domain_id(&ce); if (did >=3D 0 && did < cap_ndoms(iommu->cap)) set_bit(did, iommu->domain_ids); =20 - /* - * We need a marker for copied context entries. This - * marker needs to work for the old format as well as - * for extended context entries. - * - * Bit 67 of the context entry is used. In the old - * format this bit is available to software, in the - * extended format it is the PGE bit, but PGE is ignored - * by HW if PASIDs are disabled (and thus still - * available). - * - * So disable PASIDs first and then mark the entry - * copied. This means that we don't copy PASID - * translations from the old kernel, but this is fine as - * faults there are not fatal. - */ - context_clear_pasid_enable(&ce); - context_set_copied(&ce); - + set_context_copied(iommu, bus, devfn); new_ce[idx] =3D ce; } =20 @@ -3076,8 +3060,8 @@ static int copy_translation_tables(struct intel_iommu= *iommu) bool new_ext, ext; =20 rtaddr_reg =3D dmar_readq(iommu->reg + DMAR_RTADDR_REG); - ext =3D !!(rtaddr_reg & DMA_RTADDR_RTT); - new_ext =3D !!ecap_ecs(iommu->ecap); + ext =3D !!(rtaddr_reg & DMA_RTADDR_SMT); + new_ext =3D !!sm_supported(iommu); =20 /* * The RTT bit can only be changed when translation is disabled, @@ -3088,6 +3072,10 @@ static int copy_translation_tables(struct intel_iomm= u *iommu) if (new_ext !=3D ext) return -EINVAL; =20 + iommu->copied_tables =3D bitmap_zalloc(BIT_ULL(16), GFP_KERNEL); + if (!iommu->copied_tables) + return -ENOMEM; + old_rt_phys =3D rtaddr_reg & VTD_PAGE_MASK; if (!old_rt_phys) return -EINVAL; diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 05a65eb155f76..81da7107e3bd0 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -196,7 +196,6 @@ #define ecap_dis(e) (((e) >> 27) & 0x1) #define ecap_nest(e) (((e) >> 26) & 0x1) #define ecap_mts(e) (((e) >> 25) & 0x1) -#define ecap_ecs(e) (((e) >> 24) & 0x1) #define ecap_iotlb_offset(e) ((((e) >> 8) & 0x3ff) * 16) #define ecap_max_iotlb_offset(e) (ecap_iotlb_offset(e) + 16) #define ecap_coherent(e) ((e) & 0x1) @@ -264,7 +263,6 @@ #define DMA_GSTS_CFIS (((u32)1) << 23) =20 /* DMA_RTADDR_REG */ -#define DMA_RTADDR_RTT (((u64)1) << 11) #define DMA_RTADDR_SMT (((u64)1) << 10) =20 /* CCMD_REG */ @@ -594,6 +592,7 @@ struct intel_iommu { #ifdef CONFIG_INTEL_IOMMU unsigned long *domain_ids; /* bitmap of domains */ struct dmar_domain ***domains; /* ptr to domains */ + unsigned long *copied_tables; /* bitmap of copied tables */ spinlock_t lock; /* protect context, domain ids */ struct root_entry *root_entry; /* virtual address */ =20 @@ -713,6 +712,11 @@ static inline int first_pte_in_page(struct dma_pte *pt= e) return !((unsigned long)pte & ~VTD_PAGE_MASK); } =20 +static inline bool context_present(struct context_entry *context) +{ + return (context->lo & 1); +} + extern struct dmar_drhd_unit * dmar_find_matched_drhd_unit(struct pci_dev = *dev); extern int dmar_find_matched_atsr_unit(struct pci_dev *dev); =20 @@ -806,7 +810,6 @@ static inline void intel_iommu_debugfs_init(void) {} #endif /* CONFIG_INTEL_IOMMU_DEBUGFS */ =20 extern const struct attribute_group *intel_iommu_groups[]; -bool context_present(struct context_entry *context); struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus, u8 devfn, int alloc); =20 --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C022AC54EE9 for ; Fri, 16 Sep 2022 10:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231512AbiIPKTn (ORCPT ); Fri, 16 Sep 2022 06:19:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231650AbiIPKR7 (ORCPT ); Fri, 16 Sep 2022 06:17:59 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA469AF0F7; Fri, 16 Sep 2022 03:12:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 36D98B82520; Fri, 16 Sep 2022 10:11:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F1B8C433C1; Fri, 16 Sep 2022 10:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323096; bh=FTyZm82ma7c7kIDojvTdLUTSDMwwa3K7yYhHENatSfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WuINz0EDgk7DCwe6y4M3tipysfmE3qk9b7XmviuVVfBaYio4XL1JRrI/TL7epJWPK 900LOBUH8bAMOZbzFIF0i9uK8tCymEo1Ge3Xd9BnLM8fUu2MvNDP9Flb6BF2g/xmuc j5isFjBb5hpqKZSt6xQdE56czJJ4UVLQ+JxtewOM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ondrej Jirman , Jarrah Gosbell , Hans de Goede , Dmitry Torokhov , Sasha Levin Subject: [PATCH 5.15 13/35] Input: goodix - add support for GT1158 Date: Fri, 16 Sep 2022 12:08:36 +0200 Message-Id: <20220916100447.495959142@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Ondrej Jirman [ Upstream commit 425fe4709c76e35f93f4c0e50240f0b61b2a2e54 ] This controller is used by PinePhone and PinePhone Pro. Support for the PinePhone Pro will be added in a later patch set. Signed-off-by: Ondrej Jirman Signed-off-by: Jarrah Gosbell Reviewed-by: Hans de Goede Link: https://lore.kernel.org/r/20220809091200.290492-1-kernel@undef.tools Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/input/touchscreen/goodix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen= /goodix.c index 3667f7e51fde4..54ea593897466 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -94,6 +94,7 @@ static const struct goodix_chip_data gt9x_chip_data =3D { =20 static const struct goodix_chip_id goodix_chip_ids[] =3D { { .id =3D "1151", .data =3D >1x_chip_data }, + { .id =3D "1158", .data =3D >1x_chip_data }, { .id =3D "5663", .data =3D >1x_chip_data }, { .id =3D "5688", .data =3D >1x_chip_data }, { .id =3D "917S", .data =3D >1x_chip_data }, --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28954ECAAD8 for ; Fri, 16 Sep 2022 10:19:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231782AbiIPKSr (ORCPT ); Fri, 16 Sep 2022 06:18:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230355AbiIPKRL (ORCPT ); Fri, 16 Sep 2022 06:17:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44F8FAF0DE; Fri, 16 Sep 2022 03:12:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B012262A25; Fri, 16 Sep 2022 10:11:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB895C433C1; Fri, 16 Sep 2022 10:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323099; bh=Dd+UuuvNPyzWXKk0/gNoM/1icn7LMspg1PySp2oJaq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P7Mrl4rmYt13QAv1N+3MCQHJhJEWy0H0sjVYbMD5u5OmN4Q5AQ93FdhhE7Y6BnqfK 4gC9lP3+OuaJF2EYnKcnl5ua4bvM+uGWFUF1XY7zbmyD425f/VGh8x7hQPxVMrgwpe JZlCngl8/k8SDddhS4OYLrc2o4+T1om6pv0C6iAA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maximilian Luz , Hans de Goede , Sasha Levin Subject: [PATCH 5.15 14/35] platform/surface: aggregator_registry: Add support for Surface Laptop Go 2 Date: Fri, 16 Sep 2022 12:08:37 +0200 Message-Id: <20220916100447.537941521@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Maximilian Luz [ Upstream commit 84b8e403435c8fb94b872309673764a447961e00 ] The Surface Laptop Go 2 seems to have the same SAM client devices as the Surface Laptop Go 1, so re-use its node group. Signed-off-by: Maximilian Luz Link: https://lore.kernel.org/r/20220810140133.99087-1-luzmaximilian@gmail.= com Signed-off-by: Hans de Goede Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/platform/surface/surface_aggregator_registry.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drive= rs/platform/surface/surface_aggregator_registry.c index 1679811eff502..5c0451c56ea83 100644 --- a/drivers/platform/surface/surface_aggregator_registry.c +++ b/drivers/platform/surface/surface_aggregator_registry.c @@ -558,6 +558,9 @@ static const struct acpi_device_id ssam_platform_hub_ma= tch[] =3D { /* Surface Laptop Go 1 */ { "MSHW0118", (unsigned long)ssam_node_group_slg1 }, =20 + /* Surface Laptop Go 2 */ + { "MSHW0290", (unsigned long)ssam_node_group_slg1 }, + /* Surface Laptop Studio */ { "MSHW0123", (unsigned long)ssam_node_group_sls }, =20 --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67915ECAAD8 for ; Fri, 16 Sep 2022 10:20:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231236AbiIPKUF (ORCPT ); Fri, 16 Sep 2022 06:20:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231691AbiIPKSM (ORCPT ); Fri, 16 Sep 2022 06:18:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D7F1AFAD9; Fri, 16 Sep 2022 03:12:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B9D1262A27; Fri, 16 Sep 2022 10:11:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD440C433D6; Fri, 16 Sep 2022 10:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323102; bh=TNpz5TSPLIITY9+EhMX9wDc1LMTj+4DwgPahXg/iDtk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RhJuW3iLpixJdWM+IgMTkhsdnRaUmR428a5449f63eQLYel7JZgNF7sxcNdkuCqrY 3HR0EcKdknBjDVsUFp8aMfupLvCJJ2V+FAVrsgtKKnwcfa0ZeOYljLF+DDUJI6g33n Q8vtTWHmqmd61fuYsiQYearUkpKNspb4O3F/URaA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rob Clark , Sasha Levin Subject: [PATCH 5.15 15/35] drm/msm/rd: Fix FIFO-full deadlock Date: Fri, 16 Sep 2022 12:08:38 +0200 Message-Id: <20220916100447.578855395@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Rob Clark [ Upstream commit 174974d8463b77c2b4065e98513adb204e64de7d ] If the previous thing cat'ing $debugfs/rd left the FIFO full, then subsequent open could deadlock in rd_write() (because open is blocked, not giving a chance for read() to consume any data in the FIFO). Also it is generally a good idea to clear out old data from the FIFO. Signed-off-by: Rob Clark Patchwork: https://patchwork.freedesktop.org/patch/496706/ Link: https://lore.kernel.org/r/20220807160901.2353471-2-robdclark@gmail.com Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/gpu/drm/msm/msm_rd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index b55398a34fa48..e3f0dd4a36792 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -191,6 +191,9 @@ static int rd_open(struct inode *inode, struct file *fi= le) file->private_data =3D rd; rd->open =3D true; =20 + /* Reset fifo to clear any previously unread data: */ + rd->fifo.head =3D rd->fifo.tail =3D 0; + /* the parsing tools need to know gpu-id to know which * register database to load. */ --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09476C6FA8B for ; Fri, 16 Sep 2022 10:19:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231743AbiIPKSl (ORCPT ); Fri, 16 Sep 2022 06:18:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231658AbiIPKRM (ORCPT ); Fri, 16 Sep 2022 06:17:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44BC6AEDAF; Fri, 16 Sep 2022 03:12:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5F5A2B8253E; Fri, 16 Sep 2022 10:11:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7207C433D6; Fri, 16 Sep 2022 10:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323105; bh=vmKrB7uWruve/xUlBF9Cg4D2v9bGJBJGykfyeN0wSKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SOKVMnce6M1HHKuCHGIINIEVD4/6TY/G7r9hMaBSNDYP7r16z3y+CayhN4J4Ybs3j KFrLK3dmMcRlevbFxniX1OdxhBmSHBFIvDq6PhJ2GtThur4/ogznskV1ycNKy08yO3 mChjE+/9CZZf7b9lDys6E8PrbpNsCxHcR8gyqges= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Guenter Roeck , Sasha Levin Subject: [PATCH 5.15 16/35] hwmon: (pmbus) Use dev_err_probe() to filter -EPROBE_DEFER error messages Date: Fri, 16 Sep 2022 12:08:39 +0200 Message-Id: <20220916100447.621806325@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Christophe JAILLET [ Upstream commit 09e52d17b72d3a4bf6951a90ccd8c97fae04e5cf ] devm_regulator_register() can return -EPROBE_DEFER, so better use dev_err_probe() instead of dev_err(), it is less verbose in such a case. It is also more informative, which can't hurt. Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/3adf1cea6e32e54c0f71f4604b4e98d992beaa71.16= 60741419.git.christophe.jaillet@wanadoo.fr Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/hwmon/pmbus/pmbus_core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_c= ore.c index 63b616ce3a6e9..6d5b228032cad 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -2463,11 +2463,10 @@ static int pmbus_regulator_register(struct pmbus_da= ta *data) =20 rdev =3D devm_regulator_register(dev, &info->reg_desc[i], &config); - if (IS_ERR(rdev)) { - dev_err(dev, "Failed to register %s regulator\n", - info->reg_desc[i].name); - return PTR_ERR(rdev); - } + if (IS_ERR(rdev)) + return dev_err_probe(dev, PTR_ERR(rdev), + "Failed to register %s regulator\n", + info->reg_desc[i].name); } =20 return 0; --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D6ECECAAD8 for ; Fri, 16 Sep 2022 10:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231611AbiIPKQY (ORCPT ); Fri, 16 Sep 2022 06:16:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231450AbiIPKPp (ORCPT ); Fri, 16 Sep 2022 06:15:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 100CAABF24; Fri, 16 Sep 2022 03:11:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B63E562A09; Fri, 16 Sep 2022 10:11:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD63EC433D6; Fri, 16 Sep 2022 10:11:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323108; bh=hTXg7u7di5Z06XG9BCn6oG8/0a79m4ePnTp0VKoo82Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JieO2ZC424eu73WgDoUU1q0NBMd7fHjKTZq6TSXQwuDVTXd26+0mh0HDH9A8uZLMz bivxRQYXDpViMSBIu6LaaYVdbV0VfAxAV93C50mpWv7qguMrr7hNagj21zGApOb0Ud +N2MieJRsdDMj7NKugER0LTd0FylB3NnKuw/qZTA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Kozlowski , Jonathan Cameron , Sasha Levin Subject: [PATCH 5.15 17/35] dt-bindings: iio: gyroscope: bosch,bmg160: correct number of pins Date: Fri, 16 Sep 2022 12:08:40 +0200 Message-Id: <20220916100447.667024754@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Krzysztof Kozlowski [ Upstream commit 767470209cedbe2cc72ba38d77c9f096d2c7694c ] BMG160 has two interrupt pins to which interrupts can be freely mapped. Correct the schema to express such case and fix warnings like: qcom/msm8916-alcatel-idol347.dtb: gyroscope@68: interrupts: [[97, 1], [98= , 1]] is too long However the basic issue still persists - the interrupts should come in a defined order. Signed-off-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20220805075503.16983-1-krzysztof.kozlowski@= linaro.org Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- .../devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.y= aml b/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml index b6bbc312a7cf7..1414ba9977c16 100644 --- a/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml +++ b/Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml @@ -24,8 +24,10 @@ properties: =20 interrupts: minItems: 1 + maxItems: 2 description: Should be configured with type IRQ_TYPE_EDGE_RISING. + If two interrupts are provided, expected order is INT1 and INT2. =20 required: - compatible --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C730FECAAD8 for ; Fri, 16 Sep 2022 10:21:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231807AbiIPKVR (ORCPT ); Fri, 16 Sep 2022 06:21:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231872AbiIPKS7 (ORCPT ); Fri, 16 Sep 2022 06:18:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C141B029E; Fri, 16 Sep 2022 03:12:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C4A9762A0E; Fri, 16 Sep 2022 10:11:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7212C433C1; Fri, 16 Sep 2022 10:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323111; bh=CDsStmIrPeAHmX1Ml4M5Nc0oNw9u01LP4Yp6v594aKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b9M/eId35FDt2d0PZ0TiM98n7ub+aZLkhsxh7O9UoHoMFUqQB10oRAVWoSDymRc6e plf6u2+qEiCFWSXm/BmXJQalUdwW/llp7w6Ik+JHhi+WiZrOq+33MW+Vkfz5PVLGKH W1dS0V4rgCnv2V6j5eXzT3CA/0p0r6QzBLGPivoE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Wang , Jiri Kosina , Sasha Levin Subject: [PATCH 5.15 18/35] HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo Date: Fri, 16 Sep 2022 12:08:41 +0200 Message-Id: <20220916100447.711742281@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jason Wang [ Upstream commit 94553f8a218540d676efbf3f7827ed493d1057cf ] The double `like' is duplicated in the comment, remove one. Signed-off-by: Jason Wang Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/hid/intel-ish-hid/ishtp-hid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.h b/drivers/hid/intel-ish-= hid/ishtp-hid.h index 6a5cc11aefd89..35dddc5015b37 100644 --- a/drivers/hid/intel-ish-hid/ishtp-hid.h +++ b/drivers/hid/intel-ish-hid/ishtp-hid.h @@ -105,7 +105,7 @@ struct report_list { * @multi_packet_cnt: Count of fragmented packet count * * This structure is used to store completion flags and per client data li= ke - * like report description, number of HID devices etc. + * report description, number of HID devices etc. */ struct ishtp_cl_data { /* completion flags */ --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48EE5C6FA8B for ; Fri, 16 Sep 2022 10:21:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231689AbiIPKVw (ORCPT ); Fri, 16 Sep 2022 06:21:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231652AbiIPKT4 (ORCPT ); Fri, 16 Sep 2022 06:19:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EED03B08A8; Fri, 16 Sep 2022 03:13:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 64F0862A24; Fri, 16 Sep 2022 10:13:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 565B9C433D7; Fri, 16 Sep 2022 10:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323196; bh=AfdJmkxYl4fp0gaMB1jEJ0ekn7GLEIObkapGRoAp1ck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O93SKMwAAVOPIQJyBc+vs2XKXd/2P4uc2GEWuhEDFGCk4h7m1e0iv5uELYWVa+8Wo Zfe+Z/mEDePHVU3WHMflQxQXWL+wdXdn+eorL1DScU/vcUYsFzwflLyyxE/esZ3CD0 OArgr6mFYz9J0I2Pu2gsN5dMP7eSr3DWjib60lyg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Even Xu , Srinivas Pandruvada , Jiri Kosina , Sasha Levin Subject: [PATCH 5.15 19/35] hid: intel-ish-hid: ishtp: Fix ishtp client sending disordered message Date: Fri, 16 Sep 2022 12:08:42 +0200 Message-Id: <20220916100447.752735934@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Even Xu [ Upstream commit e1fa076706209cc447d7a2abd0843a18277e5ef7 ] There is a timing issue captured during ishtp client sending stress tests. It was observed during stress tests that ISH firmware is getting out of ordered messages. This is a rare scenario as the current set of ISH client drivers don't send much data to firmware. But this may not be the case going forward. When message size is bigger than IPC MTU, ishtp splits the message into fragments and uses serialized async method to send message fragments. The call stack: ishtp_cl_send_msg_ipc->ipc_tx_callback(first fregment)-> ishtp_send_msg(with callback)->write_ipc_to_queue-> write_ipc_from_queue->callback->ipc_tx_callback(next fregment)...... When an ipc write complete interrupt is received, driver also calls write_ipc_from_queue->ipc_tx_callback in ISR to start sending of next fragm= ent. Through ipc_tx_callback uses spin_lock to protect message splitting, as the serialized sending method will call back to ipc_tx_callback again, so it do= esn't put sending under spin_lock, it causes driver cannot guarantee all fragments be sent in order. Considering this scenario: ipc_tx_callback just finished a fragment splitting, and not call ishtp_send= _msg yet, there is a write complete interrupt happens, then ISR->write_ipc_from_= queue ->ipc_tx_callback->ishtp_send_msg->write_ipc_to_queue...... Because ISR has higher exec priority than normal thread, this causes the new fragment be sent out before previous fragment. This disordered message caus= es invalid message to firmware. The solution is, to send fragments synchronously: Use ishtp_write_message writing fragments into tx queue directly one by one, instead of ishtp_send_msg only writing one fragment with completion callbac= k. As no completion callback be used, so change ipc_tx_callback to ipc_tx_send. Signed-off-by: Even Xu Acked-by: Srinivas Pandruvada Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/hid/intel-ish-hid/ishtp/client.c | 68 ++++++++++++++---------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/drivers/hid/intel-ish-hid/ishtp/client.c b/drivers/hid/intel-i= sh-hid/ishtp/client.c index 405e0d5212cc8..df0a825694f52 100644 --- a/drivers/hid/intel-ish-hid/ishtp/client.c +++ b/drivers/hid/intel-ish-hid/ishtp/client.c @@ -626,13 +626,14 @@ static void ishtp_cl_read_complete(struct ishtp_cl_rb= *rb) } =20 /** - * ipc_tx_callback() - IPC tx callback function + * ipc_tx_send() - IPC tx send function * @prm: Pointer to client device instance * - * Send message over IPC either first time or on callback on previous mess= age - * completion + * Send message over IPC. Message will be split into fragments + * if message size is bigger than IPC FIFO size, and all + * fragments will be sent one by one. */ -static void ipc_tx_callback(void *prm) +static void ipc_tx_send(void *prm) { struct ishtp_cl *cl =3D prm; struct ishtp_cl_tx_ring *cl_msg; @@ -677,32 +678,41 @@ static void ipc_tx_callback(void *prm) list); rem =3D cl_msg->send_buf.size - cl->tx_offs; =20 - ishtp_hdr.host_addr =3D cl->host_client_id; - ishtp_hdr.fw_addr =3D cl->fw_client_id; - ishtp_hdr.reserved =3D 0; - pmsg =3D cl_msg->send_buf.data + cl->tx_offs; + while (rem > 0) { + ishtp_hdr.host_addr =3D cl->host_client_id; + ishtp_hdr.fw_addr =3D cl->fw_client_id; + ishtp_hdr.reserved =3D 0; + pmsg =3D cl_msg->send_buf.data + cl->tx_offs; + + if (rem <=3D dev->mtu) { + /* Last fragment or only one packet */ + ishtp_hdr.length =3D rem; + ishtp_hdr.msg_complete =3D 1; + /* Submit to IPC queue with no callback */ + ishtp_write_message(dev, &ishtp_hdr, pmsg); + cl->tx_offs =3D 0; + cl->sending =3D 0; =20 - if (rem <=3D dev->mtu) { - ishtp_hdr.length =3D rem; - ishtp_hdr.msg_complete =3D 1; - cl->sending =3D 0; - list_del_init(&cl_msg->list); /* Must be before write */ - spin_unlock_irqrestore(&cl->tx_list_spinlock, tx_flags); - /* Submit to IPC queue with no callback */ - ishtp_write_message(dev, &ishtp_hdr, pmsg); - spin_lock_irqsave(&cl->tx_free_list_spinlock, tx_free_flags); - list_add_tail(&cl_msg->list, &cl->tx_free_list.list); - ++cl->tx_ring_free_size; - spin_unlock_irqrestore(&cl->tx_free_list_spinlock, - tx_free_flags); - } else { - /* Send IPC fragment */ - spin_unlock_irqrestore(&cl->tx_list_spinlock, tx_flags); - cl->tx_offs +=3D dev->mtu; - ishtp_hdr.length =3D dev->mtu; - ishtp_hdr.msg_complete =3D 0; - ishtp_send_msg(dev, &ishtp_hdr, pmsg, ipc_tx_callback, cl); + break; + } else { + /* Send ipc fragment */ + ishtp_hdr.length =3D dev->mtu; + ishtp_hdr.msg_complete =3D 0; + /* All fregments submitted to IPC queue with no callback */ + ishtp_write_message(dev, &ishtp_hdr, pmsg); + cl->tx_offs +=3D dev->mtu; + rem =3D cl_msg->send_buf.size - cl->tx_offs; + } } + + list_del_init(&cl_msg->list); + spin_unlock_irqrestore(&cl->tx_list_spinlock, tx_flags); + + spin_lock_irqsave(&cl->tx_free_list_spinlock, tx_free_flags); + list_add_tail(&cl_msg->list, &cl->tx_free_list.list); + ++cl->tx_ring_free_size; + spin_unlock_irqrestore(&cl->tx_free_list_spinlock, + tx_free_flags); } =20 /** @@ -720,7 +730,7 @@ static void ishtp_cl_send_msg_ipc(struct ishtp_device *= dev, return; =20 cl->tx_offs =3D 0; - ipc_tx_callback(cl); + ipc_tx_send(cl); ++cl->send_msg_cnt_ipc; } =20 --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC648ECAAD8 for ; Fri, 16 Sep 2022 10:21:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231774AbiIPKVF (ORCPT ); Fri, 16 Sep 2022 06:21:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231820AbiIPKSu (ORCPT ); Fri, 16 Sep 2022 06:18:50 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6461DAFAF6; Fri, 16 Sep 2022 03:12:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6E82CB82543; Fri, 16 Sep 2022 10:12:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3366C433D7; Fri, 16 Sep 2022 10:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323142; bh=WHRxAVYJvNf+tsOM+bZFl4O0EEI09kuycwNQUMZe5iA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ihmy4e9swsdhG5vnJEYgOo0IjsCwsbDg9ZJLnEHSWH1cF/5d/sZPYIc0LJ3BnIau2 i9SHJpEUj3Wtyjm/3xFUWGyh0E/xmVJ7PGvFFWz0v9A0R1i19Eh/lqlnOwu2oDuFvV zCln8Yia+vmXrBrk7DkIBf0yyUA2l9SsMNt9G3ok= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , Kai-Heng Feng , Michael Chan , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 20/35] tg3: Disable tg3 device on system reboot to avoid triggering AER Date: Fri, 16 Sep 2022 12:08:43 +0200 Message-Id: <20220916100447.793993204@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Kai-Heng Feng [ Upstream commit 2ca1c94ce0b65a2ce7512b718f3d8a0fe6224bca ] Commit d60cd06331a3 ("PM: ACPI: reboot: Use S5 for reboot") caused a reboot hang on one Dell servers so the commit was reverted. Someone managed to collect the AER log and it's caused by MSI: [ 148.762067] ACPI: Preparing to enter system sleep state S5 [ 148.794638] {1}[Hardware Error]: Hardware error from APEI Generic Hardwar= e Error Source: 5 [ 148.803731] {1}[Hardware Error]: event severity: recoverable [ 148.810191] {1}[Hardware Error]: Error 0, type: fatal [ 148.816088] {1}[Hardware Error]: section_type: PCIe error [ 148.822391] {1}[Hardware Error]: port_type: 0, PCIe end point [ 148.829026] {1}[Hardware Error]: version: 3.0 [ 148.834266] {1}[Hardware Error]: command: 0x0006, status: 0x0010 [ 148.841140] {1}[Hardware Error]: device_id: 0000:04:00.0 [ 148.847309] {1}[Hardware Error]: slot: 0 [ 148.852077] {1}[Hardware Error]: secondary_bus: 0x00 [ 148.857876] {1}[Hardware Error]: vendor_id: 0x14e4, device_id: 0x165f [ 148.865145] {1}[Hardware Error]: class_code: 020000 [ 148.870845] {1}[Hardware Error]: aer_uncor_status: 0x00100000, aer_uncor_= mask: 0x00010000 [ 148.879842] {1}[Hardware Error]: aer_uncor_severity: 0x000ef030 [ 148.886575] {1}[Hardware Error]: TLP Header: 40000001 0000030f 90028090 0= 0000000 [ 148.894823] tg3 0000:04:00.0: AER: aer_status: 0x00100000, aer_mask: 0x00= 010000 [ 148.902795] tg3 0000:04:00.0: AER: [20] UnsupReq (First) [ 148.910234] tg3 0000:04:00.0: AER: aer_layer=3DTransaction Layer, aer_age= nt=3DRequester ID [ 148.918806] tg3 0000:04:00.0: AER: aer_uncor_severity: 0x000ef030 [ 148.925558] tg3 0000:04:00.0: AER: TLP Header: 40000001 0000030f 90028090= 00000000 The MSI is probably raised by incoming packets, so power down the device and disable bus mastering to stop the traffic, as user confirmed this approach works. In addition to that, be extra safe and cancel reset task if it's running. Cc: Josef Bacik Link: https://lore.kernel.org/all/b8db79e6857c41dab4ef08bdf826ea7c47e3bafc.= 1615947283.git.josef@toxicpanda.com/ BugLink: https://bugs.launchpad.net/bugs/1917471 Signed-off-by: Kai-Heng Feng Reviewed-by: Michael Chan Link: https://lore.kernel.org/r/20220826002530.1153296-1-kai.heng.feng@cano= nical.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/net/ethernet/broadcom/tg3.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/bro= adcom/tg3.c index 5e0e0e70d8014..8aab07419263e 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -18078,16 +18078,20 @@ static void tg3_shutdown(struct pci_dev *pdev) struct net_device *dev =3D pci_get_drvdata(pdev); struct tg3 *tp =3D netdev_priv(dev); =20 + tg3_reset_task_cancel(tp); + rtnl_lock(); + netif_device_detach(dev); =20 if (netif_running(dev)) dev_close(dev); =20 - if (system_state =3D=3D SYSTEM_POWER_OFF) - tg3_power_down(tp); + tg3_power_down(tp); =20 rtnl_unlock(); + + pci_disable_device(pdev); } =20 /** --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A740C54EE9 for ; Fri, 16 Sep 2022 10:21:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230420AbiIPKVU (ORCPT ); Fri, 16 Sep 2022 06:21:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231892AbiIPKTB (ORCPT ); Fri, 16 Sep 2022 06:19:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0F9F13F49; Fri, 16 Sep 2022 03:12:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 138DDB82539; Fri, 16 Sep 2022 10:12:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58FD6C433D6; Fri, 16 Sep 2022 10:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323171; bh=bUQW0Wp4SnI8PrxP3zvxYr7GetJzUvK5EMTjMqSKClw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mqPqUuWZNC5nJyO3dM6mGun23H2nBS14cjn8ty1lI4uar3CVjoogzzhc0RMjPzT13 YAFsSQsMEsmCg24OGgPHx+WVsbD3fgC7GC1Jap8EzhP3kYudFybG4U1CfB08U9sUXk ycLoUlnk0voE271E7eLGm5aTRXScA+EZ86P46JJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Bartosz Golaszewski , Sasha Levin Subject: [PATCH 5.15 21/35] gpio: mockup: remove gpio debugfs when remove device Date: Fri, 16 Sep 2022 12:08:44 +0200 Message-Id: <20220916100447.835275499@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Wei Yongjun [ Upstream commit 303e6da99429510b1e4edf833afe90ac8542e747 ] GPIO mockup debugfs is created in gpio_mockup_probe() but forgot to remove when remove device. This patch add a devm managed callback for removing them. Signed-off-by: Wei Yongjun Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/gpio/gpio-mockup.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c index d26bff29157b5..369a832d96203 100644 --- a/drivers/gpio/gpio-mockup.c +++ b/drivers/gpio/gpio-mockup.c @@ -373,6 +373,13 @@ static void gpio_mockup_debugfs_setup(struct device *d= ev, } } =20 +static void gpio_mockup_debugfs_cleanup(void *data) +{ + struct gpio_mockup_chip *chip =3D data; + + debugfs_remove_recursive(chip->dbg_dir); +} + static void gpio_mockup_dispose_mappings(void *data) { struct gpio_mockup_chip *chip =3D data; @@ -455,7 +462,7 @@ static int gpio_mockup_probe(struct platform_device *pd= ev) =20 gpio_mockup_debugfs_setup(dev, chip); =20 - return 0; + return devm_add_action_or_reset(dev, gpio_mockup_debugfs_cleanup, chip); } =20 static const struct of_device_id gpio_mockup_of_match[] =3D { --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70FACECAAD8 for ; Fri, 16 Sep 2022 10:23:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231949AbiIPKW6 (ORCPT ); Fri, 16 Sep 2022 06:22:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231716AbiIPKVw (ORCPT ); Fri, 16 Sep 2022 06:21:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C76CDADCC1; Fri, 16 Sep 2022 03:13:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 515ABB82520; Fri, 16 Sep 2022 10:12:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DE86C433D6; Fri, 16 Sep 2022 10:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323175; bh=LiI4v9vBPc7mLT6eREo4zXLAyk3E8pYsOLWHLK96i/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nyS1DDqpovG6NLBH2f3fhIQ3pMHFpAoVn3Mf697/AkaiwAYU3s3VcIjybCXKzSQYx X5DyNY5fqLXnqYTaadBkFNtDUH0YdA2IPl4OZTl4pp9CATMQvHPatAvafZiy+TLtjk Ig+xHaJD+xHcwLR+l21VFG3AuSAgOoWjeZYvbDIQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Li Qiong , Stefan Schmidt , Sasha Levin Subject: [PATCH 5.15 22/35] ieee802154: cc2520: add rc code in cc2520_tx() Date: Fri, 16 Sep 2022 12:08:45 +0200 Message-Id: <20220916100447.875710379@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Li Qiong [ Upstream commit ffd7bdddaab193c38416fd5dd416d065517d266e ] The rc code is 0 at the error path "status & CC2520_STATUS_TX_UNDERFLOW". Assign rc code with '-EINVAL' at this error path to fix it. Signed-off-by: Li Qiong Link: https://lore.kernel.org/r/20220829071259.18330-1-liqiong@nfschina.com Signed-off-by: Stefan Schmidt Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/net/ieee802154/cc2520.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc252= 0.c index 89c046b204e0c..4517517215f2b 100644 --- a/drivers/net/ieee802154/cc2520.c +++ b/drivers/net/ieee802154/cc2520.c @@ -504,6 +504,7 @@ cc2520_tx(struct ieee802154_hw *hw, struct sk_buff *skb) goto err_tx; =20 if (status & CC2520_STATUS_TX_UNDERFLOW) { + rc =3D -EINVAL; dev_err(&priv->spi->dev, "cc2520 tx underflow exception\n"); goto err_tx; } --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EFD0ECAAD8 for ; Fri, 16 Sep 2022 10:21:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231824AbiIPKVX (ORCPT ); Fri, 16 Sep 2022 06:21:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231928AbiIPKTL (ORCPT ); Fri, 16 Sep 2022 06:19:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B74EF59E; Fri, 16 Sep 2022 03:12:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BC824629E6; Fri, 16 Sep 2022 10:12:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5F2EC433D6; Fri, 16 Sep 2022 10:12:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323178; bh=54RdefYutBM/Gw3iVNj/W+hkwOzEHl/9vNlS+w2lrfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IPgd212QhcKzhxrpogpk81PdRBpM1AkKYn5DApd+G+JJOQZliMjXvzrUIPUjPuz3R ykdWeilktxi3nOrtkn4im/iTqupGbeSHsB/e+9DzArHXAZo5UXqD48BQTcL8r8j7eo 3euDjeEWmBSXejWk6fwNwpoWMmPtbEwoRKc2KmeI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Greg Tulli , Dmitry Torokhov , Sasha Levin Subject: [PATCH 5.15 23/35] Input: iforce - add support for Boeder Force Feedback Wheel Date: Fri, 16 Sep 2022 12:08:46 +0200 Message-Id: <20220916100447.921097236@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Greg Tulli [ Upstream commit 9c9c71168f7979f3798b61c65b4530fbfbcf19d1 ] Add a new iforce_device entry to support the Boeder Force Feedback Wheel device. Signed-off-by: Greg Tulli Link: https://lore.kernel.org/r/3256420-c8ac-31b-8499-3c488a9880fd@gmail.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- Documentation/input/joydev/joystick.rst | 1 + drivers/input/joystick/iforce/iforce-main.c | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/input/joydev/joystick.rst b/Documentation/input/= joydev/joystick.rst index f615906a0821b..6d721396717a2 100644 --- a/Documentation/input/joydev/joystick.rst +++ b/Documentation/input/joydev/joystick.rst @@ -517,6 +517,7 @@ All I-Force devices are supported by the iforce module.= This includes: * AVB Mag Turbo Force * AVB Top Shot Pegasus * AVB Top Shot Force Feedback Racing Wheel +* Boeder Force Feedback Wheel * Logitech WingMan Force * Logitech WingMan Force Wheel * Guillemot Race Leader Force Feedback diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/jo= ystick/iforce/iforce-main.c index b2a68bc9f0b4d..b86de1312512b 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c @@ -50,6 +50,7 @@ static struct iforce_device iforce_device[] =3D { { 0x046d, 0xc291, "Logitech WingMan Formula Force", btn_wheel, abs_wheel= , ff_iforce }, { 0x05ef, 0x020a, "AVB Top Shot Pegasus", btn_joystick_avb, abs_avb_peg= asus, ff_iforce }, { 0x05ef, 0x8884, "AVB Mag Turbo Force", btn_wheel, abs_wheel, ff_iforc= e }, + { 0x05ef, 0x8886, "Boeder Force Feedback Wheel", btn_wheel, abs_wheel, f= f_iforce }, { 0x05ef, 0x8888, "AVB Top Shot Force Feedback Racing Wheel", btn_wheel, = abs_wheel, ff_iforce }, //? { 0x061c, 0xc0a4, "ACT LABS Force RS", btn_wheel= , abs_wheel, ff_iforce }, //? { 0x061c, 0xc084, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce= }, --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ABFEC54EE9 for ; Fri, 16 Sep 2022 10:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231862AbiIPKVf (ORCPT ); Fri, 16 Sep 2022 06:21:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232018AbiIPKTY (ORCPT ); Fri, 16 Sep 2022 06:19:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 902F713D77; Fri, 16 Sep 2022 03:13:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E7C9262A0E; Fri, 16 Sep 2022 10:13:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C02CCC433C1; Fri, 16 Sep 2022 10:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323181; bh=zGUf+dIncbfBmDbOFyCW2gzyXF8Db5DU0ihwD6D1D48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2I6E68aMgArukDqbBXGi9jLAdL4W3e4yQbakHgQZbTnYlSnFnCKxwfQEW+hMOi7SZ i2D7DjcEnb/8JgXiyvzMlM9udMaH/SwPoA4PTRAsMVRVByHbFwk5QaPGiAOgzXSM+U jlJz5aD+Bo9L16LJpeqBJRA/t5V37+fNtYE2I0XQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maurizio Lombardi , Sagi Grimberg , Chaitanya Kulkarni , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.15 24/35] nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change() Date: Fri, 16 Sep 2022 12:08:47 +0200 Message-Id: <20220916100447.962278530@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Maurizio Lombardi [ Upstream commit 478814a5584197fa1fb18377653626e3416e7cd6 ] TCP_FIN_WAIT2 and TCP_LAST_ACK were not handled, the connection is closing so we can ignore them and avoid printing the "unhandled state" warning message. [ 1298.852386] nvmet_tcp: queue 2 unhandled state 5 [ 1298.879112] nvmet_tcp: queue 7 unhandled state 5 [ 1298.884253] nvmet_tcp: queue 8 unhandled state 5 [ 1298.889475] nvmet_tcp: queue 9 unhandled state 5 v2: Do not call nvmet_tcp_schedule_release_queue(), just ignore the fin_wait2 and last_ack states. Signed-off-by: Maurizio Lombardi Reviewed-by: Sagi Grimberg Reviewed-by: Chaitanya Kulkarni Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/nvme/target/tcp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 889c5433c94d2..fba5a77c58d6b 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1501,6 +1501,9 @@ static void nvmet_tcp_state_change(struct sock *sk) goto done; =20 switch (sk->sk_state) { + case TCP_FIN_WAIT2: + case TCP_LAST_ACK: + break; case TCP_FIN_WAIT1: case TCP_CLOSE_WAIT: case TCP_CLOSE: --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA75AECAAD8 for ; Fri, 16 Sep 2022 10:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231874AbiIPKVj (ORCPT ); Fri, 16 Sep 2022 06:21:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232083AbiIPKTe (ORCPT ); Fri, 16 Sep 2022 06:19:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 461E51E3F6; Fri, 16 Sep 2022 03:13:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D417EB82521; Fri, 16 Sep 2022 10:13:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 104FEC433D6; Fri, 16 Sep 2022 10:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323184; bh=Y2kWidGblQU7Jl85rXu4izXx+BbFIXaPCD5M7Z32Qfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IqgkpcoAAewrOSvusV7OGFPm7tjL28v1CX07tlax/asmEDmCWxmH9rdPeaqCbiBdn DaURl0wuXLLP0Q1XLb1pqBi2InDyDpxAMEly1Qtm1RBYxnoPhoxGc1ca2ePLmOZMMk HrxnGPXYblyOS1On/5sYsKZ2aNfu3AjhnMRdQoPg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chengming Gui , Hawking Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 25/35] drm/amd/amdgpu: skip ucode loading if ucode_size == 0 Date: Fri, 16 Sep 2022 12:08:48 +0200 Message-Id: <20220916100448.005789139@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Chengming Gui [ Upstream commit 39c84b8e929dbd4f63be7e04bf1a2bcd92b44177 ] Restrict the ucode loading check to avoid frontdoor loading error. Signed-off-by: Chengming Gui Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_psp.c index 5b41c29f3ed50..65744c3bd3648 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -2505,7 +2505,7 @@ static int psp_load_smu_fw(struct psp_context *psp) static bool fw_load_skip_check(struct psp_context *psp, struct amdgpu_firmware_info *ucode) { - if (!ucode->fw) + if (!ucode->fw || !ucode->ucode_size) return true; =20 if (ucode->ucode_id =3D=3D AMDGPU_UCODE_ID_SMC && --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DECFAC6FA8B for ; Fri, 16 Sep 2022 10:21:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231810AbiIPKV4 (ORCPT ); Fri, 16 Sep 2022 06:21:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231701AbiIPKUU (ORCPT ); Fri, 16 Sep 2022 06:20:20 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91A90B08A3; Fri, 16 Sep 2022 03:13:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 43732B82548; Fri, 16 Sep 2022 10:13:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A639C43149; Fri, 16 Sep 2022 10:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323188; bh=yxmTmAmQYOY0Y1XhFJJ91Ijes9f9h/iULVvKrO+XC0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UNm5/LMR5umcl4SGonvGipHojehhFjphK68EPwFhwj51gsQKE06S7ideHeKRxK/pW K+RVT6MOn+IvWxfXCT18G++Aylq2m1X0L/MX+E8CA44z2STMHIF1oo7+Pz/Cr0gTnW OcJJlIREkOiRvwZWIz2U4CMLdhe8tk6rEyf8LToc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kurt Kanzenbach , Andrew Lunn , Vladimir Oltean , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 26/35] net: dsa: hellcreek: Print warning only once Date: Fri, 16 Sep 2022 12:08:49 +0200 Message-Id: <20220916100448.045361017@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Kurt Kanzenbach [ Upstream commit 52267ce25f60f37ae40ccbca0b21328ebae5ae75 ] In case the source port cannot be decoded, print the warning only once. This still brings attention to the user and does not spam the logs at the same t= ime. Signed-off-by: Kurt Kanzenbach Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean Link: https://lore.kernel.org/r/20220830163448.8921-1-kurt@linutronix.de Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- net/dsa/tag_hellcreek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/dsa/tag_hellcreek.c b/net/dsa/tag_hellcreek.c index eb204ad36eeec..846588c0070a5 100644 --- a/net/dsa/tag_hellcreek.c +++ b/net/dsa/tag_hellcreek.c @@ -45,7 +45,7 @@ static struct sk_buff *hellcreek_rcv(struct sk_buff *skb, =20 skb->dev =3D dsa_master_find_slave(dev, 0, port); if (!skb->dev) { - netdev_warn(dev, "Failed to get source port: %d\n", port); + netdev_warn_once(dev, "Failed to get source port: %d\n", port); return NULL; } =20 --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65CCCECAAD8 for ; Fri, 16 Sep 2022 10:26:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232060AbiIPK0J (ORCPT ); Fri, 16 Sep 2022 06:26:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231681AbiIPKWk (ORCPT ); Fri, 16 Sep 2022 06:22:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D067B0B2D; Fri, 16 Sep 2022 03:14:09 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 212E4B82543; Fri, 16 Sep 2022 10:13:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BE12C433D6; Fri, 16 Sep 2022 10:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323190; bh=lzvI08HxbeT3BDrPTiftpAaZxUwRATnxFpRa2DlgBPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZrfL5bxoR9S2x3IjgoYO+ARseslOrVH+3EraKNV9jgWtiTAqFrdxZhP5TwlppxzHv k6GucQ7bqgeibdo1iX2Ooe14hHPh5GfIGylw2Q+ziKjcp2HwLV0N0Io55ZupdDWR0n daKefSj7/NSHy4Imc9d94AdTHm201tLLFrhl518Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yu Zhe , Will Deacon , Sasha Levin Subject: [PATCH 5.15 27/35] perf/arm_pmu_platform: fix tests for platform_get_irq() failure Date: Fri, 16 Sep 2022 12:08:50 +0200 Message-Id: <20220916100448.086413293@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Yu Zhe [ Upstream commit 6bb0d64c100091e131cd16710b62fda3319cd0af ] The platform_get_irq() returns negative error codes. It can't actually return zero. Signed-off-by: Yu Zhe Link: https://lore.kernel.org/r/20220825011844.8536-1-yuzhe@nfschina.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/perf/arm_pmu_platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platfor= m.c index 513de1f54e2d7..933b96e243b84 100644 --- a/drivers/perf/arm_pmu_platform.c +++ b/drivers/perf/arm_pmu_platform.c @@ -117,7 +117,7 @@ static int pmu_parse_irqs(struct arm_pmu *pmu) =20 if (num_irqs =3D=3D 1) { int irq =3D platform_get_irq(pdev, 0); - if (irq && irq_is_percpu_devid(irq)) + if ((irq > 0) && irq_is_percpu_devid(irq)) return pmu_parse_percpu_irq(pmu, irq); } =20 --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC1B1C6FA8B for ; Fri, 16 Sep 2022 10:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230373AbiIPKWJ (ORCPT ); Fri, 16 Sep 2022 06:22:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231806AbiIPKVR (ORCPT ); Fri, 16 Sep 2022 06:21:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 192EE979ED; Fri, 16 Sep 2022 03:13:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7F81662A19; Fri, 16 Sep 2022 10:13:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 908C4C433D6; Fri, 16 Sep 2022 10:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323193; bh=tsW+DTT6znUFkdm+6frZ1ZNI7hnR2AHb0jpdcpRlyKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sID64DV1p35gR+/cC4hpZmNRcc8xbfdMgRSjeKVy3Ejit+nuSGLIOuqv5mtKmS4sY RRI59XCIJYLKhb/sKQZqavnJynKizPocZaCDGFu4Ra7/6usEeue2xCyGGvpZhC8idJ SI3pyB5DPoIzniQH66X60UZkI4ok3skalr+7HDnE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Sasha Levin Subject: [PATCH 5.15 28/35] platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes Date: Fri, 16 Sep 2022 12:08:51 +0200 Message-Id: <20220916100448.131046499@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hans de Goede [ Upstream commit c3b82d26bc85f5fc2fef5ec8cce17c89633a55a8 ] 2 keymap fixes for the Acer Aspire One AOD270 and the same hardware rebranded as Packard Bell Dot SC: 1. The F2 key is marked with a big '?' symbol on the Packard Bell Dot SC, this sends WMID_HOTKEY_EVENTs with a scancode of 0x27 add a mapping for this. 2. Scancode 0x61 is KEY_SWITCHVIDEOMODE. Usually this is a duplicate input event with the "Video Bus" input device events. But on these devices the "Video Bus" does not send events for this key. Map 0x61 to KEY_UNKNOWN instead of using KE_IGNORE so that udev/hwdb can override it on these devs. Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20220829163544.5288-1-hdegoede@redhat.com Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/platform/x86/acer-wmi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wm= i.c index 694b45ed06a21..8c2a73d5428d7 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -99,6 +99,7 @@ static const struct key_entry acer_wmi_keymap[] __initcon= st =3D { {KE_KEY, 0x22, {KEY_PROG2} }, /* Arcade */ {KE_KEY, 0x23, {KEY_PROG3} }, /* P_Key */ {KE_KEY, 0x24, {KEY_PROG4} }, /* Social networking_Key */ + {KE_KEY, 0x27, {KEY_HELP} }, {KE_KEY, 0x29, {KEY_PROG3} }, /* P_Key for TM8372 */ {KE_IGNORE, 0x41, {KEY_MUTE} }, {KE_IGNORE, 0x42, {KEY_PREVIOUSSONG} }, @@ -112,7 +113,13 @@ static const struct key_entry acer_wmi_keymap[] __init= const =3D { {KE_IGNORE, 0x48, {KEY_VOLUMEUP} }, {KE_IGNORE, 0x49, {KEY_VOLUMEDOWN} }, {KE_IGNORE, 0x4a, {KEY_VOLUMEDOWN} }, - {KE_IGNORE, 0x61, {KEY_SWITCHVIDEOMODE} }, + /* + * 0x61 is KEY_SWITCHVIDEOMODE. Usually this is a duplicate input event + * with the "Video Bus" input device events. But sometimes it is not + * a dup. Map it to KEY_UNKNOWN instead of using KE_IGNORE so that + * udev/hwdb can override it on systems where it is not a dup. + */ + {KE_KEY, 0x61, {KEY_UNKNOWN} }, {KE_IGNORE, 0x62, {KEY_BRIGHTNESSUP} }, {KE_IGNORE, 0x63, {KEY_BRIGHTNESSDOWN} }, {KE_KEY, 0x64, {KEY_SWITCHVIDEOMODE} }, /* Display Switch */ --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D96B9ECAAD8 for ; Fri, 16 Sep 2022 10:19:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbiIPKS1 (ORCPT ); Fri, 16 Sep 2022 06:18:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231438AbiIPKRN (ORCPT ); Fri, 16 Sep 2022 06:17:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB8EAAF487; Fri, 16 Sep 2022 03:12:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9D3F7B82538; Fri, 16 Sep 2022 10:12:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0911C433C1; Fri, 16 Sep 2022 10:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323145; bh=m0CCmXn+DRNmptGEaAfo1O1jNqKFsxS0zWNvH9+boSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ctMCo6mUyPgS2cd36hkKaetRkdaMqjj7w7QAFhxtX12jhZ9VHeXLU8IkeQ8UcDKHl FVNsbRVrJ+q5HpG1Tmnfp63uzX8lfUybA+FMOonm9N3yVv5JBZhdAVH5CWpK48i9xy Aky0IfLqsmM8WsMT2a1mi0ZRizlEacGKJjFslky0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthias Kaehlcke , Alan Stern , Hu Xiaoying , Sasha Levin Subject: [PATCH 5.15 29/35] usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS Date: Fri, 16 Sep 2022 12:08:52 +0200 Message-Id: <20220916100448.171417859@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hu Xiaoying [ Upstream commit c61feaee68b9735be06f162bc046c7f1959efb0c ] USB external storage device(0x0b05:1932), use gnome-disk-utility tools to test usb write < 30MB/s. if does not to load module of uas for this device, can increase the write speed from 20MB/s to >40MB/s. Suggested-by: Matthias Kaehlcke Acked-by: Alan Stern Signed-off-by: Hu Xiaoying Link: https://lore.kernel.org/r/20220901045737.3438046-1-huxiaoying@kylinos= .cn Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusua= l_uas.h index 4051c8cd0cd8a..23ab3b048d9be 100644 --- a/drivers/usb/storage/unusual_uas.h +++ b/drivers/usb/storage/unusual_uas.h @@ -62,6 +62,13 @@ UNUSUAL_DEV(0x0984, 0x0301, 0x0128, 0x0128, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_IGNORE_UAS), =20 +/* Reported-by: Tom Hu */ +UNUSUAL_DEV(0x0b05, 0x1932, 0x0000, 0x9999, + "ASUS", + "External HDD", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_IGNORE_UAS), + /* Reported-by: David Webb */ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x9999, "Seagate", --=20 2.35.1 From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABD48C6FA8B for ; Fri, 16 Sep 2022 10:20:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231356AbiIPKUA (ORCPT ); Fri, 16 Sep 2022 06:20:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231693AbiIPKSN (ORCPT ); Fri, 16 Sep 2022 06:18:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 544E0AF4AD; Fri, 16 Sep 2022 03:12:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A9B63B8253E; Fri, 16 Sep 2022 10:12:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFB8CC433D6; Fri, 16 Sep 2022 10:12:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323148; bh=KN9By6VJn8TM3x4MzLq38+XMB2rK2Fdsqy+GUO/mHks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vlRptHYfcYXAh/lEM4bSnfg1Y9O3zmLY8DC7Qv58GE36R7X1WcNmfdA4l+t7zqvXM k5v6QPhaIAYbsk+2uYXdOYicA7RDg7diGyJA8rnjOetzheXd9Hw+YHoWqpsTAq5VXS djh65+L3MIOxvpexXJAbZ/VIfxvOS1QBxlpC8NDg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jann Horn Subject: [PATCH 5.15 30/35] mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region() Date: Fri, 16 Sep 2022 12:08:53 +0200 Message-Id: <20220916100448.212192840@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jann Horn This is a stable-specific patch. I botched the stable-specific rewrite of commit b67fbebd4cf98 ("mmu_gather: Force tlb-flush VM_PFNMAP vmas"): As Hugh pointed out, unmap_region() actually operates on a list of VMAs, and the variable "vma" merely points to the first VMA in that list. So if we want to check whether any of the VMAs we're operating on is PFNMAP or MIXEDMAP, we have to iterate through the list and check each VMA. Signed-off-by: Jann Horn Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- mm/mmap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2638,6 +2638,7 @@ static void unmap_region(struct mm_struc { struct vm_area_struct *next =3D vma_next(mm, prev); struct mmu_gather tlb; + struct vm_area_struct *cur_vma; =20 lru_add_drain(); tlb_gather_mmu(&tlb, mm); @@ -2652,8 +2653,12 @@ static void unmap_region(struct mm_struc * concurrent flush in this region has to be coming through the rmap, * and we synchronize against that using the rmap lock. */ - if ((vma->vm_flags & (VM_PFNMAP|VM_MIXEDMAP)) !=3D 0) - tlb_flush_mmu(&tlb); + for (cur_vma =3D vma; cur_vma; cur_vma =3D cur_vma->vm_next) { + if ((cur_vma->vm_flags & (VM_PFNMAP|VM_MIXEDMAP)) !=3D 0) { + tlb_flush_mmu(&tlb); + break; + } + } =20 free_pgtables(&tlb, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, next ? next->vm_start : USER_PGTABLES_CEILING); From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B78FC54EE9 for ; Fri, 16 Sep 2022 10:21:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231793AbiIPKVN (ORCPT ); Fri, 16 Sep 2022 06:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231853AbiIPKSz (ORCPT ); Fri, 16 Sep 2022 06:18:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95E39AF4BF; Fri, 16 Sep 2022 03:12:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BB050629E7; Fri, 16 Sep 2022 10:12:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1059C433D7; Fri, 16 Sep 2022 10:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323151; bh=S07XMmLlcm/5xYS+ZKU7ruAv+2iVf9I/7rxvTXJEHGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dju4f3wzITF1LO3C+KOqk/RZiKH1yuaE4jWopk4Xgx4RXC1lElbMHFocn9EbTxqn8 Gk4wgQAx0joc8tPgetXy5ymFHP6QiTi1XZkp4YVhBhs3Skt8eT/Us41LAQO1IkA13i wS8jkY4iHWaGcQbD92UMO9vZuTNLzXQVdlU7kwak= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathew McBride , Ioana Ciornei , Arnd Bergmann Subject: [PATCH 5.15 31/35] soc: fsl: select FSL_GUTS driver for DPIO Date: Fri, 16 Sep 2022 12:08:54 +0200 Message-Id: <20220916100448.253393410@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Mathew McBride commit 9a472613f5bccf1b36837423495ae592a9c5182f upstream. The soc/fsl/dpio driver will perform a soc_device_match() to determine the optimal cache settings for a given CPU core. If FSL_GUTS is not enabled, this search will fail and the driver will not configure cache stashing for the given DPIO, and a string of "unknown SoC" messages will appear: fsl_mc_dpio dpio.7: unknown SoC version fsl_mc_dpio dpio.6: unknown SoC version fsl_mc_dpio dpio.5: unknown SoC version Fixes: 51da14e96e9b ("soc: fsl: dpio: configure cache stashing destination") Signed-off-by: Mathew McBride Reviewed-by: Ioana Ciornei Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220901052149.23873-2-matt@traverse.com.au' Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/soc/fsl/Kconfig | 1 + 1 file changed, 1 insertion(+) --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig @@ -24,6 +24,7 @@ config FSL_MC_DPIO tristate "QorIQ DPAA2 DPIO driver" depends on FSL_MC_BUS select SOC_BUS + select FSL_GUTS help Driver for the DPAA2 DPIO object. A DPIO provides queue and buffer management facilities for software to interact with From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB1D2C54EE9 for ; Fri, 16 Sep 2022 10:22:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231915AbiIPKWS (ORCPT ); Fri, 16 Sep 2022 06:22:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbiIPKVb (ORCPT ); Fri, 16 Sep 2022 06:21:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76E9AB0B0F; Fri, 16 Sep 2022 03:13:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C654E62A15; Fri, 16 Sep 2022 10:12:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8E44C433C1; Fri, 16 Sep 2022 10:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323154; bh=fv+ekS6RWw8GsEUvlEw6OCT0A6j61vKae45X0UQT26o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oam9C0wOJhnCrgtkfDsPUaLHQiHaVJNy0Y1kXRo6EBCtFnoIMr0movfBEh9iO9rCa Gljq1OU5d7D36QFIqOXKt+U845o4vH2iETJ1AXssH6Jwy+xBYxG5yHVB9PC/X9W3r6 rj1ZBkaAlzReW2PETxDaAPF+98KWGQvTLI4PPJH4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Jack Pham Subject: [PATCH 5.15 32/35] usb: gadget: f_uac2: clean up some inconsistent indenting Date: Fri, 16 Sep 2022 12:08:55 +0200 Message-Id: <20220916100448.299002635@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Colin Ian King commit 18d6b39ee8959c6e513750879b52fd215533cc87 upstream. There are bunch of statements where the indentation is not correct, clean these up. Signed-off-by: Colin Ian King Link: https://lore.kernel.org/r/20210902224758.57600-1-colin.king@canonical= .com Signed-off-by: Jack Pham Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/usb/gadget/function/f_uac2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -760,15 +760,15 @@ static void setup_headers(struct f_uac2_ headers[i++] =3D USBDHDR(&out_clk_src_desc); headers[i++] =3D USBDHDR(&usb_out_it_desc); =20 - if (FUOUT_EN(opts)) - headers[i++] =3D USBDHDR(out_feature_unit_desc); - } + if (FUOUT_EN(opts)) + headers[i++] =3D USBDHDR(out_feature_unit_desc); + } =20 if (EPIN_EN(opts)) { headers[i++] =3D USBDHDR(&io_in_it_desc); =20 - if (FUIN_EN(opts)) - headers[i++] =3D USBDHDR(in_feature_unit_desc); + if (FUIN_EN(opts)) + headers[i++] =3D USBDHDR(in_feature_unit_desc); =20 headers[i++] =3D USBDHDR(&usb_in_ot_desc); } @@ -776,10 +776,10 @@ static void setup_headers(struct f_uac2_ if (EPOUT_EN(opts)) headers[i++] =3D USBDHDR(&io_out_ot_desc); =20 - if (FUOUT_EN(opts) || FUIN_EN(opts)) - headers[i++] =3D USBDHDR(ep_int_desc); + if (FUOUT_EN(opts) || FUIN_EN(opts)) + headers[i++] =3D USBDHDR(ep_int_desc); =20 - if (EPOUT_EN(opts)) { + if (EPOUT_EN(opts)) { headers[i++] =3D USBDHDR(&std_as_out_if0_desc); headers[i++] =3D USBDHDR(&std_as_out_if1_desc); headers[i++] =3D USBDHDR(&as_out_hdr_desc); From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FE13C54EE9 for ; Fri, 16 Sep 2022 10:20:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231759AbiIPKUq (ORCPT ); Fri, 16 Sep 2022 06:20:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231812AbiIPKSu (ORCPT ); Fri, 16 Sep 2022 06:18:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39A77AFAF3; Fri, 16 Sep 2022 03:12:43 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BF29662A20; Fri, 16 Sep 2022 10:12:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0B88C433C1; Fri, 16 Sep 2022 10:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323162; bh=8ThC85J/wSX3GFsBiI4U7mtGNrOsFRRcVFqnrA//jpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g2Kowy92iu+Ao3ZyxwIQTDo3qrcSd6P0n+wIqUCnWH6o6d2viEAfFFUr0tQRKqdF0 Hgu0Si4h96j7BwH1C4p7lcYZH9xoQ9i13XlB90KhnNyIkBtKH8WuF9XNeXDpkBO3xI VjlcMet6Ch+w0gjX/ShdYY5wlKjn6d4BMEpvpWK8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable , Jing Leng , Jack Pham Subject: [PATCH 5.15 33/35] usb: gadget: f_uac2: fix superspeed transfer Date: Fri, 16 Sep 2022 12:08:56 +0200 Message-Id: <20220916100448.339070740@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jing Leng commit f511aef2ebe5377d4c263842f2e0c0b8e274e8e5 upstream. On page 362 of the USB3.2 specification ( https://usb.org/sites/default/files/usb_32_20210125.zip), The 'SuperSpeed Endpoint Companion Descriptor' shall only be returned by Enhanced SuperSpeed devices that are operating at Gen X speed. Each endpoint described in an interface is followed by a 'SuperSpeed Endpoint Companion Descriptor'. If users use SuperSpeed UDC, host can't recognize the device if endpoint doesn't have 'SuperSpeed Endpoint Companion Descriptor' followed. Currently in the uac2 driver code: 1. ss_epout_desc_comp follows ss_epout_desc; 2. ss_epin_fback_desc_comp follows ss_epin_fback_desc; 3. ss_epin_desc_comp follows ss_epin_desc; 4. Only ss_ep_int_desc endpoint doesn't have 'SuperSpeed Endpoint Companion Descriptor' followed, so we should add it. Fixes: eaf6cbe09920 ("usb: gadget: f_uac2: add volume and mute support") Cc: stable Signed-off-by: Jing Leng Signed-off-by: Jack Pham Link: https://lore.kernel.org/r/20220721014815.14453-1-quic_jackp@quicinc.c= om Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/usb/gadget/function/f_uac2.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) --- a/drivers/usb/gadget/function/f_uac2.c +++ b/drivers/usb/gadget/function/f_uac2.c @@ -281,6 +281,12 @@ static struct usb_endpoint_descriptor ss .bInterval =3D 4, }; =20 +static struct usb_ss_ep_comp_descriptor ss_ep_int_desc_comp =3D { + .bLength =3D sizeof(ss_ep_int_desc_comp), + .bDescriptorType =3D USB_DT_SS_ENDPOINT_COMP, + .wBytesPerInterval =3D cpu_to_le16(6), +}; + /* Audio Streaming OUT Interface - Alt0 */ static struct usb_interface_descriptor std_as_out_if0_desc =3D { .bLength =3D sizeof std_as_out_if0_desc, @@ -594,7 +600,8 @@ static struct usb_descriptor_header *ss_ (struct usb_descriptor_header *)&in_feature_unit_desc, (struct usb_descriptor_header *)&io_out_ot_desc, =20 - (struct usb_descriptor_header *)&ss_ep_int_desc, + (struct usb_descriptor_header *)&ss_ep_int_desc, + (struct usb_descriptor_header *)&ss_ep_int_desc_comp, =20 (struct usb_descriptor_header *)&std_as_out_if0_desc, (struct usb_descriptor_header *)&std_as_out_if1_desc, @@ -721,6 +728,7 @@ static void setup_headers(struct f_uac2_ struct usb_ss_ep_comp_descriptor *epout_desc_comp =3D NULL; struct usb_ss_ep_comp_descriptor *epin_desc_comp =3D NULL; struct usb_ss_ep_comp_descriptor *epin_fback_desc_comp =3D NULL; + struct usb_ss_ep_comp_descriptor *ep_int_desc_comp =3D NULL; struct usb_endpoint_descriptor *epout_desc; struct usb_endpoint_descriptor *epin_desc; struct usb_endpoint_descriptor *epin_fback_desc; @@ -748,6 +756,7 @@ static void setup_headers(struct f_uac2_ epin_fback_desc =3D &ss_epin_fback_desc; epin_fback_desc_comp =3D &ss_epin_fback_desc_comp; ep_int_desc =3D &ss_ep_int_desc; + ep_int_desc_comp =3D &ss_ep_int_desc_comp; } =20 i =3D 0; @@ -776,8 +785,11 @@ static void setup_headers(struct f_uac2_ if (EPOUT_EN(opts)) headers[i++] =3D USBDHDR(&io_out_ot_desc); =20 - if (FUOUT_EN(opts) || FUIN_EN(opts)) + if (FUOUT_EN(opts) || FUIN_EN(opts)) { headers[i++] =3D USBDHDR(ep_int_desc); + if (ep_int_desc_comp) + headers[i++] =3D USBDHDR(ep_int_desc_comp); + } =20 if (EPOUT_EN(opts)) { headers[i++] =3D USBDHDR(&std_as_out_if0_desc); From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85E21ECAAD8 for ; Fri, 16 Sep 2022 10:21:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231784AbiIPKVK (ORCPT ); Fri, 16 Sep 2022 06:21:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbiIPKSy (ORCPT ); Fri, 16 Sep 2022 06:18:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DE76DF20; Fri, 16 Sep 2022 03:12:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B85EE62A18; Fri, 16 Sep 2022 10:12:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0241C433D7; Fri, 16 Sep 2022 10:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323165; bh=fsCkcg9eLrtnwopzlQbz4pY3sh8MxH9tjwwq5p3jSHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0S3fsaQMl/bcSSqQ5X6O/85sAypdbN9WPWQhiFMq8zVue99LmnVknuCtuGW0s4aPq kvbV51jBTcKoOjKneps5AiZR9K4VmNqTjc/OC4U+mQ5+NKbmD1TufmMnm5a8b6d1RU dR9eGqxH3bazoU/prnwBcsfVQ8O/g9v2wLQwKXJY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sindhu-Devale , Shiraz Saleem , Leon Romanovsky Subject: [PATCH 5.15 34/35] RDMA/irdma: Use s/g array in post send only when its valid Date: Fri, 16 Sep 2022 12:08:57 +0200 Message-Id: <20220916100448.397377086@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Sindhu-Devale commit 2c8844431d065ae15a6b442f5769b60aeaaa07af upstream. Send with invalidate verb call can pass in an uninitialized s/g array with 0 sge's which is filled into irdma WQE and causes a HW asynchronous event. Fix this by using the s/g array in irdma post send only when its valid. Fixes: 551c46e ("RDMA/irdma: Add user/kernel shared libraries") Signed-off-by: Sindhu-Devale Signed-off-by: Shiraz Saleem Link: https://lore.kernel.org/r/20220906223244.1119-5-shiraz.saleem@intel.c= om Signed-off-by: Leon Romanovsky Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/infiniband/hw/irdma/uk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/infiniband/hw/irdma/uk.c +++ b/drivers/infiniband/hw/irdma/uk.c @@ -501,7 +501,8 @@ enum irdma_status_code irdma_uk_send(str FIELD_PREP(IRDMAQPSQ_IMMDATA, info->imm_data)); i =3D 0; } else { - qp->wqe_ops.iw_set_fragment(wqe, 0, op_info->sg_list, + qp->wqe_ops.iw_set_fragment(wqe, 0, + frag_cnt ? op_info->sg_list : NULL, qp->swqe_polarity); i =3D 1; } From nobody Fri Apr 3 03:48:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5C51C54EE9 for ; Fri, 16 Sep 2022 10:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230034AbiIPKUz (ORCPT ); Fri, 16 Sep 2022 06:20:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231808AbiIPKSt (ORCPT ); Fri, 16 Sep 2022 06:18:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CCD4B02A0; Fri, 16 Sep 2022 03:12:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 904FCB8253E; Fri, 16 Sep 2022 10:12:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEFF0C433D6; Fri, 16 Sep 2022 10:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663323168; bh=hqbrszzZB7d1mUTKiXozYTogJryXmTUijWPoE+NHwLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IQxa2AGvXJllNykqeUZUPUzEmKysNj/ujLzqNkWjQYLiqhuNrI0/WvbY2pGLGoX9d 4D9K6nEuDy7lvLQysxsGkFnOlVf801lpsmM3bwBYYCGRbw4cYHUDdtEiLU88KHzQ6A QaGPpz0lPGPXtNYw0qh1w683PqkcXD9VybBrDpu0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jarrah Gosbell , Dmitry Torokhov Subject: [PATCH 5.15 35/35] Input: goodix - add compatible string for GT1158 Date: Fri, 16 Sep 2022 12:08:58 +0200 Message-Id: <20220916100448.440635965@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916100446.916515275@linuxfoundation.org> References: <20220916100446.916515275@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jarrah Gosbell commit 80b9ebd3e478cd41526cbf84f80c3e0eb885d1d3 upstream. Add compatible string for GT1158 missing from the previous patch. Fixes: 425fe4709c76 ("Input: goodix - add support for GT1158") Signed-off-by: Jarrah Gosbell Link: https://lore.kernel.org/r/20220813043821.9981-1-kernel@undef.tools Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman Reported-by: Linux Kernel Functional Testing Tested-by: Bagas Sanjaya Tested-by: Florian Fainelli Tested-by: Guenter Roeck Tested-by: Ron Economos Tested-by: Sudip Mukherjee --- drivers/input/touchscreen/goodix.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -1363,6 +1363,7 @@ MODULE_DEVICE_TABLE(acpi, goodix_acpi_ma #ifdef CONFIG_OF static const struct of_device_id goodix_of_match[] =3D { { .compatible =3D "goodix,gt1151" }, + { .compatible =3D "goodix,gt1158" }, { .compatible =3D "goodix,gt5663" }, { .compatible =3D "goodix,gt5688" }, { .compatible =3D "goodix,gt911" },