Date: Sun, 23 Jun 2024 10:06:22 +0200 From: Wolfram Sang To: Linus Torvalds Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Rosin , Bartosz Golaszewski , Andi Shyti Subject: [PULL REQUEST] i2c-for-6.10-rc5 Message-ID: Mail-Followup-To: Wolfram Sang , Linus Torvalds , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Rosin , Bartosz Golaszewski , Andi Shyti X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="CcDWrlTMmm+xypyo" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255794 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-i2c Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --CcDWrlTMmm+xypyo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Linus, the doc updates not only fix outdated information but also set the base for new terminology which we want to apply soon to avoid dependencies. Please pull. Wolfram The following changes since commit 6ba59ff4227927d3a8530fc2973b80e94b54d58f: Linux 6.10-rc4 (2024-06-16 13:40:16 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git tags/i2c-for-6.10-rc5 for you to fetch changes up to 2c50f892caadc94ff216d42accd8222e172b5144: Merge tag 'i2c-host-fixes-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current (2024-06-23 02:13:27 +0200) ---------------------------------------------------------------- The core gains placeholders for recently added functions when CONFIG_I2C is not defined as well documentation fixes to start using inclusive terminology. The drivers get paths in DT bindings fixed as well as proper interrupt handling for the ocores driver. ---------------------------------------------------------------- Grygorii Tertychnyi (1): i2c: ocores: set IACK bit after core is enabled Krzysztof Kozlowski (2): dt-bindings: i2c: atmel,at91sam: correct path to i2c-controller schema dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema Sakari Ailus (1): i2c: Add nop fwnode operations Wolfram Sang (7): docs: i2c: summary: start sentences consistently. docs: i2c: summary: update I2C specification link docs: i2c: summary: update speed mode description docs: i2c: summary: document use of inclusive language docs: i2c: summary: document 'local' and 'remote' targets docs: i2c: summary: be clearer with 'controller/target' and 'adapter/client' pairs Merge tag 'i2c-host-fixes-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current with much appreciated quality assurance from ---------------------------------------------------------------- Conor Dooley (2): (Rev.) dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema (Rev.) dt-bindings: i2c: atmel,at91sam: correct path to i2c-controller schema Easwar Hariharan (6): (Rev.) docs: i2c: summary: be clearer with 'controller/target' and 'adapter/client' pairs (Rev.) docs: i2c: summary: document 'local' and 'remote' targets (Rev.) docs: i2c: summary: document use of inclusive language (Rev.) docs: i2c: summary: update speed mode description (Rev.) docs: i2c: summary: update I2C specification link (Rev.) docs: i2c: summary: start sentences consistently. .../devicetree/bindings/i2c/atmel,at91sam-i2c.yaml | 2 +- .../bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- Documentation/i2c/i2c_bus.svg | 15 ++-- Documentation/i2c/summary.rst | 79 ++++++++++++++-------- drivers/i2c/busses/i2c-ocores.c | 2 +- include/linux/i2c.h | 24 ++++++- 6 files changed, 83 insertions(+), 41 deletions(-) --CcDWrlTMmm+xypyo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAmZ3134ACgkQFA3kzBSg KbYPbw/9Ey6o45ZFS8G8SFCEn3CUSst8se3v1UE/Cn5mw2gAehELOqLn/f98AFAS 2j05gkoD28TEglszRCIaWBSISSW2XM1xVDQ6I0szmSBJyJ/43ajy536wc4gVAENo BWGT8SxYCp6BM/x//hEx+sw3Ok1FKOTPb/pOZvcawXmmVXQbEA4fMPzHdRKSvFy4 abY5UMwYT8z34BqfBzWWq/oOgvZTRvgeFpzvJGDlAHaEs7LOeqeWF0LwoRiHQ3Q+ Mx03zbyy+r4fFKAY8UWUXWxVM/aBRVxhMp3CLfyRmq7tt7R4aru/v0P0GTawLtUU FFKBEDkjiBaXISMsoCORhX/3rkvqVJItGuX2m8jHIUpHwvSPn4zjjTB0yRcn84yE 5MA0dQ8vngoP344EcBvN9zvAuTs0yzuv8mb7cVqSr4vf9ynkIwWEHkrI0M6U/Jti WD3/WXGPwv24xAkyNQKlmcM5EH19VZwKhwr3oTyUuh6t4af6PeTCUwM/614vAbaU hKs3GZ+DyhPCHXX75dqWvjkA/yv/ay2E/MhnWDWMICU15tKN78CizXbEUM1vaieR tB3BY359gdMBCxPnU1OVDkXj2MdQN4bPPNSSbTuHl4x/5dBZZHdDx84VNSKzEhf1 tmn8Qwob2VolyPH+qvZNTWrDzJpP8AJfkKGWz6HTVGW35JEgG8w= =umm3 -----END PGP SIGNATURE----- --CcDWrlTMmm+xypyo-- . From: David Vernet To: tj@kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: [PATCH] sched_ext: Make scx_bpf_cpuperf_set() @cpu arg signed Date: Sun, 23 Jun 2024 03:10:36 -0500 Message-ID: <20240623081036.51867-1-void@manifault.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255797 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The scx_bpf_cpuperf_set() kfunc allows a BPF program to set the relative performance target of a specified CPU. Commit d86adb4fc065 ("sched_ext: Add cpuperf support") defined the @cpu argument to be unsigned. Let's update it to be signed to match the norm for the rest of ext.c and the kernel. Note that the kfunc declaration of scx_bpf_cpuperf_set() in the common.bpf.h header in tools/sched_ext already listed the cpu as signed, so this also fixes the build for tools/sched_ext and the sched_ext selftests due to kfunc declarations now being emitted in vmlinux.h based on BTF (thus causing the compiler to error due to observing conflicting types). Fixes: d86adb4fc065 ("sched_ext: Add cpuperf support") Signed-off-by: David Vernet --- kernel/sched/ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 28f7a4266fde..8e8b44f2c74a 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -5893,7 +5893,7 @@ __bpf_kfunc u32 scx_bpf_cpuperf_cur(s32 cpu) * use. Consult hardware and cpufreq documentation for more information. The * current performance level can be monitored using scx_bpf_cpuperf_cur(). */ -__bpf_kfunc void scx_bpf_cpuperf_set(u32 cpu, u32 perf) +__bpf_kfunc void scx_bpf_cpuperf_set(s32 cpu, u32 perf) { if (unlikely(perf > SCX_CPUPERF_ONE)) { scx_ops_error("Invalid cpuperf target %u for CPU %d", perf, cpu); -- 2.45.2 . From: Ma Ke To: lars@metafoo.de, vkoul@kernel.org Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH] dmaengine: axi-dmac: Add check for dma_set_max_seg_size Date: Sun, 23 Jun 2024 16:16:44 +0800 Message-Id: <20240623081644.2089695-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255799 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.dmaengine Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail To avoid possible failure of the dma_set_max_seg_size(), we should better check the return value of the dma_set_max_seg_size(). Signed-off-by: Ma Ke --- drivers/dma/dma-axi-dmac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c index bdb752f11869..93543c2f1bd7 100644 --- a/drivers/dma/dma-axi-dmac.c +++ b/drivers/dma/dma-axi-dmac.c @@ -1051,7 +1051,9 @@ static int axi_dmac_probe(struct platform_device *pdev) INIT_LIST_HEAD(&dmac->chan.active_descs); - dma_set_max_seg_size(&pdev->dev, UINT_MAX); + ret = dma_set_max_seg_size(&pdev->dev, UINT_MAX); + if (ret) + return ret; dma_dev = &dmac->dma_dev; dma_cap_set(DMA_SLAVE, dma_dev->cap_mask); -- 2.25.1 . X-Virus-Scanned: Debian amavisd-new at mail.alien8.de Date: Sun, 23 Jun 2024 10:23:10 +0200 From: Borislav Petkov To: Linus Torvalds Cc: x86-ml , lkml Subject: [GIT PULL] x86/urgent for v6.10-rc5 Message-ID: <20240623082310.GAZnfbbi9ZV1nEpkpE@fat_crate.local> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255800 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Linus, please pull two x86 urgent fixes for v6.10-rc5. Thx. --- The following changes since commit 6ba59ff4227927d3a8530fc2973b80e94b54d58f: Linux 6.10-rc4 (2024-06-16 13:40:16 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip tags/x86_urgent_for_v6.10_rc5 for you to fetch changes up to 739c9765793e5794578a64aab293c58607f1826a: x86/resctrl: Don't try to free nonexistent RMIDs (2024-06-19 11:39:09 +0200) ---------------------------------------------------------------- - An ARM-relevant fix to not free default RMIDs of a resource control group - A randconfig build fix for the VMware virtual GPU driver ---------------------------------------------------------------- Alexey Makhalov (1): drm/vmwgfx: Fix missing HYPERVISOR_GUEST dependency Dave Martin (1): x86/resctrl: Don't try to free nonexistent RMIDs arch/x86/kernel/cpu/resctrl/monitor.c | 3 ++- drivers/gpu/drm/vmwgfx/Kconfig | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette . From: Andy Yan To: heiko@sntech.de Cc: dsimic@manjaro.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH] arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi 4B Date: Sun, 23 Jun 2024 16:34:13 +0800 Message-Id: <20240623083413.2051412-1-andyshrk@163.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255801 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail According to the hardware design, the i2c address of audio codec es8316 on Cool Pi 4B is 0x10. This fix the read/write error like bellow: es8316 7-0011: ASoC: error at soc_component_write_no_lock on es8316.7-0011 for register: [0x0000000c] -6 es8316 7-0011: ASoC: error at soc_component_write_no_lock on es8316.7-0011 for register: [0x00000003] -6 es8316 7-0011: ASoC: error at soc_component_read_no_lock on es8316.7-0011 for register: [0x00000016] -6 es8316 7-0011: ASoC: error at soc_component_read_no_lock on es8316.7-0011 for register: [0x00000016] -6 Fixes: 3f5d336d64d6 ("arm64: dts: rockchip: Add support for rk3588s based board Cool Pi 4B") Signed-off-by: Andy Yan --- arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts index 20a0a60acd16..091dee37d068 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts @@ -302,7 +302,7 @@ &i2c7 { es8316: audio-codec@11 { compatible = "everest,es8316"; - reg = <0x11>; + reg = <0x10>; assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; assigned-clock-rates = <12288000>; clocks = <&cru I2S0_8CH_MCLKOUT>; -- 2.34.1 . From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH] firewire: core: undefine macros after use in tracepoints events Date: Sun, 23 Jun 2024 17:39:00 +0900 Message-ID: <20240623083900.777897-1-o-takashi@sakamocchi.jp> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255803 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Some macros are defined in tracepoints events. They should be back to undefined state after use. Signed-off-by: Takashi Sakamoto --- include/trace/events/firewire.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/trace/events/firewire.h b/include/trace/events/firewire.h index 5ccc0d91b220..132f9329224d 100644 --- a/include/trace/events/firewire.h +++ b/include/trace/events/firewire.h @@ -366,6 +366,14 @@ TRACE_EVENT(bus_reset_handle, ) ); +#undef PHY_PACKET_SELF_ID_GET_PHY_ID +#undef PHY_PACKET_SELF_ID_GET_LINK_ACTIVE +#undef PHY_PACKET_SELF_ID_GET_GAP_COUNT +#undef PHY_PACKET_SELF_ID_GET_SCODE +#undef PHY_PACKET_SELF_ID_GET_CONTENDER +#undef PHY_PACKET_SELF_ID_GET_POWER_CLASS +#undef PHY_PACKET_SELF_ID_GET_INITIATED_RESET + #undef QUADLET_SIZE #endif // _FIREWIRE_TRACE_EVENT_H -- 2.43.0 . From: Frank Oltmanns Date: Sun, 23 Jun 2024 10:45:58 +0200 Subject: [PATCH] clk: sunxi-ng: common: Don't call hw_to_ccu_common on hw without common X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240623-sunxi-ng_fix_common_probe-v1-1-7c97e32824a1@oltmanns.dev> To: Michael Turquette , Stephen Boyd , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Maxime Ripard Cc: =?utf-8?q?M=C3=A5ns_Rullg=C3=A5rd?= , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, "Robert J. Pafford" , stable@vger.kernel.org, Frank Oltmanns Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255804 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-sunxi,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-clk,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail In order to set the rate range of a hw sunxi_ccu_probe calls hw_to_ccu_common() assuming all entries in desc->ccu_clks are contained in a ccu_common struct. This assumption is incorrect and, in consequence, causes invalid pointer de-references. Remove the faulty call. Instead, add one more loop that iterates over the ccu_clks and sets the rate range, if required. Fixes: b914ec33b391 ("clk: sunxi-ng: common: Support minimum and maximum rate") Reported-by: Robert J. Pafford Closes: https://lore.kernel.org/lkml/DM6PR01MB58047C810DDD5D0AE397CADFF7C22@DM6PR01MB5804.prod.exchangelabs.com/ Cc: stable@vger.kernel.org Signed-off-by: Frank Oltmanns --- Robert, could you please test if this fixes the issue you reported. I'm CC'ing Måns here, because he observed some strange behavior [1] with the original patch. Is it possible for you to look into if this patch fixes your issue without the need for the following (seemingly unrelated) patches: cedb7dd193f6 "drm/sun4i: hdmi: Convert encoder to atomic" 9ca6bc246035 "drm/sun4i: hdmi: Move mode_set into enable" Thanks, Frank [1]: https://lore.kernel.org/lkml/yw1xo78z8ez0.fsf@mansr.com/ --- drivers/clk/sunxi-ng/ccu_common.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu_common.c b/drivers/clk/sunxi-ng/ccu_common.c index ac0091b4ce24..be375ce0149c 100644 --- a/drivers/clk/sunxi-ng/ccu_common.c +++ b/drivers/clk/sunxi-ng/ccu_common.c @@ -132,7 +132,6 @@ static int sunxi_ccu_probe(struct sunxi_ccu *ccu, struct device *dev, for (i = 0; i < desc->hw_clks->num ; i++) { struct clk_hw *hw = desc->hw_clks->hws[i]; - struct ccu_common *common = hw_to_ccu_common(hw); const char *name; if (!hw) @@ -147,14 +146,21 @@ static int sunxi_ccu_probe(struct sunxi_ccu *ccu, struct device *dev, pr_err("Couldn't register clock %d - %s\n", i, name); goto err_clk_unreg; } + } + + for (i = 0; i < desc->num_ccu_clks; i++) { + struct ccu_common *cclk = desc->ccu_clks[i]; + + if (!cclk) + continue; - if (common->max_rate) - clk_hw_set_rate_range(hw, common->min_rate, - common->max_rate); + if (cclk->max_rate) + clk_hw_set_rate_range(&cclk->hw, cclk->min_rate, + cclk->max_rate); else - WARN(common->min_rate, + WARN(cclk->min_rate, "No max_rate, ignoring min_rate of clock %d - %s\n", - i, name); + i, clk_hw_get_name(&cclk->hw)); } ret = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, --- base-commit: 2607133196c35f31892ee199ce7ffa717bea4ad1 change-id: 20240622-sunxi-ng_fix_common_probe-5677c3e487fc Best regards, -- Frank Oltmanns . From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 0/3] drm: backlight quirk infrastructure and lower minimum for Framework AMD 13 Date: Sun, 23 Jun 2024 10:51:26 +0200 Message-Id: <20240623-amdgpu-min-backlight-quirk-v2-0-cecf7f49da9b@weissschuh.net> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Harry Wentland , Leo Li , Rodrigo Siqueira , Mario Limonciello , Matt Hartley , Kieran Levin , Hans de Goede Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dustin Howett , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255807 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The value of "min_input_signal" returned from ATIF on a Framework AMD 13 is "12". This leads to a fairly bright minimum display backlight. Add a generic quirk infrastructure for backlight configuration to override the settings provided by the firmware. Also add amdgpu as a user of that infrastructure and a quirk for the Framework 13 matte panel. Most likely this will also work for the glossy panel, but I can't test that. One solution would be a fixed firmware version, but given that the problem exists since the release of the hardware, it has been known for a month that the hardware can go lower and there was no acknowledgment from Framework in any way, I'd like to explore this alternative way forward. Notes: * Should the quirk infrastructure be part of drm_edid.c? * The current allocation of struct drm_edid in amdgpu is bad. But it is done the same way in other parts of amdgpu. I do have patches migrating amdgpu to proper usage of struct drm_edid [0] Mario: I intentionally left out the consideration of the firmware version. The quirk will stay correct even if the firmware starts reporting correct values. If there are strong opinions it would be easy to add, though. Based on amdgpu/drm-next. [0] https://lore.kernel.org/lkml/20240616-amdgpu-edid-bios-v1-1-2874f212b365@weissschuh.net/ --- Changes in v2: - Introduce proper drm backlight quirk infrastructure - Quirk by EDID and DMI instead of only DMI - Limit quirk to only single Framework 13 matte panel - Link to v1: https://lore.kernel.org/r/20240610-amdgpu-min-backlight-quirk-v1-1-8459895a5b2a@weissschuh.net --- Thomas Weißschuh (3): drm: Add panel backlight quirks drm: panel-backlight-quirks: Add Framework 13 matte panel drm/amd/display: Add support backlight quirks Documentation/gpu/drm-kms-helpers.rst | 3 + drivers/gpu/drm/Kconfig | 4 ++ drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 28 +++++++++ drivers/gpu/drm/drm_panel_backlight_quirks.c | 76 +++++++++++++++++++++++ include/drm/drm_utils.h | 11 ++++ 7 files changed, 124 insertions(+) --- base-commit: 1ecef5589320fd56af599b624d59c355d162ac7b change-id: 20240610-amdgpu-min-backlight-quirk-8402fd8e736a Best regards, -- Thomas Weißschuh . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Sun, 23 Jun 2024 02:23:21 -0700 Message-ID: <0000000000004492c2061b8b3796@google.com> Subject: [syzbot] [bcachefs?] kernel BUG in bch2_bucket_alloc_freelist From: syzbot To: bfoster@redhat.com, kent.overstreet@linux.dev, linux-bcachefs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255814 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-bcachefs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: 2ccbdf43d5e7 Merge tag 'for-linus' of git://git.kernel.org.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=15b13146980000 kernel config: https://syzkaller.appspot.com/x/.config?x=81c0d76ceef02b39 dashboard link: https://syzkaller.appspot.com/bug?extid=3d2944b5612507034fc4 compiler: gcc (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40 userspace arch: i386 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image (non-bootable): https://storage.googleapis.com/syzbot-assets/7bc7510fe41f/non_bootable_disk-2ccbdf43.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/13cdb5bfbafa/vmlinux-2ccbdf43.xz kernel image: https://storage.googleapis.com/syzbot-assets/7a14f5d07f81/bzImage-2ccbdf43.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+3d2944b5612507034fc4@syzkaller.appspotmail.com ------------[ cut here ]------------ kernel BUG at fs/bcachefs/alloc_foreground.c:489! Oops: invalid opcode: 0000 [#1] PREEMPT SMP KASAN NOPTI CPU: 3 PID: 5534 Comm: syz-executor.2 Not tainted 6.10.0-rc3-syzkaller-00044-g2ccbdf43d5e7 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:bch2_bucket_alloc_freelist+0xec0/0x1090 fs/bcachefs/alloc_foreground.c:489 Code: ff ff 48 8b bd 18 fe ff ff e8 7c ba 0a fe e9 19 f9 ff ff 48 8b bd 88 fe ff ff e8 db b9 0a fe e9 55 f9 ff ff e8 91 87 ad fd 90 <0f> 0b 4c 89 ef e8 c6 b9 0a fe e9 25 f8 ff ff 48 89 cf e8 e9 b9 0a RSP: 0018:ffffc90007fde1a0 EFLAGS: 00010246 RAX: 0000000000040000 RBX: 0000000000000019 RCX: ffffc90002f22000 RDX: 0000000000040000 RSI: ffffffff83e1083f RDI: 0000000000000007 RBP: ffffc90007fde3d0 R08: ffff8880217ce120 R09: 0000000000000000 R10: 0000000000000019 R11: 0000000000000001 R12: ffff8880217ce000 R13: ffff8880217ce2f8 R14: ffff88802bb94042 R15: dffffc0000000000 FS: 0000000000000000(0000) GS:ffff88802c300000(0063) knlGS:00000000f5f32b40 CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 CR2: 0000000031c3b000 CR3: 0000000053c02000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: bch2_bucket_alloc_trans+0x706/0xb20 fs/bcachefs/alloc_foreground.c:649 bch2_bucket_alloc_set_trans+0x466/0xd40 fs/bcachefs/alloc_foreground.c:810 __open_bucket_add_buckets+0x991/0x12f0 fs/bcachefs/alloc_foreground.c:1058 open_bucket_add_buckets+0x116/0x200 fs/bcachefs/alloc_foreground.c:1102 bch2_alloc_sectors_start_trans+0xa41/0x1ba0 fs/bcachefs/alloc_foreground.c:1457 __bch2_btree_node_alloc+0x718/0xdc0 fs/bcachefs/btree_update_interior.c:333 bch2_btree_reserve_get+0x21d/0x330 fs/bcachefs/btree_update_interior.c:547 bch2_btree_update_start+0x1235/0x1ed0 fs/bcachefs/btree_update_interior.c:1245 bch2_btree_split_leaf+0xc9/0x770 fs/bcachefs/btree_update_interior.c:1851 bch2_trans_commit_error+0x327/0xd00 fs/bcachefs/btree_trans_commit.c:918 __bch2_trans_commit+0x383b/0x7a40 fs/bcachefs/btree_trans_commit.c:1138 bch2_trans_commit fs/bcachefs/btree_update.h:170 [inline] bch2_logged_op_start+0x122/0x1b0 fs/bcachefs/logged_ops.c:83 bch2_truncate+0x173/0x240 fs/bcachefs/io_misc.c:291 bchfs_truncate+0x90c/0xd70 fs/bcachefs/fs-io.c:476 bch2_setattr+0x1ab/0x250 fs/bcachefs/fs.c:918 notify_change+0x742/0x11f0 fs/attr.c:497 do_truncate+0x15c/0x220 fs/open.c:65 handle_truncate fs/namei.c:3308 [inline] do_open fs/namei.c:3654 [inline] path_openat+0x2505/0x29f0 fs/namei.c:3807 do_filp_open+0x1dc/0x430 fs/namei.c:3834 do_sys_openat2+0x17a/0x1e0 fs/open.c:1405 do_sys_open fs/open.c:1420 [inline] __do_compat_sys_openat fs/open.c:1480 [inline] __se_compat_sys_openat fs/open.c:1478 [inline] __ia32_compat_sys_openat+0x16e/0x210 fs/open.c:1478 do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline] __do_fast_syscall_32+0x73/0x120 arch/x86/entry/common.c:386 do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411 entry_SYSENTER_compat_after_hwframe+0x84/0x8e RIP: 0023:0xf7340579 Code: b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 00 00 00 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d b4 26 00 00 00 00 8d b4 26 00 00 00 00 RSP: 002b:00000000f5f325ac EFLAGS: 00000292 ORIG_RAX: 0000000000000127 RAX: ffffffffffffffda RBX: 00000000ffffff9c RCX: 0000000020000080 RDX: 0000000000183341 RSI: 0000000000000000 RDI: 0000000000000000 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000292 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 Modules linked in: ---[ end trace 0000000000000000 ]--- RIP: 0010:bch2_bucket_alloc_freelist+0xec0/0x1090 fs/bcachefs/alloc_foreground.c:489 Code: ff ff 48 8b bd 18 fe ff ff e8 7c ba 0a fe e9 19 f9 ff ff 48 8b bd 88 fe ff ff e8 db b9 0a fe e9 55 f9 ff ff e8 91 87 ad fd 90 <0f> 0b 4c 89 ef e8 c6 b9 0a fe e9 25 f8 ff ff 48 89 cf e8 e9 b9 0a RSP: 0018:ffffc90007fde1a0 EFLAGS: 00010246 RAX: 0000000000040000 RBX: 0000000000000019 RCX: ffffc90002f22000 RDX: 0000000000040000 RSI: ffffffff83e1083f RDI: 0000000000000007 RBP: ffffc90007fde3d0 R08: ffff8880217ce120 R09: 0000000000000000 R10: 0000000000000019 R11: 0000000000000001 R12: ffff8880217ce000 R13: ffff8880217ce2f8 R14: ffff88802bb94042 R15: dffffc0000000000 FS: 0000000000000000(0000) GS:ffff88802c200000(0063) knlGS:00000000f5f32b40 CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 CR2: 0000560e79cc7088 CR3: 0000000053c02000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 ---------------- Code disassembly (best guess), 2 bytes skipped: 0: 10 06 adc %al,(%rsi) 2: 03 74 b4 01 add 0x1(%rsp,%rsi,4),%esi 6: 10 07 adc %al,(%rdi) 8: 03 74 b0 01 add 0x1(%rax,%rsi,4),%esi c: 10 08 adc %cl,(%rax) e: 03 74 d8 01 add 0x1(%rax,%rbx,8),%esi 1e: 00 51 52 add %dl,0x52(%rcx) 21: 55 push %rbp 22: 89 e5 mov %esp,%ebp 24: 0f 34 sysenter 26: cd 80 int $0x80 * 28: 5d pop %rbp <-- trapping instruction 29: 5a pop %rdx 2a: 59 pop %rcx 2b: c3 ret 2c: 90 nop 2d: 90 nop 2e: 90 nop 2f: 90 nop 30: 8d b4 26 00 00 00 00 lea 0x0(%rsi,%riz,1),%esi 37: 8d b4 26 00 00 00 00 lea 0x0(%rsi,%riz,1),%esi --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 23 Jun 2024 11:26:56 +0200 X-ME-IP: 86.243.222.230 From: Christophe JAILLET To: Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , xen-devel@lists.xenproject.org Subject: [PATCH] xen/manage: Constify struct shutdown_handler Date: Sun, 23 Jun 2024 11:26:50 +0200 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255815 org.xenproject.lists.xen-devel:51133 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kernel-janitors,org.xenproject.lists.xen-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 'struct shutdown_handler' is not modified in this driver. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig: Before: ====== text data bss dec hex filename 7043 788 8 7839 1e9f drivers/xen/manage.o After: ===== text data bss dec hex filename 7164 676 8 7848 1ea8 drivers/xen/manage.o Signed-off-by: Christophe JAILLET --- Compile tested-only --- drivers/xen/manage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index c16df629907e..b4b4ebed68da 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -208,7 +208,7 @@ static void do_reboot(void) orderly_reboot(); } -static struct shutdown_handler shutdown_handlers[] = { +static const struct shutdown_handler shutdown_handlers[] = { { "poweroff", true, do_poweroff }, { "halt", false, do_poweroff }, { "reboot", true, do_reboot }, -- 2.45.2 . From: Wentong Wu To: sakari.ailus@linux.intel.com, tomas.winkler@intel.com, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Wentong Wu Subject: [PATCH 0/6] Fix MEI command timeout issue following warm reboot Date: Sun, 23 Jun 2024 17:30:50 +0800 Message-Id: <20240623093056.4169438-1-wentong.wu@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255816 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail While enabling the IVSC on certain recent commercial products, the chipset may occasionally enter an unknown state following a warm reboot. This issue can cause the firmware to fail in responding to the MEI command from the host, despite the firmware being re-downloaded. To resolve this, the current patch set incorporates reset logic during system shutdown to ensure that the IVSC chipset remains in a valid state after a warm reboot. Furthermore, after the firmware download is complete, the firmware requires some time to become operational. To address this, additional sleep time has been introduced before the initial read operation to prevent a confusing timeout error in vsc_tp_xfer(). Additionally, this patch set includes several enhancements as well: 1) constructing the SPI transfer command as per a specific request; 2) utilizing the appropriate byte order swap function for data received from the ROM; 3) correcting a spelling error in a comment. Wentong Wu (6): mei: vsc: Enhance IVSC chipset reset toggling mei: vsc: Enhance IVSC chipset stability during warm reboot mei: vsc: Enhance SPI transfer of IVSC rom mei: vsc: Utilize the appropriate byte order swap function mei: vsc: Prevent timeout error with added delay post-firmware download mei: vsc: Fix spelling error drivers/misc/mei/platform-vsc.c | 4 ++-- drivers/misc/mei/vsc-fw-loader.c | 2 +- drivers/misc/mei/vsc-tp.c | 20 ++++++++++++++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) -- 2.34.1 . From: Nikita Travkin Subject: [PATCH 0/3] Introduce msm8916 based LG devices Date: Sun, 23 Jun 2024 14:26:29 +0500 Message-Id: <20240623-msm8916-lg-initial-v1-0-6fbcf714d69b@trvn.ru> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, Nikita Travkin , Cristian Cozzolino , Anton Bambura Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255830 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.phone-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series introduces two msm8916-based LG devices: - LG Leon LTE (c50) - LG LG K10 (m216) The devices only have basic support for now. Signed-off-by: Nikita Travkin --- Anton Bambura (1): arm64: dts: qcom: msm8916-lg-c50: add initial dts for LG Leon LTE Cristian Cozzolino (1): arm64: dts: qcom: msm8916-lg-m216: Add initial device tree Nikita Travkin (1): dt-bindings: arm: qcom: Add msm8916 based LG devices Documentation/devicetree/bindings/arm/qcom.yaml | 2 + arch/arm64/boot/dts/qcom/Makefile | 2 + arch/arm64/boot/dts/qcom/msm8916-lg-c50.dts | 140 +++++++++++++ arch/arm64/boot/dts/qcom/msm8916-lg-m216.dts | 251 ++++++++++++++++++++++++ 4 files changed, 395 insertions(+) --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240621-msm8916-lg-initial-8d4a399ec3c2 Best regards, -- Nikita Travkin . Date: Sun, 23 Jun 2024 12:09:49 +0200 From: Thomas Bogendoerfer To: torvalds@linux-foundation.org Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] MIPS fixes for v6.10 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255834 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-mips Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The following changes since commit 6e5aee08bd2517397c9572243a816664f2ead547: Revert "MIPS: pci: lantiq: restore reset gpio polarity" (2024-06-13 10:17:09 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/ tags/mips-fixes_6.10_2 for you to fetch changes up to 0d5679a0aae2d8cda72169452c32e5cb88a7ab33: mips: fix compat_sys_lseek syscall (2024-06-21 10:16:34 +0200) ---------------------------------------------------------------- - fix lseek in o32 compat mode - fix for microMIPS MT ASE helpers ---------------------------------------------------------------- Arnd Bergmann (1): mips: fix compat_sys_lseek syscall Jiaxun Yang (1): MIPS: mipsmtregs: Fix target register for MFTC0 arch/mips/include/asm/mipsmtregs.h | 2 +- arch/mips/kernel/syscalls/syscall_o32.tbl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ] . From: Javier Carrasco Date: Sun, 23 Jun 2024 12:35:11 +0200 Subject: [PATCH] usb: typec: ucsi: glink: use device_for_each_child_node_scoped() X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240623-ucsi_glink-scoped-v1-1-f0fdcfec69bb@gmail.com> To: Heikki Krogerus , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255848 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-usb Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use the scoped variant of `device_for_each_child_node()` to automatically handle early exits. This prevents memory leaks if new error paths are introduced, as no explicit refcount decrement via `fwnode_handle_put()` is needed. Signed-off-by: Javier Carrasco --- This patch is a follow-up to the recently introduced commit c68942624e25 ("usb: typec: ucsi: glink: fix child node release in probe function") to account for a safer approach to iterating over child nodes. --- drivers/usb/typec/ucsi/ucsi_glink.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_glink.c b/drivers/usb/typec/ucsi/ucsi_glink.c index 2fa973afe4e6..d41c9caa84e0 100644 --- a/drivers/usb/typec/ucsi/ucsi_glink.c +++ b/drivers/usb/typec/ucsi/ucsi_glink.c @@ -333,7 +333,6 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev, struct pmic_glink_ucsi *ucsi; struct device *dev = &adev->dev; const struct of_device_id *match; - struct fwnode_handle *fwnode; int ret; ucsi = devm_kzalloc(dev, sizeof(*ucsi), GFP_KERNEL); @@ -365,14 +364,13 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev, ucsi_set_drvdata(ucsi->ucsi, ucsi); - device_for_each_child_node(dev, fwnode) { + device_for_each_child_node_scoped(dev, fwnode) { struct gpio_desc *desc; u32 port; ret = fwnode_property_read_u32(fwnode, "reg", &port); if (ret < 0) { dev_err(dev, "missing reg property of %pOFn\n", fwnode); - fwnode_handle_put(fwnode); return ret; } @@ -387,11 +385,10 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev, if (!desc) continue; - if (IS_ERR(desc)) { - fwnode_handle_put(fwnode); + if (IS_ERR(desc)) return dev_err_probe(dev, PTR_ERR(desc), "unable to acquire orientation gpio\n"); - } + ucsi->port_orientation[port] = desc; } --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240623-ucsi_glink-scoped-2d417fc9afd3 Best regards, -- Javier Carrasco . From: Akhil P Oommen To: freedreno , , , Rob Clark , Bjorn Andersson CC: Akhil P Oommen , Abhinav Kumar , Conor Dooley , "Daniel Vetter" , David Airlie , Dmitry Baryshkov , Konrad Dybcio , Krzysztof Kozlowski , Maarten Lankhorst , Marijn Suijten , Maxime Ripard , "Rob Herring" , Sean Paul , Thomas Zimmermann , , Subject: [PATCH v1 0/3] Support for Adreno X1-85 GPU Date: Sun, 23 Jun 2024 16:36:27 +0530 Message-ID: <20240623110753.141400-1-quic_akhilpo@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-QCInternal: smtphost Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255856 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series adds support for the Adreno X1-85 GPU found in Qualcomm's compute series chipset, Snapdragon X1 Elite (x1e80100). In this new naming scheme for Adreno GPU, 'X' stands for compute series, '1' denotes 1st generation and '8' & '5' denotes the tier and the SKU which it belongs. X1-85 has major focus on doubling core clock frequency and bandwidth throughput. It has a dedicated collapsible Graphics MX rail (gmxc) to power the memories and double the number of data channels to improve bandwidth to DDR. Mesa has the necessary bits present already to support this GPU. We are able to bring up Gnome desktop by hardcoding "0xffff43050a01" as chipid. Also, verified glxgears and glmark2. We have plans to add the new chipid support to Mesa in next few weeks, but these patches can go in right away to get included in v6.11. This series is rebased on top of v6.10-rc4. P3 cherry-picks cleanly on qcom/for-next. P1 & P2 for Rob, P3 for Bjorn to pick up. Akhil P Oommen (3): dt-bindings: display/msm/gmu: Add Adreno X185 GMU drm/msm/adreno: Add support for X185 GPU arm64: dts: qcom: x1e80100: Add gpu support .../devicetree/bindings/display/msm/gmu.yaml | 4 + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 195 ++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 19 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 6 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 14 ++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 + 6 files changed, 235 insertions(+), 8 deletions(-) -- 2.45.1 . From: Mark Brown Subject: [PATCH RFT v6 0/9] fork: Support shadow stacks in clone3() Date: Sun, 23 Jun 2024 12:23:42 +0100 Message-Id: <20240623-clone3-shadow-stack-v6-0-9ee7783b1fb9@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: "Rick P. Edgecombe" , Deepak Gupta , Szabolcs Nagy , "H.J. Lu" , Florian Weimer , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider , Christian Brauner , Shuah Khan Cc: linux-kernel@vger.kernel.org, Catalin Marinas , Will Deacon , jannh@google.com, bsegall@google.com, linux-kselftest@vger.kernel.org, linux-api@vger.kernel.org, Mark Brown , Kees Cook , David Hildenbrand Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255869 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-api,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The kernel has recently added support for shadow stacks, currently x86 only using their CET feature but both arm64 and RISC-V have equivalent features (GCS and Zicfiss respectively), I am actively working on GCS[1]. With shadow stacks the hardware maintains an additional stack containing only the return addresses for branch instructions which is not generally writeable by userspace and ensures that any returns are to the recorded addresses. This provides some protection against ROP attacks and making it easier to collect call stacks. These shadow stacks are allocated in the address space of the userspace process. Our API for shadow stacks does not currently offer userspace any flexiblity for managing the allocation of shadow stacks for newly created threads, instead the kernel allocates a new shadow stack with the same size as the normal stack whenever a thread is created with the feature enabled. The stacks allocated in this way are freed by the kernel when the thread exits or shadow stacks are disabled for the thread. This lack of flexibility and control isn't ideal, in the vast majority of cases the shadow stack will be over allocated and the implicit allocation and deallocation is not consistent with other interfaces. As far as I can tell the interface is done in this manner mainly because the shadow stack patches were in development since before clone3() was implemented. Since clone3() is readily extensible let's add support for specifying a shadow stack when creating a new thread or process in a similar manner to how the normal stack is specified, keeping the current implicit allocation behaviour if one is not specified either with clone3() or through the use of clone(). The user must provide a shadow stack address and size, this must point to memory mapped for use as a shadow stackby map_shadow_stack() with a shadow stack token at the top of the stack. Please note that the x86 portions of this code are build tested only, I don't appear to have a system that can run CET avaible to me, I have done testing with an integration into my pending work for GCS. There is some possibility that the arm64 implementation may require the use of clone3() and explicit userspace allocation of shadow stacks, this is still under discussion. Please further note that the token consumption done by clone3() is not currently implemented in an atomic fashion, Rick indicated that he would look into fixing this if people are OK with the implementation. A new architecture feature Kconfig option for shadow stacks is added as here, this was suggested as part of the review comments for the arm64 GCS series and since we need to detect if shadow stacks are supported it seemed sensible to roll it in here. [1] https://lore.kernel.org/r/20231009-arm64-gcs-v6-0-78e55deaa4dd@kernel.org/ Signed-off-by: Mark Brown --- Changes in v6: - Rebase onto v6.10-rc3. - Ensure we don't try to free the parent shadow stack in error paths of x86 arch code. - Spelling fixes in userspace API document. - Additional cleanups and improvements to the clone3() tests to support the shadow stack tests. - Link to v5: https://lore.kernel.org/r/20240203-clone3-shadow-stack-v5-0-322c69598e4b@kernel.org Changes in v5: - Rebase onto v6.8-rc2. - Rework ABI to have the user allocate the shadow stack memory with map_shadow_stack() and a token. - Force inlining of the x86 shadow stack enablement. - Move shadow stack enablement out into a shared header for reuse by other tests. - Link to v4: https://lore.kernel.org/r/20231128-clone3-shadow-stack-v4-0-8b28ffe4f676@kernel.org Changes in v4: - Formatting changes. - Use a define for minimum shadow stack size and move some basic validation to fork.c. - Link to v3: https://lore.kernel.org/r/20231120-clone3-shadow-stack-v3-0-a7b8ed3e2acc@kernel.org Changes in v3: - Rebase onto v6.7-rc2. - Remove stale shadow_stack in internal kargs. - If a shadow stack is specified unconditionally use it regardless of CLONE_ parameters. - Force enable shadow stacks in the selftest. - Update changelogs for RISC-V feature rename. - Link to v2: https://lore.kernel.org/r/20231114-clone3-shadow-stack-v2-0-b613f8681155@kernel.org Changes in v2: - Rebase onto v6.7-rc1. - Remove ability to provide preallocated shadow stack, just specify the desired size. - Link to v1: https://lore.kernel.org/r/20231023-clone3-shadow-stack-v1-0-d867d0b5d4d0@kernel.org --- Mark Brown (9): Documentation: userspace-api: Add shadow stack API documentation selftests: Provide helper header for shadow stack testing mm: Introduce ARCH_HAS_USER_SHADOW_STACK fork: Add shadow stack support to clone3() selftests/clone3: Remove redundant flushes of output streams selftests/clone3: Factor more of main loop into test_clone3() selftests/clone3: Explicitly handle child exits due to signals selftests/clone3: Allow tests to flag if -E2BIG is a valid error code selftests/clone3: Test shadow stack support Documentation/userspace-api/index.rst | 1 + Documentation/userspace-api/shadow_stack.rst | 41 ++++ arch/x86/Kconfig | 1 + arch/x86/include/asm/shstk.h | 11 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/shstk.c | 104 +++++++--- fs/proc/task_mmu.c | 2 +- include/linux/mm.h | 2 +- include/linux/sched/task.h | 13 ++ include/uapi/linux/sched.h | 13 +- kernel/fork.c | 76 ++++++-- mm/Kconfig | 6 + tools/testing/selftests/clone3/clone3.c | 225 ++++++++++++++++++---- tools/testing/selftests/clone3/clone3_selftests.h | 40 +++- tools/testing/selftests/ksft_shstk.h | 63 ++++++ 15 files changed, 512 insertions(+), 88 deletions(-) --- base-commit: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670 change-id: 20231019-clone3-shadow-stack-15d40d2bf536 Best regards, -- Mark Brown . X-Spam-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high * trust * [2003:e3:1f18:c802:68fd:ffff:fe6f:e76 listed in] [list.dnswl.org] * 0.5 HELO_NO_DOMAIN Relay reports its domain incorrectly * 0.4 RDNS_DYNAMIC Delivered to internal network by host with * dynamic-looking rDNS * 0.0 DMARC_MISSING Missing DMARC policy Message-ID: <6ca2b58c-f689-447f-abc8-4e8dd9bf677a@afaics.de> Date: Sun, 23 Jun 2024 13:39:41 +0200 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: linux-kernel@vger.kernel.org From: Harald Dunkel Content-Language: en-US Subject: shutdown gets stuck on ancient Intel CPUs (>10 y) Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255885 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi folks, I've got quite a number of ancient systems that do not shut down gracefully. On "reboot" they get stuck instead, with these messages on the console (for example): [3100272.289498] NMI watchdog: Watchdog detected hard LOCKUP on cpu 5 [3100274.206164] NMI watchdog: Watchdog detected hard LOCKUP on cpu 6 [3100274.432631] NMI watchdog: Watchdog detected hard LOCKUP on cpu 12 [3100277.888319] NMI watchdog: Watchdog detected hard LOCKUP on cpu 11 [3100278.939282] NMI watchdog: Watchdog detected hard LOCKUP on cpu 2 [3100280.147329] rcu: INFO: rcu_preempt self-detected stall on CPU [3100280.590580] rcu: 14-...!: (5248 ticks this GP) idle=afe4/1/0x4000000000000000 softirq=85687678/85687678 fqs=38 [3100280.713513] rcu: rcu_preempt kthread timer wakeup didn't happen for 5308 jiffies! g227828925 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x402 [3100280.856203] rcu: Possible timer handling issue on cpu=3 timer-softirq=46376324 [3100280.945837] rcu: rcu_preempt kthread starved for 5367 jiffies! g227828925 f0x0 RCU_GP_WAIT_FQS(5) ->state=0x402 ->cpu=3 [3100281.077083] rcu: Unless rcu_preempt kthread gets sufficient CPU time, OOM is now expected behavior. [3100281.188462] rcu: RCU grace-period kthread stack dump: [3100281.251112] rcu: Stack dump where RCU GP kthread last ran: [3100282.053462] NMI watchdog: Watchdog detected hard LOCKUP on cpu 10 [3100284.061698] watchdog: BUG: soft lockup - CPU#8 stuck for 26s! [kworker/8:0:2191850] [3100284.065698] watchdog: BUG: soft lockup - CPU#9 stuck for 22s! [migration/9:62] [3100284.077698] watchdog: BUG: soft lockup - CPU#13 stuck for 22s! [migration/13:82] [3100285.095828] NMI watchdog: Watchdog detected hard LOCKUP on cpu 7 [3100288.045764] watchdog: BUG: soft lockup - CPU#4 stuck for 23s! [etcd:1614] [3100291.949829] watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [etcd:556385] [3100292.037830] watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [migration/1:21] [3100292.081831] watchdog: BUG: soft lockup - CPU#15 stuck for 23s! [etcd:1613] [3100293.997839] NMI watchdog: Watchdog detected hard LOCKUP on cpu 3 [3100308.078097] watchdog: BUG: soft lockup - CPU#14 stuck for 48s! [rasdaemon:2267297] [3100312.062164] watchdog: BUG: soft lockup - CPU#8 stuck for 52s! [kworker/8:0:2191850] [3100312.066164] watchdog: BUG: soft lockup - CPU#9 stuck for 48s! [migration/9:62] [3100312.078164] watchdog: BUG: soft lockup - CPU#13 stuck for 48s! [migration/13:82] [3100316.046230] watchdog: BUG: soft lockup - CPU#4 stuck for 49s! [etcd:1614] [3100319.950295] watchdog: BUG: soft lockup - CPU#0 stuck for 48s! [etcd:556385] [3100320.038297] watchdog: BUG: soft lockup - CPU#1 stuck for 49s! [migration/1:21] [3100320.082297] watchdog: BUG: soft lockup - CPU#15 stuck for 49s! [etcd:1613] These systems are >10 years old. The CPUs are Intel Xeon E5620 or similar. Kernel is 6.1.90. An old NAS running with an Atom CPU D525 and kernel 6.7.5 is affected as well. The problem is quite reproducible (esp on the NAS), but it requires a little bit of runtime. Immediately after startup the reboot works as expected. After a few days it doesn't. Every helpful comment is highly appreciated Harri . From: Andy Yan To: heiko@sntech.de Cc: dsimic@manjaro.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, didi.debian@cknow.org, Andy Yan Subject: [PATCH v2] arm64: dts: rockchip: Fix the i2c address of es8316 on Cool Pi 4B Date: Sun, 23 Jun 2024 19:55:26 +0800 Message-Id: <20240623115526.2154645-1-andyshrk@163.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255888 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-rockchip,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail According to the hardware design, the i2c address of audio codec es8316 on Cool Pi 4B is 0x10. This fix the read/write error like bellow: es8316 7-0011: ASoC: error at soc_component_write_no_lock on es8316.7-0011 for register: [0x0000000c] -6 es8316 7-0011: ASoC: error at soc_component_write_no_lock on es8316.7-0011 for register: [0x00000003] -6 es8316 7-0011: ASoC: error at soc_component_read_no_lock on es8316.7-0011 for register: [0x00000016] -6 es8316 7-0011: ASoC: error at soc_component_read_no_lock on es8316.7-0011 for register: [0x00000016] -6 Fixes: 3f5d336d64d6 ("arm64: dts: rockchip: Add support for rk3588s based board Cool Pi 4B") Signed-off-by: Andy Yan --- Changes in v2: - Also change the address after @ to 0x10 arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts index 20a0a60acd16..b0259b0d5021 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts @@ -300,9 +300,9 @@ &i2c7 { pinctrl-0 = <&i2c7m0_xfer>; status = "okay"; - es8316: audio-codec@11 { + es8316: audio-codec@10 { compatible = "everest,es8316"; - reg = <0x11>; + reg = <0x10>; assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; assigned-clock-rates = <12288000>; clocks = <&cru I2S0_8CH_MCLKOUT>; -- 2.34.1 . From: Krzysztof Kozlowski To: Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/3] dt-bindings: display/msm/gpu: constrain clocks in top-level Date: Sun, 23 Jun 2024 14:00:24 +0200 Message-ID: <20240623120026.44198-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255890 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail We expect each schema with variable number of clocks, to have the widest constrains in top-level "properties:". This is more readable and also makes binding stricter, if there is no "if:then:" block for given variant. Signed-off-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/display/msm/gpu.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/gpu.yaml b/Documentation/devicetree/bindings/display/msm/gpu.yaml index 40b5c6bd11f8..253e68d92779 100644 --- a/Documentation/devicetree/bindings/display/msm/gpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/gpu.yaml @@ -32,9 +32,13 @@ properties: - pattern: '^amd,imageon-200\.[0-1]$' - const: amd,imageon - clocks: true + clocks: + minItems: 2 + maxItems: 7 - clock-names: true + clock-names: + minItems: 2 + maxItems: 7 reg: minItems: 1 -- 2.43.0 . From: yskelg@gmail.com To: Harald Freudenberger , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle Cc: shjy180909@gmail.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Yunseong Kim Subject: [PATCH] s390/zcrypt: optimize memory allocation in online_show() Date: Sun, 23 Jun 2024 21:01:49 +0900 Message-ID: <20240623120147.35554-3-yskelg@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255893 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-s390 Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yunseong Kim Previously, when setting the online state for a card, the code would allocate memory to store information about all attached queues, regardless of whether their online state actually changed. This patch improves efficiency by only allocating memory for the queues that are truly affected by the online state change. This allows for a more precise memory allocation (based on maxzqs) which can reduce memory usage. Signed-off-by: Yunseong Kim --- drivers/s390/crypto/zcrypt_card.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/s390/crypto/zcrypt_card.c b/drivers/s390/crypto/zcrypt_card.c index 050462d95222..2c80be3f2a00 100644 --- a/drivers/s390/crypto/zcrypt_card.c +++ b/drivers/s390/crypto/zcrypt_card.c @@ -88,9 +88,10 @@ static ssize_t online_store(struct device *dev, * the zqueue objects, we make sure they exist after lock release. */ list_for_each_entry(zq, &zc->zqueues, list) - maxzqs++; + if (!!zq->online != !!online) + maxzqs++; if (maxzqs > 0) - zq_uelist = kcalloc(maxzqs + 1, sizeof(*zq_uelist), GFP_ATOMIC); + zq_uelist = kcalloc(maxzqs, sizeof(*zq_uelist), GFP_ATOMIC); list_for_each_entry(zq, &zc->zqueues, list) if (zcrypt_queue_force_online(zq, online)) if (zq_uelist) { @@ -98,14 +99,11 @@ static ssize_t online_store(struct device *dev, zq_uelist[i++] = zq; } spin_unlock(&zcrypt_list_lock); - if (zq_uelist) { - for (i = 0; zq_uelist[i]; i++) { - zq = zq_uelist[i]; - ap_send_online_uevent(&zq->queue->ap_dev, online); - zcrypt_queue_put(zq); - } - kfree(zq_uelist); + while (i--) { + ap_send_online_uevent(&zq->queue->ap_dev, online); + zcrypt_queue_put(zq_uelist[i]); } + kfree(zq_uelist); return count; } -- 2.45.2 . From: Krzysztof Kozlowski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] ARM: dts: qcom: use generic node names for Adreno and QFPROM Date: Sun, 23 Jun 2024 14:07:07 +0200 Message-ID: <20240623120707.45764-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255896 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use recommended generic node names for the Adreno GPU and QFPROM fused values device nodes. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 4 ++-- arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 2 +- arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 2 +- arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 4 ++-- arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi index 178a3b424670..d73ea1434b36 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi @@ -666,7 +666,7 @@ ssbi: ssbi@500000 { qcom,controller-type = "pmic-arbiter"; }; - qfprom: qfprom@700000 { + qfprom: efuse@700000 { compatible = "qcom,apq8064-qfprom", "qcom,qfprom"; reg = <0x00700000 0x1000>; #address-cells = <1>; @@ -992,7 +992,7 @@ tcsr: syscon@1a400000 { reg = <0x1a400000 0x100>; }; - gpu: adreno-3xx@4300000 { + gpu: gpu@4300000 { compatible = "qcom,adreno-320.2", "qcom,adreno"; reg = <0x04300000 0x20000>; reg-names = "kgsl_3d0_reg_memory"; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8084.dtsi index ca53dff820ef..2b52e5d5eb51 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8084.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8084.dtsi @@ -245,7 +245,7 @@ sram@fc190000 { reg = <0xfc190000 0x10000>; }; - qfprom: qfprom@fc4bc000 { + qfprom: efuse@fc4bc000 { compatible = "qcom,apq8084-qfprom", "qcom,qfprom"; reg = <0xfc4bc000 0x1000>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi index 4e36fe4bf2a1..0b04ea856f7c 100644 --- a/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi @@ -372,7 +372,7 @@ ssbi@500000 { qcom,controller-type = "pmic-arbiter"; }; - qfprom: qfprom@700000 { + qfprom: efuse@700000 { compatible = "qcom,ipq8064-qfprom", "qcom,qfprom"; reg = <0x00700000 0x1000>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi index 270973e85625..b2f92ad6499a 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8226.dtsi @@ -635,7 +635,7 @@ restart@fc4ab000 { reg = <0xfc4ab000 0x4>; }; - qfprom: qfprom@fc4bc000 { + qfprom: efuse@fc4bc000 { compatible = "qcom,msm8226-qfprom", "qcom,qfprom"; reg = <0xfc4bc000 0x1000>; #address-cells = <1>; @@ -1046,7 +1046,7 @@ cci_i2c0: i2c-bus@0 { }; }; - gpu: adreno@fdb00000 { + gpu: gpu@fdb00000 { compatible = "qcom,adreno-305.18", "qcom,adreno"; reg = <0xfdb00000 0x10000>; reg-names = "kgsl_3d0_reg_memory"; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi index 1bea3cef4ba7..f9820d996910 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi @@ -1235,7 +1235,7 @@ restart@fc4ab000 { reg = <0xfc4ab000 0x4>; }; - qfprom: qfprom@fc4bc000 { + qfprom: efuse@fc4bc000 { compatible = "qcom,msm8974-qfprom", "qcom,qfprom"; reg = <0xfc4bc000 0x2100>; #address-cells = <1>; @@ -2131,7 +2131,7 @@ cci_i2c1: i2c-bus@1 { }; }; - gpu: adreno@fdb00000 { + gpu: gpu@fdb00000 { compatible = "qcom,adreno-330.1", "qcom,adreno"; reg = <0xfdb00000 0x10000>; reg-names = "kgsl_3d0_reg_memory"; -- 2.43.0 . From: yskelg@gmail.com To: Harald Freudenberger , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle Cc: shjy180909@gmail.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Yunseong Kim Subject: [PATCH] s390/raw3270: handle memory allocation failure in 'raw3270_setup_console()' Date: Sun, 23 Jun 2024 21:24:49 +0900 Message-ID: <20240623122447.35847-3-yskelg@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255907 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-s390 Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yunseong Kim This patch handle potential null pointer dereference in 'raw3270_setup_device()', When 'raw3270_setup_console()' fails to allocate memory for 'rp' or 'ascebc'. Signed-off-by: Yunseong Kim --- drivers/s390/char/raw3270.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index c57694be9bd3..4e81040eea81 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c @@ -812,7 +812,13 @@ struct raw3270 __init *raw3270_setup_console(void) return ERR_CAST(cdev); rp = kzalloc(sizeof(*rp), GFP_KERNEL | GFP_DMA); + if (!rp) + return ERR_PTR(-ENOMEM); ascebc = kzalloc(256, GFP_KERNEL); + if (!ascebc) { + kfree(rp); + return ERR_PTR(-ENOMEM); + } rc = raw3270_setup_device(cdev, rp, ascebc); if (rc) return ERR_PTR(rc); -- 2.45.2 . From: alexjlzheng@gmail.com X-Google-Original-From: alexjlzheng@tencent.com To: chandan.babu@oracle.com, djwong@kernel.org Cc: linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, alexjlzheng@tencent.com Subject: [PATCH] xfs: make xfs_log_iovec independent from xfs_log_vec and release it early Date: Sun, 23 Jun 2024 20:31:19 +0800 Message-Id: <20240623123119.3562031-1-alexjlzheng@tencent.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255911 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-xfs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Jinliang Zheng In the current implementation, in most cases, the memory of xfs_log_vec and xfs_log_iovec is allocated together. Therefore the life cycle of xfs_log_iovec has to remain the same as xfs_log_vec. But this is not necessary. When the content in xfs_log_iovec is written to iclog by xlog_write(), it no longer needs to exist in the memory. But xfs_log_vec is still useful, because after we flush the iclog into the disk log space, we need to find the corresponding xfs_log_item through the xfs_log_vec->lv_item field and add it to AIL. This patch separates the memory allocation of xfs_log_iovec from xfs_log_vec, and releases the memory of xfs_log_iovec in advance after the content in xfs_log_iovec is written to iclog. Signed-off-by: Jinliang Zheng --- fs/xfs/xfs_log.c | 2 ++ fs/xfs/xfs_log.h | 8 ++++++-- fs/xfs/xfs_log_cil.c | 26 ++++++++++++++++---------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 416c15494983..f7af9550c17b 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -2526,6 +2526,8 @@ xlog_write( xlog_write_full(lv, ticket, iclog, &log_offset, &len, &record_cnt, &data_cnt); } + if (lv->lv_flags & XFS_LOG_VEC_DYNAMIC) + kvfree(lv->lv_iovecp); } ASSERT(len == 0); diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index d69acf881153..f052c7fdb3e9 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h @@ -6,6 +6,8 @@ #ifndef __XFS_LOG_H__ #define __XFS_LOG_H__ +#define XFS_LOG_VEC_DYNAMIC (1 << 0) + struct xfs_cil_ctx; struct xfs_log_vec { @@ -17,7 +19,8 @@ struct xfs_log_vec { char *lv_buf; /* formatted buffer */ int lv_bytes; /* accounted space in buffer */ int lv_buf_len; /* aligned size of buffer */ - int lv_size; /* size of allocated lv */ + int lv_size; /* size of allocated iovec + buffer */ + int lv_flags; /* lv flags */ }; #define XFS_LOG_VEC_ORDERED (-1) @@ -40,6 +43,7 @@ static inline void xlog_finish_iovec(struct xfs_log_vec *lv, struct xfs_log_iovec *vec, int data_len) { + struct xfs_log_iovec *lvec = lv->lv_iovecp; struct xlog_op_header *oph = vec->i_addr; int len; @@ -69,7 +73,7 @@ xlog_finish_iovec(struct xfs_log_vec *lv, struct xfs_log_iovec *vec, vec->i_len = len; /* Catch buffer overruns */ - ASSERT((void *)lv->lv_buf + lv->lv_bytes <= (void *)lv + lv->lv_size); + ASSERT((void *)lv->lv_buf + lv->lv_bytes <= (void *)lvec + lv->lv_size); } /* diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index f51cbc6405c1..3be9f86ce655 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c @@ -219,8 +219,7 @@ static inline int xlog_cil_iovec_space( uint niovecs) { - return round_up((sizeof(struct xfs_log_vec) + - niovecs * sizeof(struct xfs_log_iovec)), + return round_up(niovecs * sizeof(struct xfs_log_iovec), sizeof(uint64_t)); } @@ -279,6 +278,7 @@ xlog_cil_alloc_shadow_bufs( list_for_each_entry(lip, &tp->t_items, li_trans) { struct xfs_log_vec *lv; + struct xfs_log_iovec *lvec; int niovecs = 0; int nbytes = 0; int buf_size; @@ -339,18 +339,23 @@ xlog_cil_alloc_shadow_bufs( * the buffer, only the log vector header and the iovec * storage. */ - kvfree(lip->li_lv_shadow); - lv = xlog_kvmalloc(buf_size); - - memset(lv, 0, xlog_cil_iovec_space(niovecs)); + if (lip->li_lv_shadow) { + kvfree(lip->li_lv_shadow->lv_iovecp); + kvfree(lip->li_lv_shadow); + } + lv = xlog_kvmalloc(sizeof(struct xfs_log_vec)); + memset(lv, 0, sizeof(struct xfs_log_vec)); + lvec = xlog_kvmalloc(buf_size); + memset(lvec, 0, xlog_cil_iovec_space(niovecs)); + lv->lv_flags |= XFS_LOG_VEC_DYNAMIC; INIT_LIST_HEAD(&lv->lv_list); lv->lv_item = lip; lv->lv_size = buf_size; if (ordered) lv->lv_buf_len = XFS_LOG_VEC_ORDERED; else - lv->lv_iovecp = (struct xfs_log_iovec *)&lv[1]; + lv->lv_iovecp = lvec; lip->li_lv_shadow = lv; } else { /* same or smaller, optimise common overwrite case */ @@ -366,9 +371,9 @@ xlog_cil_alloc_shadow_bufs( lv->lv_niovecs = niovecs; /* The allocated data region lies beyond the iovec region */ - lv->lv_buf = (char *)lv + xlog_cil_iovec_space(niovecs); + lv->lv_buf = (char *)lv->lv_iovecp + + xlog_cil_iovec_space(niovecs); } - } /* @@ -502,7 +507,7 @@ xlog_cil_insert_format_items( /* reset the lv buffer information for new formatting */ lv->lv_buf_len = 0; lv->lv_bytes = 0; - lv->lv_buf = (char *)lv + + lv->lv_buf = (char *)lv->lv_iovecp + xlog_cil_iovec_space(lv->lv_niovecs); } else { /* switch to shadow buffer! */ @@ -1544,6 +1549,7 @@ xlog_cil_process_intents( set_bit(XFS_LI_WHITEOUT, &ilip->li_flags); trace_xfs_cil_whiteout_mark(ilip); len += ilip->li_lv->lv_bytes; + kvfree(ilip->li_lv->lv_iovecp); kvfree(ilip->li_lv); ilip->li_lv = NULL; -- 2.39.3 . From: Shresth Prasad To: vkoul@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, javier.carrasco.cruz@gmail.com, Shresth Prasad Subject: [PATCH] dt-bindings: dma: mv-xor-v2: Convert to dtschema Date: Sun, 23 Jun 2024 18:15:08 +0530 Message-ID: <20240623124507.27297-2-shresthprasad7@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255915 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.dmaengine,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Convert txt bindings of Marvell XOR v2 engines to dtschema to allow for validation. Signed-off-by: Shresth Prasad --- Tested against `marvell/armada-7040-db.dtb`, `marvell/armada-7040-mochabin.dtb` and `marvell/armada-8080-db.dtb` .../bindings/dma/marvell,xor-v2.yaml | 69 +++++++++++++++++++ .../devicetree/bindings/dma/mv-xor-v2.txt | 28 -------- 2 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/marvell,xor-v2.yaml delete mode 100644 Documentation/devicetree/bindings/dma/mv-xor-v2.txt diff --git a/Documentation/devicetree/bindings/dma/marvell,xor-v2.yaml b/Documentation/devicetree/bindings/dma/marvell,xor-v2.yaml new file mode 100644 index 000000000000..3d7481c1917e --- /dev/null +++ b/Documentation/devicetree/bindings/dma/marvell,xor-v2.yaml @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/marvell,xor-v2.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell XOR v2 engines + +maintainers: + - Vinod Koul + +properties: + compatible: + contains: + enum: + - marvell,armada-7k-xor + - marvell,xor-v2 + + reg: + items: + - description: DMA registers location and length + - description: global registers location and length + + clocks: + minItems: 1 + maxItems: 2 + + clock-names: + items: + - const: core + - const: reg + + msi-parent: + description: + Phandle to the MSI-capable interrupt controller used for + interrupts. + maxItems: 1 + + dma-coherent: true + +required: + - compatible + - reg + - msi-parent + - dma-coherent + +if: + required: + - clocks + properties: + clocks: + minItems: 2 + maxItems: 2 +then: + required: + - clock-names + +additionalProperties: false + +examples: + - | + xor0@6a0000 { + compatible = "marvell,armada-7k-xor", "marvell,xor-v2"; + reg = <0x6a0000 0x1000>, <0x6b0000 0x1000>; + clocks = <&ap_clk 0>, <&ap_clk 1>; + clock-names = "core", "reg"; + msi-parent = <&gic_v2m0>; + dma-coherent; + }; diff --git a/Documentation/devicetree/bindings/dma/mv-xor-v2.txt b/Documentation/devicetree/bindings/dma/mv-xor-v2.txt deleted file mode 100644 index 9c38bbe7e6d7..000000000000 --- a/Documentation/devicetree/bindings/dma/mv-xor-v2.txt +++ /dev/null @@ -1,28 +0,0 @@ -* Marvell XOR v2 engines - -Required properties: -- compatible: one of the following values: - "marvell,armada-7k-xor" - "marvell,xor-v2" -- reg: Should contain registers location and length (two sets) - the first set is the DMA registers - the second set is the global registers -- msi-parent: Phandle to the MSI-capable interrupt controller used for - interrupts. - -Optional properties: -- clocks: Optional reference to the clocks used by the XOR engine. -- clock-names: mandatory if there is a second clock, in this case the - name must be "core" for the first clock and "reg" for the second - one - - -Example: - - xor0@400000 { - compatible = "marvell,xor-v2"; - reg = <0x400000 0x1000>, - <0x410000 0x1000>; - msi-parent = <&gic_v2m0>; - dma-coherent; - }; -- 2.45.2 . From: Krzysztof Kozlowski To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Akhil P Oommen Subject: [PATCH] dt-bindings: display/msm/gmu: fix the schema being not applied Date: Sun, 23 Jun 2024 14:59:30 +0200 Message-ID: <20240623125930.110741-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255919 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail dtschema v2024.4, v2024.5 and maybe earlier do not select device nodes for given binding validation if the schema contains compatible list with pattern and a const fallback. This leads to binding being a no-op - not being applied at all. Issue should be fixed in the dtschema but for now add a work-around do the binding can be used against DTS validation. Signed-off-by: Krzysztof Kozlowski --- Cc: Akhil P Oommen --- .../devicetree/bindings/display/msm/gmu.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/display/msm/gmu.yaml b/Documentation/devicetree/bindings/display/msm/gmu.yaml index b3837368a260..8d1b515f59ec 100644 --- a/Documentation/devicetree/bindings/display/msm/gmu.yaml +++ b/Documentation/devicetree/bindings/display/msm/gmu.yaml @@ -17,6 +17,18 @@ description: | management and support to improve power efficiency and reduce the load on the CPU. +# dtschema does not select nodes based on pattern+const, so add custom select +# as a work-around: +select: + properties: + compatible: + contains: + enum: + - qcom,adreno-gmu + - qcom,adreno-gmu-wrapper + required: + - compatible + properties: compatible: oneOf: -- 2.43.0 . Message-ID: <45d9cf65-7d23-475b-83d0-4bf649553b02@bena.rocks> Date: Sun, 23 Jun 2024 14:56:53 +0200 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Language: en-US To: linux-kernel@vger.kernel.org From: Petr Bena Subject: Why is Dirty and Writeback part of "MemAvailable" in /proc/meminfo? Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255920 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, Apologies if this is already answered somewhere, but quick google search returned nothing on-topic: There is one thing that really puzzles me about /proc/meminfo (and subsequently about data reported by all other tools, like free, top etc. that take those numbers from same place) - why is "dirty" and "writeback" part of "available" memory? My understanding is that "available" was introduced to confuse less users by relatively low amount of "free" memory, which is very often occupied by disk and FS caches as it can be dropped almost any time as needed, but that's not quite the case with writeback and dirty memory - both of them have to be written to the disk first, which is not an instant operation, in fact with slow storage it takes some time during which memory is unusable, so there is nothing inherently "available" about that memory. If you configure your kernel for aggressive caching and run some large IO writing operations, most of your memory is going to be full by dirty pages and should some program need to quickly allocate it, it would fail, yet /proc/meminfo would be reporting plenty of available memory. Shouldn't this logic be changed? What's the reasoning behind that? Thanks . From: Roman Storozhenko Date: Sun, 23 Jun 2024 15:10:10 +0200 Subject: [PATCH] cpupower: fix lib default installation path X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240623-fix-lib-install-v1-1-bcbd03b78d87@gmail.com> To: Thomas Renninger , Shuah Khan Cc: Javier Carrasco , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Roman Storozhenko Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255922 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Invocation the tool built with the default settings fails: $ cpupower cpupower: error while loading shared libraries: libcpupower.so.1: cannot open shared object file: No such file or directory The issue is that Makefile puts the library to "/usr/lib64" dir for a 64 bit machine. This is wrong. According to the "File hierarchy standard specification: https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.pdf "/usr/lib" dirs are intended for alternative-format libraries (e.g., "/usr/lib32" for 32-bit libraries on a 64-bit machine (optional)). The utility is built for the current machine and doesn't change bit depth. Fix the issue by changing library destination dir to "/usr/lib". Signed-off-by: Roman Storozhenko --- tools/power/cpupower/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index cd0225a312b4..6c02f401069e 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile @@ -67,6 +67,7 @@ LANGUAGES = de fr it cs pt ka bindir ?= /usr/bin sbindir ?= /usr/sbin mandir ?= /usr/man +libdir ?= /usr/lib includedir ?= /usr/include localedir ?= /usr/share/locale docdir ?= /usr/share/doc/packages/cpupower @@ -94,15 +95,6 @@ RANLIB = $(CROSS)ranlib HOSTCC = gcc MKDIR = mkdir -# 64bit library detection -include ../../scripts/Makefile.arch - -ifeq ($(IS_64_BIT), 1) -libdir ?= /usr/lib64 -else -libdir ?= /usr/lib -endif - # Now we set up the build system # --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240623-fix-lib-install-3b7dccdbdf45 Best regards, -- Roman Storozhenko . From: Ma Ke To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mykolal@fb.com, shuah@kernel.org, make24@iscas.ac.cn Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] selftests/bpf: don't close(-1) in serial_test_fexit_stress() Date: Sun, 23 Jun 2024 21:17:53 +0800 Message-Id: <20240623131753.2133829-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255925 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.bpf,org.kernel.vger.linux-kselftest Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Guard close() with extra link_fd[i] >= 0 and fexit_fd[i] >= 0 check to prevent close(-1). Signed-off-by: Ma Ke --- tools/testing/selftests/bpf/prog_tests/fexit_stress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_stress.c b/tools/testing/selftests/bpf/prog_tests/fexit_stress.c index 596536def43d..94ff1d9fc9e4 100644 --- a/tools/testing/selftests/bpf/prog_tests/fexit_stress.c +++ b/tools/testing/selftests/bpf/prog_tests/fexit_stress.c @@ -50,9 +50,9 @@ void serial_test_fexit_stress(void) out: for (i = 0; i < bpf_max_tramp_links; i++) { - if (link_fd[i]) + if (link_fd[i] >= 0) close(link_fd[i]); - if (fexit_fd[i]) + if (fexit_fd[i] >= 0) close(fexit_fd[i]); } free(fd); -- 2.25.1 . From: Ma Ke To: harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, alvin.lee2@amd.com, wenjing.liu@amd.com, chaitanya.dhere@amd.com, hamza.mahfooz@amd.com, sohaib.nadeem@amd.com, samson.tam@amd.com, austin.zheng@amd.com, Qingqing.Zhuo@amd.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH] drm/amd/display: Add otg_master NULL check within init_pipe_slice_table_from_context Date: Sun, 23 Jun 2024 21:32:52 +0800 Message-Id: <20240623133252.2136231-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255930 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail To avoid reports of NULL_RETURN warning, we should add otg_master NULL check. Signed-off-by: Ma Ke --- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c index f6fe0a64beac..20f0951b00f1 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c @@ -1177,6 +1177,8 @@ static void init_pipe_slice_table_from_context( stream = context->streams[i]; otg_master = resource_get_otg_master_for_stream( &context->res_ctx, stream); + if (!otg_master) + continue; count = resource_get_odm_slice_count(otg_master); update_slice_table_for_stream(table, stream, count); -- 2.25.1 . From: Leo Yan To: Arnaldo Carvalho de Melo , James Clark , Suzuki K Poulose , Mike Leach , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Namhyung Kim , Ian Rogers , Mark Rutland , Alexander Shishkin , Adrian Hunter , "Liang, Kan" , Kajol Jain , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH v1 0/2] perf mem: Support multiple Arm SPE PMUs Date: Sun, 23 Jun 2024 14:34:35 +0100 Message-Id: <20240623133437.222736-1-leo.yan@arm.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255931 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-perf-users Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch series is to enable multiple Arm SPE PMUs. The patch 01 is to enable multiple Arm SPE PMUs. The second patch is to print out warning if not all CPUs support memory events, this can give users a hint that the memory profiling is absent on some CPUs. Leo Yan (2): perf arm-spe: Support multiple Arm SPE PMUs perf mem: Warn if memory events are not supported on all CPUs tools/perf/arch/arm/util/pmu.c | 2 +- tools/perf/util/mem-events.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) -- 2.34.1 . From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Mastykin , Trond Myklebust , Sasha Levin , trondmy@kernel.org, anna@kernel.org, linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 6.9 01/21] NFSv4: Fix memory leak in nfs4_set_security_label Date: Sun, 23 Jun 2024 09:43:34 -0400 Message-ID: <20240623134405.809025-1-sashal@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.6 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255936 org.kernel.vger.linux-nfs:86239 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-nfs,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Dmitry Mastykin [ Upstream commit aad11473f8f4be3df86461081ce35ec5b145ba68 ] We leak nfs_fattr and nfs4_label every time we set a security xattr. Signed-off-by: Dmitry Mastykin Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 3a816c4a6d5e2..a691fa10b3e95 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6289,6 +6289,7 @@ nfs4_set_security_label(struct inode *inode, const void *buf, size_t buflen) if (status == 0) nfs_setsecurity(inode, fattr); + nfs_free_fattr(fattr); return status; } #endif /* CONFIG_NFS_V4_SECURITY_LABEL */ -- 2.43.0 . From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Mastykin , Trond Myklebust , Sasha Levin , trondmy@kernel.org, anna@kernel.org, linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 01/16] NFSv4: Fix memory leak in nfs4_set_security_label Date: Sun, 23 Jun 2024 09:44:30 -0400 Message-ID: <20240623134448.809470-1-sashal@kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.35 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-nfs:86243 org.kernel.vger.linux-kernel:1255955 Newsgroups: org.kernel.vger.linux-nfs,org.kernel.vger.linux-kernel,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Dmitry Mastykin [ Upstream commit aad11473f8f4be3df86461081ce35ec5b145ba68 ] We leak nfs_fattr and nfs4_label every time we set a security xattr. Signed-off-by: Dmitry Mastykin Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index f0953200acd08..05490d4784f1a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6268,6 +6268,7 @@ nfs4_set_security_label(struct inode *inode, const void *buf, size_t buflen) if (status == 0) nfs_setsecurity(inode, fattr); + nfs_free_fattr(fattr); return status; } #endif /* CONFIG_NFS_V4_SECURITY_LABEL */ -- 2.43.0 . From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Mastykin , Trond Myklebust , Sasha Levin , trondmy@kernel.org, anna@kernel.org, linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 01/12] NFSv4: Fix memory leak in nfs4_set_security_label Date: Sun, 23 Jun 2024 09:45:04 -0400 Message-ID: <20240623134518.809802-1-sashal@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.95 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255974 org.kernel.vger.linux-nfs:86247 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-nfs,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Dmitry Mastykin [ Upstream commit aad11473f8f4be3df86461081ce35ec5b145ba68 ] We leak nfs_fattr and nfs4_label every time we set a security xattr. Signed-off-by: Dmitry Mastykin Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ec641a8f6604b..cc620fc7aaf7b 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6274,6 +6274,7 @@ nfs4_set_security_label(struct inode *inode, const void *buf, size_t buflen) if (status == 0) nfs_setsecurity(inode, fattr); + nfs_free_fattr(fattr); return status; } #endif /* CONFIG_NFS_V4_SECURITY_LABEL */ -- 2.43.0 . From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuntao Wang , Jan Kara , Christian Brauner , Sasha Levin , viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 1/3] fs/file: fix the check in find_next_fd() Date: Sun, 23 Jun 2024 09:45:35 -0400 Message-ID: <20240623134538.810055-1-sashal@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.161 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255984 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yuntao Wang [ Upstream commit ed8c7fbdfe117abbef81f65428ba263118ef298a ] The maximum possible return value of find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) is maxbit. This return value, multiplied by BITS_PER_LONG, gives the value of bitbit, which can never be greater than maxfd, it can only be equal to maxfd at most, so the following check 'if (bitbit > maxfd)' will never be true. Moreover, when bitbit equals maxfd, it indicates that there are no unused fds, and the function can directly return. Fix this check. Signed-off-by: Yuntao Wang Link: https://lore.kernel.org/r/20240529160656.209352-1-yuntao.wang@linux.dev Reviewed-by: Jan Kara Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/file.c b/fs/file.c index 69a51d37b66d9..b46a4a725a0ef 100644 --- a/fs/file.c +++ b/fs/file.c @@ -481,12 +481,12 @@ struct files_struct init_files = { static unsigned int find_next_fd(struct fdtable *fdt, unsigned int start) { - unsigned int maxfd = fdt->max_fds; + unsigned int maxfd = fdt->max_fds; /* always multiple of BITS_PER_LONG */ unsigned int maxbit = maxfd / BITS_PER_LONG; unsigned int bitbit = start / BITS_PER_LONG; bitbit = find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) * BITS_PER_LONG; - if (bitbit > maxfd) + if (bitbit >= maxfd) return maxfd; if (bitbit > start) start = bitbit; -- 2.43.0 . From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuntao Wang , Jan Kara , Christian Brauner , Sasha Levin , viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 1/2] fs/file: fix the check in find_next_fd() Date: Sun, 23 Jun 2024 09:45:42 -0400 Message-ID: <20240623134544.810127-1-sashal@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.220 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255986 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yuntao Wang [ Upstream commit ed8c7fbdfe117abbef81f65428ba263118ef298a ] The maximum possible return value of find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) is maxbit. This return value, multiplied by BITS_PER_LONG, gives the value of bitbit, which can never be greater than maxfd, it can only be equal to maxfd at most, so the following check 'if (bitbit > maxfd)' will never be true. Moreover, when bitbit equals maxfd, it indicates that there are no unused fds, and the function can directly return. Fix this check. Signed-off-by: Yuntao Wang Link: https://lore.kernel.org/r/20240529160656.209352-1-yuntao.wang@linux.dev Reviewed-by: Jan Kara Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/file.c b/fs/file.c index fdb84a64724b7..913f7d897d2fc 100644 --- a/fs/file.c +++ b/fs/file.c @@ -494,12 +494,12 @@ struct files_struct init_files = { static unsigned int find_next_fd(struct fdtable *fdt, unsigned int start) { - unsigned int maxfd = fdt->max_fds; + unsigned int maxfd = fdt->max_fds; /* always multiple of BITS_PER_LONG */ unsigned int maxbit = maxfd / BITS_PER_LONG; unsigned int bitbit = start / BITS_PER_LONG; bitbit = find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) * BITS_PER_LONG; - if (bitbit > maxfd) + if (bitbit >= maxfd) return maxfd; if (bitbit > start) start = bitbit; -- 2.43.0 . From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuntao Wang , Jan Kara , Christian Brauner , Sasha Levin , viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 1/2] fs/file: fix the check in find_next_fd() Date: Sun, 23 Jun 2024 09:45:46 -0400 Message-ID: <20240623134548.810179-1-sashal@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.278 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255988 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yuntao Wang [ Upstream commit ed8c7fbdfe117abbef81f65428ba263118ef298a ] The maximum possible return value of find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) is maxbit. This return value, multiplied by BITS_PER_LONG, gives the value of bitbit, which can never be greater than maxfd, it can only be equal to maxfd at most, so the following check 'if (bitbit > maxfd)' will never be true. Moreover, when bitbit equals maxfd, it indicates that there are no unused fds, and the function can directly return. Fix this check. Signed-off-by: Yuntao Wang Link: https://lore.kernel.org/r/20240529160656.209352-1-yuntao.wang@linux.dev Reviewed-by: Jan Kara Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/file.c b/fs/file.c index e56059fa1b309..64892b7444191 100644 --- a/fs/file.c +++ b/fs/file.c @@ -462,12 +462,12 @@ struct files_struct init_files = { static unsigned int find_next_fd(struct fdtable *fdt, unsigned int start) { - unsigned int maxfd = fdt->max_fds; + unsigned int maxfd = fdt->max_fds; /* always multiple of BITS_PER_LONG */ unsigned int maxbit = maxfd / BITS_PER_LONG; unsigned int bitbit = start / BITS_PER_LONG; bitbit = find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) * BITS_PER_LONG; - if (bitbit > maxfd) + if (bitbit >= maxfd) return maxfd; if (bitbit > start) start = bitbit; -- 2.43.0 . From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuntao Wang , Jan Kara , Christian Brauner , Sasha Levin , viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 1/2] fs/file: fix the check in find_next_fd() Date: Sun, 23 Jun 2024 09:45:51 -0400 Message-ID: <20240623134552.810231-1-sashal@kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.316 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255990 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yuntao Wang [ Upstream commit ed8c7fbdfe117abbef81f65428ba263118ef298a ] The maximum possible return value of find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) is maxbit. This return value, multiplied by BITS_PER_LONG, gives the value of bitbit, which can never be greater than maxfd, it can only be equal to maxfd at most, so the following check 'if (bitbit > maxfd)' will never be true. Moreover, when bitbit equals maxfd, it indicates that there are no unused fds, and the function can directly return. Fix this check. Signed-off-by: Yuntao Wang Link: https://lore.kernel.org/r/20240529160656.209352-1-yuntao.wang@linux.dev Reviewed-by: Jan Kara Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/file.c b/fs/file.c index 928ba7b8df1e9..f5ba0e6f1a4c6 100644 --- a/fs/file.c +++ b/fs/file.c @@ -462,12 +462,12 @@ struct files_struct init_files = { static unsigned int find_next_fd(struct fdtable *fdt, unsigned int start) { - unsigned int maxfd = fdt->max_fds; + unsigned int maxfd = fdt->max_fds; /* always multiple of BITS_PER_LONG */ unsigned int maxbit = maxfd / BITS_PER_LONG; unsigned int bitbit = start / BITS_PER_LONG; bitbit = find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) * BITS_PER_LONG; - if (bitbit > maxfd) + if (bitbit >= maxfd) return maxfd; if (bitbit > start) start = bitbit; -- 2.43.0 . From: Krzysztof Kozlowski To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Linus Walleij , Arnd Bergmann , Conor Dooley Subject: [PATCH v2] dt-bindings: mfd: Explain lack of child dependency in simple-mfd Date: Sun, 23 Jun 2024 15:46:00 +0200 Message-ID: <20240623134600.115098-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255992 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Common mistake of usage of 'simple-mfd' compatible is a dependency of children on resources acquired and managed by the parent, e.g. clocks. Extend the simple-mfd documentation to cover this case. Cc: Linus Walleij Cc: Arnd Bergmann Reviewed-by: Conor Dooley Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Rephrase the paragraph, as discussed with Lee. 2. Add Rb tag. --- Documentation/devicetree/bindings/mfd/mfd.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/mfd/mfd.txt b/Documentation/devicetree/bindings/mfd/mfd.txt index 336c0495c8a3..b938fa26d2ce 100644 --- a/Documentation/devicetree/bindings/mfd/mfd.txt +++ b/Documentation/devicetree/bindings/mfd/mfd.txt @@ -17,13 +17,14 @@ A typical MFD can be: Optional properties: -- compatible : "simple-mfd" - this signifies that the operating system should - consider all subnodes of the MFD device as separate devices akin to how - "simple-bus" indicates when to see subnodes as children for a simple - memory-mapped bus. For more complex devices, when the nexus driver has to - probe registers to figure out what child devices exist etc, this should not - be used. In the latter case the child devices will be determined by the - operating system. +- compatible : "simple-mfd" - this signifies that the operating system + should consider all subnodes of the MFD device as separate and independent + devices, so not needing any resources to be provided by the parent device. + Similarly to how "simple-bus" indicates when to see subnodes as children for + a simple memory-mapped bus. + For more complex devices, when the nexus driver has to probe registers to + figure out what child devices exist etc, this should not be used. In the + latter case the child devices will be determined by the operating system. - ranges: Describes the address mapping relationship to the parent. Should set the child's base address to 0, the physical address within parent's address -- 2.43.0 . From: Robert Marko To: lgirdwood@gmail.com, broonie@kernel.org, linux-kernel@vger.kernel.org Cc: Robert Marko Subject: [PATCH] regulator: userspace-consumer: quiet device deferral Date: Sun, 23 Jun 2024 16:09:35 +0200 Message-ID: <20240623140947.1252376-1-robimarko@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1255998 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Trying to use userspace-consumer when the required supplies have not yet been probed will throw an error message on deferral: reg-userspace-consumer output-led-power: Failed to get supplies: -517 So, lets simply use dev_err_probe() instead of dev_err() to not print errors in case when driver probe is being deferred. Signed-off-by: Robert Marko --- drivers/regulator/userspace-consumer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c index 86a626a4f610..6153d0295b6d 100644 --- a/drivers/regulator/userspace-consumer.c +++ b/drivers/regulator/userspace-consumer.c @@ -158,10 +158,8 @@ static int regulator_userspace_consumer_probe(struct platform_device *pdev) ret = devm_regulator_bulk_get_exclusive(&pdev->dev, drvdata->num_supplies, drvdata->supplies); - if (ret) { - dev_err(&pdev->dev, "Failed to get supplies: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "Failed to get supplies\n"); platform_set_drvdata(pdev, drvdata); -- 2.45.2 . Date: Sun, 23 Jun 2024 14:34:12 +0000 To: Pawan Gupta From: Jari Ruusu Cc: Dave Hansen , Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" Subject: Stable linux-5.10.x regression triggered by MDS mitigation Message-ID: X-Pm-Message-ID: 73b9c0e2971e71ba75489e27d73131b41a7615d3 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256008 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail I have 32-bit x86 linux virtual machine running on QEMU-8.2.2+ds-0ubuntu1 with KVM acceleration. QEMU emulated CPU model is pentium2. Host is 64-bit linux running on Intel i5-7200U with latest microcode. Inside that 32-bit x86 linux VM I sometimes start dosemu to run some old MS-DOS programs. Now dosemu fails to start with "Segmentation fault" error, and this shows up in dmesg output: [ 23.768348] general protection fault: 0000 [#1] [ 23.768353] CPU: 0 PID: 1730 Comm: dosemu.bin Not tainted 5.10.214-test1= 2345 #1 [ 23.768354] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS = rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 [ 23.768358] EIP: restore_all_switch_stack+0xbd/0xc5 [ 23.768359] Code: 10 36 89 48 fc 8b 4c 24 0c 81 e1 ff ff 00 00 36 89 48 = f8 8b 4c 24 08 36 89 48 f4 8b 4c 24 04 36 89 48 f0 59 8d 60 f0 58 89 f6 <0f= > 00 2d 80 87 5c c1 cf fc 0f a0 50 b8 00 00 00 00 8e e0 8c d0 66 [ 23.768361] EAX: 00000000 EBX: 00000000 ECX: 00000000 EDX: 00000000 [ 23.768362] ESI: 00000000 EDI: 00000000 EBP: 00000000 ESP: ffc03fdc [ 23.768363] DS: 0000 ES: 0000 FS: 0000 GS: 0033 SS: 0068 EFLAGS: 0001004= 6 [ 23.768366] CR0: 80050033 CR2: 00a33020 CR3: 0fc3b000 CR4: 00000290 [ 23.768368] Call Trace: [ 23.768371] ? show_regs+0x5d/0x60 [ 23.768373] ? __die_body+0x10/0x43 [ 23.768374] ? die_addr+0x27/0x3c [ 23.768376] ? exc_general_protection+0x1e6/0x239 [ 23.768378] ? exc_bounds+0x8a/0x8a [ 23.768379] ? handle_exception+0x147/0x147 [ 23.768381] ? exc_bounds+0x8a/0x8a [ 23.768386] ? restore_all_switch_stack+0xbd/0xc5 [ 23.768388] ? exc_bounds+0x8a/0x8a [ 23.768389] ? restore_all_switch_stack+0xbd/0xc5 [ 23.768390] Modules linked in: [ 23.768392] ---[ end trace 960c0712f12c2f48 ]--- [ 23.768394] EIP: restore_all_switch_stack+0xbd/0xc5 [ 23.768395] Code: 10 36 89 48 fc 8b 4c 24 0c 81 e1 ff ff 00 00 36 89 48 = f8 8b 4c 24 08 36 89 48 f4 8b 4c 24 04 36 89 48 f0 59 8d 60 f0 58 89 f6 <0f= > 00 2d 80 87 5c c1 cf fc 0f a0 50 b8 00 00 00 00 8e e0 8c d0 66 [ 23.768396] EAX: 00000000 EBX: 00000000 ECX: 00000000 EDX: 00000000 [ 23.768397] ESI: 00000000 EDI: 00000000 EBP: 00000000 ESP: ffc03fdc [ 23.768398] DS: 0000 ES: 0000 FS: 0000 GS: 0033 SS: 0068 EFLAGS: 0001004= 6 [ 23.768400] CR0: 80050033 CR2: 00a33020 CR3: 0fc3b000 CR4: 00000290 Inside that 32-bit VM, kernel.org linux-5.10.214 and earlier 5.10.x versions start dosemu normally. Inside that 32-bit VM, linux-5.10.215 and later 5.10.x versions fail to start dosemu. Inside that 32-bit VM, linux-5.10.215 and later 5.10.x versions work if "mitigations=3Doff" kernel parameter is added to the kernel running inside the VM. I have narrowed down the problem so that linux-5.10.214 plus following 5 patches trigger that failure. Above dmesg output from "5.10.214-test12345" kernel includes following 5 patches. x86/asm: Add _ASM_RIP() macro for x86-64 (%rip) suffix https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h= =3Dlinux-5.10.y&id=3D8b20c6f894b7d7d87d3aa1a85cbc7d57378e1346 x86/bugs: Add asm helpers for executing VERW https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h= =3Dlinux-5.10.y&id=3D35e36eac881cddea42ca5fd93facc145a2d5369d x86/entry_64: Add VERW just before userspace transition https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h= =3Dlinux-5.10.y&id=3Dedc702b4a820fc7ffc20e732db1c421cfffbb746 x86/entry_32: Add VERW just before userspace transition https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h= =3Dlinux-5.10.y&id=3D50f021f0b985629accf10481a6e89af8b9700583 x86/bugs: Use ALTERNATIVE() instead of mds_user_clear static key https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h= =3Dlinux-5.10.y&id=3D6192d9ed311f70eb7e8ab4a874631a98c5a9217e My reading of above dmesg output indicates that it is that VERW opcode that fails inside CLEAR_CPU_BUFFERS macro in arch/x86/include/asm/nospec-branch.h file. My reading of (possibly outdated) Intel Instruction Set Reference indicates this: "The VERR and VERW instructions are not recognized in virtual-8086 mode". My understanding is that dosemu uses virtual-8086 mode if that is available. Did above patch-set just kill virtual-8086 mode and dosemu permanently despite my 32-bit VM kernel .config having these? CONFIG_X86_LEGACY_VM86=3Dy CONFIG_VM86=3Dy I know that I am doing weird stuff and I understand that 32-bit linux and dosemu are probably something that most people don't care about, but this is still stable linux-5.10.x kernel regression that should be fixed. Upstream Linux-6.10-rc4 seems to have similarly functioning CLEAR_CPU_BUFFERS macro with VERW opcode that is used in restore_all_switch_stack code path, so the same problem may well be with all newer kernels. Pawan Gupta, Since you seem to be the author of above mentioned breakage, is there any chance of you sorting this out? -- Jari Ruusu=C2=A0 4096R/8132F189 12D6 4C3A DCDA 0AA4 27BD=C2=A0 ACDF F073 3C= 80 8132 F189 . Message-ID: <20240623142137.448898081@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 00/21] genirq, irqchip: Convert ARM MSI handling to per device MSI domains Date: Sun, 23 Jun 2024 17:18:31 +0200 (CEST) X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256026 org.kernel.vger.linux-pci:144356 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is version 4 of the series to convert ARM MSI handling over to per device MSI domains. Version 3 can be found here: https://lore.kernel.org/lkml/20240614102403.13610-1-shivamurthy.shastri@linutronix.de The conversion aims to replace the existing platform MSI mechanism and enables ARM to support the future PCI/IMS mechanism. The infrastructure to replace the platform MSI mechanism is already upstream and in use by RISC-V and has been tested on various ARM platforms during the V2 development. Changes vs. V3: - Fix the conversion of the GIC V3 MBI driver - Marc - Dropped a few stray MSI_FLAG_PCI_MSI_MASK_PARENT flags - Dropped the trivial cleanup patches as they have been merged - Picked up tags The series is only lightly tested due to lack of hardware, so we rely on the people who have access to affected machines to help with testing. If there are no major objections raised or testing fallout reported, I'm aiming this series for the next merge window. The series is also available from git: git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git devmsi-arm-v4 Thanks, tglx --- b/drivers/base/platform-msi.c | 350 -------------------------- b/drivers/irqchip/Kconfig | 8 b/drivers/irqchip/Makefile | 4 b/drivers/irqchip/irq-gic-common.h | 3 b/drivers/irqchip/irq-gic-v2m.c | 80 +---- b/drivers/irqchip/irq-gic-v3-its-msi-parent.c | 210 +++++++++++++++ b/drivers/irqchip/irq-gic-v3-its.c | 5 b/drivers/irqchip/irq-gic-v3-mbi.c | 130 +++------ b/drivers/irqchip/irq-imx-mu-msi.c | 48 +-- b/drivers/irqchip/irq-mbigen.c | 96 ++----- b/drivers/irqchip/irq-msi-lib.c | 135 ++++++++++ b/drivers/irqchip/irq-msi-lib.h | 27 ++ b/drivers/irqchip/irq-mvebu-gicp.c | 44 +-- b/drivers/irqchip/irq-mvebu-icu.c | 275 ++++++++------------ b/drivers/irqchip/irq-mvebu-odmi.c | 37 +- b/drivers/irqchip/irq-mvebu-sei.c | 52 +-- b/drivers/pci/msi/irqdomain.c | 21 + b/include/linux/msi.h | 52 --- b/kernel/irq/msi.c | 95 +------ drivers/irqchip/irq-gic-v3-its-pci-msi.c | 202 --------------- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 163 ------------ 21 files changed, 738 insertions(+), 1299 deletions(-) . Message-ID: <20240623142234.778182630@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 01/21] PCI/MSI: Provide MSI_FLAG_PCI_MSI_MASK_PARENT References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:32 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256027 org.kernel.vger.linux-pci:144357 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Shivamurthy Shastri Most ARM(64) PCI/MSI domains mask and unmask in the parent domain after or before the PCI mask/unmask operation takes place. So there are more than a dozen of the same wrapper implementation all over the place. Don't make the same mistake with the new per device PCI/MSI domains and provide a new MSI feature flag, which lets the domain implementation enable this sequence in the PCI/MSI code. Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner Acked-by: Bjorn Helgaas --- v3: new patch to replace the global static key - Marc Zyngier --- drivers/pci/msi/irqdomain.c | 21 +++++++++++++++++++++ include/linux/msi.h | 2 ++ 2 files changed, 23 insertions(+) --- a/drivers/pci/msi/irqdomain.c +++ b/drivers/pci/msi/irqdomain.c @@ -148,17 +148,35 @@ static void pci_device_domain_set_desc(m arg->hwirq = desc->msi_index; } +static __always_inline void cond_mask_parent(struct irq_data *data) +{ + struct msi_domain_info *info = data->domain->host_data; + + if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT)) + irq_chip_mask_parent(data); +} + +static __always_inline void cond_unmask_parent(struct irq_data *data) +{ + struct msi_domain_info *info = data->domain->host_data; + + if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT)) + irq_chip_unmask_parent(data); +} + static void pci_irq_mask_msi(struct irq_data *data) { struct msi_desc *desc = irq_data_get_msi_desc(data); pci_msi_mask(desc, BIT(data->irq - desc->irq)); + cond_mask_parent(data); } static void pci_irq_unmask_msi(struct irq_data *data) { struct msi_desc *desc = irq_data_get_msi_desc(data); + cond_unmask_parent(data); pci_msi_unmask(desc, BIT(data->irq - desc->irq)); } @@ -170,6 +188,7 @@ static void pci_irq_unmask_msi(struct ir #define MSI_COMMON_FLAGS (MSI_FLAG_FREE_MSI_DESCS | \ MSI_FLAG_ACTIVATE_EARLY | \ + MSI_FLAG_PCI_MSI_MASK_PARENT | \ MSI_FLAG_DEV_SYSFS | \ MSI_REACTIVATE) @@ -195,10 +214,12 @@ static const struct msi_domain_template static void pci_irq_mask_msix(struct irq_data *data) { pci_msix_mask(irq_data_get_msi_desc(data)); + cond_mask_parent(data); } static void pci_irq_unmask_msix(struct irq_data *data) { + cond_unmask_parent(data); pci_msix_unmask(irq_data_get_msi_desc(data)); } --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -556,6 +556,8 @@ enum { MSI_FLAG_USE_DEV_FWNODE = (1 << 7), /* Set parent->dev into domain->pm_dev on device domain creation */ MSI_FLAG_PARENT_PM_DEV = (1 << 8), + /* Support for parent mask/unmask */ + MSI_FLAG_PCI_MSI_MASK_PARENT = (1 << 9), /* Mask for the generic functionality */ MSI_GENERIC_FLAGS_MASK = GENMASK(15, 0), . Message-ID: <20240623142234.840975799@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 02/21] irqchip: Provide irq-msi-lib References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:34 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256028 org.kernel.vger.linux-pci:144358 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner All irqdomains which provide MSI parent domain functionality for per device MSI domains need to provide a select() callback for the irqdomain and a function to initialize the child domain. Most of these functions would just be copy&paste with minimal modifications, so provide a library function which implements the required functionality and is customizable via parent_domain::msi_parent_ops. The check for the supported bus tokens in msi_lib_init_dev_msi_info() is expanded step by step within the next patches. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: renamed file and functions as the library is independent of gic - Frank Li --- drivers/irqchip/Kconfig | 3 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-msi-lib.c | 112 ++++++++++++++++++++++++++++++++++ drivers/irqchip/irq-msi-lib.h | 19 ++++++ 4 files changed, 135 insertions(+) create mode 100644 drivers/irqchip/irq-msi-lib.c create mode 100644 drivers/irqchip/irq-msi-lib.h diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 14464716bacb..2bf8d940504c 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -74,6 +74,9 @@ config ARM_VIC_NR The maximum number of VICs available in the system, for power management. +config IRQ_MSI_LIB + bool + config ARMADA_370_XP_IRQ bool select GENERIC_IRQ_CHIP diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index d9dc3d99aaa8..72c7f6289411 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o obj-$(CONFIG_ARM_GIC) += irq-gic.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_PM) += irq-gic-pm.o obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o +obj-$(CONFIG_IRQ_MSI_LIB) += irq-msi-lib.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-v3-mbi.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o diff --git a/drivers/irqchip/irq-msi-lib.c b/drivers/irqchip/irq-msi-lib.c new file mode 100644 index 000000000000..acbccf8f7f5b --- /dev/null +++ b/drivers/irqchip/irq-msi-lib.c @@ -0,0 +1,112 @@ +// SPDX-License-Identifier: GPL-2.0-only +// Copyright (C) 2022 Linutronix GmbH +// Copyright (C) 2022 Intel + +#include + +#include "irq-msi-lib.h" + +/** + * msi_lib_init_dev_msi_info - Domain info setup for MSI domains + * @dev: The device for which the domain is created for + * @domain: The domain providing this callback + * @real_parent: The real parent domain of the domain to be initialized + * which might be a domain built on top of @domain or + * @domain itself + * @info: The domain info for the domain to be initialize + * + * This function is to be used for all types of MSI domains above the root + * parent domain and any intermediates. The topmost parent domain specific + * functionality is determined via @real_parent. + * + * All intermediate domains between the root and the device domain must + * have either msi_parent_ops.init_dev_msi_info = msi_parent_init_dev_msi_info + * or invoke it down the line. + */ +bool msi_lib_init_dev_msi_info(struct device *dev, struct irq_domain *domain, + struct irq_domain *real_parent, + struct msi_domain_info *info) +{ + const struct msi_parent_ops *pops = real_parent->msi_parent_ops; + + /* + * MSI parent domain specific settings. For now there is only the + * root parent domain, e.g. NEXUS, acting as a MSI parent, but it is + * possible to stack MSI parents. See x86 vector -> irq remapping + */ + if (domain->bus_token == pops->bus_select_token) { + if (WARN_ON_ONCE(domain != real_parent)) + return false; + } else { + WARN_ON_ONCE(1); + return false; + } + + /* Parent ops available? */ + if (WARN_ON_ONCE(!pops)) + return false; + + /* Is the target domain bus token supported? */ + switch(info->bus_token) { + default: + /* + * This should never be reached. See + * msi_lib_irq_domain_select() + */ + WARN_ON_ONCE(1); + return false; + } + + /* + * Mask out the domain specific MSI feature flags which are not + * supported by the real parent. + */ + info->flags &= pops->supported_flags; + /* Enforce the required flags */ + info->flags |= pops->required_flags; + + /* Chip updates for all child bus types */ + if (!info->chip->irq_eoi) + info->chip->irq_eoi = irq_chip_eoi_parent; + + /* + * The device MSI domain can never have a set affinity callback. It + * always has to rely on the parent domain to handle affinity + * settings. The device MSI domain just has to write the resulting + * MSI message into the hardware which is the whole purpose of the + * device MSI domain aside of mask/unmask which is provided e.g. by + * PCI/MSI device domains. + */ + info->chip->irq_set_affinity = msi_domain_set_affinity; + return true; +} +EXPORT_SYMBOL_GPL(msi_lib_init_dev_msi_info); + +/** + * msi_lib_irq_domain_select - Shared select function for NEXUS domains + * @d: Pointer to the irq domain on which select is invoked + * @fwspec: Firmware spec describing what is searched + * @bus_token: The bus token for which a matching irq domain is looked up + * + * Returns: %0 if @d is not what is being looked for + * + * %1 if @d is either the domain which is directly searched for or + * if @d is providing the parent MSI domain for the functionality + * requested with @bus_token. + */ +int msi_lib_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec, + enum irq_domain_bus_token bus_token) +{ + const struct msi_parent_ops *ops = d->msi_parent_ops; + u32 busmask = BIT(bus_token); + + if (fwspec->fwnode != d->fwnode || fwspec->param_count != 0) + return 0; + + /* Handle pure domain searches */ + if (bus_token == ops->bus_select_token) + return 1; + + return ops && !!(ops->bus_select_mask & busmask); +} +EXPORT_SYMBOL_GPL(msi_lib_irq_domain_select); diff --git a/drivers/irqchip/irq-msi-lib.h b/drivers/irqchip/irq-msi-lib.h new file mode 100644 index 000000000000..f0706cc28264 --- /dev/null +++ b/drivers/irqchip/irq-msi-lib.h @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-only +// Copyright (C) 2022 Linutronix GmbH +// Copyright (C) 2022 Intel + +#ifndef _DRIVERS_IRQCHIP_IRQ_MSI_LIB_H +#define _DRIVERS_IRQCHIP_IRQ_MSI_LIB_H + +#include +#include +#include + +int msi_lib_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec, + enum irq_domain_bus_token bus_token); + +bool msi_lib_init_dev_msi_info(struct device *dev, struct irq_domain *domain, + struct irq_domain *real_parent, + struct msi_domain_info *info); + +#endif /* _DRIVERS_IRQCHIP_IRQ_MSI_LIB_H */ -- 2.34.1 . Message-ID: <20240623142234.903076277@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 03/21] irqchip/gic-v3-its: Provide MSI parent infrastructure References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:36 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256029 org.kernel.vger.linux-pci:144359 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner To support per device MSI domains the ITS must provide MSI parent domain functionality. Provide the basic skeleton for this: - msi_parent_ops - child domain init callback - the MSI parent flag set in irqdomain::flags This does not make ITS a functional parent domain as there is no bit set in the bus_select_mask yet, but it provides the base to implement PCI and platform MSI support gradually on top. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: enabled MSI_FLAG_PCI_MSI_MASK_PARENT in msi_parent_ops::supported_flags --- drivers/irqchip/Kconfig | 1 + drivers/irqchip/Makefile | 2 +- drivers/irqchip/irq-gic-common.h | 3 ++ drivers/irqchip/irq-gic-v3-its-msi-parent.c | 31 +++++++++++++++++++++ drivers/irqchip/irq-gic-v3-its.c | 5 ++++ 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 drivers/irqchip/irq-gic-v3-its-msi-parent.c diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 2bf8d940504c..b51863fa9b38 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -41,6 +41,7 @@ config ARM_GIC_V3 config ARM_GIC_V3_ITS bool select GENERIC_MSI_IRQ + select IRQ_MSI_LIB default ARM_GIC_V3 config ARM_GIC_V3_ITS_PCI diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 72c7f6289411..6e4f7715206d 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -32,7 +32,7 @@ obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o obj-$(CONFIG_IRQ_MSI_LIB) += irq-msi-lib.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-v3-mbi.o irq-gic-common.o -obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o +obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o irq-gic-v3-its-msi-parent.o obj-$(CONFIG_ARM_GIC_V3_ITS_PCI) += irq-gic-v3-its-pci-msi.o obj-$(CONFIG_ARM_GIC_V3_ITS_FSL_MC) += irq-gic-v3-its-fsl-mc-msi.o obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o diff --git a/drivers/irqchip/irq-gic-common.h b/drivers/irqchip/irq-gic-common.h index f407cce9ecaa..eb4a220dd6ad 100644 --- a/drivers/irqchip/irq-gic-common.h +++ b/drivers/irqchip/irq-gic-common.h @@ -8,6 +8,7 @@ #include #include +#include #include struct gic_quirk { @@ -29,6 +30,8 @@ void gic_enable_quirks(u32 iidr, const struct gic_quirk *quirks, void gic_enable_of_quirks(const struct device_node *np, const struct gic_quirk *quirks, void *data); +extern const struct msi_parent_ops gic_v3_its_msi_parent_ops; + #define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING (1 << 0) #define RDIST_FLAGS_RD_TABLES_PREALLOCATED (1 << 1) #define RDIST_FLAGS_FORCE_NON_SHAREABLE (1 << 2) diff --git a/drivers/irqchip/irq-gic-v3-its-msi-parent.c b/drivers/irqchip/irq-gic-v3-its-msi-parent.c new file mode 100644 index 000000000000..cdc0844229b5 --- /dev/null +++ b/drivers/irqchip/irq-gic-v3-its-msi-parent.c @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-only +// Copyright (C) 2022 Linutronix GmbH +// Copyright (C) 2022 Intel + +#include "irq-gic-common.h" +#include "irq-msi-lib.h" + +#define ITS_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS) + +#define ITS_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK | \ + MSI_FLAG_PCI_MSIX | \ + MSI_FLAG_MULTI_PCI_MSI | \ + MSI_FLAG_PCI_MSI_MASK_PARENT) + +static bool its_init_dev_msi_info(struct device *dev, struct irq_domain *domain, + struct irq_domain *real_parent, struct msi_domain_info *info) +{ + if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info)) + return false; + + return true; +} + +const struct msi_parent_ops gic_v3_its_msi_parent_ops = { + .supported_flags = ITS_MSI_FLAGS_SUPPORTED, + .required_flags = ITS_MSI_FLAGS_REQUIRED, + .bus_select_token = DOMAIN_BUS_NEXUS, + .prefix = "ITS-", + .init_dev_msi_info = its_init_dev_msi_info, +}; diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 3c755d5dad6e..d770d6aedb29 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -38,6 +38,7 @@ #include #include "irq-gic-common.h" +#include "irq-msi-lib.h" #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) #define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) @@ -3688,6 +3689,7 @@ static void its_irq_domain_free(struct irq_domain *domain, unsigned int virq, } static const struct irq_domain_ops its_domain_ops = { + .select = msi_lib_irq_domain_select, .alloc = its_irq_domain_alloc, .free = its_irq_domain_free, .activate = its_irq_domain_activate, @@ -4993,6 +4995,9 @@ static int its_init_domain(struct its_node *its) irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS); + inner_domain->msi_parent_ops = &gic_v3_its_msi_parent_ops; + inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + return 0; } -- 2.34.1 . Message-ID: <20240623142234.964056815@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 04/21] irqchip/irq-msi-lib: Prepare for PCI MSI/MSIX References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:38 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256030 org.kernel.vger.linux-pci:144360 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner Add the bus tokens for DOMAIN_BUS_PCI_DEVICE_MSI and DOMAIN_BUS_PCI_DEVICE_MSIX to the common child init function. Provide the match mask which can be used by parent domain implementation so the bitmask based child bus token match works. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: removed pci_device_msi_mask_unmask_parent_enable call as there is no more global static key. --- drivers/irqchip/irq-msi-lib.c | 6 ++++++ drivers/irqchip/irq-msi-lib.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/irqchip/irq-msi-lib.c b/drivers/irqchip/irq-msi-lib.c index acbccf8f7f5b..0b359c5d8c6c 100644 --- a/drivers/irqchip/irq-msi-lib.c +++ b/drivers/irqchip/irq-msi-lib.c @@ -48,6 +48,12 @@ bool msi_lib_init_dev_msi_info(struct device *dev, struct irq_domain *domain, /* Is the target domain bus token supported? */ switch(info->bus_token) { + case DOMAIN_BUS_PCI_DEVICE_MSI: + case DOMAIN_BUS_PCI_DEVICE_MSIX: + if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PCI_MSI))) + return false; + + break; default: /* * This should never be reached. See diff --git a/drivers/irqchip/irq-msi-lib.h b/drivers/irqchip/irq-msi-lib.h index f0706cc28264..525aa5284a99 100644 --- a/drivers/irqchip/irq-msi-lib.h +++ b/drivers/irqchip/irq-msi-lib.h @@ -9,6 +9,12 @@ #include #include +#ifdef CONFIG_PCI_MSI +#define MATCH_PCI_MSI BIT(DOMAIN_BUS_PCI_MSI) +#else +#define MATCH_PCI_MSI (0) +#endif + int msi_lib_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec, enum irq_domain_bus_token bus_token); -- 2.34.1 . Message-ID: <20240623142235.085171290@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 06/21] irqchip/irq-msi-lib: Prepare for DEVICE MSI to replace platform MSI References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:41 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256031 org.kernel.vger.linux-pci:144361 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner Add the prerequisites for DEVICE MSI into the shared select() and child domain init function. These domains are really trivial and just provide a custom irq chip callback to write the MSI message. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: adopted to IMS->MSI rename --- drivers/irqchip/irq-msi-lib.c | 13 +++++++++++++ drivers/irqchip/irq-msi-lib.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/drivers/irqchip/irq-msi-lib.c b/drivers/irqchip/irq-msi-lib.c index 0b359c5d8c6c..6aa4974d2d12 100644 --- a/drivers/irqchip/irq-msi-lib.c +++ b/drivers/irqchip/irq-msi-lib.c @@ -53,6 +53,19 @@ bool msi_lib_init_dev_msi_info(struct device *dev, struct irq_domain *domain, if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_PCI_MSI))) return false; + break; + case DOMAIN_BUS_DEVICE_MSI: + /* + * Per device MSI should never have any MSI feature bits + * set. It's sole purpose is to create a dumb interrupt + * chip which has a device specific irq_write_msi_msg() + * callback. + */ + if (WARN_ON_ONCE(info->flags)) + return false; + + /* Core managed MSI descriptors */ + info->flags = MSI_FLAG_ALLOC_SIMPLE_MSI_DESCS | MSI_FLAG_FREE_MSI_DESCS; break; default: /* diff --git a/drivers/irqchip/irq-msi-lib.h b/drivers/irqchip/irq-msi-lib.h index 525aa5284a99..681ceabb7bc7 100644 --- a/drivers/irqchip/irq-msi-lib.h +++ b/drivers/irqchip/irq-msi-lib.h @@ -15,6 +15,8 @@ #define MATCH_PCI_MSI (0) #endif +#define MATCH_PLATFORM_MSI BIT(DOMAIN_BUS_PLATFORM_MSI) + int msi_lib_irq_domain_select(struct irq_domain *d, struct irq_fwspec *fwspec, enum irq_domain_bus_token bus_token); -- 2.34.1 . Message-ID: <20240623142235.024567623@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 05/21] irqchip/gic-v3-its: Provide MSI parent for PCI/MSI[-X] References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:39 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256032 org.kernel.vger.linux-pci:144362 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner The its_pci_msi_prepare() function from the ITS-PCI/MSI code provides the 'global' PCI/MSI domains. Move this function to the ITS-MSI parent code and amend the function to use the domain hardware size, which is the MSI[X] vector count, for allocating the ITS slots for the PCI device. Enable PCI matching in msi_parent_ops and provide the necessary update to the ITS specific child domain initialization function so that the prepare callback gets invoked on allocations. The latter might be optimized to do the allocation right at the point where the child domain is initialized, but keep it simple for now. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: adopted to IMS->MSI rename --- drivers/irqchip/Makefile | 1 - drivers/irqchip/irq-gic-v3-its-msi-parent.c | 108 +++++++++++ drivers/irqchip/irq-gic-v3-its-pci-msi.c | 202 -------------------- 3 files changed, 108 insertions(+), 203 deletions(-) delete mode 100644 drivers/irqchip/irq-gic-v3-its-pci-msi.c diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 6e4f7715206d..c5316634637f 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -33,7 +33,6 @@ obj-$(CONFIG_IRQ_MSI_LIB) += irq-msi-lib.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-v3-mbi.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o irq-gic-v3-its-msi-parent.o -obj-$(CONFIG_ARM_GIC_V3_ITS_PCI) += irq-gic-v3-its-pci-msi.o obj-$(CONFIG_ARM_GIC_V3_ITS_FSL_MC) += irq-gic-v3-its-fsl-mc-msi.o obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o obj-$(CONFIG_HISILICON_IRQ_MBIGEN) += irq-mbigen.o diff --git a/drivers/irqchip/irq-gic-v3-its-msi-parent.c b/drivers/irqchip/irq-gic-v3-its-msi-parent.c index cdc0844229b5..e81fefa428e2 100644 --- a/drivers/irqchip/irq-gic-v3-its-msi-parent.c +++ b/drivers/irqchip/irq-gic-v3-its-msi-parent.c @@ -1,7 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only +// Copyright (C) 2013-2015 ARM Limited, All Rights Reserved. +// Author: Marc Zyngier // Copyright (C) 2022 Linutronix GmbH // Copyright (C) 2022 Intel +#include + #include "irq-gic-common.h" #include "irq-msi-lib.h" @@ -13,12 +17,115 @@ MSI_FLAG_MULTI_PCI_MSI | \ MSI_FLAG_PCI_MSI_MASK_PARENT) +#ifdef CONFIG_PCI_MSI +static int its_pci_msi_vec_count(struct pci_dev *pdev, void *data) +{ + int msi, msix, *count = data; + + msi = max(pci_msi_vec_count(pdev), 0); + msix = max(pci_msix_vec_count(pdev), 0); + *count += max(msi, msix); + + return 0; +} + +static int its_get_pci_alias(struct pci_dev *pdev, u16 alias, void *data) +{ + struct pci_dev **alias_dev = data; + + *alias_dev = pdev; + + return 0; +} + +static int its_pci_msi_prepare(struct irq_domain *domain, struct device *dev, + int nvec, msi_alloc_info_t *info) +{ + struct pci_dev *pdev, *alias_dev; + struct msi_domain_info *msi_info; + int alias_count = 0, minnvec = 1; + + if (!dev_is_pci(dev)) + return -EINVAL; + + pdev = to_pci_dev(dev); + /* + * If pdev is downstream of any aliasing bridges, take an upper + * bound of how many other vectors could map to the same DevID. + * Also tell the ITS that the signalling will come from a proxy + * device, and that special allocation rules apply. + */ + pci_for_each_dma_alias(pdev, its_get_pci_alias, &alias_dev); + if (alias_dev != pdev) { + if (alias_dev->subordinate) + pci_walk_bus(alias_dev->subordinate, + its_pci_msi_vec_count, &alias_count); + info->flags |= MSI_ALLOC_FLAGS_PROXY_DEVICE; + } + + /* ITS specific DeviceID, as the core ITS ignores dev. */ + info->scratchpad[0].ul = pci_msi_domain_get_msi_rid(domain, pdev); + + /* + * @domain->msi_domain_info->hwsize contains the size of the + * MSI[-X] domain, but vector allocation happens one by one. This + * needs some thought when MSI comes into play as the size of MSI + * might be unknown at domain creation time and therefore set to + * MSI_MAX_INDEX. + */ + msi_info = msi_get_domain_info(domain); + if (msi_info->hwsize > nvec) + nvec = msi_info->hwsize; + + /* + * Always allocate a power of 2, and special case device 0 for + * broken systems where the DevID is not wired (and all devices + * appear as DevID 0). For that reason, we generously allocate a + * minimum of 32 MSIs for DevID 0. If you want more because all + * your devices are aliasing to DevID 0, consider fixing your HW. + */ + nvec = max(nvec, alias_count); + if (!info->scratchpad[0].ul) + minnvec = 32; + nvec = max_t(int, minnvec, roundup_pow_of_two(nvec)); + + msi_info = msi_get_domain_info(domain->parent); + return msi_info->ops->msi_prepare(domain->parent, dev, nvec, info); +} +#else /* CONFIG_PCI_MSI */ +#define its_pci_msi_prepare NULL +#endif /* !CONFIG_PCI_MSI */ + static bool its_init_dev_msi_info(struct device *dev, struct irq_domain *domain, struct irq_domain *real_parent, struct msi_domain_info *info) { if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info)) return false; + switch(info->bus_token) { + case DOMAIN_BUS_PCI_DEVICE_MSI: + case DOMAIN_BUS_PCI_DEVICE_MSIX: + /* + * FIXME: This probably should be done after a (not yet + * existing) post domain creation callback once to make + * support for dynamic post-enable MSI-X allocations + * work without having to reevaluate the domain size + * over and over. It is known already at allocation + * time via info->hwsize. + * + * That should work perfectly fine for MSI/MSI-X but needs + * some thoughts for purely software managed MSI domains + * where the index space is only limited artificially via + * %MSI_MAX_INDEX. + */ + info->ops->msi_prepare = its_pci_msi_prepare; + break; + default: + /* Confused. How did the lib return true? */ + WARN_ON_ONCE(1); + return false; + } + return true; } @@ -26,6 +133,7 @@ const struct msi_parent_ops gic_v3_its_msi_parent_ops = { .supported_flags = ITS_MSI_FLAGS_SUPPORTED, .required_flags = ITS_MSI_FLAGS_REQUIRED, .bus_select_token = DOMAIN_BUS_NEXUS, + .bus_select_mask = MATCH_PCI_MSI, .prefix = "ITS-", .init_dev_msi_info = its_init_dev_msi_info, }; diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c deleted file mode 100644 index 93f77a8196da..000000000000 --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c +++ /dev/null @@ -1,202 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2013-2015 ARM Limited, All Rights Reserved. - * Author: Marc Zyngier - */ - -#include -#include -#include -#include -#include -#include - -static void its_mask_msi_irq(struct irq_data *d) -{ - pci_msi_mask_irq(d); - irq_chip_mask_parent(d); -} - -static void its_unmask_msi_irq(struct irq_data *d) -{ - pci_msi_unmask_irq(d); - irq_chip_unmask_parent(d); -} - -static struct irq_chip its_msi_irq_chip = { - .name = "ITS-MSI", - .irq_unmask = its_unmask_msi_irq, - .irq_mask = its_mask_msi_irq, - .irq_eoi = irq_chip_eoi_parent, -}; - -static int its_pci_msi_vec_count(struct pci_dev *pdev, void *data) -{ - int msi, msix, *count = data; - - msi = max(pci_msi_vec_count(pdev), 0); - msix = max(pci_msix_vec_count(pdev), 0); - *count += max(msi, msix); - - return 0; -} - -static int its_get_pci_alias(struct pci_dev *pdev, u16 alias, void *data) -{ - struct pci_dev **alias_dev = data; - - *alias_dev = pdev; - - return 0; -} - -static int its_pci_msi_prepare(struct irq_domain *domain, struct device *dev, - int nvec, msi_alloc_info_t *info) -{ - struct pci_dev *pdev, *alias_dev; - struct msi_domain_info *msi_info; - int alias_count = 0, minnvec = 1; - - if (!dev_is_pci(dev)) - return -EINVAL; - - msi_info = msi_get_domain_info(domain->parent); - - pdev = to_pci_dev(dev); - /* - * If pdev is downstream of any aliasing bridges, take an upper - * bound of how many other vectors could map to the same DevID. - * Also tell the ITS that the signalling will come from a proxy - * device, and that special allocation rules apply. - */ - pci_for_each_dma_alias(pdev, its_get_pci_alias, &alias_dev); - if (alias_dev != pdev) { - if (alias_dev->subordinate) - pci_walk_bus(alias_dev->subordinate, - its_pci_msi_vec_count, &alias_count); - info->flags |= MSI_ALLOC_FLAGS_PROXY_DEVICE; - } - - /* ITS specific DeviceID, as the core ITS ignores dev. */ - info->scratchpad[0].ul = pci_msi_domain_get_msi_rid(domain, pdev); - - /* - * Always allocate a power of 2, and special case device 0 for - * broken systems where the DevID is not wired (and all devices - * appear as DevID 0). For that reason, we generously allocate a - * minimum of 32 MSIs for DevID 0. If you want more because all - * your devices are aliasing to DevID 0, consider fixing your HW. - */ - nvec = max(nvec, alias_count); - if (!info->scratchpad[0].ul) - minnvec = 32; - nvec = max_t(int, minnvec, roundup_pow_of_two(nvec)); - return msi_info->ops->msi_prepare(domain->parent, dev, nvec, info); -} - -static struct msi_domain_ops its_pci_msi_ops = { - .msi_prepare = its_pci_msi_prepare, -}; - -static struct msi_domain_info its_pci_msi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX), - .ops = &its_pci_msi_ops, - .chip = &its_msi_irq_chip, -}; - -static struct of_device_id its_device_id[] = { - { .compatible = "arm,gic-v3-its", }, - {}, -}; - -static int __init its_pci_msi_init_one(struct fwnode_handle *handle, - const char *name) -{ - struct irq_domain *parent; - - parent = irq_find_matching_fwnode(handle, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { - pr_err("%s: Unable to locate ITS domain\n", name); - return -ENXIO; - } - - if (!pci_msi_create_irq_domain(handle, &its_pci_msi_domain_info, - parent)) { - pr_err("%s: Unable to create PCI domain\n", name); - return -ENOMEM; - } - - return 0; -} - -static int __init its_pci_of_msi_init(void) -{ - struct device_node *np; - - for (np = of_find_matching_node(NULL, its_device_id); np; - np = of_find_matching_node(np, its_device_id)) { - if (!of_device_is_available(np)) - continue; - if (!of_property_read_bool(np, "msi-controller")) - continue; - - if (its_pci_msi_init_one(of_node_to_fwnode(np), np->full_name)) - continue; - - pr_info("PCI/MSI: %pOF domain created\n", np); - } - - return 0; -} - -#ifdef CONFIG_ACPI - -static int __init -its_pci_msi_parse_madt(union acpi_subtable_headers *header, - const unsigned long end) -{ - struct acpi_madt_generic_translator *its_entry; - struct fwnode_handle *dom_handle; - const char *node_name; - int err = -ENXIO; - - its_entry = (struct acpi_madt_generic_translator *)header; - node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx", - (long)its_entry->base_address); - dom_handle = iort_find_domain_token(its_entry->translation_id); - if (!dom_handle) { - pr_err("%s: Unable to locate ITS domain handle\n", node_name); - goto out; - } - - err = its_pci_msi_init_one(dom_handle, node_name); - if (!err) - pr_info("PCI/MSI: %s domain created\n", node_name); - -out: - kfree(node_name); - return err; -} - -static int __init its_pci_acpi_msi_init(void) -{ - acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR, - its_pci_msi_parse_madt, 0); - return 0; -} -#else -static int __init its_pci_acpi_msi_init(void) -{ - return 0; -} -#endif - -static int __init its_pci_msi_init(void) -{ - its_pci_of_msi_init(); - its_pci_acpi_msi_init(); - - return 0; -} -early_initcall(its_pci_msi_init); -- 2.34.1 . Message-ID: <20240623142235.207343466@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 08/21] irqchip/irq-msi-lib: Prepare for DOMAIN_BUS_WIRED_TO_MSI References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:44 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256033 org.kernel.vger.linux-pci:144363 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner Add the new bus token to the accepted list of child domain tokens. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-msi-lib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/irqchip/irq-msi-lib.c b/drivers/irqchip/irq-msi-lib.c index 6aa4974d2d12..40c19087d719 100644 --- a/drivers/irqchip/irq-msi-lib.c +++ b/drivers/irqchip/irq-msi-lib.c @@ -67,6 +67,8 @@ bool msi_lib_init_dev_msi_info(struct device *dev, struct irq_domain *domain, /* Core managed MSI descriptors */ info->flags = MSI_FLAG_ALLOC_SIMPLE_MSI_DESCS | MSI_FLAG_FREE_MSI_DESCS; break; + case DOMAIN_BUS_WIRED_TO_MSI: + break; default: /* * This should never be reached. See -- 2.34.1 . Message-ID: <20240623142235.146579575@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 07/21] irqchip/mbigen: Prepare for real per device MSI References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:43 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256034 org.kernel.vger.linux-pci:144364 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner The core infrastructure has everything in place to switch MBIGEN to per device MSI domains and avoid the convoluted construct of the existing platform-MSI layering violation. The new infrastructure provides a wired interrupt specific interface in the MSI core which converts the 'hardware interrupt number + trigger type' allocation which is required for wired interrupts in the regular irqdomain code to a normal MSI allocation. The hardware interrupt number and the trigger type are stored in the MSI descriptor device cookie by the core code so the MBIGEN specific code can retrieve them. The new per device domain is only instantiated when the irqdomain which is associated to the MBIGEN device provides MSI parent functionality. Up to that point it invokes the existing code. Once the parent is converted the code for the current platform-MSI mechanism is removed. The new domain shares the interrupt chip callbacks and the translation function. The only new functionality aside of filling out the msi_domain_template is a domain specific set_desc() callback, which will go away once all platform-MSI code has been converted. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: removed unused variable 'parent' in the function 'mbigen_of_create_domain' --- drivers/irqchip/irq-mbigen.c | 98 +++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 28 deletions(-) diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index 58881d313979..db0fa80330d9 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -135,24 +135,14 @@ static int mbigen_set_type(struct irq_data *data, unsigned int type) return 0; } -static struct irq_chip mbigen_irq_chip = { - .name = "mbigen-v2", - .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, - .irq_eoi = mbigen_eoi_irq, - .irq_set_type = mbigen_set_type, - .irq_set_affinity = irq_chip_set_affinity_parent, -}; - -static void mbigen_write_msg(struct msi_desc *desc, struct msi_msg *msg) +static void mbigen_write_msi_msg(struct irq_data *d, struct msi_msg *msg) { - struct irq_data *d = irq_get_irq_data(desc->irq); void __iomem *base = d->chip_data; u32 val; if (!msg->address_lo && !msg->address_hi) return; - + base += get_mbigen_vec_reg(d->hwirq); val = readl_relaxed(base); @@ -165,10 +155,8 @@ static void mbigen_write_msg(struct msi_desc *desc, struct msi_msg *msg) writel_relaxed(val, base); } -static int mbigen_domain_translate(struct irq_domain *d, - struct irq_fwspec *fwspec, - unsigned long *hwirq, - unsigned int *type) +static int mbigen_domain_translate(struct irq_domain *d, struct irq_fwspec *fwspec, + unsigned long *hwirq, unsigned int *type) { if (is_of_node(fwspec->fwnode) || is_acpi_device_node(fwspec->fwnode)) { if (fwspec->param_count != 2) @@ -192,6 +180,17 @@ static int mbigen_domain_translate(struct irq_domain *d, return -EINVAL; } +/* The following section will go away once ITS provides a MSI parent */ + +static struct irq_chip mbigen_irq_chip = { + .name = "mbigen-v2", + .irq_mask = irq_chip_mask_parent, + .irq_unmask = irq_chip_unmask_parent, + .irq_eoi = mbigen_eoi_irq, + .irq_set_type = mbigen_set_type, + .irq_set_affinity = irq_chip_set_affinity_parent, +}; + static int mbigen_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs, @@ -232,11 +231,63 @@ static const struct irq_domain_ops mbigen_domain_ops = { .free = mbigen_irq_domain_free, }; +static void mbigen_write_msg(struct msi_desc *desc, struct msi_msg *msg) +{ + mbigen_write_msi_msg(irq_get_irq_data(desc->irq), msg); +} + +/* End of to be removed section */ + +static void mbigen_domain_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc) +{ + arg->desc = desc; + arg->hwirq = (u32)desc->data.icookie.value; +} + +static const struct msi_domain_template mbigen_msi_template = { + .chip = { + .name = "mbigen-v2", + .irq_mask = irq_chip_mask_parent, + .irq_unmask = irq_chip_unmask_parent, + .irq_eoi = mbigen_eoi_irq, + .irq_set_type = mbigen_set_type, + .irq_write_msi_msg = mbigen_write_msi_msg, + }, + + .ops = { + .set_desc = mbigen_domain_set_desc, + .msi_translate = mbigen_domain_translate, + }, + + .info = { + .bus_token = DOMAIN_BUS_WIRED_TO_MSI, + .flags = MSI_FLAG_USE_DEV_FWNODE, + }, +}; + +static bool mbigen_create_device_domain(struct device *dev, unsigned int size, + struct mbigen_device *mgn_chip) +{ + struct irq_domain *domain = dev->msi.domain; + + if (WARN_ON_ONCE(!domain)) + return false; + + if (irq_domain_is_msi_parent(domain)) { + return msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, + &mbigen_msi_template, size, + NULL, mgn_chip->base); + } + + /* Remove once ITS provides MSI parent */ + return !!platform_msi_create_device_domain(dev, size, mbigen_write_msg, + &mbigen_domain_ops, mgn_chip); +} + static int mbigen_of_create_domain(struct platform_device *pdev, struct mbigen_device *mgn_chip) { struct platform_device *child; - struct irq_domain *domain; struct device_node *np; u32 num_pins; int ret = 0; @@ -258,11 +309,7 @@ static int mbigen_of_create_domain(struct platform_device *pdev, break; } - domain = platform_msi_create_device_domain(&child->dev, num_pins, - mbigen_write_msg, - &mbigen_domain_ops, - mgn_chip); - if (!domain) { + if (!mbigen_create_device_domain(&child->dev, num_pins, mgn_chip)) { ret = -ENOMEM; break; } @@ -284,7 +331,6 @@ MODULE_DEVICE_TABLE(acpi, mbigen_acpi_match); static int mbigen_acpi_create_domain(struct platform_device *pdev, struct mbigen_device *mgn_chip) { - struct irq_domain *domain; u32 num_pins = 0; int ret; @@ -315,11 +361,7 @@ static int mbigen_acpi_create_domain(struct platform_device *pdev, if (ret || num_pins == 0) return -EINVAL; - domain = platform_msi_create_device_domain(&pdev->dev, num_pins, - mbigen_write_msg, - &mbigen_domain_ops, - mgn_chip); - if (!domain) + if (!mbigen_create_device_domain(&pdev->dev, num_pins, mgn_chip)) return -ENOMEM; return 0; -- 2.34.1 . Message-ID: <20240623142235.333333826@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 10/21] irqchip/mbigen: Remove platform_msi_create_device_domain() fallback References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:48 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256035 org.kernel.vger.linux-pci:144365 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner Now that ITS provides the MSI parent domain, remove the unused fallback code. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-mbigen.c | 74 ++---------------------------------- 1 file changed, 4 insertions(+), 70 deletions(-) diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index db0fa80330d9..093fd42893a7 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -180,64 +180,6 @@ static int mbigen_domain_translate(struct irq_domain *d, struct irq_fwspec *fwsp return -EINVAL; } -/* The following section will go away once ITS provides a MSI parent */ - -static struct irq_chip mbigen_irq_chip = { - .name = "mbigen-v2", - .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, - .irq_eoi = mbigen_eoi_irq, - .irq_set_type = mbigen_set_type, - .irq_set_affinity = irq_chip_set_affinity_parent, -}; - -static int mbigen_irq_domain_alloc(struct irq_domain *domain, - unsigned int virq, - unsigned int nr_irqs, - void *args) -{ - struct irq_fwspec *fwspec = args; - irq_hw_number_t hwirq; - unsigned int type; - struct mbigen_device *mgn_chip; - int i, err; - - err = mbigen_domain_translate(domain, fwspec, &hwirq, &type); - if (err) - return err; - - err = platform_msi_device_domain_alloc(domain, virq, nr_irqs); - if (err) - return err; - - mgn_chip = platform_msi_get_host_data(domain); - - for (i = 0; i < nr_irqs; i++) - irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i, - &mbigen_irq_chip, mgn_chip->base); - - return 0; -} - -static void mbigen_irq_domain_free(struct irq_domain *domain, unsigned int virq, - unsigned int nr_irqs) -{ - platform_msi_device_domain_free(domain, virq, nr_irqs); -} - -static const struct irq_domain_ops mbigen_domain_ops = { - .translate = mbigen_domain_translate, - .alloc = mbigen_irq_domain_alloc, - .free = mbigen_irq_domain_free, -}; - -static void mbigen_write_msg(struct msi_desc *desc, struct msi_msg *msg) -{ - mbigen_write_msi_msg(irq_get_irq_data(desc->irq), msg); -} - -/* End of to be removed section */ - static void mbigen_domain_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc) { arg->desc = desc; @@ -268,20 +210,12 @@ static const struct msi_domain_template mbigen_msi_template = { static bool mbigen_create_device_domain(struct device *dev, unsigned int size, struct mbigen_device *mgn_chip) { - struct irq_domain *domain = dev->msi.domain; - - if (WARN_ON_ONCE(!domain)) + if (WARN_ON_ONCE(!dev->msi.domain)) return false; - if (irq_domain_is_msi_parent(domain)) { - return msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, - &mbigen_msi_template, size, - NULL, mgn_chip->base); - } - - /* Remove once ITS provides MSI parent */ - return !!platform_msi_create_device_domain(dev, size, mbigen_write_msg, - &mbigen_domain_ops, mgn_chip); + return msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, + &mbigen_msi_template, size, + NULL, mgn_chip->base); } static int mbigen_of_create_domain(struct platform_device *pdev, -- 2.34.1 . Message-ID: <20240623142235.271734124@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 09/21] irqchip/gic-v3-its: Switch platform MSI to MSI parent References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:46 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256036 org.kernel.vger.linux-pci:144366 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner Similar to the previous conversion of the PCI/MSI support lift the prepare() callback from the existing platform MSI code and enable platform MSI and the related device domain bus tokens in select and the child domain initialization code. All platform MSI users are automatically using the new per device MSI model now. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: adopted to IMS->MSI rename --- drivers/irqchip/Makefile | 2 +- drivers/irqchip/irq-gic-v3-its-msi-parent.c | 73 +++++++- drivers/irqchip/irq-gic-v3-its-platform-msi.c | 163 ------------------ 3 files changed, 73 insertions(+), 165 deletions(-) delete mode 100644 drivers/irqchip/irq-gic-v3-its-platform-msi.c diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index c5316634637f..afc44f4709a6 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -32,7 +32,7 @@ obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o obj-$(CONFIG_IRQ_MSI_LIB) += irq-msi-lib.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-v3-mbi.o irq-gic-common.o -obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-platform-msi.o irq-gic-v4.o irq-gic-v3-its-msi-parent.o +obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v4.o irq-gic-v3-its-msi-parent.o obj-$(CONFIG_ARM_GIC_V3_ITS_FSL_MC) += irq-gic-v3-its-fsl-mc-msi.o obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o obj-$(CONFIG_HISILICON_IRQ_MBIGEN) += irq-mbigen.o diff --git a/drivers/irqchip/irq-gic-v3-its-msi-parent.c b/drivers/irqchip/irq-gic-v3-its-msi-parent.c index e81fefa428e2..21daa452ffa6 100644 --- a/drivers/irqchip/irq-gic-v3-its-msi-parent.c +++ b/drivers/irqchip/irq-gic-v3-its-msi-parent.c @@ -4,6 +4,7 @@ // Copyright (C) 2022 Linutronix GmbH // Copyright (C) 2022 Intel +#include #include #include "irq-gic-common.h" @@ -96,6 +97,68 @@ static int its_pci_msi_prepare(struct irq_domain *domain, struct device *dev, #define its_pci_msi_prepare NULL #endif /* !CONFIG_PCI_MSI */ +static int of_pmsi_get_dev_id(struct irq_domain *domain, struct device *dev, + u32 *dev_id) +{ + int ret, index = 0; + + /* Suck the DeviceID out of the msi-parent property */ + do { + struct of_phandle_args args; + + ret = of_parse_phandle_with_args(dev->of_node, + "msi-parent", "#msi-cells", + index, &args); + if (args.np == irq_domain_get_of_node(domain)) { + if (WARN_ON(args.args_count != 1)) + return -EINVAL; + *dev_id = args.args[0]; + break; + } + index++; + } while (!ret); + + return ret; +} + +int __weak iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) +{ + return -1; +} + +static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, + int nvec, msi_alloc_info_t *info) +{ + struct msi_domain_info *msi_info; + u32 dev_id; + int ret; + + if (dev->of_node) + ret = of_pmsi_get_dev_id(domain, dev, &dev_id); + else + ret = iort_pmsi_get_dev_id(dev, &dev_id); + if (ret) + return ret; + + /* ITS specific DeviceID, as the core ITS ignores dev. */ + info->scratchpad[0].ul = dev_id; + + /* + * @domain->msi_domain_info->hwsize contains the size of the device + * domain, but vector allocation happens one by one. + */ + msi_info = msi_get_domain_info(domain); + if (msi_info->hwsize > nvec) + nvec = msi_info->hwsize; + + /* Allocate at least 32 MSIs, and always as a power of 2 */ + nvec = max_t(int, 32, roundup_pow_of_two(nvec)); + + msi_info = msi_get_domain_info(domain->parent); + return msi_info->ops->msi_prepare(domain->parent, + dev, nvec, info); +} + static bool its_init_dev_msi_info(struct device *dev, struct irq_domain *domain, struct irq_domain *real_parent, struct msi_domain_info *info) { @@ -120,6 +183,14 @@ static bool its_init_dev_msi_info(struct device *dev, struct irq_domain *domain, */ info->ops->msi_prepare = its_pci_msi_prepare; break; + case DOMAIN_BUS_DEVICE_MSI: + case DOMAIN_BUS_WIRED_TO_MSI: + /* + * FIXME: See the above PCI prepare comment. The domain + * size is also known at domain creation time. + */ + info->ops->msi_prepare = its_pmsi_prepare; + break; default: /* Confused. How did the lib return true? */ WARN_ON_ONCE(1); @@ -133,7 +204,7 @@ const struct msi_parent_ops gic_v3_its_msi_parent_ops = { .supported_flags = ITS_MSI_FLAGS_SUPPORTED, .required_flags = ITS_MSI_FLAGS_REQUIRED, .bus_select_token = DOMAIN_BUS_NEXUS, - .bus_select_mask = MATCH_PCI_MSI, + .bus_select_mask = MATCH_PCI_MSI | MATCH_PLATFORM_MSI, .prefix = "ITS-", .init_dev_msi_info = its_init_dev_msi_info, }; diff --git a/drivers/irqchip/irq-gic-v3-its-platform-msi.c b/drivers/irqchip/irq-gic-v3-its-platform-msi.c deleted file mode 100644 index daa6d5053bc3..000000000000 --- a/drivers/irqchip/irq-gic-v3-its-platform-msi.c +++ /dev/null @@ -1,163 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (C) 2013-2015 ARM Limited, All Rights Reserved. - * Author: Marc Zyngier - */ - -#include -#include -#include -#include -#include - -static struct irq_chip its_pmsi_irq_chip = { - .name = "ITS-pMSI", -}; - -static int of_pmsi_get_dev_id(struct irq_domain *domain, struct device *dev, - u32 *dev_id) -{ - int ret, index = 0; - - /* Suck the DeviceID out of the msi-parent property */ - do { - struct of_phandle_args args; - - ret = of_parse_phandle_with_args(dev->of_node, - "msi-parent", "#msi-cells", - index, &args); - if (args.np == irq_domain_get_of_node(domain)) { - if (WARN_ON(args.args_count != 1)) - return -EINVAL; - *dev_id = args.args[0]; - break; - } - index++; - } while (!ret); - - return ret; -} - -int __weak iort_pmsi_get_dev_id(struct device *dev, u32 *dev_id) -{ - return -1; -} - -static int its_pmsi_prepare(struct irq_domain *domain, struct device *dev, - int nvec, msi_alloc_info_t *info) -{ - struct msi_domain_info *msi_info; - u32 dev_id; - int ret; - - msi_info = msi_get_domain_info(domain->parent); - - if (dev->of_node) - ret = of_pmsi_get_dev_id(domain, dev, &dev_id); - else - ret = iort_pmsi_get_dev_id(dev, &dev_id); - if (ret) - return ret; - - /* ITS specific DeviceID, as the core ITS ignores dev. */ - info->scratchpad[0].ul = dev_id; - - /* Allocate at least 32 MSIs, and always as a power of 2 */ - nvec = max_t(int, 32, roundup_pow_of_two(nvec)); - return msi_info->ops->msi_prepare(domain->parent, - dev, nvec, info); -} - -static struct msi_domain_ops its_pmsi_ops = { - .msi_prepare = its_pmsi_prepare, -}; - -static struct msi_domain_info its_pmsi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS), - .ops = &its_pmsi_ops, - .chip = &its_pmsi_irq_chip, -}; - -static const struct of_device_id its_device_id[] = { - { .compatible = "arm,gic-v3-its", }, - {}, -}; - -static int __init its_pmsi_init_one(struct fwnode_handle *fwnode, - const char *name) -{ - struct irq_domain *parent; - - parent = irq_find_matching_fwnode(fwnode, DOMAIN_BUS_NEXUS); - if (!parent || !msi_get_domain_info(parent)) { - pr_err("%s: unable to locate ITS domain\n", name); - return -ENXIO; - } - - if (!platform_msi_create_irq_domain(fwnode, &its_pmsi_domain_info, - parent)) { - pr_err("%s: unable to create platform domain\n", name); - return -ENXIO; - } - - pr_info("Platform MSI: %s domain created\n", name); - return 0; -} - -#ifdef CONFIG_ACPI -static int __init -its_pmsi_parse_madt(union acpi_subtable_headers *header, - const unsigned long end) -{ - struct acpi_madt_generic_translator *its_entry; - struct fwnode_handle *domain_handle; - const char *node_name; - int err = -ENXIO; - - its_entry = (struct acpi_madt_generic_translator *)header; - node_name = kasprintf(GFP_KERNEL, "ITS@0x%lx", - (long)its_entry->base_address); - domain_handle = iort_find_domain_token(its_entry->translation_id); - if (!domain_handle) { - pr_err("%s: Unable to locate ITS domain handle\n", node_name); - goto out; - } - - err = its_pmsi_init_one(domain_handle, node_name); - -out: - kfree(node_name); - return err; -} - -static void __init its_pmsi_acpi_init(void) -{ - acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR, - its_pmsi_parse_madt, 0); -} -#else -static inline void its_pmsi_acpi_init(void) { } -#endif - -static void __init its_pmsi_of_init(void) -{ - struct device_node *np; - - for (np = of_find_matching_node(NULL, its_device_id); np; - np = of_find_matching_node(np, its_device_id)) { - if (!of_device_is_available(np)) - continue; - if (!of_property_read_bool(np, "msi-controller")) - continue; - - its_pmsi_init_one(of_node_to_fwnode(np), np->full_name); - } -} - -static int __init its_pmsi_init(void) -{ - its_pmsi_of_init(); - its_pmsi_acpi_init(); - return 0; -} -early_initcall(its_pmsi_init); -- 2.34.1 . Message-ID: <20240623142235.395577449@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 11/21] genirq/msi: Remove platform_msi_create_device_domain() References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:50 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256037 org.kernel.vger.linux-pci:144367 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner No more users. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- include/linux/msi.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/msi.h b/include/linux/msi.h index 04f33e7f6f8b..4ae036d0c7db 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -660,8 +660,6 @@ __platform_msi_create_device_domain(struct device *dev, const struct irq_domain_ops *ops, void *host_data); -#define platform_msi_create_device_domain(dev, nvec, write, ops, data) \ - __platform_msi_create_device_domain(dev, nvec, false, write, ops, data) #define platform_msi_create_device_tree_domain(dev, nvec, write, ops, data) \ __platform_msi_create_device_domain(dev, nvec, true, write, ops, data) -- 2.34.1 . Message-ID: <20240623142235.455849114@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 12/21] irqchip/gic_v3_mbi: Switch over to parent domain References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:51 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256038 org.kernel.vger.linux-pci:144368 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The MBI chip creates two MSI domains: - PCI/MSI - Platform device domain Both have the MBI domain as parent and differ slightly in the interrupt chip callbacks and the platform device domain supports level type signaling. Convert it over to the MSI parent domain mechanism by: - Providing the required templates - Implementing a custom init_dev_msi_info() callback which sets the chip callbacks and the level support flags depending on the domain bus token type of the per device domain. Signed-off-by: Thomas Gleixner --- V3-1: New patch to replace the broken conversion - Marc --- drivers/irqchip/irq-gic-v3-mbi.c | 128 ++++++++++++++------------------------- 1 file changed, 46 insertions(+), 82 deletions(-) --- a/drivers/irqchip/irq-gic-v3-mbi.c +++ b/drivers/irqchip/irq-gic-v3-mbi.c @@ -18,6 +18,8 @@ #include +#include "irq-msi-lib.h" + struct mbi_range { u32 spi_start; u32 nr_spis; @@ -138,6 +140,7 @@ static void mbi_irq_domain_free(struct i } static const struct irq_domain_ops mbi_domain_ops = { + .select = msi_lib_irq_domain_select, .alloc = mbi_irq_domain_alloc, .free = mbi_irq_domain_free, }; @@ -151,54 +154,6 @@ static void mbi_compose_msi_msg(struct i iommu_dma_compose_msi_msg(irq_data_get_msi_desc(data), msg); } -#ifdef CONFIG_PCI_MSI -/* PCI-specific irqchip */ -static void mbi_mask_msi_irq(struct irq_data *d) -{ - pci_msi_mask_irq(d); - irq_chip_mask_parent(d); -} - -static void mbi_unmask_msi_irq(struct irq_data *d) -{ - pci_msi_unmask_irq(d); - irq_chip_unmask_parent(d); -} - -static struct irq_chip mbi_msi_irq_chip = { - .name = "MSI", - .irq_mask = mbi_mask_msi_irq, - .irq_unmask = mbi_unmask_msi_irq, - .irq_eoi = irq_chip_eoi_parent, - .irq_compose_msi_msg = mbi_compose_msi_msg, -}; - -static struct msi_domain_info mbi_msi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_PCI_MSIX | MSI_FLAG_MULTI_PCI_MSI), - .chip = &mbi_msi_irq_chip, -}; - -static int mbi_allocate_pci_domain(struct irq_domain *nexus_domain, - struct irq_domain **pci_domain) -{ - *pci_domain = pci_msi_create_irq_domain(nexus_domain->parent->fwnode, - &mbi_msi_domain_info, - nexus_domain); - if (!*pci_domain) - return -ENOMEM; - - return 0; -} -#else -static int mbi_allocate_pci_domain(struct irq_domain *nexus_domain, - struct irq_domain **pci_domain) -{ - *pci_domain = NULL; - return 0; -} -#endif - static void mbi_compose_mbi_msg(struct irq_data *data, struct msi_msg *msg) { mbi_compose_msi_msg(data, msg); @@ -210,28 +165,51 @@ static void mbi_compose_mbi_msg(struct i iommu_dma_compose_msi_msg(irq_data_get_msi_desc(data), &msg[1]); } -/* Platform-MSI specific irqchip */ -static struct irq_chip mbi_pmsi_irq_chip = { - .name = "pMSI", - .irq_set_type = irq_chip_set_type_parent, - .irq_compose_msi_msg = mbi_compose_mbi_msg, - .flags = IRQCHIP_SUPPORTS_LEVEL_MSI, -}; +static bool mbi_init_dev_msi_info(struct device *dev, struct irq_domain *domain, + struct irq_domain *real_parent, struct msi_domain_info *info) +{ + if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info)) + return false; -static struct msi_domain_ops mbi_pmsi_ops = { -}; + switch (info->bus_token) { + case DOMAIN_BUS_PCI_DEVICE_MSI: + case DOMAIN_BUS_PCI_DEVICE_MSIX: + info->chip->irq_compose_msi_msg = mbi_compose_msi_msg; + return true; + + case DOMAIN_BUS_DEVICE_MSI: + info->chip->irq_compose_msi_msg = mbi_compose_mbi_msg; + info->chip->irq_set_type = irq_chip_set_type_parent; + info->chip->flags |= IRQCHIP_SUPPORTS_LEVEL_MSI; + info->flags |= MSI_FLAG_LEVEL_CAPABLE; + return true; + + default: + WARN_ON_ONCE(1); + return false; + } +} + +#define MBI_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS) -static struct msi_domain_info mbi_pmsi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_LEVEL_CAPABLE), - .ops = &mbi_pmsi_ops, - .chip = &mbi_pmsi_irq_chip, +#define MBI_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK | \ + MSI_FLAG_PCI_MSIX | \ + MSI_FLAG_MULTI_PCI_MSI | \ + MSI_FLAG_PCI_MSI_MASK_PARENT) + +static const struct msi_parent_ops gic_v3_mbi_msi_parent_ops = { + .supported_flags = MBI_MSI_FLAGS_SUPPORTED, + .required_flags = MBI_MSI_FLAGS_REQUIRED, + .bus_select_token = DOMAIN_BUS_NEXUS, + .bus_select_mask = MATCH_PCI_MSI | MATCH_PLATFORM_MSI, + .prefix = "MBI-", + .init_dev_msi_info = mbi_init_dev_msi_info, }; -static int mbi_allocate_domains(struct irq_domain *parent) +static int mbi_allocate_domain(struct irq_domain *parent) { - struct irq_domain *nexus_domain, *pci_domain, *plat_domain; - int err; + struct irq_domain *nexus_domain; nexus_domain = irq_domain_create_hierarchy(parent, 0, 0, parent->fwnode, &mbi_domain_ops, NULL); @@ -239,22 +217,8 @@ static int mbi_allocate_domains(struct i return -ENOMEM; irq_domain_update_bus_token(nexus_domain, DOMAIN_BUS_NEXUS); - - err = mbi_allocate_pci_domain(nexus_domain, &pci_domain); - - plat_domain = platform_msi_create_irq_domain(parent->fwnode, - &mbi_pmsi_domain_info, - nexus_domain); - - if (err || !plat_domain) { - if (plat_domain) - irq_domain_remove(plat_domain); - if (pci_domain) - irq_domain_remove(pci_domain); - irq_domain_remove(nexus_domain); - return -ENOMEM; - } - + nexus_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + nexus_domain->msi_parent_ops = &gic_v3_mbi_msi_parent_ops; return 0; } @@ -317,7 +281,7 @@ int __init mbi_init(struct fwnode_handle pr_info("Using MBI frame %pa\n", &mbi_phys_base); - ret = mbi_allocate_domains(parent); + ret = mbi_allocate_domain(parent); if (ret) goto err_free_mbi; . Message-ID: <20240623142235.514419280@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 13/21] irqchip/gic-v2m: Switch to device MSI References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:53 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256039 org.kernel.vger.linux-pci:144369 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner All platform MSI users and the PCI/MSI code handle per device MSI domains when the irqdomain associated to the device provides MSI parent functionality. Remove the "global" PCI/MSI and platform domain related code and provide the MSI parent functionality by filling in msi_parent_ops. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: enabled MSI_FLAG_PCI_MSI_MASK_PARENT in msi_parent_ops::supported_flags --- drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-gic-v2m.c | 80 +++++++++++------------------------ 2 files changed, 25 insertions(+), 56 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index b51863fa9b38..2104b8727b1a 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -26,6 +26,7 @@ config ARM_GIC_V2M bool depends on PCI select ARM_GIC + select IRQ_MSI_LIB select PCI_MSI config GIC_NON_BANKED diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c index f2ff4387870d..428132aa26cc 100644 --- a/drivers/irqchip/irq-gic-v2m.c +++ b/drivers/irqchip/irq-gic-v2m.c @@ -26,6 +26,8 @@ #include #include +#include "irq-msi-lib.h" + /* * MSI_TYPER: * [31:26] Reserved @@ -72,31 +74,6 @@ struct v2m_data { u32 flags; /* v2m flags for specific implementation */ }; -static void gicv2m_mask_msi_irq(struct irq_data *d) -{ - pci_msi_mask_irq(d); - irq_chip_mask_parent(d); -} - -static void gicv2m_unmask_msi_irq(struct irq_data *d) -{ - pci_msi_unmask_irq(d); - irq_chip_unmask_parent(d); -} - -static struct irq_chip gicv2m_msi_irq_chip = { - .name = "MSI", - .irq_mask = gicv2m_mask_msi_irq, - .irq_unmask = gicv2m_unmask_msi_irq, - .irq_eoi = irq_chip_eoi_parent, -}; - -static struct msi_domain_info gicv2m_msi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_PCI_MSIX | MSI_FLAG_MULTI_PCI_MSI), - .chip = &gicv2m_msi_irq_chip, -}; - static phys_addr_t gicv2m_get_msi_addr(struct v2m_data *v2m, int hwirq) { if (v2m->flags & GICV2M_GRAVITON_ADDRESS_ONLY) @@ -230,6 +207,7 @@ static void gicv2m_irq_domain_free(struct irq_domain *domain, } static const struct irq_domain_ops gicv2m_domain_ops = { + .select = msi_lib_irq_domain_select, .alloc = gicv2m_irq_domain_alloc, .free = gicv2m_irq_domain_free, }; @@ -250,19 +228,6 @@ static bool is_msi_spi_valid(u32 base, u32 num) return true; } -static struct irq_chip gicv2m_pmsi_irq_chip = { - .name = "pMSI", -}; - -static struct msi_domain_ops gicv2m_pmsi_ops = { -}; - -static struct msi_domain_info gicv2m_pmsi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS), - .ops = &gicv2m_pmsi_ops, - .chip = &gicv2m_pmsi_irq_chip, -}; - static void __init gicv2m_teardown(void) { struct v2m_data *v2m, *tmp; @@ -278,9 +243,26 @@ static void __init gicv2m_teardown(void) } } +#define GICV2M_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS) + +#define GICV2M_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK | \ + MSI_FLAG_PCI_MSIX | \ + MSI_FLAG_MULTI_PCI_MSI | \ + MSI_FLAG_PCI_MSI_MASK_PARENT) + +static struct msi_parent_ops gicv2m_msi_parent_ops = { + .supported_flags = GICV2M_MSI_FLAGS_SUPPORTED, + .required_flags = GICV2M_MSI_FLAGS_REQUIRED, + .bus_select_token = DOMAIN_BUS_NEXUS, + .bus_select_mask = MATCH_PCI_MSI | MATCH_PLATFORM_MSI, + .prefix = "GICv2m-", + .init_dev_msi_info = msi_lib_init_dev_msi_info, +}; + static __init int gicv2m_allocate_domains(struct irq_domain *parent) { - struct irq_domain *inner_domain, *pci_domain, *plat_domain; + struct irq_domain *inner_domain; struct v2m_data *v2m; v2m = list_first_entry_or_null(&v2m_nodes, struct v2m_data, entry); @@ -295,22 +277,8 @@ static __init int gicv2m_allocate_domains(struct irq_domain *parent) } irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS); - pci_domain = pci_msi_create_irq_domain(v2m->fwnode, - &gicv2m_msi_domain_info, - inner_domain); - plat_domain = platform_msi_create_irq_domain(v2m->fwnode, - &gicv2m_pmsi_domain_info, - inner_domain); - if (!pci_domain || !plat_domain) { - pr_err("Failed to create MSI domains\n"); - if (plat_domain) - irq_domain_remove(plat_domain); - if (pci_domain) - irq_domain_remove(pci_domain); - irq_domain_remove(inner_domain); - return -ENOMEM; - } - + inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + inner_domain->msi_parent_ops = &gicv2m_msi_parent_ops; return 0; } @@ -511,7 +479,7 @@ acpi_parse_madt_msi(union acpi_subtable_headers *header, pr_info("applying Amazon Graviton quirk\n"); res.end = res.start + SZ_8K - 1; flags |= GICV2M_GRAVITON_ADDRESS_ONLY; - gicv2m_msi_domain_info.flags &= ~MSI_FLAG_MULTI_PCI_MSI; + gicv2m_msi_parent_ops.supported_flags &= ~MSI_FLAG_MULTI_PCI_MSI; } if (m->flags & ACPI_MADT_OVERRIDE_SPI_VALUES) { -- 2.34.1 . Message-ID: <20240623142235.574932935@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 14/21] irqchip/imx-mu-msi: Switch to MSI parent References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:55 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256040 org.kernel.vger.linux-pci:144370 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner All platform MSI users and the PCI/MSI code handle per device MSI domains when the irqdomain associated to the device provides MSI parent functionality. Remove the "global" platform domain related code and provide the MSI parent functionality by filling in msi_parent_ops. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- --- drivers/irqchip/Kconfig | 1 drivers/irqchip/irq-imx-mu-msi.c | 48 +++++++++++++++++---------------------- drivers/irqchip/irq-msi-lib.c | 2 + 3 files changed, 24 insertions(+), 27 deletions(-) --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -492,6 +492,7 @@ config IMX_MU_MSI select IRQ_DOMAIN select IRQ_DOMAIN_HIERARCHY select GENERIC_MSI_IRQ + select IRQ_MSI_LIB help Provide a driver for the i.MX Messaging Unit block used as a CPU-to-CPU MSI controller. This requires a specially crafted DT --- a/drivers/irqchip/irq-imx-mu-msi.c +++ b/drivers/irqchip/irq-imx-mu-msi.c @@ -24,6 +24,8 @@ #include #include +#include "irq-msi-lib.h" + #define IMX_MU_CHANS 4 enum imx_mu_xcr { @@ -114,20 +116,6 @@ static void imx_mu_msi_parent_ack_irq(st imx_mu_read(msi_data, msi_data->cfg->xRR + data->hwirq * 4); } -static struct irq_chip imx_mu_msi_irq_chip = { - .name = "MU-MSI", - .irq_ack = irq_chip_ack_parent, -}; - -static struct msi_domain_ops imx_mu_msi_irq_ops = { -}; - -static struct msi_domain_info imx_mu_msi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS), - .ops = &imx_mu_msi_irq_ops, - .chip = &imx_mu_msi_irq_chip, -}; - static void imx_mu_msi_parent_compose_msg(struct irq_data *data, struct msi_msg *msg) { @@ -195,6 +183,7 @@ static void imx_mu_msi_domain_irq_free(s } static const struct irq_domain_ops imx_mu_msi_domain_ops = { + .select = msi_lib_irq_domain_select, .alloc = imx_mu_msi_domain_irq_alloc, .free = imx_mu_msi_domain_irq_free, }; @@ -216,6 +205,21 @@ static void imx_mu_msi_irq_handler(struc chained_irq_exit(chip, desc); } +#define IMX_MU_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS | \ + MSI_FLAG_PARENT_PM_DEV) + +#define IMX_MU_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK) + +static const struct msi_parent_ops imx_mu_msi_parent_ops = { + .supported_flags = IMX_MU_MSI_FLAGS_SUPPORTED, + .required_flags = IMX_MU_MSI_FLAGS_REQUIRED, + .bus_select_token = DOMAIN_BUS_NEXUS, + .bus_select_mask = MATCH_PLATFORM_MSI, + .prefix = "MU-MSI-", + .init_dev_msi_info = msi_lib_init_dev_msi_info, +}; + static int imx_mu_msi_domains_init(struct imx_mu_msi *msi_data, struct device *dev) { struct fwnode_handle *fwnodes = dev_fwnode(dev); @@ -230,19 +234,9 @@ static int imx_mu_msi_domains_init(struc } irq_domain_update_bus_token(parent, DOMAIN_BUS_NEXUS); - - msi_data->msi_domain = platform_msi_create_irq_domain(fwnodes, - &imx_mu_msi_domain_info, - parent); - - if (!msi_data->msi_domain) { - dev_err(dev, "failed to create MSI domain\n"); - irq_domain_remove(parent); - return -ENOMEM; - } - - irq_domain_set_pm_device(msi_data->msi_domain, dev); - + parent->dev = parent->pm_dev = dev; + parent->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + parent->msi_parent_ops = &imx_mu_msi_parent_ops; return 0; } --- a/drivers/irqchip/irq-msi-lib.c +++ b/drivers/irqchip/irq-msi-lib.c @@ -89,6 +89,8 @@ bool msi_lib_init_dev_msi_info(struct de /* Chip updates for all child bus types */ if (!info->chip->irq_eoi) info->chip->irq_eoi = irq_chip_eoi_parent; + if (!info->chip->irq_ack) + info->chip->irq_ack = irq_chip_ack_parent; /* * The device MSI domain can never have a set affinity callback. It . Message-ID: <20240623142235.635015886@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 15/21] irqchip/irq-mvebu-icu: Prepare for real per device MSI References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:56 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256041 org.kernel.vger.linux-pci:144371 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner The core infrastructure has everything in place to switch ICU to per device MSI domains and avoid the convoluted construct of the existing platform-MSI layering violation. The new infrastructure provides a wired interrupt specific interface in the MSI core which converts the 'hardware interrupt number + trigger type' allocation which is required for wired interrupts in the regular irqdomain code to a normal MSI allocation. The hardware interrupt number and the trigger type are stored in the MSI descriptor device cookie by the core code so the ICU specific code can retrieve them. The new per device domain is only instantiated when the irqdomain which is associated to the ICU device provides MSI parent functionality. Up to that point it invokes the existing code. Once the parent is converted the code for the current platform-MSI mechanism is removed. The new domain shares the interrupt chip callbacks and the translation function. The only new functionality aside of filling out the msi_domain_templates is a domain specific set_desc() callback, which will go away once all platform-MSI code has been converted. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-mvebu-icu.c | 181 ++++++++++++++++++++++++++++++-- 1 file changed, 170 insertions(+), 11 deletions(-) diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c index 3c77acc7ec6a..2a210cd9482e 100644 --- a/drivers/irqchip/irq-mvebu-icu.c +++ b/drivers/irqchip/irq-mvebu-icu.c @@ -20,6 +20,8 @@ #include #include +#include "irq-msi-lib.h" + #include /* ICU registers */ @@ -60,14 +62,52 @@ struct mvebu_icu_msi_data { const struct mvebu_icu_subset_data *subset_data; }; -struct mvebu_icu_irq_data { - struct mvebu_icu *icu; - unsigned int icu_group; - unsigned int type; -}; - static DEFINE_STATIC_KEY_FALSE(legacy_bindings); +static int mvebu_icu_translate(struct irq_domain *d, struct irq_fwspec *fwspec, + unsigned long *hwirq, unsigned int *type) +{ + unsigned int param_count = static_branch_unlikely(&legacy_bindings) ? 3 : 2; + struct mvebu_icu_msi_data *msi_data = d->host_data; + struct mvebu_icu *icu = msi_data->icu; + + /* Check the count of the parameters in dt */ + if (WARN_ON(fwspec->param_count != param_count)) { + dev_err(icu->dev, "wrong ICU parameter count %d\n", + fwspec->param_count); + return -EINVAL; + } + + if (static_branch_unlikely(&legacy_bindings)) { + *hwirq = fwspec->param[1]; + *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK; + if (fwspec->param[0] != ICU_GRP_NSR) { + dev_err(icu->dev, "wrong ICU group type %x\n", + fwspec->param[0]); + return -EINVAL; + } + } else { + *hwirq = fwspec->param[0]; + *type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK; + + /* + * The ICU receives level interrupts. While the NSR are also + * level interrupts, SEI are edge interrupts. Force the type + * here in this case. Please note that this makes the interrupt + * handling unreliable. + */ + if (msi_data->subset_data->icu_group == ICU_GRP_SEI) + *type = IRQ_TYPE_EDGE_RISING; + } + + if (*hwirq >= ICU_MAX_IRQS) { + dev_err(icu->dev, "invalid interrupt number %ld\n", *hwirq); + return -EINVAL; + } + + return 0; +} + static void mvebu_icu_init(struct mvebu_icu *icu, struct mvebu_icu_msi_data *msi_data, struct msi_msg *msg) @@ -89,6 +129,14 @@ static void mvebu_icu_init(struct mvebu_icu *icu, writel_relaxed(msg[1].address_lo, icu->base + subset->offset_clr_al); } +/* Start of area to be removed once all parent chips provide MSI parent */ + +struct mvebu_icu_irq_data { + struct mvebu_icu *icu; + unsigned int icu_group; + unsigned int type; +}; + static void mvebu_icu_write_msg(struct msi_desc *desc, struct msi_msg *msg) { struct irq_data *d = irq_get_irq_data(desc->irq); @@ -269,6 +317,109 @@ static const struct irq_domain_ops mvebu_icu_domain_ops = { .free = mvebu_icu_irq_domain_free, }; +/* End of removal area */ + +static int mvebu_icu_msi_init(struct irq_domain *domain, struct msi_domain_info *info, + unsigned int virq, irq_hw_number_t hwirq, msi_alloc_info_t *arg) +{ + irq_domain_set_hwirq_and_chip(domain, virq, hwirq, info->chip, info->chip_data); + return irq_set_irqchip_state(virq, IRQCHIP_STATE_PENDING, false); +} + +static void mvebu_icu_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc) +{ + arg->desc = desc; + arg->hwirq = (u32)desc->data.icookie.value; +} + +static void mvebu_icu_write_msi_msg(struct irq_data *d, struct msi_msg *msg) +{ + struct mvebu_icu_msi_data *msi_data = d->chip_data; + unsigned int icu_group = msi_data->subset_data->icu_group; + struct msi_desc *desc = irq_data_get_msi_desc(d); + struct mvebu_icu *icu = msi_data->icu; + unsigned int type; + u32 icu_int; + + if (msg->address_lo || msg->address_hi) { + /* One off initialization per domain */ + mvebu_icu_init(icu, msi_data, msg); + /* Configure the ICU with irq number & type */ + icu_int = msg->data | ICU_INT_ENABLE; + type = (unsigned int)(desc->data.icookie.value >> 32); + if (type & IRQ_TYPE_EDGE_RISING) + icu_int |= ICU_IS_EDGE; + icu_int |= icu_group << ICU_GROUP_SHIFT; + } else { + /* De-configure the ICU */ + icu_int = 0; + } + + writel_relaxed(icu_int, icu->base + ICU_INT_CFG(d->hwirq)); + + /* + * The SATA unit has 2 ports, and a dedicated ICU entry per + * port. The ahci sata driver supports only one irq interrupt + * per SATA unit. To solve this conflict, we configure the 2 + * SATA wired interrupts in the south bridge into 1 GIC + * interrupt in the north bridge. Even if only a single port + * is enabled, if sata node is enabled, both interrupts are + * configured (regardless of which port is actually in use). + */ + if (d->hwirq == ICU_SATA0_ICU_ID || d->hwirq == ICU_SATA1_ICU_ID) { + writel_relaxed(icu_int, icu->base + ICU_INT_CFG(ICU_SATA0_ICU_ID)); + writel_relaxed(icu_int, icu->base + ICU_INT_CFG(ICU_SATA1_ICU_ID)); + } +} + +static const struct msi_domain_template mvebu_icu_nsr_msi_template = { + .chip = { + .name = "ICU-NSR", + .irq_mask = irq_chip_mask_parent, + .irq_unmask = irq_chip_unmask_parent, + .irq_eoi = irq_chip_eoi_parent, + .irq_set_type = irq_chip_set_type_parent, + .irq_write_msi_msg = mvebu_icu_write_msi_msg, + .flags = IRQCHIP_SUPPORTS_LEVEL_MSI, + }, + + .ops = { + .msi_translate = mvebu_icu_translate, + .msi_init = mvebu_icu_msi_init, + .set_desc = mvebu_icu_set_desc, + }, + + .info = { + .bus_token = DOMAIN_BUS_WIRED_TO_MSI, + .flags = MSI_FLAG_LEVEL_CAPABLE | + MSI_FLAG_USE_DEV_FWNODE, + }, +}; + +static const struct msi_domain_template mvebu_icu_sei_msi_template = { + .chip = { + .name = "ICU-SEI", + .irq_mask = irq_chip_mask_parent, + .irq_unmask = irq_chip_unmask_parent, + .irq_ack = irq_chip_ack_parent, + .irq_set_type = irq_chip_set_type_parent, + .irq_write_msi_msg = mvebu_icu_write_msi_msg, + .flags = IRQCHIP_SUPPORTS_LEVEL_MSI, + }, + + .ops = { + .msi_translate = mvebu_icu_translate, + .msi_init = mvebu_icu_msi_init, + .set_desc = mvebu_icu_set_desc, + }, + + .info = { + .bus_token = DOMAIN_BUS_WIRED_TO_MSI, + .flags = MSI_FLAG_LEVEL_CAPABLE | + MSI_FLAG_USE_DEV_FWNODE, + }, +}; + static const struct mvebu_icu_subset_data mvebu_icu_nsr_subset_data = { .icu_group = ICU_GRP_NSR, .offset_set_ah = ICU_SETSPI_NSR_AH, @@ -298,7 +449,6 @@ static const struct of_device_id mvebu_icu_subset_of_match[] = { static int mvebu_icu_subset_probe(struct platform_device *pdev) { struct mvebu_icu_msi_data *msi_data; - struct device_node *msi_parent_dn; struct device *dev = &pdev->dev; struct irq_domain *irq_domain; @@ -314,15 +464,24 @@ static int mvebu_icu_subset_probe(struct platform_device *pdev) msi_data->subset_data = of_device_get_match_data(dev); } - dev->msi.domain = of_msi_get_domain(dev, dev->of_node, - DOMAIN_BUS_PLATFORM_MSI); + dev->msi.domain = of_msi_get_domain(dev, dev->of_node, DOMAIN_BUS_PLATFORM_MSI); if (!dev->msi.domain) return -EPROBE_DEFER; - msi_parent_dn = irq_domain_get_of_node(dev->msi.domain); - if (!msi_parent_dn) + if (!irq_domain_get_of_node(dev->msi.domain)) return -ENODEV; + if (irq_domain_is_msi_parent(dev->msi.domain)) { + bool sei = msi_data->subset_data->icu_group == ICU_GRP_SEI; + const struct msi_domain_template *tmpl; + + tmpl = sei ? &mvebu_icu_sei_msi_template : &mvebu_icu_nsr_msi_template; + + if (!msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, tmpl, + ICU_MAX_IRQS, NULL, msi_data)) + return -ENOMEM; + } + irq_domain = platform_msi_create_device_tree_domain(dev, ICU_MAX_IRQS, mvebu_icu_write_msg, &mvebu_icu_domain_ops, -- 2.34.1 . Message-ID: <20240623142235.699780279@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 16/21] irqchip/mvebu-gicp: Switch to MSI parent References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:18:58 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256042 org.kernel.vger.linux-pci:144372 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner All platform MSI users and the PCI/MSI code handle per device MSI domains when the irqdomain associated to the device provides MSI parent functionality. Remove the "global" platform domain related code and provide the MSI parent functionality by filling in msi_parent_ops. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: enabled MSI_FLAG_PCI_MSI_MASK_PARENT in msi_parent_ops::supported_flags --- drivers/irqchip/Kconfig | 1 drivers/irqchip/irq-mvebu-gicp.c | 44 ++++++++++++++++----------------------- 2 files changed, 20 insertions(+), 25 deletions(-) --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -371,6 +371,7 @@ config MSCC_OCELOT_IRQ select GENERIC_IRQ_CHIP config MVEBU_GICP + select IRQ_MSI_LIB bool config MVEBU_ICU --- a/drivers/irqchip/irq-mvebu-gicp.c +++ b/drivers/irqchip/irq-mvebu-gicp.c @@ -17,6 +17,8 @@ #include #include +#include "irq-msi-lib.h" + #include #define GICP_SETSPI_NSR_OFFSET 0x0 @@ -145,32 +147,32 @@ static void gicp_irq_domain_free(struct } static const struct irq_domain_ops gicp_domain_ops = { + .select = msi_lib_irq_domain_select, .alloc = gicp_irq_domain_alloc, .free = gicp_irq_domain_free, }; -static struct irq_chip gicp_msi_irq_chip = { - .name = "GICP", - .irq_set_type = irq_chip_set_type_parent, - .flags = IRQCHIP_SUPPORTS_LEVEL_MSI, -}; +#define GICP_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS) -static struct msi_domain_ops gicp_msi_ops = { -}; +#define GICP_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK | \ + MSI_FLAG_LEVEL_CAPABLE) -static struct msi_domain_info gicp_msi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_LEVEL_CAPABLE), - .ops = &gicp_msi_ops, - .chip = &gicp_msi_irq_chip, +static const struct msi_parent_ops gicp_msi_parent_ops = { + .supported_flags = GICP_MSI_FLAGS_SUPPORTED, + .required_flags = GICP_MSI_FLAGS_REQUIRED, + .bus_select_token = DOMAIN_BUS_GENERIC_MSI, + .bus_select_mask = MATCH_PLATFORM_MSI, + .prefix = "GICP-", + .init_dev_msi_info = msi_lib_init_dev_msi_info, }; static int mvebu_gicp_probe(struct platform_device *pdev) { - struct mvebu_gicp *gicp; - struct irq_domain *inner_domain, *plat_domain, *parent_domain; + struct irq_domain *inner_domain, *parent_domain; struct device_node *node = pdev->dev.of_node; struct device_node *irq_parent_dn; + struct mvebu_gicp *gicp; int ret, i; gicp = devm_kzalloc(&pdev->dev, sizeof(*gicp), GFP_KERNEL); @@ -234,17 +236,9 @@ static int mvebu_gicp_probe(struct platf if (!inner_domain) return -ENOMEM; - - plat_domain = platform_msi_create_irq_domain(of_node_to_fwnode(node), - &gicp_msi_domain_info, - inner_domain); - if (!plat_domain) { - irq_domain_remove(inner_domain); - return -ENOMEM; - } - - platform_set_drvdata(pdev, gicp); - + irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_GENERIC_MSI); + inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + inner_domain->msi_parent_ops = &gicp_msi_parent_ops; return 0; } . Message-ID: <20240623142235.759892514@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 17/21] irqchip/mvebu-odmi: Switch to parent MSI References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:19:00 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256043 org.kernel.vger.linux-pci:144373 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner All platform MSI users and the PCI/MSI code handle per device MSI domains when the irqdomain associated to the device provides MSI parent functionality. Remove the "global" platform domain related code and provide the MSI parent functionality by filling in msi_parent_ops. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- --- drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-mvebu-odmi.c | 37 ++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -379,6 +379,7 @@ config MVEBU_ICU config MVEBU_ODMI bool + select IRQ_MSI_LIB select GENERIC_MSI_IRQ config MVEBU_PIC --- a/drivers/irqchip/irq-mvebu-odmi.c +++ b/drivers/irqchip/irq-mvebu-odmi.c @@ -17,6 +17,9 @@ #include #include #include + +#include "irq-msi-lib.h" + #include #define GICP_ODMIN_SET 0x40 @@ -141,27 +144,29 @@ static void odmi_irq_domain_free(struct } static const struct irq_domain_ops odmi_domain_ops = { + .select = msi_lib_irq_domain_select, .alloc = odmi_irq_domain_alloc, .free = odmi_irq_domain_free, }; -static struct irq_chip odmi_msi_irq_chip = { - .name = "ODMI", -}; +#define ODMI_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS) -static struct msi_domain_ops odmi_msi_ops = { -}; +#define ODMI_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK) -static struct msi_domain_info odmi_msi_domain_info = { - .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS), - .ops = &odmi_msi_ops, - .chip = &odmi_msi_irq_chip, +static const struct msi_parent_ops odmi_msi_parent_ops = { + .supported_flags = ODMI_MSI_FLAGS_SUPPORTED, + .required_flags = ODMI_MSI_FLAGS_REQUIRED, + .bus_select_token = DOMAIN_BUS_GENERIC_MSI, + .bus_select_mask = MATCH_PLATFORM_MSI, + .prefix = "ODMI-", + .init_dev_msi_info = msi_lib_init_dev_msi_info, }; static int __init mvebu_odmi_init(struct device_node *node, struct device_node *parent) { - struct irq_domain *parent_domain, *inner_domain, *plat_domain; + struct irq_domain *parent_domain, *inner_domain; int ret, i; if (of_property_read_u32(node, "marvell,odmi-frames", &odmis_count)) @@ -208,18 +213,12 @@ static int __init mvebu_odmi_init(struct goto err_unmap; } - plat_domain = platform_msi_create_irq_domain(of_node_to_fwnode(node), - &odmi_msi_domain_info, - inner_domain); - if (!plat_domain) { - ret = -ENOMEM; - goto err_remove_inner; - } + irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_GENERIC_MSI); + inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + inner_domain->msi_parent_ops = &odmi_msi_parent_ops; return 0; -err_remove_inner: - irq_domain_remove(inner_domain); err_unmap: for (i = 0; i < odmis_count; i++) { struct odmi_data *odmi = &odmis[i]; . Message-ID: <20240623142235.820275215@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 18/21] irqchip/irq-mvebu-sei: Switch to MSI parent References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:19:02 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256044 org.kernel.vger.linux-pci:144374 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner All platform MSI users and the PCI/MSI code handle per device MSI domains when the irqdomain associated to the device provides MSI parent functionality. Remove the "global" platform domain related code and provide the MSI parent functionality by filling in msi_parent_ops. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: enabled MSI_FLAG_PCI_MSI_MASK_PARENT in msi_parent_ops::supported_flags --- drivers/irqchip/irq-mvebu-sei.c | 52 +++++++++++++++------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) --- a/drivers/irqchip/irq-mvebu-sei.c +++ b/drivers/irqchip/irq-mvebu-sei.c @@ -14,6 +14,8 @@ #include #include +#include "irq-msi-lib.h" + /* Cause register */ #define GICP_SECR(idx) (0x0 + ((idx) * 0x4)) /* Mask register */ @@ -190,6 +192,7 @@ static void mvebu_sei_domain_free(struct } static const struct irq_domain_ops mvebu_sei_domain_ops = { + .select = msi_lib_irq_domain_select, .alloc = mvebu_sei_domain_alloc, .free = mvebu_sei_domain_free, }; @@ -307,21 +310,6 @@ static const struct irq_domain_ops mvebu .free = mvebu_sei_cp_domain_free, }; -static struct irq_chip mvebu_sei_msi_irq_chip = { - .name = "SEI pMSI", - .irq_ack = irq_chip_ack_parent, - .irq_set_type = irq_chip_set_type_parent, -}; - -static struct msi_domain_ops mvebu_sei_msi_ops = { -}; - -static struct msi_domain_info mvebu_sei_msi_domain_info = { - .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS, - .ops = &mvebu_sei_msi_ops, - .chip = &mvebu_sei_msi_irq_chip, -}; - static void mvebu_sei_handle_cascade_irq(struct irq_desc *desc) { struct mvebu_sei *sei = irq_desc_get_handler_data(desc); @@ -360,10 +348,23 @@ static void mvebu_sei_reset(struct mvebu } } +#define SEI_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \ + MSI_FLAG_USE_DEF_CHIP_OPS) + +#define SEI_MSI_FLAGS_SUPPORTED (MSI_GENERIC_FLAGS_MASK) + +static const struct msi_parent_ops sei_msi_parent_ops = { + .supported_flags = SEI_MSI_FLAGS_SUPPORTED, + .required_flags = SEI_MSI_FLAGS_REQUIRED, + .bus_select_mask = MATCH_PLATFORM_MSI, + .bus_select_token = DOMAIN_BUS_GENERIC_MSI, + .prefix = "SEI-", + .init_dev_msi_info = msi_lib_init_dev_msi_info, +}; + static int mvebu_sei_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; - struct irq_domain *plat_domain; struct mvebu_sei *sei; u32 parent_irq; int ret; @@ -440,33 +441,20 @@ static int mvebu_sei_probe(struct platfo } irq_domain_update_bus_token(sei->cp_domain, DOMAIN_BUS_GENERIC_MSI); - - plat_domain = platform_msi_create_irq_domain(of_node_to_fwnode(node), - &mvebu_sei_msi_domain_info, - sei->cp_domain); - if (!plat_domain) { - pr_err("Failed to create CPs MSI domain\n"); - ret = -ENOMEM; - goto remove_cp_domain; - } + sei->cp_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT; + sei->cp_domain->msi_parent_ops = &sei_msi_parent_ops; mvebu_sei_reset(sei); - irq_set_chained_handler_and_data(parent_irq, - mvebu_sei_handle_cascade_irq, - sei); - + irq_set_chained_handler_and_data(parent_irq, mvebu_sei_handle_cascade_irq, sei); return 0; -remove_cp_domain: - irq_domain_remove(sei->cp_domain); remove_ap_domain: irq_domain_remove(sei->ap_domain); remove_sei_domain: irq_domain_remove(sei->sei_domain); dispose_irq: irq_dispose_mapping(parent_irq); - return ret; } . Message-ID: <20240623142235.881677325@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 19/21] irqchip/irq-mvebu-icu: Remove platform MSI leftovers References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:19:04 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256045 org.kernel.vger.linux-pci:144375 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner All related domains provide MSI parent functionality, so the fallback code to the original platform MSI implementation is not longer required. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-mvebu-icu.c | 212 +------------------------------- 1 file changed, 6 insertions(+), 206 deletions(-) diff --git a/drivers/irqchip/irq-mvebu-icu.c b/drivers/irqchip/irq-mvebu-icu.c index 2a210cd9482e..b337f6c05f18 100644 --- a/drivers/irqchip/irq-mvebu-icu.c +++ b/drivers/irqchip/irq-mvebu-icu.c @@ -129,196 +129,6 @@ static void mvebu_icu_init(struct mvebu_icu *icu, writel_relaxed(msg[1].address_lo, icu->base + subset->offset_clr_al); } -/* Start of area to be removed once all parent chips provide MSI parent */ - -struct mvebu_icu_irq_data { - struct mvebu_icu *icu; - unsigned int icu_group; - unsigned int type; -}; - -static void mvebu_icu_write_msg(struct msi_desc *desc, struct msi_msg *msg) -{ - struct irq_data *d = irq_get_irq_data(desc->irq); - struct mvebu_icu_msi_data *msi_data = platform_msi_get_host_data(d->domain); - struct mvebu_icu_irq_data *icu_irqd = d->chip_data; - struct mvebu_icu *icu = icu_irqd->icu; - unsigned int icu_int; - - if (msg->address_lo || msg->address_hi) { - /* One off initialization per domain */ - mvebu_icu_init(icu, msi_data, msg); - /* Configure the ICU with irq number & type */ - icu_int = msg->data | ICU_INT_ENABLE; - if (icu_irqd->type & IRQ_TYPE_EDGE_RISING) - icu_int |= ICU_IS_EDGE; - icu_int |= icu_irqd->icu_group << ICU_GROUP_SHIFT; - } else { - /* De-configure the ICU */ - icu_int = 0; - } - - writel_relaxed(icu_int, icu->base + ICU_INT_CFG(d->hwirq)); - - /* - * The SATA unit has 2 ports, and a dedicated ICU entry per - * port. The ahci sata driver supports only one irq interrupt - * per SATA unit. To solve this conflict, we configure the 2 - * SATA wired interrupts in the south bridge into 1 GIC - * interrupt in the north bridge. Even if only a single port - * is enabled, if sata node is enabled, both interrupts are - * configured (regardless of which port is actually in use). - */ - if (d->hwirq == ICU_SATA0_ICU_ID || d->hwirq == ICU_SATA1_ICU_ID) { - writel_relaxed(icu_int, - icu->base + ICU_INT_CFG(ICU_SATA0_ICU_ID)); - writel_relaxed(icu_int, - icu->base + ICU_INT_CFG(ICU_SATA1_ICU_ID)); - } -} - -static struct irq_chip mvebu_icu_nsr_chip = { - .name = "ICU-NSR", - .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, - .irq_eoi = irq_chip_eoi_parent, - .irq_set_type = irq_chip_set_type_parent, - .irq_set_affinity = irq_chip_set_affinity_parent, -}; - -static struct irq_chip mvebu_icu_sei_chip = { - .name = "ICU-SEI", - .irq_ack = irq_chip_ack_parent, - .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, - .irq_set_type = irq_chip_set_type_parent, - .irq_set_affinity = irq_chip_set_affinity_parent, -}; - -static int -mvebu_icu_irq_domain_translate(struct irq_domain *d, struct irq_fwspec *fwspec, - unsigned long *hwirq, unsigned int *type) -{ - unsigned int param_count = static_branch_unlikely(&legacy_bindings) ? 3 : 2; - struct mvebu_icu_msi_data *msi_data = platform_msi_get_host_data(d); - struct mvebu_icu *icu = msi_data->icu; - - /* Check the count of the parameters in dt */ - if (WARN_ON(fwspec->param_count != param_count)) { - dev_err(icu->dev, "wrong ICU parameter count %d\n", - fwspec->param_count); - return -EINVAL; - } - - if (static_branch_unlikely(&legacy_bindings)) { - *hwirq = fwspec->param[1]; - *type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK; - if (fwspec->param[0] != ICU_GRP_NSR) { - dev_err(icu->dev, "wrong ICU group type %x\n", - fwspec->param[0]); - return -EINVAL; - } - } else { - *hwirq = fwspec->param[0]; - *type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK; - - /* - * The ICU receives level interrupts. While the NSR are also - * level interrupts, SEI are edge interrupts. Force the type - * here in this case. Please note that this makes the interrupt - * handling unreliable. - */ - if (msi_data->subset_data->icu_group == ICU_GRP_SEI) - *type = IRQ_TYPE_EDGE_RISING; - } - - if (*hwirq >= ICU_MAX_IRQS) { - dev_err(icu->dev, "invalid interrupt number %ld\n", *hwirq); - return -EINVAL; - } - - return 0; -} - -static int -mvebu_icu_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, - unsigned int nr_irqs, void *args) -{ - int err; - unsigned long hwirq; - struct irq_fwspec *fwspec = args; - struct mvebu_icu_msi_data *msi_data = platform_msi_get_host_data(domain); - struct mvebu_icu *icu = msi_data->icu; - struct mvebu_icu_irq_data *icu_irqd; - struct irq_chip *chip = &mvebu_icu_nsr_chip; - - icu_irqd = kmalloc(sizeof(*icu_irqd), GFP_KERNEL); - if (!icu_irqd) - return -ENOMEM; - - err = mvebu_icu_irq_domain_translate(domain, fwspec, &hwirq, - &icu_irqd->type); - if (err) { - dev_err(icu->dev, "failed to translate ICU parameters\n"); - goto free_irqd; - } - - if (static_branch_unlikely(&legacy_bindings)) - icu_irqd->icu_group = fwspec->param[0]; - else - icu_irqd->icu_group = msi_data->subset_data->icu_group; - icu_irqd->icu = icu; - - err = platform_msi_device_domain_alloc(domain, virq, nr_irqs); - if (err) { - dev_err(icu->dev, "failed to allocate ICU interrupt in parent domain\n"); - goto free_irqd; - } - - /* Make sure there is no interrupt left pending by the firmware */ - err = irq_set_irqchip_state(virq, IRQCHIP_STATE_PENDING, false); - if (err) - goto free_msi; - - if (icu_irqd->icu_group == ICU_GRP_SEI) - chip = &mvebu_icu_sei_chip; - - err = irq_domain_set_hwirq_and_chip(domain, virq, hwirq, - chip, icu_irqd); - if (err) { - dev_err(icu->dev, "failed to set the data to IRQ domain\n"); - goto free_msi; - } - - return 0; - -free_msi: - platform_msi_device_domain_free(domain, virq, nr_irqs); -free_irqd: - kfree(icu_irqd); - return err; -} - -static void -mvebu_icu_irq_domain_free(struct irq_domain *domain, unsigned int virq, - unsigned int nr_irqs) -{ - struct irq_data *d = irq_get_irq_data(virq); - struct mvebu_icu_irq_data *icu_irqd = d->chip_data; - - kfree(icu_irqd); - - platform_msi_device_domain_free(domain, virq, nr_irqs); -} - -static const struct irq_domain_ops mvebu_icu_domain_ops = { - .translate = mvebu_icu_irq_domain_translate, - .alloc = mvebu_icu_irq_domain_alloc, - .free = mvebu_icu_irq_domain_free, -}; - -/* End of removal area */ - static int mvebu_icu_msi_init(struct irq_domain *domain, struct msi_domain_info *info, unsigned int virq, irq_hw_number_t hwirq, msi_alloc_info_t *arg) { @@ -448,9 +258,10 @@ static const struct of_device_id mvebu_icu_subset_of_match[] = { static int mvebu_icu_subset_probe(struct platform_device *pdev) { + const struct msi_domain_template *tmpl; struct mvebu_icu_msi_data *msi_data; struct device *dev = &pdev->dev; - struct irq_domain *irq_domain; + bool sei; msi_data = devm_kzalloc(dev, sizeof(*msi_data), GFP_KERNEL); if (!msi_data) @@ -471,22 +282,11 @@ static int mvebu_icu_subset_probe(struct platform_device *pdev) if (!irq_domain_get_of_node(dev->msi.domain)) return -ENODEV; - if (irq_domain_is_msi_parent(dev->msi.domain)) { - bool sei = msi_data->subset_data->icu_group == ICU_GRP_SEI; - const struct msi_domain_template *tmpl; - - tmpl = sei ? &mvebu_icu_sei_msi_template : &mvebu_icu_nsr_msi_template; - - if (!msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, tmpl, - ICU_MAX_IRQS, NULL, msi_data)) - return -ENOMEM; - } + sei = msi_data->subset_data->icu_group == ICU_GRP_SEI; + tmpl = sei ? &mvebu_icu_sei_msi_template : &mvebu_icu_nsr_msi_template; - irq_domain = platform_msi_create_device_tree_domain(dev, ICU_MAX_IRQS, - mvebu_icu_write_msg, - &mvebu_icu_domain_ops, - msi_data); - if (!irq_domain) { + if (!msi_create_device_irq_domain(dev, MSI_DEFAULT_DOMAIN, tmpl, + ICU_MAX_IRQS, NULL, msi_data)) { dev_err(dev, "Failed to create ICU MSI domain\n"); return -ENOMEM; } -- 2.34.1 . Message-ID: <20240623142236.003295177@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 21/21] genirq/msi: Move msi_device_data to core References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:19:07 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256046 org.kernel.vger.linux-pci:144376 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner Now that the platform MSI hack is gone, nothing needs to know about struct msi_device_data outside of the core code. Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- v3: fixed warning by kernel test robot warning: cannot understand function prototype: 'struct msi_device_data ' --- include/linux/msi.h | 18 ------------------ kernel/irq/msi.c | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/include/linux/msi.h b/include/linux/msi.h index 4c3462a6a97b..369367ecae5e 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -21,11 +21,7 @@ #include #include #include -#include -#include -#include #include -#include #include @@ -227,20 +223,6 @@ struct msi_dev_domain { struct irq_domain *domain; }; -/** - * msi_device_data - MSI per device data - * @properties: MSI properties which are interesting to drivers - * @mutex: Mutex protecting the MSI descriptor store - * @__domains: Internal data for per device MSI domains - * @__iter_idx: Index to search the next entry for iterators - */ -struct msi_device_data { - unsigned long properties; - struct mutex mutex; - struct msi_dev_domain __domains[MSI_MAX_DEVICE_IRQDOMAINS]; - unsigned long __iter_idx; -}; - int msi_setup_device_data(struct device *dev); void msi_lock_descs(struct device *dev); diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 8314b1d4a903..5fa0547ece0c 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -8,17 +8,33 @@ * This file contains common code to support Message Signaled Interrupts for * PCI compatible and non PCI compatible devices. */ -#include #include #include #include #include +#include +#include #include #include -#include +#include +#include #include "internals.h" +/** + * struct msi_device_data - MSI per device data + * @properties: MSI properties which are interesting to drivers + * @mutex: Mutex protecting the MSI descriptor store + * @__domains: Internal data for per device MSI domains + * @__iter_idx: Index to search the next entry for iterators + */ +struct msi_device_data { + unsigned long properties; + struct mutex mutex; + struct msi_dev_domain __domains[MSI_MAX_DEVICE_IRQDOMAINS]; + unsigned long __iter_idx; +}; + /** * struct msi_ctrl - MSI internal management control structure * @domid: ID of the domain on which management operations should be done -- 2.34.1 . Message-ID: <20240623142235.943295676@linutronix.de> From: Thomas Gleixner To: LKML Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, maz@kernel.org, tglx@linutronix.de, anna-maria@linutronix.de, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, bhelgaas@google.com, rdunlap@infradead.org, vidyas@nvidia.com, ilpo.jarvinen@linux.intel.com, apatel@ventanamicro.com, kevin.tian@intel.com, nipun.gupta@amd.com, den@valinux.co.jp, andrew@lunn.ch, gregory.clement@bootlin.com, sebastian.hesselbarth@gmail.com, gregkh@linuxfoundation.org, rafael@kernel.org, alex.williamson@redhat.com, will@kernel.org, lorenzo.pieralisi@arm.com, jgg@mellanox.com, ammarfaizi2@gnuweeb.org, robin.murphy@arm.com, lpieralisi@kernel.org, nm@ti.com, kristo@kernel.org, vkoul@kernel.org, okaya@kernel.org, agross@kernel.org, andersson@kernel.org, mark.rutland@arm.com, shameerali.kolothum.thodi@huawei.com, yuzenghui@huawei.com, shivamurthy.shastri@linutronix.de Subject: [patch V4 20/21] genirq/msi: Remove platform MSI leftovers References: <20240623142137.448898081@linutronix.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Sun, 23 Jun 2024 17:19:05 +0200 (CEST) Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256047 org.kernel.vger.linux-pci:144377 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pci Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Thomas Gleixner No more users! Signed-off-by: Thomas Gleixner Signed-off-by: Anna-Maria Behnsen Signed-off-by: Shivamurthy Shastri Signed-off-by: Thomas Gleixner --- drivers/base/platform-msi.c | 350 +----------------------------------- include/linux/msi.h | 30 ---- kernel/irq/msi.c | 75 +------- 3 files changed, 5 insertions(+), 450 deletions(-) diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c index 11f5fdf65b9e..0e60dd650b5e 100644 --- a/drivers/base/platform-msi.c +++ b/drivers/base/platform-msi.c @@ -4,346 +4,12 @@ * * Copyright (C) 2015 ARM Limited, All Rights Reserved. * Author: Marc Zyngier + * Copyright (C) 2022 Linutronix GmbH */ #include -#include -#include #include #include -#include - -/* Begin of removal area. Once everything is converted over. Cleanup the includes too! */ - -#define DEV_ID_SHIFT 21 -#define MAX_DEV_MSIS (1 << (32 - DEV_ID_SHIFT)) - -/* - * Internal data structure containing a (made up, but unique) devid - * and the callback to write the MSI message. - */ -struct platform_msi_priv_data { - struct device *dev; - void *host_data; - msi_alloc_info_t arg; - irq_write_msi_msg_t write_msg; - int devid; -}; - -/* The devid allocator */ -static DEFINE_IDA(platform_msi_devid_ida); - -#ifdef GENERIC_MSI_DOMAIN_OPS -/* - * Convert an msi_desc to a globaly unique identifier (per-device - * devid + msi_desc position in the msi_list). - */ -static irq_hw_number_t platform_msi_calc_hwirq(struct msi_desc *desc) -{ - u32 devid = desc->dev->msi.data->platform_data->devid; - - return (devid << (32 - DEV_ID_SHIFT)) | desc->msi_index; -} - -static void platform_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc) -{ - arg->desc = desc; - arg->hwirq = platform_msi_calc_hwirq(desc); -} - -static int platform_msi_init(struct irq_domain *domain, - struct msi_domain_info *info, - unsigned int virq, irq_hw_number_t hwirq, - msi_alloc_info_t *arg) -{ - return irq_domain_set_hwirq_and_chip(domain, virq, hwirq, - info->chip, info->chip_data); -} - -static void platform_msi_set_proxy_dev(msi_alloc_info_t *arg) -{ - arg->flags |= MSI_ALLOC_FLAGS_PROXY_DEVICE; -} -#else -#define platform_msi_set_desc NULL -#define platform_msi_init NULL -#define platform_msi_set_proxy_dev(x) do {} while(0) -#endif - -static void platform_msi_update_dom_ops(struct msi_domain_info *info) -{ - struct msi_domain_ops *ops = info->ops; - - BUG_ON(!ops); - - if (ops->msi_init == NULL) - ops->msi_init = platform_msi_init; - if (ops->set_desc == NULL) - ops->set_desc = platform_msi_set_desc; -} - -static void platform_msi_write_msg(struct irq_data *data, struct msi_msg *msg) -{ - struct msi_desc *desc = irq_data_get_msi_desc(data); - - desc->dev->msi.data->platform_data->write_msg(desc, msg); -} - -static void platform_msi_update_chip_ops(struct msi_domain_info *info) -{ - struct irq_chip *chip = info->chip; - - BUG_ON(!chip); - if (!chip->irq_mask) - chip->irq_mask = irq_chip_mask_parent; - if (!chip->irq_unmask) - chip->irq_unmask = irq_chip_unmask_parent; - if (!chip->irq_eoi) - chip->irq_eoi = irq_chip_eoi_parent; - if (!chip->irq_set_affinity) - chip->irq_set_affinity = msi_domain_set_affinity; - if (!chip->irq_write_msi_msg) - chip->irq_write_msi_msg = platform_msi_write_msg; - if (WARN_ON((info->flags & MSI_FLAG_LEVEL_CAPABLE) && - !(chip->flags & IRQCHIP_SUPPORTS_LEVEL_MSI))) - info->flags &= ~MSI_FLAG_LEVEL_CAPABLE; -} - -/** - * platform_msi_create_irq_domain - Create a platform MSI interrupt domain - * @fwnode: Optional fwnode of the interrupt controller - * @info: MSI domain info - * @parent: Parent irq domain - * - * Updates the domain and chip ops and creates a platform MSI - * interrupt domain. - * - * Returns: - * A domain pointer or NULL in case of failure. - */ -struct irq_domain *platform_msi_create_irq_domain(struct fwnode_handle *fwnode, - struct msi_domain_info *info, - struct irq_domain *parent) -{ - struct irq_domain *domain; - - if (info->flags & MSI_FLAG_USE_DEF_DOM_OPS) - platform_msi_update_dom_ops(info); - if (info->flags & MSI_FLAG_USE_DEF_CHIP_OPS) - platform_msi_update_chip_ops(info); - info->flags |= MSI_FLAG_DEV_SYSFS | MSI_FLAG_ALLOC_SIMPLE_MSI_DESCS | - MSI_FLAG_FREE_MSI_DESCS; - - domain = msi_create_irq_domain(fwnode, info, parent); - if (domain) - irq_domain_update_bus_token(domain, DOMAIN_BUS_PLATFORM_MSI); - - return domain; -} -EXPORT_SYMBOL_GPL(platform_msi_create_irq_domain); - -static int platform_msi_alloc_priv_data(struct device *dev, unsigned int nvec, - irq_write_msi_msg_t write_msi_msg) -{ - struct platform_msi_priv_data *datap; - int err; - - /* - * Limit the number of interrupts to 2048 per device. Should we - * need to bump this up, DEV_ID_SHIFT should be adjusted - * accordingly (which would impact the max number of MSI - * capable devices). - */ - if (!dev->msi.domain || !write_msi_msg || !nvec || nvec > MAX_DEV_MSIS) - return -EINVAL; - - if (dev->msi.domain->bus_token != DOMAIN_BUS_PLATFORM_MSI) { - dev_err(dev, "Incompatible msi_domain, giving up\n"); - return -EINVAL; - } - - err = msi_setup_device_data(dev); - if (err) - return err; - - /* Already initialized? */ - if (dev->msi.data->platform_data) - return -EBUSY; - - datap = kzalloc(sizeof(*datap), GFP_KERNEL); - if (!datap) - return -ENOMEM; - - datap->devid = ida_alloc_max(&platform_msi_devid_ida, - (1 << DEV_ID_SHIFT) - 1, GFP_KERNEL); - if (datap->devid < 0) { - err = datap->devid; - kfree(datap); - return err; - } - - datap->write_msg = write_msi_msg; - datap->dev = dev; - dev->msi.data->platform_data = datap; - return 0; -} - -static void platform_msi_free_priv_data(struct device *dev) -{ - struct platform_msi_priv_data *data = dev->msi.data->platform_data; - - dev->msi.data->platform_data = NULL; - ida_free(&platform_msi_devid_ida, data->devid); - kfree(data); -} - -/** - * platform_msi_domain_alloc_irqs - Allocate MSI interrupts for @dev - * @dev: The device for which to allocate interrupts - * @nvec: The number of interrupts to allocate - * @write_msi_msg: Callback to write an interrupt message for @dev - * - * Returns: - * Zero for success, or an error code in case of failure - */ -static int platform_msi_domain_alloc_irqs(struct device *dev, unsigned int nvec, - irq_write_msi_msg_t write_msi_msg) -{ - int err; - - err = platform_msi_alloc_priv_data(dev, nvec, write_msi_msg); - if (err) - return err; - - err = msi_domain_alloc_irqs_range(dev, MSI_DEFAULT_DOMAIN, 0, nvec - 1); - if (err) - platform_msi_free_priv_data(dev); - - return err; -} - -/** - * platform_msi_get_host_data - Query the private data associated with - * a platform-msi domain - * @domain: The platform-msi domain - * - * Return: The private data provided when calling - * platform_msi_create_device_domain(). - */ -void *platform_msi_get_host_data(struct irq_domain *domain) -{ - struct platform_msi_priv_data *data = domain->host_data; - - return data->host_data; -} - -static struct lock_class_key platform_device_msi_lock_class; - -/** - * __platform_msi_create_device_domain - Create a platform-msi device domain - * - * @dev: The device generating the MSIs - * @nvec: The number of MSIs that need to be allocated - * @is_tree: flag to indicate tree hierarchy - * @write_msi_msg: Callback to write an interrupt message for @dev - * @ops: The hierarchy domain operations to use - * @host_data: Private data associated to this domain - * - * Return: An irqdomain for @nvec interrupts on success, NULL in case of error. - * - * This is for interrupt domains which stack on a platform-msi domain - * created by platform_msi_create_irq_domain(). @dev->msi.domain points to - * that platform-msi domain which is the parent for the new domain. - */ -struct irq_domain * -__platform_msi_create_device_domain(struct device *dev, - unsigned int nvec, - bool is_tree, - irq_write_msi_msg_t write_msi_msg, - const struct irq_domain_ops *ops, - void *host_data) -{ - struct platform_msi_priv_data *data; - struct irq_domain *domain; - int err; - - err = platform_msi_alloc_priv_data(dev, nvec, write_msi_msg); - if (err) - return NULL; - - /* - * Use a separate lock class for the MSI descriptor mutex on - * platform MSI device domains because the descriptor mutex nests - * into the domain mutex. See alloc/free below. - */ - lockdep_set_class(&dev->msi.data->mutex, &platform_device_msi_lock_class); - - data = dev->msi.data->platform_data; - data->host_data = host_data; - domain = irq_domain_create_hierarchy(dev->msi.domain, 0, - is_tree ? 0 : nvec, - dev->fwnode, ops, data); - if (!domain) - goto free_priv; - - platform_msi_set_proxy_dev(&data->arg); - err = msi_domain_prepare_irqs(domain->parent, dev, nvec, &data->arg); - if (err) - goto free_domain; - - return domain; - -free_domain: - irq_domain_remove(domain); -free_priv: - platform_msi_free_priv_data(dev); - return NULL; -} - -/** - * platform_msi_device_domain_free - Free interrupts associated with a platform-msi - * device domain - * - * @domain: The platform-msi device domain - * @virq: The base irq from which to perform the free operation - * @nr_irqs: How many interrupts to free from @virq - */ -void platform_msi_device_domain_free(struct irq_domain *domain, unsigned int virq, - unsigned int nr_irqs) -{ - struct platform_msi_priv_data *data = domain->host_data; - - msi_lock_descs(data->dev); - msi_domain_depopulate_descs(data->dev, virq, nr_irqs); - irq_domain_free_irqs_common(domain, virq, nr_irqs); - msi_free_msi_descs_range(data->dev, virq, virq + nr_irqs - 1); - msi_unlock_descs(data->dev); -} - -/** - * platform_msi_device_domain_alloc - Allocate interrupts associated with - * a platform-msi device domain - * - * @domain: The platform-msi device domain - * @virq: The base irq from which to perform the allocate operation - * @nr_irqs: How many interrupts to allocate from @virq - * - * Return 0 on success, or an error code on failure. Must be called - * with irq_domain_mutex held (which can only be done as part of a - * top-level interrupt allocation). - */ -int platform_msi_device_domain_alloc(struct irq_domain *domain, unsigned int virq, - unsigned int nr_irqs) -{ - struct platform_msi_priv_data *data = domain->host_data; - struct device *dev = data->dev; - - return msi_domain_populate_irqs(domain->parent, dev, virq, nr_irqs, &data->arg); -} - -/* End of removal area */ - -/* Real per device domain interfaces */ /* * This indirection can go when platform_device_msi_init_and_alloc_irqs() @@ -357,7 +23,7 @@ static void platform_msi_write_msi_msg(struct irq_data *d, struct msi_msg *msg) cb(irq_data_get_msi_desc(d), msg); } -static void platform_msi_set_desc_byindex(msi_alloc_info_t *arg, struct msi_desc *desc) +static void platform_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc) { arg->desc = desc; arg->hwirq = desc->msi_index; @@ -373,7 +39,7 @@ static const struct msi_domain_template platform_msi_template = { }, .ops = { - .set_desc = platform_msi_set_desc_byindex, + .set_desc = platform_msi_set_desc, }, .info = { @@ -408,10 +74,6 @@ int platform_device_msi_init_and_alloc_irqs(struct device *dev, unsigned int nve if (!domain || !write_msi_msg) return -EINVAL; - /* Migration support. Will go away once everything is converted */ - if (!irq_domain_is_msi_parent(domain)) - return platform_msi_domain_alloc_irqs(dev, nvec, write_msi_msg); - /* * @write_msi_msg is stored in the resulting msi_domain_info::data. * The underlying domain creation mechanism will assign that @@ -432,12 +94,6 @@ EXPORT_SYMBOL_GPL(platform_device_msi_init_and_alloc_irqs); */ void platform_device_msi_free_irqs_all(struct device *dev) { - struct irq_domain *domain = dev->msi.domain; - msi_domain_free_irqs_all(dev, MSI_DEFAULT_DOMAIN); - - /* Migration support. Will go away once everything is converted */ - if (!irq_domain_is_msi_parent(domain)) - platform_msi_free_priv_data(dev); } EXPORT_SYMBOL_GPL(platform_device_msi_free_irqs_all); diff --git a/include/linux/msi.h b/include/linux/msi.h index 4ae036d0c7db..4c3462a6a97b 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -81,7 +81,6 @@ extern int pci_msi_ignore_mask; /* Helper functions */ struct msi_desc; struct pci_dev; -struct platform_msi_priv_data; struct device_attribute; struct irq_domain; struct irq_affinity_desc; @@ -231,14 +230,12 @@ struct msi_dev_domain { /** * msi_device_data - MSI per device data * @properties: MSI properties which are interesting to drivers - * @platform_data: Platform-MSI specific data * @mutex: Mutex protecting the MSI descriptor store * @__domains: Internal data for per device MSI domains * @__iter_idx: Index to search the next entry for iterators */ struct msi_device_data { unsigned long properties; - struct platform_msi_priv_data *platform_data; struct mutex mutex; struct msi_dev_domain __domains[MSI_MAX_DEVICE_IRQDOMAINS]; unsigned long __iter_idx; @@ -641,33 +638,6 @@ void msi_domain_free_irqs_all(struct device *dev, unsigned int domid); struct msi_domain_info *msi_get_domain_info(struct irq_domain *domain); -struct irq_domain *platform_msi_create_irq_domain(struct fwnode_handle *fwnode, - struct msi_domain_info *info, - struct irq_domain *parent); - -/* When an MSI domain is used as an intermediate domain */ -int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev, - int nvec, msi_alloc_info_t *args); -int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, - int virq, int nvec, msi_alloc_info_t *args); -void msi_domain_depopulate_descs(struct device *dev, int virq, int nvec); - -struct irq_domain * -__platform_msi_create_device_domain(struct device *dev, - unsigned int nvec, - bool is_tree, - irq_write_msi_msg_t write_msi_msg, - const struct irq_domain_ops *ops, - void *host_data); - -#define platform_msi_create_device_tree_domain(dev, nvec, write, ops, data) \ - __platform_msi_create_device_domain(dev, nvec, true, write, ops, data) - -int platform_msi_device_domain_alloc(struct irq_domain *domain, unsigned int virq, - unsigned int nr_irqs); -void platform_msi_device_domain_free(struct irq_domain *domain, unsigned int virq, - unsigned int nvec); -void *platform_msi_get_host_data(struct irq_domain *domain); /* Per device platform MSI */ int platform_device_msi_init_and_alloc_irqs(struct device *dev, unsigned int nvec, irq_write_msi_msg_t write_msi_msg); diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 2024f89baea4..8314b1d4a903 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -1088,8 +1088,8 @@ bool msi_match_device_irq_domain(struct device *dev, unsigned int domid, return ret; } -int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev, - int nvec, msi_alloc_info_t *arg) +static int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev, + int nvec, msi_alloc_info_t *arg) { struct msi_domain_info *info = domain->host_data; struct msi_domain_ops *ops = info->ops; @@ -1097,77 +1097,6 @@ int msi_domain_prepare_irqs(struct irq_domain *domain, struct device *dev, return ops->msi_prepare(domain, dev, nvec, arg); } -int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, - int virq_base, int nvec, msi_alloc_info_t *arg) -{ - struct msi_domain_info *info = domain->host_data; - struct msi_domain_ops *ops = info->ops; - struct msi_ctrl ctrl = { - .domid = MSI_DEFAULT_DOMAIN, - .first = virq_base, - .last = virq_base + nvec - 1, - }; - struct msi_desc *desc; - struct xarray *xa; - int ret, virq; - - msi_lock_descs(dev); - - if (!msi_ctrl_valid(dev, &ctrl)) { - ret = -EINVAL; - goto unlock; - } - - ret = msi_domain_add_simple_msi_descs(dev, &ctrl); - if (ret) - goto unlock; - - xa = &dev->msi.data->__domains[ctrl.domid].store; - - for (virq = virq_base; virq < virq_base + nvec; virq++) { - desc = xa_load(xa, virq); - desc->irq = virq; - - ops->set_desc(arg, desc); - ret = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg); - if (ret) - goto fail; - - irq_set_msi_desc(virq, desc); - } - msi_unlock_descs(dev); - return 0; - -fail: - for (--virq; virq >= virq_base; virq--) { - msi_domain_depopulate_descs(dev, virq, 1); - irq_domain_free_irqs_common(domain, virq, 1); - } - msi_domain_free_descs(dev, &ctrl); -unlock: - msi_unlock_descs(dev); - return ret; -} - -void msi_domain_depopulate_descs(struct device *dev, int virq_base, int nvec) -{ - struct msi_ctrl ctrl = { - .domid = MSI_DEFAULT_DOMAIN, - .first = virq_base, - .last = virq_base + nvec - 1, - }; - struct msi_desc *desc; - struct xarray *xa; - unsigned long idx; - - if (!msi_ctrl_valid(dev, &ctrl)) - return; - - xa = &dev->msi.data->__domains[ctrl.domid].store; - xa_for_each_range(xa, idx, desc, ctrl.first, ctrl.last) - desc->irq = 0; -} - /* * Carefully check whether the device can use reservation mode. If * reservation mode is enabled then the early activation will assign a -- 2.34.1 . Date: Sun, 23 Jun 2024 15:30:28 -0000 From: tip-bot2 for Pali =?utf-8?q?Roh=C3=A1r?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/armada-370-xp: Do not touch IPI registers on platforms without IPI Cc: pali@kernel.org, kabel@kernel.org, Thomas Gleixner , Andrew Lunn , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171915662859.10875.17816084553826058337.tip-bot2@tip-bot2> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256053 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The following commit has been merged into the irq/core branch of tip: Commit-ID: 9d80f6bd3ad8f2b49651d4685bb391399ecf80a2 Gitweb: https://git.kernel.org/tip/9d80f6bd3ad8f2b49651d4685bb391399ec= f80a2 Author: Pali Roh=C3=A1r AuthorDate: Fri, 21 Jun 2024 11:38:30 +02:00 Committer: Thomas Gleixner CommitterDate: Sun, 23 Jun 2024 17:23:08 +02:00 irqchip/armada-370-xp: Do not touch IPI registers on platforms without IPI On platforms where IPI is not available in the MPIC, the IPI registers instead represent an additional set of MSI interrupt registers (currently unused by the driver). Do not touch these registers on platforms where IPI is not available in the MPIC. [ Marek: refactored, changed commit message ] Signed-off-by: Pali Roh=C3=A1r Signed-off-by: Marek Beh=C3=BAn Signed-off-by: Thomas Gleixner Reviewed-by: Andrew Lunn --- drivers/irqchip/irq-armada-370-xp.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada= -370-xp.c index deb4c9b..94a81c5 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -502,6 +502,9 @@ static void armada_xp_mpic_smp_cpu_init(void) for (i =3D 0; i < nr_irqs; i++) writel(i, per_cpu_int_base + ARMADA_370_XP_INT_SET_MASK_OFFS); =20 + if (!is_ipi_available()) + return; + /* Disable all IPIs */ writel(0, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS); =20 @@ -752,7 +755,7 @@ static void armada_370_xp_mpic_resume(void) /* Reconfigure doorbells for IPIs and MSIs */ writel(doorbell_mask_reg, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS); - if (doorbell_mask_reg & IPI_DOORBELL_MASK) + if (is_ipi_available() && (doorbell_mask_reg & IPI_DOORBELL_MASK)) writel(0, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); if (doorbell_mask_reg & PCI_MSI_DOORBELL_MASK) writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); @@ -803,13 +806,18 @@ static int __init armada_370_xp_mpic_of_init(struct dev= ice_node *node, BUG_ON(!armada_370_xp_mpic_domain); irq_domain_update_bus_token(armada_370_xp_mpic_domain, DOMAIN_BUS_WIRED); =20 + /* + * Initialize parent_irq before calling any other functions, since it is + * used to distinguish between IPI and non-IPI platforms. + */ + parent_irq =3D irq_of_parse_and_map(node, 0); + /* Setup for the boot CPU */ armada_xp_mpic_perf_init(); armada_xp_mpic_smp_cpu_init(); =20 armada_370_xp_msi_init(node, main_int_res.start); =20 - parent_irq =3D irq_of_parse_and_map(node, 0); if (parent_irq <=3D 0) { irq_set_default_host(armada_370_xp_mpic_domain); set_handle_irq(armada_370_xp_handle_irq); . Date: Sun, 23 Jun 2024 15:30:28 -0000 From: tip-bot2 for Pali =?utf-8?q?Roh=C3=A1r?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/armada-370-xp: Only call ipi_resume() if IPI is available Cc: pali@kernel.org, kabel@kernel.org, Thomas Gleixner , Andrew Lunn , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171915662884.10875.17342495395410962795.tip-bot2@tip-bot2> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256054 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The following commit has been merged into the irq/core branch of tip: Commit-ID: de796fc184179de86fb87f94178459b5b20b1b1b Gitweb: https://git.kernel.org/tip/de796fc184179de86fb87f94178459b5b20= b1b1b Author: Pali Roh=C3=A1r AuthorDate: Fri, 21 Jun 2024 11:38:29 +02:00 Committer: Thomas Gleixner CommitterDate: Sun, 23 Jun 2024 17:23:08 +02:00 irqchip/armada-370-xp: Only call ipi_resume() if IPI is available IPI is available only on systems where the mpic controller does not have a parent interrupt defined (e.g. on Armada XP). If a parent interrupt is defined, inter-processor interrupts are handled by an interrupt controller higher in the hierarchy (most probably a parent GIC). Only call ipi_resume() on systems where IPI is available in the mpic controller. Signed-off-by: Pali Roh=C3=A1r Signed-off-by: Marek Beh=C3=BAn Signed-off-by: Thomas Gleixner Reviewed-by: Andrew Lunn [ refactored a little and changed commit message ] --- drivers/irqchip/irq-armada-370-xp.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada= -370-xp.c index 526077d..deb4c9b 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -156,6 +157,17 @@ static DEFINE_MUTEX(msi_used_lock); static phys_addr_t msi_doorbell_addr; #endif =20 +static inline bool is_ipi_available(void) +{ + /* + * We distinguish IPI availability in the IC by the IC not having a + * parent irq defined. If a parent irq is defined, there is a parent + * interrupt controller (e.g. GIC) that takes care of inter-processor + * interrupts. + */ + return parent_irq <=3D 0; +} + static inline bool is_percpu_irq(irq_hw_number_t irq) { if (irq <=3D ARMADA_370_XP_MAX_PER_CPU_IRQS) @@ -521,7 +533,8 @@ static void armada_xp_mpic_reenable_percpu(void) armada_370_xp_irq_unmask(data); } =20 - ipi_resume(); + if (is_ipi_available()) + ipi_resume(); =20 armada_370_xp_msi_reenable_percpu(); } @@ -744,7 +757,8 @@ static void armada_370_xp_mpic_resume(void) if (doorbell_mask_reg & PCI_MSI_DOORBELL_MASK) writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); =20 - ipi_resume(); + if (is_ipi_available()) + ipi_resume(); } =20 static struct syscore_ops armada_370_xp_mpic_syscore_ops =3D { . Date: Sun, 23 Jun 2024 15:30:29 -0000 From: tip-bot2 for Marek =?utf-8?q?Beh=C3=BAn?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/armada-370-xp: Use atomic_io_modify() instead of another spinlock Cc: kabel@kernel.org, Thomas Gleixner , Andrew Lunn , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171915662931.10875.4726909640508409611.tip-bot2@tip-bot2> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256055 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The following commit has been merged into the irq/core branch of tip: Commit-ID: 50c43447f71c6d0eb9e320c4cc69822d396e52bc Gitweb: https://git.kernel.org/tip/50c43447f71c6d0eb9e320c4cc69822d396= e52bc Author: Marek Beh=C3=BAn AuthorDate: Thu, 20 Jun 2024 11:52:33 +02:00 Committer: Thomas Gleixner CommitterDate: Sun, 23 Jun 2024 17:23:08 +02:00 irqchip/armada-370-xp: Use atomic_io_modify() instead of another spinlock Use the dedicated atomic_io_modify() instead of a open coded spin_lock() + readl() + writel() + spin_unlock() sequence. This allows to drop the irq_controller_lock spinlock from the driver. Signed-off-by: Marek Beh=C3=BAn Signed-off-by: Thomas Gleixner Reviewed-by: Andrew Lunn --- drivers/irqchip/irq-armada-370-xp.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada= -370-xp.c index 4b021a6..676df71 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -461,24 +461,18 @@ static __init void armada_xp_ipi_init(struct device_nod= e *node) set_smp_ipi_range(base_ipi, IPI_DOORBELL_END); } =20 -static DEFINE_RAW_SPINLOCK(irq_controller_lock); - static int armada_xp_set_affinity(struct irq_data *d, const struct cpumask *mask_val, bool force) { irq_hw_number_t hwirq =3D irqd_to_hwirq(d); - unsigned long reg, mask; int cpu; =20 /* Select a single core from the affinity mask which is online */ cpu =3D cpumask_any_and(mask_val, cpu_online_mask); - mask =3D 1UL << cpu_logical_map(cpu); =20 - raw_spin_lock(&irq_controller_lock); - reg =3D readl(main_int_base + ARMADA_370_XP_INT_SOURCE_CTL(hwirq)); - reg =3D (reg & (~ARMADA_370_XP_INT_SOURCE_CPU_MASK)) | mask; - writel(reg, main_int_base + ARMADA_370_XP_INT_SOURCE_CTL(hwirq)); - raw_spin_unlock(&irq_controller_lock); + atomic_io_modify(main_int_base + ARMADA_370_XP_INT_SOURCE_CTL(hwirq), + ARMADA_370_XP_INT_SOURCE_CPU_MASK, + BIT(cpu_logical_map(cpu))); =20 irq_data_update_effective_affinity(d, cpumask_of(cpu)); =20 . Date: Sun, 23 Jun 2024 15:30:27 -0000 From: tip-bot2 for Pali =?utf-8?q?Roh=C3=A1r?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/armada-370-xp: Add support for 32 MSI interrupts on non-IPI platforms Cc: pali@kernel.org, kabel@kernel.org, Thomas Gleixner , Andrew Lunn , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171915662810.10875.12977162387791349357.tip-bot2@tip-bot2> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256056 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The following commit has been merged into the irq/core branch of tip: Commit-ID: 986b6ad0c4c653940fab7e5decf0d847670bf407 Gitweb: https://git.kernel.org/tip/986b6ad0c4c653940fab7e5decf0d847670= bf407 Author: Pali Roh=C3=A1r AuthorDate: Fri, 21 Jun 2024 11:38:31 +02:00 Committer: Thomas Gleixner CommitterDate: Sun, 23 Jun 2024 17:23:08 +02:00 irqchip/armada-370-xp: Add support for 32 MSI interrupts on non-IPI platforms The doorbell interrupts have the following layout on IPI vs no-IPI platforms: | 0...7 | 8...15 | 16...31 | ------------------+---------+----------+---------------------+ IPI platform | IPI | n/a | MSI | ------------------+---------+----------+---------------------+ non-IPI platform | MSI | ------------------+------------------------------------------+ Currently the driver only allows for the upper 16...31 interrupts for MSI domain (i.e. the MSI domain has only 16 interrupts). On platforms where IPI is not available, we can use whole 32 MSI interrupts. Implement support also for the lower 16 MSI interrupts on non-IPI platforms. [ Marek: refactored, changed commit message ] Signed-off-by: Pali Roh=C3=A1r Signed-off-by: Marek Beh=C3=BAn Signed-off-by: Thomas Gleixner Reviewed-by: Andrew Lunn --- drivers/irqchip/irq-armada-370-xp.c | 77 ++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 14 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada= -370-xp.c index 94a81c5..dce2b80 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -13,6 +13,7 @@ * warranty of any kind, whether express or implied. */ =20 +#include #include #include #include @@ -136,6 +137,7 @@ =20 #define ARMADA_370_XP_MAX_PER_CPU_IRQS (28) =20 +/* IPI and MSI interrupt definitions for IPI platforms */ #define IPI_DOORBELL_START (0) #define IPI_DOORBELL_END (8) #define IPI_DOORBELL_MASK 0xFF @@ -144,6 +146,14 @@ #define PCI_MSI_DOORBELL_END (32) #define PCI_MSI_DOORBELL_MASK 0xFFFF0000 =20 +/* MSI interrupt definitions for non-IPI platforms */ +#define PCI_MSI_FULL_DOORBELL_START 0 +#define PCI_MSI_FULL_DOORBELL_NR 32 +#define PCI_MSI_FULL_DOORBELL_END 32 +#define PCI_MSI_FULL_DOORBELL_MASK GENMASK(31, 0) +#define PCI_MSI_FULL_DOORBELL_SRC0_MASK GENMASK(15, 0) +#define PCI_MSI_FULL_DOORBELL_SRC1_MASK GENMASK(31, 16) + static void __iomem *per_cpu_int_base; static void __iomem *main_int_base; static struct irq_domain *armada_370_xp_mpic_domain; @@ -152,7 +162,7 @@ static int parent_irq; #ifdef CONFIG_PCI_MSI static struct irq_domain *armada_370_xp_msi_domain; static struct irq_domain *armada_370_xp_msi_inner_domain; -static DECLARE_BITMAP(msi_used, PCI_MSI_DOORBELL_NR); +static DECLARE_BITMAP(msi_used, PCI_MSI_FULL_DOORBELL_NR); static DEFINE_MUTEX(msi_used_lock); static phys_addr_t msi_doorbell_addr; #endif @@ -168,6 +178,30 @@ static inline bool is_ipi_available(void) return parent_irq <=3D 0; } =20 +static inline u32 msi_doorbell_mask(void) +{ + return is_ipi_available() ? PCI_MSI_DOORBELL_MASK : + PCI_MSI_FULL_DOORBELL_MASK; +} + +static inline unsigned int msi_doorbell_start(void) +{ + return is_ipi_available() ? PCI_MSI_DOORBELL_START : + PCI_MSI_FULL_DOORBELL_START; +} + +static inline unsigned int msi_doorbell_size(void) +{ + return is_ipi_available() ? PCI_MSI_DOORBELL_NR : + PCI_MSI_FULL_DOORBELL_NR; +} + +static inline unsigned int msi_doorbell_end(void) +{ + return is_ipi_available() ? PCI_MSI_DOORBELL_END : + PCI_MSI_FULL_DOORBELL_END; +} + static inline bool is_percpu_irq(irq_hw_number_t irq) { if (irq <=3D ARMADA_370_XP_MAX_PER_CPU_IRQS) @@ -225,7 +259,7 @@ static void armada_370_xp_compose_msi_msg(struct irq_data= *data, struct msi_msg=20 =20 msg->address_lo =3D lower_32_bits(msi_doorbell_addr); msg->address_hi =3D upper_32_bits(msi_doorbell_addr); - msg->data =3D BIT(cpu + 8) | (data->hwirq + PCI_MSI_DOORBELL_START); + msg->data =3D BIT(cpu + 8) | (data->hwirq + msi_doorbell_start()); } =20 static int armada_370_xp_msi_set_affinity(struct irq_data *irq_data, @@ -258,7 +292,7 @@ static int armada_370_xp_msi_alloc(struct irq_domain *dom= ain, unsigned int virq, int hwirq, i; =20 mutex_lock(&msi_used_lock); - hwirq =3D bitmap_find_free_region(msi_used, PCI_MSI_DOORBELL_NR, + hwirq =3D bitmap_find_free_region(msi_used, msi_doorbell_size(), order_base_2(nr_irqs)); mutex_unlock(&msi_used_lock); =20 @@ -295,9 +329,10 @@ static void armada_370_xp_msi_reenable_percpu(void) u32 reg; =20 /* Enable MSI doorbell mask and combined cpu local interrupt */ - reg =3D readl(per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS) - | PCI_MSI_DOORBELL_MASK; + reg =3D readl(per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS); + reg |=3D msi_doorbell_mask(); writel(reg, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS); + /* Unmask local doorbell interrupt */ writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); } @@ -309,7 +344,7 @@ static int armada_370_xp_msi_init(struct device_node *nod= e, ARMADA_370_XP_SW_TRIG_INT_OFFS; =20 armada_370_xp_msi_inner_domain =3D - irq_domain_add_linear(NULL, PCI_MSI_DOORBELL_NR, + irq_domain_add_linear(NULL, msi_doorbell_size(), &armada_370_xp_msi_domain_ops, NULL); if (!armada_370_xp_msi_inner_domain) return -ENOMEM; @@ -325,6 +360,10 @@ static int armada_370_xp_msi_init(struct device_node *no= de, =20 armada_370_xp_msi_reenable_percpu(); =20 + /* Unmask low 16 MSI irqs on non-IPI platforms */ + if (!is_ipi_available()) + writel(0, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); + return 0; } #else @@ -613,20 +652,20 @@ static void armada_370_xp_handle_msi_irq(struct pt_regs= *regs, bool is_chained) u32 msimask, msinr; =20 msimask =3D readl_relaxed(per_cpu_int_base + - ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) - & PCI_MSI_DOORBELL_MASK; + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS); + msimask &=3D msi_doorbell_mask(); =20 writel(~msimask, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS); =20 - for (msinr =3D PCI_MSI_DOORBELL_START; - msinr < PCI_MSI_DOORBELL_END; msinr++) { + for (msinr =3D msi_doorbell_start(); + msinr < msi_doorbell_end(); msinr++) { unsigned int irq; =20 if (!(msimask & BIT(msinr))) continue; =20 - irq =3D msinr - PCI_MSI_DOORBELL_START; + irq =3D msinr - msi_doorbell_start(); =20 generic_handle_domain_irq(armada_370_xp_msi_inner_domain, irq); } @@ -655,7 +694,7 @@ static void armada_370_xp_mpic_handle_cascade_irq(struct = irq_desc *desc) if (!(irqsrc & ARMADA_370_XP_INT_IRQ_FIQ_MASK(cpuid))) continue; =20 - if (irqn =3D=3D 1) { + if (irqn =3D=3D 0 || irqn =3D=3D 1) { armada_370_xp_handle_msi_irq(NULL, true); continue; } @@ -716,6 +755,7 @@ static int armada_370_xp_mpic_suspend(void) =20 static void armada_370_xp_mpic_resume(void) { + bool src0, src1; int nirqs; irq_hw_number_t irq; =20 @@ -755,9 +795,18 @@ static void armada_370_xp_mpic_resume(void) /* Reconfigure doorbells for IPIs and MSIs */ writel(doorbell_mask_reg, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_MSK_OFFS); - if (is_ipi_available() && (doorbell_mask_reg & IPI_DOORBELL_MASK)) + + if (is_ipi_available()) { + src0 =3D doorbell_mask_reg & IPI_DOORBELL_MASK; + src1 =3D doorbell_mask_reg & PCI_MSI_DOORBELL_MASK; + } else { + src0 =3D doorbell_mask_reg & PCI_MSI_FULL_DOORBELL_SRC0_MASK; + src1 =3D doorbell_mask_reg & PCI_MSI_FULL_DOORBELL_SRC1_MASK; + } + + if (src0) writel(0, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); - if (doorbell_mask_reg & PCI_MSI_DOORBELL_MASK) + if (src1) writel(1, per_cpu_int_base + ARMADA_370_XP_INT_CLEAR_MASK_OFFS); =20 if (is_ipi_available()) . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Sun, 23 Jun 2024 08:39:23 -0700 Message-ID: <0000000000000b2e35061b9078aa@google.com> Subject: [syzbot] [btrfs?] WARNING in __btrfs_free_extent (2) From: syzbot To: boris@bur.io, clm@fb.com, dsterba@suse.com, josef@toxicpanda.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256063 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-btrfs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: 2ccbdf43d5e7 Merge tag 'for-linus' of git://git.kernel.org.. git tree: upstream console+strace: https://syzkaller.appspot.com/x/log.txt?x=10aed446980000 kernel config: https://syzkaller.appspot.com/x/.config?x=c79815c08cc14227 dashboard link: https://syzkaller.appspot.com/bug?extid=fe3566bcb509ae7764ef compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 syz repro: https://syzkaller.appspot.com/x/repro.syz?x=10ebe941980000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=1374b3de980000 Downloadable assets: disk image: https://storage.googleapis.com/syzbot-assets/35e32e9073a7/disk-2ccbdf43.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/6c6e34658d16/vmlinux-2ccbdf43.xz kernel image: https://storage.googleapis.com/syzbot-assets/4417e7ef76ed/bzImage-2ccbdf43.xz mounted in repro: https://storage.googleapis.com/syzbot-assets/b1cd2f1f0c7e/mount_0.gz The issue was bisected to: commit cecbb533b5fcec4ff77e786b7f94457f6cacd9e7 Author: Boris Burkov Date: Wed Jun 28 18:00:15 2023 +0000 btrfs: record simple quota deltas in delayed refs bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=15a47be2980000 final oops: https://syzkaller.appspot.com/x/report.txt?x=17a47be2980000 console output: https://syzkaller.appspot.com/x/log.txt?x=13a47be2980000 IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+fe3566bcb509ae7764ef@syzkaller.appspotmail.com Fixes: cecbb533b5fc ("btrfs: record simple quota deltas in delayed refs") BTRFS: Transaction aborted (error -2) WARNING: CPU: 0 PID: 5085 at fs/btrfs/extent-tree.c:2984 do_free_extent_accounting fs/btrfs/extent-tree.c:2984 [inline] WARNING: CPU: 0 PID: 5085 at fs/btrfs/extent-tree.c:2984 __btrfs_free_extent+0x32d1/0x3a10 fs/btrfs/extent-tree.c:3358 Modules linked in: CPU: 0 PID: 5085 Comm: syz-executor845 Not tainted 6.10.0-rc3-syzkaller-00044-g2ccbdf43d5e7 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/07/2024 RIP: 0010:do_free_extent_accounting fs/btrfs/extent-tree.c:2984 [inline] RIP: 0010:__btrfs_free_extent+0x32d1/0x3a10 fs/btrfs/extent-tree.c:3358 Code: e8 64 b0 b0 fd 90 0f 0b 90 90 e9 3c f3 ff ff e8 b5 81 ee fd 90 48 c7 c7 00 2e 0b 8c 44 8b 6c 24 18 44 89 ee e8 40 b0 b0 fd 90 <0f> 0b 90 90 4c 8b 24 24 e9 4f f3 ff ff e8 8d 81 ee fd 90 48 c7 c7 RSP: 0018:ffffc9000352f220 EFLAGS: 00010246 RAX: 7e1377ca92db5900 RBX: ffff888024e3c001 RCX: ffff88807c1f0000 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000000 RBP: ffffc9000352f3f0 R08: ffffffff81585742 R09: fffffbfff1c39994 R10: dffffc0000000000 R11: fffffbfff1c39994 R12: dffffc0000000000 R13: 00000000fffffffe R14: 0000000000000000 R15: ffff888063a8b5c8 FS: 000055556fa3c3c0(0000) GS:ffff8880b9400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00005648b40a4798 CR3: 0000000023a7e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: run_delayed_tree_ref fs/btrfs/extent-tree.c:1736 [inline] run_one_delayed_ref fs/btrfs/extent-tree.c:1762 [inline] btrfs_run_delayed_refs_for_head fs/btrfs/extent-tree.c:2027 [inline] __btrfs_run_delayed_refs+0x117c/0x4670 fs/btrfs/extent-tree.c:2097 btrfs_run_delayed_refs+0xe3/0x2c0 fs/btrfs/extent-tree.c:2209 btrfs_commit_transaction+0xf5d/0x3740 fs/btrfs/transaction.c:2400 sync_filesystem+0x1c8/0x230 fs/sync.c:66 generic_shutdown_super+0x72/0x2d0 fs/super.c:621 kill_anon_super+0x3b/0x70 fs/super.c:1226 btrfs_kill_super+0x41/0x50 fs/btrfs/super.c:2096 deactivate_locked_super+0xc4/0x130 fs/super.c:473 cleanup_mnt+0x41f/0x4b0 fs/namespace.c:1267 task_work_run+0x24f/0x310 kernel/task_work.c:180 ptrace_notify+0x2d2/0x380 kernel/signal.c:2402 ptrace_report_syscall include/linux/ptrace.h:415 [inline] ptrace_report_syscall_exit include/linux/ptrace.h:477 [inline] syscall_exit_work+0xc6/0x190 kernel/entry/common.c:173 syscall_exit_to_user_mode_prepare kernel/entry/common.c:200 [inline] __syscall_exit_to_user_mode_work kernel/entry/common.c:205 [inline] syscall_exit_to_user_mode+0x273/0x370 kernel/entry/common.c:218 do_syscall_64+0x100/0x230 arch/x86/entry/common.c:89 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7fda22d8de67 Code: 08 00 48 83 c4 08 5b 5d c3 66 2e 0f 1f 84 00 00 00 00 00 c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 a6 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 01 c3 48 c7 c2 b0 ff ff ff f7 d8 64 89 02 b8 RSP: 002b:00007fffaba15888 EFLAGS: 00000206 ORIG_RAX: 00000000000000a6 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 00007fda22d8de67 RDX: 0000000000000000 RSI: 0000000000000009 RDI: 00007fffaba15940 RBP: 00007fffaba15940 R08: 0000000000000000 R09: 0000000000000000 R10: 00000000ffffffff R11: 0000000000000206 R12: 00007fffaba16a00 R13: 000055556fa3d700 R14: 431bde82d7b634db R15: 00007fffaba169a4 --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. For information about bisection process see: https://goo.gl/tpsmEJ#bisection If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want syzbot to run the reproducer, reply with: #syz test: git://repo/address.git branch-or-commit-hash If you attach or paste a git patch, syzbot will apply it before testing. If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 23 Jun 2024 17:15:19 +0200 X-ME-IP: 86.243.222.230 From: Christophe JAILLET To: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org Subject: [PATCH] ASoC: Intel: sst: Constify struct intel_sst_ops Date: Sun, 23 Jun 2024 17:15:11 +0200 Message-ID: <098acdf266b2f4a922d6a624e9032ec24a09093c.1719155688.git.christophe.jaillet@wanadoo.fr> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256069 Newsgroups: org.kernel.vger.linux-kernel,org.alsa-project.alsa-devel,org.kernel.vger.kernel-janitors,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 'struct intel_sst_ops' is not modified in this driver. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig: Before: ====== text data bss dec hex filename 12250 1000 112 13362 3432 sound/soc/intel/atom/sst/sst.o After: ===== text data bss dec hex filename 12378 888 112 13378 3442 sound/soc/intel/atom/sst/sst.o Signed-off-by: Christophe JAILLET --- Compile tested-only --- sound/soc/intel/atom/sst/sst.c | 2 +- sound/soc/intel/atom/sst/sst.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c index e0357d257c6c..ff03fde12151 100644 --- a/sound/soc/intel/atom/sst/sst.c +++ b/sound/soc/intel/atom/sst/sst.c @@ -158,7 +158,7 @@ static int sst_save_dsp_context_v2(struct intel_sst_drv *sst) } -static struct intel_sst_ops mrfld_ops = { +static const struct intel_sst_ops mrfld_ops = { .interrupt = intel_sst_interrupt_mrfld, .irq_thread = intel_sst_irq_thread_mrfld, .clear_interrupt = intel_sst_clear_intr_mrfld, diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h index 126903e126e4..e0db7434543c 100644 --- a/sound/soc/intel/atom/sst/sst.h +++ b/sound/soc/intel/atom/sst/sst.h @@ -391,7 +391,7 @@ struct intel_sst_drv { unsigned int csr_value; void *fw_in_mem; struct sst_sg_list fw_sg_list, library_list; - struct intel_sst_ops *ops; + const struct intel_sst_ops *ops; struct sst_info info; struct pm_qos_request *qos; unsigned int use_dma; -- 2.45.2 . X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 23 Jun 2024 18:11:38 +0200 X-ME-IP: 86.243.222.230 From: Christophe JAILLET To: Nishanth Menon , Santosh Shilimkar Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-arm-kernel@lists.infradead.org Subject: [PATCH] soc: ti: knav_qmss: Constify struct knav_range_ops Date: Sun, 23 Jun 2024 18:11:31 +0200 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256077 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.kernel-janitors Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 'struct knav_range_ops' is not modified in these drivers. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig: Before: ====== text data bss dec hex filename 7498 1193 0 8691 21f3 drivers/soc/ti/knav_qmss_acc.o After: ===== text data bss dec hex filename 7566 1145 0 8711 2207 drivers/soc/ti/knav_qmss_acc.o Signed-off-by: Christophe JAILLET --- Compile tested-only --- drivers/soc/ti/knav_qmss.h | 2 +- drivers/soc/ti/knav_qmss_acc.c | 2 +- drivers/soc/ti/knav_qmss_queue.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soc/ti/knav_qmss.h b/drivers/soc/ti/knav_qmss.h index a01eda720bf6..9325e8ce2e25 100644 --- a/drivers/soc/ti/knav_qmss.h +++ b/drivers/soc/ti/knav_qmss.h @@ -333,7 +333,7 @@ struct knav_range_info { void *queue_base_inst; unsigned flags; struct list_head list; - struct knav_range_ops *ops; + const struct knav_range_ops *ops; struct knav_acc_info acc_info; struct knav_acc_channel *acc; unsigned num_irqs; diff --git a/drivers/soc/ti/knav_qmss_acc.c b/drivers/soc/ti/knav_qmss_acc.c index 3d388646ed43..269b4e75ae40 100644 --- a/drivers/soc/ti/knav_qmss_acc.c +++ b/drivers/soc/ti/knav_qmss_acc.c @@ -450,7 +450,7 @@ static int knav_acc_free_range(struct knav_range_info *range) return 0; } -static struct knav_range_ops knav_acc_range_ops = { +static const struct knav_range_ops knav_acc_range_ops = { .set_notify = knav_acc_set_notify, .init_queue = knav_acc_init_queue, .open_queue = knav_acc_open_queue, diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c index 06fb5505c22c..f2055a76f84c 100644 --- a/drivers/soc/ti/knav_qmss_queue.c +++ b/drivers/soc/ti/knav_qmss_queue.c @@ -411,7 +411,7 @@ static int knav_gp_close_queue(struct knav_range_info *range, return 0; } -static struct knav_range_ops knav_gp_range_ops = { +static const struct knav_range_ops knav_gp_range_ops = { .set_notify = knav_gp_set_notify, .open_queue = knav_gp_open_queue, .close_queue = knav_gp_close_queue, -- 2.45.2 . From: Krzysztof Kozlowski To: Marcel Holtmann , Luiz Augusto von Dentz , Bartosz Golaszewski , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH] Bluetooth: hci: fix build when POWER_SEQUENCING=m Date: Sun, 23 Jun 2024 19:13:52 +0200 Message-ID: <20240623171352.305053-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256093 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-bluetooth Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail BT_HCIUART_QCA, which is a bool and an HCI UART component, uses now power sequencing, so we need to be sure BT_HCIUART_QCA=y and POWER_SEQUENCING=m cannot happen: /usr/bin/aarch64-linux-gnu-ld: drivers/bluetooth/hci_qca.o: in function `qca_serdev_probe': drivers/bluetooth/hci_qca.c:2401:(.text+0xc48): undefined reference to `devm_pwrseq_get' /usr/bin/aarch64-linux-gnu-ld: drivers/bluetooth/hci_qca.o: in function `qca_power_shutdown': drivers/bluetooth/hci_qca.c:2192:(.text+0x29e8): undefined reference to `pwrseq_power_off' /usr/bin/aarch64-linux-gnu-ld: drivers/bluetooth/hci_qca.o: in function `qca_power_on': drivers/bluetooth/hci_qca.c:1808:(.text+0x3390): undefined reference to `pwrseq_power_on' Fixes: 4029dba6b6f1 ("Bluetooth: qca: use the power sequencer for QCA6390") Signed-off-by: Krzysztof Kozlowski --- drivers/bluetooth/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 87484f5de8e3..90a94a111e67 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -105,6 +105,7 @@ config BT_HCIUART tristate "HCI UART driver" depends on SERIAL_DEV_BUS || !SERIAL_DEV_BUS depends on NVMEM || !NVMEM + depends on POWER_SEQUENCING || !POWER_SEQUENCING depends on TTY help Bluetooth HCI UART driver. -- 2.43.0 . Date: Mon, 24 Jun 2024 01:48:56 +0800 From: kernel test robot To: Sam Ravnborg Cc: oe-kbuild-all@lists.linux.dev, linux-kernel@vger.kernel.org, Andreas Larsson Subject: arch/sparc/kernel/head_32.S:121:(.head.text+0x5040): relocation truncated to fit: R_SPARC_WDISP22 against `.init.text' Message-ID: <202406240441.5zaoshVX-lkp@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256122 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.oe-kbuild-all Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Sam, First bad commit (maybe != root cause): tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master head: 7c16f0a4ed1ce7b0dd1c01fc012e5bde89fe7748 commit: 91d3ff922c346d6d8cb8de5ff8d504fe0ca9e17e sparc32: Fix parport build with sparc32 date: 4 months ago config: sparc-randconfig-r026-20230907 (https://download.01.org/0day-ci/archive/20240624/202406240441.5zaoshVX-lkp@intel.com/config) compiler: sparc-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240624/202406240441.5zaoshVX-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-kbuild-all/202406240441.5zaoshVX-lkp@intel.com/ All errors (new ones prefixed by >>): arch/sparc/kernel/head_32.o: in function `current_pc': >> arch/sparc/kernel/head_32.S:121:(.head.text+0x5040): relocation truncated to fit: R_SPARC_WDISP22 against `.init.text' arch/sparc/kernel/head_32.o: in function `halt_notsup': arch/sparc/kernel/head_32.S:198:(.head.text+0x5100): relocation truncated to fit: R_SPARC_WDISP22 against `.init.text' arch/sparc/kernel/head_32.o: in function `leon_init': arch/sparc/kernel/head_32.S:434:(.init.text+0xa4): relocation truncated to fit: R_SPARC_WDISP22 against symbol `leon_smp_cpu_startup' defined in .text section in arch/sparc/kernel/trampoline_32.o >> arch/sparc/kernel/process_32.o:(.fixup+0x4): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/process_32.o:(.fixup+0xc): relocation truncated to fit: R_SPARC_WDISP22 against `.text' >> arch/sparc/kernel/signal_32.o:(.fixup+0x0): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x8): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x10): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x18): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x20): relocation truncated to fit: R_SPARC_WDISP22 against `.text' arch/sparc/kernel/signal_32.o:(.fixup+0x28): additional relocation overflows omitted from the output vim +121 arch/sparc/kernel/head_32.S ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 66 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 67 .global root_flags ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 68 .global ram_flags ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 69 .global root_dev ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 70 .global sparc_ramdisk_image ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 71 .global sparc_ramdisk_size ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 72 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 73 /* This stuff has to be in sync with SILO and other potential boot loaders ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 74 * Fields should be kept upward compatible and whenever any change is made, ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 75 * HdrS version should be incremented. ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 76 */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 77 .ascii "HdrS" ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 78 .word LINUX_VERSION_CODE ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 79 .half 0x0203 /* HdrS version */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 80 root_flags: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 81 .half 1 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 82 root_dev: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 83 .half 0 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 84 ram_flags: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 85 .half 0 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 86 sparc_ramdisk_image: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 87 .word 0 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 88 sparc_ramdisk_size: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 89 .word 0 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 90 .word reboot_command ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 91 .word 0, 0, 0 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 92 .word _end ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 93 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 94 /* Cool, here we go. Pick up the romvec pointer in %o0 and stash it in ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 95 * %g7 and at prom_vector_p. And also quickly check whether we are on ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 96 * a v0, v2, or v3 prom. ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 97 */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 98 gokernel: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 99 /* Ok, it's nice to know, as early as possible, if we ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 100 * are already mapped where we expect to be in virtual ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 101 * memory. The Solaris /boot elf format bootloader ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 102 * will peek into our elf header and load us where ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 103 * we want to be, otherwise we have to re-map. ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 104 * ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 105 * Some boot loaders don't place the jmp'rs address ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 106 * in %o7, so we do a pc-relative call to a local ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 107 * label, then see what %o7 has. ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 108 */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 109 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 110 mov %o7, %g4 ! Save %o7 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 111 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 112 /* Jump to it, and pray... */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 113 current_pc: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 114 call 1f ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 115 nop ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 116 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 117 1: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 118 mov %o7, %g3 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 119 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 120 tst %o0 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 @121 be no_sun4u_here ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 122 mov %g4, %o7 /* Previous %o7. */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 123 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 124 mov %o0, %l0 ! stash away romvec ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 125 mov %o0, %g7 ! put it here too ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 126 mov %o1, %l1 ! stash away debug_vec too ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 127 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 128 /* Ok, let's check out our run time program counter. */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 129 set current_pc, %g5 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 130 cmp %g3, %g5 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 131 be already_mapped ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 132 nop ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 133 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 134 /* %l6 will hold the offset we have to subtract ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 135 * from absolute symbols in order to access areas ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 136 * in our own image. If already mapped this is ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 137 * just plain zero, else it is KERNBASE. ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 138 */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 139 set KERNBASE, %l6 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 140 b copy_prom_lvl14 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 141 nop ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 142 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 143 already_mapped: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 144 mov 0, %l6 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 145 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 146 /* Copy over the Prom's level 14 clock handler. */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 147 copy_prom_lvl14: ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 148 #if 1 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 149 /* DJHR ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 150 * preserve our linked/calculated instructions ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 151 */ ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 152 set lvl14_save, %g1 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 153 set t_irq14, %g3 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 154 sub %g1, %l6, %g1 ! translate to physical ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 155 sub %g3, %l6, %g3 ! translate to physical ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 156 ldd [%g3], %g4 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 157 std %g4, [%g1] ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 158 ldd [%g3+8], %g4 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 159 std %g4, [%g1+8] ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 160 #endif ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 161 rd %tbr, %g1 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 162 andn %g1, 0xfff, %g1 ! proms trap table base ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 163 or %g0, (0x1e<<4), %g2 ! offset to lvl14 intr ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 164 or %g1, %g2, %g2 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 165 set t_irq14, %g3 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 166 sub %g3, %l6, %g3 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 167 ldd [%g2], %g4 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 168 std %g4, [%g3] ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 169 ldd [%g2 + 0x8], %g4 ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 170 std %g4, [%g3 + 0x8] ! Copy proms handler ^1da177e4c3f41 arch/sparc/kernel/head.S Linus Torvalds 2005-04-16 171 :::::: The code at line 121 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2 :::::: TO: Linus Torvalds :::::: CC: Linus Torvalds -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki . Date: Sun, 23 Jun 2024 19:56:42 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 00/14] staging: rtl8723bs: Remove unused macros in wifi.h Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256129 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.linux-staging Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Remove unused macros, structs and function declarations. Tested with rtl8723bs in ODYS Trenbook Next 14 Philipp Hortmann (14): staging: rtl8723bs: Remove unused structs starting with profile_info staging: rtl8723bs: Remove switch(type) as type is constant staging: rtl8723bs: Remove unused declarations start with sd_hal_bus_init staging: rtl8723bs: Remove empty file sdio_osintf.h staging: rtl8723bs: Remove unused macros in wifi.h staging: rtl8723bs: Remove unused macros in sta_info.h staging: rtl8723bs: Remove unused macros in rtw_xmit.h staging: rtl8723bs: Remove unused macros in rtw_security.h staging: rtl8723bs: Remove unused macros in rtw_recv.h staging: rtl8723bs: Remove unused macros in rtw_pwrctrl.h staging: rtl8723bs: Remove unused macros in rtw_mp.h staging: rtl8723bs: Remove unused macros in rtw_mlme.h staging: rtl8723bs: Remove unused macros in rtw_io.h staging: rtl8723bs: Remove unused macro in ioctl_cfg80211.c drivers/staging/rtl8723bs/include/drv_types.h | 1 - drivers/staging/rtl8723bs/include/rtw_io.h | 57 ---- drivers/staging/rtl8723bs/include/rtw_mlme.h | 156 --------- drivers/staging/rtl8723bs/include/rtw_mp.h | 29 -- .../staging/rtl8723bs/include/rtw_pwrctrl.h | 38 --- drivers/staging/rtl8723bs/include/rtw_recv.h | 16 - .../staging/rtl8723bs/include/rtw_security.h | 5 - drivers/staging/rtl8723bs/include/rtw_xmit.h | 10 - drivers/staging/rtl8723bs/include/sdio_hal.h | 4 - .../staging/rtl8723bs/include/sdio_osintf.h | 16 - drivers/staging/rtl8723bs/include/sta_info.h | 44 --- drivers/staging/rtl8723bs/include/wifi.h | 299 ------------------ .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 15 - 13 files changed, 690 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/include/sdio_osintf.h -- 2.45.2 . X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 23 Jun 2024 20:08:02 +0200 X-ME-IP: 86.243.222.230 From: Christophe JAILLET To: Namjae Jeon , Steve French , Sergey Senozhatsky , Tom Talpey Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-cifs@vger.kernel.org Subject: [PATCH] ksmbd: Constify struct ksmbd_transport_ops Date: Sun, 23 Jun 2024 20:07:58 +0200 Message-ID: X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-cifs:43197 org.kernel.vger.linux-kernel:1256144 Newsgroups: org.kernel.vger.linux-cifs,org.kernel.vger.kernel-janitors,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 'struct ksmbd_transport_ops' is not modified in these drivers. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig, as an example: Before: ====== text data bss dec hex filename 52184 2085 256 54525 d4fd fs/smb/server/transport_rdma.o After: ===== text data bss dec hex filename 52260 2021 256 54537 d509 fs/smb/server/transport_rdma.o Signed-off-by: Christophe JAILLET --- Compile tested-only --- fs/smb/server/connection.h | 4 ++-- fs/smb/server/transport_rdma.c | 4 ++-- fs/smb/server/transport_tcp.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/smb/server/connection.h b/fs/smb/server/connection.h index 0e04cf8b1d89..5c2845e47cf2 100644 --- a/fs/smb/server/connection.h +++ b/fs/smb/server/connection.h @@ -133,8 +133,8 @@ struct ksmbd_transport_ops { }; struct ksmbd_transport { - struct ksmbd_conn *conn; - struct ksmbd_transport_ops *ops; + struct ksmbd_conn *conn; + const struct ksmbd_transport_ops *ops; }; #define KSMBD_TCP_RECV_TIMEOUT (7 * HZ) diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c index 8faa25c6e129..cf4418f72772 100644 --- a/fs/smb/server/transport_rdma.c +++ b/fs/smb/server/transport_rdma.c @@ -164,7 +164,7 @@ enum { SMB_DIRECT_MSG_DATA_TRANSFER }; -static struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops; +static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops; struct smb_direct_send_ctx { struct list_head msg_list; @@ -2292,7 +2292,7 @@ bool ksmbd_rdma_capable_netdev(struct net_device *netdev) return rdma_capable; } -static struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { +static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { .prepare = smb_direct_prepare, .disconnect = smb_direct_disconnect, .shutdown = smb_direct_shutdown, diff --git a/fs/smb/server/transport_tcp.c b/fs/smb/server/transport_tcp.c index 6633fa78e9b9..a84788396daa 100644 --- a/fs/smb/server/transport_tcp.c +++ b/fs/smb/server/transport_tcp.c @@ -37,7 +37,7 @@ struct tcp_transport { unsigned int nr_iov; }; -static struct ksmbd_transport_ops ksmbd_tcp_transport_ops; +static const struct ksmbd_transport_ops ksmbd_tcp_transport_ops; static void tcp_stop_kthread(struct task_struct *kthread); static struct interface *alloc_iface(char *ifname); @@ -649,7 +649,7 @@ int ksmbd_tcp_set_interfaces(char *ifc_list, int ifc_list_sz) return 0; } -static struct ksmbd_transport_ops ksmbd_tcp_transport_ops = { +static const struct ksmbd_transport_ops ksmbd_tcp_transport_ops = { .read = ksmbd_tcp_read, .writev = ksmbd_tcp_writev, .disconnect = ksmbd_tcp_disconnect, -- 2.45.2 . X-Virus-Scanned: amavisd-new at emenem.pl Message-ID: Date: Sun, 23 Jun 2024 11:47:39 -0700 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Language: en-US From: =?UTF-8?Q?Krzysztof_Ol=C4=99dzki?= To: Heiner Kallweit , Greg Kroah-Hartman , Guenter Roeck , Bartosz Golaszewski Cc: stable@vger.kernel.org, linux-i2c@vger.kernel.org, linux-hwmon@vger.kernel.org, Linux Kernel Mailing List Subject: Regression caused by "eeprom: at24: Probe for DDR3 thermal sensor in the SPD case" - "sysfs: cannot create duplicate filename" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256153 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-hwmon,org.kernel.vger.linux-i2c,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, After upgrading kernel to Linux 6.6.34 on one of my systems, I noticed "sysfs: cannot create duplicate filename" and i2c registration errors in dmesg, please see below. This seems to be related to https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.6.y&id=4d5ace787273cb159bfdcf1c523df957938b3e42 - reverting the change fixes the problem. Note that jc42 devices are registered correctly and work with and without the change. # grep . /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-*/name /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-0018/name:jc42 /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-0019/name:jc42 /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-001a/name:jc42 /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-001b/name:jc42 /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-0050/name:spd /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-0051/name:spd /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-0052/name:spd /sys/devices/pci0000:00/0000:00:1f.3/i2c-12/12-0053/name:spd # sensors|grep -A4 jc42-i2c jc42-i2c-12-1b Adapter: SMBus I801 adapter at 3000 temp1: +33.2°C (low = +0.0°C) (high = +91.0°C, hyst = +91.0°C) (crit = +95.0°C, hyst = +95.0°C) -- jc42-i2c-12-19 Adapter: SMBus I801 adapter at 3000 temp1: +33.5°C (low = +0.0°C) (high = +91.0°C, hyst = +91.0°C) (crit = +95.0°C, hyst = +95.0°C) -- jc42-i2c-12-1a Adapter: SMBus I801 adapter at 3000 temp1: +33.5°C (low = +0.0°C) (high = +91.0°C, hyst = +91.0°C) (crit = +95.0°C, hyst = +95.0°C) -- jc42-i2c-12-18 Adapter: SMBus I801 adapter at 3000 temp1: +33.2°C (low = +0.0°C) (high = +91.0°C, hyst = +91.0°C) (crit = +95.0°C, hyst = +95.0°C) dmesg: [ 0.000000] DMI: Dell Inc. PowerEdge T110 II/0PM2CW, BIOS 2.10.0 05/24/2018 (...) [ 7.681132] i2c_dev: i2c /dev entries driver [ 7.687116] i2c i2c-12: 4/4 memory slots populated (from DMI) [ 7.690623] at24 12-0050: 256 byte spd EEPROM, read-only [ 7.691812] i2c i2c-12: Successfully instantiated SPD at 0x50 [ 7.698246] at24 12-0051: 256 byte spd EEPROM, read-only [ 7.699465] i2c i2c-12: Successfully instantiated SPD at 0x51 [ 7.700043] i2c i2c-12: Failed to register i2c client jc42 at 0x19 (-16) [ 7.700047] i2c i2c-12: Failed creating jc42 at 0x19 [ 7.705248] sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:1f.3/i2c-12/12-001a' [ 7.711617] [ 7.712612] dump_stack_lvl+0x37/0x4a [ 7.712612] sysfs_warn_dup+0x55/0x61 [ 7.715616] sysfs_create_dir_ns+0xa6/0xd2 [ 7.716620] kobject_add_internal+0xc3/0x1c0 [ 7.716620] kobject_add+0xba/0xe4 [ 7.719615] ? device_add+0x53/0x726 [ 7.720611] device_add+0x132/0x726 [ 7.720611] i2c_new_client_device+0x1ee/0x246 [ 7.723616] at24_probe+0x5f8/0x666 [ 7.724642] ? __pfx_at24_read+0x10/0x10 [ 7.724642] ? __pfx_at24_write+0x10/0x10 [ 7.724642] ? __pfx___device_attach_driver+0x10/0x10 [ 7.727619] i2c_device_probe+0x1b7/0x240 [ 7.728612] really_probe+0x101/0x248 [ 7.728612] __driver_probe_device+0xbb/0xed [ 7.731620] driver_probe_device+0x1a/0x72 [ 7.732621] __device_attach_driver+0x82/0x96 [ 7.732621] bus_for_each_drv+0xa6/0xd4 [ 7.732621] __device_attach+0xa8/0x12a [ 7.735619] bus_probe_device+0x31/0x95 [ 7.736614] device_add+0x265/0x726 [ 7.736614] i2c_new_client_device+0x1ee/0x246 [ 7.739618] i2c_register_spd+0x1a1/0x1ed [ 7.740613] i801_probe+0x589/0x603 [ 7.740613] ? up_write+0x37/0x4d [ 7.740613] ? kernfs_add_one+0x104/0x126 [ 7.743618] ? __raw_spin_unlock_irqrestore+0x14/0x29 [ 7.744612] pci_device_probe+0xbe/0x12f [ 7.744612] really_probe+0x101/0x248 [ 7.744612] __driver_probe_device+0xbb/0xed [ 7.747618] driver_probe_device+0x1a/0x72 [ 7.748612] __driver_attach_async_helper+0x2d/0x42 [ 7.748612] async_run_entry_fn+0x25/0xa0 [ 7.748612] process_scheduled_works+0x193/0x291 [ 7.748612] worker_thread+0x1c5/0x21f [ 7.751619] ? __pfx_worker_thread+0x10/0x10 [ 7.752611] kthread+0xf6/0xfe [ 7.752611] ? __pfx_kthread+0x10/0x10 [ 7.752611] ret_from_fork+0x23/0x35 [ 7.755621] ? __pfx_kthread+0x10/0x10 [ 7.756613] ret_from_fork_asm+0x1b/0x30 [ 7.756613] [ 7.759637] i2c i2c-12: Failed to register i2c client jc42 at 0x1a (-17) [ 7.760815] at24 12-0052: 256 byte spd EEPROM, read-only [ 7.762047] i2c i2c-12: Successfully instantiated SPD at 0x52 [ 7.765252] i2c i2c-12: Failed to register i2c client jc42 at 0x1b (-16) [ 7.766126] at24 12-0053: 256 byte spd EEPROM, read-only [ 7.767584] i2c i2c-12: Successfully instantiated SPD at 0x53 Thanks, Krzysztof . From: Roman Storozhenko Subject: [PATCH 0/4] cpupower: Add 'help' target to all the makefiles that don't have it Date: Sun, 23 Jun 2024 21:19:40 +0200 Message-Id: <20240623-make_help_rest-v1-0-4bd3fd51064b@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Thomas Renninger , Shuah Khan Cc: Javier Carrasco , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Roman Storozhenko Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256155 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch series adds the 'help' target describing all the user-available targets to the makefiles which haven't had that target yet. Signed-off-by: Roman Storozhenko --- Roman Storozhenko (4): cpupower: Add 'help' target to the 'bench' subproject makefile cpupower: Add 'help' target to the 'debug/kernel' subproject makefile cpupower: Add 'help' target to the 'debug/x86_64' subproject makefile cpupower: Add 'help' target to the 'debug/i386' subproject makefile tools/power/cpupower/bench/Makefile | 12 ++++++++++++ tools/power/cpupower/debug/i386/Makefile | 12 ++++++++++++ tools/power/cpupower/debug/kernel/Makefile | 12 ++++++++++++ tools/power/cpupower/debug/x86_64/Makefile | 12 ++++++++++++ 4 files changed, 48 insertions(+) --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240623-make_help_rest-e799889f43a1 Best regards, -- Roman Storozhenko . From: Krzysztof Kozlowski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Rob Clark , Sean Paul , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] drm/msm/adreno: allow headless setup on SM8150 MTP Date: Sun, 23 Jun 2024 21:34:19 +0200 Message-ID: <20240623193420.333735-1-krzysztof.kozlowski@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256160 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Commit f30ac26def18 ("arm64: dts: qcom: add sm8150 GPU nodes") re-used amd,imageon compatible for the SM8150 just to enable headless mode due to missing display controller nodes. This work-around was later narrowed to the SM8150 MTP board in commit 1642ab96efa4 ("arm64: dts: qcom: sm8150: Don't start Adreno in headless mode"). This was not a correct solution, because the Qualcomm SM8150 SoC does not have an AMD GPU and the SM8150 MTP board does not have magically different GPU than SM8150 SoC. Rely on board compatible to achieve the same in a Devicetree-correct way. Signed-off-by: Krzysztof Kozlowski --- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index c3703a51287b..a8afe0b6429b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -838,7 +838,8 @@ static int adreno_probe(struct platform_device *pdev) if (ret) return ret; - if (of_device_is_compatible(pdev->dev.of_node, "amd,imageon")) + if (of_device_is_compatible(pdev->dev.of_node, "amd,imageon") || + of_machine_is_compatible("qcom,sm8150-mtp")) adreno_device_register_headless(); return 0; -- 2.43.0 . From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Cc: Marek Vasut , Alexandre Torgue , Antonio Borneo , Guenter Roeck , Krzysztof Kozlowski , Marc Zyngier , Maxime Coquelin , Richard Cochran , Rob Herring , Thomas Gleixner , Wim Van Sebroeck , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-watchdog@vger.kernel.org Subject: [PATCH v3] ARM: dts: stm32: Add IWDG2 EXTI interrupt mapping and mark as wakeup source Date: Sun, 23 Jun 2024 21:51:08 +0200 Message-ID: <20240623195136.81522-1-marex@denx.de> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256162 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-watchdog Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The IWDG2 is capable of generating pre-timeout interrupt, which can be used to wake the system up from suspend to mem. Add the EXTI interrupt mapping and mark the IWDG2 as wake up source. Signed-off-by: Marek Vasut --- Cc: Alexandre Torgue Cc: Antonio Borneo Cc: Guenter Roeck Cc: Krzysztof Kozlowski Cc: Marc Zyngier Cc: Maxime Coquelin Cc: Richard Cochran Cc: Rob Herring Cc: Thomas Gleixner Cc: Wim Van Sebroeck Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-watchdog@vger.kernel.org --- V2: No change V3: No change --- arch/arm/boot/dts/st/stm32mp151.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/st/stm32mp151.dtsi b/arch/arm/boot/dts/st/stm32mp151.dtsi index 1804e202eb425..68846699b26fd 100644 --- a/arch/arm/boot/dts/st/stm32mp151.dtsi +++ b/arch/arm/boot/dts/st/stm32mp151.dtsi @@ -355,6 +355,8 @@ iwdg2: watchdog@5a002000 { reg = <0x5a002000 0x400>; clocks = <&rcc IWDG2>, <&rcc CK_LSI>; clock-names = "pclk", "lsi"; + interrupts-extended = <&exti 46 IRQ_TYPE_LEVEL_HIGH>; + wakeup-source; status = "disabled"; }; -- 2.43.0 . From: Krzysztof Kozlowski Subject: [PATCH v2 0/4] dt-bindings: display/msm/gpu: few cleanups Date: Sun, 23 Jun 2024 22:02:59 +0200 Message-Id: <20240623-qcom-adreno-dts-bindings-driver-v2-0-9496410de992@linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Conor Dooley , Krzysztof Kozlowski , Conor Dooley Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256164 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Changes since v1: 1. Add tags 2. New patches #3 and #4 3. Drop previous patch "dt-bindings: display/msm/gpu: constrain reg/reg-names per variant", because I need to investigate more. v1: dt-bindings: display/msm/gpu: constrain reg/reg-names per variant Best regards, Krzysztof --- Krzysztof Kozlowski (4): dt-bindings: display/msm/gpu: constrain clocks in top-level dt-bindings: display/msm/gpu: define reg-names in top-level dt-bindings: display/msm/gpu: simplify compatible regex dt-bindings: display/msm/gpu: fix the schema being not applied .../devicetree/bindings/display/msm/gpu.yaml | 27 ++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) --- base-commit: d47fa80a484f97ea51991c9547636a799c264652 change-id: 20240623-qcom-adreno-dts-bindings-driver-87521a145260 Best regards, -- Krzysztof Kozlowski . From: Mario Limonciello To: , CC: , , "Mario Limonciello" , , "Peter Jung" Subject: [PATCH] cpufreq: amd-pstate: Don't create attributes when registration fails Date: Sun, 23 Jun 2024 15:09:18 -0500 Message-ID: <20240623200918.52104-1-mario.limonciello@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256170 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail If driver registration fails then immediately return the failure instead of continuing to register attributes. This fixes issues of falling back from amd-pstate to other drivers when cpufreq init has failed for any reason. Reported-by: alex.s.cochran@proton.me Signed-off-by: Mario Limonciello --- Cc: Peter Jung drivers/cpufreq/amd-pstate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index 05e80d2f8803..7195dfa98cc5 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -2030,8 +2030,10 @@ static int __init amd_pstate_init(void) } ret = cpufreq_register_driver(current_pstate_driver); - if (ret) + if (ret) { pr_err("failed to register with return %d\n", ret); + goto disable_driver; + } dev_root = bus_get_dev_root(&cpu_subsys); if (dev_root) { @@ -2047,6 +2049,8 @@ static int __init amd_pstate_init(void) global_attr_free: cpufreq_unregister_driver(current_pstate_driver); +disable_driver: + amd_pstate_enable(false); return ret; } device_initcall(amd_pstate_init); -- 2.43.0 . X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 23 Jun 2024 22:18:02 +0200 X-ME-IP: 86.243.222.230 From: Christophe JAILLET To: Song Liu , Yu Kuai Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-raid@vger.kernel.org Subject: [PATCH] md-cluster: Constify struct md_cluster_operations Date: Sun, 23 Jun 2024 22:17:54 +0200 Message-ID: <3727f3ce9693cae4e62ae6778ea13971df805479.1719173852.git.christophe.jaillet@wanadoo.fr> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256173 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kernel-janitors,org.kernel.vger.linux-raid Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 'struct md_cluster_operations' is not modified in this driver. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig, as an example: Before: ====== text data bss dec hex filename 51941 1442 80 53463 d0d7 drivers/md/md-cluster.o After: ===== text data bss dec hex filename 52133 1246 80 53459 d0d3 drivers/md/md-cluster.o Signed-off-by: Christophe JAILLET --- Compile tested-only --- drivers/md/md-cluster.c | 2 +- drivers/md/md.c | 4 ++-- drivers/md/md.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index eb9bbf12c8d8..c1ea214bfc91 100644 --- a/drivers/md/md-cluster.c +++ b/drivers/md/md-cluster.c @@ -1570,7 +1570,7 @@ static int gather_bitmaps(struct md_rdev *rdev) return err; } -static struct md_cluster_operations cluster_ops = { +static const struct md_cluster_operations cluster_ops = { .join = join, .leave = leave, .slot_number = slot_number, diff --git a/drivers/md/md.c b/drivers/md/md.c index 69ea54aedd99..8221c9b641ab 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -85,7 +85,7 @@ static DEFINE_SPINLOCK(pers_lock); static const struct kobj_type md_ktype; -struct md_cluster_operations *md_cluster_ops; +const struct md_cluster_operations *md_cluster_ops; EXPORT_SYMBOL(md_cluster_ops); static struct module *md_cluster_mod; @@ -8539,7 +8539,7 @@ int unregister_md_personality(struct md_personality *p) } EXPORT_SYMBOL(unregister_md_personality); -int register_md_cluster_operations(struct md_cluster_operations *ops, +int register_md_cluster_operations(const struct md_cluster_operations *ops, struct module *module) { int ret = 0; diff --git a/drivers/md/md.h b/drivers/md/md.h index c4d7ebf9587d..e394e5bd39fc 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -849,7 +849,7 @@ static inline void safe_put_page(struct page *p) extern int register_md_personality(struct md_personality *p); extern int unregister_md_personality(struct md_personality *p); -extern int register_md_cluster_operations(struct md_cluster_operations *ops, +extern int register_md_cluster_operations(const struct md_cluster_operations *ops, struct module *module); extern int unregister_md_cluster_operations(void); extern int md_setup_cluster(struct mddev *mddev, int nodes); @@ -931,7 +931,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev) } } -extern struct md_cluster_operations *md_cluster_ops; +extern const struct md_cluster_operations *md_cluster_ops; static inline int mddev_is_clustered(struct mddev *mddev) { return mddev->cluster_info && mddev->bitmap_info.nodes > 1; -- 2.45.2 . From: =?utf-8?q?Barnab=C3=A1s_Cz=C3=A9m=C3=A1n?= Subject: [PATCH v2 0/4] MSM8937 MDP/DSI PHY enablement Date: Sun, 23 Jun 2024 22:30:35 +0200 Message-Id: <20240623-dsi-v2-0-a0ca70fb4846@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Krishna Manikandan Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, =?utf-8?q?Barnab=C3=A1s_Cz=C3=A9m=C3=A1n?= , phone-devel@vger.kernel.org, Krzysztof Kozlowski , Daniil Titov Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256180 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.phone-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch series adds support for the MDP and DSI PHY as found on the MSM8937 platform. Signed-off-by: Barnabás Czémán --- Changes in v2: - Remove MDP_CAP_SRC_SPLIT from mdp5_cfg - Link to v1: https://lore.kernel.org/r/20240623-dsi-v1-0-4ab560eb5bd9@gmail.com --- Barnabás Czémán (2): dt-bindings: display/msm: qcom, mdp5: Add msm8937 compatible dt-bindings: msm: dsi-phy-28nm: Document msm8937 compatible Daniil Titov (2): drm/msm/mdp5: Add MDP5 configuration for MSM8937 drm/msm/dsi: Add phy configuration for MSM8937 .../bindings/display/msm/dsi-phy-28nm.yaml | 1 + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 1 + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 88 ++++++++++++++++++++++ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 18 +++++ 7 files changed, 112 insertions(+) --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240607-dsi-851ebb226a8d Best regards, -- Barnabás Czémán . From: Waiman Long To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , Jonathan Corbet Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-doc@kvack.org, Alex Kalenyuk , Peter Hunt , Waiman Long Subject: [PATCH] memcg: Add a new sysctl parameter for automatically setting memory.high Date: Sun, 23 Jun 2024 16:45:14 -0400 Message-Id: <20240623204514.1032662-1-longman@redhat.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256186 org.kvack.linux-mm:201037 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.cgroups,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail With memory cgroup v1, there is only a single "memory.limit_in_bytes" to be set to specify the maximum amount of memory that is allowed to be used. So a lot of memory cgroup using tools and applications allow users to specify a single memory limit. When they migrate to cgroup v2, they use the given memory limit to set memory.max and disregard memory.high for the time being. Without properly setting memory.high, these user space applications cannot make use of the memory cgroup v2 ability to further reduce the chance of OOM kills by throttling and early memory reclaim. This patch adds a new sysctl parameter "vm/memory_high_autoset_ratio" to enable setting "memory.high" automatically whenever "memory.max" is set as long as "memory.high" hasn't been explicitly set before. This will allow a system administrator or a middleware layer to greatly reduce the chance of memory cgroup OOM kills without worrying about how to properly set memory.high. The new sysctl parameter will allow a range of 0-100. The default value of 0 will disable memory.high auto setting. For any non-zero value "n", the actual ratio used will be "n/(n+1)". A user cannot set a fraction less than 1/2. Signed-off-by: Waiman Long --- Documentation/admin-guide/sysctl/vm.rst | 10 ++++++ include/linux/memcontrol.h | 3 ++ mm/memcontrol.c | 41 +++++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst index e86c968a7a0e..250ec39dd5af 100644 --- a/Documentation/admin-guide/sysctl/vm.rst +++ b/Documentation/admin-guide/sysctl/vm.rst @@ -46,6 +46,7 @@ Currently, these files are in /proc/sys/vm: - mem_profiling (only if CONFIG_MEM_ALLOC_PROFILING=y) - memory_failure_early_kill - memory_failure_recovery +- memory_high_autoset_ratio - min_free_kbytes - min_slab_ratio - min_unmapped_ratio @@ -479,6 +480,15 @@ Enable memory failure recovery (when supported by the platform) 0: Always panic on a memory failure. +memory_high_autoset_ratio +========================= + +Specify a ratio by which memory.high should be set as a fraction of +memory.max if it hasn't been explicitly set before. It allows a range +of 0-100. The default value of 0 means auto setting will be disabled. +For any non-zero value "n", the actual ratio used will be "n/(n+1)". + + min_free_kbytes =============== diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 030d34e9d117..6be161a6b922 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -221,6 +221,9 @@ struct mem_cgroup { */ bool oom_group; + /* %true if memory.high has been explicitly set */ + bool memory_high_set; + /* protected by memcg_oom_lock */ bool oom_lock; int under_oom; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 71fe2a95b8bd..2cfb000bf543 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -6889,6 +6890,35 @@ static void mem_cgroup_attach(struct cgroup_taskset *tset) } #endif +/* + * The memory.high autoset ratio specifies a ratio by which memory.high + * should be set as a fraction of memory.max if it hasn't been explicitly + * set before. The default value of 0 means auto setting will be disabled. + * For any non-zero value "n", the actual ratio is "n/(n+1)". + */ +static int sysctl_memory_high_autoset_ratio; + +#ifdef CONFIG_SYSCTL +static struct ctl_table memcg_table[] = { + { + .procname = "memory_high_autoset_ratio", + .data = &sysctl_memory_high_autoset_ratio, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE_HUNDRED, + }, +}; + +static inline void memcg_sysctl_init(void) +{ + register_sysctl_init("vm", memcg_table); +} +#else +static void memcg_sysctl_init(void) { } +#endif /* CONFIG_SYSCTL */ + static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value) { if (value == PAGE_COUNTER_MAX) @@ -6982,6 +7012,7 @@ static ssize_t memory_high_write(struct kernfs_open_file *of, return err; page_counter_set_high(&memcg->memory, high); + memcg->memory_high_set = true; for (;;) { unsigned long nr_pages = page_counter_read(&memcg->memory); @@ -7023,6 +7054,7 @@ static ssize_t memory_max_write(struct kernfs_open_file *of, unsigned int nr_reclaims = MAX_RECLAIM_RETRIES; bool drained = false; unsigned long max; + unsigned int high_ratio = sysctl_memory_high_autoset_ratio; int err; buf = strstrip(buf); @@ -7032,6 +7064,13 @@ static ssize_t memory_max_write(struct kernfs_open_file *of, xchg(&memcg->memory.max, max); + if (high_ratio && !memcg->memory_high_set) { + /* Set memory.high as a fraction of memory.max */ + unsigned long high = max * high_ratio / (high_ratio + 1); + + page_counter_set_high(&memcg->memory, high); + } + for (;;) { unsigned long nr_pages = page_counter_read(&memcg->memory); @@ -7977,6 +8016,8 @@ static int __init mem_cgroup_init(void) soft_limit_tree.rb_tree_per_node[node] = rtpn; } + memcg_sysctl_init(); + return 0; } subsys_initcall(mem_cgroup_init); -- 2.39.3 . Date: Sun, 23 Jun 2024 23:02:44 +0200 From: Vicentiu Galanopulo To: pavel@ucw.cz, lee@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] dt-bindings: leds: Add LED1202 LED Controller Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256203 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-leds Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The LED1202 is a 12-channel low quiescent current LED driver with: * Supply range from 2.6 V to 5 V * 20 mA current capability per channel * 1.8 V compatible I2C control interface * 8-bit analog dimming individual control * 12-bit local PWM resolution * 8 programmable patterns Signed-off-by: Vicentiu Galanopulo --- Changes in v2: - renamed label to remove color from it - add color property for each node - add function and function-enumerator property for each node .../devicetree/bindings/leds/st,led1202.yml | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/st,led1202.yml diff --git a/Documentation/devicetree/bindings/leds/st,led1202.yml b/Documentation/devicetree/bindings/leds/st,led1202.yml new file mode 100644 index 000000000000..1484b09c8eeb --- /dev/null +++ b/Documentation/devicetree/bindings/leds/st,led1202.yml @@ -0,0 +1,162 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/leds/st,led1202.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ST LED1202 LED controllers + +maintainers: + - Vicentiu Galanopulo + +description: + The LED1202 is a 12-channel low quiescent current LED controller + programmable via I2C; The output current can be adjusted separately + for each channel by 8-bit analog and 12-bit digital dimming control. + + Datasheet available at + https://www.st.com/en/power-management/led1202.html + +properties: + compatible: + enum: + - st,led1202 + + reg: + maxItems: 1 + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + +patternProperties: + "^led@[0-9a-f]+$": + type: object + $ref: common.yaml# + unevaluatedProperties: false + + properties: + reg: + minimum: 0 + maximum: 11 + + required: + - reg + +additionalProperties: false + +examples: + - | + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + led-controller@58 { + compatible = "st,led1202"; + reg = <0x58>; + address-cells = <1>; + size-cells = <0>; + + led@0 { + reg = <0>; + label = "led1"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <1>; + active = <1>; + }; + + led@1 { + reg = <1>; + label = "led2"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <2>; + active = <1>; + }; + + led@2 { + reg = <2>; + label = "led3"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <3>; + active = <1>; + }; + + led@3 { + reg = <3>; + label = "led4"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <4>; + active = <1>; + }; + + led@4 { + reg = <4>; + label = "led5"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <5>; + active = <1>; + }; + + led@5 { + reg = <5>; + label = "led6"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <6>; + active = <1>; + }; + + led@6 { + reg = <6>; + label = "led7"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <7>; + active = <1>; + }; + + led@7 { + reg = <7>; + label = "led8"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <8>; + active = <1>; + }; + + led@8 { + reg = <8>; + label = "led9"; + function = LED_FUNCTION_STATUS; + color = ; + function-enumerator = <9>; + active = <1>; + }; + + led@9 { + reg = <9>; + active = <0>; + }; + + led@a { + reg = <10>; + active = <0>; + }; + + led@b { + reg = <11>; + active = <0>; + }; + }; + }; + +... -- 2.39.3 (Apple Git-145) . Date: Mon, 24 Jun 2024 05:06:09 +0800 From: kernel test robot To: Tianyang Zhang Cc: oe-kbuild-all@lists.linux.dev, linux-kernel@vger.kernel.org, x86@kernel.org, Thomas Gleixner , Jianmin Lv , Liupu Wang Subject: [tip:irq/core 39/46] drivers/irqchip/irq-loongarch-avec.c:82:17: error: implicit declaration of function 'loongson_send_ipi_single' Message-ID: <202406240451.ygBFNyJ3-lkp@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256206 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.oe-kbuild-all Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail tree: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core head: c9d269469d2b9a06559cdc84d12dd3fb4d552581 commit: 760d7e719499d64beea62bfcf53938fb233bb6e7 [39/46] Loongarch: Support loongarch avec config: loongarch-allnoconfig (https://download.01.org/0day-ci/archive/20240624/202406240451.ygBFNyJ3-lkp@intel.com/config) compiler: loongarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240624/202406240451.ygBFNyJ3-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-kbuild-all/202406240451.ygBFNyJ3-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/irqchip/irq-loongarch-avec.c: In function 'loongarch_avec_sync': >> drivers/irqchip/irq-loongarch-avec.c:82:17: error: implicit declaration of function 'loongson_send_ipi_single' [-Werror=implicit-function-declaration] 82 | loongson_send_ipi_single(adata->prev_cpu, SMP_CLEAR_VECT); | ^~~~~~~~~~~~~~~~~~~~~~~~ >> drivers/irqchip/irq-loongarch-avec.c:82:59: error: 'SMP_CLEAR_VECT' undeclared (first use in this function) 82 | loongson_send_ipi_single(adata->prev_cpu, SMP_CLEAR_VECT); | ^~~~~~~~~~~~~~ drivers/irqchip/irq-loongarch-avec.c:82:59: note: each undeclared identifier is reported only once for each function it appears in drivers/irqchip/irq-loongarch-avec.c: In function 'complete_irq_moving': drivers/irqchip/irq-loongarch-avec.c:173:55: error: 'SMP_CLEAR_VECT' undeclared (first use in this function) 173 | loongson_send_ipi_single(cpu, SMP_CLEAR_VECT); | ^~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/loongson_send_ipi_single +82 drivers/irqchip/irq-loongarch-avec.c 73 74 static void loongarch_avec_sync(struct loongarch_avec_data *adata) 75 { 76 struct pending_list *plist; 77 78 if (cpu_online(adata->prev_cpu)) { 79 plist = per_cpu_ptr(&pending_list, adata->prev_cpu); 80 list_add_tail(&adata->entry, &plist->head); 81 adata->moving = true; > 82 loongson_send_ipi_single(adata->prev_cpu, SMP_CLEAR_VECT); 83 } 84 adata->prev_cpu = adata->cpu; 85 adata->prev_vec = adata->vec; 86 } 87 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Linus Torvalds Date: Sun, 23 Jun 2024 17:41:18 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Linux 6.10-rc5 To: Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256220 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Another week, another release candidate. So far, the 6.10 release cycle has been fairly calm, and rc5 continues that trend. Let's hope things stay that way. For once, the driver changes don't dominate the diffs, although it's still about a third of it. But even that third is to some degree due to just a couple of larger driver changes (hv_balloon, broadcom bnxt network driver, and a qualcomm phy driver). There are certainly other driver changes in there, but nothing very big. The rest is just a fairly random collection of stuff. Yes, there's the requisite bcachefs fixes, but also some networking selftests, some documentation fixes, some random VM fixes, core networking, and a smattering of architecture fixes. But nothing strange, and nothing that makes me worry for 6.10. Shortlog - as always - appended for people who want to get a feel for the details. Linus --- Abel Vesa (3): phy: qcom-qmp: qserdes-txrx: Add missing registers offsets phy: qcom-qmp: pcs: Add missing v6 N4 register offsets phy: qcom: qmp-combo: Switch from V6 to V6 N4 register offsets Aditya Nagesh (1): Drivers: hv: Cosmetic changes for hv.c and balloon.c Adrian Moreno (1): selftests: openvswitch: Set value to nla flags. Ajrat Makhmutov (1): ALSA: hda/realtek: Enable headset mic on IdeaPad 330-17IKB 81DM Aleksandr Nogikh (1): kcov: don't lose track of remote references during softirqs Alex Deucher (2): drm/radeon: fix UBSAN warning in kv_dpm.c drm/amdgpu: fix UBSAN warning in kv_dpm.c Alexey Dobriyan (1): kvm: do not account temporary allocations to kmem Alexey Makhalov (1): drm/vmwgfx: Fix missing HYPERVISOR_GUEST dependency Amer Al Shanawany (2): selftests: filesystems: fix warn_unused_result build warnings selftests: seccomp: fix format-zero-length warnings Amit Kumar Mahapatra (1): spi: Fix SPI slave probe failure Andre Przywara (2): regulator: axp20x: AXP717: fix LDO supply rails and off-by-ones mfd: axp20x: AXP717: Fix missing IRQ status registers range Andrew Jones (1): KVM: selftests: Fix RISC-V compilation Andy Chi (1): ALSA: hda/realtek: fix mute/micmute LEDs don't work for ProBook 445/465 G11. Ard Biesheuvel (2): efi/arm: Disable LPAE PAN when calling EFI runtime services efi/x86: Free EFI memory map only when installing a new one. Arnd Bergmann (2): dmaengine: fsl-edma: avoid linking both modules mips: fix compat_sys_lseek syscall Aryan Srivastava (1): net: mvpp2: use slab_build_skb for oversized frames Ayala Beker (1): wifi: iwlwifi: scan: correctly check if PSC listen period is needed Babu Moger (1): KVM: Stop processing *all* memslots when "null" mmu_notifier handler is found Baolin Wang (1): mm: shmem: fix getting incorrect lruvec when replacing a shmem folio Barry Song (1): cifs: drop the incorrect assertion in cifs_swap_rw() Bart Van Assche (2): scsi: core: Introduce the BLIST_SKIP_IO_HINTS flag scsi: usb: uas: Do not query the IO Advice Hints Grouping mode page for USB/UAS devices Bibo Mao (1): KVM: Discard zero mask with function kvm_dirty_ring_reset Biju Das (1): regulator: core: Fix modpost error "regulator_get_regmap" undefined Boris Burkov (1): btrfs: retry block group reclaim without infinite loop Breno Leitao (1): KVM: Fix a data race on last_boosted_vcpu in kvm_vcpu_on_spin() Charles Keepax (2): spi: cs42l43: Correct SPI root clock speed spi: cs42l43: Drop cs35l56 SPI speed down to 11MHz Chenliang Li (1): io_uring/rsrc: fix incorrect assignment of iter->nr_segs in io_import_fixed Christian G=C3=B6ttsche (1): yama: document function parameter Christian K=C3=B6nig (2): drm/amdgpu: revert "take runtime pm reference when we attach a buffer= " v2 drm/amdgpu: cleanup MES11 command submission Christian Marangi (1): mips: bmips: BCM6358: make sure CBR is correctly set Colin Ian King (1): KVM: selftests: Fix shift of 32 bit unsigned int more than 32 bits Dan Carpenter (1): ptp: fix integer overflow in max_vclocks_store Daniel Borkmann (3): bpf: Fix reg_set_min_max corruption of fake_reg bpf: Reduce stack consumption in check_stack_write_fixed_off selftests/bpf: Add test coverage for reg_set_min_max handling Daniel Miess (1): drm/amd/display: Change dram_clock_latency to 34us for dcn351 Dave Chinner (1): xfs: fix unlink vs cluster buffer instantiation race Dave Martin (1): x86/resctrl: Don't try to free nonexistent RMIDs David Hildenbrand (1): Revert "mm: init_mlocked_on_free_v3" David Howells (3): cifs: Defer read completion cifs: Only pick a channel once per read request cifs: Move the 'pid' from the subreq to the req David Ruth (1): net/sched: act_api: fix possible infinite loop in tcf_idr_check_alloc= () Dmitry Antipov (1): wifi: cfg80211: wext: add extra SIOCSIWSCAN data check Dmitry Safonov (1): net/tcp_ao: Don't leak ao_info on error-path Dustin L. Howett (1): ALSA: hda/realtek: Remove Framework Laptop 16 from quirks Edson Juliano Drosdeck (1): ALSA: hda/realtek: Limit mic boost on N14AP7 En-Wei Wu (1): ice: avoid IRQ collision to fix init failure on ACPI S3 resume Eric Dumazet (4): tcp: clear tp->retrans_stamp in tcp_rcv_fastopen_synack() ipv6: prevent possible NULL deref in fib6_nh_init() ipv6: prevent possible NULL dereference in rt6_probe() xfrm6: check ip6_dst_idev() return value in xfrm6_get_saddr() Fabio Estevam (1): arm64: dts: imx93-11x11-evk: Remove the 'no-sdio' property Florian Westphal (1): bpf: Avoid splat in pskb_pull_reason Frank Li (1): arm64: dts: imx8qm-mek: fix gpio number for reg_usdhc2_vmmc GUO Zihua (1): ima: Avoid blocking in RCU read-side critical section Gavrilov Ilia (1): netrom: Fix a memory leak in nr_heartbeat_expiry() Geetha sowjanya (1): octeontx2-pf: Fix linking objects into multiple modules Gergely Meszaros (1): ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ARP8 Grygorii Tertychnyi (1): i2c: ocores: set IACK bit after core is enabled Hamza Mahfooz (1): drm/amd/display: prevent register access while in IPS Hans de Goede (2): ACPI: scan: Ignore camera graph port nodes on all Dell Tiger, Alder and Raptor Lake models ACPI: mipi-disco-img: Switch to new Intel CPU model defines Harish Kasiviswanathan (1): drm/amdgpu: Indicate CU havest info to CP Haylen Chu (1): riscv: dts: sophgo: disable write-protection for milkv duo Heng Qi (2): virtio_net: checksum offloading handling fix virtio_net: fixing XDP for fully checksummed packets handling Honggang LI (2): RDMA/rxe: Fix data copy for IB_SEND_INLINE RDMA/rxe: Fix responder length checking for UD request packets Hugh Dickins (1): mm/migrate: fix kernel BUG at mm/compaction.c:2761! Hui Li (3): LoongArch: Fix watchpoint setting error LoongArch: Trigger user-space watchpoints correctly LoongArch: Fix multiple hardware watchpoint issues Ignat Korchagin (1): net: do not leave a dangling sk pointer, when socket creation fails Ilpo J=C3=A4rvinen (1): MIPS: Routerboard 532: Fix vendor retry check code Jakub Kicinski (2): netdev-genl: fix error codes when outputting XDP features ipv6: bring NLM_DONE out to a separate recv() again Jani Nikula (1): drm/i915/mso: using joiner is not possible with eDP MSO Jason Gunthorpe (3): RDMA/mlx5: Remove extra unlock on error path RDMA/mlx5: Follow rb_key.ats when creating new mkeys RDMA/mlx5: Ensure created mkeys always have a populated rb_key Jean-Philippe Brucker (1): mm/util: Swap kmemdup_array() arguments Jeff Johnson (1): sound/oss/dmasound: add missing MODULE_DESCRIPTION() macro Jeff Layton (1): nfsd: fix oops when reading pool_stats before server is started Jeff Xu (1): mm/memfd: add documentation for MFD_NOEXEC_SEAL MFD_EXEC Jianguo Wu (4): seg6: fix parameter passing when calling NF_HOOK() in End.DX4 and End.DX6 behaviors netfilter: move the sysctl nf_hooks_lwtunnel into the netfilter core selftests: add selftest for the SRv6 End.DX4 behavior with netfilter selftests: add selftest for the SRv6 End.DX6 behavior with netfilter Jiaxun Yang (1): MIPS: mipsmtregs: Fix target register for MFTC0 Jiri Pirko (1): selftests: virtio_net: add forgotten config options Joao Paulo Goncalves (1): arm64: dts: freescale: imx8mm-verdin: Fix GPU speed Joel Slebodnick (1): scsi: ufs: core: Free memory allocated for model before reinit Johannes Berg (2): wifi: cfg80211: wext: set ssids=3DNULL for passive scans wifi: mac80211: fix monitor channel with chanctx emulation Johannes Thumshirn (1): btrfs: zoned: allocate dummy checksums for zoned NODATASUM writes John Hubbard (2): selftests/openat2: fix clang build failures: -static-libasan, LOCAL_H= DRS selftests/fchmodat2: fix clang build failure due to -static-libasan Jose Ignacio Tornos Martinez (1): net: usb: ax88179_178a: improve reset check Joseph Qi (2): ocfs2: fix NULL pointer dereference in ocfs2_journal_dirty() ocfs2: fix NULL pointer dereference in ocfs2_abort_trigger() Jozsef Kadlecsik (1): netfilter: ipset: Fix suspicious rcu_dereference_protected() Julien Panis (2): thermal/drivers/mediatek/lvts_thermal: Remove filtered mode for mt818= 8 thermal/drivers/mediatek/lvts_thermal: Return error in case of invalid efuse data Kailang Yang (1): ALSA: hda/realtek: Add more codec ID to no shutup pins list Kalle Niemi (1): regulator: bd71815: fix ramp values Kees Cook (2): kunit/overflow: Adjust for __counted_by with DEFINE_RAW_FLEX() MAINTAINERS: Update entries for Kees Cook Kefeng Wang (1): mm: fix possible OOB in numa_rebuild_large_mapping() Kent Overstreet (20): bcachefs: Fix initialization order for srcu barrier bcachefs: Fix array-index-out-of-bounds bcachefs: Fix a locking bug in the do_discard_fast() path bcachefs: Fix shift overflow in read_one_super() bcachefs: Fix btree ID bitmasks bcachefs: Check for invalid btree IDs bcachefs: Fix early init error path in journal code bcachefs: delete_dead_snapshots() doesn't need to go RW bcachefs: Guard against overflowing LRU_TIME_BITS bcachefs: Handle cached data LRU wraparound bcachefs: Fix bch2_sb_downgrade_update() bcachefs: set_worker_desc() for delete_dead_snapshots bcachefs: Fix bch2_trans_put() bcachefs: Fix safe errors by default closures: Change BUG_ON() to WARN_ON() bcachefs: Fix missing alloc_data_type_set() bcachefs: Replace bare EEXIST with private error codes bcachefs: Fix I_NEW warning in race path in bch2_inode_insert() bcachefs: Use bch2_print_string_as_lines for long err bcachefs: Fix a UAF after write_super() Kenton Groombridge (1): wifi: mac80211: Avoid address calculations via out of bounds array indexing Konstantin Taranov (1): RDMA/mana_ib: Ignore optional access flags for MRs Krzysztof Kozlowski (3): dt-bindings: dma: fsl-edma: fix dma-channels constraints dt-bindings: i2c: atmel,at91sam: correct path to i2c-controller schem= a dt-bindings: i2c: google,cros-ec-i2c-tunnel: correct path to i2c-controller schema Li RongQing (1): dmaengine: idxd: Fix possible Use-After-Free in irq_process_work_list Likun Gao (1): drm/amdgpu: init TA fw for psp v14 Linus Torvalds (3): Revert "mm: mmap: allow for the maximum number of bits for randomizing mmap_base by default" cpumask: limit FORCE_NR_CPUS to just the UP case Linux 6.10-rc5 Liu Ying (1): arm: dts: imx53-qsb-hdmi: Disable panel instead of deleting node Lorenzo Bianconi (1): NFSD: grab nfsd_mutex in nfsd_nl_rpc_status_get_dumpit() Lorenzo Stoakes (1): MAINTAINERS: remove Lorenzo as vmalloc reviewer Louis Chauvet (1): dmaengine: xilinx: xdma: Fix data synchronisation in xdma_channel_isr= () Maciej =C5=BBenczykowski (1): bpf: fix UML x86_64 compile failure Marc Kleine-Budde (1): spi: spi-imx: imx51: revert burst length calculation back to bits_per= _word Marc Zyngier (1): KVM: arm64: Disassociate vcpus from redistributor region on teardown Marcin Szycik (1): ice: Fix VSI list rule with ICE_SW_LKUP_LAST type Marek Vasut (1): arm64: dts: imx8mp: Fix TC9595 input clock on DH i.MX8M Plus DHCOM So= M Mark Brown (1): selftests: mm: make map_fixed_noreplace test names stable Martin Schiller (1): MIPS: pci: lantiq: restore reset gpio polarity Masami Hiramatsu (Google) (1): tracing: Build event generation tests only as modules Matthieu Baerts (NGI0) (1): selftests: mptcp: userspace_pm: fixed subtest names Max Krummenacher (1): arm64: dts: freescale: imx8mm-verdin: enable hysteresis on slow input= pin Michael Chan (2): bnxt_en: Update firmware interface to 1.10.3.44 bnxt_en: Set TSO max segs on devices with limits Michael Ellerman (1): KVM: PPC: Book3S HV: Prevent UAF in kvm_spapr_tce_attach_iommu_group(= ) Michael Kelley (4): hv_balloon: Use kernel macros to simplify open coded sequences hv_balloon: Enable hot-add for memblock sizes > 128 MiB Documentation: hyperv: Update spelling and fix typo Documentation: hyperv: Improve synic and interrupt handling descripti= on Michael Roth (1): KVM: SEV-ES: Fix svm_get_msr()/svm_set_msr() for KVM_SEV_ES_INIT gues= ts Michael Strauss (1): drm/amd/display: Attempt to avoid empty TUs when endpoint is DPIA Michal Wajdeczko (1): drm/xe/vf: Don't touch GuC irq registers if using memory irqs Miguel Ojeda (1): rust: avoid unused import warning in `rusttest` Mike Rapoport (IBM) (1): memblock: use numa_valid_node() helper to check for invalid node ID Miklos Szeredi (2): ovl: fix copy-up in tmpfile ovl: fix encoding fid for lower only root Nathan Chancellor (1): drm/amd/display: Disable CONFIG_DRM_AMD_DC_FP for RISC-V with clang Nathan Lynch (1): powerpc/crypto: Add generated P8 asm to .gitignore Nikita Shubin (4): dmaengine: ioatdma: Fix leaking on version mismatch dmaengine: ioatdma: Fix error path in ioat3_dma_probe() dmaengine: ioatdma: Fix kmemleak in ioat_pci_probe() dmaengine: ioatdma: Fix missing kmem_cache_destroy() Niklas Cassel (1): ata: ahci: Do not enable LPM if no LPM states are supported by the HB= A Oleg Nesterov (1): zap_pid_ns_processes: clear TIF_NOTIFY_SIGNAL along with TIF_SIGPENDI= NG Oleksij Rempel (3): net: phy: dp83tg720: wake up PHYs in managed mode net: phy: dp83tg720: get master/slave configuration in link down stat= e net: stmmac: Assign configured channel value to EXTTS event Oliver Neukum (1): net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings Ondrej Mosnacek (2): cipso: fix total option length computation cipso: make cipso_v4_skbuff_delattr() fully remove the CIPSO options Pablo Ca=C3=B1o (1): ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14AHP9 Paolo Bonzini (1): virt: guest_memfd: fix reference leak on hwpoisoned page Patrice Chotard (3): spi: stm32: qspi: Fix dual flash mode sanity test in stm32_qspi_setup= () spi: stm32: qspi: Clamp stm32_qspi_get_mode() output to CCR_BUSWIDTH_= 4 spi: Fix OCTAL mode support Patrisious Haddad (1): RDMA/mlx5: Add check for srq max_sge attribute Paul Greenwalt (1): ice: fix 200G link speed message log Paul Hsieh (1): drm/amd/display: change dram_clock_latency to 34us for dcn35 Pavan Chebbi (1): bnxt_en: Restore PTP tx_avail count in case of skb_pad() error Peter Oberparleiter (1): gcov: add support for GCC 14 Peter Ujfalusi (1): ALSA/hda: intel-dsp-config: Document AVS as dsp_driver option Peter Xu (2): mm/page_table_check: fix crash on ZONE_DEVICE mm/debug_vm_pgtable: drop RANDOM_ORVALUE trick Pierre-Louis Bossart (1): soundwire: fix usages of device_get_named_child_node() Rafael Aquini (1): mm: mmap: allow for the maximum number of bits for randomizing mmap_base by default Rafael J. Wysocki (2): thermal: core: Synchronize suspend-prepare and post-suspend actions thermal: core: Change PM notifier priority to the minimum Raju Lakkaraju (3): net: lan743x: disable WOL upon resume to restore full data path opera= tion net: lan743x: Support WOL at both the PHY and MAC appropriately net: phy: mxl-gpy: Remove interrupt mask clearing from config_init Raju Rangoju (1): ACPICA: Revert "ACPICA: avoid Info: mapping multiple BARs. Your kernel is fine." Ran Xiaokai (1): mm: huge_memory: fix misused mapping_large_folio_support() for anon f= olios Remi Pommarel (1): wifi: mac80211: Recalc offload when monitor stop Roman Li (1): drm/amd/display: Remove redundant idle optimization check Sakari Ailus (1): i2c: Add nop fwnode operations Saurabh Sengar (1): tools: hv: suppress the invalid warning for packed member alignment Sean Christopherson (2): KVM: x86: Always sync PIR to IRR prior to scanning I/O APIC routes MAINTAINERS: Drop Wanpeng Li as a Reviewer for KVM Paravirt support Selvin Xavier (1): RDMA/bnxt_re: Fix the max msix vectors macro Shaul Triebitz (2): wifi: iwlwifi: mvm: unlock mvm mutex wifi: iwlwifi: mvm: fix ROC version check Siddharth Vadapalli (1): dmaengine: ti: k3-udma-glue: Fix of_k3_udma_glue_parse_chn_by_id() Simon Horman (2): selftests: openvswitch: Use bash as interpreter octeontx2-pf: Add error handling to VLAN unoffload handling Simon Trimmer (6): ALSA: hda: cs35l56: Fix lifecycle of codec pointer ALSA: hda: cs35l41: Possible null pointer dereference in cs35l41_hda_unbind() ALSA: hda: cs35l56: Component should be unbound before deconstruction ALSA: hda: cs35l41: Component should be unbound before deconstruction ALSA: hda: tas2781: Component should be unbound before deconstruction ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE Srinivas Pandruvada (1): thermal: int340x: processor_thermal: Support shared interrupts Stanislav Fomichev (1): MAINTAINERS: mailmap: Update Stanislav's email address Stefan Binding (4): ALSA: hda: cs35l41: Support Lenovo Thinkbook 16P Gen 5 ALSA: hda: cs35l41: Support Lenovo Thinkbook 13x Gen 4 ALSA: hda/realtek: Support Lenovo Thinkbook 16P Gen 5 ALSA: hda/realtek: Support Lenovo Thinkbook 13x Gen 4 Stefan Wahren (1): qca_spi: Make interrupt remembering atomic Steve French (1): cifs: fix typo in module parameter enable_gcm_256 Sudeep Holla (1): firmware: psci: Fix return value from psci_system_suspend() Suren Baghdasaryan (2): lib/alloc_tag: do not register sysctl interface when CONFIG_SYSCTL=3D= n lib/alloc_tag: fix RCU imbalance in pgalloc_tag_get() Takashi Iwai (2): ALSA: seq: ump: Fix missing System Reset message handling ALSA: hda: Use imply for suggesting CONFIG_SERIAL_MULTI_INSTANTIATE Tao Su (1): KVM: selftests: x86: Prioritize getting max_gfn from GuestPhysBits Thomas Bogendoerfer (1): Revert "MIPS: pci: lantiq: restore reset gpio polarity" Thomas Richard (1): regulator: tps6594-regulator: Fix the number of irqs for TPS65224 and TPS6594 Tim Harvey (1): arm64: dts: freescale: imx8mp-venice-gw73xx-2x: fix BT shutdown GPIO Tony Ambardar (2): compiler_types.h: Define __retain for __attribute__((__retain__)) bpf: Harden __bpf_kfunc tag against linker kfunc removal Uwe Kleine-K=C3=B6nig (3): pwm: stm32: Refuse too small period requests pwm: stm32: Fix calculation of prescaler pwm: stm32: Fix error message to not describe the previous error path Vincent Donnefort (1): KVM: arm64: FFA: Release hyp rx buffer Waiman Long (1): efi/arm64: Fix kmemleak false positive in arm64_efi_rt_init() Wojciech Drewek (1): ice: implement AQ download pkg retry Wolfram Sang (6): docs: i2c: summary: start sentences consistently. docs: i2c: summary: update I2C specification link docs: i2c: summary: update speed mode description docs: i2c: summary: document use of inclusive language docs: i2c: summary: document 'local' and 'remote' targets docs: i2c: summary: be clearer with 'controller/target' and 'adapter/client' pairs Xi Ruoyao (1): LoongArch: Only allow OBJTOOL & ORC unwinder if toolchain supports -mthin-add-sub Xiaolei Wang (1): net: stmmac: No need to calculate speed divider when offload is disab= led Xin Long (2): tipc: force a dst refcount before doing decryption sched: act_ct: add netns into the key of tcf_ct_flow_table Yang Li (1): LoongArch: KVM: Remove an unneeded semicolon Yishai Hadas (1): RDMA/mlx5: Fix unwind flow as part of mlx5_ib_stage_init_init Youling Tang (2): bcachefs: fix alignment of VMA for memory mapped files on THP bcachefs: Move the ei_flags setting to after initialization Yue Haibing (1): netns: Make get_net_ns() handle zero refcount net Yunxiang Li (1): drm/amdgpu: fix locking scope when flushing tlb Yury Norov (1): gcc: disable '-Warray-bounds' for gcc-9 . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Sun, 23 Jun 2024 14:42:19 -0700 Message-ID: <000000000000f75434061b9589eb@google.com> Subject: [syzbot] [btrfs?] WARNING in btrfs_free_reserved_data_space_noquota (2) From: syzbot To: clm@fb.com, dsterba@suse.com, josef@toxicpanda.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256221 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-btrfs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, syzbot found the following issue on: HEAD commit: 2ccbdf43d5e7 Merge tag 'for-linus' of git://git.kernel.org.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=112f8c1e980000 kernel config: https://syzkaller.appspot.com/x/.config?x=81c0d76ceef02b39 dashboard link: https://syzkaller.appspot.com/bug?extid=9b4407a256ad8ed1d5c8 compiler: gcc (Debian 12.2.0-14) 12.2.0, GNU ld (GNU Binutils for Debian) 2.40 userspace arch: i386 Unfortunately, I don't have any reproducer for this issue yet. Downloadable assets: disk image (non-bootable): https://storage.googleapis.com/syzbot-assets/7bc7510fe41f/non_bootable_disk-2ccbdf43.raw.xz vmlinux: https://storage.googleapis.com/syzbot-assets/13cdb5bfbafa/vmlinux-2ccbdf43.xz kernel image: https://storage.googleapis.com/syzbot-assets/7a14f5d07f81/bzImage-2ccbdf43.xz IMPORTANT: if you fix the issue, please add the following tag to the commit: Reported-by: syzbot+9b4407a256ad8ed1d5c8@syzkaller.appspotmail.com R10: 0000000000000000 R11: 0000000000000293 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 ------------[ cut here ]------------ WARNING: CPU: 2 PID: 7088 at fs/btrfs/space-info.h:208 btrfs_space_info_update_bytes_may_use fs/btrfs/space-info.h:208 [inline] WARNING: CPU: 2 PID: 7088 at fs/btrfs/space-info.h:208 btrfs_space_info_free_bytes_may_use fs/btrfs/space-info.h:240 [inline] WARNING: CPU: 2 PID: 7088 at fs/btrfs/space-info.h:208 btrfs_free_reserved_data_space_noquota+0x3de/0x550 fs/btrfs/delalloc-space.c:179 Modules linked in: CPU: 2 PID: 7088 Comm: syz-executor.2 Not tainted 6.10.0-rc3-syzkaller-00044-g2ccbdf43d5e7 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 RIP: 0010:btrfs_space_info_update_bytes_may_use fs/btrfs/space-info.h:208 [inline] RIP: 0010:btrfs_space_info_free_bytes_may_use fs/btrfs/space-info.h:240 [inline] RIP: 0010:btrfs_free_reserved_data_space_noquota+0x3de/0x550 fs/btrfs/delalloc-space.c:179 Code: ea 03 80 3c 02 00 0f 85 64 01 00 00 4c 8b 73 60 48 89 ef 4c 89 f6 e8 71 68 df fd 49 39 ee 0f 83 65 fe ff ff e8 f3 6d df fd 90 <0f> 0b 90 e9 62 fe ff ff e8 e5 6d df fd 48 8d 7b 18 be ff ff ff ff RSP: 0018:ffffc900042af5c8 EFLAGS: 00010293 RAX: 0000000000000000 RBX: ffff88801e0fb800 RCX: ffffffff83af21cf RDX: ffff88801d02c880 RSI: ffffffff83af21dd RDI: 0000000000000006 RBP: 0000000000800000 R08: 0000000000000006 R09: 0000000000800000 R10: 00000000005cd000 R11: 0000000000000003 R12: ffff888011fb8000 R13: 0000000000000000 R14: 00000000005cd000 R15: ffffffffff800000 FS: 0000000000000000(0000) GS:ffff88802c200000(0063) knlGS:00000000f5ed1b40 CS: 0010 DS: 002b ES: 002b CR0: 0000000080050033 CR2: 000000c0018a2000 CR3: 0000000000822000 CR4: 0000000000350ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: btrfs_free_reserved_data_space+0xc1/0x100 fs/btrfs/delalloc-space.c:199 btrfs_dio_iomap_begin+0xbbc/0x1e40 fs/btrfs/inode.c:7752 iomap_iter+0x61f/0x1080 fs/iomap/iter.c:91 __iomap_dio_rw+0x6ba/0x1c70 fs/iomap/direct-io.c:659 btrfs_dio_write+0xb1/0xf0 fs/btrfs/inode.c:7890 btrfs_direct_write fs/btrfs/file.c:1554 [inline] btrfs_do_write_iter+0x901/0x10c0 fs/btrfs/file.c:1695 new_sync_write fs/read_write.c:497 [inline] vfs_write+0x6b6/0x1140 fs/read_write.c:590 ksys_write+0x12f/0x260 fs/read_write.c:643 do_syscall_32_irqs_on arch/x86/entry/common.c:165 [inline] __do_fast_syscall_32+0x73/0x120 arch/x86/entry/common.c:386 do_fast_syscall_32+0x32/0x80 arch/x86/entry/common.c:411 entry_SYSENTER_compat_after_hwframe+0x84/0x8e RIP: 0023:0xf72df579 Code: b8 01 10 06 03 74 b4 01 10 07 03 74 b0 01 10 08 03 74 d8 01 00 00 00 00 00 00 00 00 00 00 00 00 00 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d b4 26 00 00 00 00 8d b4 26 00 00 00 00 RSP: 002b:00000000f5ed15ac EFLAGS: 00000292 ORIG_RAX: 0000000000000004 RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 0000000000000000 RDX: 0000000000800000 RSI: 0000000000000000 RDI: 0000000000000000 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000293 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 ---------------- Code disassembly (best guess), 2 bytes skipped: 0: 10 06 adc %al,(%rsi) 2: 03 74 b4 01 add 0x1(%rsp,%rsi,4),%esi 6: 10 07 adc %al,(%rdi) 8: 03 74 b0 01 add 0x1(%rax,%rsi,4),%esi c: 10 08 adc %cl,(%rax) e: 03 74 d8 01 add 0x1(%rax,%rbx,8),%esi 1e: 00 51 52 add %dl,0x52(%rcx) 21: 55 push %rbp 22: 89 e5 mov %esp,%ebp 24: 0f 34 sysenter 26: cd 80 int $0x80 * 28: 5d pop %rbp <-- trapping instruction 29: 5a pop %rdx 2a: 59 pop %rcx 2b: c3 ret 2c: 90 nop 2d: 90 nop 2e: 90 nop 2f: 90 nop 30: 8d b4 26 00 00 00 00 lea 0x0(%rsi,%riz,1),%esi 37: 8d b4 26 00 00 00 00 lea 0x0(%rsi,%riz,1),%esi --- This report is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller@googlegroups.com. syzbot will keep track of this issue. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. If the report is already addressed, let syzbot know by replying with: #syz fix: exact-commit-title If you want to overwrite report's subsystems, reply with: #syz set subsystems: new-subsystem (See the list of subsystem names on the web dashboard) If the report is a duplicate of another one, reply with: #syz dup: exact-subject-of-another-report If you want to undo deduplication, reply with: #syz undup . X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 23 Jun 2024 22:02:02 +0200 X-ME-IP: 86.243.222.230 From: Christophe JAILLET To: Chandrasekar Ramakrishnan , Marc Kleine-Budde , Vincent Mailhol , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next] can: m_can: Constify struct m_can_ops Date: Sun, 23 Jun 2024 22:01:50 +0200 Message-ID: X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.netdev:354825 org.kernel.vger.linux-kernel:1256225 Newsgroups: org.kernel.vger.netdev,org.kernel.vger.kernel-janitors,org.kernel.vger.linux-can,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 'struct m_can_ops' is not modified in these drivers. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig, as an example: Before: ====== text data bss dec hex filename 4806 520 0 5326 14ce drivers/net/can/m_can/m_can_pci.o After: ===== text data bss dec hex filename 4862 464 0 5326 14ce drivers/net/can/m_can/m_can_pci.o Signed-off-by: Christophe JAILLET --- Compile tested-only --- drivers/net/can/m_can/m_can.h | 2 +- drivers/net/can/m_can/m_can_pci.c | 2 +- drivers/net/can/m_can/m_can_platform.c | 2 +- drivers/net/can/m_can/tcan4x5x-core.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h index 3a9edc292593..92b2bd8628e6 100644 --- a/drivers/net/can/m_can/m_can.h +++ b/drivers/net/can/m_can/m_can.h @@ -91,7 +91,7 @@ struct m_can_classdev { ktime_t irq_timer_wait; - struct m_can_ops *ops; + const struct m_can_ops *ops; int version; u32 irqstatus; diff --git a/drivers/net/can/m_can/m_can_pci.c b/drivers/net/can/m_can/m_can_pci.c index 45400de4163d..d72fe771dfc7 100644 --- a/drivers/net/can/m_can/m_can_pci.c +++ b/drivers/net/can/m_can/m_can_pci.c @@ -77,7 +77,7 @@ static int iomap_write_fifo(struct m_can_classdev *cdev, int offset, return 0; } -static struct m_can_ops m_can_pci_ops = { +static const struct m_can_ops m_can_pci_ops = { .read_reg = iomap_read_reg, .write_reg = iomap_write_reg, .write_fifo = iomap_write_fifo, diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c index df0367124b4c..983ab80260dd 100644 --- a/drivers/net/can/m_can/m_can_platform.c +++ b/drivers/net/can/m_can/m_can_platform.c @@ -68,7 +68,7 @@ static int iomap_write_fifo(struct m_can_classdev *cdev, int offset, return 0; } -static struct m_can_ops m_can_plat_ops = { +static const struct m_can_ops m_can_plat_ops = { .read_reg = iomap_read_reg, .write_reg = iomap_write_reg, .write_fifo = iomap_write_fifo, diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c index a42600dac70d..f15619d31065 100644 --- a/drivers/net/can/m_can/tcan4x5x-core.c +++ b/drivers/net/can/m_can/tcan4x5x-core.c @@ -357,7 +357,7 @@ static int tcan4x5x_get_gpios(struct m_can_classdev *cdev, return 0; } -static struct m_can_ops tcan4x5x_ops = { +static const struct m_can_ops tcan4x5x_ops = { .init = tcan4x5x_init, .read_reg = tcan4x5x_read_reg, .write_reg = tcan4x5x_write_reg, -- 2.45.2 . From: Thorsten Blum To: elver@google.com, dvyukov@google.com Cc: kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, Thorsten Blum Subject: [PATCH] kcsan: Use min() to fix Coccinelle warning Date: Mon, 24 Jun 2024 00:06:07 +0200 Message-ID: <20240623220606.134718-2-thorsten.blum@toblux.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256228 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Fixes the following Coccinelle/coccicheck warning reported by minmax.cocci: WARNING opportunity for min() Use size_t instead of int for the result of min(). Signed-off-by: Thorsten Blum --- kernel/kcsan/debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kcsan/debugfs.c b/kernel/kcsan/debugfs.c index 1d1d1b0e4248..11b891fe6f7a 100644 --- a/kernel/kcsan/debugfs.c +++ b/kernel/kcsan/debugfs.c @@ -225,7 +225,7 @@ debugfs_write(struct file *file, const char __user *buf, size_t count, loff_t *o { char kbuf[KSYM_NAME_LEN]; char *arg; - int read_len = count < (sizeof(kbuf) - 1) ? count : (sizeof(kbuf) - 1); + size_t read_len = min(count, (sizeof(kbuf) - 1)); if (copy_from_user(kbuf, buf, read_len)) return -EFAULT; -- 2.45.2 . From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Subject: [PATCH 0/7] firewire: core: add tracepoints events for isochronous context Date: Mon, 24 Jun 2024 07:08:51 +0900 Message-ID: <20240623220859.851685-1-o-takashi@sakamocchi.jp> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256229 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi, It is helpful to trace any operation for isochronous context for debugging purposes. This series of changes is the last part to add tracepoints events into core function. Takashi Sakamoto (7): firewire: core: add tracepoints events for allocation/deallocation of isochronous context firewire: core: add tracepoints events for setting channels of multichannel context firewire: core: add tracepoints events for starting/stopping of isochronous context firewire: core: add tracepoints events for flushing of isochronous context firewire: core: add tracepoints events for flushing completions of isochronous context firewire: core: add tracepoints events for queueing packets of isochronous context firewire: core: add tracepoints events for completions of packets in isochronous context drivers/firewire/core-iso.c | 32 +++ drivers/firewire/core-trace.c | 4 + drivers/firewire/ohci.c | 25 +- include/trace/events/firewire.h | 463 ++++++++++++++++++++++++++++++++ 4 files changed, 518 insertions(+), 6 deletions(-) -- 2.43.0 . From: =?utf-8?q?Barnab=C3=A1s_Cz=C3=A9m=C3=A1n?= Date: Mon, 24 Jun 2024 00:26:01 +0200 Subject: [PATCH] drm/msm/mdp5: Remove MDP_CAP_SRC_SPLIT from msm8x53_config X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20240624-msm8953-mdp-fix-v1-1-be4d3262ebe3@gmail.com> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Sireesh Kodali , Vladimir Lypak Cc: Rob Clark , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, phone-devel@vger.kernel.org, =?utf-8?q?Barnab=C3=A1s_Cz=C3=A9m=C3=A1n?= Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256245 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-arm-msm,org.kernel.vger.phone-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Remove MDP_CAP_SRC_SPLIT from msm8x53_config because it is not referenced in downstream. Fixes: fb25d4474fa0 ("drm/msm/mdp5: Add configuration for MDP v1.16") Signed-off-by: Barnabás Czémán --- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c index c5179e4c393c..92d06b7faa0a 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c @@ -837,8 +837,7 @@ static const struct mdp5_cfg_hw msm8x53_config = { .name = "msm8x53", .mdp = { .count = 1, - .caps = MDP_CAP_CDM | - MDP_CAP_SRC_SPLIT, + .caps = MDP_CAP_CDM, }, .ctl = { .count = 3, --- base-commit: f76698bd9a8ca01d3581236082d786e9a6b72bb7 change-id: 20240624-msm8953-mdp-fix-8af4ec159082 Best regards, -- Barnabás Czémán . Date: Sun, 23 Jun 2024 16:05:38 -0700 From: Dmitry Torokhov To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: [git pull] Input updates for v6.10-rc5 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256247 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-input Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git tags/input-for-v6.10-rc5 to receive updates for the input subsystem. You will get: - fixes for ili210x and elantech drivers - new products IDs added to xpad controller driver - a tweak to i8042 driver to always keep keyboard in Ayaneo Kun handheld in raw mode - populated "id_table" in ads7846 touchscreen driver to make sure non-OF instantiated devices can properly determine the model data. Changelog: --------- Alexander Stein (1): Input: ads7846 - use spi_device_id table John Keeping (1): Input: ili210x - fix ili251x_read_touch_data() return value Jonathan Denose (1): Input: elantech - fix touchpad state on resume for Lenovo N24 Luke D. Jones (1): Input: xpad - add support for ASUS ROG RAIKIRI PRO Tobias Jakobi (1): Input: i8042 - add Ayaneo Kun to i8042 quirk table Diffstat: -------- drivers/input/joystick/xpad.c | 1 + drivers/input/mouse/elantech.c | 31 +++++++++++++++++++++++++++++++ drivers/input/serio/i8042-acpipnpio.h | 18 ++++++++++++++++-- drivers/input/touchscreen/ads7846.c | 12 +++++++++++- drivers/input/touchscreen/ili210x.c | 4 ++-- 5 files changed, 61 insertions(+), 5 deletions(-) Thanks. -- Dmitry . From: George Chan via B4 Relay Subject: [PATCH v2 0/8] Add sc7180 camss subsys support Date: Mon, 24 Jun 2024 07:22:39 +0800 Message-Id: <20240624-b4-sc7180-camss-v2-0-0dfecdc50073@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: Robert Foss , Todor Tomov , Bryan O'Donoghue , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , cros-qcom-dts-watchers@chromium.org, Bjorn Andersson , Konrad Dybcio Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, George Chan X-Original-From: George Chan Reply-To: gchan9527@gmail.com Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256253 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.feeds.b4-sent,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail SM7125 is the SoC found in the Xiaomi Redmi Note 9 Pro(joyeuse) cellphone. This series adds support to bring up the CSIPHY, CSID, VFE/RDI interfaces. Since SM7125 is a low-speed variant of SC7180, SC7180 testers please take a look and have a test as well. sc7180 provides - 2 x VFE - 1 x VFE Lite - 2 x CSID - 1 x CSID Lite - 4 x CSI PHY The sc7180-camss binding should be comaptible with sdm845 yaml. I've copied a new yaml from sdm845-camss.yaml, strip all _src clk and put new maintainer information. If this is not desirable then i can add binding to existing sdm845 yaml instead. In addition, a bootable tree of sm7125/joyeuse is availble at: https://github.com/99degree/linux/tree/camss Signed-off-by: George Chan --- Changes in v2: - Revised dt-binding as stated by krzk - Added dt-binding item power-domain-name as stated by Bryan - Combine patch #2 and #3 as stated by krzk and Bryan - Split eror-print log for clk name from patch #5 as suggested by Konrad - Reformat dt-node of camss as stated by krzk - Corrected phy init sequence for v1.2.2 as spot by Bryan - Added 3 more debug info for missing clk and low clk-rate issue. - Adding port info to ports sub-node - Adding required-opps node to dt - Link to v1: https://lore.kernel.org/r/20240621-b4-sc7180-camss-v1-0-14937929f30e@gmail.com --- George Chan (8): Add qcom,sc7180-camss Add Gen2 v1.2.2 two-phase MIPI CSI-2 DPHY init Add sc7180 support Add sc7180 resources Add debug log info to camss_enable_clocks function Add debug log info to msm_csid_subdev_init function Add debug log info to vfe block init and set clock rate [RFT]Add support for sc7180 camss subsys .../bindings/media/qcom,sc7180-camss.yaml | 327 +++++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 135 +++++++++ drivers/media/platform/qcom/camss/camss-csid.c | 4 +- .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 135 +++++++++ drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + drivers/media/platform/qcom/camss/camss-vfe.c | 10 +- drivers/media/platform/qcom/camss/camss-video.c | 1 + drivers/media/platform/qcom/camss/camss.c | 218 +++++++++++++- drivers/media/platform/qcom/camss/camss.h | 1 + 9 files changed, 828 insertions(+), 4 deletions(-) --- base-commit: 2102cb0d050d34d50b9642a3a50861787527e922 change-id: 20240621-b4-sc7180-camss-cddc6b60a9b4 Best regards, -- George Chan . Return-Path: From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Ard Biesheuvel , Charlie Jenkins Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org Subject: [PATCH v2] riscv: enable HAVE_ARCH_STACKLEAK Date: Mon, 24 Jun 2024 07:53:16 +0800 Message-ID: <20240623235316.2010-1-jszhang@kernel.org> MIME-Version: 1.0 X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:78903 org.kernel.vger.linux-kernel:1256264 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-efi,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add support for the stackleak feature. Whenever the kernel returns to user space the kernel stack is filled with a poison value. At the same time, disables the plugin in EFI stub code because EFI stub is out of scope for the protection. Tested on qemu and milkv duo: / # echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT [ 38.675575] lkdtm: Performing direct entry STACKLEAK_ERASING [ 38.678448] lkdtm: stackleak stack usage: [ 38.678448] high offset: 288 bytes [ 38.678448] current: 496 bytes [ 38.678448] lowest: 1328 bytes [ 38.678448] tracked: 1328 bytes [ 38.678448] untracked: 448 bytes [ 38.678448] poisoned: 14312 bytes [ 38.678448] low offset: 8 bytes [ 38.689887] lkdtm: OK: the rest of the thread stack is properly erased Signed-off-by: Jisheng Zhang --- since v2: - add #include to fixing compiler error found by Charlie arch/riscv/Kconfig | 1 + arch/riscv/include/asm/thread_info.h | 1 + arch/riscv/kernel/entry.S | 4 ++++ drivers/firmware/efi/libstub/Makefile | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 0525ee2d63c7..9cbfdffec96c 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -118,6 +118,7 @@ config RISCV select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET select HAVE_ARCH_SECCOMP_FILTER + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h index 5d473343634b..fca5c6be2b81 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -10,6 +10,7 @@ #include #include +#include /* thread information allocation */ #define THREAD_SIZE_ORDER CONFIG_THREAD_SIZE_ORDER diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 68a24cf9481a..80ff55a26d13 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -130,6 +130,10 @@ SYM_CODE_START_NOALIGN(ret_from_exception) #endif bnez s0, 1f +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + call stackleak_erase_on_task_stack +#endif + /* Save unwound kernel stack pointer in thread_info */ addi s0, sp, PT_SIZE_ON_STACK REG_S s0, TASK_TI_KERNEL_SP(tp) diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 06f0428a723c..3a9521c57641 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -28,7 +28,8 @@ cflags-$(CONFIG_ARM) += -DEFI_HAVE_STRLEN -DEFI_HAVE_STRNLEN \ -DEFI_HAVE_MEMCHR -DEFI_HAVE_STRRCHR \ -DEFI_HAVE_STRCMP -fno-builtin -fpic \ $(call cc-option,-mno-single-pic-base) -cflags-$(CONFIG_RISCV) += -fpic -DNO_ALTERNATIVE -mno-relax +cflags-$(CONFIG_RISCV) += -fpic -DNO_ALTERNATIVE -mno-relax \ + $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_LOONGARCH) += -fpie cflags-$(CONFIG_EFI_PARAMS_FROM_FDT) += -I$(srctree)/scripts/dtc/libfdt -- 2.43.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: "Luke D. Jones" To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jikos@kernel.org, bentiss@kernel.org, "Luke D. Jones" Subject: [PATCH] Fixes: bda38f9a41 ("HID: asus: use hid for brightness control on keyboard") Date: Mon, 24 Jun 2024 12:14:50 +1200 Message-ID: <20240624001450.969059-1-luke@ljones.dev> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256269 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-input Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail - Fix missing braces around initializer - Remove unused function declaration from asus-wmi.h Signed-off-by: Luke D. Jones --- include/linux/platform_data/x86/asus-wmi.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/include/linux/platform_data/x86/asus-wmi.h b/include/linux/platform_data/x86/asus-wmi.h index 96c780efa0d7..74b32e1d6735 100644 --- a/include/linux/platform_data/x86/asus-wmi.h +++ b/include/linux/platform_data/x86/asus-wmi.h @@ -162,15 +162,6 @@ static inline int asus_wmi_evaluate_method(u32 method_id, u32 arg0, u32 arg1, #endif /* To be used by both hid-asus and asus-wmi to determine which controls kbd_brightness */ -#if IS_ENABLED(CONFIG_ASUS_WMI) -bool asus_use_hid_led(void); -#else -static inline bool asus_use_hid_led(void) -{ - return true; -} -#endif - static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = { { .matches = { @@ -202,7 +193,7 @@ static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = { DMI_MATCH(DMI_BOARD_NAME, "RC71L"), }, }, - NULL, + { }, }; #endif /* __PLATFORM_DATA_X86_ASUS_WMI_H */ -- 2.45.2 . From: Chris Packham To: tglx@linutronix.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, tsbogend@alpha.franken.de, daniel.lezcano@linaro.org, paulburton@kernel.org, peterz@infradead.org, mail@birger-koblitz.de, bert@biot.com, john@phrozen.org, sander@svanheule.net Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org, kabel@kernel.org, ericwouds@gmail.com, Chris Packham Subject: [PATCH v2 0/8] mips: Support for RTL9302C Date: Mon, 24 Jun 2024 13:22:52 +1200 Message-ID: <20240624012300.1713290-1-chris.packham@alliedtelesis.co.nz> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.4 cv=CvQccW4D c=1 sm=1 tr=0 ts=6678ca7d a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=T1WGqf2p2xoA:10 a=cAq4xmbCUuwB6dAq1EgA:9 a=3ZKOabzyN94A:10 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256284 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-mips Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series adds basic support for the RTL9302C reference board. Currentl= y the focus is on the CPU block stuff. I hope to get around to the DSA switch d= river eventually but this is a small start that lets me boot a mainline kernel = on the board I have. I initialiy started with code from openwrt but have paired = it down to just the clocksource driver and devicetree. The first two patches in this series are fixing some complaints from make dtbs_check for some existing realtek dts files. They can be applied on th= eir own if desired. Chris Packham (8): mips: dts: realtek: use "serial" instead of "uart" in node name mips: dts: realtek: add device_type property to cpu node dt-bindings: mips: realtek: Add rtl930x-soc compatible dt-bindings: timer: Add schema for realtek,otto-timer dt-bindings: interrupt-controller: realtek,rtl-intc: Add rtl9300-intc clocksource: realtek: Add timer driver for rtl-otto platforms mips: generic: add fdt fixup for Realtek reference board mips: dts: realtek: Add RTL9302C board .../realtek,rtl-intc.yaml | 17 +- .../devicetree/bindings/mips/realtek-rtl.yaml | 4 + .../bindings/timer/realtek,otto-timer.yaml | 66 ++++ arch/mips/boot/dts/realtek/Makefile | 1 + arch/mips/boot/dts/realtek/rtl838x.dtsi | 1 + arch/mips/boot/dts/realtek/rtl83xx.dtsi | 4 +- arch/mips/boot/dts/realtek/rtl9302c.dts | 73 +++++ arch/mips/boot/dts/realtek/rtl930x.dtsi | 79 +++++ arch/mips/generic/Makefile | 1 + arch/mips/generic/board-realtek.c | 81 +++++ drivers/clocksource/Kconfig | 11 + drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-rtl-otto.c | 287 ++++++++++++++++++ include/linux/cpuhotplug.h | 1 + 14 files changed, 624 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/timer/realtek,otto-= timer.yaml create mode 100644 arch/mips/boot/dts/realtek/rtl9302c.dts create mode 100644 arch/mips/boot/dts/realtek/rtl930x.dtsi create mode 100644 arch/mips/generic/board-realtek.c create mode 100644 drivers/clocksource/timer-rtl-otto.c --=20 2.45.2 . From: Wentong Wu To: sakari.ailus@linux.intel.com, tomas.winkler@intel.com, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Wentong Wu Subject: [PATCH v2 0/5] Fix MEI command timeout issue following warm reboot Date: Mon, 24 Jun 2024 09:42:18 +0800 Message-Id: <20240624014223.4171341-1-wentong.wu@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256295 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail While enabling the IVSC on certain recent commercial products, the chipset may occasionally enter an unknown state following a warm reboot. This issue can cause the firmware to fail in responding to the MEI command from the host, despite the firmware being re-downloaded. To resolve this, the current patch set incorporates reset logic during system shutdown to ensure that the IVSC chipset remains in a valid state after a warm reboot. Furthermore, after the firmware download is complete, the firmware requires some time to become operational. To enhance this, additional sleep time has been introduced before the initial read operation to prevent a confusing timeout error in vsc_tp_xfer(). Additionally, this patch set includes several enhancements as well: 1) utilizing the appropriate byte order swap function for data received from the ROM; 2) correcting a spelling error in a comment; 3) Constructing the SPI transfer command as per the specific request. --- v1 -> v2: - remove cc spelling fix to stable - remove the reset toggling enhancement Wentong Wu (5): mei: vsc: Enhance IVSC chipset stability during warm reboot mei: vsc: Enhance SPI transfer of IVSC rom mei: vsc: Utilize the appropriate byte order swap function mei: vsc: Prevent timeout error with added delay post-firmware download mei: vsc: Fix spelling error drivers/misc/mei/platform-vsc.c | 4 ++-- drivers/misc/mei/vsc-fw-loader.c | 2 +- drivers/misc/mei/vsc-tp.c | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) -- 2.34.1 . From: Liu Ying To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: neil.armstrong@linaro.org, quic_jesszhan@quicinc.com, sam@ravnborg.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, victor.liu@nxp.com, emil.l.velikov@gmail.com Subject: [PATCH RESEND] drm/panel: simple: Add missing display timing flags for KOE TX26D202VM0BWA Date: Mon, 24 Jun 2024 09:56:12 +0800 Message-Id: <20240624015612.341983-1-victor.liu@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256301 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail KOE TX26D202VM0BWA panel spec indicates the DE signal is active high in timing chart, so add DISPLAY_FLAGS_DE_HIGH flag in display timing flags. This aligns display_timing with panel_desc. Fixes: 8a07052440c2 ("drm/panel: simple: Add support for KOE TX26D202VM0BWA panel") Signed-off-by: Liu Ying --- drivers/gpu/drm/panel/panel-simple.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 20e3df1c59d4..7b70606e5760 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -2704,6 +2704,7 @@ static const struct display_timing koe_tx26d202vm0bwa_timing = { .vfront_porch = { 3, 5, 10 }, .vback_porch = { 2, 5, 10 }, .vsync_len = { 5, 5, 5 }, + .flags = DISPLAY_FLAGS_DE_HIGH, }; static const struct panel_desc koe_tx26d202vm0bwa = { -- 2.34.1 . From: Ma Ke To: neal_liu@aspeedtech.com, gregkh@linuxfoundation.org, joel@jms.id.au, andrew@codeconstruct.com.au Cc: linux-aspeed@lists.ozlabs.org, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH v2] usb: gadget: aspeed_udc: validate endpoint index for ast udc Date: Mon, 24 Jun 2024 09:53:13 +0800 Message-Id: <20240624015314.2249128-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256303 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-usb Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail We should verify the bound of the array to assure that host may not manipulate the index to point past endpoint array. Found by static analysis. Signed-off-by: Ma Ke --- drivers/usb/gadget/udc/aspeed_udc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/gadget/udc/aspeed_udc.c b/drivers/usb/gadget/udc/aspeed_udc.c index 3916c8e2ba01..d972ef4644bc 100644 --- a/drivers/usb/gadget/udc/aspeed_udc.c +++ b/drivers/usb/gadget/udc/aspeed_udc.c @@ -1009,6 +1009,8 @@ static void ast_udc_getstatus(struct ast_udc_dev *udc) break; case USB_RECIP_ENDPOINT: epnum = crq.wIndex & USB_ENDPOINT_NUMBER_MASK; + if (epnum >= AST_UDC_NUM_ENDPOINTS) + goto stall; status = udc->ep[epnum].stopped; break; default: -- 2.25.1 . X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Alexander Coffin Date: Sun, 23 Jun 2024 18:57:13 -0700 Message-ID: Subject: PROBLEM: ext4 resize2fs on-line resizing panic To: "Theodore Ts'o" , Jan Kara Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256306 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-ext4 Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail [1.] One line summary of the problem: Using resize2fs on-line resizing on a specific ext4 partition is causing an Oops. [2.] Full description of the problem/report: I have a partition that if it is live mounted causes a kernel panic upon invoking resize2fs on it. I believe this to be a bug, and currently don't have time to investigate the issue further so I am hoping someone else will be able to investigate this further. [3.] Keywords (i.e., modules, networking, kernel): resize2fs ext4 [4.] Kernel information [4.1.] Kernel version (from /proc/version): Linux version 6.10.0-rc5 (root@debian11-vm-acoffin) (gcc (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2) #4 SMP PREEMPT_DYNAMIC Sun Jun 23 17:49:17 PDT 2024 The kernel was built from git commit f2661062f16b2de5d7b6a5c42a9a5c96326b8454 with a config pretty much copy, and pasted from the standard Debian ones (I don't believe the config to be relevant although I have only tested the issue on Debian kernels). It also appears to affect kernels 5.10, and 6.1 from the Debian repositories. [4.2.] Kernel .config file: https://drive.google.com/file/d/1aG2-Ju0kPX09LPk9E8-ioHqQqQCgSl4x/view?usp=sharing sha256sum of file 7af96f35d621f702433a74e171af11c34b99bd96e57ab08494614af7bfcb9c21 [5.] Most recent kernel version which did not have the bug: None known. [6.] Output of Oops.. message (if applicable) with symbolic information resolved (see Documentation/admin-guide/bug-hunting.rst) ``` [ 445.552287] ------------[ cut here ]------------ [ 445.552300] kernel BUG at fs/jbd2/journal.c:846! [ 445.552345] Oops: invalid opcode: 0000 [#1] PREEMPT SMP NOPTI [ 445.552365] CPU: 12 PID: 1899 Comm: jbd2/loop0-8 Not tainted 6.10.0-rc5 #4 [ 445.552374] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 [ 445.552380] RIP: 0010:jbd2_journal_next_log_block (fs/jbd2/journal.c:846 (discriminator 1)) jbd2 [ 445.552428] Code: 8b 85 88 03 00 00 48 89 85 70 03 00 00 4c 89 ef e8 b9 d3 98 e3 4c 89 e2 4c 89 f6 48 89 ef 5d 41 5c 41 5d 41 5e e9 a4 fe ff ff <0f> 0b 66 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f All code ======== 0: 8b 85 88 03 00 00 mov 0x388(%rbp),%eax 6: 48 89 85 70 03 00 00 mov %rax,0x370(%rbp) d: 4c 89 ef mov %r13,%rdi 10: e8 b9 d3 98 e3 callq 0xffffffffe398d3ce 15: 4c 89 e2 mov %r12,%rdx 18: 4c 89 f6 mov %r14,%rsi 1b: 48 89 ef mov %rbp,%rdi 1e: 5d pop %rbp 1f: 41 5c pop %r12 21: 41 5d pop %r13 23: 41 5e pop %r14 25: e9 a4 fe ff ff jmpq 0xfffffffffffffece 2a:* 0f 0b ud2 <-- trapping instruction 2c: 66 90 xchg %ax,%ax 2e: 90 nop 2f: 90 nop 30: 90 nop 31: 90 nop 32: 90 nop 33: 90 nop 34: 90 nop 35: 90 nop 36: 90 nop 37: 90 nop 38: 90 nop 39: 90 nop 3a: 90 nop 3b: 90 nop 3c: 90 nop 3d: 90 nop 3e: 0f .byte 0xf 3f: 1f (bad) Code starting with the faulting instruction =========================================== 0: 0f 0b ud2 2: 66 90 xchg %ax,%ax 4: 90 nop 5: 90 nop 6: 90 nop 7: 90 nop 8: 90 nop 9: 90 nop a: 90 nop b: 90 nop c: 90 nop d: 90 nop e: 90 nop f: 90 nop 10: 90 nop 11: 90 nop 12: 90 nop 13: 90 nop 14: 0f .byte 0xf 15: 1f (bad) [ 445.552435] RSP: 0018:ffffb03c006a7c48 EFLAGS: 00010246 [ 445.552443] RAX: 0000000000000001 RBX: ffff9ba702ed1000 RCX: 00000000ffffffff [ 445.552449] RDX: 00000000000000ff RSI: ffffb03c006a7c70 RDI: ffff9ba707c78040 [ 445.552454] RBP: ffff9ba707c78000 R08: ffffb03c013e3900 R09: ffffb03c013e3900 [ 445.552458] R10: ffff9ba77ba35a80 R11: 0000000000000000 R12: ffffb03c006a7c70 [ 445.552463] R13: ffff9ba707c78040 R14: 0000000000000000 R15: ffff9ba702ed1000 [ 445.552468] FS: 0000000000000000(0000) GS:ffff9ba77ba00000(0000) knlGS:0000000000000000 [ 445.552474] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 445.552479] CR2: 000055824eb84444 CR3: 0000000100ad4000 CR4: 0000000000750ef0 [ 445.552492] PKRU: 55555554 [ 445.552496] Call Trace: [ 445.552504] [ 445.552511] ? die (arch/x86/kernel/dumpstack.c:421 arch/x86/kernel/dumpstack.c:434 arch/x86/kernel/dumpstack.c:447) [ 445.552613] ? do_trap (arch/x86/kernel/traps.c:114 arch/x86/kernel/traps.c:155) [ 445.552633] ? jbd2_journal_next_log_block (fs/jbd2/journal.c:846 (discriminator 1)) jbd2 [ 445.552660] ? do_error_trap (./arch/x86/include/asm/traps.h:58 arch/x86/kernel/traps.c:176) [ 445.552669] ? jbd2_journal_next_log_block (fs/jbd2/journal.c:846 (discriminator 1)) jbd2 [ 445.552693] ? exc_invalid_op (arch/x86/kernel/traps.c:267) [ 445.552757] ? jbd2_journal_next_log_block (fs/jbd2/journal.c:846 (discriminator 1)) jbd2 [ 445.552781] ? asm_exc_invalid_op (./arch/x86/include/asm/idtentry.h:621) [ 445.552818] ? jbd2_journal_next_log_block (fs/jbd2/journal.c:846 (discriminator 1)) jbd2 [ 445.552842] ? jbd2_journal_next_log_block (fs/jbd2/journal.c:846) jbd2 [ 445.552866] jbd2_journal_get_descriptor_buffer (fs/jbd2/journal.c:1007) jbd2 [ 445.552894] journal_submit_commit_record.part.0 (fs/jbd2/commit.c:131) jbd2 [ 445.552925] jbd2_journal_commit_transaction (./include/linux/mm.h:1508 fs/jbd2/commit.c:881) jbd2 [ 445.552957] ? _raw_spin_unlock_irqrestore (./arch/x86/include/asm/paravirt.h:589 ./arch/x86/include/asm/qspinlock.h:57 ./include/linux/spinlock.h:204 ./include/linux/spinlock_api_smp.h:150 kernel/locking/spinlock.c:194) [ 445.552977] kjournald2 (fs/jbd2/journal.c:202 (discriminator 3)) jbd2 [ 445.553010] ? __pfx_autoremove_wake_function (kernel/sched/wait.c:383) [ 445.553049] ? __pfx_kjournald2 (fs/jbd2/journal.c:161) jbd2 [ 445.553074] kthread (kernel/kthread.c:389) [ 445.553125] ? __pfx_kthread (kernel/kthread.c:342) [ 445.553135] ret_from_fork (arch/x86/kernel/process.c:147) [ 445.553179] ? __pfx_kthread (kernel/kthread.c:342) [ 445.553188] ret_from_fork_asm (arch/x86/entry/entry_64.S:257) [ 445.553269] [ 445.553273] Modules linked in: loop intel_rapl_msr intel_rapl_common intel_uncore_frequency_common intel_pmc_core intel_vsec pmt_telemetry pmt_class kvm_intel kvm ghash_clmulni_intel sha512_ssse3 sha256_ssse3 sha1_ssse3 aesni_intel crypto_simd cryptd rapl snd_hda_codec_generic snd_hda_intel rfkill snd_intel_dspcfg snd_intel_sdw_acpi snd_hda_codec snd_hda_core snd_hwdep snd_pcm snd_timer iTCO_wdt snd intel_pmc_bxt iTCO_vendor_support joydev watchdog serio_raw virtio_balloon pcspkr soundcore virtio_console evdev qemu_fw_cfg nfsd auth_rpcgss binfmt_misc nfs_acl lockd grace parport_pc ppdev lp sunrpc parport fuse configfs virtio_rng ip_tables x_tables autofs4 ext4 crc32c_generic crc16 mbcache jbd2 hid_generic usbhid hid virtio_gpu virtio_dma_buf drm_shmem_helper drm_kms_helper virtio_net ahci libahci net_failover xhci_pci drm xhci_hcd failover virtio_blk dimlib libata usbcore crct10dif_pclmul virtio_pci crct10dif_common scsi_mod virtio_pci_legacy_dev psmouse crc32_pclmul i2c_i801 virtio_pci_modern_dev crc32c_intel lpc_ich [ 445.553426] virtio i2c_smbus scsi_common usb_common virtio_ring button [ 445.553513] ---[ end trace 0000000000000000 ]--- [ 445.553519] RIP: 0010:jbd2_journal_next_log_block (fs/jbd2/journal.c:846 (discriminator 1)) jbd2 [ 445.553546] Code: 8b 85 88 03 00 00 48 89 85 70 03 00 00 4c 89 ef e8 b9 d3 98 e3 4c 89 e2 4c 89 f6 48 89 ef 5d 41 5c 41 5d 41 5e e9 a4 fe ff ff <0f> 0b 66 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f All code ======== 0: 8b 85 88 03 00 00 mov 0x388(%rbp),%eax 6: 48 89 85 70 03 00 00 mov %rax,0x370(%rbp) d: 4c 89 ef mov %r13,%rdi 10: e8 b9 d3 98 e3 callq 0xffffffffe398d3ce 15: 4c 89 e2 mov %r12,%rdx 18: 4c 89 f6 mov %r14,%rsi 1b: 48 89 ef mov %rbp,%rdi 1e: 5d pop %rbp 1f: 41 5c pop %r12 21: 41 5d pop %r13 23: 41 5e pop %r14 25: e9 a4 fe ff ff jmpq 0xfffffffffffffece 2a:* 0f 0b ud2 <-- trapping instruction 2c: 66 90 xchg %ax,%ax 2e: 90 nop 2f: 90 nop 30: 90 nop 31: 90 nop 32: 90 nop 33: 90 nop 34: 90 nop 35: 90 nop 36: 90 nop 37: 90 nop 38: 90 nop 39: 90 nop 3a: 90 nop 3b: 90 nop 3c: 90 nop 3d: 90 nop 3e: 0f .byte 0xf 3f: 1f (bad) Code starting with the faulting instruction =========================================== 0: 0f 0b ud2 2: 66 90 xchg %ax,%ax 4: 90 nop 5: 90 nop 6: 90 nop 7: 90 nop 8: 90 nop 9: 90 nop a: 90 nop b: 90 nop c: 90 nop d: 90 nop e: 90 nop f: 90 nop 10: 90 nop 11: 90 nop 12: 90 nop 13: 90 nop 14: 0f .byte 0xf 15: 1f (bad) [ 445.553553] RSP: 0018:ffffb03c006a7c48 EFLAGS: 00010246 [ 445.553561] RAX: 0000000000000001 RBX: ffff9ba702ed1000 RCX: 00000000ffffffff [ 445.553567] RDX: 00000000000000ff RSI: ffffb03c006a7c70 RDI: ffff9ba707c78040 [ 445.553572] RBP: ffff9ba707c78000 R08: ffffb03c013e3900 R09: ffffb03c013e3900 [ 445.553578] R10: ffff9ba77ba35a80 R11: 0000000000000000 R12: ffffb03c006a7c70 [ 445.553583] R13: ffff9ba707c78040 R14: 0000000000000000 R15: ffff9ba702ed1000 [ 445.553588] FS: 0000000000000000(0000) GS:ffff9ba77ba00000(0000) knlGS:0000000000000000 [ 445.553595] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 445.553601] CR2: 000055824eb84444 CR3: 0000000100ad4000 CR4: 0000000000750ef0 [ 445.553613] PKRU: 55555554 [ 445.553618] note: jbd2/loop0-8[1899] exited with preempt_count 1 ``` And the raw relevant dmesg section ``` [ 154.118871] loop: module loaded [ 154.119555] loop0: detected capacity change from 0 to 1048576 [ 154.452675] EXT4-fs (loop0): mounted filesystem 00000000-0000-0000-0000-000000000000 r/w with ordered data mode. Quota mode: none. [ 154.452686] ext4 filesystem being mounted at /mnt supports timestamps until 2038-01-19 (0x7fffffff) [ 441.561378] EXT4-fs (loop0): resizing filesystem from 32769 to 524288 blocks [ 445.552287] ------------[ cut here ]------------ [ 445.552300] kernel BUG at fs/jbd2/journal.c:846! [ 445.552345] Oops: invalid opcode: 0000 [#1] PREEMPT SMP NOPTI [ 445.552365] CPU: 12 PID: 1899 Comm: jbd2/loop0-8 Not tainted 6.10.0-rc5 #4 [ 445.552374] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 [ 445.552380] RIP: 0010:jbd2_journal_next_log_block+0x7c/0x80 [jbd2] [ 445.552428] Code: 8b 85 88 03 00 00 48 89 85 70 03 00 00 4c 89 ef e8 b9 d3 98 e3 4c 89 e2 4c 89 f6 48 89 ef 5d 41 5c 41 5d 41 5e e9 a4 fe ff ff <0f> 0b 66 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f [ 445.552435] RSP: 0018:ffffb03c006a7c48 EFLAGS: 00010246 [ 445.552443] RAX: 0000000000000001 RBX: ffff9ba702ed1000 RCX: 00000000ffffffff [ 445.552449] RDX: 00000000000000ff RSI: ffffb03c006a7c70 RDI: ffff9ba707c78040 [ 445.552454] RBP: ffff9ba707c78000 R08: ffffb03c013e3900 R09: ffffb03c013e3900 [ 445.552458] R10: ffff9ba77ba35a80 R11: 0000000000000000 R12: ffffb03c006a7c70 [ 445.552463] R13: ffff9ba707c78040 R14: 0000000000000000 R15: ffff9ba702ed1000 [ 445.552468] FS: 0000000000000000(0000) GS:ffff9ba77ba00000(0000) knlGS:0000000000000000 [ 445.552474] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 445.552479] CR2: 000055824eb84444 CR3: 0000000100ad4000 CR4: 0000000000750ef0 [ 445.552492] PKRU: 55555554 [ 445.552496] Call Trace: [ 445.552504] [ 445.552511] ? die+0x33/0x90 [ 445.552613] ? do_trap+0xd9/0x100 [ 445.552633] ? jbd2_journal_next_log_block+0x7c/0x80 [jbd2] [ 445.552660] ? do_error_trap+0x6a/0x90 [ 445.552669] ? jbd2_journal_next_log_block+0x7c/0x80 [jbd2] [ 445.552693] ? exc_invalid_op+0x4e/0x70 [ 445.552757] ? jbd2_journal_next_log_block+0x7c/0x80 [jbd2] [ 445.552781] ? asm_exc_invalid_op+0x16/0x20 [ 445.552818] ? jbd2_journal_next_log_block+0x7c/0x80 [jbd2] [ 445.552842] ? jbd2_journal_next_log_block+0x1e/0x80 [jbd2] [ 445.552866] jbd2_journal_get_descriptor_buffer+0x32/0x100 [jbd2] [ 445.552894] journal_submit_commit_record.part.0+0x37/0x1d0 [jbd2] [ 445.552925] jbd2_journal_commit_transaction+0x151c/0x1a20 [jbd2] [ 445.552957] ? _raw_spin_unlock_irqrestore+0xa/0x40 [ 445.552977] kjournald2+0xa8/0x260 [jbd2] [ 445.553010] ? __pfx_autoremove_wake_function+0x10/0x10 [ 445.553049] ? __pfx_kjournald2+0x10/0x10 [jbd2] [ 445.553074] kthread+0xcc/0x100 [ 445.553125] ? __pfx_kthread+0x10/0x10 [ 445.553135] ret_from_fork+0x2d/0x50 [ 445.553179] ? __pfx_kthread+0x10/0x10 [ 445.553188] ret_from_fork_asm+0x1a/0x30 [ 445.553269] [ 445.553273] Modules linked in: loop intel_rapl_msr intel_rapl_common intel_uncore_frequency_common intel_pmc_core intel_vsec pmt_telemetry pmt_class kvm_intel kvm ghash_clmulni_intel sha512_ssse3 sha256_ssse3 sha1_ssse3 aesni_intel crypto_simd cryptd rapl snd_hda_codec_generic snd_hda_intel rfkill snd_intel_dspcfg snd_intel_sdw_acpi snd_hda_codec snd_hda_core snd_hwdep snd_pcm snd_timer iTCO_wdt snd intel_pmc_bxt iTCO_vendor_support joydev watchdog serio_raw virtio_balloon pcspkr soundcore virtio_console evdev qemu_fw_cfg nfsd auth_rpcgss binfmt_misc nfs_acl lockd grace parport_pc ppdev lp sunrpc parport fuse configfs virtio_rng ip_tables x_tables autofs4 ext4 crc32c_generic crc16 mbcache jbd2 hid_generic usbhid hid virtio_gpu virtio_dma_buf drm_shmem_helper drm_kms_helper virtio_net ahci libahci net_failover xhci_pci drm xhci_hcd failover virtio_blk dimlib libata usbcore crct10dif_pclmul virtio_pci crct10dif_common scsi_mod virtio_pci_legacy_dev psmouse crc32_pclmul i2c_i801 virtio_pci_modern_dev crc32c_intel lpc_ich [ 445.553426] virtio i2c_smbus scsi_common usb_common virtio_ring button [ 445.553513] ---[ end trace 0000000000000000 ]--- [ 445.553519] RIP: 0010:jbd2_journal_next_log_block+0x7c/0x80 [jbd2] [ 445.553546] Code: 8b 85 88 03 00 00 48 89 85 70 03 00 00 4c 89 ef e8 b9 d3 98 e3 4c 89 e2 4c 89 f6 48 89 ef 5d 41 5c 41 5d 41 5e e9 a4 fe ff ff <0f> 0b 66 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f [ 445.553553] RSP: 0018:ffffb03c006a7c48 EFLAGS: 00010246 [ 445.553561] RAX: 0000000000000001 RBX: ffff9ba702ed1000 RCX: 00000000ffffffff [ 445.553567] RDX: 00000000000000ff RSI: ffffb03c006a7c70 RDI: ffff9ba707c78040 [ 445.553572] RBP: ffff9ba707c78000 R08: ffffb03c013e3900 R09: ffffb03c013e3900 [ 445.553578] R10: ffff9ba77ba35a80 R11: 0000000000000000 R12: ffffb03c006a7c70 [ 445.553583] R13: ffff9ba707c78040 R14: 0000000000000000 R15: ffff9ba702ed1000 [ 445.553588] FS: 0000000000000000(0000) GS:ffff9ba77ba00000(0000) knlGS:0000000000000000 [ 445.553595] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 445.553601] CR2: 000055824eb84444 CR3: 0000000100ad4000 CR4: 0000000000750ef0 [ 445.553613] PKRU: 55555554 [ 445.553618] note: jbd2/loop0-8[1899] exited with preempt_count 1 ``` [7.] A small shell script or example program which triggers the problem (if possible) If anyone wants to investigate the ext4 partition themselves you can download a version that should recreate this bug from here https://drive.google.com/file/d/1lzWKlBOixVWtLwGN4WEIuRiLYQz9rrH3/view?usp=sharing . ```bash sha256sum foo.iso.gz # It should show: # d7c49a5f7c26aa9a04edefb57f3f23aae660901c9ad5e88b10eb31ae4757bee8 foo.iso.gz gunzip ./foo.iso.gz mkdir /mnt/foo mount ./foo.iso /mnt/foo # Or wherever it loop mounted if not /dev/loop0 resize2fs /dev/loop0 ``` ``` root@debian11-vm-acoffin:~/tmp# mount ./foo.iso /mnt root@debian11-vm-acoffin:~/tmp# df -h Filesystem Size Used Avail Use% Mounted on udev 1.9G 0 1.9G 0% /dev tmpfs 392M 1.1M 391M 1% /run /dev/vda1 78G 71G 3.3G 96% / tmpfs 2.0G 0 2.0G 0% /dev/shm tmpfs 5.0M 4.0K 5.0M 1% /run/lock tmpfs 392M 44K 392M 1% /run/user/0 /dev/loop0 30M 16M 12M 59% /mnt root@debian11-vm-acoffin:~/tmp# resize2fs /dev/loop0 resize2fs 1.46.2 (28-Feb-2021) Filesystem at /dev/loop0 is mounted on /mnt; on-line resizing required old_desc_blocks = 1, new_desc_blocks = 4 ``` [8.] Environment [8.1.] Software (add the output of the ver_linux script here) Linux debian11-vm-acoffin 6.10.0-rc5 #4 SMP PREEMPT_DYNAMIC Sun Jun 23 17:49:17 PDT 2024 x86_64 GNU/Linux GNU C 10 GNU Make 4.3 Binutils 2.35.2 Util-linux 2.36.1 Mount 2.36.1 Module-init-tools 28 E2fsprogs 1.46.2 PPP 2.4.9 Nfs-utils 1.3.3 Bison 3.7.5 Flex 2.6.4 Linux C++ Library 6.0.28 Linux C Library 2.31 Dynamic linker (ldd) 2.31 Procps 3.3.17 Kbd 2.3.0 Console-tools 2.3.0 Sh-utils 8.32 Udev 247 Modules Loaded aesni_intel ahci auth_rpcgss autofs4 binfmt_misc button configfs crc16 crc32c_generic crc32c_intel crc32_pclmul crct10dif_common crct10dif_pclmul cryptd crypto_simd dimlib drm drm_kms_helper drm_shmem_helper evdev ext4 failover fuse ghash_clmulni_intel grace hid hid_generic i2c_i801 i2c_smbus intel_pmc_bxt intel_pmc_core intel_rapl_common intel_rapl_msr intel_uncore_frequency_common intel_vsec ip_tables iTCO_vendor_support iTCO_wdt jbd2 joydev kvm kvm_intel libahci libata lockd lp lpc_ich mbcache net_failover nfs_acl nfsd parport parport_pc pcspkr pmt_class pmt_telemetry ppdev psmouse qemu_fw_cfg rapl rfkill scsi_common scsi_mod serio_raw sha1_ssse3 sha256_ssse3 sha512_ssse3 snd snd_hda_codec snd_hda_codec_generic snd_hda_core snd_hda_intel snd_hwdep snd_intel_dspcfg snd_intel_sdw_acpi snd_pcm snd_timer soundcore sunrpc usb_common usbcore usbhid virtio virtio_balloon virtio_blk virtio_console virtio_dma_buf virtio_gpu virtio_net virtio_pci virtio_pci_legacy_dev virtio_pci_modern_dev virtio_ring virtio_rng watchdog xhci_hcd xhci_pci x_tables [8.2.] Processor information (from /proc/cpuinfo): Not relevant. Can be recreated on both ARM64, and AMD64 systems. If anyone wants this I will add it in a follow up email. [8.3.] Module information (from /proc/modules): intel_rapl_msr 20480 0 - Live 0xffffffffc0e43000 intel_rapl_common 49152 1 intel_rapl_msr, Live 0xffffffffc0ddf000 intel_uncore_frequency_common 16384 0 - Live 0xffffffffc0ec4000 intel_pmc_core 122880 0 - Live 0xffffffffc0e8d000 intel_vsec 20480 1 intel_pmc_core, Live 0xffffffffc0e47000 pmt_telemetry 16384 1 intel_pmc_core, Live 0xffffffffc0df2000 pmt_class 12288 1 pmt_telemetry, Live 0xffffffffc0bff000 kvm_intel 413696 0 - Live 0xffffffffc1144000 kvm 1323008 1 kvm_intel, Live 0xffffffffc0fa7000 ghash_clmulni_intel 16384 0 - Live 0xffffffffc0df7000 sha512_ssse3 45056 0 - Live 0xffffffffc0de4000 sha256_ssse3 32768 0 - Live 0xffffffffc0dd6000 sha1_ssse3 32768 0 - Live 0xffffffffc0dcd000 aesni_intel 364544 0 - Live 0xffffffffc0f56000 crypto_simd 16384 1 aesni_intel, Live 0xffffffffc0d95000 cryptd 28672 2 ghash_clmulni_intel,crypto_simd, Live 0xffffffffc0d87000 rapl 20480 0 - Live 0xffffffffc0b99000 rfkill 40960 1 - Live 0xffffffffc0d6b000 snd_hda_codec_generic 110592 1 - Live 0xffffffffc0f37000 snd_hda_intel 61440 0 - Live 0xffffffffc0f1c000 snd_intel_dspcfg 36864 1 snd_hda_intel, Live 0xffffffffc0b9b000 snd_intel_sdw_acpi 16384 1 snd_intel_dspcfg, Live 0xffffffffc0a33000 snd_hda_codec 212992 2 snd_hda_codec_generic,snd_hda_intel, Live 0xffffffffc0eca000 snd_hda_core 143360 3 snd_hda_codec_generic,snd_hda_intel,snd_hda_codec, Live 0xffffffffc0e92000 iTCO_wdt 12288 0 - Live 0xffffffffc0e87000 snd_hwdep 16384 1 snd_hda_codec, Live 0xffffffffc0e6e000 intel_pmc_bxt 16384 1 iTCO_wdt, Live 0xffffffffc0e62000 joydev 24576 0 - Live 0xffffffffc0e53000 iTCO_vendor_support 12288 1 iTCO_wdt, Live 0xffffffffc0e49000 snd_pcm 188416 3 snd_hda_intel,snd_hda_codec,snd_hda_core, Live 0xffffffffc0e06000 watchdog 49152 1 iTCO_wdt, Live 0xffffffffc0d70000 snd_timer 53248 1 snd_pcm, Live 0xffffffffc0c2b000 pcspkr 12288 0 - Live 0xffffffffc0bf2000 snd 147456 6 snd_hda_codec_generic,snd_hda_intel,snd_hda_codec,snd_hwdep,snd_pcm,snd_timer, Live 0xffffffffc0c6c000 serio_raw 16384 0 - Live 0xffffffffc0bbe000 soundcore 16384 1 snd, Live 0xffffffffc0bb2000 virtio_console 40960 1 - Live 0xffffffffc0b9e000 virtio_balloon 32768 0 - Live 0xffffffffc0b8f000 qemu_fw_cfg 20480 0 - Live 0xffffffffc0a43000 evdev 28672 6 - Live 0xffffffffc0a5f000 binfmt_misc 28672 1 - Live 0xffffffffc0da4000 nfsd 937984 3 - Live 0xffffffffc0c7d000 auth_rpcgss 192512 1 nfsd, Live 0xffffffffc0c39000 nfs_acl 12288 1 nfsd, Live 0xffffffffc0a45000 lockd 155648 1 nfsd, Live 0xffffffffc0c03000 grace 12288 2 nfsd,lockd, Live 0xffffffffc0bf9000 parport_pc 40960 0 - Live 0xffffffffc0be4000 ppdev 24576 0 - Live 0xffffffffc0bd5000 sunrpc 851968 18 nfsd,auth_rpcgss,nfs_acl,lockd, Live 0xffffffffc0abb000 lp 20480 0 - Live 0xffffffffc0aae000 fuse 221184 1 - Live 0xffffffffc0a66000 parport 81920 3 parport_pc,ppdev,lp, Live 0xffffffffc0a49000 configfs 65536 1 - Live 0xffffffffc07a1000 virtio_rng 12288 0 - Live 0xffffffffc0a37000 ip_tables 36864 0 - Live 0xffffffffc0918000 x_tables 65536 1 ip_tables, Live 0xffffffffc07c5000 autofs4 57344 2 - Live 0xffffffffc077d000 ext4 1118208 1 - Live 0xffffffffc0920000 crc32c_generic 12288 0 - Live 0xffffffffc06ba000 crc16 12288 1 ext4, Live 0xffffffffc05f0000 mbcache 16384 1 ext4, Live 0xffffffffc0521000 jbd2 196608 1 ext4, Live 0xffffffffc08df000 hid_generic 12288 0 - Live 0xffffffffc04c6000 usbhid 73728 0 - Live 0xffffffffc074c000 hid 253952 2 hid_generic,usbhid, Live 0xffffffffc06a7000 virtio_gpu 98304 1 - Live 0xffffffffc04ff000 virtio_dma_buf 12288 1 virtio_gpu, Live 0xffffffffc0464000 drm_shmem_helper 28672 1 virtio_gpu, Live 0xffffffffc0461000 drm_kms_helper 253952 2 virtio_gpu, Live 0xffffffffc0589000 drm 749568 5 virtio_gpu,drm_shmem_helper,drm_kms_helper, Live 0xffffffffc07f3000 virtio_net 98304 0 - Live 0xffffffffc07ce000 ahci 49152 0 - Live 0xffffffffc07b5000 net_failover 24576 1 virtio_net, Live 0xffffffffc07a7000 libahci 61440 1 ahci, Live 0xffffffffc078e000 failover 12288 1 net_failover, Live 0xffffffffc0783000 virtio_blk 32768 1 - Live 0xffffffffc0771000 xhci_pci 24576 0 - Live 0xffffffffc0760000 dimlib 16384 1 virtio_net, Live 0xffffffffc0756000 libata 450560 2 ahci,libahci, Live 0xffffffffc06bf000 xhci_hcd 356352 1 xhci_pci, Live 0xffffffffc064c000 crct10dif_pclmul 12288 0 - Live 0xffffffffc0478000 crct10dif_common 12288 1 crct10dif_pclmul, Live 0xffffffffc0644000 scsi_mod 319488 1 libata, Live 0xffffffffc05ce000 virtio_pci 40960 0 - Live 0xffffffffc05c5000 crc32_pclmul 12288 0 - Live 0xffffffffc05bb000 i2c_i801 36864 0 - Live 0xffffffffc05a8000 usbcore 397312 3 usbhid,xhci_pci,xhci_hcd, Live 0xffffffffc0524000 virtio_pci_legacy_dev 16384 1 virtio_pci, Live 0xffffffffc051a000 crc32c_intel 16384 2 - Live 0xffffffffc050f000 psmouse 208896 0 - Live 0xffffffffc04c8000 virtio_pci_modern_dev 20480 1 virtio_pci, Live 0xffffffffc04bc000 lpc_ich 28672 0 - Live 0xffffffffc04ab000 i2c_smbus 16384 1 i2c_i801, Live 0xffffffffc049e000 scsi_common 16384 2 libata,scsi_mod, Live 0xffffffffc0494000 virtio 16384 7 virtio_console,virtio_balloon,virtio_rng,virtio_gpu,virtio_net,virtio_blk,virtio_pci, Live 0xffffffffc048a000 usb_common 16384 2 xhci_hcd,usbcore, Live 0xffffffffc047e000 virtio_ring 57344 7 virtio_console,virtio_balloon,virtio_rng,virtio_gpu,virtio_net,virtio_blk,virtio_pci, Live 0xffffffffc0466000 button 24576 0 - Live 0xffffffffc0457000 [8.4.] Loaded driver and hardware information (/proc/ioports, /proc/iomem) In order to keep this email from going over any size limits I will skip this unless requested in a follow up email. [8.5.] PCI information ('lspci -vvv' as root) In order to keep this email from going over any size limits I will skip this unless requested in a follow up email. [8.6.] SCSI information (from /proc/scsi/scsi) In order to keep this email from going over any size limits I will skip this unless requested in a follow up email. [8.7.] Other information that might be relevant to the problem (please look in /proc and include all information that you think to be relevant): Nothing that I know of. [X.] Other notes, patches, fixes, workarounds: The file system was originally created with mkfs.ext4. The unmodified version of the provided partition displayed these issues and in order to be able to upload the file system here (keeping it small, and not leaking proprietary files) all the files were zeroed, and unused blocks removed. The modified version shared here shows the exact same issues and all of the bug report information filled out in this email correspond to the version of the partition available in this email. . From: Jiapeng Chong To: harry.wentland@amd.com Cc: sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] drm/amd/display: use swap() in is_config_schedulable() Date: Mon, 24 Jun 2024 09:57:07 +0800 Message-Id: <20240624015707.121287-1-jiapeng.chong@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256309 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use existing swap() function rather than duplicating its implementation. ./drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c:1171:103-104: WARNING opportunity for swap(). ./drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c:1231:99-100: WARNING opportunity for swap(). Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9400 Signed-off-by: Jiapeng Chong --- .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c index 7272a04b9d1d..926d45496e79 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c +++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c @@ -1158,7 +1158,6 @@ static bool is_config_schedulable( schedulable = true; /* sort disallow times from greatest to least */ - unsigned int temp; for (i = 0; i < s->pmo_dcn4.num_timing_groups; i++) { bool swapped = false; @@ -1167,9 +1166,8 @@ static bool is_config_schedulable( double jp1_disallow_us = s->pmo_dcn4.group_common_fams2_meta[s->pmo_dcn4.sorted_group_gtl_disallow_index[j + 1]].disallow_time_us; if (j_disallow_us < jp1_disallow_us) { /* swap as A < B */ - temp = s->pmo_dcn4.sorted_group_gtl_disallow_index[j]; - s->pmo_dcn4.sorted_group_gtl_disallow_index[j] = s->pmo_dcn4.sorted_group_gtl_disallow_index[j + 1]; - s->pmo_dcn4.sorted_group_gtl_disallow_index[j + 1] = temp; + swap(s->pmo_dcn4.sorted_group_gtl_disallow_index[j], + s->pmo_dcn4.sorted_group_gtl_disallow_index[j+1]); swapped = true; } } @@ -1227,9 +1225,8 @@ static bool is_config_schedulable( double jp1_period_us = s->pmo_dcn4.group_common_fams2_meta[s->pmo_dcn4.sorted_group_gtl_period_index[j + 1]].period_us; if (j_period_us < jp1_period_us) { /* swap as A < B */ - temp = s->pmo_dcn4.sorted_group_gtl_period_index[j]; - s->pmo_dcn4.sorted_group_gtl_period_index[j] = s->pmo_dcn4.sorted_group_gtl_period_index[j + 1]; - s->pmo_dcn4.sorted_group_gtl_period_index[j + 1] = temp; + swap(s->pmo_dcn4.sorted_group_gtl_period_index[j], + s->pmo_dcn4.sorted_group_gtl_period_index[j+1]); swapped = true; } } -- 2.20.1.7.g153144c . Return-Path: From: Drew Fustini Subject: [PATCH v2 0/7] clk: thead: Add support for TH1520 AP_SUBSYS clock controller Date: Sun, 23 Jun 2024 19:12:30 -0700 Message-Id: <20240623-th1520-clk-v2-0-ad8d6432d9fb@tenstorrent.com> MIME-Version: 1.0 To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini , Conor Dooley X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Xref: photonic.trudheim.com org.infradead.lists.linux-riscv:78910 org.kernel.vger.linux-kernel:1256317 Newsgroups: org.infradead.lists.linux-riscv,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series adds support for the AP sub-system clock controller in the T-Head TH1520 [1]. Yangtao Li originally submitted this series in May 2023 [2]. Jisheng made additional improvements and then passed on the work in progress to me. Changes in v2: - Add clock property to the gpio nodes after Conor asked why they were missing. These clock gates correspond to enable bits in PERI_CLK_CFG. - Drop 2 cell address and size properties from the binding example per Conor and add Reviewed-by from from Conor. Changes in v1: - Split th1520_clks into groups for gate, mux, div, pll - Convert gate clocks to devm_clk_hw_register_gate_parent_data() - Convert mux clocks to devm_clk_hw_register_mux_parent_data_table() - Split the PLL recalculation into th1520_pll_vco_recalc_rate() and th1520_pll_postdiv_recalc_rate(). Based on Emil's comments in v1, add logic to handle the fractional portion of feedback divide value when the delta-sigma modulator (DSM) is active. - Drop clock-names from the binding per Stephan to avoid relying on anything other than the cell index when describing clk_parent_data (note: I dropped Rob's Rb because I changed the binding patch) - Rename reg/reg2 to cfg0/cfg1 to match the SoC documentation - Rename struct for pll clocks from ccu_mdiv to ccu_pll - Rebase on v6.10-rc3, remove the dts node reordering patch from v3 now that it is in mainline Changes in RFC v3 [3]: - Drop redundant new line and unused clk label from the dts example in the DT binding which I failed to fix in v2. - Add patch [4] from Thomas Bonnefille that fixes dts node ordering in th1520.dtsi. Conor has already merged it into riscv-dt-for-next so the dts patches in this series are based on top of that. - Remove fixed uart clock and converted uart DT nodes to use clocks from the clock controller. - Remove fixed apb clock and converted the dma controller and timer DT nodes to use a clock from the clock controller. - Made ccu_disable_helper() and ccu_enable_helper() to static functions - Follow the advice from Stephen Boyd in Yangtao's original series to not use strings for clk tree topology. Created clk_parent_data arrays to be used with CLK_HW_INIT_PARENTS_DATA instead of parent strings. - Rebase on top of v6.9-rc7 Changes in RFC v2 [5]: - squash the header file patch into the DT schema patch - describe the changes I made to original series in the cover letter instead of the individual patches - fix my typo in my email address Changes in RFC v1 [6] from the original series: - corrected the npu_clk enable bit - deduplicated CLK_NPU and CLK_NPU_AXI number in header - fixed c910_i0_clk reg typo - fixed checkpatch and dt_binding_check warnings - rebased on v6.9-rc5 - revised commit descriptions Thank you, Drew [1] https://openbeagle.org/beaglev-ahead/beaglev-ahead/-/blob/main/docs/TH1520%20System%20User%20Manual.pdf [2] https://lore.kernel.org/all/20230515054402.27633-1-frank.li@vivo.com/ [3] https://lore.kernel.org/all/20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com/ [4] https://lore.kernel.org/all/20240425082138.374445-1-thomas.bonnefille@bootlin.com/ [5] https://lore.kernel.org/all/20240426-th1520-clk-v2-v2-0-96b829e6fcee@tenstorrent.com/ [6] https://lore.kernel.org/all/20240110-clk-th1520-v1-0-8b0682567984@tenstorrent.com/ To: Jisheng Zhang To: Guo Ren To: Fu Wei To: Yangtao Li To: Thomas Bonnefille To: Emil Renner Berthing To: Michael Turquette To: Stephen Boyd To: Rob Herring To: Krzysztof Kozlowski To: Conor Dooley To: Paul Walmsley To: Palmer Dabbelt To: Albert Ou Cc: linux-riscv@lists.infradead.org Cc: linux-clk@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Drew Fustini --- Drew Fustini (7): dt-bindings: clock: Document T-Head TH1520 AP_SUBSYS controller clk: thead: Add support for T-Head TH1520 AP_SUBSYS clocks riscv: dts: thead: Add TH1520 AP_SUBSYS clock controller riscv: dts: thead: change TH1520 uart nodes to use clock controller riscv: dts: thead: change TH1520 mmc nodes to use clock controller riscv: dts: thead: update TH1520 dma and timer nodes to use clock controller riscv: dts: thead: add clock to TH1520 gpio nodes .../bindings/clock/thead,th1520-clk-ap.yaml | 53 + MAINTAINERS | 3 + arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 12 - .../boot/dts/thead/th1520-lichee-module-4a.dtsi | 12 - arch/riscv/boot/dts/thead/th1520.dtsi | 73 +- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/thead/Kconfig | 12 + drivers/clk/thead/Makefile | 2 + drivers/clk/thead/clk-th1520-ap.c | 1086 ++++++++++++++++++++ include/dt-bindings/clock/thead,th1520-clk-ap.h | 96 ++ 11 files changed, 1290 insertions(+), 61 deletions(-) --- base-commit: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670 change-id: 20240622-th1520-clk-e813a97b9e16 Best regards, -- Drew Fustini _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv . From: YijieYang To: , , , , , , , , CC: , , , , , Subject: [PATCH v2] dt-bindings: phy: qcom,qmp-usb: fix spelling error Date: Mon, 24 Jun 2024 10:19:16 +0800 Message-ID: <20240624021916.2033062-1-quic_yijiyang@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-QCInternal: smtphost Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256321 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-phy,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-devicetree,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yijie Yang Correct the spelling error, changing 'com' to 'qcom'. Cc: stable@vger.kernel.org Fixes: f75a4b3a6efc ("dt-bindings: phy: qcom,qmp-usb: Add QDU1000 USB3 PHY") Signed-off-by: Yijie Yang --- v1 -> v2: - add 'Fixes' and 'Cc-stable' tags previous discussion here: [1] v1: https://lore.kernel.org/all/20240621061521.332567-1-quic_yijiyang@quicinc.com/ --- .../devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml index 5755245ecfd6..0e0b6cae07bc 100644 --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml @@ -20,7 +20,7 @@ properties: - qcom,ipq8074-qmp-usb3-phy - qcom,ipq9574-qmp-usb3-phy - qcom,msm8996-qmp-usb3-phy - - com,qdu1000-qmp-usb3-uni-phy + - qcom,qdu1000-qmp-usb3-uni-phy - qcom,sa8775p-qmp-usb3-uni-phy - qcom,sc8180x-qmp-usb3-uni-phy - qcom,sc8280xp-qmp-usb3-uni-phy base-commit: b992b79ca8bc336fa8e2c80990b5af80ed8f36fd -- 2.34.1 . From: Jiapeng Chong To: alexander.deucher@amd.com Cc: christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] drm/amd/display: Remove unused function reverse_planes_order Date: Mon, 24 Jun 2024 10:22:25 +0800 Message-Id: <20240624022225.28655-1-jiapeng.chong@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256324 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The function are defined in the amdgpu_dm.c file, but not called anywhere, so delete the unused function. drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:371:20: warning: unused function 'reverse_planes_order'. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9402 Signed-off-by: Jiapeng Chong --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 4b86b30eddc4..1e0e33b565f1 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -368,15 +368,6 @@ static inline bool is_dc_timing_adjust_needed(struct dm_crtc_state *old_state, return false; } -static inline void reverse_planes_order(struct dc_surface_update *array_of_surface_update, - int planes_count) -{ - int i, j; - - for (i = 0, j = planes_count - 1; i < j; i++, j--) - swap(array_of_surface_update[i], array_of_surface_update[j]); -} - /* * DC will program planes with their z-order determined by their ordering * in the dc_surface_updates array. This comparator is used to sort them -- 2.20.1.7.g153144c . From: Jinjie Ruan To: , , , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v2] ARM: Add support for STACKLEAK gcc plugin Date: Mon, 24 Jun 2024 10:36:12 +0800 Message-ID: <20240624023612.2134144-1-ruanjinjie@huawei.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256327 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-efi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add the STACKLEAK gcc plugin to arm32 by adding the helper used by stackleak common code: on_thread_stack(). It initialize the stack with the poison value before returning from system calls which improves the kernel security. Additionally, this disables the plugin in EFI stub code and decompress code, which are out of scope for the protection. Before the test on Qemu versatilepb board: # echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT lkdtm: Performing direct entry STACKLEAK_ERASING lkdtm: XFAIL: stackleak is not supported on this arch (HAVE_ARCH_STACKLEAK=n) After: # echo STACKLEAK_ERASING > /sys/kernel/debug/provoke-crash/DIRECT lkdtm: Performing direct entry STACKLEAK_ERASING lkdtm: stackleak stack usage: high offset: 80 bytes current: 280 bytes lowest: 696 bytes tracked: 696 bytes untracked: 192 bytes poisoned: 7220 bytes low offset: 4 bytes lkdtm: OK: the rest of the thread stack is properly erased Signed-off-by: Jinjie Ruan Acked-by: Ard Biesheuvel --- v2: - Make on_thread_stack() more legible. - Add Acked-by. --- arch/arm/Kconfig | 1 + arch/arm/boot/compressed/Makefile | 1 + arch/arm/include/asm/stacktrace.h | 7 +++++++ arch/arm/kernel/entry-common.S | 3 +++ drivers/firmware/efi/libstub/Makefile | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 036381c5d42f..b211b7f5a138 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -86,6 +86,7 @@ config ARM select HAVE_ARCH_PFN_VALID select HAVE_ARCH_SECCOMP select HAVE_ARCH_SECCOMP_FILTER if AEABI && !OABI_COMPAT + select HAVE_ARCH_STACKLEAK select HAVE_ARCH_THREAD_STRUCT_WHITELIST select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if ARM_LPAE diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 6bca03c0c7f0..945b5975fce2 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -9,6 +9,7 @@ OBJS = HEAD = head.o OBJS += misc.o decompress.o +CFLAGS_decompress.o += $(DISABLE_STACKLEAK_PLUGIN) ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y) OBJS += debug.o AFLAGS_head.o += -DDEBUG diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stacktrace.h index 360f0d2406bf..f80a85b091d6 100644 --- a/arch/arm/include/asm/stacktrace.h +++ b/arch/arm/include/asm/stacktrace.h @@ -26,6 +26,13 @@ struct stackframe { #endif }; +static inline bool on_thread_stack(void) +{ + unsigned long delta = current_stack_pointer ^ (unsigned long)current->stack; + + return delta < THREAD_SIZE; +} + static __always_inline void arm_get_current_stackframe(struct pt_regs *regs, struct stackframe *frame) { diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 5c31e9de7a60..f379c852dcb7 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -119,6 +119,9 @@ no_work_pending: ct_user_enter save = 0 +#ifdef CONFIG_GCC_PLUGIN_STACKLEAK + bl stackleak_erase_on_task_stack +#endif restore_user_regs fast = 0, offset = 0 ENDPROC(ret_to_user_from_irq) ENDPROC(ret_to_user) diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile index 06f0428a723c..20d8a491f25f 100644 --- a/drivers/firmware/efi/libstub/Makefile +++ b/drivers/firmware/efi/libstub/Makefile @@ -27,7 +27,8 @@ cflags-$(CONFIG_ARM64) += -fpie $(DISABLE_STACKLEAK_PLUGIN) \ cflags-$(CONFIG_ARM) += -DEFI_HAVE_STRLEN -DEFI_HAVE_STRNLEN \ -DEFI_HAVE_MEMCHR -DEFI_HAVE_STRRCHR \ -DEFI_HAVE_STRCMP -fno-builtin -fpic \ - $(call cc-option,-mno-single-pic-base) + $(call cc-option,-mno-single-pic-base) \ + $(DISABLE_STACKLEAK_PLUGIN) cflags-$(CONFIG_RISCV) += -fpic -DNO_ALTERNATIVE -mno-relax cflags-$(CONFIG_LOONGARCH) += -fpie -- 2.34.1 . From: "Peng Fan (OSS)" To: abelvesa@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com Cc: imx@lists.linux.dev, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan , kernel test robot Subject: [PATCH] clk: imx: composite-7ulp: Use NULL instead of 0 Date: Mon, 24 Jun 2024 10:43:51 +0800 Message-Id: <20240624024351.488492-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256328 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.kernel.vger.linux-clk Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Peng Fan Address the sparse warnings " sparse warnings: (new ones prefixed by >>) >> drivers/clk/imx/clk-composite-7ulp.c:85:24: sparse: sparse: Using plain integer as NULL pointer " Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202406220536.JnAncjqz-lkp@intel.com/ Signed-off-by: Peng Fan --- V1: Since the orignal patch is still in linux-next tree, so not add fixes tag drivers/clk/imx/clk-composite-7ulp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/imx/clk-composite-7ulp.c b/drivers/clk/imx/clk-composite-7ulp.c index db7f40b07d1a..8ed2e0ad2769 100644 --- a/drivers/clk/imx/clk-composite-7ulp.c +++ b/drivers/clk/imx/clk-composite-7ulp.c @@ -82,7 +82,7 @@ static struct clk_hw *imx_ulp_clk_hw_composite(const char *name, val = readl(reg); if (!(val & PCG_PR_MASK)) { pr_info("PCC PR is 0 for clk:%s, bypass\n", name); - return 0; + return NULL; } if (mux_present) { -- 2.37.1 . From: Jiapeng Chong To: yannick.fertre@foss.st.com Cc: raphael.gallais-pou@foss.st.com, philippe.cornu@foss.st.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, dri-devel@lists.freedesktop.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] drm/stm: ltdc: Remove unused function plane_to_ltdc Date: Mon, 24 Jun 2024 10:41:13 +0800 Message-Id: <20240624024113.54850-1-jiapeng.chong@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256332 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The function are defined in the ltdc.c file, but not called anywhere, so delete the unused function. drivers/gpu/drm/stm/ltdc.c:494:35: warning: unused function 'encoder_to_ltdc'. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9403 Signed-off-by: Jiapeng Chong --- drivers/gpu/drm/stm/ltdc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index 5576fdae4962..3f280155e25c 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -491,11 +491,6 @@ static inline struct ltdc_device *plane_to_ltdc(struct drm_plane *plane) return (struct ltdc_device *)plane->dev->dev_private; } -static inline struct ltdc_device *encoder_to_ltdc(struct drm_encoder *enc) -{ - return (struct ltdc_device *)enc->dev->dev_private; -} - static inline enum ltdc_pix_fmt to_ltdc_pixelformat(u32 drm_fmt) { enum ltdc_pix_fmt pf; -- 2.20.1.7.g153144c . From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Will Deacon , Robin Murphy , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/1] iommu/vt-d: Remove comment for def_domain_type Date: Mon, 24 Jun 2024 10:43:27 +0800 Message-Id: <20240624024327.234979-1-baolu.lu@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256334 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The comment for def_domain_type is outdated. Part of it is irrelevant. Furthermore, it could just be deleted since the iommu_ops::def_domain_type callback is properly documented in iommu.h, so individual implementations shouldn't need to repeat that. Remove it to avoid confusion. Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index ccde5f5972e4..640081933aed 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -2177,17 +2177,6 @@ static bool device_rmrr_is_relaxable(struct device *dev) return false; } -/* - * Return the required default domain type for a specific device. - * - * @dev: the device in query - * @startup: true if this is during early boot - * - * Returns: - * - IOMMU_DOMAIN_DMA: device requires a dynamic mapping domain - * - IOMMU_DOMAIN_IDENTITY: device requires an identical mapping domain - * - 0: both identity and dynamic domains work for this device - */ static int device_def_domain_type(struct device *dev) { if (dev_is_pci(dev)) { -- 2.34.1 . From: Ma Ke To: harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, wenjing.liu@amd.com, jun.lei@amd.com, hamza.mahfooz@amd.com, alex.hung@amd.com, alvin.lee2@amd.com, george.shen@amd.com, dillon.varone@amd.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH] drm/amd/display: Check pipe_ctx before it is used Date: Mon, 24 Jun 2024 10:48:35 +0800 Message-Id: <20240624024835.2278651-1-make24@iscas.ac.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256335 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail resource_get_otg_master_for_stream() could return NULL, we should check the return value of 'otg_master' before it is used in resource_log_pipe_for_stream(). Signed-off-by: Ma Ke --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c index 15819416a2f3..597ca9f369c6 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -2279,6 +2279,8 @@ void resource_log_pipe_topology_update(struct dc *dc, struct dc_state *state) state->stream_status[stream_idx].mall_stream_config.paired_stream); otg_master = resource_get_otg_master_for_stream( &state->res_ctx, state->streams[phantom_stream_idx]); + if (!otg_master) + continue; resource_log_pipe_for_stream(dc, state, otg_master, stream_idx); } } -- 2.25.1 . From: Jiapeng Chong To: djakov@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] interconnect: mediatek: remove unneeded semicolon Date: Mon, 24 Jun 2024 10:53:26 +0800 Message-Id: <20240624025326.69551-1-jiapeng.chong@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256336 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail No functional modification involved. ./drivers/interconnect/mediatek/icc-emi.c:71:2-3: Unneeded semicolon. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9401 Signed-off-by: Jiapeng Chong --- drivers/interconnect/mediatek/icc-emi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/interconnect/mediatek/icc-emi.c b/drivers/interconnect/mediatek/icc-emi.c index d420c55682d0..7da740b5fa8d 100644 --- a/drivers/interconnect/mediatek/icc-emi.c +++ b/drivers/interconnect/mediatek/icc-emi.c @@ -68,7 +68,7 @@ static int mtk_emi_icc_set(struct icc_node *src, struct icc_node *dst) default: dev_err(src->provider->dev, "Unknown endpoint %u\n", node->ep); return -EINVAL; - }; + } return 0; } -- 2.20.1.7.g153144c . From: Chris Packham To: andrew@lunn.ch, f.fainelli@gmail.com, olteanv@gmail.com Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Chris Packham , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= , Landen Chao , DENG Qingfang , Sean Wang , Daniel Golle Subject: [PATCH] dt-bindings: net: dsa: mediatek,mt7530: Minor grammar fixes Date: Mon, 24 Jun 2024 14:58:11 +1200 Message-ID: <20240624025812.1729229-1-chris.packham@alliedtelesis.co.nz> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SEG-SpamProfiler-Analysis: v=2.4 cv=CvQccW4D c=1 sm=1 tr=0 ts=6678e0c8 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=T1WGqf2p2xoA:10 a=Mc0CNVgLlbBwIVVfR90A:9 a=3ZKOabzyN94A:10 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256337 org.kernel.vger.netdev:354828 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-devicetree,org.kernel.vger.netdev Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Update the mt7530 binding with some minor updates that make the document easier to read. Signed-off-by: Chris Packham --- Notes: I was referring to this dt binding and found a couple of places where the wording could be improved. I'm not exactly a techical writer but hopefully I've made things a bit better. .../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.ya= ml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml index 1c2444121e60..6c0abb020631 100644 --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml @@ -22,16 +22,16 @@ description: | =20 The MT7988 SoC comes with a built-in switch similar to MT7531 as well = as four Gigabit Ethernet PHYs. The switch registers are directly mapped into t= he SoC's - memory map rather than using MDIO. The switch got an internally connec= ted 10G + memory map rather than using MDIO. The switch has an internally connec= ted 10G CPU port and 4 user ports connected to the built-in Gigabit Ethernet P= HYs. =20 - MT7530 in MT7620AN, MT7620DA, MT7620DAN and MT7620NN SoCs has got 10/1= 00 PHYs + MT7530 in MT7620AN, MT7620DA, MT7620DAN and MT7620NN SoCs have 10/100 = PHYs and the switch registers are directly mapped into SoC's memory map rat= her than using MDIO. The DSA driver currently doesn't support MT7620 variants. =20 There is only the standalone version of MT7531. =20 - Port 5 on MT7530 has got various ways of configuration: + Port 5 on MT7530 supports various configurations: =20 - Port 5 can be used as a CPU port. =20 --=20 2.45.2 . From: "Ethan D. Twardy" To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Martin Rodriguez Reboredo , "Ethan D. Twardy" , Trevor Gross , Aswin Unnikrishnan , rust-for-linux@vger.kernel.org (open list:RUST), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 0/4] Enable rustdoc tests for the macros crate Date: Sun, 23 Jun 2024 22:03:02 -0500 Message-ID: <20240624030327.90301-1-ethan.twardy@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256339 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.rust-for-linux Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patch series addresses GitHub issue Rust-For-Linux/linux#1076 by enabling the rustdoc tests for the macros crate and updating kbuild to compile these tests with appropriate dependencies respected. Reviewers: Please pay particular attention to the Kbuild changes in rust/Makefile. I appreciate your time in reviewing this series! Ethan D. Twardy (4): kbuild: rust: Expand rusttest target for macros rust: Enable test for macros::module rust: macros: Enable use from macro_rules! rust: macros: Enable the rest of the tests rust/Makefile | 37 ++++++++++++- rust/macros/lib.rs | 127 ++++++++++++++++++++++++++++++++----------- rust/macros/paste.rs | 15 ++++- 3 files changed, 142 insertions(+), 37 deletions(-) base-commit: a126eca844353360ebafa9088d22865cb8e022e3 -- 2.44.2 . From: Jeongjun Park To: clm@fb.com, dsterba@suse.com, josef@toxicpanda.com Cc: syzbot+a0d1f7e26910be4dc171@syzkaller.appspotmail.com, fdmanana@suse.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com, Jeongjun Park Subject: [PATCH] btrfs: qgroup: fix slab-out-of-bounds in btrfs_qgroup_inherit Date: Mon, 24 Jun 2024 12:07:20 +0900 Message-Id: <20240624030720.137753-1-aha310510@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256345 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-btrfs Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail If a value exists in inherit->num_ref_copies or inherit->num_excl_copies, an out-of-bounds vulnerability occurs. Therefore, you need to add code to check the presence or absence of that value. Regards. Jeongjun Park. Reported-by: syzbot+a0d1f7e26910be4dc171@syzkaller.appspotmail.com Fixes: 3f5e2d3b3877 ("Btrfs: fix missing check in the btrfs_qgroup_inherit()") Signed-off-by: Jeongjun Park --- fs/btrfs/qgroup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/btrfs/qgroup.c b /fs/btrfs/qgroup.c index fc2a7ea26354..23beac746637 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -3270,6 +3270,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, } if (inherit) { + if (inherit->num_ref_copies > 0 || inherit->num_excl_copies > 0) { + ret = -EINVAL; + goto out; + } i_qgroups = (u64 *)(inherit + 1); nums = inherit->num_qgroups + 2 * inherit->num_ref_copies + 2 * inherit->num_excl_copies; -- . From: Jiapeng Chong To: harry.wentland@amd.com Cc: sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jiapeng Chong , Abaci Robot Subject: [PATCH] drm/amd/display: Use ARRAY_SIZE for array length Date: Mon, 24 Jun 2024 11:11:58 +0800 Message-Id: <20240624031158.98502-1-jiapeng.chong@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256346 Newsgroups: org.kernel.vger.linux-kernel,org.freedesktop.lists.dri-devel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Use of macro ARRAY_SIZE to calculate array size minimizes the redundant code and improves code reusability. ./drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c:164:45-46: WARNING: Use ARRAY_SIZE. ./drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c:183:47-48: WARNING: Use ARRAY_SIZE. ./drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c:237:45-46: WARNING: Use ARRAY_SIZE. ./drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c:257:47-48: WARNING: Use ARRAY_SIZE. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=9405 Signed-off-by: Jiapeng Chong --- drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c index 1b2df97226a3..7ecf76aea950 100644 --- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c +++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c @@ -161,8 +161,7 @@ static enum mod_hdcp_status read(struct mod_hdcp *hdcp, return MOD_HDCP_STATUS_DDC_FAILURE; if (is_dp_hdcp(hdcp)) { - int num_dpcd_addrs = sizeof(hdcp_dpcd_addrs) / - sizeof(hdcp_dpcd_addrs[0]); + int num_dpcd_addrs = ARRAY_SIZE(hdcp_dpcd_addrs); if (msg_id >= num_dpcd_addrs) return MOD_HDCP_STATUS_DDC_FAILURE; @@ -180,8 +179,7 @@ static enum mod_hdcp_status read(struct mod_hdcp *hdcp, data_offset += cur_size; } } else { - int num_i2c_offsets = sizeof(hdcp_i2c_offsets) / - sizeof(hdcp_i2c_offsets[0]); + int num_i2c_offsets = ARRAY_SIZE(hdcp_i2c_offsets); if (msg_id >= num_i2c_offsets) return MOD_HDCP_STATUS_DDC_FAILURE; @@ -234,8 +232,7 @@ static enum mod_hdcp_status write(struct mod_hdcp *hdcp, return MOD_HDCP_STATUS_DDC_FAILURE; if (is_dp_hdcp(hdcp)) { - int num_dpcd_addrs = sizeof(hdcp_dpcd_addrs) / - sizeof(hdcp_dpcd_addrs[0]); + int num_dpcd_addrs = ARRAY_SIZE(hdcp_dpcd_addrs); if (msg_id >= num_dpcd_addrs) return MOD_HDCP_STATUS_DDC_FAILURE; @@ -254,8 +251,7 @@ static enum mod_hdcp_status write(struct mod_hdcp *hdcp, data_offset += cur_size; } } else { - int num_i2c_offsets = sizeof(hdcp_i2c_offsets) / - sizeof(hdcp_i2c_offsets[0]); + int num_i2c_offsets = ARRAY_SIZE(hdcp_i2c_offsets); if (msg_id >= num_i2c_offsets) return MOD_HDCP_STATUS_DDC_FAILURE; -- 2.20.1.7.g153144c . From: Lu Baolu To: Joerg Roedel , Kevin Tian , Yi Liu , Jacob Pan Cc: Will Deacon , Robin Murphy , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/1] iommu/vt-d: Remove control over Execute-Requested requests Date: Mon, 24 Jun 2024 11:23:51 +0800 Message-Id: <20240624032351.249858-1-baolu.lu@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256349 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The VT-d specification has removed architectural support of the requests with pasid with a value of 1 for Execute-Requested (ER). And the NXE bit in the pasid table entry and XD bit in the first-stage paging Entries are deprecated accordingly. Remove the programming of these bits to make it consistent with the spec. Suggested-by: Jacob Pan Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.h | 6 ++---- drivers/iommu/intel/pasid.h | 10 ---------- drivers/iommu/intel/iommu.c | 4 ++-- drivers/iommu/intel/pasid.c | 1 - 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index eaf015b4353b..9a3b064126de 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -49,7 +49,6 @@ #define DMA_FL_PTE_US BIT_ULL(2) #define DMA_FL_PTE_ACCESS BIT_ULL(5) #define DMA_FL_PTE_DIRTY BIT_ULL(6) -#define DMA_FL_PTE_XD BIT_ULL(63) #define DMA_SL_PTE_DIRTY_BIT 9 #define DMA_SL_PTE_DIRTY BIT_ULL(DMA_SL_PTE_DIRTY_BIT) @@ -831,11 +830,10 @@ static inline void dma_clear_pte(struct dma_pte *pte) static inline u64 dma_pte_addr(struct dma_pte *pte) { #ifdef CONFIG_64BIT - return pte->val & VTD_PAGE_MASK & (~DMA_FL_PTE_XD); + return pte->val & VTD_PAGE_MASK; #else /* Must have a full atomic 64-bit read */ - return __cmpxchg64(&pte->val, 0ULL, 0ULL) & - VTD_PAGE_MASK & (~DMA_FL_PTE_XD); + return __cmpxchg64(&pte->val, 0ULL, 0ULL) & VTD_PAGE_MASK; #endif } diff --git a/drivers/iommu/intel/pasid.h b/drivers/iommu/intel/pasid.h index da9978fef7ac..dde6d3ba5ae0 100644 --- a/drivers/iommu/intel/pasid.h +++ b/drivers/iommu/intel/pasid.h @@ -247,16 +247,6 @@ static inline void pasid_set_page_snoop(struct pasid_entry *pe, bool value) pasid_set_bits(&pe->val[1], 1 << 23, value << 23); } -/* - * Setup No Execute Enable bit (Bit 133) of a scalable mode PASID - * entry. It is required when XD bit of the first level page table - * entry is about to be set. - */ -static inline void pasid_set_nxe(struct pasid_entry *pe) -{ - pasid_set_bits(&pe->val[2], 1 << 5, 1 << 5); -} - /* * Setup the Page Snoop (PGSNP) field (Bit 88) of a scalable mode * PASID entry. diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 2e9811bf2a4e..0ea1f2183f93 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -854,7 +854,7 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain, domain_flush_cache(domain, tmp_page, VTD_PAGE_SIZE); pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE; if (domain->use_first_level) - pteval |= DMA_FL_PTE_XD | DMA_FL_PTE_US | DMA_FL_PTE_ACCESS; + pteval |= DMA_FL_PTE_US | DMA_FL_PTE_ACCESS; tmp = 0ULL; if (!try_cmpxchg64(&pte->val, &tmp, pteval)) @@ -1872,7 +1872,7 @@ __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn, attr = prot & (DMA_PTE_READ | DMA_PTE_WRITE | DMA_PTE_SNP); attr |= DMA_FL_PTE_PRESENT; if (domain->use_first_level) { - attr |= DMA_FL_PTE_XD | DMA_FL_PTE_US | DMA_FL_PTE_ACCESS; + attr |= DMA_FL_PTE_US | DMA_FL_PTE_ACCESS; if (prot & DMA_PTE_WRITE) attr |= DMA_FL_PTE_DIRTY; } diff --git a/drivers/iommu/intel/pasid.c b/drivers/iommu/intel/pasid.c index abce19e2ad6f..aabcdf756581 100644 --- a/drivers/iommu/intel/pasid.c +++ b/drivers/iommu/intel/pasid.c @@ -333,7 +333,6 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu, pasid_set_domain_id(pte, did); pasid_set_address_width(pte, iommu->agaw); pasid_set_page_snoop(pte, !!ecap_smpwc(iommu->ecap)); - pasid_set_nxe(pte); /* Setup Present and PASID Granular Transfer Type: */ pasid_set_translation_type(pte, PASID_ENTRY_PGTT_FL_ONLY); -- 2.34.1 . From: Shengjiu Wang To: p.zabel@pengutronix.de, abelvesa@kernel.org, peng.fan@nxp.com, mturquette@baylibre.com, sboyd@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, marex@denx.de, linux-clk@vger.kernel.org, imx@lists.linux.dev, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com Subject: [PATCH v9] reset: imx8mp-audiomix: Add AudioMix Block Control reset driver Date: Mon, 24 Jun 2024 11:39:05 +0800 Message-Id: <1719200345-32006-1-git-send-email-shengjiu.wang@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256354 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.imx,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add support for the resets on i.MX8MP Audio Block Control module, which includes the EARC PHY software reset and EARC controller software reset. The reset controller is created using the auxiliary device framework and set up in the clock driver. Signed-off-by: Shengjiu Wang Reviewed-by: Marco Felsch --- changes in v9: - only send this commits because others have been applied - remove depends on in config - add spin lock - call iounmmap() changes in v8: https://lore.kernel.org/linux-arm-kernel/27ea1bf7de6f349426fcd7ddb056a1adfae47c73.camel@pengutronix.de/T/ drivers/reset/Kconfig | 7 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-imx8mp-audiomix.c | 128 ++++++++++++++++++++++++++ 3 files changed, 136 insertions(+) create mode 100644 drivers/reset/reset-imx8mp-audiomix.c diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 7112f5932609..509f70e5c4c0 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -91,6 +91,13 @@ config RESET_IMX7 help This enables the reset controller driver for i.MX7 SoCs. +config RESET_IMX8MP_AUDIOMIX + tristate "i.MX8MP AudioMix Reset Driver" + select AUXILIARY_BUS + default CLK_IMX8MP + help + This enables the reset controller driver for i.MX8MP AudioMix + config RESET_INTEL_GW bool "Intel Reset Controller Driver" depends on X86 || COMPILE_TEST diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index fd8b49fa46fc..a6796e83900b 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_RESET_BRCMSTB_RESCAL) += reset-brcmstb-rescal.o obj-$(CONFIG_RESET_GPIO) += reset-gpio.o obj-$(CONFIG_RESET_HSDK) += reset-hsdk.o obj-$(CONFIG_RESET_IMX7) += reset-imx7.o +obj-$(CONFIG_RESET_IMX8MP_AUDIOMIX) += reset-imx8mp-audiomix.o obj-$(CONFIG_RESET_INTEL_GW) += reset-intel-gw.o obj-$(CONFIG_RESET_K210) += reset-k210.o obj-$(CONFIG_RESET_LANTIQ) += reset-lantiq.o diff --git a/drivers/reset/reset-imx8mp-audiomix.c b/drivers/reset/reset-imx8mp-audiomix.c new file mode 100644 index 000000000000..6e3f3069f727 --- /dev/null +++ b/drivers/reset/reset-imx8mp-audiomix.c @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright 2024 NXP + */ + +#include +#include +#include +#include +#include +#include +#include + +#define EARC 0x200 +#define EARC_RESET_MASK 0x3 + +struct imx8mp_audiomix_reset { + struct reset_controller_dev rcdev; + spinlock_t lock; /* protect register read-modify-write cycle */ + void __iomem *base; +}; + +static struct imx8mp_audiomix_reset *to_imx8mp_audiomix_reset(struct reset_controller_dev *rcdev) +{ + return container_of(rcdev, struct imx8mp_audiomix_reset, rcdev); +} + +static int imx8mp_audiomix_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct imx8mp_audiomix_reset *priv = to_imx8mp_audiomix_reset(rcdev); + void __iomem *reg_addr = priv->base; + unsigned int mask, reg; + unsigned long flags; + + mask = BIT(id); + spin_lock_irqsave(&priv->lock, flags); + reg = readl(reg_addr + EARC); + writel(reg & ~mask, reg_addr + EARC); + spin_unlock_irqrestore(&priv->lock, flags); + + return 0; +} + +static int imx8mp_audiomix_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + struct imx8mp_audiomix_reset *priv = to_imx8mp_audiomix_reset(rcdev); + void __iomem *reg_addr = priv->base; + unsigned int mask, reg; + unsigned long flags; + + mask = BIT(id); + spin_lock_irqsave(&priv->lock, flags); + reg = readl(reg_addr + EARC); + writel(reg | mask, reg_addr + EARC); + spin_unlock_irqrestore(&priv->lock, flags); + + return 0; +} + +static const struct reset_control_ops imx8mp_audiomix_reset_ops = { + .assert = imx8mp_audiomix_reset_assert, + .deassert = imx8mp_audiomix_reset_deassert, +}; + +static int imx8mp_audiomix_reset_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id) +{ + struct imx8mp_audiomix_reset *priv; + struct device *dev = &adev->dev; + int ret; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + spin_lock_init(&priv->lock); + + priv->rcdev.owner = THIS_MODULE; + priv->rcdev.nr_resets = fls(EARC_RESET_MASK); + priv->rcdev.ops = &imx8mp_audiomix_reset_ops; + priv->rcdev.of_node = dev->parent->of_node; + priv->rcdev.dev = dev; + priv->rcdev.of_reset_n_cells = 1; + priv->base = of_iomap(dev->parent->of_node, 0); + if (!priv->base) + return -ENOMEM; + + dev_set_drvdata(dev, priv); + + ret = devm_reset_controller_register(dev, &priv->rcdev); + if (ret) + goto out_unmap; + + return 0; + +out_unmap: + iounmap(priv->base); + return ret; +} + +static void imx8mp_audiomix_reset_remove(struct auxiliary_device *adev) +{ + struct imx8mp_audiomix_reset *priv = dev_get_drvdata(&adev->dev); + + iounmap(priv->base); +} + +static const struct auxiliary_device_id imx8mp_audiomix_reset_ids[] = { + { + .name = "clk_imx8mp_audiomix.reset", + }, + { } +}; +MODULE_DEVICE_TABLE(auxiliary, imx8mp_audiomix_reset_ids); + +static struct auxiliary_driver imx8mp_audiomix_reset_driver = { + .probe = imx8mp_audiomix_reset_probe, + .remove = imx8mp_audiomix_reset_remove, + .id_table = imx8mp_audiomix_reset_ids, +}; + +module_auxiliary_driver(imx8mp_audiomix_reset_driver); + +MODULE_AUTHOR("Shengjiu Wang "); +MODULE_DESCRIPTION("Freescale i.MX8MP Audio Block Controller reset driver"); +MODULE_LICENSE("GPL"); -- 2.34.1 . Date: Mon, 24 Jun 2024 12:20:21 +0800 From: kernel test robot To: Jiaxun Yang Cc: oe-kbuild-all@lists.linux.dev, linux-kernel@vger.kernel.org, Thomas Bogendoerfer Subject: error: ABI 'o32' is not supported on CPU 'mips4' Message-ID: <202406241220.InhXAWQe-lkp@intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256362 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.oe-kbuild-all Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master head: f2661062f16b2de5d7b6a5c42a9a5c96326b8454 commit: bfc0a330c1b4526b88f6f9e711484b342cb00fb5 MIPS: Fallback CPU -march flag to ISA level if unsupported date: 4 months ago config: mips-randconfig-r062-20240624 (https://download.01.org/0day-ci/archive/20240624/202406241220.InhXAWQe-lkp@intel.com/config) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240624/202406241220.InhXAWQe-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-kbuild-all/202406241220.InhXAWQe-lkp@intel.com/ All errors (new ones prefixed by >>): >> error: ABI 'o32' is not supported on CPU 'mips4' scripts/genksyms/parse.y: warning: 9 shift/reduce conflicts [-Wconflicts-sr] scripts/genksyms/parse.y: warning: 5 reduce/reduce conflicts [-Wconflicts-rr] scripts/genksyms/parse.y: note: rerun with option '-Wcounterexamples' to generate conflict counterexamples >> error: ABI 'o32' is not supported on CPU 'mips4' >> error: ABI 'o32' is not supported on CPU 'mips4' make[3]: *** [scripts/Makefile.build:243: scripts/mod/empty.o] Error 1 make[3]: *** [scripts/Makefile.build:116: scripts/mod/devicetable-offsets.s] Error 1 make[3]: Target 'scripts/mod/' not remade because of errors. make[2]: *** [Makefile:1198: prepare0] Error 2 make[2]: Target 'prepare' not remade because of errors. make[1]: *** [Makefile:240: __sub-make] Error 2 make[1]: Target 'prepare' not remade because of errors. make: *** [Makefile:240: __sub-make] Error 2 make: Target 'prepare' not remade because of errors. -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki . X-CID-INFO: VERSION:1.1.38,REQID:53c491e2-b8da-4ec8-862d-4f50d5d39a69,IP:15,UR L:0,TC:0,Content:0,EDM:25,RT:0,SF:5,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:45 X-User: lizhenneng@kylinos.cn From: Zhenneng Li To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] migrate_pages: modify max number of pages to migrate in batch Date: Mon, 24 Jun 2024 12:41:40 +0800 Message-Id: <20240624044140.117196-1-lizhenneng@kylinos.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256368 org.kvack.linux-mm:201050 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail We restrict the number of pages to be migrated to no more than HPAGE_PMD_NR or NR_MAX_BATCHED_MIGRATION, but in fact, the number of pages to be migrated may reach 2*HPAGE_PMD_NR-1 or 2 *NR_MAX_BATCHED_MIGRATION-1, it's not in inconsistent with the context. Please refer to the patch: 42012e0436d4(migrate_pages: restrict number of pages to migrate in batch) Signed-off-by: Zhenneng Li --- mm/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index 781979567f64..7a4b37aac9e8 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1961,7 +1961,7 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio, break; } if (nr_pages >= NR_MAX_BATCHED_MIGRATION) - list_cut_before(&folios, from, &folio2->lru); + list_cut_before(&folios, from, &folio->lru); else list_splice_init(from, &folios); if (mode == MIGRATE_ASYNC) -- 2.25.1 . From: Jagadeesh Kona To: Bjorn Andersson , Michael Turquette , Stephen Boyd , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Mauro Carvalho Chehab , Ulf Hansson , "Rafael J . Wysocki" , Kevin Hilman , Pavel Machek , Len Brown , Greg Kroah-Hartman , Konrad Dybcio , "Andy Gross" , Dmitry Baryshkov , Abel Vesa CC: , , , , , Taniya Das , "Jagadeesh Kona" , Satya Priya Kakitapalli , Imran Shaik , "Ajit Pandey" Subject: [PATCH V7 0/5] Add control for switching back and forth to HW control Date: Mon, 24 Jun 2024 10:18:04 +0530 Message-ID: <20240624044809.17751-1-quic_jkona@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-QCInternal: smtphost Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256372 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-clk,org.kernel.vger.linux-media,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series adds support for dev_pm_genpd_set_hwmode() and dev_pm_genpd_get_hwmode() APIs and support in gdsc genpd provider drivers to register respective callbacks and a venus consumer driver example using above API to switch the power domain(GDSC) to HW/SW modes dynamically at runtime. Changes in V7: - [PATCH 3/5]: Updated the comment description in gdsc_set_hwmode as per V6 review comments - Added R-By tags received on V6 - Link to V6: https://lore.kernel.org/all/20240619141413.7983-1-quic_jkona@quicinc.com/ Changes in V6: - [PATCH 3/5]: Added details for 1usec delay in gdsc_set_hwmode() - [PATCH 4/5]: Updated commit text - Added R-By and T-By tags received on V5 RESEND - Link to V5 RESEND: https://lore.kernel.org/all/20240413152013.22307-1-quic_jkona@quicinc.com/ - Link to V5: https://lore.kernel.org/all/20240315111046.22136-1-quic_jkona@quicinc.com/ Changes in V5: - Updated 1st patch as per V4 review comments to synchronize the initial HW mode state by invoking ->get_hwmode_dev()callback in genpd_add_device() - With above change, SW cached hwmode will contain correct value initially, and it will be updated everytime mode is changed in set_hwmode, hence updated dev_pm_genpd_get_hwmode() to just return SW cached hwmode in 1st patch - Updated commit text for 1st, 3rd, 4th and 5th patches - Updated 3rd and 5th patches as per review comments received on V4 series - Added R-By tags received in older series to 1st and 2nd patches - Link to V4: https://lore.kernel.org/all/20240122-gdsc-hwctrl-v4-0-9061e8a7aa07@linaro.org/ Changes in V4: - Re-worded 1st patch commit message, as per Bjorn's suggestion, and added Dmitry's R-b tag - Added Bjorn's and Dmitry's R-b tags to the 2nd patch - Re-worded 3rd patch commit message, to better explain the HW_CTRL_TRIGGER flag. - Added mode transition delay when setting mode for GDSC - Added status polling if GDSSC is enabled when transitioning from HW to SW - Re-worded 4th patch commit message to better explain why the HW_CTRL_TRIGGER needs to be used instead - Drop changes to SC7180, SDM845 and SM8550 video CC drivers, as only SC7280 and SM8250 have been tested so far. More platforms (with v6 venus) will be added eventually. - Call genpd set_hwmode API only for v6 and dropped the vcodec_pmdomains_hwctrl. - Re-worded 5th patch commit message accordingly. - Link to V3: https://lore.kernel.org/lkml/20230823114528.3677667-1-abel.vesa@linaro.org/ Changes in V3: - 5th patch has been squashed in the 4th one - Link to V2: https://lore.kernel.org/lkml/20230816145741.1472721-1-abel.vesa@linaro.org/ Changes in V2: - patch for printing domain HW-managed mode in the summary - patch that adds one consumer (venus) - patch for gdsc with new (different) flag - patch for videocc GDSC provider to update flags - Link to V1: https://lore.kernel.org/all/20230628105652.1670316-1-abel.vesa@linaro.org/ Abel Vesa (1): PM: domains: Add the domain HW-managed mode to the summary Jagadeesh Kona (3): clk: qcom: gdsc: Add set and get hwmode callbacks to switch GDSC mode clk: qcom: videocc: Use HW_CTRL_TRIGGER for SM8250, SC7280 vcodec GDSC's venus: pm_helpers: Use dev_pm_genpd_set_hwmode to switch GDSC mode on V6 Ulf Hansson (1): PM: domains: Allow devices attached to genpd to be managed by HW drivers/clk/qcom/gdsc.c | 41 ++++++++++ drivers/clk/qcom/gdsc.h | 1 + drivers/clk/qcom/videocc-sc7280.c | 2 +- drivers/clk/qcom/videocc-sm8250.c | 4 +- .../media/platform/qcom/venus/pm_helpers.c | 39 ++++++---- drivers/pmdomain/core.c | 78 ++++++++++++++++++- include/linux/pm_domain.h | 17 ++++ 7 files changed, 161 insertions(+), 21 deletions(-) -- 2.43.0 . X-ME-Helo: fedora.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Mon, 24 Jun 2024 06:40:45 +0200 X-ME-IP: 86.243.222.230 From: Christophe JAILLET To: Benoit Parrot , Mauro Carvalho Chehab Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-media@vger.kernel.org Subject: [PATCH] media: ti: cal: Constify struct media_entity_operations Date: Mon, 24 Jun 2024 06:40:38 +0200 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256378 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kernel-janitors,org.kernel.vger.linux-media Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail 'struct media_entity_operations' is not modified in this driver. Constifying this structure moves some data to a read-only section, so increase overall security. On a x86_64, with allmodconfig, as an example: Before: ====== text data bss dec hex filename 20694 1394 32 22120 5668 drivers/media/platform/ti/cal/cal-camerarx.o After: ===== text data bss dec hex filename 20726 1362 32 22120 5668 drivers/media/platform/ti/cal/cal-camerarx.o Signed-off-by: Christophe JAILLET --- Compile tested-only --- drivers/media/platform/ti/cal/cal-camerarx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/ti/cal/cal-camerarx.c b/drivers/media/platform/ti/cal/cal-camerarx.c index 4afc2ad00330..42dfe08b765f 100644 --- a/drivers/media/platform/ti/cal/cal-camerarx.c +++ b/drivers/media/platform/ti/cal/cal-camerarx.c @@ -798,7 +798,7 @@ static const struct v4l2_subdev_internal_ops cal_camerarx_internal_ops = { .init_state = cal_camerarx_sd_init_state, }; -static struct media_entity_operations cal_camerarx_media_ops = { +static const struct media_entity_operations cal_camerarx_media_ops = { .link_validate = v4l2_subdev_link_validate, }; -- 2.45.2 . X-CID-INFO: VERSION:1.1.38,REQID:513e5f83-4bc0-4c29-9adf-5881a04f0a2b,IP:15,UR L:0,TC:0,Content:0,EDM:-25,RT:0,SF:-1,FILE:0,BULK:0,RULE:EDM_GE969F26,ACTI ON:release,TS:-11 X-User: lizhenneng@kylinos.cn From: Zhenneng Li To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Zhenneng Li Subject: [PATCH] migrate_pages: modify max number of pages to migrate in batch Date: Mon, 24 Jun 2024 12:51:20 +0800 Message-Id: <20240624045120.121261-1-lizhenneng@kylinos.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256381 org.kvack.linux-mm:201051 Newsgroups: org.kernel.vger.linux-kernel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail We restrict the number of pages to be migrated to no more than HPAGE_PMD_NR or NR_MAX_BATCHED_MIGRATION, but in fact, the number of pages to be migrated may reach 2*HPAGE_PMD_NR-1 or 2 *NR_MAX_BATCHED_MIGRATION-1, it's not in inconsistent with the context. Please refer to the patch: 42012e0436d4(migrate_pages: restrict number of pages to migrate in batch) Signed-off-by: Zhenneng Li --- mm/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index 781979567f64..7a4b37aac9e8 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1961,7 +1961,7 @@ int migrate_pages(struct list_head *from, new_folio_t get_new_folio, break; } if (nr_pages >= NR_MAX_BATCHED_MIGRATION) - list_cut_before(&folios, from, &folio2->lru); + list_cut_before(&folios, from, &folio->lru); else list_splice_init(from, &folios); if (mode == MIGRATE_ASYNC) -- 2.25.1 . From: Varadarajan Narayanan To: , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v2 0/7] Enable CPR for IPQ9574 Date: Mon, 24 Jun 2024 10:32:47 +0530 Message-ID: <20240624050254.2942959-1-quic_varada@quicinc.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-QCInternal: smtphost Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256391 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This series tries to enable CPR on IPQ9574, that implements CPRv4. Since [1] is older, faced few minor issues. Those are addressed in [2]. dt_binding_check and dtbs_check passed. Depends: [1] https://lore.kernel.org/lkml/20230217-topic-cpr3h-v14-0-9fd23241493d@linaro.org/T/ [2] https://github.com/quic-varada/cpr/commits/konrad/ v2: Fix Signed-off-by order in 2 patches Update constraints in qcom,cpr3.yaml Add rbcpr_clk_src registration Add Reviewed-by to one of the patches Not adding Acked-by as the file has changed Varadarajan Narayanan (7): dt-bindings: power: rpmpd: Add IPQ9574 power domains dt-bindings: soc: qcom: cpr3: Add bindings for IPQ9574 pmdomain: qcom: rpmpd: Add IPQ9574 power domains dt-bindings: clock: Add CPR clock defines for IPQ9574 clk: qcom: gcc-ipq9574: Add CPR clock definition soc: qcom: cpr3: Add IPQ9574 definitions dts: arm64: qcom: ipq9574: Enable CPR .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + .../bindings/soc/qcom/qcom,cpr3.yaml | 35 +++ arch/arm64/boot/dts/qcom/ipq9574.dtsi | 269 ++++++++++++++++-- drivers/clk/qcom/gcc-ipq9574.c | 39 +++ drivers/pmdomain/qcom/cpr3.c | 137 +++++++++ drivers/pmdomain/qcom/rpmpd.c | 19 ++ include/dt-bindings/clock/qcom,ipq9574-gcc.h | 2 + include/dt-bindings/power/qcom-rpmpd.h | 3 + 8 files changed, 488 insertions(+), 17 deletions(-) -- 2.34.1 . From: Lu Baolu To: Joerg Roedel , Kevin Tian , Yi Liu , Jacob Pan Cc: Will Deacon , Robin Murphy , iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH 1/2] iommu/vt-d: Convert dmar_ats_supported() to return bool Date: Mon, 24 Jun 2024 13:25:00 +0800 Message-Id: <20240624052501.253405-1-baolu.lu@linux.intel.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256406 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.iommu Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail dmar_ats_supported() returns an integer that is used as a boolean. Since it all it needs is to return true or false, change the return type from int to bool to make it a bit more readable and obvious. Cleanup this helper accordingly with no functional change intended. Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 38cda454fc64..07e394dfccc1 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -3043,15 +3043,15 @@ static struct dmar_satc_unit *dmar_find_matched_satc_unit(struct pci_dev *dev) return satcu; } -static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) +static bool dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) { - int i, ret = 1; - struct pci_bus *bus; struct pci_dev *bridge = NULL; - struct device *tmp; - struct acpi_dmar_atsr *atsr; struct dmar_atsr_unit *atsru; struct dmar_satc_unit *satcu; + struct acpi_dmar_atsr *atsr; + struct pci_bus *bus; + struct device *tmp; + int i; dev = pci_physfn(dev); satcu = dmar_find_matched_satc_unit(dev); @@ -3069,11 +3069,11 @@ static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) bridge = bus->self; /* If it's an integrated device, allow ATS */ if (!bridge) - return 1; + return true; /* Connected via non-PCIe: no ATS */ if (!pci_is_pcie(bridge) || pci_pcie_type(bridge) == PCI_EXP_TYPE_PCI_BRIDGE) - return 0; + return false; /* If we found the root port, look it up in the ATSR */ if (pci_pcie_type(bridge) == PCI_EXP_TYPE_ROOT_PORT) break; @@ -3085,18 +3085,21 @@ static int dmar_ats_supported(struct pci_dev *dev, struct intel_iommu *iommu) if (atsr->segment != pci_domain_nr(dev->bus)) continue; - for_each_dev_scope(atsru->devices, atsru->devices_cnt, i, tmp) - if (tmp == &bridge->dev) - goto out; + for_each_dev_scope(atsru->devices, atsru->devices_cnt, i, tmp) { + if (tmp == &bridge->dev) { + rcu_read_unlock(); + return true; + } + } - if (atsru->include_all) - goto out; + if (atsru->include_all) { + rcu_read_unlock(); + return true; + } } - ret = 0; -out: rcu_read_unlock(); - return ret; + return false; } int dmar_iommu_notify_scope_dev(struct dmar_pci_notify_info *info) -- 2.34.1 . From: Dhananjay Ugwekar To: , , , , , , , , , , , , , , , , , CC: , , , , , , , , , Dhananjay Ugwekar Subject: [PATCH v3 00/10] Add per-core RAPL energy counter support for AMD CPUs Date: Mon, 24 Jun 2024 05:58:57 +0000 Message-ID: <20240624055907.7720-1-Dhananjay.Ugwekar@amd.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256428 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-hardening,org.kernel.vger.linux-perf-users,org.kernel.vger.linux-pm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Currently the energy-cores event in the power PMU aggregates energy consumption data at a package level. On the other hand the core energy RAPL counter in AMD CPUs has a core scope (which means the energy consumption is recorded separately for each core). Earlier efforts to add the core event in the power PMU had failed [1], due to the difference in the scope of these two events. Hence, there is a need for a new core scope PMU. This patchset adds a new "power_per_core" PMU alongside the existing "power" PMU, which will be responsible for collecting the new "energy-per-core" event. Tested the package level and core level PMU counters with workloads pinned to different CPUs. Results with workload pinned to CPU 1 in Core 1 on an AMD Zen4 Genoa machine: $ perf stat -a --per-core -e power_per_core/energy-per-core/ -- sleep 1 Performance counter stats for 'system wide': S0-D0-C0 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C1 1 5.72 Joules power_per_core/energy-per-core/ S0-D0-C2 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C3 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C4 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C5 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C6 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C7 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C8 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C9 1 0.02 Joules power_per_core/energy-per-core/ S0-D0-C10 1 0.02 Joules power_per_core/energy-per-core/ [1]: https://lore.kernel.org/lkml/3e766f0e-37d4-0f82-3868-31b14228868d@linux.intel.com/ This patchset applies cleanly on top of v6.10-rc4 as well as latest tip/master. v3 changes: * Patch 1 added to introduce the logical_core_id which is unique across the system (Prateek) * Use the unique topology_logical_core_id() instead of topology_core_id() (which is only unique within a package on tested AMD and Intel systems) in Patch 10 v2 changes: * Patches 6,7,8 added to split some changes out of the last patch * Use container_of to get the rapl_pmus from event variable (Rui) * Set PERF_EV_CAP_READ_ACTIVE_PKG flag only for pkg scope PMU (Rui) * Use event id 0x1 for energy-per-core event (Rui) * Use PERF_RAPL_PER_CORE bit instead of adding a new flag to check for per-core counter hw support (Rui) Dhananjay Ugwekar (9): perf/x86/rapl: Fix the energy-pkg event for AMD CPUs perf/x86/rapl: Rename rapl_pmu variables perf/x86/rapl: Make rapl_model struct global perf/x86/rapl: Move cpumask variable to rapl_pmus struct perf/x86/rapl: Add wrapper for online/offline functions perf/x86/rapl: Add an argument to the cleanup and init functions perf/x86/rapl: Modify the generic variable names to *_pkg* perf/x86/rapl: Remove the global variable rapl_msrs perf/x86/rapl: Add per-core energy counter support for AMD CPUs K Prateek Nayak (1): x86/topology: Introduce topology_logical_core_id() Documentation/arch/x86/topology.rst | 4 + arch/x86/events/rapl.c | 418 ++++++++++++++++++-------- arch/x86/include/asm/processor.h | 1 + arch/x86/include/asm/topology.h | 1 + arch/x86/kernel/cpu/debugfs.c | 1 + arch/x86/kernel/cpu/topology_common.c | 1 + 6 files changed, 305 insertions(+), 121 deletions(-) -- 2.34.1 . From: Chen-Yu Tsai To: Mark Brown , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , Trevor Wu , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2] ASoC: mediatek: mt8195: Add platform entry for ETDM1_OUT_BE dai link Date: Mon, 24 Jun 2024 14:12:56 +0800 Message-ID: <20240624061257.3115467-1-wenst@chromium.org> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256443 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-mediatek,org.kernel.vger.linux-sound Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Commit e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link") removed the codec entry for the ETDM1_OUT_BE dai link entirely instead of replacing it with COMP_EMPTY(). This worked by accident as the remaining COMP_EMPTY() platform entry became the codec entry, and the platform entry became completely empty, effectively the same as COMP_DUMMY() since snd_soc_fill_dummy_dai() doesn't do anything for platform entries. This causes a KASAN out-of-bounds warning in mtk_soundcard_common_probe() in sound/soc/mediatek/common/mtk-soundcard-driver.c: for_each_card_prelinks(card, i, dai_link) { if (adsp_node && !strncmp(dai_link->name, "AFE_SOF", strlen("AFE_SOF"))) dai_link->platforms->of_node = adsp_node; else if (!dai_link->platforms->name && !dai_link->platforms->of_node) dai_link->platforms->of_node = platform_node; } where the code expects the platforms array to have space for at least one entry. Add an COMP_EMPTY() entry so that dai_link->platforms has space. Fixes: e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link") Signed-off-by: Chen-Yu Tsai --- Changes since v1: - Reword commit message with more details on how the original commit got things wrong, and what this commit adds and fixes --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index ca8751190520..2832ef78eaed 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -827,6 +827,7 @@ SND_SOC_DAILINK_DEFS(ETDM2_IN_BE, SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")), + DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE, -- 2.45.2.741.gdbec12cfda-goog . From: Maxim Anisimov To: Cc: maxim.anisimov.ua@gmail.com, Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Martin Kurbanov , Michael Walle , Mark Brown , "Chia-Lin Kao (AceLan)" , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH] mtd: spinand: Add support for HeYangTek HYF1GQ4UDACAE Date: Mon, 24 Jun 2024 09:12:17 +0300 Message-ID: <20240624061246.5292-1-maxim.anisimov.ua@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256444 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-mtd Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add Support HeYangTek HYF1GQ4UDACAE SPI NAND. Datasheet Link: - https://www.heyangtek.cn/previewfile.jsp?file=ABUIABA9GAAgwsvRnwYo-eDpsgc Signed-off-by: Maxim Anisimov --- drivers/mtd/nand/spi/Makefile | 4 +- drivers/mtd/nand/spi/core.c | 1 + drivers/mtd/nand/spi/heyangtek.c | 112 +++++++++++++++++++++++++++++++ include/linux/mtd/spinand.h | 1 + 4 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 drivers/mtd/nand/spi/heyangtek.c diff --git a/drivers/mtd/nand/spi/Makefile b/drivers/mtd/nand/spi/Makefile index 19cc77288ebb..69d95fbdd0ce 100644 --- a/drivers/mtd/nand/spi/Makefile +++ b/drivers/mtd/nand/spi/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -spinand-objs := core.o alliancememory.o ato.o esmt.o foresee.o gigadevice.o macronix.o -spinand-objs += micron.o paragon.o toshiba.o winbond.o xtx.o +spinand-objs := core.o alliancememory.o ato.o esmt.o foresee.o gigadevice.o heyangtek.o +spinand-objs += macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o obj-$(CONFIG_MTD_SPI_NAND) += spinand.o diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index e0b6715e5dfe..45795e5f1e49 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -942,6 +942,7 @@ static const struct spinand_manufacturer *spinand_manufacturers[] = { &esmt_c8_spinand_manufacturer, &foresee_spinand_manufacturer, &gigadevice_spinand_manufacturer, + &heyangtek_spinand_manufacturer, ¯onix_spinand_manufacturer, µn_spinand_manufacturer, ¶gon_spinand_manufacturer, diff --git a/drivers/mtd/nand/spi/heyangtek.c b/drivers/mtd/nand/spi/heyangtek.c new file mode 100644 index 000000000000..d4a5dbca40fb --- /dev/null +++ b/drivers/mtd/nand/spi/heyangtek.c @@ -0,0 +1,112 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Author: + * Andrey Zolotarev - the main driver logic + * Maxim Anisimov - adaptation to mainline linux kernel + * + * Based on: + * https://github.com/keenetic/kernel-49/commit/bacade569fb12bc0ad31ba09bca9b890118fbca7 + */ + +#include +#include +#include + +#define SPINAND_MFR_HEYANGTEK 0xC9 + +#define STATUS_ECC_LIMIT_BITFLIPS (3 << 4) + +static SPINAND_OP_VARIANTS(read_cache_variants, + SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0), + SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0)); + +static SPINAND_OP_VARIANTS(write_cache_variants, + SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), + SPINAND_PROG_LOAD(true, 0, NULL, 0)); + +static SPINAND_OP_VARIANTS(update_cache_variants, + SPINAND_PROG_LOAD_X4(false, 0, NULL, 0), + SPINAND_PROG_LOAD(false, 0, NULL, 0)); + +static int hyfxgq4uda_ooblayout_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section > 3) + return -ERANGE; + + region->offset = section * 16 + 8; + region->length = 8; + + return 0; +} + +static int hyfxgq4uda_ooblayout_free(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section > 3) + return -ERANGE; + + /* ECC-protected user meta-data */ + region->offset = section * 16 + 4; + region->length = 4; + + return 0; +} + +static const struct mtd_ooblayout_ops hyfxgq4uda_ooblayout = { + .ecc = hyfxgq4uda_ooblayout_ecc, + .free = hyfxgq4uda_ooblayout_free, +}; + +static int hyfxgq4uda_ecc_get_status(struct spinand_device *spinand, + u8 status) +{ + struct nand_device *nand = spinand_to_nand(spinand); + + switch (status & STATUS_ECC_MASK) { + case STATUS_ECC_NO_BITFLIPS: + return 0; + + case STATUS_ECC_UNCOR_ERROR: + return -EBADMSG; + + case STATUS_ECC_HAS_BITFLIPS: + return nanddev_get_ecc_conf(nand)->strength >> 1; + + case STATUS_ECC_LIMIT_BITFLIPS: + return nanddev_get_ecc_conf(nand)->strength; + + default: + break; + } + + return -EINVAL; +} + +static const struct spinand_info heyangtek_spinand_table[] = { + SPINAND_INFO("HYF1GQ4UDACAE", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_ADDR, 0x21), + NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), + NAND_ECCREQ(4, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&hyfxgq4uda_ooblayout, + hyfxgq4uda_ecc_get_status)), +}; + +static const struct spinand_manufacturer_ops heyangtek_spinand_manuf_ops = { +}; + +const struct spinand_manufacturer heyangtek_spinand_manufacturer = { + .id = SPINAND_MFR_HEYANGTEK, + .name = "HeYangTek", + .chips = heyangtek_spinand_table, + .nchips = ARRAY_SIZE(heyangtek_spinand_table), + .ops = &heyangtek_spinand_manuf_ops, +}; diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index 5c19ead60499..06ee35a27e3b 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -265,6 +265,7 @@ extern const struct spinand_manufacturer ato_spinand_manufacturer; extern const struct spinand_manufacturer esmt_c8_spinand_manufacturer; extern const struct spinand_manufacturer foresee_spinand_manufacturer; extern const struct spinand_manufacturer gigadevice_spinand_manufacturer; +extern const struct spinand_manufacturer heyangtek_spinand_manufacturer; extern const struct spinand_manufacturer macronix_spinand_manufacturer; extern const struct spinand_manufacturer micron_spinand_manufacturer; extern const struct spinand_manufacturer paragon_spinand_manufacturer; -- 2.45.1 . From: Jan Kiszka To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Bao Cheng Su , Diogo Ivo Subject: [PATCH 0/4] arm64: dts: k3: Resolve remaining dtbs_check warnings Date: Mon, 24 Jun 2024 08:20:46 +0200 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256451 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This goes on top of https://patchwork.kernel.org/project/linux-arm-kernel/cover/20240518-dt-bindings-ti-soc-mfd-v1-0-b3952f104c9a@linaro.org/ As we are working in this area, having a zero-warning baseline helps a lot finding own issues quicker. Maybe not all of the suggested resolutions are optimal, open for feedback, just want to have them all fixed now soon. Jan Jan Kiszka (4): arm64: dts: ti: k3-j72xx-mcu-wakeup: add dedicated wakeup controller compatible arm64: dts: ti: k3-am642-evm: Silence schema warning dt-bindings: soc: ti: am645-system-controller: add child nodes used by main domain arm64: dts: ti: k3-am65-main: add system controller compatible .../soc/ti/ti,am654-system-controller.yaml | 29 +++++++++++++++++++ arch/arm64/boot/dts/ti/k3-am642-evm.dts | 4 +++ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 +- .../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 2 +- .../boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 +- .../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 +- 6 files changed, 37 insertions(+), 4 deletions(-) -- 2.43.0 . From: =?UTF-8?Q?Aaron?= Reply-To: aaron@xyexpansion.com To: linux-kernel@vger.kernel.org Subject: =?UTF-8?Q?A_factory_you_can_trust?= Date: Mon, 24 Jun 2024 13:50:34 +0800 X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Mark=_1009550050477508" Message-ID: <009A0B8C06180D3223344F799EF2@PC-20240130SRIC> Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256455 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This is a multi-part message in MIME format. --Mark=_1009550050477508 Content-Type: multipart/related; type="multipart/alternative"; boundary="Mark=_100955005047750803" --Mark=_100955005047750803 Content-Type: multipart/alternative; boundary="Mark=_10095500504775044" --Mark=_10095500504775044 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi : I hope your business is getting better! We are a Very big production factory! we produce high quality b= rand for swimwear and yoga and fitness and cycling and some t-shirts an= d beach shorts so on, We have over 2500 workers in our factory. There is no problem for any guest to require any audit report=E3= =80=82 I hope we can become as close as brothers and cooperate for a lo= ng time. We have been doing clothing factory for more than 30 years, I wa= nt to find a few good brothers sincerely good cooperation. we develop t= ogether.and become real good brothers, are you willing ? Whenever you come to China, remember to call me and get togeth= er to eat and talk. I hope your business goes from strength to strength !!! keep i= n touch, my brother friend ! Best regarding. Waitting for your reply. General Manager : Mr.Aaron Email : aaron@xyexpansion.com, Mobile: +86 18965665987 Wechat ID : +86 18965665987 Skype ID : yingtinggao9 Address : Industrial Park,YingLin Town, JinJiang City,FuJian Province,China. Postal code : 362256. --Mark=_10095500504775044-- --Mark=_100955005047750803-- --Mark=_1009550050477508-- . From: Thorsten Blum To: jstultz@google.com, tglx@linutronix.de, sboyd@kernel.org, linux-kernel@vger.kernel.org Cc: Thorsten Blum Subject: [PATCH] timekeeping: Use min() to fix Coccinelle warning Date: Mon, 24 Jun 2024 08:24:12 +0200 Message-ID: <20240624062411.321995-2-thorsten.blum@toblux.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256456 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Fixes the following Coccinelle/coccicheck warning reported by minmax.cocci: WARNING opportunity for min() Signed-off-by: Thorsten Blum --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 4e18db1819f8..f1a9c52b7c66 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -799,7 +799,7 @@ static void timekeeping_forward_now(struct timekeeper *tk) while (delta > 0) { u64 max = tk->tkr_mono.clock->max_cycles; - u64 incr = delta < max ? delta : max; + u64 incr = min(delta, max); tk->tkr_mono.xtime_nsec += incr * tk->tkr_mono.mult; tk->tkr_raw.xtime_nsec += incr * tk->tkr_raw.mult; -- 2.45.2 . From: Chun-Yi Lee X-Google-Original-From: Chun-Yi Lee To: Justin Sanders Cc: Jens Axboe , Pavel Emelianov , Kirill Korotaev , "David S . Miller" , Nicolai Stange , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Chun-Yi Lee Subject: [PATCH v2] aoe: fix the potential use-after-free problem in more places Date: Mon, 24 Jun 2024 14:44:18 +0800 Message-Id: <20240624064418.27043-1-jlee@suse.com> X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Xref: photonic.trudheim.com org.kernel.vger.linux-block:93397 org.kernel.vger.linux-kernel:1256459 Newsgroups: org.kernel.vger.linux-block,org.kernel.vger.linux-kernel,org.kernel.vger.stable Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail For fixing CVE-2023-6270, f98364e92662 ("aoe: fix the potential use-after-free problem in aoecmd_cfg_pkts") makes tx() calling dev_put() instead of doing in aoecmd_cfg_pkts(). It avoids that the tx() runs into use-after-free. Then Nicolai Stange found more places in aoe have potential use-after-free problem with tx(). e.g. revalidate(), aoecmd_ata_rw(), resend(), probe() and aoecmd_cfg_rsp(). Those functions also use aoenet_xmit() to push packet to tx queue. So they should also use dev_hold() to increase the refcnt of skb->dev. Link: https://nvd.nist.gov/vuln/detail/CVE-2023-6270 Fixes: f98364e92662 ("aoe: fix the potential use-after-free problem in aoecmd_cfg_pkts") Reported-by: Nicolai Stange Signed-off-by: Chun-Yi Lee --- v2: - Improve patch description - Improved wording - Add oneline summary of the commit f98364e92662 - Used curly brackets in the if-else blocks. drivers/block/aoe/aoecmd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c index cc9077b588d7..d1f4ddc57645 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c @@ -361,6 +361,7 @@ ata_rw_frameinit(struct frame *f) } ah->cmdstat = ATA_CMD_PIO_READ | writebit | extbit; + dev_hold(t->ifp->nd); skb->dev = t->ifp->nd; } @@ -401,6 +402,8 @@ aoecmd_ata_rw(struct aoedev *d) __skb_queue_head_init(&queue); __skb_queue_tail(&queue, skb); aoenet_xmit(&queue); + } else { + dev_put(f->t->ifp->nd); } return 1; } @@ -483,10 +486,13 @@ resend(struct aoedev *d, struct frame *f) memcpy(h->dst, t->addr, sizeof h->dst); memcpy(h->src, t->ifp->nd->dev_addr, sizeof h->src); + dev_hold(t->ifp->nd); skb->dev = t->ifp->nd; skb = skb_clone(skb, GFP_ATOMIC); - if (skb == NULL) + if (skb == NULL) { + dev_put(t->ifp->nd); return; + } f->sent = ktime_get(); __skb_queue_head_init(&queue); __skb_queue_tail(&queue, skb); @@ -617,6 +623,8 @@ probe(struct aoetgt *t) __skb_queue_head_init(&queue); __skb_queue_tail(&queue, skb); aoenet_xmit(&queue); + } else { + dev_put(f->t->ifp->nd); } } @@ -1395,6 +1403,7 @@ aoecmd_ata_id(struct aoedev *d) ah->cmdstat = ATA_CMD_ID_ATA; ah->lba3 = 0xa0; + dev_hold(t->ifp->nd); skb->dev = t->ifp->nd; d->rttavg = RTTAVG_INIT; @@ -1404,6 +1413,8 @@ aoecmd_ata_id(struct aoedev *d) skb = skb_clone(skb, GFP_ATOMIC); if (skb) f->sent = ktime_get(); + else + dev_put(t->ifp->nd); return skb; } -- 2.35.3 . From: Neha Malcom Francis To: , CC: , , , Subject: [PATCH] soc: ti: k3-socinfo: Add J721E SR2.0 Date: Mon, 24 Jun 2024 12:22:05 +0530 Message-ID: <20240624065205.718449-1-n-francis@ti.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256467 Newsgroups: org.kernel.vger.linux-kernel,org.infradead.lists.linux-arm-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Add support to detect J721E SR2.0 Signed-off-by: Neha Malcom Francis --- drivers/soc/ti/k3-socinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/ti/k3-socinfo.c b/drivers/soc/ti/k3-socinfo.c index 59101bf7cf23..4fb0f0a24828 100644 --- a/drivers/soc/ti/k3-socinfo.c +++ b/drivers/soc/ti/k3-socinfo.c @@ -61,7 +61,7 @@ static const struct k3_soc_id { }; static const char * const j721e_rev_string_map[] = { - "1.0", "1.1", + "1.0", "1.1", "2.0", }; static int -- 2.34.1 . From: Bibo Mao To: Tianrui Zhao , Huacai Chen Cc: WANG Xuerui , Sean Christopherson , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, WANG Rui Subject: [PATCH v3 0/7] LoongArch: KVM: VM migration enhancement Date: Mon, 24 Jun 2024 15:14:15 +0800 Message-Id: <20240624071422.3473789-1-maobibo@loongson.cn> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256483 Newsgroups: org.kernel.vger.linux-kernel,dev.linux.lists.loongarch,org.kernel.vger.kvm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail This patchset is to solve VM migration issues, the first six patches are mmu relative, the last patch is relative with vcpu interrupt status. It fixes potential issue about tlb flush of secondary mmu and huge page selection etc. Also it hardens LoongArch kvm mmu module. With this patchset, VM successfully migrates on my 3C5000 Dual-Way machine with 32 cores. 1. Pass to migrate when unixbench workload runs with 32 vcpus, for some unixbench testcases there is much IPI sending. 2. Pass to migrate with kernel compiling with 8 vcpus in VM 3. Fail to migrate with kernel compiling with 32 vcpus in VM, since there is to much memory writing operation, also there will be file system inode inconsistent error after migration. --- v2 ... v3: 1. Merge patch 7 into this patchset since it is relative with VM migration bugfix. 2. Sync pending interrupt when getting ESTAT register, SW ESTAT register is read after vcpu_put(). 3. Add notation about smp_wmb() when update pmd entry, to elimate checkpatch warning. 4. Remove unnecessary modification about function kvm_pte_huge() in patch 2. 5. Add notation about secondary mmu tlb since it is firstly used here. v1 ... v2: 1. Combine seperate patches into one patchset, all are relative with migration. 2. Mark page accessed without mmu_lock still, however with page ref added --- Bibo Mao (7): LoongArch: KVM: Delay secondary mmu tlb flush until guest entry LoongArch: KVM: Select huge page only if secondary mmu supports it LoongArch: KVM: Discard dirty page tracking on readonly memslot LoongArch: KVM: Add memory barrier before update pmd entry LoongArch: KVM: Add dirty bitmap initially all set support LoongArch: KVM: Mark page accessed and dirty with page ref added LoongArch: KVM: Sync pending interrupt when getting ESTAT from user mode arch/loongarch/include/asm/kvm_host.h | 5 ++ arch/loongarch/include/asm/kvm_mmu.h | 2 +- arch/loongarch/kvm/main.c | 1 + arch/loongarch/kvm/mmu.c | 67 ++++++++++++++++++++------- arch/loongarch/kvm/tlb.c | 5 +- arch/loongarch/kvm/vcpu.c | 29 ++++++++++++ 6 files changed, 86 insertions(+), 23 deletions(-) base-commit: 50736169ecc8387247fe6a00932852ce7b057083 -- 2.39.3 . From: Bastien Curutchet To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Petazzoni , Herve Codina , Christopher Cordahi , Bastien Curutchet Subject: [PATCH] spi: davinci: Unset POWERDOWN bit when releasing resources Date: Mon, 24 Jun 2024 09:17:45 +0200 Message-ID: <20240624071745.17409-1-bastien.curutchet@bootlin.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-Sasl: bastien.curutchet@bootlin.com Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256489 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-spi Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail On the OMAPL138, the SPI reference clock is provided by the Power and Sleep Controller (PSC). The PSC's datasheet says that 'some peripherals have special programming requirements and additional recommended steps you must take before you can invoke the PSC module state transition'. I didn't find more details in documentation but it appears that PSC needs the SPI to clear the POWERDOWN bit before disabling the clock. Indeed, when this bit is set, the PSC gets stuck in transitions from enable to disable state. Clear the POWERDOWN bit when releasing driver's resources Signed-off-by: Bastien Curutchet --- Hi, I ran into this bug by enabling the 'cs-gpio' property. It causes the probe to fail at first with -EPROBE_DEFER because the gpio provider is not ready. So the clock gets disabled. In the clock controller's driver (drivers/clk/davinci/psc.c) the clock_disable() calls a regmap_read_poll_timeout() with an infinite timeout. This poll() polls a transition bit status that never goes down so we end stuck in the middle of the boot sequence. drivers/spi/spi-davinci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index be3998104bfb..f7e8b5efa50e 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -984,6 +984,9 @@ static int davinci_spi_probe(struct platform_device *pdev) return ret; free_dma: + /* This bit needs to be cleared to disable dpsi->clk */ + clear_io_bits(dspi->base + SPIGCR1, SPIGCR1_POWERDOWN_MASK); + if (dspi->dma_rx) { dma_release_channel(dspi->dma_rx); dma_release_channel(dspi->dma_tx); @@ -1013,6 +1016,9 @@ static void davinci_spi_remove(struct platform_device *pdev) spi_bitbang_stop(&dspi->bitbang); + /* This bit needs to be cleared to disable dpsi->clk */ + clear_io_bits(dspi->base + SPIGCR1, SPIGCR1_POWERDOWN_MASK); + if (dspi->dma_rx) { dma_release_channel(dspi->dma_rx); dma_release_channel(dspi->dma_tx); -- 2.45.0 . From: Tianchen Ding To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider , Josh Don Subject: [PATCH] sched/fair: Make SCHED_IDLE se be preempted in strict hierarchy Date: Mon, 24 Jun 2024 15:39:00 +0800 Message-Id: <20240624073900.10343-1-dtcccc@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256502 Newsgroups: org.kernel.vger.linux-kernel Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Consider the following cgroup: root | ------------------------ | | normal_cgroup idle_cgroup | | SCHED_IDLE task_A SCHED_NORMAL task_B According to the cgroup hierarchy, A should preempt B. But current check_preempt_wakeup_fair() treats cgroup se and task separately, so B will preempt A unexpectedly. Unify the wakeup logic by {p}se_is_idle only. Also fix a bug about se_is_idle() definition when !CONFIG_FAIR_GROUP_SCHED. Fixes: 304000390f88 ("sched: Cgroup SCHED_IDLE support") Signed-off-by: Tianchen Ding --- kernel/sched/fair.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 41b58387023d..c91cfaa7d9ee 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -511,7 +511,7 @@ static int cfs_rq_is_idle(struct cfs_rq *cfs_rq) static int se_is_idle(struct sched_entity *se) { - return 0; + return task_has_idle_policy(task_of(se)); } #endif /* CONFIG_FAIR_GROUP_SCHED */ @@ -8382,16 +8382,7 @@ static void check_preempt_wakeup_fair(struct rq *rq, struct task_struct *p, int if (test_tsk_need_resched(curr)) return; - /* Idle tasks are by definition preempted by non-idle tasks. */ - if (unlikely(task_has_idle_policy(curr)) && - likely(!task_has_idle_policy(p))) - goto preempt; - - /* - * Batch and idle tasks do not preempt non-idle tasks (their preemption - * is driven by the tick): - */ - if (unlikely(p->policy != SCHED_NORMAL) || !sched_feat(WAKEUP_PREEMPTION)) + if (!sched_feat(WAKEUP_PREEMPTION)) return; find_matching_se(&se, &pse); @@ -8408,6 +8399,12 @@ static void check_preempt_wakeup_fair(struct rq *rq, struct task_struct *p, int goto preempt; if (cse_is_idle != pse_is_idle) return; + /* + * Batch tasks do not preempt non-idle tasks (their preemption + * is driven by the tick): + */ + if (unlikely(pse == &p->se && p->policy == SCHED_BATCH)) + return; cfs_rq = cfs_rq_of(se); update_curr(cfs_rq); -- 2.39.3 . From: Mateusz Guzik To: cfijalkovich@google.com Cc: brauner@kernel.org, viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Mateusz Guzik Subject: [RFC PATCH] vfs: wrap CONFIG_READ_ONLY_THP_FOR_FS-related code with an ifdef Date: Mon, 24 Jun 2024 09:41:34 +0200 Message-ID: <20240624074135.486845-1-mjguzik@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256504 org.kvack.linux-mm:201066 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-fsdevel,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail On kernels compiled without this option (which is currently the default state) filemap_nr_thps expands to 0. do_dentry_open has a big chunk dependent on it, most of which gets optimized away, except for a branch and a full fence: if (f->f_mode & FMODE_WRITE) { [snip] smp_mb(); if (filemap_nr_thps(inode->i_mapping)) { [snip] } } While the branch is pretty minor the fence really does not need to be there. This is a bare-minimum patch which takes care of it until someone(tm) cleans this up. Notably it does not conditionally compile other spots which issue the matching fence. I did not bother benchmarking it, not issuing a spurious full fence in the fast path does not warrant justification from perf standpoint. Signed-off-by: Mateusz Guzik --- I am not particularly familiar with any of this, the smp_mb in the open for write path was sticking out like a sore thumb on code read so I figured there may be One Weird Trick to whack it. If the stock code is correct as is, then the ifdef as above is fine. The ifdefed chunk is big enough that it should probably be its own routine. I don't want to bikeshed so I did not go for it. For a moment I considered adding filemap_nr_thps_mb which would expand to 0 or issue the fence + do the read, but then I figured a routine claiming to post a fence and only conditionally do it is misleading at best. As per the commit message fences in collapse_file remain compiled in. It is unclear to me if the code following them is doing anything useful on kernels !CONFIG_READ_ONLY_THP_FOR_FS. All that said, if there is cosmetic touch ups you want done here, I can do them. However, a nice full patch would take care of all of the above and I have neither the information needed to do it nor the interest to get it, so should someone insinst on a full version I'm going to suggest they write it themselves. I repeat this is merely a damage control until someone sorts thigs out. fs/open.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/open.c b/fs/open.c index 28f2fcbebb1b..654c300b3c33 100644 --- a/fs/open.c +++ b/fs/open.c @@ -980,6 +980,7 @@ static int do_dentry_open(struct file *f, if ((f->f_flags & O_DIRECT) && !(f->f_mode & FMODE_CAN_ODIRECT)) return -EINVAL; +#ifdef CONFIG_READ_ONLY_THP_FOR_FS /* * XXX: Huge page cache doesn't support writing yet. Drop all page * cache for this file before processing writes. @@ -1007,6 +1008,7 @@ static int do_dentry_open(struct file *f, filemap_invalidate_unlock(inode->i_mapping); } } +#endif return 0; -- 2.43.0 . From: yskelg@gmail.com To: Paolo Bonzini Cc: MichelleJin , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yunseong Kim Subject: [PATCH] tools/kvm_stat: update exit reasons for userspace Date: Mon, 24 Jun 2024 16:58:21 +0900 Message-ID: <20240624075820.71583-2-yskelg@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1256512 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.kvm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail From: Yunseong Kim Update EXIT_REASONS from source, including 2 USERSPACE_EXIT_REASONS: 'KVM_EXIT_LOONGARCH_IOCSR' and 'KVM_EXIT_MEMORY_FAULT'. Link: https://lore.kernel.org/all/20231121225650.390246-3-namhyung@kernel.org/ Link: https://lore.kernel.org/lkml/ZbVLbkngp4oq13qN@kernel.org/ Signed-off-by: Yunseong Kim --- tools/kvm/kvm_stat/kvm_stat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat index 15bf00e79e3f..eec6c00e3ff9 100755 --- a/tools/kvm/kvm_stat/kvm_stat +++ b/tools/kvm/kvm_stat/kvm_stat @@ -288,6 +288,8 @@ USERSPACE_EXIT_REASONS = { 'RISCV_SBI': 35, 'RISCV_CSR': 36, 'NOTIFY': 37, + 'LOONGARCH_IOCSR': 38, + 'MEMORY_FAULT': 39 } IOCTL_NUMBERS = { -- 2.45.2 .