ARM: dts: imx: Fix pca9547 i2c-mux node name
Subsystems (18)
Sasha Levin
maintainerPATCH 16/35 blk-cgroup: fix missing pd_online_fn() while activating policy
In reply to Sasha LevinFrom: Yu Kuai <[email protected]>
[ Upstream commit e3ff8887e7db757360f97634e0d6f4b8e27a8c46 ]
If the policy defines pd_online_fn(), it should be called after pd_init_fn(), like blkg_create().
--- block/blk-cgroup.c | 4 ++++ 1 file changed, 4 insertions(+)
block/blk-cgroup.c +4 -0
@@ -1408,6 +1408,10 @@ int blkcg_activate_policy(struct request_queue *q,list_for_each_entry_reverse (blkg, &q->blkg_list, q_node) pol->pd_init_fn (blkg->pd[pol->plid]); +if (pol->pd_online_fn) +list_for_each_entry_reverse (blkg, &q->blkg_list, q_node) + pol->pd_online_fn (blkg->pd[pol->plid]); +__set_bit (pol->plid, q->blkcg_pols); ret =0 ;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 2/35 ARM: dts: vf610: Fix pca9548 i2c-mux node names
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 42825d1f269355d63554ab3c3762611e4d8053e9 ]
"make dtbs_check":
arch/arm/boot/dts/vf610-zii-dev-rev-b.dtb: tca9548@70: $nodename:0: 'tca9548@70' does not match '^(i2c-?)?mux'
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
arch/arm/boot/dts/vf610-zii-dev-rev-b.dtb: tca9548@70: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@0', 'i2c@1', 'i2c@2', 'i2c@3', 'i2c@4' were unexpected)
From schema: /scratch/geert/linux/linux-renesas/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
...Fix this by renaming PCA9548 nodes to "i2c-mux", to match the I2C bus multiplexer/switch DT bindings and the Generic Names Recommendation in the Devicetree Specification.
--- arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +1 -1
@@ -345,7 +345,7 @@ gpio6: io-expander@22 { }; &i2c2 { - tca9548@70 { + i2c-mux@70 { compatible = "nxp,pca9548"; pinctrl-0 = <&pinctrl_i2c_mux_reset>; pinctrl-names = "default";
arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +1 -1
@@ -340,7 +340,7 @@ eeprom@50 { }; &i2c2 { - tca9548@70 { + i2c-mux@70 { compatible = "nxp,pca9548"; pinctrl-0 = <&pinctrl_i2c_mux_reset>; pinctrl-names = "default";
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 1/35 ARM: dts: imx: Fix pca9547 i2c-mux node name
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit f78985f9f58380eec37f82c8a2c765aa7670fc29 ]
"make dtbs_check":
arch/arm/boot/dts/imx53-ppd.dtb: i2c-switch@70: $nodename:0: 'i2c-switch@70' does not match '^(i2c-?)?mux'
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
arch/arm/boot/dts/imx53-ppd.dtb: i2c-switch@70: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@0', 'i2c@1', 'i2c@2', 'i2c@3', 'i2c@4', 'i2c@5', 'i2c@6', 'i2c@7' were unexpected)
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
Fix this by renaming the PCA9547 node to "i2c-mux", to match the I2C bus multiplexer/switch DT bindings and the Generic Names Recommendation in the Devicetree Specification.
--- arch/arm/boot/dts/imx53-ppd.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx53-ppd.dts +1 -1
@@ -488,7 +488,7 @@ &i2c1 { scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; status = "okay"; - i2c-switch@70 { + i2c-mux@70 { compatible = "nxp,pca9547"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 3/35 arm64: dts: freescale: Fix pca954x i2c-mux node names
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit b025b4f5c288e29bbea421613a5b4eacf9261fbb ]
"make dtbs_check":
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: pca9547@77: $nodename:0: 'pca9547@77' does not match '^(i2c-?)?mux'
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dtb: pca9547@77: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@4' were unexpected)
From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
...
Fix this by renaming PCA954x nodes to "i2c-mux", to match the I2C bus multiplexer/switch DT bindings and the Generic Names Recommendation in the Devicetree Specification.
--- arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts | 2 +- arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 4 ++-- arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-)
arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts +1 -1
@@ -110,7 +110,7 @@ &esdhc1 { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts +1 -1
@@ -89,7 +89,7 @@ fpga: board-control@2,0 { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts +1 -1
@@ -88,7 +88,7 @@ &duart1 { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts +1 -1
@@ -53,7 +53,7 @@ flash@2 { &i2c0 { status = "okay"; - i2c-switch@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts +1 -1
@@ -136,7 +136,7 @@ mdio2_aquantia_phy: ethernet-phy@0 { &i2c0 { status = "okay"; - i2c-switch@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts +1 -1
@@ -245,7 +245,7 @@ rx8035: rtc@32 { &i2c3 { status = "okay"; - i2c-switch@70 { + i2c-mux@70 { compatible = "nxp,pca9540"; #address-cells = <1>; #size-cells = <0>;
arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi +1 -1
@@ -103,7 +103,7 @@ mdio0_phy15: mdio-phy3@1f { &i2c0 { status = "okay"; - pca9547@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; reg = <0x77>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi +1 -1
@@ -44,7 +44,7 @@ cpld@3,0 { &i2c0 { status = "okay"; - pca9547@75 { + i2c-mux@75 { compatible = "nxp,pca9547"; reg = <0x75>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi +1 -1
@@ -54,7 +54,7 @@ &esdhc1 { &i2c0 { status = "okay"; - i2c-switch@77 { + i2c-mux@77 { compatible = "nxp,pca9547"; #address-cells = <1>; #size-cells = <0>;
arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts +1 -1
@@ -214,7 +214,7 @@ &i2c3 { pinctrl-0 = <&pinctrl_i2c3>; status = "okay"; - i2cmux@70 { + i2c-mux@70 { compatible = "nxp,pca9540"; reg = <0x70>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts +2 -2
@@ -133,7 +133,7 @@ &i2c1 { pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; - i2cmux@70 { + i2c-mux@70 { compatible = "nxp,pca9546"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1_pca9546>;
@@ -216,7 +216,7 @@ &i2c4 { pinctrl-0 = <&pinctrl_i2c4>; status = "okay"; - pca9546: i2cmux@70 { + pca9546: i2c-mux@70 { compatible = "nxp,pca9546"; reg = <0x70>; #address-cells = <1>;
arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +1 -1
@@ -61,7 +61,7 @@ &i2c1 { pinctrl-0 = <&pinctrl_lpi2c1 &pinctrl_ioexp_rst>; status = "okay"; - i2c-switch@71 { + i2c-mux@71 { compatible = "nxp,pca9646", "nxp,pca9546"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 5/35 firmware: arm_scmi: Clear stale xfer->hdr.status
In reply to Sasha LevinFrom: Cristian Marussi <[email protected]>
[ Upstream commit f6ca5059dc0d6608dc46070f48e396d611f240d6 ]
Stale error status reported from a previous message transaction must be cleared before starting a new transaction to avoid being confusingly reported in the following SCMI message dump traces.
--- drivers/firmware/arm_scmi/driver.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/firmware/arm_scmi/driver.c +2 -0
@@ -910,6 +910,8 @@ static int do_xfer(const struct scmi_protocol_handle *ph, xfer->hdr.protocol_id, xfer->hdr.seq, xfer->hdr.poll_completion); +/* Clear any stale status */ + xfer->hdr.status =SCMI_SUCCESS ; xfer->state =SCMI_XFER_SENT_OK ;/* * Even though spinlocking is not needed here since no race is possible
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 12/35 kselftest: Fix error message for unconfigured LLVM builds
In reply to Sasha LevinFrom: Mark Brown <[email protected]>
[ Upstream commit 9fdaca2c1e157dc0a3c0faecf3a6a68e7d8d0c7b ]
We are missing a ) when we attempt to complain about not having enough configuration for clang, resulting in the rather inscrutable error:
../lib.mk:23: *** unterminated call to function 'error': missing ')'. Stop.
Add the required ) so we print the message we were trying to print.
--- tools/testing/selftests/lib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/lib.mk +1 -1
@@ -20,7 +20,7 @@ CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH)) ifeq ($(CROSS_COMPILE),) ifeq ($(CLANG_TARGET_FLAGS),) -$(error Specify CROSS_COMPILE or add '--target=' option to lib.mk +$(error Specify CROSS_COMPILE or add '--target=' option to lib.mk) else CLANG_FLAGS += --target=$(CLANG_TARGET_FLAGS) endif # CLANG_TARGET_FLAGS
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 7/35 erofs/zmap.c: Fix incorrect offset calculation
In reply to Sasha LevinFrom: Siddh Raman Pant <[email protected]>
[ Upstream commit 6acd87d50998ef0afafc441613aeaf5a8f5c9eff ]
Effective offset to add to length was being incorrectly calculated, which resulted in iomap->length being set to 0, triggering a WARN_ON in iomap_iter_done().
Fix that, and describe it in comments.
This was reported as a crash by syzbot under an issue about a warning encountered in iomap_iter_done(), but unrelated to erofs.
C reproducer: https://syzkaller.appspot.com/text?tag=ReproC&x=1037a6b2880000
Kernel config: https://syzkaller.appspot.com/text?tag=KernelConfig&x=e2021a61197ebe02
Dashboard link: https://syzkaller.appspot.com/bug?extid=a8e049cd3abd342936b6
--- fs/erofs/zmap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/erofs/zmap.c +7 -3
@@ -793,12 +793,16 @@ static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset, iomap->type =IOMAP_HOLE ; iomap->addr =IOMAP_NULL_ADDR ;/* -* No strict rule how to describe extents for post EOF, yet -* we need do like below. Otherwise, iomap itself will get +* No strict rule on how to describe extents for post EOF, yet +* we need to do like below. Otherwise, iomap itself will get * into an endless loop on post EOF. +* +* Calculate the effective offset by subtracting extent start +* (map.m_la) from the requested offset, and add it to length. +* (NB: offset >= map.m_la always) */ if (iomap->offset >= inode->i_size) - iomap->length = length + map.m_la - offset; + iomap->length = length + offset - map.m_la; } iomap->flags =0 ;return 0 ;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 4/35 arm64: dts: imx8mq-thor96: fix no-mmc property for SDHCI
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ef10d57936ead5e817ef7cea6a87531085e77773 ]
There is no "no-emmc" property, so intention for SD/SDIO only nodes was to use "no-mmc".
--- arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mq-thor96.dts +2 -2
@@ -339,7 +339,7 @@ &usdhc1 { bus-width = <4>; non-removable; no-sd; - no-emmc; + no-mmc; status = "okay"; brcmf: wifi@1 {
@@ -359,7 +359,7 @@ &usdhc2 { cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; bus-width = <4>; no-sdio; - no-emmc; + no-mmc; disable-wp; status = "okay"; };
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 6/35 bpf: Skip task with pid=1 in send_signal_common()
In reply to Sasha LevinFrom: Hao Sun <[email protected]>
[ Upstream commit a3d81bc1eaef48e34dd0b9b48eefed9e02a06451 ]
The following kernel panic can be triggered when a task with pid=1 attaches a prog that attempts to send killing signal to itself, also see [1] for more details:
Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b CPU: 3 PID: 1 Comm: systemd Not tainted 6.1.0-09652-g59fe41b5255f #148 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x100/0x178 lib/dump_stack.c:106 panic+0x2c4/0x60f kernel/panic.c:275 do_exit.cold+0x63/0xe4 kernel/exit.c:789 do_group_exit+0xd4/0x2a0 kernel/exit.c:950 get_signal+0x2460/0x2600 kernel/signal.c:2858 arch_do_signal_or_restart+0x78/0x5d0 arch/x86/kernel/signal.c:306 exit_to_user_mode_loop kernel/entry/common.c:168 [inline] exit_to_user_mode_prepare+0x15f/0x250 kernel/entry/common.c:203 __syscall_exit_to_user_mode_work kernel/entry/common.c:285 [inline] syscall_exit_to_user_mode+0x1d/0x50 kernel/entry/common.c:296 do_syscall_64+0x44/0xb0 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x63/0xcd
So skip task with pid=1 in bpf_send_signal_common() to avoid the panic.
[1] https://lore.kernel.org/bpf/[email protected]
--- kernel/trace/bpf_trace.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/bpf_trace.c +3 -0
@@ -847,6 +847,9 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type)return -EPERM ;if (unlikely (!nmi_uaccess_okay ()))return -EPERM ; +/* Task should not be pid=1 to avoid kernel panic. */ +if (unlikely (is_global_init (current))) +return -EPERM ;if (irqs_disabled ()) {/* Do an early check on signal validity. Otherwise,
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 13/35 erofs: clean up parsing of fscache related options
In reply to Sasha LevinFrom: Jingbo Xu <[email protected]>
[ Upstream commit e02ac3e7329f76c5de40cba2746cbe165f571dff ]
... to avoid the mess of conditional preprocessing as we are continually adding fscache related mount options.
--- fs/erofs/super.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/erofs/super.c +6 -7
@@ -577,26 +577,25 @@ static int erofs_fc_parse_param(struct fs_context *fc, } ++ctx->devs->extra_devices;break ; -case Opt_fsid:#ifdef CONFIG_EROFS_FS_ONDEMAND +case Opt_fsid:kfree (ctx->fsid); ctx->fsid =kstrdup (param->string,GFP_KERNEL );if (!ctx->fsid)return -ENOMEM ; -#else -errorfc (fc,"fsid option not supported" ); -#endif break ;case Opt_domain_id: -#ifdef CONFIG_EROFS_FS_ONDEMAND kfree (ctx->domain_id); ctx->domain_id =kstrdup (param->string,GFP_KERNEL );if (!ctx->domain_id)return -ENOMEM ; +break ;#else -errorfc (fc,"domain_id option not supported" ); -#endif +case Opt_fsid: +case Opt_domain_id: +errorfc (fc,"%s option not supported" , erofs_fs_parameters[opt].name);break ; +#endif default :return -ENOPARAM ; }
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 8/35 mac80211: Fix MLO address translation for multiple bss case
In reply to Sasha LevinFrom: Sriram R <[email protected]>
[ Upstream commit fa22b51ace8aa106267636f36170e940e676809c ]
When multiple interfaces are present in the local interface list, new skb copy is taken before rx processing except for the first interface. The address translation happens each time only on the original skb since the hdr pointer is not updated properly to the newly created skb.
As a result frames start to drop in userspace when address based checks or search fails.
--- net/mac80211/rx.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/rx.c +3 -0
@@ -4859,6 +4859,9 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,*/ shwt =skb_hwtstamps (rx->skb); shwt->hwtstamp =skb_hwtstamps (skb)->hwtstamp; + +/* Update the hdr pointer to the new skb for translation below */ + hdr = (struct ieee80211_hdr *)rx->skb->data; }if (unlikely (link_sta)) {
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 9/35 arm64: dts: msm8994-angler: fix the memory map
In reply to Sasha LevinFrom: Dominik Kobinski <[email protected]>
[ Upstream commit 380cd3a34b7f9825a60ccb045611af9cb4533b70 ]
Add reserved regions for memory hole and tz app mem to prevent rebooting. Also enable cont_splash_mem, it is the same as the generic 8994 one.
--- .../qcom/msm8994-huawei-angler-rev-101.dts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts +16 -3
@@ -8,9 +8,6 @@ #include "msm8994.dtsi" -/* Angler's firmware does not report where the memory is allocated */ -/delete-node/ &cont_splash_mem; - / { model = "Huawei Nexus 6P"; compatible = "huawei,angler", "qcom,msm8994";
@@ -27,6 +24,22 @@ aliases { chosen { stdout-path = "serial0:115200n8"; }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + tzapp_mem: tzapp@4800000 { + reg = <0 0x04800000 0 0x1900000>; + no-map; + }; + + removed_region: reserved@6300000 { + reg = <0 0x06300000 0 0xD00000>; + no-map; + }; + }; }; &blsp1_uart2 {
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 17/35 LoongArch: Get frame info in unwind_start() when regs is not available
In reply to Sasha LevinFrom: Jinyang He <[email protected]>
[ Upstream commit 429a9671f235c94fc4b5d6687308714b74adc820 ]
At unwind_start(), it is better to get its frame info here rather than get them outside, even we don't have 'regs'. In this way we can simply use unwind_{start, next_frame, done} outside.
--- arch/loongarch/kernel/process.c | 12 +++--------- arch/loongarch/kernel/unwind_guess.c | 6 ++++++ arch/loongarch/kernel/unwind_prologue.c | 16 +++++++++++++--- 3 files changed, 22 insertions(+), 12 deletions(-)
arch/loongarch/kernel/process.c +3 -9
@@ -185,20 +185,14 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)unsigned long __get_wchan (struct task_struct *task) { -unsigned long pc; +unsigned long pc =0 ;struct unwind_state state;if (!try_get_task_stack (task))return 0 ; -unwind_start (&state, task,NULL ); - state.sp =thread_saved_fp (task); -get_stack_info (state.sp, state.task, &state.stack_info); - state.pc =thread_saved_ra (task); -#ifdef CONFIG_UNWINDER_PROLOGUE - state.type =UNWINDER_PROLOGUE ; -#endif -for (; !unwind_done (&state);unwind_next_frame (&state)) { +for (unwind_start (&state, task,NULL ); + !unwind_done (&state);unwind_next_frame (&state)) { pc =unwind_get_return_address (&state);if (!pc)break ;
arch/loongarch/kernel/unwind_guess.c +6 -0
@@ -25,6 +25,12 @@ void unwind_start(struct unwind_state *state, struct task_struct *task,if (regs) { state->sp = regs->regs[3 ]; state->pc = regs->csr_era; + }else if (task && task != current) { + state->sp =thread_saved_fp (task); + state->pc =thread_saved_ra (task); + }else { + state->sp = (unsigned long )__builtin_frame_address (0 ); + state->pc = (unsigned long )__builtin_return_address (0 ); } state->task = task;
arch/loongarch/kernel/unwind_prologue.c +13 -3
@@ -111,12 +111,22 @@ void unwind_start(struct unwind_state *state, struct task_struct *task, struct pt_regs *regs) {memset (state,0 ,sizeof (*state)); + state->type =UNWINDER_PROLOGUE ; -if (regs &&__kernel_text_address (regs->csr_era)) { - state->pc = regs->csr_era; +if (regs) { state->sp = regs->regs[3 ]; + state->pc = regs->csr_era; state->ra = regs->regs[1 ]; - state->type =UNWINDER_PROLOGUE ; +if (!__kernel_text_address (state->pc)) + state->type =UNWINDER_GUESS ; + }else if (task && task != current) { + state->sp =thread_saved_fp (task); + state->pc =thread_saved_ra (task); + state->ra =0 ; + }else { + state->sp = (unsigned long )__builtin_frame_address (0 ); + state->pc = (unsigned long )__builtin_return_address (0 ); + state->ra =0 ; } state->task = task;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 10/35 ARM: omap1: fix building gpio15xx
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 9d46ce57f4d1c626bb48170226ea5e35deb5877c ]
In some randconfig builds, the asm/irq.h header is not included in gpio15xx.c, so add an explicit include to avoid a build fialure:
In file included from arch/arm/mach-omap1/gpio15xx.c:15:arch/arm/mach-omap1/irqs.h:99:34: error: 'NR_IRQS_LEGACY' undeclared here (not in a function)
99 | #define IH2_BASE (NR_IRQS_LEGACY + 32)
| ^~~~~~~~~~~~~~
arch/arm/mach-omap1/irqs.h:105:38: note: in expansion of macro 'IH2_BASE'
105 | #define INT_MPUIO (5 + IH2_BASE)
| ^~~~~~~~arch/arm/mach-omap1/gpio15xx.c:28:27: note: in expansion of macro 'INT_MPUIO'
28 | .start = INT_MPUIO,
| ^~~~~~~~~
--- arch/arm/mach-omap1/gpio15xx.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-omap1/gpio15xx.c +1 -0
@@ -11,6 +11,7 @@#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/soc/ti/omap1-soc.h> +#include <asm/irq.h> #include "irqs.h"
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 11/35 init/Kconfig: fix LOCALVERSION_AUTO help text
In reply to Sasha LevinFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 0f9c608d4a1eb852d6769d2fc5906c71c02565ae ]
It was never guaranteed to be exactly eight, but since commit 548b8b5168c9 ("scripts/setlocalversion: make git describe output more reliable"), it has been exactly 12.
--- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
init/Kconfig +1 -1
@@ -202,7 +202,7 @@ config LOCALVERSION_AUTO appended after any matching localversion* files, and after the value set in CONFIG_LOCALVERSION. - (The actual string used here is the first eight characters produced + (The actual string used here is the first 12 characters produced by running the command: $ git rev-parse --verify HEAD
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 26/35 nvme-apple: only reset the controller when RTKit is running
In reply to Sasha LevinFrom: Janne Grunau <[email protected]>
[ Upstream commit c0a4a1eafbd48e02829045bba3e6163c03037276 ]
NVMe controller register access hangs indefinitely when the co-processor is not running. A missed reset is preferable over a hanging thread since it could be recoverable.
--- drivers/nvme/host/apple.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/host/apple.c +3 -3
@@ -987,11 +987,11 @@ static void apple_nvme_reset_work(struct work_struct *work) goto out; } -if (anv->ctrl.ctrl_config &NVME_CC_ENABLE ) -apple_nvme_disable (anv, false); -/* RTKit must be shut down cleanly for the (soft)-reset to work */ if (apple_rtkit_is_running (anv->rtk)) { +/* reset the controller if it is enabled */ +if (anv->ctrl.ctrl_config &NVME_CC_ENABLE ) +apple_nvme_disable (anv, false);dev_dbg (anv->dev,"Trying to shut down RTKit before reset." ); ret =apple_rtkit_shutdown (anv->rtk);if (ret)
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 15/35 btrfs: stop using write_one_page in btrfs_scratch_superblock
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 26ecf243e407be54807ad67210f7e83b9fad71ea ]
write_one_page is an awkward interface that expects the page locked and ->writepage to be implemented. Replace that by zeroing the signature bytes and synchronize the block device page using the proper bdev helpers.
--- fs/btrfs/volumes.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
fs/btrfs/volumes.c +8 -9
@@ -2021,23 +2021,22 @@ static void btrfs_scratch_superblock(struct btrfs_fs_info *fs_info, struct block_device *bdev, int copy_num) {struct btrfs_super_block *disk_super; -struct page *page; +const size_t len =sizeof (disk_super->magic); +const u64 bytenr =btrfs_sb_offset (copy_num);int ret; - disk_super =btrfs_read_dev_one_super (bdev, copy_num, false); + disk_super =btrfs_read_disk_super (bdev, bytenr, bytenr);if (IS_ERR (disk_super))return ; -memset (&disk_super->magic,0 ,sizeof (disk_super->magic)); - page =virt_to_page (disk_super); -set_page_dirty (page); -lock_page (page); -/* write_on_page() unlocks the page */ - ret =write_one_page (page); +memset (&disk_super->magic,0 , len); +folio_mark_dirty (virt_to_folio (disk_super)); +btrfs_release_disk_super (disk_super); + + ret =sync_blockdev_range (bdev, bytenr, bytenr + len -1 );if (ret)btrfs_warn (fs_info,"error clearing superblock number %d (%d)" , copy_num, ret); -btrfs_release_disk_super (disk_super); } void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 19/35 block: fix hctx checks for batch allocation
In reply to Sasha LevinFrom: Pavel Begunkov <[email protected]>
[ Upstream commit 7746564793978fe2f43b18a302b22dca0ad3a0e8 ]
When there are no read queues read requests will be assigned a default queue on allocation. However, blk_mq_get_cached_request() is not prepared for that and will fail all attempts to grab read requests from the cache. Worst case it doubles the number of requests allocated, roughly half of which will be returned by blk_mq_free_plug_rqs().
It only affects batched allocations and so is io_uring specific. For reference, QD8 t/io_uring benchmark improves by 20-35%.
--- block/blk-mq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
block/blk-mq.c +5 -1
@@ -2858,6 +2858,7 @@ static inline struct request *blk_mq_get_cached_request(struct request_queue *q, struct blk_plug *plug, struct bio **bio, unsigned int nsegs) { struct request *rq; +enum hctx_type type, hctx_type;if (!plug)return NULL ;
@@ -2870,7 +2871,10 @@ static inline struct request *blk_mq_get_cached_request(struct request_queue *q,return NULL ; } -if (blk_mq_get_hctx_type ((*bio)->bi_opf) != rq->mq_hctx->type) + type =blk_mq_get_hctx_type ((*bio)->bi_opf); + hctx_type = rq->mq_hctx->type; +if (type != hctx_type && + !(type ==HCTX_TYPE_READ && hctx_type ==HCTX_TYPE_DEFAULT ))return NULL ;if (op_is_flush (rq->cmd_flags) !=op_is_flush ((*bio)->bi_opf))return NULL ;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 14/35 btrfs: factor out scratching of one regular super block
In reply to Sasha LevinFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 0e0078f72be81bbb2a02b229fd2cec8ad63e4fb1 ]
btrfs_scratch_superblocks open codes scratching super block of a non-zoned super block. Split the code to read, zero and write the superblock for regular devices into a separate helper.
--- fs/btrfs/volumes.c | 51 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-)
fs/btrfs/volumes.c +26 -25
@@ -2017,42 +2017,43 @@ static u64 btrfs_num_devices(struct btrfs_fs_info *fs_info)return num_devices; } +static void btrfs_scratch_superblock (struct btrfs_fs_info *fs_info, +struct block_device *bdev,int copy_num) +{ +struct btrfs_super_block *disk_super; +struct page *page; +int ret; + + disk_super =btrfs_read_dev_one_super (bdev, copy_num, false); +if (IS_ERR (disk_super)) +return ; + +memset (&disk_super->magic,0 ,sizeof (disk_super->magic)); + page =virt_to_page (disk_super); +set_page_dirty (page); +lock_page (page); +/* write_on_page() unlocks the page */ + ret =write_one_page (page); +if (ret) +btrfs_warn (fs_info,"error clearing superblock number %d (%d)" , + copy_num, ret); +btrfs_release_disk_super (disk_super); +} +void btrfs_scratch_superblocks (struct btrfs_fs_info *fs_info,struct block_device *bdev,const char *device_path) { -struct btrfs_super_block *disk_super;int copy_num;if (!bdev)return ;for (copy_num =0 ; copy_num <BTRFS_SUPER_MIRROR_MAX ; copy_num++) { -struct page *page; -int ret; - - disk_super =btrfs_read_dev_one_super (bdev, copy_num, false); -if (IS_ERR (disk_super)) -continue ; - -if (bdev_is_zoned (bdev)) { +if (bdev_is_zoned (bdev))btrfs_reset_sb_log_zones (bdev, copy_num); -continue ; - } - -memset (&disk_super->magic,0 ,sizeof (disk_super->magic)); - - page =virt_to_page (disk_super); -set_page_dirty (page); -lock_page (page); -/* write_on_page() unlocks the page */ - ret =write_one_page (page); -if (ret) -btrfs_warn (fs_info, -"error clearing superblock number %d (%d)" , - copy_num, ret); -btrfs_release_disk_super (disk_super); - +else +btrfs_scratch_superblock (fs_info, bdev, copy_num); }/* Notify udev that device has changed */
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 20/35 s390: workaround invalid gcc-11 out of bounds read warning
In reply to Sasha LevinFrom: Heiko Carstens <[email protected]>
[ Upstream commit 41e1992665a2701fa025a8b76970c43b4148446f ]
GCC 11.1.0 and 11.2.0 generate a wrong warning when compiling the kernel e.g. with allmodconfig:
arch/s390/kernel/setup.c: In function ‘setup_lowcore_dat_on’:./include/linux/fortify-string.h:57:33: error: ‘__builtin_memcpy’ reading 128 bytes from a region of size 0 [-Werror=stringop-overread]
...arch/s390/kernel/setup.c:526:9: note: in expansion of macro ‘memcpy’
526 | memcpy(abs_lc->cregs_save_area, S390_lowcore.cregs_save_area,
| ^~~~~~This could be addressed by using absolute_pointer() with the S390_lowcore macro, but this is not a good idea since this generates worse code for performance critical paths.
Therefore simply use a for loop to copy the array in question and get rid of the warning.
--- arch/s390/kernel/setup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/s390/kernel/setup.c +3 -2
@@ -507,6 +507,7 @@ static void __init setup_lowcore_dat_on(void) {struct lowcore *abs_lc;unsigned long flags; +int i;__ctl_clear_bit (0 ,28 ); S390_lowcore.external_new_psw.mask |=PSW_MASK_DAT ;
@@ -521,8 +522,8 @@ static void __init setup_lowcore_dat_on(void) abs_lc =get_abs_lowcore (&flags); abs_lc->restart_flags =RESTART_FLAG_CTLREGS ; abs_lc->program_new_psw = S390_lowcore.program_new_psw; -memcpy (abs_lc->cregs_save_area, S390_lowcore.cregs_save_area, -sizeof (abs_lc->cregs_save_area)); +for (i =0 ; i <16 ; i++) + abs_lc->cregs_save_area[i] = S390_lowcore.cregs_save_area[i];put_abs_lowcore (abs_lc, flags); }
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 21/35 HID: uclogic: Add support for XP-PEN Deco 01 V2
In reply to Sasha LevinFrom: José Expósito <[email protected]>
[ Upstream commit febb2c0d7c69c0396aa32d5ab425a4163473961a ]
The XP-PEN Deco 01 V2 is a UGEE v2 device with a frame with 8 buttons. Its pen has 2 buttons, supports tilt and pressure.
Add its ID in order to support the device.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-uclogic-core.c | 2 ++ drivers/hid/hid-uclogic-params.c | 2 ++ 3 files changed, 5 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -1295,6 +1295,7 @@#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540 0x0075#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640 0x0094#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042 +#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2 0x0905#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L 0x0935#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S 0x0909#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06 0x0078
drivers/hid/hid-uclogic-core.c +2 -0
@@ -525,6 +525,8 @@ static const struct hid_device_id uclogic_devices[] = { USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640) }, { HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01) }, + { HID_USB_DEVICE(USB_VENDOR_ID_UGEE, + USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2) }, { HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L) }, { HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
drivers/hid/hid-uclogic-params.c +2 -0
@@ -1655,6 +1655,8 @@ int uclogic_params_init(struct uclogic_params *params,break ;case VID_PID (USB_VENDOR_ID_UGEE ,USB_DEVICE_ID_UGEE_PARBLO_A610_PRO ): +case VID_PID (USB_VENDOR_ID_UGEE , +USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2 ):case VID_PID (USB_VENDOR_ID_UGEE ,USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L ): case VID_PID(USB_VENDOR_ID_UGEE,
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 23/35 dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init
In reply to Sasha LevinFrom: Hui Wang <[email protected]>
[ Upstream commit 1417f59ac0b02130ee56c0c50794b9b257be3d17 ]
If the function sdma_load_context() fails, the sdma_desc will be freed, but the allocated desc->bd is forgot to be freed.
We already met the sdma_load_context() failure case and the log as below:
[ 450.699064] imx-sdma 30bd0000.dma-controller: Timeout waiting for CH0 ready
...
In this case, the desc->bd will not be freed without this change.
--- drivers/dma/imx-sdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/imx-sdma.c +3 -1
@@ -1521,10 +1521,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,sdma_config_ownership (sdmac, false, true, false);if (sdma_load_context (sdmac)) - goto err_desc_out; + goto err_bd_out;return desc; +err_bd_out: +sdma_free_bd (desc); err_desc_out:kfree (desc); err_out:
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 27/35 octeontx2-af: recover CPT engine when it gets fault
In reply to Sasha LevinFrom: Srujana Challa <[email protected]>
[ Upstream commit 07ea567d84cdf0add274d66db7c02b55b818d517 ]
When CPT engine has uncorrectable errors, it will get halted and must be disabled and re-enabled. This patch adds code for the same.
--- .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 110 +++++++++++++----- 1 file changed, 80 insertions(+), 30 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +80 -30
@@ -37,34 +37,60 @@ (_rsp)->free_sts_##etype = free_sts; \ }) -static irqreturn_t rvu_cpt_af_flt_intr_handler (int irq,void *ptr) +static irqreturn_t cpt_af_flt_intr_handler (int vec,void *ptr) {struct rvu_block *block = ptr;struct rvu *rvu = block->rvu;int blkaddr = block->addr; -u64 reg0, reg1, reg2; - - reg0 =rvu_read64 (rvu, blkaddr,CPT_AF_FLTX_INT (0 )); - reg1 =rvu_read64 (rvu, blkaddr,CPT_AF_FLTX_INT (1 )); -if (!is_rvu_otx2 (rvu)) { - reg2 =rvu_read64 (rvu, blkaddr,CPT_AF_FLTX_INT (2 )); -dev_err_ratelimited (rvu->dev, -"Received CPTAF FLT irq : 0x%llx, 0x%llx, 0x%llx" , - reg0, reg1, reg2); - }else { -dev_err_ratelimited (rvu->dev, -"Received CPTAF FLT irq : 0x%llx, 0x%llx" , - reg0, reg1); +u64 reg, val; +int i, eng; +u8 grp; + + reg =rvu_read64 (rvu, blkaddr,CPT_AF_FLTX_INT (vec)); +dev_err_ratelimited (rvu->dev,"Received CPTAF FLT%d irq : 0x%llx" , vec, reg); + + i =-1 ; +while ((i =find_next_bit ((unsigned long *)®,64 , i +1 )) <64 ) { +switch (vec) { +case 0 : + eng = i; +break ; +case 1 : + eng = i +64 ; +break ; +case 2 : + eng = i +128 ; +break ; + } + grp =rvu_read64 (rvu, blkaddr,CPT_AF_EXEX_CTL2 (eng)) &0xFF ; +/* Disable and enable the engine which triggers fault */ +rvu_write64 (rvu, blkaddr,CPT_AF_EXEX_CTL2 (eng),0x0 ); + val =rvu_read64 (rvu, blkaddr,CPT_AF_EXEX_CTL (eng)); +rvu_write64 (rvu, blkaddr,CPT_AF_EXEX_CTL (eng), val & ~1ULL ); + +rvu_write64 (rvu, blkaddr,CPT_AF_EXEX_CTL2 (eng), grp); +rvu_write64 (rvu, blkaddr,CPT_AF_EXEX_CTL (eng), val |1ULL ); } - -rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT (0 ), reg0); -rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT (1 ), reg1); -if (!is_rvu_otx2 (rvu)) -rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT (2 ), reg2); +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT (vec), reg);return IRQ_HANDLED ; } +static irqreturn_t rvu_cpt_af_flt0_intr_handler (int irq,void *ptr) +{ +return cpt_af_flt_intr_handler (CPT_AF_INT_VEC_FLT0 , ptr); +} + +static irqreturn_t rvu_cpt_af_flt1_intr_handler (int irq,void *ptr) +{ +return cpt_af_flt_intr_handler (CPT_AF_INT_VEC_FLT1 , ptr); +} + +static irqreturn_t rvu_cpt_af_flt2_intr_handler (int irq,void *ptr) +{ +return cpt_af_flt_intr_handler (CPT_10K_AF_INT_VEC_FLT2 , ptr); +} +static irqreturn_t rvu_cpt_af_rvu_intr_handler (int irq,void *ptr) {struct rvu_block *block = ptr;
@@ -119,8 +145,10 @@ static void cpt_10k_unregister_interrupts(struct rvu_block *block, int off)int i;/* Disable all CPT AF interrupts */ -for (i =0 ; i <CPT_10K_AF_INT_VEC_RVU ; i++) -rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1C (i),0x1 ); +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1C (0 ), ~0ULL ); +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1C (1 ), ~0ULL ); +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1C (2 ),0xFFFF ); +rvu_write64 (rvu, blkaddr,CPT_AF_RVU_INT_ENA_W1C ,0x1 );rvu_write64 (rvu, blkaddr,CPT_AF_RAS_INT_ENA_W1C ,0x1 );
@@ -151,7 +179,7 @@ static void cpt_unregister_interrupts(struct rvu *rvu, int blkaddr)/* Disable all CPT AF interrupts */ for (i =0 ; i <CPT_AF_INT_VEC_RVU ; i++) -rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1C (i),0x1 ); +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1C (i), ~0ULL );rvu_write64 (rvu, blkaddr,CPT_AF_RVU_INT_ENA_W1C ,0x1 );rvu_write64 (rvu, blkaddr,CPT_AF_RAS_INT_ENA_W1C ,0x1 );
@@ -172,16 +200,31 @@ static int cpt_10k_register_interrupts(struct rvu_block *block, int off) {struct rvu *rvu = block->rvu;int blkaddr = block->addr; +irq_handler_t flt_fn;int i, ret;for (i =CPT_10K_AF_INT_VEC_FLT0 ; i <CPT_10K_AF_INT_VEC_RVU ; i++) {sprintf (&rvu->irq_name[(off + i) *NAME_SIZE ],"CPTAF FLT%d" , i); + +switch (i) { +case CPT_10K_AF_INT_VEC_FLT0 : + flt_fn = rvu_cpt_af_flt0_intr_handler; +break ; +case CPT_10K_AF_INT_VEC_FLT1 : + flt_fn = rvu_cpt_af_flt1_intr_handler; +break ; +case CPT_10K_AF_INT_VEC_FLT2 : + flt_fn = rvu_cpt_af_flt2_intr_handler; +break ; + } ret =rvu_cpt_do_register_interrupt (block, off + i, - rvu_cpt_af_flt_intr_handler, - &rvu->irq_name[(off + i) *NAME_SIZE ]); + flt_fn, &rvu->irq_name[(off + i) *NAME_SIZE ]);if (ret) goto err; -rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1S (i),0x1 ); +if (i ==CPT_10K_AF_INT_VEC_FLT2 ) +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1S (i),0xFFFF ); +else +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1S (i), ~0ULL ); } ret = rvu_cpt_do_register_interrupt(block, off + CPT_10K_AF_INT_VEC_RVU,
@@ -208,8 +251,8 @@ static int cpt_register_interrupts(struct rvu *rvu, int blkaddr) {struct rvu_hwinfo *hw = rvu->hw;struct rvu_block *block; +irq_handler_t flt_fn;int i, offs, ret =0 ; -char irq_name[16 ];if (!is_block_implemented (rvu->hw, blkaddr))return 0 ;
@@ -226,13 +269,20 @@ static int cpt_register_interrupts(struct rvu *rvu, int blkaddr)return cpt_10k_register_interrupts (block, offs);for (i =CPT_AF_INT_VEC_FLT0 ; i <CPT_AF_INT_VEC_RVU ; i++) { -snprintf (irq_name,sizeof (irq_name),"CPTAF FLT%d" , i); +sprintf (&rvu->irq_name[(offs + i) *NAME_SIZE ],"CPTAF FLT%d" , i); +switch (i) { +case CPT_AF_INT_VEC_FLT0 : + flt_fn = rvu_cpt_af_flt0_intr_handler; +break ; +case CPT_AF_INT_VEC_FLT1 : + flt_fn = rvu_cpt_af_flt1_intr_handler; +break ; + } ret =rvu_cpt_do_register_interrupt (block, offs + i, - rvu_cpt_af_flt_intr_handler, - irq_name); + flt_fn, &rvu->irq_name[(offs + i) *NAME_SIZE ]);if (ret) goto err; -rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1S (i),0x1 ); +rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT_ENA_W1S (i), ~0ULL ); } ret = rvu_cpt_do_register_interrupt(block, offs + CPT_AF_INT_VEC_RVU,
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 29/35 octeontx2-af: modify FLR sequence for CPT
In reply to Sasha LevinFrom: Srujana Challa <[email protected]>
[ Upstream commit 1286c50ae9e0f5025b165c8f2321b3ce3b558002 ]
On OcteonTX2 platform CPT instruction enqueue is only possible via LMTST operations.
The existing FLR sequence mentioned in HRM requires a dummy LMTST to CPT but LMTST can't be submitted from AF driver. So, HW team provided a new sequence to avoid dummy LMTST. This patch adds code for the same.
--- .../net/ethernet/marvell/octeontx2/af/rvu.h | 12 +++ .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 86 +++++++++---------- .../ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + 3 files changed, 53 insertions(+), 47 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +12 -0
@@ -453,6 +453,7 @@ struct rvu {struct rvu_pfvf *pf;struct rvu_pfvf *hwvf;struct mutex rsrc_lock;/* Serialize resource alloc/free */ +struct mutex alias_lock;/* Serialize bar2 alias access */ int vfs;/* Number of VFs attached to RVU */ int nix_blkaddr[MAX_NIX_BLKS ];
@@ -540,6 +541,17 @@ static inline u64 rvupf_read64(struct rvu *rvu, u64 offset)return readq (rvu->pfreg_base + offset); } +static inline void rvu_bar2_sel_write64 (struct rvu *rvu,u64 block,u64 offset,u64 val) +{ +/* HW requires read back of RVU_AF_BAR2_SEL register to make sure completion of +* write operation. +*/ +rvu_write64 (rvu, block, offset, val); +rvu_read64 (rvu, block, offset); +/* Barrier to ensure read completes before accessing LF registers */ +mb (); +} +/* Silicon revisions */ static inline bool is_rvu_pre_96xx_C0 (struct rvu *rvu) {
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +39 -47
139 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +2 -0
@@ -545,6 +545,8 @@#define CPT_LF_CTL 0x10#define CPT_LF_INPROG 0x40 +#define CPT_LF_Q_SIZE 0x100 +#define CPT_LF_Q_INST_PTR 0x110#define CPT_LF_Q_GRP_PTR 0x120#define CPT_LF_CTX_FLUSH 0x510
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 18/35 ACPI: video: Add backlight=native DMI quirk for Acer Aspire 4810T
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 8ba5fc4c154aeb3b4620f05543cce426c62ed2de ]
The Acer Aspire 4810T predates Windows 8, so it defaults to using acpi_video# for backlight control, but this is non functional on this model.
Add a DMI quirk to use the native backlight interface which does work properly.
--- drivers/acpi/video_detect.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/acpi/video_detect.c +8 -0
@@ -513,6 +513,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"), }, }, + { + .callback = video_detect_force_native, +/* Acer Aspire 4810T */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 4810T"), + }, + }, { .callback = video_detect_force_native,/* Acer Aspire 5738z */
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 31/35 octeontx2-af: restore rxc conf after teardown sequence
In reply to Sasha LevinFrom: Nithin Dabilpuram <[email protected]>
[ Upstream commit d5b2e0a299f36c6ccdda4830525ca20550243536 ]
CN10K CPT coprocessor includes a component named RXC which is responsible for reassembly of inner IP packets. RXC has the feature to evict oldest entries based on age/threshold. The age/threshold is being set to minimum values to evict all entries at the time of teardown.
This patch adds code to restore timeout and threshold config after teardown sequence is complete as it is global config.
--- .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +18 -4
@@ -812,10 +812,21 @@ int rvu_mbox_handler_cpt_sts(struct rvu *rvu, struct cpt_sts_req *req,#define RXC_ZOMBIE_COUNT GENMASK_ULL(60, 48)static void cpt_rxc_time_cfg (struct rvu *rvu,struct cpt_rxc_time_cfg_req *req, -int blkaddr) +int blkaddr,struct cpt_rxc_time_cfg_req *save) {u64 dfrg_reg; +if (save) { +/* Save older config */ + dfrg_reg =rvu_read64 (rvu, blkaddr,CPT_AF_RXC_DFRG ); + save->zombie_thres =FIELD_GET (RXC_ZOMBIE_THRES , dfrg_reg); + save->zombie_limit =FIELD_GET (RXC_ZOMBIE_LIMIT , dfrg_reg); + save->active_thres =FIELD_GET (RXC_ACTIVE_THRES , dfrg_reg); + save->active_limit =FIELD_GET (RXC_ACTIVE_LIMIT , dfrg_reg); + + save->step =rvu_read64 (rvu, blkaddr,CPT_AF_RXC_TIME_CFG ); + } + dfrg_reg =FIELD_PREP (RXC_ZOMBIE_THRES , req->zombie_thres); dfrg_reg |=FIELD_PREP (RXC_ZOMBIE_LIMIT , req->zombie_limit); dfrg_reg |=FIELD_PREP (RXC_ACTIVE_THRES , req->active_thres);
@@ -840,7 +851,7 @@ int rvu_mbox_handler_cpt_rxc_time_cfg(struct rvu *rvu, !is_cpt_vf(rvu, req->hdr.pcifunc))return CPT_AF_ERR_ACCESS_DENIED ; -cpt_rxc_time_cfg (rvu, req, blkaddr); +cpt_rxc_time_cfg (rvu, req, blkaddr,NULL );return 0 ; }
@@ -886,7 +897,7 @@ int rvu_mbox_handler_cpt_lf_reset(struct rvu *rvu, struct cpt_lf_rst_req *req,static void cpt_rxc_teardown (struct rvu *rvu,int blkaddr) { -struct cpt_rxc_time_cfg_req req; +struct cpt_rxc_time_cfg_req req, prev;int timeout =2000 ;u64 reg;
@@ -902,7 +913,7 @@ static void cpt_rxc_teardown(struct rvu *rvu, int blkaddr) req.active_thres =1 ; req.active_limit =1 ; -cpt_rxc_time_cfg (rvu, &req, blkaddr); +cpt_rxc_time_cfg (rvu, &req, blkaddr, &prev); do { reg = rvu_read64(rvu, blkaddr, CPT_AF_RXC_ACTIVE_STS);
@@ -928,6 +939,9 @@ static void cpt_rxc_teardown(struct rvu *rvu, int blkaddr)if (timeout ==0 )dev_warn (rvu->dev,"Poll for RXC zombie count hits hard loop counter\n" ); + +/* Restore config */ +cpt_rxc_time_cfg (rvu, &prev, blkaddr,NULL ); }#define INFLIGHT GENMASK_ULL(8, 0)
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 30/35 octeontx2-af: optimize cpt pf identification
In reply to Sasha LevinFrom: Srujana Challa <[email protected]>
[ Upstream commit 9adb04ff62f51265002c2c83e718bcf459e06e48 ]
Optimize CPT PF identification in mbox handling for faster mbox response by doing it at AF driver probe instead of every mbox message.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 8 ++++++++ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 ++ drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 13 ++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +8 -0
@@ -1164,8 +1164,16 @@ static int rvu_setup_hw_resources(struct rvu *rvu) goto nix_err; } + err =rvu_cpt_init (rvu); +if (err) { +dev_err (rvu->dev,"%s: Failed to initialize cpt\n" , __func__); + goto mcs_err; + } +return 0 ; +mcs_err: +rvu_mcs_exit (rvu); nix_err:rvu_nix_freemem (rvu); npa_err:
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +2 -0
@@ -505,6 +505,7 @@ struct rvu {struct ptp *ptp;int mcs_blk_cnt; +int cpt_pf_num;#ifdef CONFIG_DEBUG_FS struct rvu_debugfs rvu_dbg;
@@ -870,6 +871,7 @@ void rvu_cpt_unregister_interrupts(struct rvu *rvu);int rvu_cpt_lf_teardown (struct rvu *rvu,u16 pcifunc,int blkaddr,int lf,int slot);int rvu_cpt_ctx_flush (struct rvu *rvu,u16 pcifunc); +int rvu_cpt_init (struct rvu *rvu);/* CN10K RVU */ int rvu_set_channels_base (struct rvu *rvu);
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +10 -3
@@ -340,7 +340,7 @@ static int get_cpt_pf_num(struct rvu *rvu)static bool is_cpt_pf (struct rvu *rvu,u16 pcifunc) { -int cpt_pf_num =get_cpt_pf_num (rvu); +int cpt_pf_num = rvu->cpt_pf_num;if (rvu_get_pf (pcifunc) != cpt_pf_num)return false;
@@ -352,7 +352,7 @@ static bool is_cpt_pf(struct rvu *rvu, u16 pcifunc)static bool is_cpt_vf (struct rvu *rvu,u16 pcifunc) { -int cpt_pf_num =get_cpt_pf_num (rvu); +int cpt_pf_num = rvu->cpt_pf_num;if (rvu_get_pf (pcifunc) != cpt_pf_num)return false;
@@ -1015,7 +1015,7 @@ int rvu_cpt_lf_teardown(struct rvu *rvu, u16 pcifunc, int blkaddr, int lf, int sstatic int cpt_inline_inb_lf_cmd_send (struct rvu *rvu,int blkaddr,int nix_blkaddr) { -int cpt_pf_num =get_cpt_pf_num (rvu); +int cpt_pf_num = rvu->cpt_pf_num;struct cpt_inst_lmtst_req *req;dma_addr_t res_daddr;int timeout =3000 ;
@@ -1159,3 +1159,10 @@ int rvu_cpt_ctx_flush(struct rvu *rvu, u16 pcifunc)return 0 ; } + +int rvu_cpt_init (struct rvu *rvu) +{ +/* Retrieve CPT PF number */ + rvu->cpt_pf_num =get_cpt_pf_num (rvu); +return 0 ; +}
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 33/35 octeontx2-af: add mbox to return CPT_AF_FLT_INT info
In reply to Sasha LevinFrom: Srujana Challa <[email protected]>
[ Upstream commit 8299ffe3dc3dc9ac2bd60e3a8332008f03156aca ]
CPT HW would trigger the CPT AF FLT interrupt when CPT engines hits some uncorrectable errors and AF is the one which receives the interrupt and recovers the engines.
This patch adds a mailbox for CPT VFs to request for CPT faulted and recovered engines info.
--- .../net/ethernet/marvell/octeontx2/af/mbox.h | 17 +++++++++ .../net/ethernet/marvell/octeontx2/af/rvu.h | 4 +++ .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 35 +++++++++++++++++++ 3 files changed, 56 insertions(+)
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +17 -0
@@ -196,6 +196,8 @@ M(CPT_RXC_TIME_CFG, 0xA06, cpt_rxc_time_cfg, cpt_rxc_time_cfg_req, \ msg_rsp) \ M(CPT_CTX_CACHE_SYNC, 0xA07, cpt_ctx_cache_sync, msg_req, msg_rsp) \ M(CPT_LF_RESET, 0xA08, cpt_lf_reset, cpt_lf_rst_req, msg_rsp) \ +M(CPT_FLT_ENG_INFO, 0xA09, cpt_flt_eng_info, cpt_flt_eng_info_req, \ + cpt_flt_eng_info_rsp) \ /* SDP mbox IDs (range 0x1000 - 0x11FF) */ \ M(SET_SDP_CHAN_INFO, 0x1000, set_sdp_chan_info, sdp_chan_info_msg, msg_rsp) \ M(GET_SDP_CHAN_INFO, 0x1001, get_sdp_chan_info, msg_req, sdp_get_chan_info_msg) \
@@ -1684,6 +1686,21 @@ struct cpt_lf_rst_req {u32 rsvd; }; +/* Mailbox message format to request for CPT faulted engines */ +struct cpt_flt_eng_info_req { +struct mbox_msghdr hdr; +int blkaddr; +bool reset; +u32 rsvd; +}; + +struct cpt_flt_eng_info_rsp { +struct mbox_msghdr hdr; +u64 flt_eng_map[CPT_10K_AF_INT_VEC_RVU ]; +u64 rcvrd_eng_map[CPT_10K_AF_INT_VEC_RVU ]; +u64 rsvd; +}; +struct sdp_node_info {/* Node to which this PF belons to */ u8 node_id;
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +4 -0
@@ -108,6 +108,8 @@ struct rvu_block {u64 lfreset_reg;unsigned char name[NAME_SIZE ];struct rvu *rvu; +u64 cpt_flt_eng_map[3 ]; +u64 cpt_rcvrd_eng_map[3 ]; };struct nix_mcast {
@@ -520,6 +522,8 @@ struct rvu {struct list_head mcs_intrq_head;/* mcs interrupt queue lock */ spinlock_t mcs_intrq_lock; +/* CPT interrupt lock */ +spinlock_t cpt_intr_lock; };static inline void rvu_write64 (struct rvu *rvu,u64 block,u64 offset,u64 val)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +35 -0
@@ -70,6 +70,14 @@ static irqreturn_t cpt_af_flt_intr_handler(int vec, void *ptr)rvu_write64 (rvu, blkaddr,CPT_AF_EXEX_CTL2 (eng), grp);rvu_write64 (rvu, blkaddr,CPT_AF_EXEX_CTL (eng), val |1ULL ); + +spin_lock (&rvu->cpt_intr_lock); + block->cpt_flt_eng_map[vec] |=BIT_ULL (i); + val =rvu_read64 (rvu, blkaddr,CPT_AF_EXEX_STS (eng)); + val = val &0x3 ; +if (val ==0x1 || val ==0x2 ) + block->cpt_rcvrd_eng_map[vec] |=BIT_ULL (i); +spin_unlock (&rvu->cpt_intr_lock); }rvu_write64 (rvu, blkaddr,CPT_AF_FLTX_INT (vec), reg);
@@ -899,6 +907,31 @@ int rvu_mbox_handler_cpt_lf_reset(struct rvu *rvu, struct cpt_lf_rst_req *req,return 0 ; } +int rvu_mbox_handler_cpt_flt_eng_info (struct rvu *rvu,struct cpt_flt_eng_info_req *req, +struct cpt_flt_eng_info_rsp *rsp) +{ +struct rvu_block *block; +unsigned long flags; +int blkaddr, vec; + + blkaddr =validate_and_get_cpt_blkaddr (req->blkaddr); +if (blkaddr <0 ) +return blkaddr; + + block = &rvu->hw->block[blkaddr]; +for (vec =0 ; vec <CPT_10K_AF_INT_VEC_RVU ; vec++) { +spin_lock_irqsave (&rvu->cpt_intr_lock, flags); + rsp->flt_eng_map[vec] = block->cpt_flt_eng_map[vec]; + rsp->rcvrd_eng_map[vec] = block->cpt_rcvrd_eng_map[vec]; +if (req->reset) { + block->cpt_flt_eng_map[vec] =0x0 ; + block->cpt_rcvrd_eng_map[vec] =0x0 ; + } +spin_unlock_irqrestore (&rvu->cpt_intr_lock, flags); + } +return 0 ; +} +static void cpt_rxc_teardown (struct rvu *rvu,int blkaddr) {struct cpt_rxc_time_cfg_req req, prev;
@@ -1182,5 +1215,7 @@ int rvu_cpt_init(struct rvu *rvu) {/* Retrieve CPT PF number */ rvu->cpt_pf_num =get_cpt_pf_num (rvu); +spin_lock_init (&rvu->cpt_intr_lock); +return 0 ; }
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 22/35 HID: playstation: sanity check DualSense calibration data.
In reply to Sasha LevinFrom: Roderick Colenbrander <[email protected]>
[ Upstream commit ccf1e1626d37745d0a697db67407beec9ae9d4b8 ]
Make sure calibration values are defined to prevent potential kernel crashes. This fixes a hypothetical issue for virtual or clone devices inspired by a similar fix for DS4.
--- drivers/hid/hid-playstation.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/hid/hid-playstation.c +32 -0
@@ -712,6 +712,7 @@ ATTRIBUTE_GROUPS(ps_device);static int dualsense_get_calibration_data (struct dualsense *ds) { +struct hid_device *hdev = ds->base.hdev;short gyro_pitch_bias, gyro_pitch_plus, gyro_pitch_minus;short gyro_yaw_bias, gyro_yaw_plus, gyro_yaw_minus;short gyro_roll_bias, gyro_roll_plus, gyro_roll_minus;
@@ -722,6 +723,7 @@ static int dualsense_get_calibration_data(struct dualsense *ds)int speed_2x;int range_2g;int ret =0 ; +int i;uint8_t *buf; buf =kzalloc (DS_FEATURE_REPORT_CALIBRATION_SIZE ,GFP_KERNEL );
@@ -773,6 +775,21 @@ static int dualsense_get_calibration_data(struct dualsense *ds) ds->gyro_calib_data[2 ].sens_numer = speed_2x*DS_GYRO_RES_PER_DEG_S ; ds->gyro_calib_data[2 ].sens_denom = gyro_roll_plus - gyro_roll_minus; +/* +* Sanity check gyro calibration data. This is needed to prevent crashes +* during report handling of virtual, clone or broken devices not implementing +* calibration data properly. +*/ +for (i =0 ; i <ARRAY_SIZE (ds->gyro_calib_data); i++) { +if (ds->gyro_calib_data[i].sens_denom ==0 ) { +hid_warn (hdev,"Invalid gyro calibration data for axis (%d), disabling calibration." , + ds->gyro_calib_data[i].abs_code); + ds->gyro_calib_data[i].bias =0 ; + ds->gyro_calib_data[i].sens_numer =DS_GYRO_RANGE ; + ds->gyro_calib_data[i].sens_denom =S16_MAX ; + } + } +/* * Set accelerometer calibration and normalization parameters. * Data values will be normalized to 1/DS_ACC_RES_PER_G g.
@@ -795,6 +812,21 @@ static int dualsense_get_calibration_data(struct dualsense *ds) ds->accel_calib_data[2 ].sens_numer =2 *DS_ACC_RES_PER_G ; ds->accel_calib_data[2 ].sens_denom = range_2g; +/* +* Sanity check accelerometer calibration data. This is needed to prevent crashes +* during report handling of virtual, clone or broken devices not implementing calibration +* data properly. +*/ +for (i =0 ; i <ARRAY_SIZE (ds->accel_calib_data); i++) { +if (ds->accel_calib_data[i].sens_denom ==0 ) { +hid_warn (hdev,"Invalid accelerometer calibration data for axis (%d), disabling calibration." , + ds->accel_calib_data[i].abs_code); + ds->accel_calib_data[i].bias =0 ; + ds->accel_calib_data[i].sens_numer =DS_ACC_RANGE ; + ds->accel_calib_data[i].sens_denom =S16_MAX ; + } + } + err_free:kfree (buf);return ret;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 28/35 octeontx2-af: add mbox for CPT LF reset
In reply to Sasha LevinFrom: Srujana Challa <[email protected]>
[ Upstream commit f58cf765e8f5f4860ea094aa12c156d9195a4c28 ]
On OcteonTX2 SoC, the admin function (AF) is the only one with all priviliges to configure HW and alloc resources, PFs and it's VFs have to request AF via mailbox for all their needs. This patch adds a new mailbox for CPT VFs to request for CPT LF reset.
--- .../net/ethernet/marvell/octeontx2/af/mbox.h | 8 +++++ .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 33 +++++++++++++++++++ 2 files changed, 41 insertions(+)
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +8 -0
@@ -195,6 +195,7 @@ M(CPT_STATS, 0xA05, cpt_sts, cpt_sts_req, cpt_sts_rsp) \M (CPT_RXC_TIME_CFG ,0xA06 , cpt_rxc_time_cfg, cpt_rxc_time_cfg_req, \ msg_rsp) \ M(CPT_CTX_CACHE_SYNC, 0xA07, cpt_ctx_cache_sync, msg_req, msg_rsp) \ +M (CPT_LF_RESET ,0xA08 , cpt_lf_reset, cpt_lf_rst_req, msg_rsp) \ /* SDP mbox IDs (range 0x1000 - 0x11FF) */ \ M(SET_SDP_CHAN_INFO, 0x1000, set_sdp_chan_info, sdp_chan_info_msg, msg_rsp) \M (GET_SDP_CHAN_INFO ,0x1001 , get_sdp_chan_info, msg_req, sdp_get_chan_info_msg) \
@@ -1674,6 +1675,13 @@ struct cpt_inst_lmtst_req {u64 rsvd; }; +/* Mailbox message format to request for CPT LF reset */ +struct cpt_lf_rst_req { +struct mbox_msghdr hdr; +u32 slot; +u32 rsvd; +}; +struct sdp_node_info {/* Node to which this PF belons to */ u8 node_id;
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +33 -0
@@ -851,6 +851,39 @@ int rvu_mbox_handler_cpt_ctx_cache_sync(struct rvu *rvu, struct msg_req *req,return rvu_cpt_ctx_flush (rvu, req->hdr.pcifunc); } +int rvu_mbox_handler_cpt_lf_reset (struct rvu *rvu,struct cpt_lf_rst_req *req, +struct msg_rsp *rsp) +{ +u16 pcifunc = req->hdr.pcifunc; +struct rvu_block *block; +int cptlf, blkaddr, ret; +u16 actual_slot; +u64 ctl, ctl2; + + blkaddr =rvu_get_blkaddr_from_slot (rvu,BLKTYPE_CPT , pcifunc, + req->slot, &actual_slot); +if (blkaddr <0 ) +return CPT_AF_ERR_LF_INVALID ; + + block = &rvu->hw->block[blkaddr]; + + cptlf =rvu_get_lf (rvu, block, pcifunc, actual_slot); +if (cptlf <0 ) +return CPT_AF_ERR_LF_INVALID ; + ctl =rvu_read64 (rvu, blkaddr,CPT_AF_LFX_CTL (cptlf)); + ctl2 =rvu_read64 (rvu, blkaddr,CPT_AF_LFX_CTL2 (cptlf)); + + ret =rvu_lf_reset (rvu, block, cptlf); +if (ret) +dev_err (rvu->dev,"Failed to reset blkaddr %d LF%d\n" , + block->addr, cptlf); + +rvu_write64 (rvu, blkaddr,CPT_AF_LFX_CTL (cptlf), ctl); +rvu_write64 (rvu, blkaddr,CPT_AF_LFX_CTL2 (cptlf), ctl2); + +return 0 ; +} +static void cpt_rxc_teardown (struct rvu *rvu,int blkaddr) {struct cpt_rxc_time_cfg_req req;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 34/35 prlimit: do_prlimit needs to have a speculation check
In reply to Sasha LevinFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 739790605705ddcf18f21782b9c99ad7d53a8c11 ]
do_prlimit() adds the user-controlled resource value to a pointer that will subsequently be dereferenced. In order to help prevent this codepath from being used as a spectre "gadget" a barrier needs to be added after checking the range.
--- kernel/sys.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/sys.c +2 -0
@@ -1442,6 +1442,8 @@ static int do_prlimit(struct task_struct *tsk, unsigned int resource,if (resource >=RLIM_NLIMITS )return -EINVAL ; + resource =array_index_nospec (resource,RLIM_NLIMITS ); +if (new_rlim) {if (new_rlim->rlim_cur > new_rlim->rlim_max)return -EINVAL ;
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 25/35 cifs: fix return of uninitialized rc in dfs_cache_update_tgthint()
In reply to Sasha LevinFrom: Paulo Alcantara <[email protected]>
[ Upstream commit d6a49e8c4ca4d399ed65ac219585187fc8c2e2b1 ]
Fix this by initializing rc to 0 as cache_refresh_path() would not set it in case of success.
--- fs/cifs/dfs_cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/cifs/dfs_cache.c +3 -3
@@ -1046,10 +1046,10 @@ int dfs_cache_update_tgthint(const unsigned int xid, struct cifs_ses *ses, const struct nls_table *cp, int remap, const char *path, const struct dfs_cache_tgt_iterator *it) { - int rc; -const char *npath; -struct cache_entry *ce; struct cache_dfs_tgt *t; +struct cache_entry *ce; +const char *npath; +int rc =0 ; npath =dfs_cache_canonical_path (path, cp, remap);if (IS_ERR (npath))
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 35/35 ext4: deal with legacy signed xattr name hash values
In reply to Sasha LevinFrom: Linus Torvalds <[email protected]>
[ Upstream commit f3bbac32475b27f49be201f896d98d4009de1562 ]
We potentially have old hashes of the xattr names generated on systems with signed 'char' types. Now that everybody uses '-funsigned-char', those hashes will no longer match.
This only happens if you use xattrs names that have the high bit set, which probably doesn't happen in practice, but the xfstest generic/454 shows it.
Instead of adding a new "signed xattr hash filesystem" bit and having to deal with all the possible combinations, just calculate the hash both ways if the first one fails, and always generate new hashes with the proper unsigned char version.
--- fs/ext4/xattr.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
fs/ext4/xattr.c +39 -2
@@ -81,6 +81,8 @@ ext4_xattr_block_cache_find(struct inode *, struct ext4_xattr_header *, struct mb_cache_entry **);static __le32 ext4_xattr_hash_entry (char *name,size_t name_len,__le32 *value,size_t value_count); +static __le32 ext4_xattr_hash_entry_signed (char *name,size_t name_len,__le32 *value, +size_t value_count);static void ext4_xattr_rehash (struct ext4_xattr_header *);static const struct xattr_handler *const ext4_xattr_handler_map[] = {
@@ -470,8 +472,21 @@ ext4_xattr_inode_verify_hashes(struct inode *ea_inode, tmp_data =cpu_to_le32 (hash); e_hash =ext4_xattr_hash_entry (entry->e_name, entry->e_name_len, &tmp_data,1 ); -if (e_hash != entry->e_hash) -return -EFSCORRUPTED ; +/* All good? */ +if (e_hash == entry->e_hash) +return 0 ; + +/* +* Not good. Maybe the entry hash was calculated +* using the buggy signed char version? +*/ + e_hash =ext4_xattr_hash_entry_signed (entry->e_name, entry->e_name_len, + &tmp_data,1 ); +if (e_hash == entry->e_hash) +return 0 ; + +/* Still no match - bad */ +return -EFSCORRUPTED ; }return 0 ; }
@@ -3090,6 +3105,28 @@ static __le32 ext4_xattr_hash_entry(char *name, size_t name_len, __le32 *value,return cpu_to_le32 (hash); } +/* +* ext4_xattr_hash_entry_signed() +* +* Compute the hash of an extended attribute incorrectly. +*/ +static __le32 ext4_xattr_hash_entry_signed (char *name,size_t name_len,__le32 *value,size_t value_count) +{ +__u32 hash =0 ; + +while (name_len--) { + hash = (hash <<NAME_HASH_SHIFT ) ^ + (hash >> (8 *sizeof (hash) -NAME_HASH_SHIFT )) ^ + (signed char )*name++; + } +while (value_count--) { + hash = (hash <<VALUE_HASH_SHIFT ) ^ + (hash >> (8 *sizeof (hash) -VALUE_HASH_SHIFT )) ^ +le32_to_cpu (*value++); + } +return cpu_to_le32 (hash); +} +#undef NAME_HASH_SHIFT#undef VALUE_HASH_SHIFT
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 32/35 octeontx2-af: update cpt lf alloc mailbox
In reply to Sasha LevinFrom: Srujana Challa <[email protected]>
[ Upstream commit c0688ec002a451d04a51d43b849765c5ce6cb36f ]
The CN10K CPT coprocessor contains a context processor to accelerate updates to the IPsec security association contexts. The context processor contains a context cache. This patch updates CPT LF ALLOC mailbox to config ctx_ilen requested by VFs. CPT_LF_ALLOC:ctx_ilen is the size of initial context fetch.
--- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 2 ++ drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +2 -0
@@ -1592,6 +1592,8 @@ struct cpt_lf_alloc_req_msg {u16 sso_pf_func;u16 eng_grpmsk;int blkaddr; + u8 ctx_ilen_valid : 1; + u8 ctx_ilen : 7; };#define CPT_INLINE_INBOUND 0
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c +7 -3
@@ -17,7 +17,7 @@#define PCI_DEVID_OTX2_CPT10K_PF 0xA0F2/* Length of initial context fetch in 128 byte words */ -#define CPT_CTX_ILEN 2ULL +#define CPT_CTX_ILEN 1ULL#define cpt_get_eng_sts (e_min, e_max, rsp, etype) \ ({ \
@@ -421,8 +421,12 @@ int rvu_mbox_handler_cpt_lf_alloc(struct rvu *rvu,/* Set CPT LF group and priority */ val = (u64 )req->eng_grpmsk <<48 |1 ; -if (!is_rvu_otx2 (rvu)) - val |= (CPT_CTX_ILEN <<17 ); +if (!is_rvu_otx2 (rvu)) { +if (req->ctx_ilen_valid) + val |= (req->ctx_ilen <<17 ); +else + val |= (CPT_CTX_ILEN <<17 ); + }rvu_write64 (rvu, blkaddr,CPT_AF_LFX_CTL (cptlf), val);
Signature · 1 line
2.39.0
Sasha Levin
maintainerPATCH 24/35 gpiolib: acpi: Allow ignoring wake capability on pins that aren't in _AEI
In reply to Sasha LevinFrom: Mario Limonciello <[email protected]>
[ Upstream commit 0e3b175f079247f0d40d2ab695999c309d3a7498 ]
Using the ignore_wake quirk or module parameter doesn't work for any pin that has been specified in the _CRS instead of _AEI.
Extend the acpi_gpio_irq_is_wake check to cover both places.
--- drivers/gpio/gpiolib-acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib-acpi.c +2 -2
@@ -361,7 +361,7 @@ static bool acpi_gpio_in_ignore_list(const char *ignore_list, const char *contro }static bool acpi_gpio_irq_is_wake (struct device *parent, -struct acpi_resource_gpio *agpio) +const struct acpi_resource_gpio *agpio) {unsigned int pin = agpio->pin_table[0 ];
@@ -754,7 +754,7 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data) lookup->info.pin_config = agpio->pin_config; lookup->info.debounce = agpio->debounce_timeout; lookup->info.gpioint = gpioint; - lookup->info.wake_capable = agpio->wake_capable ==ACPI_WAKE_CAPABLE ; + lookup->info.wake_capable =acpi_gpio_irq_is_wake (&lookup->info.adev->dev, agpio);/* * Polarity and triggering are only specified for GpioInt
Signature · 1 line
2.39.0
Greg Kroah-Hartman
maintainerRe: [PATCH AUTOSEL 6.1 34/35] prlimit: do_prlimit needs to have a speculation check
In reply to Sasha LevinQuoted 34 lines · Sasha Levin
From: Greg Kroah-Hartman <[email protected]>
[ Upstream commit
739790605705ddcf18f21782b9c99ad7d53a8c11]
do_prlimit()adds the user-controlled resource value to a pointer that will subsequently be dereferenced. In order to help prevent this codepath from being used as a spectre "gadget" a barrier needs to be added after checking the range.Reported-by Jordy Zomer <[email protected]>Tested-by Jordy Zomer <[email protected]>Suggested-by Linus Torvalds <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- kernel/sys.c | 2 ++ 1 file changed, 2 insertions(+)kernel/sys.c +2
-0@@ -1442,6 +1442,8 @@ static int do_prlimit(struct task_struct *tsk, unsigned int resource,if (resource >=RLIM_NLIMITS )return -EINVAL ; + resource =array_index_nospec (resource,RLIM_NLIMITS ); +if (new_rlim) {if (new_rlim->rlim_cur > new_rlim->rlim_max)return -EINVAL ;Signature · 1 line
2.39.0
This is already in the 6.1.8 release so no need to add it again :)
thanks,
greg k-h
Re: [PATCH AUTOSEL 6.1 35/35] ext4: deal with legacy signed xattr name hash values
In reply to Sasha LevinQuoted 8 lines · Sasha Levin
From: Linus Torvalds <[email protected]>
[ Upstream commit
f3bbac32475b27f49be201f896d98d4009de1562]We potentially have old hashes of the xattr names generated on systems with signed 'char' types. Now that everybody uses '-funsigned-char', those hashes will no longer match.
This patch does not work correctly without '-funsigned-char', and I don't think that has been back-ported to stable kernels.
That said, the patch *almost* works. You'd just have to add something like this to it:
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -3096,7 +3096,7 @@ static __le32 ext4_xattr_hash_entry(char *name,
while (name_len--) {
hash = (hash << NAME_HASH_SHIFT) ^
(hash >> (8*sizeof(hash) - NAME_HASH_SHIFT)) ^
- *name++;
+ (unsigned char)*name++;
}
while (value_count--) {
hash = (hash << VALUE_HASH_SHIFT) ^to make it work right (ie just make sure that the proper xattr name hashing actually uses unsigned chars for its hash).
Linus
Re: [PATCH AUTOSEL 6.1 15/35] btrfs: stop using write_one_page in btrfs_scratch_superblock
In reply to Sasha LevinQuoted 9 lines · Sasha Levin
From: Christoph Hellwig <[email protected]>
[ Upstream commit
26ecf243e407be54807ad67210f7e83b9fad71ea]
write_one_pageis an awkward interface that expects the page locked and ->writepage to be implemented. Replace that by zeroing the signature bytes and synchronize the block device page using the proper bdev helpers.
Quoted 5 lines
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by David Sterba <[email protected]>[ update changelog ]Signed-off-by David Sterba <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Please drop this patch and "btrfs: factor out scratching of one regular super block" from all stable queues. It's not a fix, only preparatory work to allow removing write_one_page from MM code.
Commit ids: 0e0078f72be81bbb and 26ecf243e407be54
Re: [PATCH AUTOSEL 6.1 35/35] ext4: deal with legacy signed xattr name hash values
In reply to Linus TorvaldsQuoted 5 lines · Linus Torvalds
This patch does not work correctly without '-funsigned-char', and I don't think that has been back-ported to stable kernels.
That said, the patch *almost* works.
So I'm not convinced this should be back-ported at all, but it's certainly true that going back and forth between the two cases would be problematic.
Maybe the right thing to do would be for me to just do that explicit 'unsigned char' even in kernels that don't need it, and also add a 'pr_warn_once()' to make people aware of this case if it ever happens outside of the xfstests.
So a more complete patch might be something like the attached (which also changes the polarity of the signed hash test, in order to make the pr_warn_once() simpler).
Linus
fs/ext4/xattr.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/ext4/xattr.c +6 -5
@@ -482,11 +482,12 @@ ext4_xattr_inode_verify_hashes(struct inode *ea_inode,*/ e_hash =ext4_xattr_hash_entry_signed (entry->e_name, entry->e_name_len, &tmp_data,1 ); -if (e_hash == entry->e_hash) -return 0 ; -/* Still no match - bad */ -return -EFSCORRUPTED ; +if (e_hash != entry->e_hash) +return -EFSCORRUPTED ; + +/* Let people know about old hash */ +pr_warn_once ("ext4: filesystem with signed xattr name hash" ); }return 0 ; }
@@ -3096,7 +3097,7 @@ static __le32 ext4_xattr_hash_entry(char *name, size_t name_len, __le32 *value,while (name_len--) { hash = (hash <<NAME_HASH_SHIFT ) ^ (hash >> (8 *sizeof (hash) -NAME_HASH_SHIFT )) ^ - *name++; + (unsigned char )*name++; }while (value_count--) { hash = (hash << VALUE_HASH_SHIFT) ^
Re: [PATCH AUTOSEL 6.1 35/35] ext4: deal with legacy signed xattr name hash values
Quoted 11 lines · Linus Torvalds
Quoted 5 lines · Linus Torvalds
This patch does not work correctly without '-funsigned-char', and I don't think that has been back-ported to stable kernels.
That said, the patch *almost* works.
So I'm not convinced this should be back-ported at all, but it's certainly true that going back and forth between the two cases would be problematic.
Yeah, I wouldn't backport this patch, since it also requires changes to e2fsprogs that will take a while to propagate to stable distributions.
- Ted
Sasha Levin
maintainerRe: [PATCH AUTOSEL 6.1 35/35] ext4: deal with legacy signed xattr name hash values
Quoted 7 lines · Theodore Ts'o
Quoted 6 lines · Linus Torvalds
Quoted 4 lines · Linus Torvalds
This patch does not work correctly without '-funsigned-char', and I don't think that has been back-ported to stable kernels.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
That said, the patch *almost* works.
So I'm not convinced this should be back-ported at all, but it's certainly true that going back and forth between the two cases would be problematic.
Yeah, I wouldn't backport this patch, since it also requires changes to e2fsprogs that will take a while to propagate to stable distributions.
Ack, I'll drop it. Thanks!
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerRe: [PATCH AUTOSEL 6.1 15/35] btrfs: stop using write_one_page in btrfs_scratch_superblock
In reply to David SterbaQuoted 16 lines · David Sterba
Quoted 9 lines · Sasha Levin
From: Christoph Hellwig <[email protected]>
[ Upstream commit
26ecf243e407be54807ad67210f7e83b9fad71ea]
write_one_pageis an awkward interface that expects the page locked and ->writepage to be implemented. Replace that by zeroing the signature bytes and synchronize the block device page using the proper bdev helpers.Quoted 5 lines
Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by David Sterba <[email protected]>[ update changelog ]Signed-off-by David Sterba <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 5 lines
Please drop this patch and "btrfs: factor out scratching of one regular super block" from all stable queues. It's not a fix, only preparatory work to allow removing
write_one_pagefrom MM code.Commit ids:
0e0078f72be81bbband26ecf243e407be54
Ack, dropped.
Signature · 2 lines
Thanks, Sasha