6.6.14-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainerPATCH 143/583 arm64: dts: hisilicon: hikey970-pmic: fix regulator cells properties
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 44ab3ee76a5a977864ba0bb6c352dcf6206804e0 ]
The Hi6421 PMIC regulator child nodes do not have unit addresses so drop the incorrect '#address-cells' and '#size-cells' properties.
--- arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi | 3 --- 1 file changed, 3 deletions(-)
arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi +0 -3
@@ -25,9 +25,6 @@ pmic: pmic@0 { gpios = <&gpio28 0 0>; regulators { - #address-cells = <1>; - #size-cells = <0>; - ldo3: ldo3 { /* HDMI */ regulator-name = "ldo3"; regulator-min-microvolt = <1500000>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 144/583 bpf: Guard stack limits against 32bit overflow
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Matei <[email protected]>
[ Upstream commit 1d38a9ee81570c4bd61f557832dead4d6f816760 ]
This patch promotes the arithmetic around checking stack bounds to be done in the 64-bit domain, instead of the current 32bit. The arithmetic implies adding together a 64-bit register with a int offset. The register was checked to be below 1<<29 when it was variable, but not when it was fixed. The offset either comes from an instruction (in which case it is 16 bit), from another register (in which case the caller checked it to be below 1<<29 [1]), or from the size of an argument to a kfunc (in which case it can be a u32 [2]). Between the register being inconsistently checked to be below 1<<29, and the offset being up to an u32, it appears that we were open to overflowing the ints which were currently used for arithmetic.
[1] https://github.com/torvalds/linux/blob/815fb87b753055df2d9e50f6cd80eb10235fe3e9/kernel/bpf/verifier.c#L7494-L7498
[2] https://github.com/torvalds/linux/blob/815fb87b753055df2d9e50f6cd80eb10235fe3e9/kernel/bpf/verifier.c#L11904
Stable-dep-of: 6b4a64bafd10 ("bpf: Fix accesses to uninit stack slots")
--- kernel/bpf/verifier.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/verifier.c +3 -3
@@ -6371,7 +6371,7 @@ static int check_ptr_to_map_access(struct bpf_verifier_env *env,* The minimum valid offset is -MAX_BPF_STACK for writes, and * -state->allocated_stack for reads. */ -static int check_stack_slot_within_bounds (int off, +static int check_stack_slot_within_bounds (s64 off,struct bpf_func_state *state,enum bpf_access_type t) {
@@ -6400,7 +6400,7 @@ static int check_stack_access_within_bounds(struct bpf_reg_state *regs =cur_regs (env);struct bpf_reg_state *reg = regs + regno;struct bpf_func_state *state =func (env, reg); -int min_off, max_off; +s64 min_off, max_off;int err;char *err_extra;
@@ -6413,7 +6413,7 @@ static int check_stack_access_within_bounds( err_extra =" write to" ;if (tnum_is_const (reg->var_off)) { - min_off = reg->var_off.value + off; + min_off = (s64 )reg->var_off.value + off; max_off = min_off + access_size; }else { if (reg->smax_value >= BPF_MAX_VAR_OFF ||
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 145/583 bpf: Fix accesses to uninit stack slots
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Matei <[email protected]>
[ Upstream commit 6b4a64bafd107e521c01eec3453ce94a3fb38529 ]
Privileged programs are supposed to be able to read uninitialized stack memory (ever since 6715df8d5) but, before this patch, these accesses were permitted inconsistently. In particular, accesses were permitted above state->allocated_stack, but not below it. In other words, if the stack was already "large enough", the access was permitted, but otherwise the access was rejected instead of being allowed to "grow the stack". This undesired rejection was happening in two places:
- in check_stack_slot_within_bounds()
- in check_stack_range_initialized()
This patch arranges for these accesses to be permitted. A bunch of tests that were relying on the old rejection had to change; all of them were changed to add also run unprivileged, in which case the old behavior persists. One tests couldn't be updated - global_func16 - because it can't run unprivileged for other reasons.
This patch also fixes the tracking of the stack size for variable-offset reads. This second fix is bundled in the same commit as the first one because they're inter-related. Before this patch, writes to the stack using registers containing a variable offset (as opposed to registers with fixed, known values) were not properly contributing to the function's needed stack size. As a result, it was possible for a program to verify, but then to attempt to read out-of-bounds data at runtime because a too small stack had been allocated for it.
Each function tracks the size of the stack it needs in bpf_subprog_info.stack_depth, which is maintained by update_stack_depth(). For regular memory accesses, check_mem_access() was calling update_state_depth() but it was passing in only the fixed part of the offset register, ignoring the variable offset. This was incorrect; the minimum possible value of that register should be used instead.
This tracking is now fixed by centralizing the tracking of stack size in grow_stack_state(), and by lifting the calls to grow_stack_state() to check_stack_access_within_bounds() as suggested by Andrii. The code is now simpler and more convincingly tracks the correct maximum stack size. check_stack_range_initialized() can now rely on enough stack having been allocated for the access; this helps with the fix for the first issue.
A few tests were changed to also check the stack depth computation. The one that fails without this patch is verifier_var_off:stack_write_priv_vs_unpriv.
--- kernel/bpf/verifier.c | 65 ++++++++----------- .../selftests/bpf/progs/test_global_func16.c | 2 +- .../bpf/progs/verifier_basic_stack.c | 8 +-- .../selftests/bpf/progs/verifier_int_ptr.c | 5 +- .../selftests/bpf/progs/verifier_raw_stack.c | 5 +- .../selftests/bpf/progs/verifier_var_off.c | 62 ++++++++++++++---- .../selftests/bpf/verifier/atomic_cmpxchg.c | 11 ---- tools/testing/selftests/bpf/verifier/calls.c | 4 +- 8 files changed, 91 insertions(+), 71 deletions(-)
kernel/bpf/verifier.c +26 -39
@@ -1632,7 +1632,10 @@ static int resize_reference_state(struct bpf_func_state *state, size_t n)return 0 ; } -static int grow_stack_state (struct bpf_func_state *state,int size) +/* Possibly update state->allocated_stack to be at least size bytes. Also +* possibly update the function's high-water mark in its bpf_subprog_info. +*/ +static int grow_stack_state (struct bpf_verifier_env *env,struct bpf_func_state *state,int size) {size_t old_n = state->allocated_stack /BPF_REG_SIZE , n = size /BPF_REG_SIZE ;
@@ -1644,6 +1647,11 @@ static int grow_stack_state(struct bpf_func_state *state, int size)return -ENOMEM ; state->allocated_stack = size; + +/* update known max for given subprogram */ +if (env->subprog_info[state->subprogno].stack_depth < size) + env->subprog_info[state->subprogno].stack_depth = size; +return 0 ; }
@@ -4323,9 +4331,6 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env,struct bpf_reg_state *reg =NULL ;u32 dst_reg = insn->dst_reg; - err =grow_stack_state (state,round_up (slot +1 ,BPF_REG_SIZE )); -if (err) -return err;/* caller checked that off % size == 0 and -MAX_BPF_STACK <= off < 0, * so it's aligned access and [off, off + size) are within stack limits */
@@ -4481,10 +4486,6 @@ static int check_stack_write_var_off(struct bpf_verifier_env *env, (!value_reg && is_bpf_st_mem(insn) && insn->imm == 0)) writing_zero = true; - err =grow_stack_state (state,round_up (-min_off,BPF_REG_SIZE )); -if (err) -return err; -for (i = min_off; i < max_off; i++) {int spi;
@@ -5599,20 +5600,6 @@ static int check_ptr_alignment(struct bpf_verifier_env *env, strict); } -static int update_stack_depth (struct bpf_verifier_env *env, -const struct bpf_func_state *func, -int off) -{ -u16 stack = env->subprog_info[func->subprogno].stack_depth; - -if (stack >= -off) -return 0 ; - -/* update known max for given subprogram */ - env->subprog_info[func->subprogno].stack_depth = -off; -return 0 ; -} -/* starting from main bpf function walk all instructions of the function * and recursively walk all callees that given function can call. * Ignore jump and exit insns.
@@ -6371,13 +6358,14 @@ static int check_ptr_to_map_access(struct bpf_verifier_env *env,* The minimum valid offset is -MAX_BPF_STACK for writes, and * -state->allocated_stack for reads. */ -static int check_stack_slot_within_bounds (s64 off, -struct bpf_func_state *state, -enum bpf_access_type t) +static int check_stack_slot_within_bounds (struct bpf_verifier_env *env, +s64 off, +struct bpf_func_state *state, +enum bpf_access_type t) {int min_valid_off; -if (t ==BPF_WRITE ) +if (t ==BPF_WRITE || env->allow_uninit_stack) min_valid_off = -MAX_BPF_STACK ;else min_valid_off = -state->allocated_stack;
@@ -6426,7 +6414,7 @@ static int check_stack_access_within_bounds( max_off = reg->smax_value + off + access_size; } - err =check_stack_slot_within_bounds (min_off, state, type); + err =check_stack_slot_within_bounds (env, min_off, state, type);if (!err && max_off >0 ) err = -EINVAL ;/* out of stack access into non-negative offsets */
@@ -6441,8 +6429,10 @@ static int check_stack_access_within_bounds(verbose (env,"invalid variable-offset%s stack R%d var_off=%s size=%d\n" , err_extra, regno, tn_buf, access_size); } +return err; } -return err; + +return grow_stack_state (env, state,round_up (-min_off,BPF_REG_SIZE )); }/* check whether memory at (regno + off) is accessible for t = (read | write)
@@ -6457,7 +6447,6 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn {struct bpf_reg_state *regs =cur_regs (env);struct bpf_reg_state *reg = regs + regno; -struct bpf_func_state *state;int size, err =0 ; size =bpf_size_to_bytes (bpf_size);
@@ -6600,11 +6589,6 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regnif (err)return err; - state =func (env, reg); - err =update_stack_depth (env, state, off); -if (err) -return err; -if (t ==BPF_READ ) err =check_stack_read (env, regno, off, size, value_regno);
@@ -6799,7 +6783,8 @@ static int check_atomic(struct bpf_verifier_env *env, int insn_idx, struct bpf_i/* When register 'regno' is used to read the stack (either directly or through * a helper function) make sure that it's within stack boundary and, depending -* on the access type, that all elements of the stack are initialized. +* on the access type and privileges, that all elements of the stack are +* initialized. * * 'off' includes 'regno->off', but not its dynamic part (if any). *
@@ -6907,8 +6892,11 @@ static int check_stack_range_initialized( slot = -i -1 ; spi = slot /BPF_REG_SIZE ; -if (state->allocated_stack <= slot) - goto err; +if (state->allocated_stack <= slot) { +verbose (env,"verifier bug: allocated_stack too small" ); +return -EFAULT ; + } + stype = &state->stack[spi].slot_type[slot %BPF_REG_SIZE ];if (*stype ==STACK_MISC ) goto mark;
@@ -6932,7 +6920,6 @@ static int check_stack_range_initialized( goto mark; } -err:if (tnum_is_const (reg->var_off)) {verbose (env,"invalid%s read from stack R%d off %d+%d size %d\n" , err_extra, regno, min_off, i - min_off, access_size);
@@ -6957,7 +6944,7 @@ static int check_stack_range_initialized(* helper may write to the entire memory range. */ } -return update_stack_depth (env, state, min_off); +return 0 ; } static int check_helper_mem_access(struct bpf_verifier_env *env, int regno,
tools/testing/selftests/bpf/progs/test_global_func16.c +1 -1
@@ -13,7 +13,7 @@ __noinline int foo(int (*arr)[10]) } SEC("cgroup_skb/ingress") -__failure __msg("invalid indirect read from stack") +__successint global_func16 (struct __sk_buff *skb) {int array[10 ];
tools/testing/selftests/bpf/progs/verifier_basic_stack.c +4 -4
@@ -27,8 +27,8 @@ __naked void stack_out_of_bounds(void) SEC("socket") __description("uninitialized stack1") -__failure __msg("invalid indirect read from stack") -__failure_unpriv +__success __log_level(4) __msg("stack depth 8") +__failure_unpriv __msg_unpriv("invalid indirect read from stack") __naked void uninitialized_stack1(void) { asm volatile (" \
@@ -45,8 +45,8 @@ __naked void uninitialized_stack1(void) SEC("socket") __description("uninitialized stack2") -__failure __msg("invalid read from stack") -__failure_unpriv +__success __log_level(4) __msg("stack depth 8") +__failure_unpriv __msg_unpriv("invalid read from stack") __naked void uninitialized_stack2(void) { asm volatile (" \
tools/testing/selftests/bpf/progs/verifier_int_ptr.c +3 -2
@@ -5,9 +5,10 @@#include <bpf/bpf_helpers.h> #include "bpf_misc.h" -SEC("cgroup/sysctl") +SEC("socket") __description("ARG_PTR_TO_LONG uninitialized") -__failure __msg("invalid indirect read from stack R4 off -16+0 size 8") +__success +__failure_unpriv __msg_unpriv("invalid indirect read from stack R4 off -16+0 size 8")__naked void arg_ptr_to_long_uninitialized (void ) { asm volatile (" \
tools/testing/selftests/bpf/progs/verifier_raw_stack.c +3 -2
@@ -5,9 +5,10 @@#include <bpf/bpf_helpers.h> #include "bpf_misc.h" -SEC("tc") +SEC("socket") __description("raw_stack: no skb_load_bytes") -__failure __msg("invalid read from stack R6 off=-8 size=8") +__success +__failure_unpriv __msg_unpriv("invalid read from stack R6 off=-8 size=8")__naked void stack_no_skb_load_bytes (void ) { asm volatile (" \
tools/testing/selftests/bpf/progs/verifier_var_off.c +51 -11
93 lines not on this page · raw message
tools/testing/selftests/bpf/verifier/atomic_cmpxchg.c +0 -11
@@ -83,17 +83,6 @@ .result = REJECT, .errstr = "!read_ok", }, -{ - "Can't use cmpxchg on uninit memory", - .insns = { -BPF_MOV64_IMM (BPF_REG_0 ,3 ), -BPF_MOV64_IMM (BPF_REG_2 ,4 ), -BPF_ATOMIC_OP (BPF_DW ,BPF_CMPXCHG ,BPF_REG_10 ,BPF_REG_2 ,-8 ), - BPF_EXIT_INSN(), - }, - .result =REJECT , - .errstr = "invalid read from stack", -}, { "BPF_W cmpxchg should zero top 32 bits", .insns = {
tools/testing/selftests/bpf/verifier/calls.c +3 -1
@@ -1505,7 +1505,9 @@ .prog_type = BPF_PROG_TYPE_XDP, .fixup_map_hash_8b = { 23 }, .result = REJECT, - .errstr ="invalid read from stack R7 off=-16 size=8" , + .errstr = "R0 invalid mem access 'scalar'", + .result_unpriv = REJECT, + .errstr_unpriv ="invalid read from stack R7 off=-16 size=8" , }, { "calls: two calls that receive map_value via arg=ptr_stack_of_caller. test1",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 146/583 dt-bindings: media: mediatek: mdp3: correct RDMA and WROT node with generic names
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moudy Ho <[email protected]>
[ Upstream commit f5f185bf7c42f6ca885202fefc40fc871d08a722 ]
The DMA-related nodes RDMA/WROT in MDP3 should be changed to generic names. In addition, fix improper space indent in example.
--- .../bindings/media/mediatek,mdp3-rdma.yaml | 29 +++++++++++-------- .../bindings/media/mediatek,mdp3-wrot.yaml | 23 +++++++++------ 2 files changed, 31 insertions(+), 21 deletions(-)
Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml +17 -12
@@ -61,6 +61,9 @@ properties: - description: used for 1st data pipe from RDMA - description: used for 2nd data pipe from RDMA + '#dma-cells': + const: 1 + required: - compatible - reg
@@ -70,6 +73,7 @@ required: - clocks - iommus - mboxes + - '#dma-cells' additionalProperties: false
@@ -80,16 +84,17 @@ examples: #include <dt-bindings/power/mt8183-power.h> #include <dt-bindings/memory/mt8183-larb-port.h> - mdp3_rdma0: mdp3-rdma0@14001000 { - compatible = "mediatek,mt8183-mdp3-rdma"; - reg = <0x14001000 0x1000>; - mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>; - mediatek,gce-events = <CMDQ_EVENT_MDP_RDMA0_SOF>, - <CMDQ_EVENT_MDP_RDMA0_EOF>; - power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; - clocks = <&mmsys CLK_MM_MDP_RDMA0>, - <&mmsys CLK_MM_MDP_RSZ1>; - iommus = <&iommu>; - mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST>, - <&gce 21 CMDQ_THR_PRIO_LOWEST>; + dma-controller@14001000 { + compatible = "mediatek,mt8183-mdp3-rdma"; + reg = <0x14001000 0x1000>; + mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>; + mediatek,gce-events = <CMDQ_EVENT_MDP_RDMA0_SOF>, + <CMDQ_EVENT_MDP_RDMA0_EOF>; + power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; + clocks = <&mmsys CLK_MM_MDP_RDMA0>, + <&mmsys CLK_MM_MDP_RSZ1>; + iommus = <&iommu>; + mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST>, + <&gce 21 CMDQ_THR_PRIO_LOWEST>; + #dma-cells = <1>; };
Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml +14 -9
@@ -50,6 +50,9 @@ properties: iommus: maxItems: 1 + '#dma-cells': + const: 1 + required: - compatible - reg
@@ -58,6 +61,7 @@ required: - power-domains - clocks - iommus + - '#dma-cells' additionalProperties: false
@@ -68,13 +72,14 @@ examples: #include <dt-bindings/power/mt8183-power.h> #include <dt-bindings/memory/mt8183-larb-port.h> - mdp3_wrot0: mdp3-wrot0@14005000 { - compatible = "mediatek,mt8183-mdp3-wrot"; - reg = <0x14005000 0x1000>; - mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>; - mediatek,gce-events = <CMDQ_EVENT_MDP_WROT0_SOF>, - <CMDQ_EVENT_MDP_WROT0_EOF>; - power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; - clocks = <&mmsys CLK_MM_MDP_WROT0>; - iommus = <&iommu>; + dma-controller@14005000 { + compatible = "mediatek,mt8183-mdp3-wrot"; + reg = <0x14005000 0x1000>; + mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>; + mediatek,gce-events = <CMDQ_EVENT_MDP_WROT0_SOF>, + <CMDQ_EVENT_MDP_WROT0_EOF>; + power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; + clocks = <&mmsys CLK_MM_MDP_WROT0>; + iommus = <&iommu>; + #dma-cells = <1>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 147/583 arm64: dts: mediatek: mt8183: correct MDP3 DMA-related nodes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moudy Ho <[email protected]>
[ Upstream commit 188ffcd7fea79af3cac441268fc99f60e87f03b3 ]
In order to generalize the node names, the DMA-related nodes corresponding to MT8183 MDP3 need to be corrected.
--- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt8183.dtsi +4 -2
@@ -1660,7 +1660,7 @@ mmsys: syscon@14000000 { mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0 0x1000>; }; - mdp3-rdma0@14001000 { + dma-controller0@14001000 { compatible = "mediatek,mt8183-mdp3-rdma"; reg = <0 0x14001000 0 0x1000>; mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>;
@@ -1672,6 +1672,7 @@ mdp3-rdma0@14001000 { iommus = <&iommu M4U_PORT_MDP_RDMA0>; mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST 0>, <&gce 21 CMDQ_THR_PRIO_LOWEST 0>; + #dma-cells = <1>; }; mdp3-rsz0@14003000 {
@@ -1692,7 +1693,7 @@ mdp3-rsz1@14004000 { clocks = <&mmsys CLK_MM_MDP_RSZ1>; }; - mdp3-wrot0@14005000 { + dma-controller@14005000 { compatible = "mediatek,mt8183-mdp3-wrot"; reg = <0 0x14005000 0 0x1000>; mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>;
@@ -1701,6 +1702,7 @@ mdp3-wrot0@14005000 { power-domains = <&spm MT8183_POWER_DOMAIN_DISP>; clocks = <&mmsys CLK_MM_MDP_WROT0>; iommus = <&iommu M4U_PORT_MDP_WROT0>; + #dma-cells = <1>; }; mdp3-wdma@14006000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 148/583 arm64: dts: mediatek: mt8195: revise VDOSYS RDMA node name
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Moudy Ho <[email protected]>
[ Upstream commit 52f4a10f2a860402c130c5c21d055e721d63a7e9 ]
DMA-related nodes have their own standardized naming. Therefore, the MT8195 VDOSYS RDMA has been unified and corrected. Additionally, these modifications will facilitate the further integration of bindings.
--- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/mediatek/mt8195.dtsi +16 -8
@@ -2873,7 +2873,7 @@ larb3: larb@1c103000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; }; - vdo1_rdma0: rdma@1c104000 { + vdo1_rdma0: dma-controller@1c104000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c104000 0 0x1000>; interrupts = <GIC_SPI 495 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2881,9 +2881,10 @@ vdo1_rdma0: rdma@1c104000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vdo M4U_PORT_L2_MDP_RDMA0>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0x4000 0x1000>; + #dma-cells = <1>; }; - vdo1_rdma1: rdma@1c105000 { + vdo1_rdma1: dma-controller@1c105000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c105000 0 0x1000>; interrupts = <GIC_SPI 496 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2891,9 +2892,10 @@ vdo1_rdma1: rdma@1c105000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vpp M4U_PORT_L3_MDP_RDMA1>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0x5000 0x1000>; + #dma-cells = <1>; }; - vdo1_rdma2: rdma@1c106000 { + vdo1_rdma2: dma-controller@1c106000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c106000 0 0x1000>; interrupts = <GIC_SPI 497 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2901,9 +2903,10 @@ vdo1_rdma2: rdma@1c106000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vdo M4U_PORT_L2_MDP_RDMA2>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0x6000 0x1000>; + #dma-cells = <1>; }; - vdo1_rdma3: rdma@1c107000 { + vdo1_rdma3: dma-controller@1c107000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c107000 0 0x1000>; interrupts = <GIC_SPI 498 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2911,9 +2914,10 @@ vdo1_rdma3: rdma@1c107000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vpp M4U_PORT_L3_MDP_RDMA3>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0x7000 0x1000>; + #dma-cells = <1>; }; - vdo1_rdma4: rdma@1c108000 { + vdo1_rdma4: dma-controller@1c108000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c108000 0 0x1000>; interrupts = <GIC_SPI 499 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2921,9 +2925,10 @@ vdo1_rdma4: rdma@1c108000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vdo M4U_PORT_L2_MDP_RDMA4>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0x8000 0x1000>; + #dma-cells = <1>; }; - vdo1_rdma5: rdma@1c109000 { + vdo1_rdma5: dma-controller@1c109000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c109000 0 0x1000>; interrupts = <GIC_SPI 500 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2931,9 +2936,10 @@ vdo1_rdma5: rdma@1c109000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vpp M4U_PORT_L3_MDP_RDMA5>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0x9000 0x1000>; + #dma-cells = <1>; }; - vdo1_rdma6: rdma@1c10a000 { + vdo1_rdma6: dma-controller@1c10a000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c10a000 0 0x1000>; interrupts = <GIC_SPI 501 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2941,9 +2947,10 @@ vdo1_rdma6: rdma@1c10a000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vdo M4U_PORT_L2_MDP_RDMA6>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xa000 0x1000>; + #dma-cells = <1>; }; - vdo1_rdma7: rdma@1c10b000 { + vdo1_rdma7: dma-controller@1c10b000 { compatible = "mediatek,mt8195-vdo1-rdma"; reg = <0 0x1c10b000 0 0x1000>; interrupts = <GIC_SPI 502 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -2951,6 +2958,7 @@ vdo1_rdma7: rdma@1c10b000 { power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; iommus = <&iommu_vpp M4U_PORT_L3_MDP_RDMA7>; mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xb000 0x1000>; + #dma-cells = <1>; }; merge1: vpp-merge@1c10c000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 149/583 arm64: dts: mediatek: mt8186: Fix alias prefix for ovl_2l0
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit 6ed159e499bc2ebedf94c9086244220824e71672 ]
The alias prefix for ovl_2l (2 layer overlay) is "ovl-2l", not "ovl_2l".
Fix this.
--- arch/arm64/boot/dts/mediatek/mt8186.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt8186.dtsi +1 -1
@@ -22,7 +22,7 @@ / { aliases { ovl0 = &ovl0; - ovl_2l0 = &ovl_2l0; + ovl-2l0 = &ovl_2l0; rdma0 = &rdma0; rdma1 = &rdma1; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 150/583 arm64: dts: mediatek: mt8186: fix address warning for ADSP mailboxes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eugen Hristev <[email protected]>
[ Upstream commit 840e341bed3c4331061031dc9db0aff04abafb4b ]
Fix warnings reported by dtbs_check :
arch/arm64/boot/dts/mediatek/mt8186.dtsi:1163.35-1168.5: Warning (simple_bus_reg):
/soc/mailbox@10686000: simple-bus unit address format error, expected "10686100"
arch/arm64/boot/dts/mediatek/mt8186.dtsi:1170.35-1175.5: Warning (simple_bus_reg):
/soc/mailbox@10687000: simple-bus unit address format error, expected "10687100"
by having the right bus address as node name.
--- arch/arm64/boot/dts/mediatek/mt8186.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt8186.dtsi +2 -2
@@ -1160,14 +1160,14 @@ adsp: adsp@10680000 { status = "disabled"; }; - adsp_mailbox0: mailbox@10686000 { + adsp_mailbox0: mailbox@10686100 { compatible = "mediatek,mt8186-adsp-mbox"; #mbox-cells = <0>; reg = <0 0x10686100 0 0x1000>; interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH 0>; }; - adsp_mailbox1: mailbox@10687000 { + adsp_mailbox1: mailbox@10687100 { compatible = "mediatek,mt8186-adsp-mbox"; #mbox-cells = <0>; reg = <0 0x10687100 0 0x1000>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 151/583 wifi: mt76: mt7921: fix country count limitation for CLC
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Yen Hsieh <[email protected]>
[ Upstream commit fa6ad88e023ddfa6c5dcdb466d159e89f451e305 ]
Due to the increase in the number of power tables for 6Ghz on CLC, the variable nr_country is no longer sufficient to represent the total quantity. Therefore, we have switched to calculating the length of clc buf to obtain the correct power table. Additionally, the version number has been incremented to 1.
--- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +8 -3
@@ -1136,22 +1136,27 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,u8 type[2 ];u8 rsvd[64 ]; }__packed req = { + .ver =1 , .idx = idx, .env = env_cap, .acpi_conf =mt792x_acpi_get_flags (&dev->phy), };int ret, valid_cnt =0 ; -u8 i, *pos; +u16 buf_len =0 ; +u8 *pos;if (!clc)return 0 ; + buf_len =le16_to_cpu (clc->len) -sizeof (*clc); pos = clc->data; -for (i =0 ; i < clc->nr_country; i++) { +while (buf_len >16 ) {struct mt7921_clc_rule *rule = (struct mt7921_clc_rule *)pos;u16 len =le16_to_cpu (rule->len); +u16 offset = len +sizeof (*rule); - pos += len +sizeof (*rule); + pos += offset; + buf_len -= offset;if (rule->alpha2[0 ] != alpha2[0 ] || rule->alpha2[1 ] != alpha2[1 ])continue ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 152/583 wifi: iwlwifi: dont support triggered EHT CQI feedback
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 637bbd5b3cbd0fc6945ebd2e311315b6cca1f9c5 ]
EHT CQI is one of the EHT PHY capabilities. We don't support EHT CQI. The non-triggered CQI feedback bit was unset in a previous patch, but the triggered CQI feedback bit wasn't. Unset it.
--- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +2 -1
@@ -1012,7 +1012,8 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans,IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK |IEEE80211_EHT_PHY_CAP3_CODEBOOK_4_2_SU_FDBK |IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK | - IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK); +IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK | + IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK); iftype_data->eht_cap.eht_cap_elem.phy_cap_info[4 ] &= ~(IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO |IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 153/583 selftests/bpf: Relax time_tai test for equal timestamps in tai_forward
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: YiFei Zhu <[email protected]>
[ Upstream commit e1ba7f64b192f083b4423644be03bb9e3dc8ae84 ]
We're observing test flakiness on an arm64 platform which might not have timestamps as precise as x86. The test log looks like:
test_time_tai:PASS:tai_open 0 nsec
test_time_tai:PASS:test_run 0 nsec
test_time_tai:PASS:tai_ts1 0 nsec
test_time_tai:PASS:tai_ts2 0 nsec
test_time_tai:FAIL:tai_forward unexpected tai_forward: actual 1702348135471494160 <= expected 1702348135471494160 test_time_tai:PASS:tai_gettime 0 nsec
test_time_tai:PASS:tai_future_ts1 0 nsec
test_time_tai:PASS:tai_future_ts2 0 nsec
test_time_tai:PASS:tai_range_ts1 0 nsec
test_time_tai:PASS:tai_range_ts2 0 nsec
#199 time_tai:FAIL
This patch changes ASSERT_GT to ASSERT_GE in the tai_forward assertion so that equal timestamps are permitted.
--- tools/testing/selftests/bpf/prog_tests/time_tai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/prog_tests/time_tai.c +1 -1
@@ -56,7 +56,7 @@ void test_time_tai(void)ASSERT_NEQ (ts2,0 ,"tai_ts2" );/* TAI is moving forward only */ -ASSERT_GT (ts2, ts1,"tai_forward" ); +ASSERT_GE (ts2, ts1,"tai_forward" );/* Check for future */ ret =clock_gettime (CLOCK_TAI , &now_tai);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 154/583 block: Set memalloc_noio to false on device_add_disk() error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 5fa3d1a00c2d4ba14f1300371ad39d5456e890d7 ]
On the error path of device_add_disk(), device's memalloc_noio flag was set but not cleared. As the comment of pm_runtime_set_memalloc_noio(), "The function should be called between device_add() and device_del()". Clear this flag before device_del() now.
--- block/genhd.c | 1 + 1 file changed, 1 insertion(+)
block/genhd.c +1 -0
@@ -542,6 +542,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,kobject_put (disk->part0->bd_holder_dir); out_del_block_link:sysfs_remove_link (block_depr,dev_name (ddev)); +pm_runtime_set_memalloc_noio (ddev, false); out_device_del:device_del (ddev); out_free_ext_minor:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 155/583 arm64: dts: xilinx: Apply overlays to base dtbs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit 23b697ec85f3e7beed271b9f344c54821de2251e ]
DT overlays in tree need to be applied to a base DTB to validate they apply, to run schema checks on them, and to catch any errors at compile time. Defining the "-dtbs" variable is not enough as the combined DT must be added to dtbs-y.
zynqmp-sck-kr-g-revA.dtso and zynqmp-sck-kr-g-revB.dtso don't exist, so drop them.
--- arch/arm64/boot/dts/xilinx/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/xilinx/Makefile +4 -5
@@ -22,11 +22,10 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb zynqmp-sm-k26-revA-sck-kv-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revA.dtb zynqmp-sm-k26-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revB.dtb zynqmp-smk-k26-revA-sck-kv-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revA.dtb zynqmp-smk-k26-revA-sck-kv-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo - -zynqmp-sm-k26-revA-sck-kr-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -zynqmp-sm-k26-revA-sck-kr-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo -zynqmp-smk-k26-revA-sck-kr-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo -zynqmp-smk-k26-revA-sck-kr-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revB.dtb
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 156/583 arm64: dts: renesas: white-hawk-cpu: Fix missing serial console pin control
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit fc67495680f60e88bb8ca43421c1dd628928d581 ]
The pin control description for the serial console was added, but not enabled, due to missing pinctrl properties in the serial port device node.
--- arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +3 -0
@@ -187,6 +187,9 @@ &extalr_clk { }; &hscif0 { + pinctrl-0 = <&hscif0_pins>; + pinctrl-names = "default"; + status = "okay"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 157/583 arm64: dts: imx8mm: Reduce GPU to nominal speed
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 1f794d3eed5345413c2b0cf1bcccc92d77681220 ]
When the GPU nodes were added, the GPU_PLL_OUT was configured for 1000MHz, but this requires the SoC to run in overdrive mode which requires an elevated voltage operating point.
Since this may run some boards out of spec, the default clock should be set to 800MHz for nominal operating mode. Boards that run at the higher voltage can update their clocks accordingly.
--- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm.dtsi +2 -2
@@ -1408,7 +1408,7 @@ gpu_3d: gpu@38000000 { assigned-clocks = <&clk IMX8MM_CLK_GPU3D_CORE>, <&clk IMX8MM_GPU_PLL_OUT>; assigned-clock-parents = <&clk IMX8MM_GPU_PLL_OUT>; - assigned-clock-rates = <0>, <1000000000>; + assigned-clock-rates = <0>, <800000000>; power-domains = <&pgc_gpu>; };
@@ -1423,7 +1423,7 @@ gpu_2d: gpu@38008000 { assigned-clocks = <&clk IMX8MM_CLK_GPU2D_CORE>, <&clk IMX8MM_GPU_PLL_OUT>; assigned-clock-parents = <&clk IMX8MM_GPU_PLL_OUT>; - assigned-clock-rates = <0>, <1000000000>; + assigned-clock-rates = <0>, <800000000>; power-domains = <&pgc_gpu>; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 158/583 scsi: ufs: qcom: Fix the return value of ufs_qcom_ice_program_key()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 3bf7ab4ac30c03beecf57c052e87d5a38fb8aed6 ]
Currently, the function returns -EINVAL if algorithm other than AES-256-XTS is requested. But the correct error code is -EOPNOTSUPP. Fix it!
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -159,7 +159,7 @@ static int ufs_qcom_ice_program_key(struct ufs_hba *hba, cap = hba->crypto_cap_array[cfg->crypto_cap_idx];if (cap.algorithm_id !=UFS_CRYPTO_ALG_AES_XTS || cap.key_size !=UFS_CRYPTO_KEY_SIZE_256 ) -return -EINVAL ; +return -EOPNOTSUPP ;if (config_enable) return qcom_ice_program_key(host->ice,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 159/583 scsi: ufs: qcom: Fix the return value when platform_get_resource_byname() fails
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 3a747c5cf9b6c36649783b28d2ef8f9c92b16a0f ]
The return value should be -ENODEV indicating that the resource is not provided in DT, not -ENOMEM. Fix it!
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -1675,7 +1675,7 @@ static int ufs_qcom_mcq_config_resource(struct ufs_hba *hba)if (!res->resource) {dev_info (hba->dev,"Resource %s not provided\n" , res->name);if (i ==RES_UFS ) -return -ENOMEM ; +return -ENODEV ;continue ; }else if (i ==RES_UFS ) { res_mem = res->resource;
Signature · 18 lines
2.43.0
truct iio_dev *iio_dev = private;
+ struct ad7091r_state *st = iio_priv(iio_dev);
unsigned int i, read_val;
int ret;
s64 timestamp = iio_get_time_ns(iio_dev);
@@ -234,7 +234,7 @@ int ad7091r_probe(struct device *dev, co
if (irq) {
ret = devm_request_threaded_irq(dev, irq, NULL,
ad7091r_event_handler,
- IRQF_TRIGGER_FALLING | IRQF_ONESHOT, name, st);
+ IRQF_TRIGGER_FALLING | IRQF_ONESHOT, name, iio_dev);
if (ret)
return ret;
}Greg Kroah-Hartman
maintainerPATCH 160/583 scsi: hisi_sas: Replace with standard error code return value
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit d34ee535705eb43885bc0f561c63046f697355ad ]
In function hisi_sas_controller_prereset(), -ENOSYS (Function not implemented) should be returned if the driver does not support .soft_reset. Returns -EPERM (Operation not permitted) if HISI_SAS_RESETTING_BIT is already be set.
In function _suspend_v3_hw(), returns -EPERM (Operation not permitted) if HISI_SAS_RESETTING_BIT is already be set.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 4 ++-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +2 -2
@@ -1565,12 +1565,12 @@ EXPORT_SYMBOL_GPL(hisi_sas_controller_reset_done);static int hisi_sas_controller_prereset (struct hisi_hba *hisi_hba) {if (!hisi_hba->hw->soft_reset) -return -1 ; +return -ENOENT ;down (&hisi_hba->sem);if (test_and_set_bit (HISI_SAS_RESETTING_BIT , &hisi_hba->flags)) {up (&hisi_hba->sem); -return -1 ; +return -EPERM ; }if (hisi_sas_debugfs_enable && hisi_hba->debugfs_itct[0 ].itct)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -5148,7 +5148,7 @@ static int _suspend_v3_hw(struct device *device) }if (test_and_set_bit (HISI_SAS_RESETTING_BIT , &hisi_hba->flags)) -return -1 ; +return -EPERM ;dev_warn (dev,"entering suspend state\n" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 161/583 scsi: hisi_sas: Check before using pointer variables
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit 8dd10296be8562a45c6c6794dd492a2b7dccede8 ]
In commit 4b329abc9180 ("scsi: hisi_sas: Move slot variable definition in hisi_sas_abort_task()"), we move the variables slot to the function head. However, the variable slot may be NULL, we should check it in each branch.
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +5 -2
@@ -1641,7 +1641,10 @@ static int hisi_sas_abort_task(struct sas_task *task) task->task_state_flags |=SAS_TASK_STATE_ABORTED ;spin_unlock_irqrestore (&task->task_state_lock, flags); -if (slot && task->task_proto &SAS_PROTOCOL_SSP ) { +if (!slot) + goto out; + +if (task->task_proto &SAS_PROTOCOL_SSP ) {u16 tag = slot->idx;int rc2;
@@ -1688,7 +1691,7 @@ static int hisi_sas_abort_task(struct sas_task *task) rc =hisi_sas_softreset_ata_disk (device); } } - }else if (slot && task->task_proto &SAS_PROTOCOL_SMP ) { + }else if (task->task_proto &SAS_PROTOCOL_SMP ) {/* SMP */ u32 tag = slot->idx;struct hisi_sas_cq *cq = &hisi_hba->cq[slot->dlvry_queue];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 162/583 scsi: hisi_sas: Rollback some operations if FLR failed
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit 7ea3e7763c50b20a8bd25cf524ea0c6463de69be ]
We obtain the semaphore and set HISI_SAS_RESETTING_BIT in hisi_sas_reset_prepare_v3_hw(), block the scsi host and set HISI_SAS_REJECT_CMD_BIT in hisi_sas_controller_reset_prepare(), released them in hisi_sas_controller_reset_done(). However, if the HW reset failure in FLR results in early return, the semaphore and flag bits will not be release.
Rollback some operations including clearing flags / releasing semaphore when FLR is failed.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +5 -0
@@ -5098,6 +5098,7 @@ static void hisi_sas_reset_done_v3_hw(struct pci_dev *pdev) {struct sas_ha_struct *sha =pci_get_drvdata (pdev);struct hisi_hba *hisi_hba = sha->lldd_ha; +struct Scsi_Host *shost = hisi_hba->shost;struct device *dev = hisi_hba->dev;int rc;
@@ -5106,6 +5107,10 @@ static void hisi_sas_reset_done_v3_hw(struct pci_dev *pdev) rc =hw_init_v3_hw (hisi_hba);if (rc) {dev_err (dev,"FLR: hw init failed rc=%d\n" , rc); +clear_bit (HISI_SAS_REJECT_CMD_BIT , &hisi_hba->flags); +scsi_unblock_requests (shost); +clear_bit (HISI_SAS_RESETTING_BIT , &hisi_hba->flags); +up (&hisi_hba->sem);return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 163/583 scsi: hisi_sas: Correct the number of global debugfs registers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yihang Li <[email protected]>
[ Upstream commit 73e33f969ef05328766b23a99b2c07bfff765009 ]
In function debugfs_debugfs_snapshot_global_reg_v3_hw() it uses debugfs_axi_reg.count (which is the number of axi debugfs registers) to acquire the number of global debugfs registers.
Use debugfs_global_reg.count to acquire the number of global debugfs registers instead.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -3478,7 +3478,7 @@ static void debugfs_snapshot_global_reg_v3_hw(struct hisi_hba *hisi_hba)u32 *databuf = hisi_hba->debugfs_regs[dump_index][DEBUGFS_GLOBAL ].data;int i; -for (i =0 ; i < debugfs_axi_reg.count; i++, databuf++) +for (i =0 ; i < debugfs_global_reg.count; i++, databuf++) *databuf =hisi_sas_read32 (hisi_hba,4 * i); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 164/583 ARM: dts: stm32: dont mix SCMI and non-SCMI board compatibles
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmad Fatoum <[email protected]>
[ Upstream commit bfc3c6743de0ecb169026c36cbdbc0d12d22a528 ]
The binding erroneously decreed that the SCMI variants of the ST evaluation kits are compatible with the non-SCMI variants.
This is not correct, as a kernel or bootloader compatible with the non-SCMI variant is not necessarily able to function, when direct access to resources is replaced by having to talk SCMI to the secure monitor.
The binding has been adjusted to reflect thus, so synchronize the device trees now.
--- arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 2 +- arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 2 +- arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 2 +- arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "STMicroelectronics STM32MP157A-DK1 SCMI Discovery Board"; - compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157a-dk1", "st,stm32mp157"; + compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157"; reserved-memory { optee@de000000 {
arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "STMicroelectronics STM32MP157C-DK2 SCMI Discovery Board"; - compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157c-dk2", "st,stm32mp157"; + compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157"; reserved-memory { optee@de000000 {
arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts +1 -1
@@ -11,7 +11,7 @@ / { model = "STMicroelectronics STM32MP157C-ED1 SCMI eval daughter"; - compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157"; + compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157"; reserved-memory { optee@fe000000 {
arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts +1 -2
@@ -11,8 +11,7 @@ / { model = "STMicroelectronics STM32MP157C-EV1 SCMI eval daughter on eval mother"; - compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ev1", "st,stm32mp157c-ed1", - "st,stm32mp157"; + compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157"; reserved-memory { optee@fe000000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 165/583 bpf: Fix a race condition between btf_put() and map_free()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit 59e5791f59dd83e8aa72a4e74217eabb6e8cfd90 ]
When running ./test_progs -j in my local vm with latest kernel, I once hit a kasan error like below:
[ 1887.184724] BUG: KASAN: slab-use-after-free in bpf_rb_root_free+0x1f8/0x2b0 [ 1887.185599] Read of size 4 at addr ffff888106806910 by task kworker/u12:2/2830 [ 1887.186498] [ 1887.186712] CPU: 3 PID: 2830 Comm: kworker/u12:2 Tainted: G OEL 6.7.0-rc3-00699-g90679706d486-dirty #494 [ 1887.188034] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 [ 1887.189618] Workqueue: events_unbound bpf_map_free_deferred [ 1887.190341] Call Trace: [ 1887.190666] <TASK> [ 1887.190949] dump_stack_lvl+0xac/0xe0 [ 1887.191423] ? nf_tcp_handle_invalid+0x1b0/0x1b0 [ 1887.192019] ? panic+0x3c0/0x3c0 [ 1887.192449] print_report+0x14f/0x720 [ 1887.192930] ? preempt_count_sub+0x1c/0xd0 [ 1887.193459] ? __virt_addr_valid+0xac/0x120 [ 1887.194004] ? bpf_rb_root_free+0x1f8/0x2b0 [ 1887.194572] kasan_report+0xc3/0x100 [ 1887.195085] ? bpf_rb_root_free+0x1f8/0x2b0 [ 1887.195668] bpf_rb_root_free+0x1f8/0x2b0 [ 1887.196183] ? __bpf_obj_drop_impl+0xb0/0xb0 [ 1887.196736] ? preempt_count_sub+0x1c/0xd0 [ 1887.197270] ? preempt_count_sub+0x1c/0xd0 [ 1887.197802] ? _raw_spin_unlock+0x1f/0x40 [ 1887.198319] bpf_obj_free_fields+0x1d4/0x260 [ 1887.198883] array_map_free+0x1a3/0x260 [ 1887.199380] bpf_map_free_deferred+0x7b/0xe0 [ 1887.199943] process_scheduled_works+0x3a2/0x6c0 [ 1887.200549] worker_thread+0x633/0x890 [ 1887.201047] ? __kthread_parkme+0xd7/0xf0 [ 1887.201574] ? kthread+0x102/0x1d0 [ 1887.202020] kthread+0x1ab/0x1d0 [ 1887.202447] ? pr_cont_work+0x270/0x270 [ 1887.202954] ? kthread_blkcg+0x50/0x50 [ 1887.203444] ret_from_fork+0x34/0x50 [ 1887.203914] ? kthread_blkcg+0x50/0x50 [ 1887.204397] ret_from_fork_asm+0x11/0x20 [ 1887.204913] </TASK> [ 1887.204913] </TASK> [ 1887.205209] [ 1887.205416] Allocated by task 2197: [ 1887.205881] kasan_set_track+0x3f/0x60 [ 1887.206366] __kasan_kmalloc+0x6e/0x80 [ 1887.206856] __kmalloc+0xac/0x1a0 [ 1887.207293] btf_parse_fields+0xa15/0x1480 [ 1887.207836] btf_parse_struct_metas+0x566/0x670 [ 1887.208387] btf_new_fd+0x294/0x4d0 [ 1887.208851] __sys_bpf+0x4ba/0x600 [ 1887.209292] __x64_sys_bpf+0x41/0x50 [ 1887.209762] do_syscall_64+0x4c/0xf0 [ 1887.210222] entry_SYSCALL_64_after_hwframe+0x63/0x6b [ 1887.210868] [ 1887.211074] Freed by task 36: [ 1887.211460] kasan_set_track+0x3f/0x60 [ 1887.211951] kasan_save_free_info+0x28/0x40 [ 1887.212485] ____kasan_slab_free+0x101/0x180 [ 1887.213027] __kmem_cache_free+0xe4/0x210 [ 1887.213514] btf_free+0x5b/0x130 [ 1887.213918] rcu_core+0x638/0xcc0 [ 1887.214347] __do_softirq+0x114/0x37e
The error happens at bpf_rb_root_free+0x1f8/0x2b0:
00000000000034c0 <bpf_rb_root_free>:
; {
34c0: f3 0f 1e fa endbr64
34c4: e8 00 00 00 00 callq 0x34c9 <bpf_rb_root_free+0x9>
34c9: 55 pushq %rbp
34ca: 48 89 e5 movq %rsp, %rbp
...
; if (rec && rec->refcount_off >= 0 &&
36aa: 4d 85 ed testq %r13, %r13
36ad: 74 a9 je 0x3658 <bpf_rb_root_free+0x198>
36af: 49 8d 7d 10 leaq 0x10(%r13), %rdi
36b3: e8 00 00 00 00 callq 0x36b8 <bpf_rb_root_free+0x1f8>
<==== kasan function
36b8: 45 8b 7d 10 movl 0x10(%r13), %r15d
<==== use-after-free load
36bc: 45 85 ff testl %r15d, %r15d
36bf: 78 8c js 0x364d <bpf_rb_root_free+0x18d>So the problem is at rec->refcount_off in the above.
I did some source code analysis and find the reason.
CPU A CPU B
bpf_map_put:
...
btf_put with rcu callback
...
bpf_map_free_deferred
with system_unbound_wq
... ... ...
... btf_free_rcu: ...
... ... bpf_map_free_deferred:
... ...
... ---------> btf_struct_metas_free()
... | race condition ...
... ---------> map->ops->map_free()
...
... btf->struct_meta_tab = NULLIn the above, map_free() corresponds to array_map_free() and eventually calling bpf_rb_root_free() which calls:
...
__bpf_obj_drop_impl(obj, field->graph_root.value_rec, false);
...
Here, 'value_rec' is assigned in btf_check_and_fixup_fields() with following code:
meta = btf_find_struct_meta(btf, btf_id);
if (!meta)
return -EFAULT;
rec->fields[i].graph_root.value_rec = meta->record;So basically, 'value_rec' is a pointer to the record in struct_metas_tab. And it is possible that that particular record has been freed by btf_struct_metas_free() and hence we have a kasan error here.
Actually it is very hard to reproduce the failure with current bpf/bpf-next code, I only got the above error once. To increase reproducibility, I added a delay in bpf_map_free_deferred() to delay map->ops->map_free(), which significantly increased reproducibility.
# diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c # index 5e43ddd1b83f..aae5b5213e93 100644 # --- a/kernel/bpf/syscall.c # +++ b/kernel/bpf/syscall.c
# @@ -695,6 +695,7 @@ static void bpf_map_free_deferred(struct work_struct *work)
# struct bpf_map *map = container_of(work, struct bpf_map, work);
# struct btf_record *rec = map->record;
#
# + mdelay(100); # security_bpf_map_free(map); # bpf_map_release_memcg(map); # /* implementation dependent freeing */
Hao also provided test cases ([1]) for easily reproducing the above issue.
There are two ways to fix the issue, the v1 of the patch ([2]) moving btf_put() after map_free callback, and the v5 of the patch ([3]) using a kptr style fix which tries to get a btf reference during map_check_btf(). Each approach has its pro and cons. The first approach delays freeing btf while the second approach needs to acquire reference depending on context which makes logic not very elegant and may complicate things with future new data structures. Alexei suggested in [4] going back to v1 which is what this patch tries to do.
Rerun './test_progs -j' with the above mdelay() hack for a couple of times and didn't observe the error for the above rb_root test cases. Running Hou's test ([1]) is also successful.
[1] https://lore.kernel.org/bpf/[email protected]/
[2] v1: https://lore.kernel.org/bpf/[email protected]/
[3] v5: https://lore.kernel.org/bpf/[email protected]/
[4] v4: https://lore.kernel.org/bpf/CAADnVQJ3FiXUhZJwX_81sjZvSYYKCFB3BT6P8D59RS2Gu+0Z7g@mail.gmail.com/
--- kernel/bpf/syscall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/bpf/syscall.c +5 -1
@@ -692,6 +692,7 @@ static void bpf_map_free_deferred(struct work_struct *work) { struct bpf_map *map = container_of(work, struct bpf_map, work);struct btf_record *rec = map->record; +struct btf *btf = map->btf;security_bpf_map_free (map);bpf_map_release_memcg (map);
@@ -707,6 +708,10 @@ static void bpf_map_free_deferred(struct work_struct *work)* template bpf_map struct used during verification. */ btf_record_free (rec); +/* Delay freeing of btf for maps, as map_free callback may need +* struct_meta info which will be freed with btf_put(). +*/ +btf_put (btf); }static void bpf_map_put_uref (struct bpf_map *map)
@@ -747,7 +752,6 @@ void bpf_map_put(struct bpf_map *map)if (atomic64_dec_and_test (&map->refcnt)) {/* bpf_map_free_id() must be called first */ bpf_map_free_id (map); -btf_put (map->btf);if (READ_ONCE (map->free_after_mult_rcu_gp))call_rcu_tasks_trace (&map->rcu, bpf_map_free_mult_rcu_gp);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 166/583 selftests/net: fix grep checking for fib_nexthop_multiprefix
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit a33e9da3470499e9ff476138f271fb52d6bfe767 ]
When running fib_nexthop_multiprefix test I saw all IPv6 test failed. e.g.
]# ./fib_nexthop_multiprefix.sh
TEST: IPv4: host 0 to host 1, mtu 1300 [ OK ]
TEST: IPv6: host 0 to host 1, mtu 1300 [FAIL]
With -v it shows
COMMAND: ip netns exec h0 /usr/sbin/ping6 -s 1350 -c5 -w5 2001:db8:101::1 PING 2001:db8:101::1(2001:db8:101::1) 1350 data bytes
From 2001:db8:100::64 icmp_seq=1 Packet too big: mtu=1300
--- 2001:db8:101::1 ping statistics ---
1 packets transmitted, 0 received, +1 errors, 100% packet loss, time 0ms
Route get
2001:db8:101::1 via 2001:db8:100::64 dev eth0 src 2001:db8:100::1 metric 1024 expires 599sec mtu 1300 pref medium Searching for:
2001:db8:101::1 from :: via 2001:db8:100::64 dev eth0 src 2001:db8:100::1 .* mtu 1300
The reason is when CONFIG_IPV6_SUBTREES is not enabled, rt6_fill_node() will not put RTA_SRC info. After fix:
]# ./fib_nexthop_multiprefix.sh
TEST: IPv4: host 0 to host 1, mtu 1300 [ OK ]
TEST: IPv6: host 0 to host 1, mtu 1300 [ OK ]
--- tools/testing/selftests/net/fib_nexthop_multiprefix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/fib_nexthop_multiprefix.sh +2 -2
@@ -209,12 +209,12 @@ validate_v6_exception() echo "Route get" ip -netns h0 -6 ro get ${dst} echo "Searching for:" - echo " ${dst} from :: via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" + echo " ${dst}.* via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" echo fi ip -netns h0 -6 ro get ${dst} | \ - grep -q "${dst} from :: via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" + grep -q "${dst}.* via ${r1} dev eth0 src ${h0} .* mtu ${mtu}" rc=$? log_test $rc 0 "IPv6: host 0 to host ${i}, mtu ${mtu}"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 167/583 ipmr: support IP_PKTINFO on cache report IGMP msg
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leone Fernando <[email protected]>
[ Upstream commit bb7403655b3c3eb245d0ee330047cd3e20b3c4af ]
In order to support IP_PKTINFO on those packets, we need to call ipv4_pktinfo_prepare.
When sending mrouted/pimd daemons a cache report IGMP msg, it is unnecessary to set dst on the newly created skb.
It used to be necessary on older versions until
commit d826eb14ecef ("ipv4: PKTINFO doesnt need dst reference") which changed the way IP_PKTINFO struct is been retrieved.
Changes from v1:
1. Undo changes in ipv4_pktinfo_prepare function. use it directly and copy the control block.
--- net/ipv4/ipmr.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
net/ipv4/ipmr.c +6 -7
@@ -1025,6 +1025,10 @@ static int ipmr_cache_report(const struct mr_table *mrt,struct sk_buff *skb;int ret; + mroute_sk =rcu_dereference (mrt->mroute_sk); +if (!mroute_sk) +return -EINVAL ; +if (assert ==IGMPMSG_WHOLEPKT || assert ==IGMPMSG_WRVIFWHOLE ) skb =skb_realloc_headroom (pkt,sizeof (struct iphdr ));else
@@ -1069,7 +1073,8 @@ static int ipmr_cache_report(const struct mr_table *mrt, msg = (struct igmpmsg *)skb_network_header (skb); msg->im_vif = vifi; msg->im_vif_hi = vifi >>8 ; -skb_dst_set (skb,dst_clone (skb_dst (pkt))); +ipv4_pktinfo_prepare (mroute_sk, pkt); +memcpy (skb->cb, pkt->cb,sizeof (skb->cb));/* Add our header */ igmp =skb_put (skb,sizeof (struct igmphdr )); igmp->type = assert;
@@ -1079,12 +1084,6 @@ static int ipmr_cache_report(const struct mr_table *mrt, skb->transport_header = skb->network_header; } - mroute_sk =rcu_dereference (mrt->mroute_sk); -if (!mroute_sk) { -kfree_skb (skb); -return -EINVAL ; - } -igmpmsg_netlink_event (mrt, skb);/* Deliver to mrouted */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 168/583 virtio/vsock: fix logic which reduces credit update messages
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
[ Upstream commit 93b80887668226180ea5f5349cc728ca6dc700ab ]
Add one more condition for sending credit update during dequeue from stream socket: when number of bytes in the rx queue is smaller than SO_RCVLOWAT value of the socket. This is actual for non-default value of SO_RCVLOWAT (e.g. not 1) - idea is to "kick" peer to continue data transmission, because we need at least SO_RCVLOWAT bytes in our rx queue to wake up user for reading data (in corner case it is also possible to stuck both tx and rx sides, this is why 'Fixes' is used).
--- net/vmw_vsock/virtio_transport_common.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
net/vmw_vsock/virtio_transport_common.c +10 -3
@@ -398,6 +398,8 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk,struct virtio_vsock_sock *vvs = vsk->trans;size_t bytes, total =0 ;struct sk_buff *skb; +u32 fwd_cnt_delta; +bool low_rx_bytes;int err = -EFAULT ;u32 free_space;
@@ -439,7 +441,10 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk, } } - free_space = vvs->buf_alloc - (vvs->fwd_cnt - vvs->last_fwd_cnt); + fwd_cnt_delta = vvs->fwd_cnt - vvs->last_fwd_cnt; + free_space = vvs->buf_alloc - fwd_cnt_delta; + low_rx_bytes = (vvs->rx_bytes < +sock_rcvlowat (sk_vsock (vsk),0 ,INT_MAX ));spin_unlock_bh (&vvs->rx_lock);
@@ -449,9 +454,11 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk,* too high causes extra messages. Too low causes transmitter * stalls. As stalls are in theory more expensive than extra * messages, we set the limit to a high value. TODO: experiment -* with different values. +* with different values. Also send credit update message when +* number of bytes in rx queue is not enough to wake up reader. */ -if (free_space <VIRTIO_VSOCK_MAX_PKT_BUF_SIZE ) +if (fwd_cnt_delta && + (free_space <VIRTIO_VSOCK_MAX_PKT_BUF_SIZE || low_rx_bytes))virtio_transport_send_credit_update (vsk);return total;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 169/583 virtio/vsock: send credit update during setting SO_RCVLOWAT
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
[ Upstream commit 0fe1798968115488c0c02f4633032a015b1faf97 ]
Send credit update message when SO_RCVLOWAT is updated and it is bigger than number of bytes in rx queue. It is needed, because 'poll()' will wait until number of bytes in rx queue will be not smaller than O_RCVLOWAT, so kick sender to send more data. Otherwise mutual hungup for tx/rx is possible: sender waits for free space and receiver is waiting data in 'poll()'.
Rename 'set_rcvlowat' callback to 'notify_set_rcvlowat' and set 'sk->sk_rcvlowat' only in one place (i.e. 'vsock_set_rcvlowat'), so the transport doesn't need to do it.
--- drivers/vhost/vsock.c | 1 + include/linux/virtio_vsock.h | 1 + include/net/af_vsock.h | 2 +- net/vmw_vsock/af_vsock.c | 9 ++++++-- net/vmw_vsock/hyperv_transport.c | 4 ++-- net/vmw_vsock/virtio_transport.c | 1 + net/vmw_vsock/virtio_transport_common.c | 30 +++++++++++++++++++++++++ net/vmw_vsock/vsock_loopback.c | 1 + 8 files changed, 44 insertions(+), 5 deletions(-)
drivers/vhost/vsock.c +1 -0
@@ -438,6 +438,7 @@ static struct virtio_transport vhost_transport = { .notify_send_pre_enqueue = virtio_transport_notify_send_pre_enqueue, .notify_send_post_enqueue = virtio_transport_notify_send_post_enqueue, .notify_buffer_size = virtio_transport_notify_buffer_size, + .notify_set_rcvlowat = virtio_transport_notify_set_rcvlowat, .read_skb = virtio_transport_read_skb, },
include/linux/virtio_vsock.h +1 -0
@@ -246,4 +246,5 @@ void virtio_transport_put_credit(struct virtio_vsock_sock *vvs, u32 credit);void virtio_transport_deliver_tap_pkt (struct sk_buff *skb);int virtio_transport_purge_skbs (void *vsk,struct sk_buff_head *list);int virtio_transport_read_skb (struct vsock_sock *vsk,skb_read_actor_t read_actor); +int virtio_transport_notify_set_rcvlowat (struct vsock_sock *vsk,int val);#endif /* _LINUX_VIRTIO_VSOCK_H */
include/net/af_vsock.h +1 -1
@@ -137,7 +137,6 @@ struct vsock_transport {u64 (*stream_rcvhiwat)(struct vsock_sock *);bool (*stream_is_active)(struct vsock_sock *);bool (*stream_allow)(u32 cid,u32 port); -int (*set_rcvlowat)(struct vsock_sock *vsk,int val);/* SEQ_PACKET. */ ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg,
@@ -168,6 +167,7 @@ struct vsock_transport { struct vsock_transport_send_notify_data *);/* sk_lock held by the caller */ void (*notify_buffer_size)(struct vsock_sock *,u64 *); +int (*notify_set_rcvlowat)(struct vsock_sock *vsk,int val);/* Shutdown. */ int (*shutdown)(struct vsock_sock *,int );
net/vmw_vsock/af_vsock.c +7 -2
@@ -2214,8 +2214,13 @@ static int vsock_set_rcvlowat(struct sock *sk, int val) transport = vsk->transport; -if (transport && transport->set_rcvlowat) -return transport->set_rcvlowat (vsk, val); +if (transport && transport->notify_set_rcvlowat) { +int err; + + err = transport->notify_set_rcvlowat (vsk, val); +if (err) +return err; + }WRITE_ONCE (sk->sk_rcvlowat, val ? :1 );return 0 ;
net/vmw_vsock/hyperv_transport.c +2 -2
@@ -816,7 +816,7 @@ int hvs_notify_send_post_enqueue(struct vsock_sock *vsk, ssize_t written, }static -int hvs_set_rcvlowat (struct vsock_sock *vsk,int val) +int hvs_notify_set_rcvlowat (struct vsock_sock *vsk,int val) {return -EOPNOTSUPP ; }
@@ -856,7 +856,7 @@ static struct vsock_transport hvs_transport = { .notify_send_pre_enqueue = hvs_notify_send_pre_enqueue, .notify_send_post_enqueue = hvs_notify_send_post_enqueue, - .set_rcvlowat = hvs_set_rcvlowat + .notify_set_rcvlowat = hvs_notify_set_rcvlowat };static bool hvs_check_transport (struct vsock_sock *vsk)
net/vmw_vsock/virtio_transport.c +1 -0
@@ -457,6 +457,7 @@ static struct virtio_transport virtio_transport = { .notify_send_pre_enqueue = virtio_transport_notify_send_pre_enqueue, .notify_send_post_enqueue = virtio_transport_notify_send_post_enqueue, .notify_buffer_size = virtio_transport_notify_buffer_size, + .notify_set_rcvlowat = virtio_transport_notify_set_rcvlowat, .read_skb = virtio_transport_read_skb, },
net/vmw_vsock/virtio_transport_common.c +30 -0
@@ -1526,6 +1526,36 @@ int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t recv_acto }EXPORT_SYMBOL_GPL (virtio_transport_read_skb); +int virtio_transport_notify_set_rcvlowat (struct vsock_sock *vsk,int val) +{ +struct virtio_vsock_sock *vvs = vsk->trans; +bool send_update; + +spin_lock_bh (&vvs->rx_lock); + +/* If number of available bytes is less than new SO_RCVLOWAT value, +* kick sender to send more data, because sender may sleep in its +* 'send()' syscall waiting for enough space at our side. Also +* don't send credit update when peer already knows actual value - +* such transmission will be useless. +*/ + send_update = (vvs->rx_bytes < val) && + (vvs->fwd_cnt != vvs->last_fwd_cnt); + +spin_unlock_bh (&vvs->rx_lock); + +if (send_update) { +int err; + + err =virtio_transport_send_credit_update (vsk); +if (err <0 ) +return err; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (virtio_transport_notify_set_rcvlowat); +MODULE_LICENSE ("GPL v2" );MODULE_AUTHOR ("Asias He" );MODULE_DESCRIPTION ("common code for virtio vsock" );
net/vmw_vsock/vsock_loopback.c +1 -0
@@ -90,6 +90,7 @@ static struct virtio_transport loopback_transport = { .notify_send_pre_enqueue = virtio_transport_notify_send_pre_enqueue, .notify_send_post_enqueue = virtio_transport_notify_send_post_enqueue, .notify_buffer_size = virtio_transport_notify_buffer_size, + .notify_set_rcvlowat = virtio_transport_notify_set_rcvlowat, .read_skb = virtio_transport_read_skb, },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 170/583 dma-mapping: clear dev->dma_mem to NULL after freeing it
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joakim Zhang <[email protected]>
[ Upstream commit b07bc2347672cc8c7293c64499f1488278c5ca3d ]
Reproduced with below sequence:
dma_declare_coherent_memory()->dma_release_coherent_memory() ->dma_declare_coherent_memory()->"return -EBUSY" error
It will return -EBUSY from the dma_assign_coherent_memory() in dma_declare_coherent_memory(), the reason is that dev->dma_mem pointer has not been set to NULL after it's freed.
--- kernel/dma/coherent.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/dma/coherent.c +3 -1
@@ -132,8 +132,10 @@ int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,void dma_release_coherent_memory (struct device *dev) { -if (dev) +if (dev) {_dma_release_coherent_memory (dev->dma_mem); + dev->dma_mem =NULL ; + } } static void *__dma_alloc_from_coherent(struct device *dev,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 171/583 bpf: Limit the number of uprobes when attaching program to multiple uprobes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit 8b2efe51ba85ca83460941672afac6fca4199df6 ]
An abnormally big cnt may be passed to link_create.uprobe_multi.cnt, and it will trigger the following warning in kvmalloc_node():
if (unlikely(size > INT_MAX)) {
WARN_ON_ONCE(!(flags & __GFP_NOWARN));
return NULL;
}Fix the warning by limiting the maximal number of uprobes in bpf_uprobe_multi_link_attach(). If the number of uprobes is greater than MAX_UPROBE_MULTI_CNT, the attachment will return -E2BIG.
--- kernel/trace/bpf_trace.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/trace/bpf_trace.c +4 -0
@@ -41,6 +41,8 @@#define bpf_event_rcu_dereference (p) \ rcu_dereference_protected(p, lockdep_is_held(&bpf_event_mutex)) +#define MAX_UPROBE_MULTI_CNT (1U << 20) + #ifdef CONFIG_MODULES struct bpf_trace_module { struct module *module;
@@ -3198,6 +3200,8 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prif (!upath || !uoffsets || !cnt)return -EINVAL ; +if (cnt >MAX_UPROBE_MULTI_CNT ) +return -E2BIG ; uref_ctr_offsets =u64_to_user_ptr (attr->link_create.uprobe_multi.ref_ctr_offsets); ucookies =u64_to_user_ptr (attr->link_create.uprobe_multi.cookies);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 172/583 bpf: Limit the number of kprobes when attaching program to multiple kprobes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit d6d1e6c17cab2dcb7b8530c599f00e7de906d380 ]
An abnormally big cnt may also be assigned to kprobe_multi.cnt when attaching multiple kprobes. It will trigger the following warning in kvmalloc_node():
if (unlikely(size > INT_MAX)) {
WARN_ON_ONCE(!(flags & __GFP_NOWARN));
return NULL;
}Fix the warning by limiting the maximal number of kprobes in bpf_kprobe_multi_link_attach(). If the number of kprobes is greater than MAX_KPROBE_MULTI_CNT, the attachment will fail and return -E2BIG.
--- kernel/trace/bpf_trace.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/trace/bpf_trace.c +3 -0
@@ -42,6 +42,7 @@ rcu_dereference_protected(p, lockdep_is_held(&bpf_event_mutex))#define MAX_UPROBE_MULTI_CNT (1U << 20) +#define MAX_KPROBE_MULTI_CNT (1U << 20)#ifdef CONFIG_MODULES struct bpf_trace_module {
@@ -2897,6 +2898,8 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr cnt = attr->link_create.kprobe_multi.cnt;if (!cnt)return -EINVAL ; +if (cnt >MAX_KPROBE_MULTI_CNT ) +return -E2BIG ; size = cnt *sizeof (*addrs); addrs =kvmalloc_array (cnt,sizeof (*addrs),GFP_KERNEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 173/583 arm64: dts: qcom: acer-aspire1: Correct audio codec definition
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Travkin <[email protected]>
[ Upstream commit feec9f0add432a867f23e29afcd2f7088889b8e2 ]
When initially added, a mistake was made in the definition of the codec.
Despite the fact that the DMIC line is connected on the side of the codec chip, and relevant passive components, including 0-ohm resistors connecting the dmics, are present, the dmic line is still cut in another place on the board, which was overlooked.
Correct this by replacing the dmic configuration with a comment describing this hardware detail.
While at it, also add missing regulators definitions. This is not a functional change as all the relevant regulators were already added via the other rail supplies.
--- .../arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts +15 -2
@@ -209,9 +209,22 @@ alc5682: codec@1a { AVDD-supply = <&vreg_l15a_1p8>; MICVDD-supply = <®_codec_3p3>; VBAT-supply = <®_codec_3p3>; + DBVDD-supply = <&vreg_l15a_1p8>; + LDO1-IN-supply = <&vreg_l15a_1p8>; + + /* + * NOTE: The board has a path from this codec to the + * DMIC microphones in the lid, however some of the option + * resistors are absent and the microphones are connected + * to the SoC instead. + * + * If the resistors were to be changed by the user to + * connect the codec, the following could be used: + * + * realtek,dmic1-data-pin = <1>; + * realtek,dmic1-clk-pin = <1>; + */ - realtek,dmic1-data-pin = <1>; - realtek,dmic1-clk-pin = <1>; realtek,jd-src = <1>; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 174/583 soc: qcom: llcc: Fix dis_cap_alloc and retain_on_pc configuration
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Atul Dhudase <[email protected]>
[ Upstream commit eed6e57e9f3e2beac37563eb6a0129549daa330e ]
Commit c14e64b46944 ("soc: qcom: llcc: Support chipsets that can
write to llcc") add the support for chipset where capacity based
allocation and retention through power collapse can be programmed based on content of SCT table mentioned in the llcc driver where the target like sdm845 where the entire programming related to it is controlled in firmware. However, the commit introduces a bug where capacity/retention register get overwritten each time it gets programmed for each slice and that results in misconfiguration of the register based on SCT table and that is not expected behaviour instead it should be read modify write to retain the configuration of other slices.
This issue is totally caught from code review and programming test and not through any power/perf numbers so, it is not known what impact this could make if we don't have this change however, this feature are for these targets and they should have been programmed accordingly as per their configuration mentioned in SCT table like others bits information.
This change brings one difference where it keeps capacity/retention bits of the slices that are not mentioned in SCT table in unknown state where as earlier it was initialized to zero.
--- drivers/soc/qcom/llcc-qcom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/soc/qcom/llcc-qcom.c +4 -4
@@ -785,15 +785,15 @@ static int _qcom_llcc_cfg_program(const struct llcc_slice_config *config,u32 disable_cap_alloc, retain_pc; disable_cap_alloc = config->dis_cap_alloc << config->slice_id; - ret =regmap_write (drv_data->bcast_regmap, -LLCC_TRP_SCID_DIS_CAP_ALLOC , disable_cap_alloc); + ret =regmap_update_bits (drv_data->bcast_regmap,LLCC_TRP_SCID_DIS_CAP_ALLOC , +BIT (config->slice_id), disable_cap_alloc);if (ret)return ret;if (drv_data->version <LLCC_VERSION_4_1_0_0 ) { retain_pc = config->retain_on_pc << config->slice_id; - ret =regmap_write (drv_data->bcast_regmap, -LLCC_TRP_PCB_ACT , retain_pc); + ret =regmap_update_bits (drv_data->bcast_regmap,LLCC_TRP_PCB_ACT , +BIT (config->slice_id), retain_pc);if (ret)return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 175/583 arm64: dts: qcom: sm6375: fix USB wakeup interrupt types
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 41952be6661b20f56c2c5b06c431880dd975b747 ]
The DP/DM wakeup interrupts are edge triggered and which edge to trigger on depends on use-case and whether a Low speed or Full/High speed device is connected.
Stable-dep-of: d3246a0cf43f ("arm64: dts: qcom: sm6375: Hook up MPM")
--- arch/arm64/boot/dts/qcom/sm6375.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm6375.dtsi +2 -2
@@ -1362,8 +1362,8 @@ usb_1: usb@4ef8800 { interrupts = <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; + <GIC_SPI 93 IRQ_TYPE_EDGE_BOTH>, + <GIC_SPI 94 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "hs_phy_irq", "ss_phy_irq", "dm_hs_phy_irq",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 176/583 arm64: dts: qcom: sm6375: Hook up MPM
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit d3246a0cf43fd24a1986163284edd2389143809d ]
Add a node for MPM and wire it up on consumers that use it. This also fixes a very bad and sad assumption I made when initially porting this SoC that the downstream MPM-TLMM mappings were 1-1. That apparently changed some time ago, so with this patch the MPM consumers will actually be hooked up to the correct interrupt lines.
--- arch/arm64/boot/dts/qcom/sm6375.dtsi | 41 +++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/sm6375.dtsi +34 -7
@@ -311,6 +311,25 @@ scm { }; }; + mpm: interrupt-controller { + compatible = "qcom,mpm"; + qcom,rpm-msg-ram = <&apss_mpm>; + interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>; + mboxes = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_SMP2P>; + interrupt-controller; + #interrupt-cells = <2>; + #power-domain-cells = <0>; + interrupt-parent = <&intc>; + qcom,mpm-pin-count = <96>; + qcom,mpm-pin-map = <5 296>, /* Soundwire wake_irq */ + <12 422>, /* DWC3 ss_phy_irq */ + <86 183>, /* MPM wake, SPMI */ + <89 314>, /* TSENS0 0C */ + <90 315>, /* TSENS1 0C */ + <93 164>, /* DWC3 dm_hs_phy_irq */ + <94 165>; /* DWC3 dp_hs_phy_irq */ + }; + memory@80000000 { device_type = "memory"; /* We expect the bootloader to fill in the size */
@@ -486,6 +505,7 @@ CPU_PD7: power-domain-cpu7 { CLUSTER_PD: power-domain-cpu-cluster0 { #power-domain-cells = <0>; + power-domains = <&mpm>; domain-idle-states = <&CLUSTER_SLEEP_0>; }; };
@@ -808,7 +828,7 @@ tlmm: pinctrl@500000 { reg = <0 0x00500000 0 0x800000>; interrupts = <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>; gpio-ranges = <&tlmm 0 0 157>; - /* TODO: Hook up MPM as wakeup-parent when it's there */ + wakeup-parent = <&mpm>; interrupt-controller; gpio-controller; #interrupt-cells = <2>;
@@ -930,7 +950,7 @@ spmi_bus: spmi@1c40000 { <0 0x01c0a000 0 0x26000>; reg-names = "core", "chnls", "obsrvr", "intr", "cnfg"; interrupt-names = "periph_irq"; - interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; + interrupts-extended = <&mpm 86 IRQ_TYPE_LEVEL_HIGH>; qcom,ee = <0>; qcom,channel = <0>; #address-cells = <2>;
@@ -962,8 +982,15 @@ tsens1: thermal-sensor@4413000 { }; rpm_msg_ram: sram@45f0000 { - compatible = "qcom,rpm-msg-ram"; + compatible = "qcom,rpm-msg-ram", "mmio-sram"; reg = <0 0x045f0000 0 0x7000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x0 0x045f0000 0x7000>; + + apss_mpm: sram@1b8 { + reg = <0x1b8 0x48>; + }; }; sram@4690000 {
@@ -1360,10 +1387,10 @@ usb_1: usb@4ef8800 { <&gcc GCC_USB30_PRIM_MASTER_CLK>; assigned-clock-rates = <19200000>, <133333333>; - interrupts = <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 93 IRQ_TYPE_EDGE_BOTH>, - <GIC_SPI 94 IRQ_TYPE_EDGE_BOTH>; + interrupts-extended = <&intc GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>, + <&mpm 12 IRQ_TYPE_LEVEL_HIGH>, + <&mpm 93 IRQ_TYPE_EDGE_BOTH>, + <&mpm 94 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "hs_phy_irq", "ss_phy_irq", "dm_hs_phy_irq",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 177/583 arm64: dts: qcom: sm8150: make dispcc cast minimal vote on MMCX
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 617de4ce7b1c4b41c1316e493d4717cd2f208def ]
Add required-opps property to the display clock controller. This makes it cast minimal vote on the MMCX lane and prevents further 'clock stuck' errors when enabling the display.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/qcom/sm8150.dtsi +1 -0
@@ -3959,6 +3959,7 @@ dispcc: clock-controller@af00000 { "dp_phy_pll_link_clk", "dp_phy_pll_vco_div_clk"; power-domains = <&rpmhpd SM8150_MMCX>; + required-opps = <&rpmhpd_opp_low_svs>; #clock-cells = <1>; #reset-cells = <1>; #power-domain-cells = <1>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 178/583 arm64: dts: qcom: sm8150-hdk: fix SS USB regulators
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit a509adf05b2aac31b22781f5aa09e4768a5b6c39 ]
The SM8150-HDK uses two different regulators to power up SuperSpeed USB PHYs. The L5A regulator is used for the second USB host, while the first (OTG) USB host uses different regulator, L18A. Fix the regulator for the usb_1 QMPPHY and (to remove possible confusion) drop the usb_ss_dp_core_1/_2 labels.
--- arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/qcom/sm8150-hdk.dts +8 -4
@@ -127,8 +127,6 @@ vdda_qrefs_0p875_5: vdda_sp_sensor: vdda_ufs_2ln_core_1: vdda_ufs_2ln_core_2: - vdda_usb_ss_dp_core_1: - vdda_usb_ss_dp_core_2: vdda_qlink_lv: vdda_qlink_lv_ck: vreg_l5a_0p875: ldo5 {
@@ -210,6 +208,12 @@ vreg_l17a_3p0: ldo17 { regulator-max-microvolt = <3008000>; regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; }; + + vreg_l18a_0p8: ldo18 { + regulator-min-microvolt = <880000>; + regulator-max-microvolt = <880000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; + }; }; regulators-1 {
@@ -445,13 +449,13 @@ &usb_2_hsphy { &usb_1_qmpphy { status = "okay"; vdda-phy-supply = <&vreg_l3c_1p2>; - vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; + vdda-pll-supply = <&vreg_l18a_0p8>; }; &usb_2_qmpphy { status = "okay"; vdda-phy-supply = <&vreg_l3c_1p2>; - vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; + vdda-pll-supply = <&vreg_l5a_0p875>; }; &usb_1 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 179/583 soc: qcom: llcc: Fix LLCC_TRP_ATTR2_CFGn offset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abel Vesa <[email protected]>
[ Upstream commit 110cb8d861cc1a040cdab495b22ac436c49d1454 ]
According to documentation, it has increments of 4, not 8.
--- drivers/soc/qcom/llcc-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/llcc-qcom.c +1 -1
@@ -46,7 +46,7 @@#define LLCC_TRP_STATUSn (n) (4 + n * SZ_4K)#define LLCC_TRP_ATTR0_CFGn (n) (0x21000 + SZ_8 * n)#define LLCC_TRP_ATTR1_CFGn (n) (0x21004 + SZ_8 * n) -#define LLCC_TRP_ATTR2_CFGn (n) (0x21100 + SZ_8 * n) +#define LLCC_TRP_ATTR2_CFGn (n) (0x21100 + SZ_4 * n)#define LLCC_TRP_SCID_DIS_CAP_ALLOC 0x21f00#define LLCC_TRP_PCB_ACT 0x21f04
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 180/583 block: add check of minors and first_minor in device_add_disk()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Nan <[email protected]>
[ Upstream commit 4c434392c4777881d01beada6701eff8c76b43fe ]
'first_minor' represents the starting minor number of disks, and 'minors' represents the number of partitions in the device. Neither of them can be greater than MINORMASK + 1.
Commit e338924bd05d ("block: check minor range in device_add_disk()") only added the check of 'first_minor + minors'. However, their sum might be less than MINORMASK but their values are wrong. Complete the checks now.
--- block/genhd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/genhd.c +3 -1
@@ -432,7 +432,9 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, DISK_MAX_PARTS); disk->minors =DISK_MAX_PARTS ; } -if (disk->first_minor + disk->minors >MINORMASK +1 ) +if (disk->first_minor >MINORMASK || + disk->minors >MINORMASK +1 || + disk->first_minor + disk->minors >MINORMASK +1 ) goto out_exit_elevator; }else {if (WARN_ON (disk->minors))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 181/583 arm64: dts: qcom: sc7280: Mark SDHCI hosts as cache-coherent
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 827f5fc8d912203c1f971e47d61130b13c6820ba ]
The SDHCI hosts on SC7280 are cache-coherent, just like on most fairly recent Qualcomm SoCs. Mark them as such.
--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -0
@@ -925,6 +925,7 @@ sdhc_1: mmc@7c4000 { bus-width = <8>; supports-cqe; + dma-coherent; qcom,dll-config = <0x0007642c>; qcom,ddr-config = <0x80040868>;
@@ -3291,6 +3292,7 @@ sdhc_2: mmc@8804000 { operating-points-v2 = <&sdhc2_opp_table>; bus-width = <4>; + dma-coherent; qcom,dll-config = <0x0007642c>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 182/583 arm64: dts: qcom: ipq6018: fix clock rates for GCC_USB0_MOCK_UTMI_CLK
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chukun Pan <[email protected]>
[ Upstream commit 5c0dbe8b058436ad5daecb19c60869f832607ea3 ]
The downstream QSDK kernel [1] and GCC_USB1_MOCK_UTMI_CLK are both 24MHz. Adjust GCC_USB0_MOCK_UTMI_CLK to 24MHz to avoid the following error:
clk: couldn't set gcc_usb0_mock_utmi_clk clk rate to 20000000 (-22), current rate: 24000000
1. https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4/-/commit/486c8485f59
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +1 -1
@@ -565,7 +565,7 @@ usb3: usb@8af8800 { <&gcc GCC_USB0_MOCK_UTMI_CLK>; assigned-clock-rates = <133330000>, <133330000>, - <20000000>; + <24000000>; resets = <&gcc GCC_USB0_BCR>; status = "disabled";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 183/583 arm64: dts: qcom: sm8550: Separate out X3 idle state
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 28b735232d5e16a34f98dbac1e7b5401c1c16d89 ]
The X3 core has different entry/exit/residency time requirements than the big cluster. Denote them to stop confusing the scheduler.
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +11 -1
@@ -298,6 +298,16 @@ BIG_CPU_SLEEP_0: cpu-sleep-1-0 { min-residency-us = <4791>; local-timer-stop; }; + + PRIME_CPU_SLEEP_0: cpu-sleep-2-0 { + compatible = "arm,idle-state"; + idle-state-name = "goldplus-rail-power-collapse"; + arm,psci-suspend-param = <0x40000004>; + entry-latency-us = <500>; + exit-latency-us = <1350>; + min-residency-us = <7480>; + local-timer-stop; + }; }; domain-idle-states {
@@ -398,7 +408,7 @@ CPU_PD6: power-domain-cpu6 { CPU_PD7: power-domain-cpu7 { #power-domain-cells = <0>; power-domains = <&CLUSTER_PD>; - domain-idle-states = <&BIG_CPU_SLEEP_0>; + domain-idle-states = <&PRIME_CPU_SLEEP_0>; }; CLUSTER_PD: power-domain-cluster {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 184/583 arm64: dts: qcom: sm8550: Update idle state time requirements
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit ad6556fb45d4ab91ad786a2025cbe2b0f2e6cf77 ]
The idle state entry/exit/residency times differ from what shipped on production devices, mostly being overly optimistic in entry times and overly pessimistic in minimal residency times. Align them with downstream sources.
--- arch/arm64/boot/dts/qcom/sm8550.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/qcom/sm8550.dtsi +10 -10
@@ -283,9 +283,9 @@ LITTLE_CPU_SLEEP_0: cpu-sleep-0-0 { compatible = "arm,idle-state"; idle-state-name = "silver-rail-power-collapse"; arm,psci-suspend-param = <0x40000004>; - entry-latency-us = <800>; + entry-latency-us = <550>; exit-latency-us = <750>; - min-residency-us = <4090>; + min-residency-us = <6700>; local-timer-stop; };
@@ -294,8 +294,8 @@ BIG_CPU_SLEEP_0: cpu-sleep-1-0 { idle-state-name = "gold-rail-power-collapse"; arm,psci-suspend-param = <0x40000004>; entry-latency-us = <600>; - exit-latency-us = <1550>; - min-residency-us = <4791>; + exit-latency-us = <1300>; + min-residency-us = <8136>; local-timer-stop; };
@@ -314,17 +314,17 @@ domain-idle-states { CLUSTER_SLEEP_0: cluster-sleep-0 { compatible = "domain-idle-state"; arm,psci-suspend-param = <0x41000044>; - entry-latency-us = <1050>; - exit-latency-us = <2500>; - min-residency-us = <5309>; + entry-latency-us = <750>; + exit-latency-us = <2350>; + min-residency-us = <9144>; }; CLUSTER_SLEEP_1: cluster-sleep-1 { compatible = "domain-idle-state"; arm,psci-suspend-param = <0x4100c344>; - entry-latency-us = <2700>; - exit-latency-us = <3500>; - min-residency-us = <13959>; + entry-latency-us = <2800>; + exit-latency-us = <4400>; + min-residency-us = <10150>; }; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 185/583 arm64: dts: qcom: sc8180x: Mark PCIe hosts cache-coherent
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 45e8c72712345263208f7c94f334fa718634f557 ]
The PCIe controllers on 8180 are cache-coherent. Mark them as such.
--- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/sc8180x.dtsi +4 -0
@@ -1751,6 +1751,7 @@ pcie0: pci@1c00000 { phys = <&pcie0_lane>; phy-names = "pciephy"; + dma-coherent; status = "disabled"; };
@@ -1858,6 +1859,7 @@ pcie3: pci@1c08000 { phys = <&pcie3_lane>; phy-names = "pciephy"; + dma-coherent; status = "disabled"; };
@@ -1965,6 +1967,7 @@ pcie1: pci@1c10000 { phys = <&pcie1_lane>; phy-names = "pciephy"; + dma-coherent; status = "disabled"; };
@@ -2072,6 +2075,7 @@ pcie2: pci@1c18000 { phys = <&pcie2_lane>; phy-names = "pciephy"; + dma-coherent; status = "disabled"; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 186/583 arm64: dts: qcom: sc8180x: switch PCIe QMP PHY to new style of bindings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit a6546460ca439bade19d64eb63cee2d97c29fb72 ]
Change the PCIe QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). While we are at it, rename PHY nodes to phy@.
Stable-dep-of: 78403b37f677 ("arm64: dts: qcom: sc8180x: Fix up PCIe nodes")
--- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 148 ++++++++++---------------- 1 file changed, 55 insertions(+), 93 deletions(-)
arch/arm64/boot/dts/qcom/sc8180x.dtsi +55 -93
@@ -1749,24 +1749,29 @@ pcie0: pci@1c00000 { <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>; interconnect-names = "pcie-mem", "cpu-pcie"; - phys = <&pcie0_lane>; + phys = <&pcie0_phy>; phy-names = "pciephy"; dma-coherent; status = "disabled"; }; - pcie0_phy: phy-wrapper@1c06000 { + pcie0_phy: phy@1c06000 { compatible = "qcom,sc8180x-qmp-pcie-phy"; - reg = <0 0x1c06000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01c06000 0 0x1000>; clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>, <&gcc GCC_PCIE_0_CFG_AHB_CLK>, <&gcc GCC_PCIE_0_CLKREF_CLK>, - <&gcc GCC_PCIE1_PHY_REFGEN_CLK>; - clock-names = "aux", "cfg_ahb", "ref", "refgen"; + <&gcc GCC_PCIE1_PHY_REFGEN_CLK>, + <&gcc GCC_PCIE_0_PIPE_CLK>; + clock-names = "aux", + "cfg_ahb", + "ref", + "refgen", + "pipe"; + #clock-cells = <0>; + clock-output-names = "pcie_0_pipe_clk"; + #phy-cells = <0>; resets = <&gcc GCC_PCIE_0_PHY_BCR>; reset-names = "phy";
@@ -1775,21 +1780,6 @@ pcie0_phy: phy-wrapper@1c06000 { assigned-clock-rates = <100000000>; status = "disabled"; - - pcie0_lane: phy@1c06200 { - reg = <0 0x1c06200 0 0x170>, /* tx0 */ - <0 0x1c06400 0 0x200>, /* rx0 */ - <0 0x1c06a00 0 0x1f0>, /* pcs */ - <0 0x1c06600 0 0x170>, /* tx1 */ - <0 0x1c06800 0 0x200>, /* rx1 */ - <0 0x1c06e00 0 0xf4>; /* pcs_com */ - clocks = <&gcc GCC_PCIE_0_PIPE_CLK>; - clock-names = "pipe0"; - - #clock-cells = <0>; - clock-output-names = "pcie_0_pipe_clk"; - #phy-cells = <0>; - }; }; pcie3: pci@1c08000 {
@@ -1857,24 +1847,30 @@ pcie3: pci@1c08000 { <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>; interconnect-names = "pcie-mem", "cpu-pcie"; - phys = <&pcie3_lane>; + phys = <&pcie3_phy>; phy-names = "pciephy"; dma-coherent; status = "disabled"; }; - pcie3_phy: phy-wrapper@1c0c000 { + pcie3_phy: phy@1c0c000 { compatible = "qcom,sc8180x-qmp-pcie-phy"; - reg = <0 0x1c0c000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01c0c000 0 0x1000>; clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>, <&gcc GCC_PCIE_3_CFG_AHB_CLK>, <&gcc GCC_PCIE_3_CLKREF_CLK>, - <&gcc GCC_PCIE2_PHY_REFGEN_CLK>; - clock-names = "aux", "cfg_ahb", "ref", "refgen"; + <&gcc GCC_PCIE2_PHY_REFGEN_CLK>, + <&gcc GCC_PCIE_3_PIPE_CLK>; + clock-names = "aux", + "cfg_ahb", + "ref", + "refgen", + "pipe"; + #clock-cells = <0>; + clock-output-names = "pcie_3_pipe_clk"; + + #phy-cells = <0>; resets = <&gcc GCC_PCIE_3_PHY_BCR>; reset-names = "phy";
@@ -1883,21 +1879,6 @@ pcie3_phy: phy-wrapper@1c0c000 { assigned-clock-rates = <100000000>; status = "disabled"; - - pcie3_lane: phy@1c0c200 { - reg = <0 0x1c0c200 0 0x170>, /* tx0 */ - <0 0x1c0c400 0 0x200>, /* rx0 */ - <0 0x1c0ca00 0 0x1f0>, /* pcs */ - <0 0x1c0c600 0 0x170>, /* tx1 */ - <0 0x1c0c800 0 0x200>, /* rx1 */ - <0 0x1c0ce00 0 0xf4>; /* pcs_com */ - clocks = <&gcc GCC_PCIE_3_PIPE_CLK>; - clock-names = "pipe0"; - - #clock-cells = <0>; - clock-output-names = "pcie_3_pipe_clk"; - #phy-cells = <0>; - }; }; pcie1: pci@1c10000 {
@@ -1965,24 +1946,30 @@ pcie1: pci@1c10000 { <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>; interconnect-names = "pcie-mem", "cpu-pcie"; - phys = <&pcie1_lane>; + phys = <&pcie1_phy>; phy-names = "pciephy"; dma-coherent; status = "disabled"; }; - pcie1_phy: phy-wrapper@1c16000 { + pcie1_phy: phy@1c16000 { compatible = "qcom,sc8180x-qmp-pcie-phy"; - reg = <0 0x1c16000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01c16000 0 0x1000>; clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>, <&gcc GCC_PCIE_1_CFG_AHB_CLK>, <&gcc GCC_PCIE_1_CLKREF_CLK>, - <&gcc GCC_PCIE1_PHY_REFGEN_CLK>; - clock-names = "aux", "cfg_ahb", "ref", "refgen"; + <&gcc GCC_PCIE1_PHY_REFGEN_CLK>, + <&gcc GCC_PCIE_1_PIPE_CLK>; + clock-names = "aux", + "cfg_ahb", + "ref", + "refgen", + "pipe"; + #clock-cells = <0>; + clock-output-names = "pcie_1_pipe_clk"; + + #phy-cells = <0>; resets = <&gcc GCC_PCIE_1_PHY_BCR>; reset-names = "phy";
@@ -1991,21 +1978,6 @@ pcie1_phy: phy-wrapper@1c16000 { assigned-clock-rates = <100000000>; status = "disabled"; - - pcie1_lane: phy@1c0e200 { - reg = <0 0x1c16200 0 0x170>, /* tx0 */ - <0 0x1c16400 0 0x200>, /* rx0 */ - <0 0x1c16a00 0 0x1f0>, /* pcs */ - <0 0x1c16600 0 0x170>, /* tx1 */ - <0 0x1c16800 0 0x200>, /* rx1 */ - <0 0x1c16e00 0 0xf4>; /* pcs_com */ - clocks = <&gcc GCC_PCIE_1_PIPE_CLK>; - clock-names = "pipe0"; - #clock-cells = <0>; - clock-output-names = "pcie_1_pipe_clk"; - - #phy-cells = <0>; - }; }; pcie2: pci@1c18000 {
@@ -2073,24 +2045,30 @@ pcie2: pci@1c18000 { <&gem_noc MASTER_AMPSS_M0 0 &config_noc SLAVE_PCIE_0 0>; interconnect-names = "pcie-mem", "cpu-pcie"; - phys = <&pcie2_lane>; + phys = <&pcie2_phy>; phy-names = "pciephy"; dma-coherent; status = "disabled"; }; - pcie2_phy: phy-wrapper@1c1c000 { + pcie2_phy: phy@1c1c000 { compatible = "qcom,sc8180x-qmp-pcie-phy"; - reg = <0 0x1c1c000 0 0x1c0>; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x01c1c000 0 0x1000>; clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>, <&gcc GCC_PCIE_2_CFG_AHB_CLK>, <&gcc GCC_PCIE_2_CLKREF_CLK>, - <&gcc GCC_PCIE2_PHY_REFGEN_CLK>; - clock-names = "aux", "cfg_ahb", "ref", "refgen"; + <&gcc GCC_PCIE2_PHY_REFGEN_CLK>, + <&gcc GCC_PCIE_2_PIPE_CLK>; + clock-names = "aux", + "cfg_ahb", + "ref", + "refgen", + "pipe"; + #clock-cells = <0>; + clock-output-names = "pcie_3_pipe_clk"; + + #phy-cells = <0>; resets = <&gcc GCC_PCIE_2_PHY_BCR>; reset-names = "phy";
@@ -2099,22 +2077,6 @@ pcie2_phy: phy-wrapper@1c1c000 { assigned-clock-rates = <100000000>; status = "disabled"; - - pcie2_lane: phy@1c0e200 { - reg = <0 0x1c1c200 0 0x170>, /* tx0 */ - <0 0x1c1c400 0 0x200>, /* rx0 */ - <0 0x1c1ca00 0 0x1f0>, /* pcs */ - <0 0x1c1c600 0 0x170>, /* tx1 */ - <0 0x1c1c800 0 0x200>, /* rx1 */ - <0 0x1c1ce00 0 0xf4>; /* pcs_com */ - clocks = <&gcc GCC_PCIE_2_PIPE_CLK>; - clock-names = "pipe0"; - - #clock-cells = <0>; - clock-output-names = "pcie_2_pipe_clk"; - - #phy-cells = <0>; - }; }; ufs_mem_hc: ufshc@1d84000 {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 187/583 arm64: dts: qcom: sc8180x: Fix up PCIe nodes
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 78403b37f6770441f80a78d13772394731afe055 ]
Duplicated clock output names cause probe errors and wrong clocks cause hardware not to work. Fix such issues.
--- arch/arm64/boot/dts/qcom/sc8180x.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sc8180x.dtsi +3 -3
@@ -1762,7 +1762,7 @@ pcie0_phy: phy@1c06000 { clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>, <&gcc GCC_PCIE_0_CFG_AHB_CLK>, <&gcc GCC_PCIE_0_CLKREF_CLK>, - <&gcc GCC_PCIE1_PHY_REFGEN_CLK>, + <&gcc GCC_PCIE0_PHY_REFGEN_CLK>, <&gcc GCC_PCIE_0_PIPE_CLK>; clock-names = "aux", "cfg_ahb",
@@ -1860,7 +1860,7 @@ pcie3_phy: phy@1c0c000 { clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>, <&gcc GCC_PCIE_3_CFG_AHB_CLK>, <&gcc GCC_PCIE_3_CLKREF_CLK>, - <&gcc GCC_PCIE2_PHY_REFGEN_CLK>, + <&gcc GCC_PCIE3_PHY_REFGEN_CLK>, <&gcc GCC_PCIE_3_PIPE_CLK>; clock-names = "aux", "cfg_ahb",
@@ -2066,7 +2066,7 @@ pcie2_phy: phy@1c1c000 { "refgen", "pipe"; #clock-cells = <0>; - clock-output-names = "pcie_3_pipe_clk"; + clock-output-names = "pcie_2_pipe_clk"; #phy-cells = <0>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 188/583 bpf: Re-enable unit_size checking for global per-cpu allocator
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit baa8fdecd87bb8751237b45e3bcb5a179e5a12ca ]
With pcpu_alloc_size() in place, check whether or not the size of the dynamic per-cpu area is matched with unit_size.
Stable-dep-of: 7ac5c53e0073 ("bpf: Use c->unit_size to select target cache during free")
--- kernel/bpf/memalloc.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
kernel/bpf/memalloc.c +12 -10
@@ -491,21 +491,17 @@ static int check_obj_size(struct bpf_mem_cache *c, unsigned int idx)struct llist_node *first;unsigned int obj_size; -/* For per-cpu allocator, the size of free objects in free list doesn't -* match with unit_size and now there is no way to get the size of -* per-cpu pointer saved in free object, so just skip the checking. -*/ -if (c->percpu_size) -return 0 ; - first = c->free_llist.first;if (!first)return 0 ; - obj_size =ksize (first); +if (c->percpu_size) + obj_size =pcpu_alloc_size (((void **)first)[1 ]); +else + obj_size =ksize (first);if (obj_size != c->unit_size) { -WARN_ONCE (1 ,"bpf_mem_cache[%u]: unexpected object size %u, expect %u\n" , - idx, obj_size, c->unit_size); +WARN_ONCE (1 ,"bpf_mem_cache[%u]: percpu %d, unexpected object size %u, expect %u\n" , + idx, c->percpu_size, obj_size, c->unit_size);return -EINVAL ; }return 0 ;
@@ -967,6 +963,12 @@ void notrace *bpf_mem_cache_alloc_flags(struct bpf_mem_alloc *ma, gfp_t flags)return !ret ?NULL : ret +LLIST_NODE_SZ ; } +/* The alignment of dynamic per-cpu area is 8, so c->unit_size and the +* actual size of dynamic per-cpu area will always be matched and there is +* no need to adjust size_index for per-cpu allocation. However for the +* simplicity of the implementation, use an unified size_index for both +* kmalloc and per-cpu allocation. +*/ static __init int bpf_mem_cache_adjust_size (void ) {unsigned int size;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 189/583 bpf: Use pcpu_alloc_size() in bpf_mem_free{_rcu}()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit 3f2189e4f77b7a3e979d143dc4ff586488c7e8a5 ]
For bpf_global_percpu_ma, the pointer passed to bpf_mem_free_rcu() is allocated by kmalloc() and its size is fixed (16-bytes on x86-64). So no matter which cache allocates the dynamic per-cpu area, on x86-64 cache[2] will always be used to free the per-cpu area.
Fix the unbalance by checking whether the bpf memory allocator is per-cpu or not and use pcpu_alloc_size() instead of ksize() to find the correct cache for per-cpu free.
Stable-dep-of: 7ac5c53e0073 ("bpf: Use c->unit_size to select target cache during free")
--- include/linux/bpf_mem_alloc.h | 1 + kernel/bpf/memalloc.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)
include/linux/bpf_mem_alloc.h +1 -0
@@ -11,6 +11,7 @@ struct bpf_mem_caches;struct bpf_mem_alloc {struct bpf_mem_caches __percpu *caches;struct bpf_mem_cache __percpu *cache; +bool percpu;struct work_struct work; };
kernel/bpf/memalloc.c +15 -2
@@ -522,6 +522,8 @@ int bpf_mem_alloc_init(struct bpf_mem_alloc *ma, int size, bool percpu)struct bpf_mem_cache *c,__percpu *pc;struct obj_cgroup *objcg =NULL ; + ma->percpu = percpu; +if (size) { pc =__alloc_percpu_gfp (sizeof (*pc),8 ,GFP_KERNEL );if (!pc)
@@ -866,6 +868,17 @@ void notrace *bpf_mem_alloc(struct bpf_mem_alloc *ma, size_t size)return !ret ?NULL : ret +LLIST_NODE_SZ ; } +static notrace int bpf_mem_free_idx(void *ptr, bool percpu) +{ +size_t size; + +if (percpu) + size =pcpu_alloc_size (*((void **)ptr)); +else + size =ksize (ptr -LLIST_NODE_SZ ); +return bpf_mem_cache_idx (size); +} + void notrace bpf_mem_free(struct bpf_mem_alloc *ma, void *ptr) {int idx;
@@ -873,7 +886,7 @@ void notrace bpf_mem_free(struct bpf_mem_alloc *ma, void *ptr)if (!ptr)return ; - idx =bpf_mem_cache_idx (ksize (ptr -LLIST_NODE_SZ )); + idx =bpf_mem_free_idx (ptr, ma->percpu);if (idx <0 )return ;
@@ -887,7 +900,7 @@ void notrace bpf_mem_free_rcu(struct bpf_mem_alloc *ma, void *ptr)if (!ptr)return ; - idx =bpf_mem_cache_idx (ksize (ptr -LLIST_NODE_SZ )); + idx =bpf_mem_free_idx (ptr, ma->percpu);if (idx <0 )return ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 190/583 bpf: Use c->unit_size to select target cache during free
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hou Tao <[email protected]>
[ Upstream commit 7ac5c53e00735d183a0f5e2cfce5eeb6c16319f2 ]
At present, bpf memory allocator uses check_obj_size() to ensure that ksize() of allocated pointer is equal with the unit_size of used bpf_mem_cache. Its purpose is to prevent bpf_mem_free() from selecting a bpf_mem_cache which has different unit_size compared with the bpf_mem_cache used for allocation. But as reported by lkp, the return value of ksize() or kmalloc_size_roundup() may change due to slab merge and it will lead to the warning report in check_obj_size().
The reported warning happened as follows:
(1) in bpf_mem_cache_adjust_size(), kmalloc_size_roundup(96) returns the object_size of kmalloc-96 instead of kmalloc-cg-96. The object_size of kmalloc-96 is 96, so size_index for 96 is not adjusted accordingly.
(2) the object_size of kmalloc-cg-96 is adjust from 96 to 128 due to slab merge in __kmem_cache_alias(). For SLAB, SLAB_HWCACHE_ALIGN is enabled by default for kmalloc slab, so align is 64 and size is 128 for kmalloc-cg-96. SLUB has a similar merge logic, but its object_size will not be changed, because its align is 8 under x86-64.
(3) when unit_alloc() does kmalloc_node(96, __GFP_ACCOUNT, node), ksize() returns 128 instead of 96 for the returned pointer.
(4) the warning in check_obj_size() is triggered.
Considering the slab merge can happen in anytime (e.g, a slab created in a new module), the following case is also possible: during the initialization of bpf_global_ma, there is no slab merge and ksize() for a 96-bytes object returns 96. But after that a new slab created by a kernel module is merged to kmalloc-cg-96 and the object_size of kmalloc-cg-96 is adjust from 96 to 128 (which is possible for x86-64 + CONFIG_SLAB, because its alignment requirement is 64 for 96-bytes slab). So soon or later, when bpf_global_ma frees a 96-byte-sized pointer which is allocated from bpf_mem_cache with unit_size=96, bpf_mem_free() will free the pointer through a bpf_mem_cache in which unit_size is 128, because the return value of ksize() changes. The warning for the mismatch will be triggered again.
A feasible fix is introducing similar APIs compared with ksize() and kmalloc_size_roundup() to return the actually-allocated size instead of size which may change due to slab merge, but it will introduce unnecessary dependency on the implementation details of mm subsystem.
As for now the pointer of bpf_mem_cache is saved in the 8-bytes area (or 4-bytes under 32-bit host) above the returned pointer, using unit_size in the saved bpf_mem_cache to select the target cache instead of inferring the size from the pointer itself. Beside no extra dependency on mm subsystem, the performance for bpf_mem_free_rcu() is also improved as shown below.
Before applying the patch, the performances of bpf_mem_alloc() and bpf_mem_free_rcu() on 8-CPUs VM with one producer are as follows:
kmalloc : alloc 11.69 ± 0.28M/s free 29.58 ± 0.93M/s percpu : alloc 14.11 ± 0.52M/s free 14.29 ± 0.99M/s
After apply the patch, the performance for bpf_mem_free_rcu() increases 9% and 146% for kmalloc memory and per-cpu memory respectively:
kmalloc: alloc 11.01 ± 0.03M/s free 32.42 ± 0.48M/s percpu: alloc 12.84 ± 0.12M/s free 35.24 ± 0.23M/s
After the fixes, there is no need to adjust size_index to fix the mismatch between allocation and free, so remove it as well. Also return NULL instead of ZERO_SIZE_PTR for zero-sized alloc in bpf_mem_alloc(), because there is no bpf_mem_cache pointer saved above ZERO_SIZE_PTR.
--- kernel/bpf/memalloc.c | 105 +++++------------------------------------- 1 file changed, 11 insertions(+), 94 deletions(-)
kernel/bpf/memalloc.c +11 -94
@@ -486,27 +486,6 @@ static void prefill_mem_cache(struct bpf_mem_cache *c, int cpu)alloc_bulk (c, c->unit_size <=256 ?4 :1 ,cpu_to_node (cpu), false); } -static int check_obj_size (struct bpf_mem_cache *c,unsigned int idx) -{ -struct llist_node *first; -unsigned int obj_size; - - first = c->free_llist.first; -if (!first) -return 0 ; - -if (c->percpu_size) - obj_size =pcpu_alloc_size (((void **)first)[1 ]); -else - obj_size =ksize (first); -if (obj_size != c->unit_size) { -WARN_ONCE (1 ,"bpf_mem_cache[%u]: percpu %d, unexpected object size %u, expect %u\n" , - idx, c->percpu_size, obj_size, c->unit_size); -return -EINVAL ; - } -return 0 ; -} -/* When size != 0 bpf_mem_cache for each cpu. * This is typical bpf hash map use case when all elements have equal size. *
@@ -517,10 +496,10 @@ static int check_obj_size(struct bpf_mem_cache *c, unsigned int idx)int bpf_mem_alloc_init (struct bpf_mem_alloc *ma,int size,bool percpu) {static u16 sizes[NUM_CACHES ] = {96 ,192 ,16 ,32 ,64 ,128 ,256 ,512 ,1024 ,2048 ,4096 }; -int cpu, i, err, unit_size, percpu_size =0 ;struct bpf_mem_caches *cc,__percpu *pcc;struct bpf_mem_cache *c,__percpu *pc;struct obj_cgroup *objcg =NULL ; +int cpu, i, unit_size, percpu_size =0 ; ma->percpu = percpu;
@@ -560,7 +539,6 @@ int bpf_mem_alloc_init(struct bpf_mem_alloc *ma, int size, bool percpu) pcc =__alloc_percpu_gfp (sizeof (*cc),8 ,GFP_KERNEL );if (!pcc)return -ENOMEM ; - err =0 ;#ifdef CONFIG_MEMCG_KMEM objcg =get_obj_cgroup_from_current ();#endif
@@ -573,28 +551,12 @@ int bpf_mem_alloc_init(struct bpf_mem_alloc *ma, int size, bool percpu) c->tgt = c;init_refill_work (c); -/* Another bpf_mem_cache will be used when allocating -* c->unit_size in bpf_mem_alloc(), so doesn't prefill -* for the bpf_mem_cache because these free objects will -* never be used. -*/ -if (i !=bpf_mem_cache_idx (c->unit_size)) -continue ;prefill_mem_cache (c, cpu); - err =check_obj_size (c, i); -if (err) - goto out; } } -out: ma->caches = pcc; -/* refill_work is either zeroed or initialized, so it is safe to -* call irq_work_sync(). -*/ -if (err) -bpf_mem_alloc_destroy (ma); -return err; +return 0 ; }static void drain_mem_cache (struct bpf_mem_cache *c)
@@ -858,7 +820,7 @@ void notrace *bpf_mem_alloc(struct bpf_mem_alloc *ma, size_t size)void *ret;if (!size) -return ZERO_SIZE_PTR ; +return NULL ; idx =bpf_mem_cache_idx (size +LLIST_NODE_SZ );if (idx <0 )
@@ -868,26 +830,17 @@ void notrace *bpf_mem_alloc(struct bpf_mem_alloc *ma, size_t size)return !ret ?NULL : ret +LLIST_NODE_SZ ; } -static notrace int bpf_mem_free_idx(void *ptr, bool percpu) -{ -size_t size; - -if (percpu) - size =pcpu_alloc_size (*((void **)ptr)); -else - size =ksize (ptr -LLIST_NODE_SZ ); -return bpf_mem_cache_idx (size); -} - void notrace bpf_mem_free(struct bpf_mem_alloc *ma, void *ptr) { +struct bpf_mem_cache *c;int idx;if (!ptr)return ; - idx =bpf_mem_free_idx (ptr, ma->percpu); -if (idx <0 ) + c = *(void **)(ptr -LLIST_NODE_SZ ); + idx =bpf_mem_cache_idx (c->unit_size); +if (WARN_ON_ONCE (idx <0 ))return ;unit_free (this_cpu_ptr (ma->caches)->cache + idx, ptr);
@@ -895,13 +848,15 @@ void notrace bpf_mem_free(struct bpf_mem_alloc *ma, void *ptr) void notrace bpf_mem_free_rcu(struct bpf_mem_alloc *ma, void *ptr) { +struct bpf_mem_cache *c;int idx;if (!ptr)return ; - idx =bpf_mem_free_idx (ptr, ma->percpu); -if (idx <0 ) + c = *(void **)(ptr -LLIST_NODE_SZ ); + idx =bpf_mem_cache_idx (c->unit_size); +if (WARN_ON_ONCE (idx <0 ))return ;unit_free_rcu (this_cpu_ptr (ma->caches)->cache + idx, ptr);
@@ -975,41 +930,3 @@ void notrace *bpf_mem_cache_alloc_flags(struct bpf_mem_alloc *ma, gfp_t flags)return !ret ?NULL : ret +LLIST_NODE_SZ ; } - -/* The alignment of dynamic per-cpu area is 8, so c->unit_size and the -* actual size of dynamic per-cpu area will always be matched and there is -* no need to adjust size_index for per-cpu allocation. However for the -* simplicity of the implementation, use an unified size_index for both -* kmalloc and per-cpu allocation. -*/ -static __init int bpf_mem_cache_adjust_size (void ) -{ -unsigned int size; - -/* Adjusting the indexes in size_index() according to the object_size -* of underlying slab cache, so bpf_mem_alloc() will select a -* bpf_mem_cache with unit_size equal to the object_size of -* the underlying slab cache. -* -* The maximal value of KMALLOC_MIN_SIZE and __kmalloc_minalign() is -* 256-bytes, so only do adjustment for [8-bytes, 192-bytes]. -*/ -for (size =192 ; size >=8 ; size -=8 ) { -unsigned int kmalloc_size, index; - - kmalloc_size =kmalloc_size_roundup (size); -if (kmalloc_size == size) -continue ; - -if (kmalloc_size <=192 ) - index = size_index[(kmalloc_size -1 ) /8 ]; -else - index =fls (kmalloc_size -1 ) -1 ; -/* Only overwrite if necessary */ -if (size_index[(size -1 ) /8 ] != index) - size_index[(size -1 ) /8 ] = index; - } - -return 0 ; -} -subsys_initcall (bpf_mem_cache_adjust_size);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 191/583 wifi: rtlwifi: add calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 52221dfddbbfb5b4e029bb2efe9bb7da33ec1e46 ]
There are many same functions like _rtl88e_phy_calculate_bit_shift(), _rtl92c_phy_calculate_bit_shift() and so on. And these functions can cause undefined bitwise shift behavior. Add calculate_bit_shift() to replace them and fix undefined behavior in subsequent patches.
Stable-dep-of: 969bc926f04b ("wifi: rtlwifi: rtl8188ee: phy: using calculate_bit_shift()")
--- drivers/net/wireless/realtek/rtlwifi/wifi.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/realtek/rtlwifi/wifi.h +7 -0
@@ -3080,4 +3080,11 @@ static inline struct ieee80211_sta *rtl_find_sta(struct ieee80211_hw *hw, return ieee80211_find_sta(mac->vif, mac_addr); } +static inline u32 calculate_bit_shift (u32 bitmask) +{ +if (WARN_ON_ONCE (!bitmask)) +return 0 ; + +return __ffs (bitmask); +}#endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 192/583 wifi: rtlwifi: rtl8188ee: phy: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 969bc926f04b438676768aeffffffb050e480b62 ]
Using calculate_bit_shift() to replace _rtl88e_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c +4 -10
@@ -16,12 +16,6 @@ static u32 _rtl88e_phy_rf_serial_read(struct ieee80211_hw *hw,static void _rtl88e_phy_rf_serial_write (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset,u32 data); -static u32 _rtl88e_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -}static bool _rtl88e_phy_bb8188e_config_parafile (struct ieee80211_hw *hw);static bool _rtl88e_phy_config_mac_with_headerfile (struct ieee80211_hw *hw); static bool phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
@@ -51,7 +45,7 @@ u32 rtl88e_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)rtl_dbg (rtlpriv,COMP_RF ,DBG_TRACE ,"regaddr(%#x), bitmask(%#x)\n" , regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -74,7 +68,7 @@ void rtl88e_phy_set_bb_reg(struct ieee80211_hw *hw,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -99,7 +93,7 @@ u32 rtl88e_phy_query_rf_reg(struct ieee80211_hw *hw, original_value =_rtl88e_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -127,7 +121,7 @@ void rtl88e_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl88e_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl88e_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 193/583 wifi: rtlwifi: rtl8192c: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 1dedc3a6699d827d345019e921b8d8f37f694333 ]
Using calculate_bit_shift() to replace _rtl92c_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c | 12 ++---------- .../wireless/realtek/rtlwifi/rtl8192c/phy_common.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c +2 -10
@@ -17,7 +17,7 @@ u32 rtl92c_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)rtl_dbg (rtlpriv,COMP_RF ,DBG_TRACE ,"regaddr(%#x), bitmask(%#x)\n" , regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -40,7 +40,7 @@ void rtl92c_phy_set_bb_reg(struct ieee80211_hw *hw,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -143,14 +143,6 @@ void _rtl92c_phy_rf_serial_write(struct ieee80211_hw *hw, }EXPORT_SYMBOL (_rtl92c_phy_rf_serial_write); -u32 _rtl92c_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -EXPORT_SYMBOL (_rtl92c_phy_calculate_bit_shift); -static void _rtl92c_phy_bb_config_1t (struct ieee80211_hw *hw) {rtl_set_bbreg (hw,RFPGA0_TXINFO ,0x3 ,0x2 );
drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h +0 -1
@@ -196,7 +196,6 @@ bool rtl92c_phy_set_rf_power_state(struct ieee80211_hw *hw,void rtl92ce_phy_set_rf_on (struct ieee80211_hw *hw);void rtl92c_phy_set_io (struct ieee80211_hw *hw);void rtl92c_bb_block_on (struct ieee80211_hw *hw); -u32 _rtl92c_phy_calculate_bit_shift (u32 bitmask);long _rtl92c_phy_txpwr_idx_to_dbm (struct ieee80211_hw *hw,enum wireless_mode wirelessmode,u8 txpwridx);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 194/583 wifi: rtlwifi: rtl8192cu: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit f4088c8fcbabadad9dd17d17ae9ba24e9e3221ec ]
Using calculate_bit_shift() to replace _rtl92c_phy_calculate_bit_shift(). And fix an undefined bitwise shift behavior problem.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c +3 -3
@@ -32,7 +32,7 @@ u32 rtl92cu_phy_query_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_fw_rf_serial_read (hw, rfpath, regaddr); } - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, "regaddr(%#x), rfpath(%#x), bitmask(%#x), original_value(%#x)\n",
@@ -56,7 +56,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
@@ -67,7 +67,7 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_fw_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 195/583 wifi: rtlwifi: rtl8192ce: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 3d03e8231031bcc65a48cd88ef9c71b6524ce70b ]
Using calculate_bit_shift() to replace _rtl92c_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c | 6 +++--- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +3 -3
@@ -39,7 +39,7 @@ u32 rtl92c_phy_query_rf_reg(struct ieee80211_hw *hw, rfpath, regaddr); } - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -110,7 +110,7 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
@@ -122,7 +122,7 @@ void rtl92ce_phy_set_rf_reg(struct ieee80211_hw *hw, original_value =_rtl92c_phy_fw_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92c_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift));
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h +0 -1
@@ -94,7 +94,6 @@ u32 _rtl92c_phy_rf_serial_read(struct ieee80211_hw *hw, enum radio_path rfpath, u32 offset);u32 _rtl92c_phy_fw_rf_serial_read (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset); -u32 _rtl92c_phy_calculate_bit_shift (u32 bitmask);void _rtl92c_phy_rf_serial_write (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset,u32 data); void _rtl92c_phy_fw_rf_serial_write(struct ieee80211_hw *hw,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 196/583 wifi: rtlwifi: rtl8192de: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit b8b2baad2e652042cf8b6339939ac2f4e6f53de4 ]
Using calculate_bit_shift() to replace _rtl92d_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c +4 -11
@@ -169,13 +169,6 @@ static const u8 channel_all[59] = { 157, 159, 161, 163, 165 }; -static u32 _rtl92d_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -u32 rtl92d_phy_query_bb_reg (struct ieee80211_hw *hw,u32 regaddr,u32 bitmask) {struct rtl_priv *rtlpriv =rtl_priv (hw);
@@ -198,7 +191,7 @@ u32 rtl92d_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask) }else { originalvalue =rtl_read_dword (rtlpriv, regaddr); } - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
@@ -230,7 +223,7 @@ void rtl92d_phy_set_bb_reg(struct ieee80211_hw *hw, dbi_direct); else originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }if (rtlhal->during_mac1init_radioa || rtlhal->during_mac0init_radiob)
@@ -317,7 +310,7 @@ u32 rtl92d_phy_query_rf_reg(struct ieee80211_hw *hw, regaddr, rfpath, bitmask);spin_lock (&rtlpriv->locks.rf_lock); original_value =_rtl92d_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock); rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -343,7 +336,7 @@ void rtl92d_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,if (bitmask !=RFREG_OFFSET_MASK ) { original_value =_rtl92d_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92d_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift)); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 197/583 wifi: rtlwifi: rtl8192ee: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit 63526897fc0d086069bcab67c3a112caaec751cb ]
Using calculate_bit_shift() to replace _rtl92ee_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c +4 -12
@@ -16,7 +16,6 @@ static u32 _rtl92ee_phy_rf_serial_read(struct ieee80211_hw *hw,static void _rtl92ee_phy_rf_serial_write (struct ieee80211_hw *hw,enum radio_path rfpath,u32 offset,u32 data); -static u32 _rtl92ee_phy_calculate_bit_shift (u32 bitmask);static bool _rtl92ee_phy_bb8192ee_config_parafile (struct ieee80211_hw *hw);static bool _rtl92ee_phy_config_mac_with_headerfile (struct ieee80211_hw *hw); static bool phy_config_bb_with_hdr_file(struct ieee80211_hw *hw,
@@ -46,7 +45,7 @@ u32 rtl92ee_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask)rtl_dbg (rtlpriv,COMP_RF ,DBG_TRACE ,"regaddr(%#x), bitmask(%#x)\n" , regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE,
@@ -68,7 +67,7 @@ void rtl92ee_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -92,7 +91,7 @@ u32 rtl92ee_phy_query_rf_reg(struct ieee80211_hw *hw,spin_lock (&rtlpriv->locks.rf_lock); original_value =_rtl92ee_phy_rf_serial_read (hw , rfpath, regaddr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -119,7 +118,7 @@ void rtl92ee_phy_set_rf_reg(struct ieee80211_hw *hw,if (bitmask !=RFREG_OFFSET_MASK ) { original_value =_rtl92ee_phy_rf_serial_read (hw, rfpath, addr); - bitshift =_rtl92ee_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = (original_value & (~bitmask)) | (data << bitshift); }
@@ -201,13 +200,6 @@ static void _rtl92ee_phy_rf_serial_write(struct ieee80211_hw *hw, pphyreg->rf3wire_offset, data_and_addr); } -static u32 _rtl92ee_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -bool rtl92ee_phy_mac_config (struct ieee80211_hw *hw) {return _rtl92ee_phy_config_mac_with_headerfile (hw);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 198/583 wifi: rtlwifi: rtl8192se: using calculate_bit_shift()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit ac32b9317063b101a8ff3d3e885f76f87a280419 ]
Using calculate_bit_shift() to replace _rtl92s_phy_calculate_bit_shift(). And fix the undefined bitwise shift behavior problem.
--- .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c +4 -11
@@ -14,13 +14,6 @@#include "hw.h" #include "table.h" -static u32 _rtl92s_phy_calculate_bit_shift (u32 bitmask) -{ -u32 i =ffs (bitmask); - -return i ? i -1 :32 ; -} -u32 rtl92s_phy_query_bb_reg (struct ieee80211_hw *hw,u32 regaddr,u32 bitmask) {struct rtl_priv *rtlpriv =rtl_priv (hw);
@@ -30,7 +23,7 @@ u32 rtl92s_phy_query_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask) regaddr, bitmask); originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); returnvalue = (originalvalue & bitmask) >> bitshift; rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, "BBR MASK=0x%x Addr[0x%x]=0x%x\n",
@@ -52,7 +45,7 @@ void rtl92s_phy_set_bb_reg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask,if (bitmask !=MASKDWORD ) { originalvalue =rtl_read_dword (rtlpriv, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((originalvalue & (~bitmask)) | (data << bitshift)); }
@@ -157,7 +150,7 @@ u32 rtl92s_phy_query_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath, original_value =_rtl92s_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); readback_value = (original_value & bitmask) >> bitshift;spin_unlock (&rtlpriv->locks.rf_lock);
@@ -188,7 +181,7 @@ void rtl92s_phy_set_rf_reg(struct ieee80211_hw *hw, enum radio_path rfpath,if (bitmask !=RFREG_OFFSET_MASK ) { original_value =_rtl92s_phy_rf_serial_read (hw, rfpath, regaddr); - bitshift =_rtl92s_phy_calculate_bit_shift (bitmask); + bitshift =calculate_bit_shift (bitmask); data = ((original_value & (~bitmask)) | (data << bitshift)); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 199/583 wifi: iwlwifi: mvm: set siso/mimo chains to 1 in FW SMPS request
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit b1a2e5c310e063560760806d2cc5d2233c596067 ]
The firmware changed their mind, don't set the chains to zero, instead set them to 1 as we normally would for connections to APs that don't use MIMO.
--- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +0 -11
@@ -99,17 +99,6 @@ static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm, active_cnt =2 ; } -/* -* If the firmware requested it, then we know that it supports -* getting zero for the values to indicate "use one, but pick -* which one yourself", which means it can dynamically pick one -* that e.g. has better RSSI. -*/ -if (mvm->fw_static_smps_request && active_cnt ==1 && idle_cnt ==1 ) { - idle_cnt =0 ; - active_cnt =0 ; - } - *rxchain_info =cpu_to_le32 (iwl_mvm_get_valid_rx_ant (mvm) <<PHY_RX_CHAIN_VALID_POS ); *rxchain_info |=cpu_to_le32 (idle_cnt <<PHY_RX_CHAIN_CNT_POS );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 200/583 wifi: iwlwifi: mvm: send TX path flush in rfkill
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 2afc3dad39ea84a072d04ff40a417234326adc47 ]
If we want to drop packets, that's surely a good thing to do when we want to enter rfkill. Send this command despite rfkill so we can successfully clean up everything, we need to handle it separately since it has CMD_WANT_SKB, so it's not going to automatically return success when in rfkill.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +1 -1
@@ -2236,7 +2236,7 @@ int iwl_mvm_flush_sta_tids(struct iwl_mvm *mvm, u32 sta_id, u16 tids)WARN_ON (!iwl_mvm_has_new_tx_api (mvm));if (iwl_fw_lookup_notif_ver (mvm->fw,LONG_GROUP ,TXPATH_FLUSH ,0 ) >0 ) - cmd.flags |=CMD_WANT_SKB ; + cmd.flags |=CMD_WANT_SKB |CMD_SEND_IN_RFKILL ;IWL_DEBUG_TX_QUEUES (mvm,"flush for sta id %d tid mask 0x%x\n" , sta_id, tids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 201/583 wifi: iwlwifi: fix out of bound copy_from_user
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anjaneyulu <[email protected]>
[ Upstream commit cb2dfacb197bed0241fbb4f84bd0995a47f4465e ]
The driver copies the userspace buffer into an internal NUL byte terminated buffer. While doing so, it was reading beyond the end of the userspace buffer, overwriting its own NUL termination in the process.
Fix this by only copying the correct number of bytes.
--- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +1 -1
@@ -1673,7 +1673,7 @@ static ssize_t _iwl_dbgfs_link_sta_##name##_write(struct file *file, \char buf[buflen] = {}; \size_t buf_size =min (count,sizeof (buf) -1 ); \ \ -if (copy_from_user (buf, user_buf,sizeof (buf))) \ +if (copy_from_user (buf, user_buf, buf_size)) \return -EFAULT ; \ \ return _iwl_dbgfs_link_sta_wrap_write(iwl_dbgfs_##name##_write, \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 202/583 wifi: iwlwifi: assign phy_ctxt before eSR activation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 9b6614e5ead5d19a71893bcca3f1a6569ca0c456 ]
eSR is activated when a chanctx is assigned to more than one link. During eSR activation we should disable RLC for both phys, and configure the FW with a special phy command for both phys.
Currently we assign the phy_ctxt to the link only after eSR activation, so RLC is not disabled for the new phy_ctxt, and a cmd is not sent to FW. Fix this by first assigning the new phy_ctxt to the link and then doing the eSR activation.
--- drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +3 -3
@@ -269,17 +269,17 @@ __iwl_mvm_mld_assign_vif_chanctx(struct iwl_mvm *mvm, } } + mvmvif->link[link_id]->phy_ctxt = phy_ctxt; +if (iwl_mvm_is_esr_supported (mvm->fwrt.trans) && n_active >1 ) { mvmvif->link[link_id]->listen_lmac = true; ret =iwl_mvm_esr_mode_active (mvm, vif);if (ret) {IWL_ERR (mvm,"failed to activate ESR mode (%d)\n" , ret); -return ret; + goto out; } } - mvmvif->link[link_id]->phy_ctxt = phy_ctxt; -if (switching_chanctx) {/* reactivate if we turned this off during channel switch */ if (vif->type ==NL80211_IFTYPE_AP )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 203/583 netfilter: nf_tables: mark newset as dead on transaction abort
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 08e4c8c5919fd405a4d709b4ba43d836894a26eb ]
If a transaction is aborted, we should mark the to-be-released NEWSET dead, just like commit path does for DEL and DESTROYSET commands.
In both cases all remaining elements will be released via set->ops->destroy().
The existing abort code does NOT post the actual release to the work queue. Also the entire __nf_tables_abort() function is wrapped in gc_seq begin/end pair.
Therefore, async gc worker will never try to release the pending set elements, as gc sequence is always stale.
It might be possible to speed up transaction aborts via work queue too, this would result in a race and a possible use-after-free.
So fix this before it becomes an issue.
--- net/netfilter/nf_tables_api.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_tables_api.c +1 -0
@@ -10345,6 +10345,7 @@ static int __nf_tables_abort(struct net *net, enum nfnl_abort_action action)nft_trans_destroy (trans);break ; } +nft_trans_set (trans)->dead =1 ;list_del_rcu (&nft_trans_set (trans)->list);break ;case NFT_MSG_DELSET :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 204/583 netfilter: nf_tables: validate chain type update if available
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit aaba7ddc8507f4ad5bbd07988573967632bc2385 ]
Parse netlink attribute containing the chain type in this update, to bail out if this is different from the existing type.
Otherwise, it is possible to define a chain with the same name, hook and priority but different type, which is silently ignored.
--- net/netfilter/nf_tables_api.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +10 -1
@@ -2263,7 +2263,16 @@ static int nft_chain_parse_hook(struct net *net,return -EOPNOTSUPP ; } - type = basechain->type; +if (nla[NFTA_CHAIN_TYPE ]) { + type =__nf_tables_chain_type_lookup (nla[NFTA_CHAIN_TYPE ], + family); +if (!type) { +NL_SET_BAD_ATTR (extack, nla[NFTA_CHAIN_TYPE ]); +return -ENOENT ; + } + }else { + type = basechain->type; + } }if (!try_module_get (type->owner)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 205/583 Bluetooth: Fix bogus check for re-auth no supported with non-ssp
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit d03376c185926098cb4d668d6458801eb785c0a5 ]
This reverts 19f8def031bfa50c579149b200bfeeb919727b27 "Bluetooth: Fix auth_complete_evt for legacy units" which seems to be working around a bug on a broken controller rather then any limitation imposed by the Bluetooth spec, in fact if there ws not possible to re-auth the command shall fail not succeed.
--- include/net/bluetooth/hci_core.h | 1 - net/bluetooth/hci_conn.c | 8 +++----- net/bluetooth/hci_event.c | 11 ++--------- 3 files changed, 5 insertions(+), 15 deletions(-)
include/net/bluetooth/hci_core.h +0 -1
@@ -957,7 +957,6 @@ void hci_inquiry_cache_flush(struct hci_dev *hdev);/* ----- HCI Connections ----- */ enum {HCI_CONN_AUTH_PEND , -HCI_CONN_REAUTH_PEND ,HCI_CONN_ENCRYPT_PEND ,HCI_CONN_RSWITCH_PEND ,HCI_CONN_MODE_CHANGE_PEND ,
net/bluetooth/hci_conn.c +3 -5
@@ -2380,12 +2380,10 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)hci_send_cmd (conn->hdev,HCI_OP_AUTH_REQUESTED ,sizeof (cp), &cp); -/* If we're already encrypted set the REAUTH_PEND flag, -* otherwise set the ENCRYPT_PEND. +/* Set the ENCRYPT_PEND to trigger encryption after +* authentication. */ -if (test_bit (HCI_CONN_ENCRYPT , &conn->flags)) -set_bit (HCI_CONN_REAUTH_PEND , &conn->flags); -else +if (!test_bit (HCI_CONN_ENCRYPT , &conn->flags))set_bit (HCI_CONN_ENCRYPT_PEND , &conn->flags); }
net/bluetooth/hci_event.c +2 -9
@@ -3500,14 +3500,8 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, void *data,if (!ev->status) {clear_bit (HCI_CONN_AUTH_FAILURE , &conn->flags); - -if (!hci_conn_ssp_enabled (conn) && -test_bit (HCI_CONN_REAUTH_PEND , &conn->flags)) { -bt_dev_info (hdev,"re-auth of legacy device is not possible." ); - }else { -set_bit (HCI_CONN_AUTH , &conn->flags); - conn->sec_level = conn->pending_sec_level; - } +set_bit (HCI_CONN_AUTH , &conn->flags); + conn->sec_level = conn->pending_sec_level; }else {if (ev->status ==HCI_ERROR_PIN_OR_KEY_MISSING )set_bit (HCI_CONN_AUTH_FAILURE , &conn->flags);
@@ -3516,7 +3510,6 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, void *data, }clear_bit (HCI_CONN_AUTH_PEND , &conn->flags); -clear_bit (HCI_CONN_REAUTH_PEND , &conn->flags);if (conn->state ==BT_CONFIG ) {if (!ev->status &&hci_conn_ssp_enabled (conn)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 206/583 Bluetooth: btnxpuart: fix recv_buf() return value
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francesco Dolcini <[email protected]>
[ Upstream commit 94d05394254401e503867c16aff561d3e687dfdc ]
Serdev recv_buf() callback is supposed to return the amount of bytes consumed, therefore an int in between 0 and count.
Do not return a negative number in case of issue, just print an error and return count. Before this change, in case of error, the returned negative number was internally converted to 0 in ttyport_receive_buf, now when the receive buffer is corrupted we return the size of the whole received data (count). This should allow for better recovery in case receiver/transmitter get out of sync if some data is lost.
This fixes a WARN in ttyport_receive_buf().
Bluetooth: hci0: Frame reassembly failed (-84)
------------[ cut here ]------------ serial serial0: receive_buf returns -84 (count = 6) WARNING: CPU: 0 PID: 37 at drivers/tty/serdev/serdev-ttyport.c:37 ttyport_receive_buf+0xd8/0xf8 Modules linked in: mwifiex_sdio(+) ... CPU: 0 PID: 37 Comm: kworker/u4:2 Not tainted 6.7.0-rc2-00147-gf1a09972a45a #1 Hardware name: Toradex Verdin AM62 WB on Verdin Development Board (DT) Workqueue: events_unbound flush_to_ldisc pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : ttyport_receive_buf+0xd8/0xf8 lr : ttyport_receive_buf+0xd8/0xf8 ... Call trace: ttyport_receive_buf+0xd8/0xf8 flush_to_ldisc+0xbc/0x1a4 process_scheduled_works+0x16c/0x28c
--- drivers/bluetooth/btnxpuart.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/bluetooth/btnxpuart.c +3 -4
@@ -1276,11 +1276,10 @@ static int btnxpuart_receive_buf(struct serdev_device *serdev, const u8 *data,if (IS_ERR (nxpdev->rx_skb)) {int err =PTR_ERR (nxpdev->rx_skb);/* Safe to ignore out-of-sync bootloader signatures */ -if (is_fw_downloading (nxpdev)) -return count; -bt_dev_err (nxpdev->hdev,"Frame reassembly failed (%d)" , err); +if (!is_fw_downloading (nxpdev)) +bt_dev_err (nxpdev->hdev,"Frame reassembly failed (%d)" , err); nxpdev->rx_skb =NULL ; -return err; +return count; }if (!is_fw_downloading (nxpdev)) nxpdev->hdev->stat.byte_rx += count;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 207/583 Bluetooth: btmtkuart: fix recv_buf() return value
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francesco Dolcini <[email protected]>
[ Upstream commit 64057f051f20c2a2184b9db7f8037d928d68a4f4 ]
Serdev recv_buf() callback is supposed to return the amount of bytes consumed, therefore an int in between 0 and count.
Do not return negative number in case of issue, just print an error and return count. This fixes a WARN in ttyport_receive_buf().
--- drivers/bluetooth/btmtkuart.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/bluetooth/btmtkuart.c +3 -8
@@ -336,7 +336,7 @@ mtk_stp_split(struct btmtkuart_dev *bdev, const unsigned char *data, int count,return data; } -static int btmtkuart_recv (struct hci_dev *hdev,const u8 *data,size_t count) +static void btmtkuart_recv (struct hci_dev *hdev,const u8 *data,size_t count) {struct btmtkuart_dev *bdev =hci_get_drvdata (hdev);const unsigned char *p_left = data, *p_h4;
@@ -375,25 +375,20 @@ static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)bt_dev_err (bdev->hdev,"Frame reassembly failed (%d)" , err); bdev->rx_skb =NULL ; -return err; +return ; } sz_left -= sz_h4; p_left += sz_h4; } - -return 0 ; }static int btmtkuart_receive_buf (struct serdev_device *serdev,const u8 *data,size_t count) {struct btmtkuart_dev *bdev =serdev_device_get_drvdata (serdev); -int err; - err =btmtkuart_recv (bdev->hdev, data, count); -if (err <0 ) -return err; +btmtkuart_recv (bdev->hdev, data, count); bdev->hdev->stat.byte_rx += count;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 208/583 null_blk: dont cap max_hw_sectors to BLK_DEF_MAX_SECTORS
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 9a9525de865410047fa962867b4fcd33943b206f ]
null_blk has some rather odd capping of the max_hw_sectors value to BLK_DEF_MAX_SECTORS, which doesn't make sense - max_hw_sector is the hardware limit, and BLK_DEF_MAX_SECTORS despite the confusing name is the default cap for the max_sectors field used for normal file system I/O.
Remove all the capping, and simply leave it to the block layer or user to take up or not all of that for file system I/O.
--- drivers/block/null_blk/main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/block/null_blk/main.c +2 -10
@@ -2165,10 +2165,8 @@ static int null_add_dev(struct nullb_device *dev)blk_queue_logical_block_size (nullb->q, dev->blocksize);blk_queue_physical_block_size (nullb->q, dev->blocksize); -if (!dev->max_sectors) - dev->max_sectors =queue_max_hw_sectors (nullb->q); - dev->max_sectors =min (dev->max_sectors,BLK_DEF_MAX_SECTORS ); -blk_queue_max_hw_sectors (nullb->q, dev->max_sectors); +if (dev->max_sectors) +blk_queue_max_hw_sectors (nullb->q, dev->max_sectors);if (dev->virt_boundary)blk_queue_virt_boundary (nullb->q,PAGE_SIZE -1 );
@@ -2268,12 +2266,6 @@ static int __init null_init(void) g_bs =PAGE_SIZE ; } -if (g_max_sectors >BLK_DEF_MAX_SECTORS ) { -pr_warn ("invalid max sectors\n" ); -pr_warn ("defaults max sectors to %u\n" ,BLK_DEF_MAX_SECTORS ); - g_max_sectors =BLK_DEF_MAX_SECTORS ; - } -if (g_home_node !=NUMA_NO_NODE && g_home_node >= nr_online_nodes) {pr_err ("invalid home_node value\n" ); g_home_node =NUMA_NO_NODE ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 209/583 arm64: dts: rockchip: Fix led pinctrl of lubancat 1
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit 8586a5d217ef7bfeee24943c600a8a7890d6f477 ]
According to the schematics, the gpio control sys_led is GPIO0_C5.
--- arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts +1 -1
@@ -455,7 +455,7 @@ &pcie2x1 { &pinctrl { leds { sys_led_pin: sys-status-led-pin { - rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 210/583 wifi: cfg80211: correct comment about MLD ID
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit 2a0698f86d4dfc43cc0c1703efb7ba6b1506a4e2 ]
The comment was referencing the wrong section of the documentation and was also subtly wrong as it assumed the rules that apply when sending probe requests directly to a nontransmitted AP. However, in that case the response comes from the transmitting AP and the AP MLD ID will be included.
--- net/wireless/scan.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/wireless/scan.c +5 -2
@@ -2625,8 +2625,11 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,/* MLD capabilities and operations */ pos +=2 ; -/* Not included when the (nontransmitted) AP is responding itself, -* but defined to zero then (Draft P802.11be_D3.0, 9.4.2.170.2) +/* +* The MLD ID of the reporting AP is always zero. It is set if the AP +* is part of an MBSSID set and will be non-zero for ML Elements +* relating to a nontransmitted BSS (matching the Multi-BSSID Index, +* Draft P802.11be_D3.2, 35.3.4.2) */ if (u16_get_bits (control,IEEE80211_MLC_BASIC_PRES_MLD_ID )) { mld_id = *pos;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 211/583 wifi: cfg80211: parse all ML elements in an ML probe response
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit d18125b640309e925441ce49559be33867ae6b29 ]
A probe response from a transmitting AP in an Multi-BSSID setup will contain more than one Multi-Link element. Most likely, only one of these elements contains per-STA profiles.
--- net/wireless/scan.c | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-)
net/wireless/scan.c +26 -14
@@ -2569,10 +2569,12 @@ cfg80211_tbtt_info_for_mld_ap(const u8 *ie, size_t ielen, u8 mld_id, u8 link_id,return false; } -static void cfg80211_parse_ml_sta_data (struct wiphy *wiphy, -struct cfg80211_inform_single_bss_data *tx_data, -struct cfg80211_bss *source_bss, -gfp_t gfp) +static void +cfg80211_parse_ml_elem_sta_data (struct wiphy *wiphy, +struct cfg80211_inform_single_bss_data *tx_data, +struct cfg80211_bss *source_bss, +const struct element *elem, +gfp_t gfp) {struct cfg80211_inform_single_bss_data data = { .drv_data = tx_data->drv_data,
@@ -2581,7 +2583,6 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy, .bss_source = BSS_SOURCE_STA_PROFILE, };struct ieee80211_multi_link_elem *ml_elem; -const struct element *elem;struct cfg80211_mle *mle;u16 control;u8 *new_ie;
@@ -2591,15 +2592,7 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,const u8 *pos;u8 i; -if (!source_bss) -return ; - -if (tx_data->ftype !=CFG80211_BSS_FTYPE_PRESP ) -return ; - - elem =cfg80211_find_ext_elem (WLAN_EID_EXT_EHT_MULTI_LINK , - tx_data->ie, tx_data->ielen); -if (!elem || !ieee80211_mle_size_ok (elem->data +1 , elem->datalen -1 )) +if (!ieee80211_mle_size_ok (elem->data +1 , elem->datalen -1 ))return ; ml_elem = (void *)elem->data +1 ;
@@ -2734,6 +2727,25 @@ static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy,kfree (mle); } +static void cfg80211_parse_ml_sta_data (struct wiphy *wiphy, +struct cfg80211_inform_single_bss_data *tx_data, +struct cfg80211_bss *source_bss, +gfp_t gfp) +{ +const struct element *elem; + +if (!source_bss) +return ; + +if (tx_data->ftype !=CFG80211_BSS_FTYPE_PRESP ) +return ; + +for_each_element_extid (elem,WLAN_EID_EXT_EHT_MULTI_LINK , + tx_data->ie, tx_data->ielen) +cfg80211_parse_ml_elem_sta_data (wiphy, tx_data, source_bss, + elem, gfp); +} +struct cfg80211_bss * cfg80211_inform_bss_data(struct wiphy *wiphy, struct cfg80211_inform_bss *data,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 212/583 bpf: sockmap, fix proto update hook to avoid dup calls
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Fastabend <[email protected]>
[ Upstream commit 16b2f264983dc264c1560cc0170e760dec1bf54f ]
When sockets are added to a sockmap or sockhash we allocate and init a psock. Then update the proto ops with sock_map_init_proto the flow is
sock_hash_update_common
sock_map_link
psock = sock_map_psock_get_checked() <-returns existing psock
sock_map_init_proto(sk, psock) <- updates sk_proto
If the socket is already in a map this results in the sock_map_init_proto being called multiple times on the same socket. We do this because when a socket is added to multiple maps this might result in a new set of BPF programs being attached to the socket requiring an updated ops struct.
This creates a rule where it must be safe to call psock_update_sk_prot multiple times. When we added a fix for UAF through unix sockets in patch 4dd9a38a753fc we broke this rule by adding a sock_hold in that path to ensure the sock is not released. The result is if a af_unix stream sock is placed in multiple maps it results in a memory leak because we call sock_hold multiple times with only a single sock_put on it.
--- net/unix/unix_bpf.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
net/unix/unix_bpf.c +18 -3
@@ -161,15 +161,30 @@ int unix_stream_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool r {struct sock *sk_pair; +/* Restore does not decrement the sk_pair reference yet because we must +* keep the a reference to the socket until after an RCU grace period +* and any pending sends have completed. +*/ if (restore) { sk->sk_write_space = psock->saved_write_space;sock_replace_proto (sk, psock->sk_proto);return 0 ; } - sk_pair =unix_peer (sk); -sock_hold (sk_pair); - psock->sk_pair = sk_pair; +/* psock_update_sk_prot can be called multiple times if psock is +* added to multiple maps and/or slots in the same map. There is +* also an edge case where replacing a psock with itself can trigger +* an extra psock_update_sk_prot during the insert process. So it +* must be safe to do multiple calls. Here we need to ensure we don't +* increment the refcnt through sock_hold many times. There will only +* be a single matching destroy operation. +*/ +if (!psock->sk_pair) { + sk_pair =unix_peer (sk); +sock_hold (sk_pair); + psock->sk_pair = sk_pair; + } +unix_stream_bpf_check_needs_rebuild (psock->sk_proto);sock_replace_proto (sk, &unix_stream_bpf_prot);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 213/583 sctp: support MSG_ERRQUEUE flag in recvmsg()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 4746b36b1abe11ca32987b2d21e1e770deab17cc ]
For some reason sctp_poll() generates EPOLLERR if sk->sk_error_queue is not empty but recvmsg() can not drain the error queue yet.
This is needed to better support timestamping.
I had to export inet_recv_error(), since sctp
can be compiled as a module.
Stable-dep-of: a562c0a2d651 ("sctp: fix busy polling")
--- net/ipv4/af_inet.c | 1 + net/sctp/socket.c | 3 +++ 2 files changed, 4 insertions(+)
net/ipv4/af_inet.c +1 -0
@@ -1632,6 +1632,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)#endif return -EINVAL ; } +EXPORT_SYMBOL (inet_recv_error);int inet_gro_complete (struct sk_buff *skb,int nhoff) {
net/sctp/socket.c +3 -0
@@ -2099,6 +2099,9 @@ static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,pr_debug ("%s: sk:%p, msghdr:%p, len:%zd, flags:0x%x, addr_len:%p)\n" , __func__, sk, msg, len, flags, addr_len); +if (unlikely (flags &MSG_ERRQUEUE )) +return inet_recv_error (sk, msg, len, addr_len); +lock_sock (sk); if (sctp_style(sk, TCP) && !sctp_sstate(sk, ESTABLISHED) &&
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 214/583 sctp: fix busy polling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit a562c0a2d651e040681b0bfce9b4d229ac3b0b8c ]
Busy polling while holding the socket lock makes litle sense, because incoming packets wont reach our receive queue.
--- net/sctp/socket.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
net/sctp/socket.c +4 -6
@@ -2102,6 +2102,10 @@ static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,if (unlikely (flags &MSG_ERRQUEUE ))return inet_recv_error (sk, msg, len, addr_len); +if (sk_can_busy_loop (sk) && +skb_queue_empty_lockless (&sk->sk_receive_queue)) +sk_busy_loop (sk, flags &MSG_DONTWAIT ); +lock_sock (sk); if (sctp_style(sk, TCP) && !sctp_sstate(sk, ESTABLISHED) &&
@@ -9046,12 +9050,6 @@ struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags, int *err)if (sk->sk_shutdown &RCV_SHUTDOWN )break ; -if (sk_can_busy_loop (sk)) { -sk_busy_loop (sk, flags &MSG_DONTWAIT ); - -if (!skb_queue_empty_lockless (&sk->sk_receive_queue)) -continue ; - }/* User doesn't want to wait. */ error = -EAGAIN ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 215/583 blk-cgroup: fix rcu lockdep warning in blkg_lookup()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 393cd8ffd832f23eec3a105553eff622e8198918 ]
blkg_lookup() is called with either queue_lock or rcu read lock, so use rcu_dereference_check(lockdep_is_held(&q->queue_lock)) for retrieving 'blkg', which way models the check exactly for covering queue lock or rcu read lock.
Fix lockdep warning of "block/blk-cgroup.h:254 suspicious rcu_dereference_check() usage!" from blkg_lookup().
--- block/blk-cgroup.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/blk-cgroup.h +2 -1
@@ -252,7 +252,8 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg,if (blkcg == &blkcg_root)return q->root_blkg; - blkg =rcu_dereference (blkcg->blkg_hint); + blkg =rcu_dereference_check (blkcg->blkg_hint, +lockdep_is_held (&q->queue_lock));if (blkg && blkg->q == q)return blkg;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 216/583 net/sched: act_ct: fix skb leak and crash on ooo frags
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tao Liu <[email protected]>
[ Upstream commit 3f14b377d01d8357eba032b4cabc8c1149b458b6 ]
act_ct adds skb->users before defragmentation. If frags arrive in order, the last frag's reference is reset in:
inet_frag_reasm_prepare
skb_morph
which is not straightforward.
However when frags arrive out of order, nobody unref the last frag, and all frags are leaked. The situation is even worse, as initiating packet capture can lead to a crash[0] when skb has been cloned and shared at the same time.
Fix the issue by removing skb_get() before defragmentation. act_ct returns TC_ACT_CONSUMED when defrag failed or in progress.
[0]:
[ 843.804823] ------------[ cut here ]------------ [ 843.809659] kernel BUG at net/core/skbuff.c:2091! [ 843.814516] invalid opcode: 0000 [#1] PREEMPT SMP [ 843.819296] CPU: 7 PID: 0 Comm: swapper/7 Kdump: loaded Tainted: G S 6.7.0-rc3 #2 [ 843.824107] Hardware name: XFUSION 1288H V6/BC13MBSBD, BIOS 1.29 11/25/2022 [ 843.828953] RIP: 0010:pskb_expand_head+0x2ac/0x300 [ 843.833805] Code: 8b 70 28 48 85 f6 74 82 48 83 c6 08 bf 01 00 00 00 e8 38 bd ff ff 8b 83 c0 00 00 00 48 03 83 c8 00 00 00 e9 62 ff ff ff 0f 0b <0f> 0b e8 8d d0 ff ff e9 b3 fd ff ff 81 7c 24 14 40 01 00 00 4c 89 [ 843.843698] RSP: 0018:ffffc9000cce07c0 EFLAGS: 00010202 [ 843.848524] RAX: 0000000000000002 RBX: ffff88811a211d00 RCX: 0000000000000820 [ 843.853299] RDX: 0000000000000640 RSI: 0000000000000000 RDI: ffff88811a211d00 [ 843.857974] RBP: ffff888127d39518 R08: 00000000bee97314 R09: 0000000000000000 [ 843.862584] R10: 0000000000000000 R11: ffff8881109f0000 R12: 0000000000000880 [ 843.867147] R13: ffff888127d39580 R14: 0000000000000640 R15: ffff888170f7b900 [ 843.871680] FS: 0000000000000000(0000) GS:ffff889ffffc0000(0000) knlGS:0000000000000000 [ 843.876242] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 843.880778] CR2: 00007fa42affcfb8 CR3: 000000011433a002 CR4: 0000000000770ef0 [ 843.885336] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 843.889809] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 843.894229] PKRU: 55555554 [ 843.898539] Call Trace: [ 843.902772] <IRQ> [ 843.906922] ? __die_body+0x1e/0x60 [ 843.911032] ? die+0x3c/0x60 [ 843.915037] ? do_trap+0xe2/0x110 [ 843.918911] ? pskb_expand_head+0x2ac/0x300 [ 843.922687] ? do_error_trap+0x65/0x80 [ 843.926342] ? pskb_expand_head+0x2ac/0x300 [ 843.929905] ? exc_invalid_op+0x50/0x60 [ 843.933398] ? pskb_expand_head+0x2ac/0x300 [ 843.936835] ? asm_exc_invalid_op+0x1a/0x20 [ 843.940226] ? pskb_expand_head+0x2ac/0x300 [ 843.943580] inet_frag_reasm_prepare+0xd1/0x240 [ 843.946904] ip_defrag+0x5d4/0x870 [ 843.950132] nf_ct_handle_fragments+0xec/0x130 [nf_conntrack] [ 843.953334] tcf_ct_act+0x252/0xd90 [act_ct] [ 843.956473] ? tcf_mirred_act+0x516/0x5a0 [act_mirred] [ 843.959657] tcf_action_exec+0xa1/0x160 [ 843.962823] fl_classify+0x1db/0x1f0 [cls_flower] [ 843.966010] ? skb_clone+0x53/0xc0 [ 843.969173] tcf_classify+0x24d/0x420 [ 843.972333] tc_run+0x8f/0xf0 [ 843.975465] __netif_receive_skb_core+0x67a/0x1080 [ 843.978634] ? dev_gro_receive+0x249/0x730 [ 843.981759] __netif_receive_skb_list_core+0x12d/0x260 [ 843.984869] netif_receive_skb_list_internal+0x1cb/0x2f0 [ 843.987957] ? mlx5e_handle_rx_cqe_mpwrq_rep+0xfa/0x1a0 [mlx5_core] [ 843.991170] napi_complete_done+0x72/0x1a0 [ 843.994305] mlx5e_napi_poll+0x28c/0x6d0 [mlx5_core] [ 843.997501] __napi_poll+0x25/0x1b0 [ 844.000627] net_rx_action+0x256/0x330 [ 844.003705] __do_softirq+0xb3/0x29b [ 844.006718] irq_exit_rcu+0x9e/0xc0 [ 844.009672] common_interrupt+0x86/0xa0 [ 844.012537] </IRQ> [ 844.015285] <TASK> [ 844.017937] asm_common_interrupt+0x26/0x40 [ 844.020591] RIP: 0010:acpi_safe_halt+0x1b/0x20 [ 844.023247] Code: ff 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 65 48 8b 04 25 00 18 03 00 48 8b 00 a8 08 75 0c 66 90 0f 00 2d 81 d0 44 00 fb f4 <fa> c3 0f 1f 00 89 fa ec 48 8b 05 ee 88 ed 00 a9 00 00 00 80 75 11 [ 844.028900] RSP: 0018:ffffc90000533e70 EFLAGS: 00000246 [ 844.031725] RAX: 0000000000004000 RBX: 0000000000000001 RCX: 0000000000000000 [ 844.034553] RDX: ffff889ffffc0000 RSI: ffffffff828b7f20 RDI: ffff88a090f45c64 [ 844.037368] RBP: ffff88a0901a2800 R08: ffff88a090f45c00 R09: 00000000000317c0 [ 844.040155] R10: 00ec812281150475 R11: ffff889fffff0e04 R12: ffffffff828b7fa0 [ 844.042962] R13: ffffffff828b7f20 R14: 0000000000000001 R15: 0000000000000000 [ 844.045819] acpi_idle_enter+0x7b/0xc0 [ 844.048621] cpuidle_enter_state+0x7f/0x430 [ 844.051451] cpuidle_enter+0x2d/0x40 [ 844.054279] do_idle+0x1d4/0x240 [ 844.057096] cpu_startup_entry+0x2a/0x30 [ 844.059934] start_secondary+0x104/0x130 [ 844.062787] secondary_startup_64_no_verify+0x16b/0x16b [ 844.065674] </TASK>
--- net/sched/act_ct.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/sched/act_ct.c +6 -6
@@ -851,7 +851,6 @@ static int tcf_ct_handle_fragments(struct net *net, struct sk_buff *skb,if (err || !frag)return err; -skb_get (skb); err =nf_ct_handle_fragments (net, skb, zone, family, &proto, &mru);if (err)return err;
@@ -995,12 +994,8 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a, nh_ofs =skb_network_offset (skb);skb_pull_rcsum (skb, nh_ofs); err =tcf_ct_handle_fragments (net, skb, family, p->zone, &defrag); -if (err == -EINPROGRESS ) { - retval =TC_ACT_STOLEN ; - goto out_clear; - }if (err) - goto drop; + goto out_frag; err =nf_ct_skb_network_trim (skb, family);if (err)
@@ -1087,6 +1082,11 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,qdisc_skb_cb (skb)->pkt_len = skb->len;return retval; +out_frag: +if (err != -EINPROGRESS ) +tcf_action_inc_drop_qstats (&c->common); +return TC_ACT_CONSUMED ; + drop:tcf_action_inc_drop_qstats (&c->common);return TC_ACT_SHOT ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 217/583 mlxbf_gige: Fix intermittent no ip issue
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Asmaa Mnebhi <[email protected]>
[ Upstream commit ef210ef85d5cb543ce34a57803ed856d0c8c08c2 ]
Although the link is up, there is no ip assigned on setups with high background traffic. Nothing is transmitted nor received. The RX error count keeps on increasing. After several minutes, the RX error count stagnates and the GigE interface finally gets an ip.
The issue is that mlxbf_gige_rx_init() is called before phy_start(). As soon as the RX DMA is enabled in mlxbf_gige_rx_init(), the RX CI reaches the max of 128, and becomes equal to RX PI. RX CI doesn't decrease since the code hasn't ran phy_start yet.
Bring the PHY up before starting the RX.
--- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 14 +++++++------- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +7 -7
@@ -147,14 +147,14 @@ static int mlxbf_gige_open(struct net_device *netdev)*/ priv->valid_polarity =0 ; - err =mlxbf_gige_rx_init (priv); +phy_start (phydev); + + err =mlxbf_gige_tx_init (priv);if (err) goto free_irqs; - err =mlxbf_gige_tx_init (priv); + err =mlxbf_gige_rx_init (priv);if (err) - goto rx_deinit; - -phy_start (phydev); + goto tx_deinit;netif_napi_add (netdev, &priv->napi, mlxbf_gige_poll);napi_enable (&priv->napi);
@@ -176,8 +176,8 @@ static int mlxbf_gige_open(struct net_device *netdev)return 0 ; -rx_deinit: -mlxbf_gige_rx_deinit (priv); +tx_deinit: +mlxbf_gige_tx_deinit (priv); free_irqs:mlxbf_gige_free_irqs (priv);
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c +3 -3
@@ -142,6 +142,9 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv)writeq (MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS_EN , priv->base +MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS ); +writeq (ilog2 (priv->rx_q_entries), + priv->base +MLXBF_GIGE_RX_WQE_SIZE_LOG2 ); +/* Clear MLXBF_GIGE_INT_MASK 'receive pkt' bit to * indicate readiness to receive interrupts */
@@ -154,9 +157,6 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv) data |=MLXBF_GIGE_RX_DMA_EN ;writeq (data, priv->base +MLXBF_GIGE_RX_DMA ); -writeq (ilog2 (priv->rx_q_entries), - priv->base +MLXBF_GIGE_RX_WQE_SIZE_LOG2 ); -return 0 ; free_wqe_and_skb:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 218/583 mlxbf_gige: Enable the GigE port in mlxbf_gige_open
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Asmaa Mnebhi <[email protected]>
[ Upstream commit a460f4a684511e007bbf1700758a41f05d9981e6 ]
At the moment, the GigE port is enabled in the mlxbf_gige_probe function. If the mlxbf_gige_open is not executed, this could cause pause frames to increase in the case where there is high backgroud traffic. This results in clogging the port.
So move enabling the OOB port to mlxbf_gige_open.
--- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +6 -6
@@ -130,9 +130,15 @@ static int mlxbf_gige_open(struct net_device *netdev) {struct mlxbf_gige *priv =netdev_priv (netdev);struct phy_device *phydev = netdev->phydev; +u64 control;u64 int_en;int err; +/* Perform general init of GigE block */ + control =readq (priv->base +MLXBF_GIGE_CONTROL ); + control |=MLXBF_GIGE_CONTROL_PORT_EN ; +writeq (control, priv->base +MLXBF_GIGE_CONTROL ); + err =mlxbf_gige_request_irqs (priv);if (err)return err;
@@ -365,7 +371,6 @@ static int mlxbf_gige_probe(struct platform_device *pdev)void __iomem *plu_base;void __iomem *base;int addr, phy_irq; -u64 control;int err; base =devm_platform_ioremap_resource (pdev,MLXBF_GIGE_RES_MAC );
@@ -380,11 +385,6 @@ static int mlxbf_gige_probe(struct platform_device *pdev)if (IS_ERR (plu_base))return PTR_ERR (plu_base); -/* Perform general init of GigE block */ - control =readq (base +MLXBF_GIGE_CONTROL ); - control |=MLXBF_GIGE_CONTROL_PORT_EN ; -writeq (control, base +MLXBF_GIGE_CONTROL ); - netdev =devm_alloc_etherdev (&pdev->dev,sizeof (*priv));if (!netdev)return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 219/583 rxrpc: Fix skbuff cleanup of calls recvmsg_queue and rx_oos_queue
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 4fc68c4c1a114ba597b4f3b082f04622dfa0e0f6 ]
Fix rxrpc_cleanup_ring() to use rxrpc_purge_queue() rather than skb_queue_purge() so that the count of outstanding skbuffs is correctly updated when a failed call is cleaned up.
Without this rmmod may hang waiting for rxrpc_n_rx_skbs to become zero.
--- net/rxrpc/call_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/rxrpc/call_object.c +2 -2
@@ -545,8 +545,8 @@ void rxrpc_get_call(struct rxrpc_call *call, enum rxrpc_call_trace why)*/ static void rxrpc_cleanup_ring (struct rxrpc_call *call) { -skb_queue_purge (&call->recvmsg_queue); -skb_queue_purge (&call->rx_oos_queue); +rxrpc_purge_queue (&call->recvmsg_queue); +rxrpc_purge_queue (&call->rx_oos_queue); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 220/583 ip6_tunnel: fix NEXTHDR_FRAGMENT handling in ip6_tnl_parse_tlv_enc_lim()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d375b98e0248980681e5e56b712026174d617198 ]
syzbot pointed out [1] that NEXTHDR_FRAGMENT handling is broken.
Reading frag_off can only be done if we pulled enough bytes to skb->head. Currently we might access garbage.
[1]
BUG: KMSAN: uninit-value in ip6_tnl_parse_tlv_enc_lim+0x94f/0xbb0 ip6_tnl_parse_tlv_enc_lim+0x94f/0xbb0 ipxip6_tnl_xmit net/ipv6/ip6_tunnel.c:1326 [inline] ip6_tnl_start_xmit+0xab2/0x1a70 net/ipv6/ip6_tunnel.c:1432 __netdev_start_xmit include/linux/netdevice.h:4940 [inline] netdev_start_xmit include/linux/netdevice.h:4954 [inline] xmit_one net/core/dev.c:3548 [inline] dev_hard_start_xmit+0x247/0xa10 net/core/dev.c:3564 __dev_queue_xmit+0x33b8/0x5130 net/core/dev.c:4349 dev_queue_xmit include/linux/netdevice.h:3134 [inline] neigh_connected_output+0x569/0x660 net/core/neighbour.c:1592 neigh_output include/net/neighbour.h:542 [inline] ip6_finish_output2+0x23a9/0x2b30 net/ipv6/ip6_output.c:137 ip6_finish_output+0x855/0x12b0 net/ipv6/ip6_output.c:222 NF_HOOK_COND include/linux/netfilter.h:303 [inline] ip6_output+0x323/0x610 net/ipv6/ip6_output.c:243 dst_output include/net/dst.h:451 [inline] ip6_local_out+0xe9/0x140 net/ipv6/output_core.c:155 ip6_send_skb net/ipv6/ip6_output.c:1952 [inline] ip6_push_pending_frames+0x1f9/0x560 net/ipv6/ip6_output.c:1972 rawv6_push_pending_frames+0xbe8/0xdf0 net/ipv6/raw.c:582 rawv6_sendmsg+0x2b66/0x2e70 net/ipv6/raw.c:920 inet_sendmsg+0x105/0x190 net/ipv4/af_inet.c:847 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg net/socket.c:745 [inline] ____sys_sendmsg+0x9c2/0xd60 net/socket.c:2584 ___sys_sendmsg+0x28d/0x3c0 net/socket.c:2638 __sys_sendmsg net/socket.c:2667 [inline] __do_sys_sendmsg net/socket.c:2676 [inline] __se_sys_sendmsg net/socket.c:2674 [inline] __x64_sys_sendmsg+0x307/0x490 net/socket.c:2674 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x44/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b
Uninit was created at:
slab_post_alloc_hook+0x129/0xa70 mm/slab.h:768 slab_alloc_node mm/slub.c:3478 [inline] __kmem_cache_alloc_node+0x5c9/0x970 mm/slub.c:3517 __do_kmalloc_node mm/slab_common.c:1006 [inline] __kmalloc_node_track_caller+0x118/0x3c0 mm/slab_common.c:1027 kmalloc_reserve+0x249/0x4a0 net/core/skbuff.c:582 pskb_expand_head+0x226/0x1a00 net/core/skbuff.c:2098 __pskb_pull_tail+0x13b/0x2310 net/core/skbuff.c:2655 pskb_may_pull_reason include/linux/skbuff.h:2673 [inline] pskb_may_pull include/linux/skbuff.h:2681 [inline] ip6_tnl_parse_tlv_enc_lim+0x901/0xbb0 net/ipv6/ip6_tunnel.c:408 ipxip6_tnl_xmit net/ipv6/ip6_tunnel.c:1326 [inline] ip6_tnl_start_xmit+0xab2/0x1a70 net/ipv6/ip6_tunnel.c:1432 __netdev_start_xmit include/linux/netdevice.h:4940 [inline] netdev_start_xmit include/linux/netdevice.h:4954 [inline] xmit_one net/core/dev.c:3548 [inline] dev_hard_start_xmit+0x247/0xa10 net/core/dev.c:3564 __dev_queue_xmit+0x33b8/0x5130 net/core/dev.c:4349 dev_queue_xmit include/linux/netdevice.h:3134 [inline] neigh_connected_output+0x569/0x660 net/core/neighbour.c:1592 neigh_output include/net/neighbour.h:542 [inline] ip6_finish_output2+0x23a9/0x2b30 net/ipv6/ip6_output.c:137 ip6_finish_output+0x855/0x12b0 net/ipv6/ip6_output.c:222 NF_HOOK_COND include/linux/netfilter.h:303 [inline] ip6_output+0x323/0x610 net/ipv6/ip6_output.c:243 dst_output include/net/dst.h:451 [inline] ip6_local_out+0xe9/0x140 net/ipv6/output_core.c:155 ip6_send_skb net/ipv6/ip6_output.c:1952 [inline] ip6_push_pending_frames+0x1f9/0x560 net/ipv6/ip6_output.c:1972 rawv6_push_pending_frames+0xbe8/0xdf0 net/ipv6/raw.c:582 rawv6_sendmsg+0x2b66/0x2e70 net/ipv6/raw.c:920 inet_sendmsg+0x105/0x190 net/ipv4/af_inet.c:847 sock_sendmsg_nosec net/socket.c:730 [inline] __sock_sendmsg net/socket.c:745 [inline] ____sys_sendmsg+0x9c2/0xd60 net/socket.c:2584 ___sys_sendmsg+0x28d/0x3c0 net/socket.c:2638 __sys_sendmsg net/socket.c:2667 [inline] __do_sys_sendmsg net/socket.c:2676 [inline] __se_sys_sendmsg net/socket.c:2674 [inline] __x64_sys_sendmsg+0x307/0x490 net/socket.c:2674 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0x44/0x110 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x63/0x6b CPU: 0 PID: 7345 Comm: syz-executor.3 Not tainted 6.7.0-rc8-syzkaller-00024-gac865f00af29 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 11/17/2023
--- net/ipv6/ip6_tunnel.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
net/ipv6/ip6_tunnel.c +13 -13
@@ -399,7 +399,7 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw)const struct ipv6hdr *ipv6h = (const struct ipv6hdr *)raw;unsigned int nhoff = raw - skb->data;unsigned int off = nhoff +sizeof (*ipv6h); -u8 next, nexthdr = ipv6h->nexthdr; +u8 nexthdr = ipv6h->nexthdr;while (ipv6_ext_hdr (nexthdr) && nexthdr !=NEXTHDR_NONE ) {struct ipv6_opt_hdr *hdr;
@@ -410,25 +410,25 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw) hdr = (struct ipv6_opt_hdr *)(skb->data + off);if (nexthdr ==NEXTHDR_FRAGMENT ) { -struct frag_hdr *frag_hdr = (struct frag_hdr *) hdr; -if (frag_hdr->frag_off) -break ; optlen =8 ; }else if (nexthdr ==NEXTHDR_AUTH ) { optlen =ipv6_authlen (hdr); }else { optlen =ipv6_optlen (hdr); } -/* cache hdr->nexthdr, since pskb_may_pull() might -* invalidate hdr -*/ - next = hdr->nexthdr; -if (nexthdr ==NEXTHDR_DEST ) { -u16 i =2 ; -/* Remember : hdr is no longer valid at this point. */ -if (!pskb_may_pull (skb, off + optlen)) +if (!pskb_may_pull (skb, off + optlen)) +break ; + + hdr = (struct ipv6_opt_hdr *)(skb->data + off); +if (nexthdr ==NEXTHDR_FRAGMENT ) { +struct frag_hdr *frag_hdr = (struct frag_hdr *)hdr; + +if (frag_hdr->frag_off)break ; + } +if (nexthdr ==NEXTHDR_DEST ) { +u16 i =2 ;while (1 ) {struct ipv6_tlv_tnl_enc_lim *tel;
@@ -449,7 +449,7 @@ __u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw) i++; } } - nexthdr = next; + nexthdr = hdr->nexthdr; off += optlen; }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 221/583 ARM: davinci: always select CONFIG_CPU_ARM926T
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 40974ee421b4d1fc74ac733d86899ce1b83d8f65 ]
The select was lost by accident during the multiplatform conversion. Any davinci-only
arm-linux-gnueabi-ld: arch/arm/mach-davinci/sleep.o: in function `CACHE_FLUSH':
(.text+0x168): undefined reference to `arm926_flush_kern_cache_all'
--- arch/arm/mach-davinci/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-davinci/Kconfig +1 -0
@@ -4,6 +4,7 @@ menuconfig ARCH_DAVINCI bool "TI DaVinci" depends on ARCH_MULTI_V5 depends on CPU_LITTLE_ENDIAN + select CPU_ARM926T select DAVINCI_TIMER select ZONE_DMA select PM_GENERIC_DOMAINS if PM
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 222/583 Revert "drm/tidss: Annotate dma-fence critical section in commit path"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit ca34d816558c3e4c3f8fe037b5a6b16c944693de ]
This reverts commit 4d56a4f08391857ba93465de489707b66adad114.
The DMA-fence annotations cause a lockdep warning (see below). As per
https://patchwork.freedesktop.org/patch/462170/ it sounds like the annotations don't work correctly.
======================================================
WARNING: possible circular locking dependency detected
6.6.0-rc2+ #1 Not tainted
------------------------------------------------------
kmstest/733 is trying to acquire lock:ffff8000819377f0 (fs_reclaim){+.+.}-{0:0}, at: __kmem_cache_alloc_node+0x58/0x2d4
but task is already holding lock:ffff800081a06aa0 (dma_fence_map){++++}-{0:0}, at: tidss_atomic_commit_tail+0x20/0xc0 [tidss]
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (dma_fence_map){++++}-{0:0}:
__dma_fence_might_wait+0x5c/0xd0
dma_resv_lockdep+0x1a4/0x32c
do_one_initcall+0x84/0x2fc
kernel_init_freeable+0x28c/0x4c4
kernel_init+0x24/0x1dc
ret_from_fork+0x10/0x20-> #1 (mmu_notifier_invalidate_range_start){+.+.}-{0:0}:
fs_reclaim_acquire+0x70/0xe4
__kmem_cache_alloc_node+0x58/0x2d4
kmalloc_trace+0x38/0x78
__kthread_create_worker+0x3c/0x150
kthread_create_worker+0x64/0x8c
workqueue_init+0x1e8/0x2f0
kernel_init_freeable+0x11c/0x4c4
kernel_init+0x24/0x1dc
ret_from_fork+0x10/0x20-> #0 (fs_reclaim){+.+.}-{0:0}:
__lock_acquire+0x1370/0x20d8
lock_acquire+0x1e8/0x308
fs_reclaim_acquire+0xd0/0xe4
__kmem_cache_alloc_node+0x58/0x2d4
__kmalloc_node_track_caller+0x58/0xf0
kmemdup+0x34/0x60
regmap_bulk_write+0x64/0x2c0
tc358768_bridge_pre_enable+0x8c/0x12d0 [tc358768]
drm_atomic_bridge_call_pre_enable+0x68/0x80 [drm]
drm_atomic_bridge_chain_pre_enable+0x50/0x158 [drm]
drm_atomic_helper_commit_modeset_enables+0x164/0x264 [drm_kms_helper]
tidss_atomic_commit_tail+0x58/0xc0 [tidss]
commit_tail+0xa0/0x188 [drm_kms_helper]
drm_atomic_helper_commit+0x1a8/0x1c0 [drm_kms_helper]
drm_atomic_commit+0xa8/0xe0 [drm]
drm_mode_atomic_ioctl+0x9ec/0xc80 [drm]
drm_ioctl_kernel+0xc4/0x170 [drm]
drm_ioctl+0x234/0x4b0 [drm]
drm_compat_ioctl+0x110/0x12c [drm]
__arm64_compat_sys_ioctl+0x128/0x150
invoke_syscall+0x48/0x110
el0_svc_common.constprop.0+0x40/0xe0
do_el0_svc_compat+0x1c/0x38
el0_svc_compat+0x48/0xb4
el0t_32_sync_handler+0xb0/0x138
el0t_32_sync+0x194/0x198other info that might help us debug this:
Chain exists of: fs_reclaim --> mmu_notifier_invalidate_range_start --> dma_fence_map Possible unsafe locking scenario:
CPU0 CPU1
---- ----
rlock(dma_fence_map);
lock(mmu_notifier_invalidate_range_start);
lock(dma_fence_map); lock(fs_reclaim);
*** DEADLOCK ***
3 locks held by kmstest/733:
#0: ffff800082e5bba0 (crtc_ww_class_acquire){+.+.}-{0:0}, at: drm_mode_atomic_ioctl+0x118/0xc80 [drm] #1: ffff000004224c88 (crtc_ww_class_mutex){+.+.}-{3:3}, at: modeset_lock+0xdc/0x1a0 [drm] #2: ffff800081a06aa0 (dma_fence_map){++++}-{0:0}, at: tidss_atomic_commit_tail+0x20/0xc0 [tidss]
stack backtrace: CPU: 0 PID: 733 Comm: kmstest Not tainted 6.6.0-rc2+ #1 Hardware name: Toradex Verdin AM62 on Verdin Development Board (DT) Call trace: dump_backtrace+0x98/0x118 show_stack+0x18/0x24 dump_stack_lvl+0x60/0xac dump_stack+0x18/0x24 print_circular_bug+0x288/0x368 check_noncircular+0x168/0x17c __lock_acquire+0x1370/0x20d8 lock_acquire+0x1e8/0x308 fs_reclaim_acquire+0xd0/0xe4 __kmem_cache_alloc_node+0x58/0x2d4 __kmalloc_node_track_caller+0x58/0xf0 kmemdup+0x34/0x60 regmap_bulk_write+0x64/0x2c0 tc358768_bridge_pre_enable+0x8c/0x12d0 [tc358768] drm_atomic_bridge_call_pre_enable+0x68/0x80 [drm] drm_atomic_bridge_chain_pre_enable+0x50/0x158 [drm] drm_atomic_helper_commit_modeset_enables+0x164/0x264 [drm_kms_helper] tidss_atomic_commit_tail+0x58/0xc0 [tidss] commit_tail+0xa0/0x188 [drm_kms_helper] drm_atomic_helper_commit+0x1a8/0x1c0 [drm_kms_helper] drm_atomic_commit+0xa8/0xe0 [drm] drm_mode_atomic_ioctl+0x9ec/0xc80 [drm] drm_ioctl_kernel+0xc4/0x170 [drm] drm_ioctl+0x234/0x4b0 [drm] drm_compat_ioctl+0x110/0x12c [drm] __arm64_compat_sys_ioctl+0x128/0x150 invoke_syscall+0x48/0x110 el0_svc_common.constprop.0+0x40/0xe0 do_el0_svc_compat+0x1c/0x38 el0_svc_compat+0x48/0xb4 el0t_32_sync_handler+0xb0/0x138 el0t_32_sync+0x194/0x198
--- drivers/gpu/drm/tidss/tidss_kms.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/tidss/tidss_kms.c +0 -4
@@ -4,8 +4,6 @@* Author: Tomi Valkeinen <[email protected]> */ -#include <linux/dma-fence.h> -#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h>
@@ -25,7 +23,6 @@ static void tidss_atomic_commit_tail(struct drm_atomic_state *old_state) {struct drm_device *ddev = old_state->dev;struct tidss_device *tidss =to_tidss (ddev); -bool fence_cookie =dma_fence_begin_signalling ();dev_dbg (ddev->dev,"%s\n" , __func__);
@@ -36,7 +33,6 @@ static void tidss_atomic_commit_tail(struct drm_atomic_state *old_state)drm_atomic_helper_commit_modeset_enables (ddev, old_state);drm_atomic_helper_commit_hw_done (old_state); -dma_fence_end_signalling (fence_cookie);drm_atomic_helper_wait_for_flip_done (ddev, old_state);drm_atomic_helper_cleanup_planes (ddev, old_state);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 223/583 Revert "drm/omapdrm: Annotate dma-fence critical section in commit path"
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 9d7c8c066916f231ca0ed4e4fce6c4b58ca3e451 ]
This reverts commit 250aa22920cd5d956a5d3e9c6a43d671c2bae217.
The DMA-fence annotations cause a lockdep warning (see below). As per
https://patchwork.freedesktop.org/patch/462170/ it sounds like the annotations don't work correctly.
======================================================
WARNING: possible circular locking dependency detected 6.5.0-rc2+ #2 Not tainted
------------------------------------------------------
kmstest/219 is trying to acquire lock:c4705838 (&hdmi->lock){+.+.}-{3:3}, at: hdmi5_bridge_mode_set+0x1c/0x50
but task is already holding lock:c11e1128 (dma_fence_map){++++}-{0:0}, at: omap_atomic_commit_tail+0x14/0xbc
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (dma_fence_map){++++}-{0:0}:
__dma_fence_might_wait+0x48/0xb4
dma_resv_lockdep+0x1b8/0x2bc
do_one_initcall+0x68/0x3b0
kernel_init_freeable+0x260/0x34c
kernel_init+0x14/0x140
ret_from_fork+0x14/0x28-> #1 (fs_reclaim){+.+.}-{0:0}:
fs_reclaim_acquire+0x70/0xa8
__kmem_cache_alloc_node+0x3c/0x368
kmalloc_trace+0x28/0x58
_drm_do_get_edid+0x7c/0x35c
hdmi5_bridge_get_edid+0xc8/0x1ac
drm_bridge_connector_get_modes+0x64/0xc0
drm_helper_probe_single_connector_modes+0x170/0x528
drm_client_modeset_probe+0x208/0x1334
__drm_fb_helper_initial_config_and_unlock+0x30/0x548
omap_fbdev_client_hotplug+0x3c/0x6c
drm_client_register+0x58/0x94
pdev_probe+0x544/0x6b0
platform_probe+0x58/0xbc
really_probe+0xd8/0x3fc
__driver_probe_device+0x94/0x1f4
driver_probe_device+0x2c/0xc4
__device_attach_driver+0xa4/0x11c
bus_for_each_drv+0x84/0xdc
__device_attach+0xac/0x20c
bus_probe_device+0x8c/0x90
device_add+0x588/0x7e0
platform_device_add+0x110/0x24c
platform_device_register_full+0x108/0x15c
dss_bind+0x90/0xc0
try_to_bring_up_aggregate_device+0x1e0/0x2c8
__component_add+0xa4/0x174
hdmi5_probe+0x1c8/0x270
platform_probe+0x58/0xbc
really_probe+0xd8/0x3fc
__driver_probe_device+0x94/0x1f4
driver_probe_device+0x2c/0xc4
__device_attach_driver+0xa4/0x11c
bus_for_each_drv+0x84/0xdc
__device_attach+0xac/0x20c
bus_probe_device+0x8c/0x90
deferred_probe_work_func+0x8c/0xd8
process_one_work+0x2ac/0x6e4
worker_thread+0x30/0x4ec
kthread+0x100/0x124
ret_from_fork+0x14/0x28-> #0 (&hdmi->lock){+.+.}-{3:3}:
__lock_acquire+0x145c/0x29cc
lock_acquire.part.0+0xb4/0x258
__mutex_lock+0x90/0x950
mutex_lock_nested+0x1c/0x24
hdmi5_bridge_mode_set+0x1c/0x50
drm_bridge_chain_mode_set+0x48/0x5c
crtc_set_mode+0x188/0x1d0
omap_atomic_commit_tail+0x2c/0xbc
commit_tail+0x9c/0x188
drm_atomic_helper_commit+0x158/0x18c
drm_atomic_commit+0xa4/0xe8
drm_mode_atomic_ioctl+0x9a4/0xc38
drm_ioctl+0x210/0x4a8
sys_ioctl+0x138/0xf00
ret_fast_syscall+0x0/0x1cother info that might help us debug this:
Chain exists of: &hdmi->lock --> fs_reclaim --> dma_fence_map Possible unsafe locking scenario:
CPU0 CPU1
---- ----
rlock(dma_fence_map);
lock(fs_reclaim);
lock(dma_fence_map); lock(&hdmi->lock);
*** DEADLOCK ***
3 locks held by kmstest/219:
#0: f1011de4 (crtc_ww_class_acquire){+.+.}-{0:0}, at: drm_mode_atomic_ioctl+0xf0/0xc38 #1: c47059c8 (crtc_ww_class_mutex){+.+.}-{3:3}, at: modeset_lock+0xf8/0x230 #2: c11e1128 (dma_fence_map){++++}-{0:0}, at: omap_atomic_commit_tail+0x14/0xbc
stack backtrace: CPU: 1 PID: 219 Comm: kmstest Not tainted 6.5.0-rc2+ #2 Hardware name: Generic DRA74X (Flattened Device Tree) unwind_backtrace from show_stack+0x10/0x14 show_stack from dump_stack_lvl+0x58/0x70 dump_stack_lvl from check_noncircular+0x164/0x198 check_noncircular from __lock_acquire+0x145c/0x29cc __lock_acquire from lock_acquire.part.0+0xb4/0x258 lock_acquire.part.0 from __mutex_lock+0x90/0x950 __mutex_lock from mutex_lock_nested+0x1c/0x24 mutex_lock_nested from hdmi5_bridge_mode_set+0x1c/0x50 hdmi5_bridge_mode_set from drm_bridge_chain_mode_set+0x48/0x5c drm_bridge_chain_mode_set from crtc_set_mode+0x188/0x1d0 crtc_set_mode from omap_atomic_commit_tail+0x2c/0xbc omap_atomic_commit_tail from commit_tail+0x9c/0x188 commit_tail from drm_atomic_helper_commit+0x158/0x18c drm_atomic_helper_commit from drm_atomic_commit+0xa4/0xe8 drm_atomic_commit from drm_mode_atomic_ioctl+0x9a4/0xc38 drm_mode_atomic_ioctl from drm_ioctl+0x210/0x4a8 drm_ioctl from sys_ioctl+0x138/0xf00 sys_ioctl from ret_fast_syscall+0x0/0x1c Exception stack(0xf1011fa8 to 0xf1011ff0)
1fa0: 00466d58 be9ab510 00000003 c03864bc be9ab510 be9ab4e0
1fc0: 00466d58 be9ab510 c03864bc 00000036 00466ef0 00466fc0 00467020 00466f20 1fe0: b6bc7ef4 be9ab4d0 b6bbbb00 b6cb2cc0
--- drivers/gpu/drm/omapdrm/omap_drv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/omapdrm/omap_drv.c +4 -5
@@ -69,7 +69,6 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state) {struct drm_device *dev = old_state->dev;struct omap_drm_private *priv = dev->dev_private; -bool fence_cookie =dma_fence_begin_signalling ();dispc_runtime_get (priv->dispc);
@@ -92,6 +91,8 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state)omap_atomic_wait_for_completion (dev, old_state);drm_atomic_helper_commit_planes (dev, old_state,0 ); + +drm_atomic_helper_commit_hw_done (old_state); }else {/* * OMAP3 DSS seems to have issues with the work-around above,
@@ -101,11 +102,9 @@ static void omap_atomic_commit_tail(struct drm_atomic_state *old_state)drm_atomic_helper_commit_planes (dev, old_state,0 );drm_atomic_helper_commit_modeset_enables (dev, old_state); - } -drm_atomic_helper_commit_hw_done (old_state); - -dma_fence_end_signalling (fence_cookie); +drm_atomic_helper_commit_hw_done (old_state); + }/* * Wait for completion of the page flips to ensure that old buffers
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 224/583 drm/dp_mst: Fix fractional DSC bpp handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ville Syrjälä <[email protected]>
[ Upstream commit 7707dd6022593f3edd8e182e7935870cf326f874 ]
The current code does '(bpp << 4) / 16' in the MST PBN calculation, but that is just the same as 'bpp' so the DSC codepath achieves absolutely nothing. Fix it up so that the fractional part of the bpp value is actually used instead of truncated away. 64*1006 has enough zero lsbs that we can just shift that down in the dividend and thus still manage to stick to a 32bit divisor.
And while touching this, let's just make the whole thing more straightforward by making the passed in bpp value .4 binary fixed point always, instead of having to pass in different things based on whether DSC is enabled or not.
v2:
- Fix DSC kunit test cases.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- drivers/gpu/drm/display/drm_dp_mst_topology.c | 20 +++++-------------- drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 ++--- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 +-- .../gpu/drm/tests/drm_dp_mst_helper_test.c | 6 +++--- include/drm/display/drm_dp_mst_helper.h | 2 +- 7 files changed, 14 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -6882,7 +6882,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, max_bpc); bpp =convert_dc_color_depth_into_bpc (color_depth) *3 ; clock = adjusted_mode->clock; - dm_new_connector_state->pbn =drm_dp_calc_pbn_mode (clock, bpp, false); + dm_new_connector_state->pbn =drm_dp_calc_pbn_mode (clock, bpp <<4 ); } dm_new_connector_state->vcpi_slots =
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +1 -1
@@ -1636,7 +1636,7 @@ enum dc_status dm_dp_mst_is_port_support_mode( }else {/* check if mode could be supported within full_pbn */ bpp =convert_dc_color_depth_into_bpc (stream->timing.display_color_depth) *3 ; - pbn =drm_dp_calc_pbn_mode (stream->timing.pix_clk_100hz /10 , bpp, false); + pbn =drm_dp_calc_pbn_mode (stream->timing.pix_clk_100hz /10 , bpp <<4 );if (pbn > full_pbn)return DC_FAIL_BANDWIDTH_VALIDATE ; }
drivers/gpu/drm/display/drm_dp_mst_topology.c +5 -15
@@ -4690,13 +4690,12 @@ EXPORT_SYMBOL(drm_dp_check_act_status);/** * drm_dp_calc_pbn_mode() - Calculate the PBN for a mode. -* @clock: dot clock for the mode -* @bpp: bpp for the mode. -* @dsc: DSC mode. If true, bpp has units of 1/16 of a bit per pixel +* @clock: dot clock +* @bpp: bpp as .4 binary fixed point * * This uses the formula in the spec to calculate the PBN value for a mode. */ -int drm_dp_calc_pbn_mode (int clock,int bpp,bool dsc) +int drm_dp_calc_pbn_mode (int clock,int bpp) {/* * margin 5300ppm + 300ppm ~ 0.6% as per spec, factor is 1.006
@@ -4707,18 +4706,9 @@ int drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc)* peak_kbps *= (1006/1000) * peak_kbps *= (64/54) * peak_kbps *= 8 convert to bytes -* -* If the bpp is in units of 1/16, further divide by 16. Put this -* factor in the numerator rather than the denominator to avoid -* integer overflow */ - -if (dsc) -return DIV_ROUND_UP_ULL (mul_u32_u32 (clock * (bpp /16 ),64 *1006 ), -8 *54 *1000 *1000 ); - -return DIV_ROUND_UP_ULL (mul_u32_u32 (clock * bpp,64 *1006 ), -8 *54 *1000 *1000 ); +return DIV_ROUND_UP_ULL (mul_u32_u32 (clock * bpp,64 *1006 >>4 ), +1000 *8 *54 *1000 ); }EXPORT_SYMBOL (drm_dp_calc_pbn_mode);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -3
@@ -109,8 +109,7 @@ static int intel_dp_mst_find_vcpi_slots_for_bpp(struct intel_encoder *encoder,continue ; crtc_state->pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, - dsc ? bpp <<4 : bpp, - dsc); + bpp <<4 ); slots = drm_dp_atomic_find_time_slots(state, &intel_dp->mst_mgr, connector->port,
@@ -941,7 +940,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,return ret;if (mode_rate > max_rate || mode->clock > max_dotclk || -drm_dp_calc_pbn_mode (mode->clock, min_bpp, false) > port->full_pbn) { +drm_dp_calc_pbn_mode (mode->clock, min_bpp <<4 ) > port->full_pbn) { *status =MODE_CLOCK_HIGH ;return 0 ; }
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -2
@@ -966,8 +966,7 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,const int clock = crtc_state->adjusted_mode.clock; asyh->or.bpc = connector->display_info.bpc; - asyh->dp.pbn =drm_dp_calc_pbn_mode (clock, asyh->or.bpc *3 , - false); + asyh->dp.pbn =drm_dp_calc_pbn_mode (clock, asyh->or.bpc *3 <<4 ); } mst_state =drm_atomic_get_mst_topology_state (state, &mstm->mgr);
drivers/gpu/drm/tests/drm_dp_mst_helper_test.c +3 -3
@@ -42,13 +42,13 @@ static const struct drm_dp_mst_calc_pbn_mode_test drm_dp_mst_calc_pbn_mode_cases .clock = 332880, .bpp = 24, .dsc = true, - .expected = 50 + .expected = 1191 }, { .clock = 324540, .bpp = 24, .dsc = true, - .expected = 49 + .expected = 1161 }, };
@@ -56,7 +56,7 @@ static void drm_test_dp_mst_calc_pbn_mode(struct kunit *test) {const struct drm_dp_mst_calc_pbn_mode_test *params = test->param_value; -KUNIT_EXPECT_EQ (test,drm_dp_calc_pbn_mode (params->clock, params->bpp, params->dsc), +KUNIT_EXPECT_EQ (test,drm_dp_calc_pbn_mode (params->clock, params->bpp <<4 ), params->expected); }
include/drm/display/drm_dp_mst_helper.h +1 -1
@@ -832,7 +832,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector,int drm_dp_get_vc_payload_bw (const struct drm_dp_mst_topology_mgr *mgr,int link_rate,int link_lane_count); -int drm_dp_calc_pbn_mode (int clock,int bpp,bool dsc); +int drm_dp_calc_pbn_mode (int clock,int bpp);void drm_dp_mst_update_slots (struct drm_dp_mst_topology_state *mst_state,uint8_t link_encoding_cap);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 225/583 drm/panfrost: Really power off GPU cores in panfrost_gpu_power_off()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 22aa1a209018dc2eca78745f7666db63637cd5dc ]
The layout of the registers {TILER,SHADER,L2}_PWROFF_LO, used to request powering off cores, is the same as the {TILER,SHADER,L2}_PWRON_LO ones:
this means that in order to request poweroff of cores, we are supposed to write a bitmask of cores that should be powered off!
This means that the panfrost_gpu_power_off() function has always been doing nothing.
Fix powering off the GPU by writing a bitmask of the cores to poweroff to the relevant PWROFF_LO registers and then check that the transition (from ON to OFF) has finished by polling the relevant PWRTRANS_LO registers.
While at it, in order to avoid code duplication, move the core mask logic from panfrost_gpu_power_on() to a new panfrost_get_core_mask() function, used in both poweron and poweroff.
--- drivers/gpu/drm/panfrost/panfrost_gpu.c | 64 ++++++++++++++++++------- 1 file changed, 46 insertions(+), 18 deletions(-)
drivers/gpu/drm/panfrost/panfrost_gpu.c +46 -18
@@ -321,28 +321,38 @@ static void panfrost_gpu_init_features(struct panfrost_device *pfdev) pfdev->features.shader_present, pfdev->features.l2_present); } +static u64 panfrost_get_core_mask (struct panfrost_device *pfdev) +{ +u64 core_mask; + +if (pfdev->features.l2_present ==1 ) +return U64_MAX ; + +/* +* Only support one core group now. +* ~(l2_present - 1) unsets all bits in l2_present except +* the bottom bit. (l2_present - 2) has all the bits in +* the first core group set. AND them together to generate +* a mask of cores in the first core group. +*/ + core_mask = ~(pfdev->features.l2_present -1 ) & + (pfdev->features.l2_present -2 ); +dev_info_once (pfdev->dev,"using only 1st core group (%lu cores from %lu)\n" , +hweight64 (core_mask), +hweight64 (pfdev->features.shader_present)); + +return core_mask; +} +void panfrost_gpu_power_on (struct panfrost_device *pfdev) {int ret;u32 val; -u64 core_mask =U64_MAX ; +u64 core_mask;panfrost_gpu_init_quirks (pfdev); + core_mask =panfrost_get_core_mask (pfdev); -if (pfdev->features.l2_present !=1 ) { -/* -* Only support one core group now. -* ~(l2_present - 1) unsets all bits in l2_present except -* the bottom bit. (l2_present - 2) has all the bits in -* the first core group set. AND them together to generate -* a mask of cores in the first core group. -*/ - core_mask = ~(pfdev->features.l2_present -1 ) & - (pfdev->features.l2_present -2 ); -dev_info_once (pfdev->dev,"using only 1st core group (%lu cores from %lu)\n" , -hweight64 (core_mask), -hweight64 (pfdev->features.shader_present)); - }gpu_write (pfdev,L2_PWRON_LO , pfdev->features.l2_present & core_mask); ret = readl_relaxed_poll_timeout(pfdev->iomem + L2_READY_LO, val, val == (pfdev->features.l2_present & core_mask),
@@ -367,9 +377,27 @@ void panfrost_gpu_power_on(struct panfrost_device *pfdev)void panfrost_gpu_power_off (struct panfrost_device *pfdev) { -gpu_write (pfdev,TILER_PWROFF_LO ,0 ); -gpu_write (pfdev,SHADER_PWROFF_LO ,0 ); -gpu_write (pfdev,L2_PWROFF_LO ,0 ); +u64 core_mask =panfrost_get_core_mask (pfdev); +int ret; +u32 val; + +gpu_write (pfdev,SHADER_PWROFF_LO , pfdev->features.shader_present & core_mask); + ret =readl_relaxed_poll_timeout (pfdev->iomem +SHADER_PWRTRANS_LO , + val, !val,1 ,1000 ); +if (ret) +dev_err (pfdev->dev,"shader power transition timeout" ); + +gpu_write (pfdev,TILER_PWROFF_LO , pfdev->features.tiler_present); + ret =readl_relaxed_poll_timeout (pfdev->iomem +TILER_PWRTRANS_LO , + val, !val,1 ,1000 ); +if (ret) +dev_err (pfdev->dev,"tiler power transition timeout" ); + +gpu_write (pfdev,L2_PWROFF_LO , pfdev->features.l2_present & core_mask); + ret =readl_poll_timeout (pfdev->iomem +L2_PWRTRANS_LO , + val, !val,0 ,1000 ); +if (ret) +dev_err (pfdev->dev,"l2 power transition timeout" ); }int panfrost_gpu_init (struct panfrost_device *pfdev)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 226/583 RDMA/usnic: Silence uninitialized symbol smatch warnings
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit b9a85e5eec126d6ae6c362f94b447c223e8fe6e4 ]
The patch 1da177e4c3f4: "Linux-2.6.12-rc2" from Apr 16, 2005 (linux-next), leads to the following Smatch static checker warning:
drivers/infiniband/hw/mthca/mthca_cmd.c:644 mthca_SYS_EN()
error: uninitialized symbol 'out'.
drivers/infiniband/hw/mthca/mthca_cmd.c
636 int mthca_SYS_EN(struct mthca_dev *dev)
637 {
638 u64 out;
639 int ret;
640
641 ret = mthca_cmd_imm(dev, 0, &out, 0, 0, CMD_SYS_EN, CMD_TIME_CLASS_D);We pass out here and it gets used without being initialized.
err = mthca_cmd_post(dev, in_param,
out_param ? *out_param : 0,
^^^^^^^^^^
in_modifier, op_modifier,
op, context->token, 1);It's the same in mthca_cmd_wait() and mthca_cmd_poll().
--- drivers/infiniband/hw/mthca/mthca_cmd.c | 4 ++-- drivers/infiniband/hw/mthca/mthca_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/hw/mthca/mthca_cmd.c +2 -2
@@ -635,7 +635,7 @@ void mthca_free_mailbox(struct mthca_dev *dev, struct mthca_mailbox *mailbox)int mthca_SYS_EN (struct mthca_dev *dev) { -u64 out; +u64 out =0 ;int ret; ret =mthca_cmd_imm (dev,0 , &out,0 ,0 ,CMD_SYS_EN ,CMD_TIME_CLASS_D );
@@ -1955,7 +1955,7 @@ int mthca_WRITE_MGM(struct mthca_dev *dev, int index,int mthca_MGID_HASH (struct mthca_dev *dev,struct mthca_mailbox *mailbox,u16 *hash) { -u64 imm; +u64 imm =0 ;int err; err = mthca_cmd_imm(dev, mailbox->dma, &imm, 0, 0, CMD_MGID_HASH,
drivers/infiniband/hw/mthca/mthca_main.c +1 -1
@@ -382,7 +382,7 @@ static int mthca_init_icm(struct mthca_dev *mdev, struct mthca_init_hca_param *init_hca, u64 icm_size) { -u64 aux_pages; +u64 aux_pages =0 ;int err; err =mthca_SET_ICM_SIZE (mdev, icm_size, &aux_pages);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 227/583 RDMA/hns: Fix inappropriate err code for unsupported operations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxian Huang <[email protected]>
[ Upstream commit f45b83ad39f8033e717b1eee57e81811113d5a84 ]
EOPNOTSUPP is more situable than EINVAL for allocating XRCD while XRC is not supported and unsupported resizing SRQ.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- drivers/infiniband/hw/hns/hns_roce_pd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -1
@@ -5634,7 +5634,7 @@ static int hns_roce_v2_modify_srq(struct ib_srq *ibsrq,/* Resizing SRQs is not supported yet */ if (srq_attr_mask &IB_SRQ_MAX_WR ) -return -EINVAL ; +return -EOPNOTSUPP ;if (srq_attr_mask &IB_SRQ_LIMIT ) {if (srq_attr->srq_limit > srq->wqe_cnt)
drivers/infiniband/hw/hns/hns_roce_pd.c +1 -1
@@ -150,7 +150,7 @@ int hns_roce_alloc_xrcd(struct ib_xrcd *ib_xrcd, struct ib_udata *udata)int ret;if (!(hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_XRC )) -return -EINVAL ; +return -EOPNOTSUPP ; ret =hns_roce_xrcd_alloc (hr_dev, &xrcd->xrcdn);if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 228/583 drm/panel: nv3051d: Hold panel in reset for unprepare
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Morgan <[email protected]>
[ Upstream commit 697ebc319b942403a6fee894607fd2cd47cca069 ]
Improve the panel's ability to restore from suspend by holding the panel in suspend after unprepare.
--- drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/panel/panel-newvision-nv3051d.c +2 -0
@@ -261,6 +261,8 @@ static int panel_nv3051d_unprepare(struct drm_panel *panel)usleep_range (10000 ,15000 ); +gpiod_set_value_cansleep (ctx->reset_gpio,1 ); +regulator_disable (ctx->vdd);return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 229/583 drm/panel-elida-kd35t133: hold panel in reset for unprepare
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Morgan <[email protected]>
[ Upstream commit 03c5b2a5f6c39fe4e090346536cf1c14ee18b61e ]
For devices like the Anbernic RG351M and RG351P the panel is wired to an always on regulator. When the device suspends and wakes up, there are some slight artifacts on the screen that go away over time. If instead we hold the panel in reset status after it is unprepared, this does not happen.
--- drivers/gpu/drm/panel/panel-elida-kd35t133.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/panel/panel-elida-kd35t133.c +2 -0
@@ -104,6 +104,8 @@ static int kd35t133_unprepare(struct drm_panel *panel)return ret; } +gpiod_set_value_cansleep (ctx->reset_gpio,1 ); +regulator_disable (ctx->iovcc);regulator_disable (ctx->vdd);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 230/583 drm/nouveau/fence:: fix warning directly dereferencing a rcu pointer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abhinav Singh <[email protected]>
[ Upstream commit 5f35a624c1e30b5bae5023b3c256e94e0ad4f806 ]
Fix a sparse warning with this message
"warning:dereference of noderef expression". In this context it means we are dereferencing a __rcu tagged pointer directly.
We should not be directly dereferencing a rcu pointer. To get a normal (non __rcu tagged pointer) from a __rcu tagged pointer we are using the function unrcu_pointer(...). The non __rcu tagged pointer then can be dereferenced just like a normal pointer.
I tested with qemu with this command
qemu-system-x86_64 \ -m 2G \ -smp 2 \ -kernel bzImage \ -append "console=ttyS0 root=/dev/sda earlyprintk=serial net.ifnames=0" \ -drive file=bullseye.img,format=raw \ -net user,host=10.0.2.10,hostfwd=tcp:127.0.0.1:10021-:22 \ -net nic,model=e1000 \ -enable-kvm \ -nographic \ -pidfile vm.pid \ 2>&1 | tee vm.log
with lockdep enabled.
--- drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nv04_fence.c +1 -1
@@ -39,7 +39,7 @@ struct nv04_fence_priv {static int nv04_fence_emit (struct nouveau_fence *fence) { -struct nvif_push *push = fence->channel->chan.push; +struct nvif_push *push =unrcu_pointer (fence->channel)->chan.push;int ret =PUSH_WAIT (push,2 );if (ret ==0 ) {PUSH_NVSQ (push,NV_SW ,0x0150 , fence->base.seqno);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 231/583 drm/bridge: tpd12s015: Drop buggy __exit annotation for remove function
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit ce3e112e7ae854249d8755906acc5f27e1542114 ]
With tpd12s015_remove() marked with __exit this function is discarded when the driver is compiled as a built-in. The result is that when the driver unbinds there is no cleanup done which results in resource leakage or worse.
--- drivers/gpu/drm/bridge/ti-tpd12s015.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/ti-tpd12s015.c +2 -2
@@ -179,7 +179,7 @@ static int tpd12s015_probe(struct platform_device *pdev)return 0 ; } -static int __exit tpd12s015_remove(struct platform_device *pdev) +static int tpd12s015_remove (struct platform_device *pdev) {struct tpd12s015_device *tpd =platform_get_drvdata (pdev);
@@ -197,7 +197,7 @@ MODULE_DEVICE_TABLE(of, tpd12s015_of_match);static struct platform_driver tpd12s015_driver = { .probe = tpd12s015_probe, - .remove =__exit_p (tpd12s015_remove), + .remove = tpd12s015_remove, .driver = { .name ="tpd12s015" , .of_match_table = tpd12s015_of_match,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 232/583 drm/tilcdc: Fix irq free on unload
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 38360bf96d816e175bc602c4ee76953cd303b71d ]
The driver only frees the reserved irq if priv->irq_enabled is set to true. However, the driver mistakenly sets priv->irq_enabled to false, instead of true, in tilcdc_irq_install(), and thus the driver never frees the irq, causing issues on loading the driver a second time.
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -1
@@ -138,7 +138,7 @@ static int tilcdc_irq_install(struct drm_device *dev, unsigned int irq)if (ret)return ret; - priv->irq_enabled = false; + priv->irq_enabled = true;return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 233/583 media: pvrusb2: fix use after free on context disconnection
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo B. Marliere <[email protected]>
[ Upstream commit ded85b0c0edd8f45fec88783d7555a5b982449c1 ]
Upon module load, a kthread is created targeting the pvr2_context_thread_func function, which may call pvr2_context_destroy and thus call kfree() on the context object. However, that might happen before the usb hub_event handler is able to notify the driver. This patch adds a sanity check before the invalid read reported by syzbot, within the context disconnection call stack.
--- drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/pvrusb2/pvrusb2-context.c +2 -1
@@ -268,7 +268,8 @@ void pvr2_context_disconnect(struct pvr2_context *mp) {pvr2_hdw_disconnect (mp->hdw); mp->disconnect_flag = !0 ; -pvr2_context_notify (mp); +if (!pvr2_context_shutok ()) +pvr2_context_notify (mp); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 234/583 media: mtk-jpeg: Remove cancel worker in mtk_jpeg_remove to avoid the crash of multi-core JPEG devices
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Wang <[email protected]>
[ Upstream commit d8212c5c87c143ca01b78f6bf61244af07e0058e ]
This patch reverts commit c677d7ae8314
("media: mtk-jpeg: Fix use after free bug due to uncanceled work"). The job_timeout_work is initialized only for
the single-core JPEG device so it will cause the crash for multi-core JPEG devices.
Fix it by removing the cancel_delayed_work_sync function.
--- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +0 -1
@@ -1403,7 +1403,6 @@ static void mtk_jpeg_remove(struct platform_device *pdev) {struct mtk_jpeg_dev *jpeg =platform_get_drvdata (pdev); -cancel_delayed_work_sync (&jpeg->job_timeout_work);pm_runtime_disable (&pdev->dev);video_unregister_device (jpeg->vdev);v4l2_m2m_release (jpeg->m2m_dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 235/583 media: visl: Hook the (TRY_)DECODER_CMD stateless ioctls
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Kocialkowski <[email protected]>
[ Upstream commit 3907f6ef8e0d55a88cdb0f7238363d24e26790ca ]
The (TRY_)DECODER_CMD ioctls are used to support flushing when holding capture buffers is supported. This is the case of this driver but the ioctls were never hooked to the ioctl ops.
Add them to correctly support flushing.
--- drivers/media/test-drivers/visl/visl-video.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/test-drivers/visl/visl-video.c +3 -0
@@ -525,6 +525,9 @@ const struct v4l2_ioctl_ops visl_ioctl_ops = { .vidioc_streamon = v4l2_m2m_ioctl_streamon, .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, + .vidioc_decoder_cmd = v4l2_m2m_ioctl_stateless_decoder_cmd, + .vidioc_try_decoder_cmd = v4l2_m2m_ioctl_stateless_try_decoder_cmd, + .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 236/583 media: verisilicon: Hook the (TRY_)DECODER_CMD stateless ioctls
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Kocialkowski <[email protected]>
[ Upstream commit 6c0d9e12b1d12bbd95484e4b99f63feeb423765f ]
The (TRY_)DECODER_CMD ioctls are used to support flushing when holding capture buffers is supported. This is the case of this driver but the ioctls were never hooked to the ioctl ops.
Add them to correctly support flushing.
--- drivers/media/platform/verisilicon/hantro_drv.c | 2 ++ drivers/media/platform/verisilicon/hantro_v4l2.c | 3 +++ 2 files changed, 5 insertions(+)
drivers/media/platform/verisilicon/hantro_drv.c +2 -0
@@ -904,6 +904,8 @@ static int hantro_add_func(struct hantro_dev *vpu, unsigned int funcid)if (funcid ==MEDIA_ENT_F_PROC_VIDEO_ENCODER ) { vpu->encoder = func; +v4l2_disable_ioctl (vfd,VIDIOC_TRY_DECODER_CMD ); +v4l2_disable_ioctl (vfd,VIDIOC_DECODER_CMD ); }else { vpu->decoder = func;v4l2_disable_ioctl (vfd,VIDIOC_TRY_ENCODER_CMD );
drivers/media/platform/verisilicon/hantro_v4l2.c +3 -0
@@ -785,6 +785,9 @@ const struct v4l2_ioctl_ops hantro_ioctl_ops = { .vidioc_g_selection = vidioc_g_selection, .vidioc_s_selection = vidioc_s_selection, + .vidioc_decoder_cmd = v4l2_m2m_ioctl_stateless_decoder_cmd, + .vidioc_try_decoder_cmd = v4l2_m2m_ioctl_stateless_try_decoder_cmd, + .vidioc_try_encoder_cmd = v4l2_m2m_ioctl_try_encoder_cmd, .vidioc_encoder_cmd = vidioc_encoder_cmd, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 237/583 media: rkvdec: Hook the (TRY_)DECODER_CMD stateless ioctls
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Kocialkowski <[email protected]>
[ Upstream commit 1fb7b5ab62113b29ce331464048d8c39e58fd08a ]
The (TRY_)DECODER_CMD ioctls are used to support flushing when holding capture buffers is supported. This is the case of this driver but the ioctls were never hooked to the ioctl ops.
Add them to correctly support flushing.
--- drivers/staging/media/rkvdec/rkvdec.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/media/rkvdec/rkvdec.c +3 -0
@@ -461,6 +461,9 @@ static const struct v4l2_ioctl_ops rkvdec_ioctl_ops = { .vidioc_streamon = v4l2_m2m_ioctl_streamon, .vidioc_streamoff = v4l2_m2m_ioctl_streamoff, + + .vidioc_decoder_cmd = v4l2_m2m_ioctl_stateless_decoder_cmd, + .vidioc_try_decoder_cmd = v4l2_m2m_ioctl_stateless_try_decoder_cmd, }; static int rkvdec_queue_setup(struct vb2_queue *vq, unsigned int *num_buffers,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 238/583 media: amphion: Fix VPU core alias name
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
[ Upstream commit f033c87fda47e272bb4f75dc7b03677261d91158 ]
Starting with commit f6038de293f2 ("arm64: dts: imx8qm: Fix VPU core alias name") the alias for VPU cores uses dashes instead of underscores. Adjust the alias stem accordingly. Fixes the errors:
amphion-vpu-core 2d040000.vpu-core: can't get vpu core id amphion-vpu-core 2d050000.vpu-core: can't get vpu core id
--- drivers/media/platform/amphion/vpu_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/amphion/vpu_core.c +1 -1
@@ -642,7 +642,7 @@ static int vpu_core_probe(struct platform_device *pdev)return -ENODEV ; core->type = core->res->type; - core->id =of_alias_get_id (dev->of_node,"vpu_core" ); + core->id =of_alias_get_id (dev->of_node,"vpu-core" );if (core->id <0 ) {dev_err (dev,"can't get vpu core id\n" );return core->id;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 239/583 drm/bridge: Fix typo in post_disable() description
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dario Binacchi <[email protected]>
[ Upstream commit 288b039db225676e0c520c981a1b5a2562d893a3 ]
s/singals/signals/
--- include/drm/drm_bridge.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_bridge.h +1 -1
@@ -192,7 +192,7 @@ struct drm_bridge_funcs {* or &drm_encoder_helper_funcs.dpms hook. * * The bridge must assume that the display pipe (i.e. clocks and timing -* singals) feeding it is no longer running when this callback is +* signals) feeding it is no longer running when this callback is * called. * * The @post_disable callback is optional.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 240/583 f2fs: fix to avoid dirent corruption
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 53edb549565f55ccd0bdf43be3d66ce4c2d48b28 ]
As Al reported in link[1]:
f2fs_rename()
...
if (old_dir != new_dir && !whiteout) f2fs_set_link(old_inode, old_dir_entry, old_dir_page, new_dir); else f2fs_put_page(old_dir_page, 0);
You want correct inumber in the ".." link. And cross-directory rename does move the source to new parent, even if you'd been asked to leave a whiteout in the old place.
[1] https://lore.kernel.org/all/20231017055040.GN800259@ZenIV/
With below testcase, it may cause dirent corruption, due to it missed to call f2fs_set_link() to update ".." link to new directory.
- mkdir -p dir/foo
- renameat2 -w dir/foo bar
[ASSERT] (__chk_dots_dentries:1421) --> Bad inode number[0x4] for '..', parent parent ino is [0x3]
[FSCK] other corrupted bugs [Fail]
--- fs/f2fs/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/namei.c +1 -1
@@ -1106,7 +1106,7 @@ static int f2fs_rename(struct mnt_idmap *idmap, struct inode *old_dir, }if (old_dir_entry) { -if (old_dir != new_dir && !whiteout) +if (old_dir != new_dir)f2fs_set_link (old_inode, old_dir_entry, old_dir_page, new_dir);else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 241/583 drm/radeon/r600_cs: Fix possible int overflows in r600_cs_check_reg()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit 39c960bbf9d9ea862398759e75736cfb68c3446f ]
While improbable, there may be a chance of hitting integer overflow when the result of radeon_get_ib_value() gets shifted left.
Avoid it by casting one of the operands to larger data type (u64).
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/gpu/drm/radeon/r600_cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/r600_cs.c +2 -2
@@ -1275,7 +1275,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)return -EINVAL ; } tmp = (reg -CB_COLOR0_BASE ) /4 ; - track->cb_color_bo_offset[tmp] =radeon_get_ib_value (p, idx) <<8 ; + track->cb_color_bo_offset[tmp] = (u64 )radeon_get_ib_value (p, idx) <<8 ; ib[idx] += (u32)((reloc->gpu_offset >>8 ) &0xffffffff ); track->cb_color_base_last[tmp] = ib[idx]; track->cb_color_bo[tmp] = reloc->robj;
@@ -1302,7 +1302,7 @@ static int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx) "0x%04X\n", reg);return -EINVAL ; } - track->htile_offset =radeon_get_ib_value (p, idx) <<8 ; + track->htile_offset = (u64 )radeon_get_ib_value (p, idx) <<8 ; ib[idx] += (u32)((reloc->gpu_offset >>8 ) &0xffffffff ); track->htile_bo = reloc->robj; track->db_dirty = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 242/583 drm/radeon/r100: Fix integer overflow issues in r100_cs_track_check()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit b5c5baa458faa5430c445acd9a17481274d77ccf ]
It may be possible, albeit unlikely, to encounter integer overflow during the multiplication of several unsigned int variables, the result being assigned to a variable 'size' of wider type.
Prevent this potential behaviour by converting one of the multiples to unsigned long.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/gpu/drm/radeon/r100.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/r100.c +2 -2
@@ -2321,7 +2321,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track)switch (prim_walk) {case 1 :for (i =0 ; i < track->num_arrays; i++) { - size = track->arrays[i].esize * track->max_indx *4 ; + size = track->arrays[i].esize * track->max_indx *4UL ;if (track->arrays[i].robj ==NULL ) {DRM_ERROR ("(PW %u) Vertex array %u no buffer " "bound\n" , prim_walk, i);
@@ -2340,7 +2340,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track)break ;case 2 :for (i =0 ; i < track->num_arrays; i++) { - size = track->arrays[i].esize * (nverts -1 ) *4 ; + size = track->arrays[i].esize * (nverts -1 ) *4UL ;if (track->arrays[i].robj ==NULL ) {DRM_ERROR ("(PW %u) Vertex array %u no buffer " "bound\n" , prim_walk, i);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 243/583 drm/radeon: check return value of radeon_ring_lock()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Zhandarovich <[email protected]>
[ Upstream commit 71225e1c930942cb1e042fc08c5cc0c4ef30e95e ]
In the unlikely event of radeon_ring_lock() failing, its errno return value should be processed. This patch checks said return value and prints a debug message in case of an error.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/gpu/drm/radeon/si.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/radeon/si.c +4 -0
@@ -3611,6 +3611,10 @@ static int si_cp_start(struct radeon_device *rdev)for (i =RADEON_RING_TYPE_GFX_INDEX ; i <=CAYMAN_RING_TYPE_CP2_INDEX ; ++i) { ring = &rdev->ring[i]; r =radeon_ring_lock (rdev, ring,2 ); +if (r) { +DRM_ERROR ("radeon: cp failed to lock ring (%d).\n" , r); +return r; + }/* clear the compute context state */ radeon_ring_write (ring,PACKET3_COMPUTE (PACKET3_CLEAR_STATE ,0 ));
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 244/583 drm/tidss: Move reset to the end of dispc_init()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 36d1e0852680aa038e2428d450673390111b165c ]
We do a DSS reset in the middle of the dispc_init(). While that happens to work now, we should really make sure that e..g the fclk, which is acquired only later in the function, is enabled when doing a reset. This will be handled in a later patch, but for now, let's move the dispc_softreset() call to the end of dispc_init(), which is a sensible place for it anyway.
Stable-dep-of: bc288a927815 ("drm/tidss: Fix dss reset")
--- drivers/gpu/drm/tidss/tidss_dispc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/tidss/tidss_dispc.c +4 -4
@@ -2777,10 +2777,6 @@ int dispc_init(struct tidss_device *tidss)return r; } -/* K2G display controller does not support soft reset */ -if (feat->subrev !=DISPC_K2G ) -dispc_softreset (dispc); -for (i =0 ; i < dispc->feat->num_vps; i++) {u32 gamma_size = dispc->feat->vp_feat.color.gamma_size;u32 *gamma_table;
@@ -2829,6 +2825,10 @@ int dispc_init(struct tidss_device *tidss)of_property_read_u32 (dispc->dev->of_node,"max-memory-bandwidth" , &dispc->memory_bandwidth_limit); +/* K2G display controller does not support soft reset */ +if (feat->subrev !=DISPC_K2G ) +dispc_softreset (dispc); + tidss->dispc = dispc;return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 245/583 drm/tidss: Return error value from from softreset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit aceafbb5035c4bfc75a321863ed1e393d644d2d2 ]
Return an error value from dispc_softreset() so that the caller can handle the errors.
Stable-dep-of: bc288a927815 ("drm/tidss: Fix dss reset")
--- drivers/gpu/drm/tidss/tidss_dispc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/gpu/drm/tidss/tidss_dispc.c +12 -5
@@ -2702,7 +2702,7 @@ static void dispc_init_errata(struct dispc_device *dispc) } } -static void dispc_softreset (struct dispc_device *dispc) +static int dispc_softreset (struct dispc_device *dispc) {u32 val;int ret =0 ;
@@ -2712,8 +2712,12 @@ static void dispc_softreset(struct dispc_device *dispc)/* Wait for reset to complete */ ret =readl_poll_timeout (dispc->base_common +DSS_SYSSTATUS , val, val &1 ,100 ,5000 ); -if (ret) -dev_warn (dispc->dev,"failed to reset dispc\n" ); +if (ret) { +dev_err (dispc->dev,"failed to reset dispc\n" ); +return ret; + } + +return 0 ; }int dispc_init (struct tidss_device *tidss)
@@ -2826,8 +2830,11 @@ int dispc_init(struct tidss_device *tidss) &dispc->memory_bandwidth_limit);/* K2G display controller does not support soft reset */ -if (feat->subrev !=DISPC_K2G ) -dispc_softreset (dispc); +if (feat->subrev !=DISPC_K2G ) { + r =dispc_softreset (dispc); +if (r) +return r; + } tidss->dispc = dispc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 246/583 drm/tidss: Check for K2G in in dispc_softreset()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 151825150cf9c2e9fb90763d35b9dff3783628ac ]
K2G doesn't have softreset feature. Instead of having every caller of dispc_softreset() check for K2G, move the check into dispc_softreset(), and make dispc_softreset() return 0 in case of K2G.
Stable-dep-of: bc288a927815 ("drm/tidss: Fix dss reset")
--- drivers/gpu/drm/tidss/tidss_dispc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/tidss/tidss_dispc.c +7 -6
@@ -2707,6 +2707,10 @@ static int dispc_softreset(struct dispc_device *dispc)u32 val;int ret =0 ; +/* K2G display controller does not support soft reset */ +if (dispc->feat->subrev ==DISPC_K2G ) +return 0 ; +/* Soft reset */ REG_FLD_MOD (dispc,DSS_SYSCONFIG ,1 ,1 ,1 );/* Wait for reset to complete */
@@ -2829,12 +2833,9 @@ int dispc_init(struct tidss_device *tidss)of_property_read_u32 (dispc->dev->of_node,"max-memory-bandwidth" , &dispc->memory_bandwidth_limit); -/* K2G display controller does not support soft reset */ -if (feat->subrev !=DISPC_K2G ) { - r =dispc_softreset (dispc); -if (r) -return r; - } + r =dispc_softreset (dispc); +if (r) +return r; tidss->dispc = dispc;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 247/583 drm/tidss: Fix dss reset
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit bc288a927815efcf9d7f4a54d4d89c5df478c635 ]
The probe function calls dispc_softreset() before runtime PM is enabled and without enabling any of the DSS clocks. This happens to work by luck, and we need to make sure the DSS HW is active and the fclk is enabled.
To fix the above, add a new function, dispc_init_hw(), which does:
- pm_runtime_set_active()
- clk_prepare_enable(fclk)
- dispc_softreset().
This ensures that the reset can be successfully accomplished.
Note that we use pm_runtime_set_active(), not the normal pm_runtime_get(). The reason for this is that at this point we haven't enabled the runtime PM yet and also we don't want the normal resume callback to be called: the dispc resume callback does some initial HW setup, and it expects that the HW was off (no video ports are streaming). If the bootloader has enabled the DSS and has set up a boot time splash-screen, the DSS would be enabled and streaming which might lead to issues with the normal resume callback.
--- drivers/gpu/drm/tidss/tidss_dispc.c | 45 ++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-)
drivers/gpu/drm/tidss/tidss_dispc.c +44 -1
@@ -2724,6 +2724,49 @@ static int dispc_softreset(struct dispc_device *dispc)return 0 ; } +static int dispc_init_hw (struct dispc_device *dispc) +{ +struct device *dev = dispc->dev; +int ret; + + ret =pm_runtime_set_active (dev); +if (ret) { +dev_err (dev,"Failed to set DSS PM to active\n" ); +return ret; + } + + ret =clk_prepare_enable (dispc->fclk); +if (ret) { +dev_err (dev,"Failed to enable DSS fclk\n" ); + goto err_runtime_suspend; + } + + ret =dispc_softreset (dispc); +if (ret) + goto err_clk_disable; + +clk_disable_unprepare (dispc->fclk); + ret =pm_runtime_set_suspended (dev); +if (ret) { +dev_err (dev,"Failed to set DSS PM to suspended\n" ); +return ret; + } + +return 0 ; + +err_clk_disable: +clk_disable_unprepare (dispc->fclk); + +err_runtime_suspend: + ret =pm_runtime_set_suspended (dev); +if (ret) { +dev_err (dev,"Failed to set DSS PM to suspended\n" ); +return ret; + } + +return ret; +} +int dispc_init (struct tidss_device *tidss) {struct device *dev = tidss->dev;
@@ -2833,7 +2876,7 @@ int dispc_init(struct tidss_device *tidss)of_property_read_u32 (dispc->dev->of_node,"max-memory-bandwidth" , &dispc->memory_bandwidth_limit); - r =dispc_softreset (dispc); + r =dispc_init_hw (dispc);if (r)return r;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 248/583 drm/imx/lcdc: Fix double-free of driver data
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit ff3670877e7c73d06c2a835d9abb62efcae0145c ]
The struct imx_lcdc driver data is allocated using devm_drm_dev_alloc() so it must not be explicitly kfree()d.
Also drm_kms_helper_poll_fini() should not be called as there is no matching drm_kms_helper_poll_init(). So drop the release function completely.
--- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/gpu/drm/imx/lcdc/imx-lcdc.c +0 -9
@@ -342,21 +342,12 @@ static const struct drm_mode_config_helper_funcs imx_lcdc_mode_config_helpers = .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, }; -static void imx_lcdc_release (struct drm_device *drm) -{ -struct imx_lcdc *lcdc =imx_lcdc_from_drmdev (drm); - -drm_kms_helper_poll_fini (drm); -kfree (lcdc); -} -DEFINE_DRM_GEM_DMA_FOPS (imx_lcdc_drm_fops);static struct drm_driver imx_lcdc_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &imx_lcdc_drm_fops,DRM_GEM_DMA_DRIVER_OPS_VMAP , - .release = imx_lcdc_release, .name ="imx-lcdc" , .desc ="i.MX LCDC driver" , .date ="20200716" ,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 249/583 ASoC: cs35l33: Fix GPIO name and drop legacy include
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
[ Upstream commit 50678d339d670a92658e5538ebee30447c88ccb3 ]
This driver includes the legacy GPIO APIs <linux/gpio.h> and <linux/of_gpio.h> but does not use any symbols from any of them.
Drop the includes.
Further the driver is requesting "reset-gpios" rather than just "reset" from the GPIO framework. This is wrong because the gpiolib core will add "-gpios" before processing the request from e.g. device tree. Drop the suffix.
The last problem means that the optional RESET GPIO has never been properly retrieved and used even if it existed, but nobody noticed.
--- sound/soc/codecs/cs35l33.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/codecs/cs35l33.c +1 -3
@@ -22,13 +22,11 @@#include <sound/soc-dapm.h> #include <sound/initval.h> #include <sound/tlv.h> -#include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <sound/cs35l33.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <linux/regulator/machine.h> -#include <linux/of_gpio.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_irq.h>
@@ -1167,7 +1165,7 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client)/* We could issue !RST or skip it based on AMP topology */ cs35l33->reset_gpio =devm_gpiod_get_optional (&i2c_client->dev, -"reset-gpios" ,GPIOD_OUT_HIGH ); +"reset" ,GPIOD_OUT_HIGH );if (IS_ERR (cs35l33->reset_gpio)) {dev_err (&i2c_client->dev,"%s ERROR: Can't get reset GPIO\n" , __func__);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 250/583 drm/msm/mdp4: flush vblank event on disable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit c6721b3c6423d8a348ae885a0f4c85e14f9bf85c ]
Flush queued events when disabling the crtc. This avoids timeouts when we come back and wait for dependencies (like the previous frame's flip_done).
Patchwork: https://patchwork.freedesktop.org/patch/569127/
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +9 -0
@@ -269,6 +269,7 @@ static void mdp4_crtc_atomic_disable(struct drm_crtc *crtc, {struct mdp4_crtc *mdp4_crtc =to_mdp4_crtc (crtc);struct mdp4_kms *mdp4_kms =get_kms (crtc); +unsigned long flags;DBG ("%s" , mdp4_crtc->name);
@@ -281,6 +282,14 @@ static void mdp4_crtc_atomic_disable(struct drm_crtc *crtc,mdp_irq_unregister (&mdp4_kms->base, &mdp4_crtc->err);mdp4_disable (mdp4_kms); +if (crtc->state->event && !crtc->state->active) { +WARN_ON (mdp4_crtc->event); +spin_lock_irqsave (&mdp4_kms->dev->event_lock, flags); +drm_crtc_send_vblank_event (crtc, crtc->state->event); + crtc->state->event =NULL ; +spin_unlock_irqrestore (&mdp4_kms->dev->event_lock, flags); + } + mdp4_crtc->enabled = false; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 251/583 drm/msm/dpu: Add missing safe_lut_tbl in sc8180x catalog
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit 7cc2621f16b644bb7af37987cb471311641a9e56 ]
Similar to SC8280XP, the misconfigured SAFE logic causes rather significant delays in __arm_smmu_tlb_sync(), resulting in poor performance for things such as USB.
Introduce appropriate SAFE values for SC8180X to correct this.
Patchwork: https://patchwork.freedesktop.org/patch/569840/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h +1 -0
@@ -377,6 +377,7 @@ static const struct dpu_perf_cfg sc8180x_perf_data = { .min_llcc_ib = 800000, .min_dram_ib = 800000, .danger_lut_tbl = {0xf, 0xffff, 0x0}, + .safe_lut_tbl = {0xfff0, 0xf000, 0xffff}, .qos_lut_tbl = { {.nentry = ARRAY_SIZE(sc7180_qos_linear), .entries = sc7180_qos_linear
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 252/583 drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
[ Upstream commit 3d07a411b4faaf2b498760ccf12888f8de529de0 ]
This helper has been introduced to avoid programmer errors (missing _put calls leading to dangling refcnt) when using pm_runtime_get, use it.
While at it, start checking the return value.
Patchwork: https://patchwork.freedesktop.org/patch/543350/
--- drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +3 -1
@@ -516,7 +516,9 @@ static int dsi_phy_enable_resource(struct msm_dsi_phy *phy)struct device *dev = &phy->pdev->dev;int ret; -pm_runtime_get_sync (dev); + ret =pm_runtime_resume_and_get (dev); +if (ret) +return ret; ret =clk_prepare_enable (phy->ahb_clk);if (ret) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 253/583 drm/drv: propagate errors from drm_modeset_register_all()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit 5f8dec200923a76dc57187965fd59c1136f5d085 ]
In case the drm_modeset_register_all() function fails, its error code will be ignored. Instead make the drm_dev_register() bail out in case of such an error.
--- drivers/gpu/drm/drm_drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_drv.c +8 -2
@@ -940,8 +940,11 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto err_minors; } -if (drm_core_check_feature (dev,DRIVER_MODESET )) -drm_modeset_register_all (dev); +if (drm_core_check_feature (dev,DRIVER_MODESET )) { + ret =drm_modeset_register_all (dev); +if (ret) + goto err_unload; + } DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", driver->name, driver->major, driver->minor,
@@ -951,6 +954,9 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) goto out_unlock; +err_unload: +if (dev->driver->unload) + dev->driver->unload (dev); err_minors:remove_compat_control_link (dev);drm_minor_unregister (dev,DRM_MINOR_ACCEL );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 254/583 media: v4l: async: Fix duplicated list deletion
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Reichel <[email protected]>
[ Upstream commit 3de6ee94aae701fa949cd3b5df6b6a440ddfb8f2 ]
The list deletion call dropped here is already called from the helper function in the line before. Having a second list_del() call results in either a warning (with CONFIG_DEBUG_LIST=y):
list_del corruption, c46c8198->next is LIST_POISON1 (00000100)
If CONFIG_DEBUG_LIST is disabled the operation results in a kernel error due to NULL pointer dereference.
--- drivers/media/v4l2-core/v4l2-async.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/v4l2-core/v4l2-async.c +0 -1
@@ -880,7 +880,6 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd) &asc->notifier->waiting_list);v4l2_async_unbind_subdev_one (asc->notifier, asc); -list_del (&asc->asc_subdev_entry); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 255/583 ASoC: Intel: glk_rt5682_max98357a: fix board id mismatch
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brent Lu <[email protected]>
[ Upstream commit 486ede0df82dd74472c6f5651e38ff48f7f766c1 ]
The drv_name in enumeration table for ALC5682I-VS codec does not match the board id string in machine driver. Modify the entry of "10EC5682" to enumerate "RTL5682" as well and remove invalid entry.
--- sound/soc/intel/common/soc-acpi-intel-glk-match.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
sound/soc/intel/common/soc-acpi-intel-glk-match.c +6 -8
@@ -19,6 +19,11 @@ static const struct snd_soc_acpi_codecs glk_codecs = { .codecs = {"MX98357A"} }; +static const struct snd_soc_acpi_codecs glk_rt5682_rt5682s_hp = { + .num_codecs =2 , + .codecs = {"10EC5682" ,"RTL5682" }, +}; +struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = { { .id ="INT343A" ,
@@ -35,20 +40,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = { .sof_tplg_filename = "sof-glk-da7219.tplg", }, { - .id = "10EC5682", + .comp_ids = &glk_rt5682_rt5682s_hp, .drv_name = "glk_rt5682_mx98357a", .fw_filename = "intel/dsp_fw_glk.bin", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &glk_codecs, .sof_tplg_filename = "sof-glk-rt5682.tplg", }, - { - .id = "RTL5682", - .drv_name = "glk_rt5682_max98357a", - .machine_quirk = snd_soc_acpi_codec_list, - .quirk_data = &glk_codecs, - .sof_tplg_filename = "sof-glk-rt5682.tplg", - }, { .id = "10134242", .drv_name = "glk_cs4242_mx98357a",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 256/583 ASoC: Intel: sof_sdw_rt_sdca_jack_common: ctx->headset_codec_dev = NULL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bard Liao <[email protected]>
[ Upstream commit e38e252dbceeef7d2f848017132efd68e9ae1416 ]
sof_sdw_rt_sdca_jack_exit() are used by different codecs, and some of them use the same dai name.
For example, rt712 and rt713 both use "rt712-sdca-aif1" and sof_sdw_rt_sdca_jack_exit().
As a result, sof_sdw_rt_sdca_jack_exit() will be called twice by mc_dailink_exit_loop(). Set ctx->headset_codec_dev = NULL; after put_device(ctx->headset_codec_dev); to avoid ctx->headset_codec_dev being put twice.
--- sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c +1 -0
@@ -168,6 +168,7 @@ int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_linkdevice_remove_software_node (ctx->headset_codec_dev);put_device (ctx->headset_codec_dev); + ctx->headset_codec_dev =NULL ;return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 257/583 ASoC: SOF: topology: Use partial match for disconnecting DAI link and DAI widget
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bard Liao <[email protected]>
[ Upstream commit 2f03970198d6438d95b96f69041254bd39aafed0 ]
We use partial match for connecting DAI link and DAI widget. We need to use partial match for disconnecting, too.
--- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/topology.c +1 -1
@@ -1134,7 +1134,7 @@ static void sof_disconnect_dai_widget(struct snd_soc_component *scomp,list_for_each_entry (rtd, &card->rtd_list, list) {/* does stream match DAI link ? */ if (!rtd->dai_link->stream_name || -strcmp (sname, rtd->dai_link->stream_name)) + !strstr (rtd->dai_link->stream_name, sname))continue ;for_each_rtd_cpu_dais (rtd, i, cpu_dai)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 258/583 drm/panfrost: Ignore core_mask for poweroff and disable PWRTRANS irq
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit a4f5892914ca7709ea6d191f0edace93a5935966 ]
Some SoCs may be equipped with a GPU containing two core groups and this is exactly the case of Samsung's Exynos 5422 featuring an ARM Mali-T628 MP6 GPU: the support for this GPU in Panfrost is partial, as this driver currently supports using only one core group and that's reflected on all parts of it, including the power on (and power off, previously to this patch) function.
The issue with this is that even though executing the soft reset operation should power off all cores unconditionally, on at least one platform we're seeing a crash that seems to be happening due to an interrupt firing which may be because we are calling power transition only on the first core group, leaving the second one unchanged, or because ISR execution was pending before entering the panfrost_gpu_power_off() function and executed after powering off the GPU cores, or all of the above.
Finally, solve this by:
- Avoid to enable the power transition interrupt on reset; and
- Ignoring the core_mask and ask the GPU to poweroff both core groups
--- drivers/gpu/drm/panfrost/panfrost_gpu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/panfrost/panfrost_gpu.c +8 -4
@@ -71,7 +71,12 @@ int panfrost_gpu_soft_reset(struct panfrost_device *pfdev) }gpu_write (pfdev,GPU_INT_CLEAR ,GPU_IRQ_MASK_ALL ); -gpu_write (pfdev,GPU_INT_MASK ,GPU_IRQ_MASK_ALL ); + +/* Only enable the interrupts we care about */ +gpu_write (pfdev,GPU_INT_MASK , +GPU_IRQ_MASK_ERROR | +GPU_IRQ_PERFCNT_SAMPLE_COMPLETED | +GPU_IRQ_CLEAN_CACHES_COMPLETED );return 0 ; }
@@ -377,11 +382,10 @@ void panfrost_gpu_power_on(struct panfrost_device *pfdev)void panfrost_gpu_power_off (struct panfrost_device *pfdev) { -u64 core_mask =panfrost_get_core_mask (pfdev);int ret;u32 val; -gpu_write (pfdev,SHADER_PWROFF_LO , pfdev->features.shader_present & core_mask); +gpu_write (pfdev,SHADER_PWROFF_LO , pfdev->features.shader_present); ret =readl_relaxed_poll_timeout (pfdev->iomem +SHADER_PWRTRANS_LO , val, !val,1 ,1000 );if (ret)
@@ -393,7 +397,7 @@ void panfrost_gpu_power_off(struct panfrost_device *pfdev)if (ret)dev_err (pfdev->dev,"tiler power transition timeout" ); -gpu_write (pfdev,L2_PWROFF_LO , pfdev->features.l2_present & core_mask); +gpu_write (pfdev,L2_PWROFF_LO , pfdev->features.l2_present); ret =readl_poll_timeout (pfdev->iomem +L2_PWRTRANS_LO , val, !val,0 ,1000 );if (ret)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 259/583 drm/msm/dpu: correct clk bit for WB2 block
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit e843ca2f30e630675e2d2a75c96f4844f2854430 ]
On sc7280 there are two clk bits for WB2: vbif_cli and clk_ctrl. While programming the VBIF params of WB, the driver should be toggling the former bit, while the sc7180_mdp, sc7280_mdp and sm8250_mdp structs list the latter one.
Correct that to ensure proper programming sequence for WB2 on these platforms.
Patchwork: https://patchwork.freedesktop.org/patch/570185/
--- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h +1 -1
@@ -32,7 +32,7 @@ static const struct dpu_mdp_cfg sm8250_mdp = { [DPU_CLK_CTRL_DMA2] = { .reg_off = 0x2bc, .bit_off = 8 }, [DPU_CLK_CTRL_DMA3] = { .reg_off = 0x2c4, .bit_off = 8 }, [DPU_CLK_CTRL_REG_DMA] = { .reg_off = 0x2bc, .bit_off = 20 }, - [DPU_CLK_CTRL_WB2] = { .reg_off = 0x3b8, .bit_off = 24 }, + [DPU_CLK_CTRL_WB2] = { .reg_off = 0x2bc, .bit_off = 16 }, }, };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h +1 -1
@@ -25,7 +25,7 @@ static const struct dpu_mdp_cfg sc7180_mdp = { [DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2ac, .bit_off = 8 }, [DPU_CLK_CTRL_DMA1] = { .reg_off = 0x2b4, .bit_off = 8 }, [DPU_CLK_CTRL_DMA2] = { .reg_off = 0x2c4, .bit_off = 8 }, - [DPU_CLK_CTRL_WB2] = { .reg_off = 0x3b8, .bit_off = 24 }, + [DPU_CLK_CTRL_WB2] = { .reg_off = 0x2bc, .bit_off = 16 }, }, };
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h +1 -1
@@ -25,7 +25,7 @@ static const struct dpu_mdp_cfg sc7280_mdp = { [DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2ac, .bit_off = 8 }, [DPU_CLK_CTRL_DMA1] = { .reg_off = 0x2b4, .bit_off = 8 }, [DPU_CLK_CTRL_DMA2] = { .reg_off = 0x2c4, .bit_off = 8 }, - [DPU_CLK_CTRL_WB2] = { .reg_off = 0x3b8, .bit_off = 24 }, + [DPU_CLK_CTRL_WB2] = { .reg_off = 0x2bc, .bit_off = 16 }, }, };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 260/583 drm/radeon: check the alloc_workqueue return value in radeon_crtc_init()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yingliang <[email protected]>
[ Upstream commit 7a2464fac80d42f6f8819fed97a553e9c2f43310 ]
check the alloc_workqueue return value in radeon_crtc_init() to avoid null-ptr-deref.
--- drivers/gpu/drm/radeon/radeon_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_display.c +6 -1
@@ -687,11 +687,16 @@ static void radeon_crtc_init(struct drm_device *dev, int index)if (radeon_crtc ==NULL )return ; + radeon_crtc->flip_queue =alloc_workqueue ("radeon-crtc" ,WQ_HIGHPRI ,0 ); +if (!radeon_crtc->flip_queue) { +kfree (radeon_crtc); +return ; + } +drm_crtc_init (dev, &radeon_crtc->base, &radeon_crtc_funcs);drm_mode_crtc_set_gamma_size (&radeon_crtc->base,256 ); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue =alloc_workqueue ("radeon-crtc" ,WQ_HIGHPRI ,0 ); rdev->mode_info.crtcs[index] = radeon_crtc;if (rdev->family >=CHIP_BONAIRE ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 261/583 drm/radeon/dpm: fix a memleak in sumo_parse_power_table
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 0737df9ed0997f5b8addd6e2b9699a8c6edba2e4 ]
The rdev->pm.dpm.ps allocated by kcalloc should be freed in every following error-handling path. However, in the error-handling of rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed, resulting in a memleak in this function.
--- drivers/gpu/drm/radeon/sumo_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/sumo_dpm.c +3 -1
@@ -1493,8 +1493,10 @@ static int sumo_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) +if (!rdev->pm.power_state[i].clock_info) { +kfree (rdev->pm.dpm.ps);return -EINVAL ; + } ps =kzalloc (sizeof (struct sumo_ps ),GFP_KERNEL );if (ps ==NULL ) {kfree (rdev->pm.dpm.ps);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 262/583 drm/radeon/trinity_dpm: fix a memleak in trinity_parse_power_table
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 28c28d7f77c06ac2c0b8f9c82bc04eba22912b3b ]
The rdev->pm.dpm.ps allocated by kcalloc should be freed in every following error-handling path. However, in the error-handling of rdev->pm.power_state[i].clock_info the rdev->pm.dpm.ps is not freed, resulting in a memleak in this function.
--- drivers/gpu/drm/radeon/trinity_dpm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/trinity_dpm.c +3 -1
@@ -1726,8 +1726,10 @@ static int trinity_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) +if (!rdev->pm.power_state[i].clock_info) { +kfree (rdev->pm.dpm.ps);return -EINVAL ; + } ps =kzalloc (sizeof (struct sumo_ps ),GFP_KERNEL );if (ps ==NULL ) {kfree (rdev->pm.dpm.ps);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 263/583 drm/bridge: cdns-mhdp8546: Fix use of uninitialized variable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 155d6fb61270dd297f128731cd155080deee8f3a ]
'ret' could be uninitialized at the end of the function, although it's not clear if that can happen in practice.
--- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c +2 -1
@@ -403,7 +403,8 @@ static int _cdns_mhdp_hdcp_disable(struct cdns_mhdp_device *mhdp)static int _cdns_mhdp_hdcp_enable (struct cdns_mhdp_device *mhdp,u8 content_type) { -int ret, tries =3 ; +int ret = -EINVAL ; +int tries =3 ;u32 i;for (i =0 ; i < tries; i++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 264/583 drm/bridge: tc358767: Fix return value on error case
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 32bd29b619638256c5b75fb021d6d9f12fc4a984 ]
If the hpd_pin is invalid, the driver returns 'ret'. But 'ret' contains 0, instead of an error value.
Return -EINVAL instead.
--- drivers/gpu/drm/bridge/tc358767.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -2273,7 +2273,7 @@ static int tc_probe(struct i2c_client *client) }else {if (tc->hpd_pin <0 || tc->hpd_pin >1 ) {dev_err (dev,"failed to parse HPD number\n" ); -return ret; +return -EINVAL ; } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 265/583 media: cx231xx: fix a memleak in cx231xx_init_isoc
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 5d3c8990e2bbf929cb211563dadd70708f42e4e6 ]
The dma_q->p_left_data alloced by kzalloc should be freed in all the following error handling paths. However, it hasn't been freed in the allocation error paths of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer.
On the other hand, the dma_q->p_left_data did be freed in the error-handling paths after that of dev->video_mode.isoc_ctl.urb and dev->video_mode.isoc_ctl.transfer_buffer, by calling cx231xx_uninit_isoc(dev). So the same free operation should be done in error-handling paths of those two allocation.
--- drivers/media/usb/cx231xx/cx231xx-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/usb/cx231xx/cx231xx-core.c +2 -0
@@ -1024,6 +1024,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,if (!dev->video_mode.isoc_ctl.urb) {dev_err (dev->dev,"cannot alloc memory for usb buffers\n" ); +kfree (dma_q->p_left_data);return -ENOMEM ; }
@@ -1033,6 +1034,7 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,dev_err (dev->dev,"cannot allocate memory for usbtransfer\n" );kfree (dev->video_mode.isoc_ctl.urb); +kfree (dma_q->p_left_data);return -ENOMEM ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 266/583 RDMA/hns: Fix memory leak in free_mr_init()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengchang Tang <[email protected]>
[ Upstream commit 288f535951aa81ed674f5e5477ab11b9d9351b8c ]
When a reserved QP fails to be created, the memory of the remaining created reserved QPs is leaked.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4 -0
@@ -2693,6 +2693,10 @@ static int free_mr_alloc_res(struct hns_roce_dev *hr_dev)return 0 ; create_failed_qp: +for (i--; i >=0 ; i--) { +hns_roce_v2_destroy_qp (&free_mr->rsv_qp[i]->ibqp,NULL ); +kfree (free_mr->rsv_qp[i]); + }hns_roce_destroy_cq (cq,NULL );kfree (cq);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 267/583 clk: qcom: gpucc-sm8150: Update the gpu_cc_pll1 config
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 6ebd9a4f8b8d2b35cf965a04849c4ba763722f13 ]
Update the test_ctl_hi_val and test_ctl_hi1_val of gpu_cc_pll1 as per latest HW recommendation.
--- drivers/clk/qcom/gpucc-sm8150.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/qcom/gpucc-sm8150.c +2 -2
@@ -37,8 +37,8 @@ static struct alpha_pll_config gpu_cc_pll1_config = { .config_ctl_hi_val = 0x00002267, .config_ctl_hi1_val = 0x00000024, .test_ctl_val = 0x00000000, - .test_ctl_hi_val = 0x00000002, - .test_ctl_hi1_val = 0x00000000, + .test_ctl_hi_val = 0x00000000, + .test_ctl_hi1_val = 0x00000020, .user_ctl_val = 0x00000000, .user_ctl_hi_val = 0x00000805, .user_ctl_hi1_val = 0x000000d0,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 268/583 media: bttv: start_streaming should return a proper error code
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 0d75bb6ae127f5e3fd0e2239714908fd2038193d ]
The start_streaming callback returned 0 or 1 instead of a proper error code. Fix that.
--- drivers/media/pci/bt8xx/bttv-driver.c | 6 ++---- drivers/media/pci/bt8xx/bttv-vbi.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-)
drivers/media/pci/bt8xx/bttv-driver.c +2 -4
@@ -1536,13 +1536,11 @@ static void buf_cleanup(struct vb2_buffer *vb)static int start_streaming (struct vb2_queue *q,unsigned int count) { -int ret =1 ;int seqnr =0 ;struct bttv_buffer *buf;struct bttv *btv =vb2_get_drv_priv (q); - ret =check_alloc_btres_lock (btv,RESOURCE_VIDEO_STREAM ); -if (ret ==0 ) { +if (!check_alloc_btres_lock (btv,RESOURCE_VIDEO_STREAM )) {if (btv->field_count) seqnr++;while (!list_empty (&btv->capture)) {
@@ -1553,7 +1551,7 @@ static int start_streaming(struct vb2_queue *q, unsigned int count)vb2_buffer_done (&buf->vbuf.vb2_buf,VB2_BUF_STATE_QUEUED ); } -return !ret; +return -EBUSY ; }if (!vb2_is_streaming (&btv->vbiq)) {init_irqreg (btv);
drivers/media/pci/bt8xx/bttv-vbi.c +3 -5
@@ -123,14 +123,12 @@ static void buf_cleanup_vbi(struct vb2_buffer *vb)static int start_streaming_vbi (struct vb2_queue *q,unsigned int count) { -int ret;int seqnr =0 ;struct bttv_buffer *buf;struct bttv *btv =vb2_get_drv_priv (q); btv->framedrop =0 ; - ret =check_alloc_btres_lock (btv,RESOURCE_VBI ); -if (ret ==0 ) { +if (!check_alloc_btres_lock (btv,RESOURCE_VBI )) {if (btv->field_count) seqnr++;while (!list_empty (&btv->vcapture)) {
@@ -141,13 +139,13 @@ static int start_streaming_vbi(struct vb2_queue *q, unsigned int count)vb2_buffer_done (&buf->vbuf.vb2_buf,VB2_BUF_STATE_QUEUED ); } -return !ret; +return -EBUSY ; }if (!vb2_is_streaming (&btv->capq)) {init_irqreg (btv); btv->field_count =0 ; } -return !ret; +return 0 ; }static void stop_streaming_vbi (struct vb2_queue *q)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 269/583 media: bttv: add back vbi hack
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Verkuil <[email protected]>
[ Upstream commit 3f1faa154a4316b1b585a25394697504b3c24e98 ]
The old (now removed) videobuf framework had an optional vbi hack where the sequence number of the frame counter was copied in the last 4 bytes of the buffer. This hack was active only for the read() interface (so not for streaming I/O), and it was enabled by bttv. This allowed applications that used read() for the VBI data to match it with the corresponding video frame.
When bttv was converted to vb2 this hack was forgotten, but some old applications rely on this.
So add this back, but this time in the bttv driver rather than in the vb2 framework.
--- drivers/media/pci/bt8xx/bttv-driver.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/media/pci/bt8xx/bttv-driver.c +21 -0
@@ -2772,6 +2772,27 @@ bttv_irq_wakeup_vbi(struct bttv *btv, struct bttv_buffer *wakeup,return ; wakeup->vbuf.vb2_buf.timestamp =ktime_get_ns (); wakeup->vbuf.sequence = btv->field_count >>1 ; + +/* +* Ugly hack for backwards compatibility. +* Some applications expect that the last 4 bytes of +* the VBI data contains the sequence number. +* +* This makes it possible to associate the VBI data +* with the video frame if you use read() to get the +* VBI data. +*/ +if (vb2_fileio_is_active (wakeup->vbuf.vb2_buf.vb2_queue)) { +u32 *vaddr =vb2_plane_vaddr (&wakeup->vbuf.vb2_buf,0 ); +unsigned long size = +vb2_get_plane_payload (&wakeup->vbuf.vb2_buf,0 ) /4 ; + +if (vaddr && size) { + vaddr += size -1 ; + *vaddr = wakeup->vbuf.sequence; + } + } +vb2_buffer_done (&wakeup->vbuf.vb2_buf, state);if (btv->field_count ==0 )btor (BT848_INT_VSYNC ,BT848_INT_MASK );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 270/583 media: imx-mipi-csis: Fix clock handling in remove()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 5705b0e0eb550ff834125a46a4ef99b62093d83d ]
The driver always calls mipi_csis_runtime_suspend() and mipi_csis_clk_disable() in remove(). This causes multiple WARNs from the kernel, as the clocks get disabled too many times.
Fix the remove() to call mipi_csis_runtime_suspend() and mipi_csis_clk_disable() in a way that reverses what is done in probe().
--- drivers/media/platform/nxp/imx-mipi-csis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/nxp/imx-mipi-csis.c +3 -1
@@ -1504,8 +1504,10 @@ static void mipi_csis_remove(struct platform_device *pdev)v4l2_async_nf_cleanup (&csis->notifier);v4l2_async_unregister_subdev (&csis->sd); +if (!pm_runtime_enabled (&pdev->dev)) +mipi_csis_runtime_suspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); -mipi_csis_runtime_suspend (&pdev->dev);mipi_csis_clk_disable (csis);v4l2_subdev_cleanup (&csis->sd);media_entity_cleanup (&csis->sd.entity);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 271/583 media: imx-mipi-csis: Drop extra clock enable at probe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit fb387fcb5cdd0384ba04a5d15a3605e2dccdab2a ]
The driver always enables the clocks at probe() and disables them only at remove(). It is not clear why the driver does this, as it supports runtime PM, and enables and disables the clocks in the runtime resume and suspend callbacks. Also, in the case runtime PM is not available, the driver calls the resume and suspend callbacks manually from probe() and remove().
Drop the unnecessary clock enable, thus enabling the clocks only when actually needed.
--- drivers/media/platform/nxp/imx-mipi-csis.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/media/platform/nxp/imx-mipi-csis.c +2 -11
@@ -1437,24 +1437,18 @@ static int mipi_csis_probe(struct platform_device *pdev)/* Reset PHY and enable the clocks. */ mipi_csis_phy_reset (csis); - ret =mipi_csis_clk_enable (csis); -if (ret <0 ) { -dev_err (csis->dev,"failed to enable clocks: %d\n" , ret); -return ret; - } -/* Now that the hardware is initialized, request the interrupt. */ ret =devm_request_irq (dev, irq, mipi_csis_irq_handler,0 ,dev_name (dev), csis);if (ret) {dev_err (dev,"Interrupt request failed\n" ); - goto err_disable_clock; +return ret; }/* Initialize and register the subdev. */ ret =mipi_csis_subdev_init (csis);if (ret <0 ) - goto err_disable_clock; +return ret;platform_set_drvdata (pdev, &csis->sd);
@@ -1488,8 +1482,6 @@ static int mipi_csis_probe(struct platform_device *pdev)v4l2_async_nf_unregister (&csis->notifier);v4l2_async_nf_cleanup (&csis->notifier);v4l2_async_unregister_subdev (&csis->sd); -err_disable_clock: -mipi_csis_clk_disable (csis);return ret; }
@@ -1508,7 +1500,6 @@ static void mipi_csis_remove(struct platform_device *pdev)mipi_csis_runtime_suspend (&pdev->dev);pm_runtime_disable (&pdev->dev); -mipi_csis_clk_disable (csis);v4l2_subdev_cleanup (&csis->sd);media_entity_cleanup (&csis->sd.entity);pm_runtime_set_suspended (&pdev->dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 272/583 media: dt-bindings: media: rkisp1: Fix the port description for the parallel interface
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mehdi Djait <[email protected]>
[ Upstream commit 25bf28b25a2afa1864b7143259443160d9163ea0 ]
The bus-type belongs to the endpoint's properties and should therefore be moved.
--- .../devicetree/bindings/media/rockchip-isp1.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/media/rockchip-isp1.yaml +6 -5
@@ -90,15 +90,16 @@ properties: description: connection point for input on the parallel interface properties: - bus-type: - enum: [5, 6] - endpoint: $ref: video-interfaces.yaml# unevaluatedProperties: false - required: - - bus-type + properties: + bus-type: + enum: [5, 6] + + required: + - bus-type anyOf: - required:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 273/583 media: rkisp1: Fix media device memory leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 452f604a4683654f4d9472b3126d8da61d748443 ]
Add missing calls to media_device_cleanup() to fix memory leak.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +5 -1
@@ -582,7 +582,7 @@ static int rkisp1_probe(struct platform_device *pdev) ret =v4l2_device_register (rkisp1->dev, &rkisp1->v4l2_dev);if (ret) - goto err_pm_runtime_disable; + goto err_media_dev_cleanup; ret =media_device_register (&rkisp1->media_dev);if (ret) {
@@ -617,6 +617,8 @@ static int rkisp1_probe(struct platform_device *pdev)media_device_unregister (&rkisp1->media_dev); err_unreg_v4l2_dev:v4l2_device_unregister (&rkisp1->v4l2_dev); +err_media_dev_cleanup: +media_device_cleanup (&rkisp1->media_dev); err_pm_runtime_disable:pm_runtime_disable (&pdev->dev);return ret;
@@ -637,6 +639,8 @@ static void rkisp1_remove(struct platform_device *pdev)media_device_unregister (&rkisp1->media_dev);v4l2_device_unregister (&rkisp1->v4l2_dev); +media_device_cleanup (&rkisp1->media_dev); +pm_runtime_disable (&pdev->dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 274/583 drm/msm/adreno: Fix A680 chip id
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit 3e6688fd96966b6c275e95c39aa367bc0a490ccd ]
The only A680 referenced from DeviceTree is patch level 1, which since commit '90b593ce1c9e ("drm/msm/adreno: Switch to chip-id for identifying GPU")' isn't a known chip id.
Correct the chip id to allow the A680 to be recognized again.
Patchwork: https://patchwork.freedesktop.org/patch/569839/
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -1
@@ -462,7 +462,7 @@ static const struct adreno_info gpulist[] = { { 190, 1 }, ), }, { - .chip_ids =ADRENO_CHIP_IDS (0x06080000 ), + .chip_ids =ADRENO_CHIP_IDS (0x06080001 ), .family = ADRENO_6XX_GEN2, .revn = 680, .fw = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 275/583 drm/panel: st7701: Fix AVCL calculation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Morgan <[email protected]>
[ Upstream commit 799825aa87200ade1ba21db853d1c2ff720dcfe0 ]
The AVCL register, according to the datasheet, comes in increments of -0.2v between -4.4v (represented by 0x0) to -5.0v (represented by 0x3). The current calculation is done by adding the defined AVCL value in mV to -4400 and then dividing by 200 to get the register value. Unfortunately if I subtract -4400 from -4400 I get -8800, which divided by 200 gives me -44. If I instead subtract -4400 from -4400 I get 0, which divided by 200 gives me 0. Based on the datasheet this is the expected register value.
--- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-sitronix-st7701.c +1 -1
@@ -288,7 +288,7 @@ static void st7701_init_sequence(struct st7701 *st7701)FIELD_PREP (DSI_CMD2_BK1_PWRCTRL2_AVDD_MASK ,DIV_ROUND_CLOSEST (desc->avdd_mv -6200 ,200 )) |FIELD_PREP (DSI_CMD2_BK1_PWRCTRL2_AVCL_MASK , - DIV_ROUND_CLOSEST(-4400 + desc->avcl_mv, 200))); + DIV_ROUND_CLOSEST(-4400 - desc->avcl_mv, 200)));/* T2D = 0.2us * T2D[3:0] */ ST7701_DSI(st7701, DSI_CMD2_BK1_SPD1,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 276/583 f2fs: fix to wait on block writeback for post_read case
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 55fdc1c24a1d6229fe0ecf31335fb9a2eceaaa00 ]
If inode is compressed, but not encrypted, it missed to call f2fs_wait_on_block_writeback() to wait for GCed page writeback in IPU write path.
Thread A GC-Thread
- f2fs_gc
- do_garbage_collect
- gc_data_segment
- move_data_block
- f2fs_submit_page_write migrate normal cluster's block via meta_inode's page cache
- f2fs_write_single_data_page
- f2fs_do_write_data_page
- f2fs_inplace_write_data
- f2fs_submit_page_bio
IRQ
- f2fs_read_end_io
IRQ
old data overrides new data due to out-of-order GC and common IO.
- f2fs_read_end_io
--- fs/f2fs/data.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/data.c +4 -3
@@ -2568,9 +2568,6 @@ int f2fs_encrypt_one_page(struct f2fs_io_info *fio) page = fio->compressed_page ? fio->compressed_page : fio->page; -/* wait for GCed page writeback via META_MAPPING */ -f2fs_wait_on_block_writeback (inode, fio->old_blkaddr); -if (fscrypt_inode_uses_inline_crypto (inode))return 0 ;
@@ -2752,6 +2749,10 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) goto out_writepage; } +/* wait for GCed page writeback via META_MAPPING */ +if (fio->post_read) +f2fs_wait_on_block_writeback (inode, fio->old_blkaddr); +/* * If current allocation needs SSR, * it had better in-place writes for updated data.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 277/583 f2fs: fix to check compress file in f2fs_move_file_range()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit fb9b65340c818875ea86464faf3c744bdce0055c ]
f2fs_move_file_range() doesn't support migrating compressed cluster data, let's add the missing check condition and return -EOPNOTSUPP for the case until we support it.
--- fs/f2fs/file.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/f2fs/file.c +5 -0
@@ -2818,6 +2818,11 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, goto out; } +if (f2fs_compressed_file (src) ||f2fs_compressed_file (dst)) { + ret = -EOPNOTSUPP ; + goto out_unlock; + } + ret = -EINVAL ;if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 278/583 f2fs: fix to update iostat correctly in f2fs_filemap_fault()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit bb34cc6ca87ff78f9fb5913d7619dc1389554da6 ]
In f2fs_filemap_fault(), it fixes to update iostat info only if VM_FAULT_LOCKED is tagged in return value of filemap_fault().
--- fs/f2fs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/file.c +1 -1
@@ -42,7 +42,7 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)vm_fault_t ret; ret =filemap_fault (vmf); -if (!ret) +if (ret &VM_FAULT_LOCKED )f2fs_update_iostat (F2FS_I_SB (inode), inode,APP_MAPPED_READ_IO ,F2FS_BLKSIZE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 279/583 media: dvbdev: drop refcount on error path in dvb_device_open()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit a2dd235df435a05d389240be748909ada91201d2 ]
If call to file->f_op->open() fails, then call dvb_device_put(dvbdev).
--- drivers/media/dvb-core/dvbdev.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/dvb-core/dvbdev.c +2 -0
@@ -104,6 +104,8 @@ static int dvb_device_open(struct inode *inode, struct file *file) err = file->f_op->open (inode, file);up_read (&minor_rwsem);mutex_unlock (&dvbdev_mutex); +if (err) +dvb_device_put (dvbdev);return err; } fail:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 280/583 media: dvb-frontends: m88ds3103: Fix a memory leak in an error handling path of m88ds3103_probe()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 5b2f885e2f6f482d05c23f04c8240f7b4fc5bdb5 ]
If an error occurs after a successful i2c_mux_add_adapter(), then i2c_mux_del_adapters() should be called to free some resources, as already done in the remove function.
--- drivers/media/dvb-frontends/m88ds3103.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/dvb-frontends/m88ds3103.c +5 -2
@@ -1894,7 +1894,7 @@ static int m88ds3103_probe(struct i2c_client *client)/* get frontend address */ ret =regmap_read (dev->regmap,0x29 , &utmp);if (ret) - goto err_kfree; + goto err_del_adapters; dev->dt_addr = ((utmp &0x80 ) ==0 ) ?0x42 >>1 :0x40 >>1 ;dev_dbg (&client->dev,"dt addr is 0x%02x\n" , dev->dt_addr);
@@ -1902,11 +1902,14 @@ static int m88ds3103_probe(struct i2c_client *client) dev->dt_addr);if (IS_ERR (dev->dt_client)) { ret =PTR_ERR (dev->dt_client); - goto err_kfree; + goto err_del_adapters; } }return 0 ; + +err_del_adapters: +i2c_mux_del_adapters (dev->muxc); err_kfree:kfree (dev); err:
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 281/583 clk: renesas: rzg2l-cpg: Reuse code in rzg2l_cpg_reset()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 5f9e29b9159a41fcf6733c3b59fa46a90ce3ae20 ]
Code in rzg2l_cpg_reset() is equivalent with the combined code of rzg2l_cpg_assert() and rzg2l_cpg_deassert(). There is no need to have different versions thus re-use rzg2l_cpg_assert() and rzg2l_cpg_deassert().
Stable-dep-of: da235d2fac21 ("clk: renesas: rzg2l: Check reset monitor registers")
--- drivers/clk/renesas/rzg2l-cpg.c | 38 +++++++++++++-------------------- 1 file changed, 15 insertions(+), 23 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +15 -23
@@ -1105,29 +1105,6 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod,#define rcdev_to_priv (x) container_of(x, struct rzg2l_cpg_priv, rcdev) -static int rzg2l_cpg_reset (struct reset_controller_dev *rcdev, -unsigned long id) -{ -struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev); -const struct rzg2l_cpg_info *info = priv->info; -unsigned int reg = info->resets[id].off; -u32 dis =BIT (info->resets[id].bit); -u32 we = dis <<16 ; - -dev_dbg (rcdev->dev,"reset id:%ld offset:0x%x\n" , id,CLK_RST_R (reg)); - -/* Reset module */ -writel (we, priv->base +CLK_RST_R (reg)); - -/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ -udelay (35 ); - -/* Release module from reset state */ -writel (we | dis, priv->base +CLK_RST_R (reg)); - -return 0 ; -} -static int rzg2l_cpg_assert (struct reset_controller_dev *rcdev,unsigned long id) {
@@ -1158,6 +1135,21 @@ static int rzg2l_cpg_deassert(struct reset_controller_dev *rcdev,return 0 ; } +static int rzg2l_cpg_reset (struct reset_controller_dev *rcdev, +unsigned long id) +{ +int ret; + + ret =rzg2l_cpg_assert (rcdev, id); +if (ret) +return ret; + +/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ +udelay (35 ); + +return rzg2l_cpg_deassert (rcdev, id); +} +static int rzg2l_cpg_status (struct reset_controller_dev *rcdev,unsigned long id) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 282/583 clk: renesas: rzg2l: Check reset monitor registers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit da235d2fac212d0add570e755feb1167a830bc99 ]
The hardware manual of both RZ/G2L and RZ/G3S specifies that the reset monitor registers need to be interrogated when the reset signals are toggled (chapters "Procedures for Supplying and Stopping Reset Signals" and "Procedure for Activating Modules"). Without this, there is a chance that different modules (e.g. Ethernet) are not ready after their reset signal is toggled, leading to failures (on probe or resume from deep sleep states).
The same indications are available for RZ/V2M for TYPE-B reset controls.
--- drivers/clk/renesas/rzg2l-cpg.c | 59 ++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 15 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +44 -15
@@ -1111,12 +1111,27 @@ static int rzg2l_cpg_assert(struct reset_controller_dev *rcdev,struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev);const struct rzg2l_cpg_info *info = priv->info;unsigned int reg = info->resets[id].off; -u32 value =BIT (info->resets[id].bit) <<16 ; +u32 mask =BIT (info->resets[id].bit); +s8 monbit = info->resets[id].monbit; +u32 value = mask <<16 ;dev_dbg (rcdev->dev,"assert id:%ld offset:0x%x\n" , id,CLK_RST_R (reg));writel (value, priv->base +CLK_RST_R (reg)); -return 0 ; + +if (info->has_clk_mon_regs) { + reg =CLK_MRST_R (reg); + }else if (monbit >=0 ) { + reg =CPG_RST_MON ; + mask =BIT (monbit); + }else { +/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ +udelay (35 ); +return 0 ; + } + +return readl_poll_timeout_atomic (priv->base + reg, value, + value & mask,10 ,200 ); } static int rzg2l_cpg_deassert(struct reset_controller_dev *rcdev,
@@ -1125,14 +1140,28 @@ static int rzg2l_cpg_deassert(struct reset_controller_dev *rcdev,struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev);const struct rzg2l_cpg_info *info = priv->info;unsigned int reg = info->resets[id].off; -u32 dis =BIT (info->resets[id].bit); -u32 value = (dis <<16 ) | dis; +u32 mask =BIT (info->resets[id].bit); +s8 monbit = info->resets[id].monbit; +u32 value = (mask <<16 ) | mask;dev_dbg (rcdev->dev,"deassert id:%ld offset:0x%x\n" , id,CLK_RST_R (reg));writel (value, priv->base +CLK_RST_R (reg)); -return 0 ; + +if (info->has_clk_mon_regs) { + reg =CLK_MRST_R (reg); + }else if (monbit >=0 ) { + reg =CPG_RST_MON ; + mask =BIT (monbit); + }else { +/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ +udelay (35 ); +return 0 ; + } + +return readl_poll_timeout_atomic (priv->base + reg, value, + !(value & mask),10 ,200 ); } static int rzg2l_cpg_reset(struct reset_controller_dev *rcdev,
@@ -1144,9 +1173,6 @@ static int rzg2l_cpg_reset(struct reset_controller_dev *rcdev,if (ret)return ret; -/* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ -udelay (35 ); -return rzg2l_cpg_deassert (rcdev, id); }
@@ -1155,18 +1181,21 @@ static int rzg2l_cpg_status(struct reset_controller_dev *rcdev, {struct rzg2l_cpg_priv *priv =rcdev_to_priv (rcdev);const struct rzg2l_cpg_info *info = priv->info; -unsigned int reg = info->resets[id].off; -u32 bitmask =BIT (info->resets[id].bit);s8 monbit = info->resets[id].monbit; +unsigned int reg; +u32 bitmask;if (info->has_clk_mon_regs) { -return !!(readl (priv->base +CLK_MRST_R (reg)) & bitmask); + reg =CLK_MRST_R (info->resets[id].off); + bitmask =BIT (info->resets[id].bit); }else if (monbit >=0 ) { -u32 monbitmask =BIT (monbit); - -return !!(readl (priv->base +CPG_RST_MON ) & monbitmask); + reg =CPG_RST_MON ; + bitmask =BIT (monbit); + }else { +return -ENOTSUPP ; } -return -ENOTSUPP ; + +return !!(readl (priv->base + reg) & bitmask); }static const struct reset_control_ops rzg2l_cpg_reset_ops = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 283/583 drm/msm/dpu: Set input_sel bit for INTF
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jessica Zhang <[email protected]>
[ Upstream commit 980fffd0c69e5df0f67ee089d405899d532aeeab ]
Set the input_sel bit for encoders as it was missed in the initial implementation.
Patchwork: https://patchwork.freedesktop.org/patch/572007/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 9 +++++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +1 -1
@@ -320,7 +320,7 @@ static u32 dpu_hw_intf_get_line_count(struct dpu_hw_intf *intf)static void dpu_hw_intf_setup_misr (struct dpu_hw_intf *intf,bool enable,u32 frame_count) { -dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL , enable, frame_count); +dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL , enable, frame_count,0x1 ); }static int dpu_hw_intf_collect_misr (struct dpu_hw_intf *intf,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +1 -1
@@ -83,7 +83,7 @@ static void dpu_hw_lm_setup_border_color(struct dpu_hw_mixer *ctx,static void dpu_hw_lm_setup_misr (struct dpu_hw_mixer *ctx,bool enable,u32 frame_count) { -dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL , enable, frame_count); +dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL , enable, frame_count,0x0 ); }static int dpu_hw_lm_collect_misr (struct dpu_hw_mixer *ctx,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c +7 -2
@@ -481,9 +481,13 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset, cfg->danger_safe_en ? QOS_QOS_CTRL_DANGER_SAFE_EN : 0); } +/* +* note: Aside from encoders, input_sel should be set to 0x0 by default +*/ void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c,u32 misr_ctrl_offset, -bool enable,u32 frame_count) +bool enable,u32 frame_count, +u8 input_sel) {u32 config =0 ;
@@ -494,7 +498,8 @@ void dpu_hw_setup_misr(struct dpu_hw_blk_reg_map *c,if (enable) { config = (frame_count &MISR_FRAME_COUNT_MASK ) | -MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK ; +MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK | + ((input_sel &0xF ) <<24 );DPU_REG_WRITE (c, misr_ctrl_offset, config); }else {
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +2 -1
@@ -360,7 +360,8 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset,void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c,u32 misr_ctrl_offset,bool enable, -u32 frame_count); +u32 frame_count, +u8 input_sel); int dpu_hw_collect_misr(struct dpu_hw_blk_reg_map *c, u32 misr_ctrl_offset,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 284/583 drm/msm/dpu: Drop enable and frame_count parameters from dpu_hw_setup_misr()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jessica Zhang <[email protected]>
[ Upstream commit 3313c23f3eab698bc6b904520ee608fc0f7b03d0 ]
Drop the enable and frame_count parameters from dpu_hw_setup_misr() as they are always set to the same values.
In addition, replace MISR_FRAME_COUNT_MASK with MISR_FRAME_COUNT as frame_count is always set to the same value.
Patchwork: https://patchwork.freedesktop.org/patch/572009/
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 4 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 6 +++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 19 +++++-------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 9 +++------ 8 files changed, 22 insertions(+), 33 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved. * Copyright (C) 2013 Red Hat * Author: Rob Clark <[email protected]>
@@ -125,7 +125,7 @@ static void dpu_crtc_setup_lm_misr(struct dpu_crtc_state *crtc_state)continue ;/* Calculate MISR over 1 frame */ - m->hw_lm->ops.setup_misr (m->hw_lm, true,1 ); + m->hw_lm->ops.setup_misr (m->hw_lm); } }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +2 -2
@@ -2,7 +2,7 @@/* * Copyright (C) 2013 Red Hat * Copyright (c) 2014-2018, 2020-2021 The Linux Foundation. All rights reserved. -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * * Author: Rob Clark <[email protected]> */
@@ -255,7 +255,7 @@ void dpu_encoder_setup_misr(const struct drm_encoder *drm_enc)if (!phys->hw_intf || !phys->hw_intf->ops.setup_misr)continue ; - phys->hw_intf->ops.setup_misr (phys->hw_intf, true,1 ); + phys->hw_intf->ops.setup_misr (phys->hw_intf); } }
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c +3 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. */
@@ -318,9 +318,9 @@ static u32 dpu_hw_intf_get_line_count(struct dpu_hw_intf *intf)return DPU_REG_READ (c,INTF_LINE_COUNT ); } -static void dpu_hw_intf_setup_misr (struct dpu_hw_intf *intf,bool enable,u32 frame_count) +static void dpu_hw_intf_setup_misr (struct dpu_hw_intf *intf) { -dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL , enable, frame_count,0x1 ); +dpu_hw_setup_misr (&intf->hw,INTF_MISR_CTRL ,0x1 ); }static int dpu_hw_intf_collect_misr (struct dpu_hw_intf *intf,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. */
@@ -94,7 +94,7 @@ struct dpu_hw_intf_ops {void (*bind_pingpong_blk)(struct dpu_hw_intf *intf,const enum dpu_pingpong pp); -void (*setup_misr)(struct dpu_hw_intf *intf,bool enable,u32 frame_count); +void (*setup_misr)(struct dpu_hw_intf *intf);int (*collect_misr)(struct dpu_hw_intf *intf,u32 *misr_value);// Tearcheck on INTF since DPU 5.0.0
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +3 -3
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */
@@ -81,9 +81,9 @@ static void dpu_hw_lm_setup_border_color(struct dpu_hw_mixer *ctx, } } -static void dpu_hw_lm_setup_misr (struct dpu_hw_mixer *ctx,bool enable,u32 frame_count) +static void dpu_hw_lm_setup_misr (struct dpu_hw_mixer *ctx) { -dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL , enable, frame_count,0x0 ); +dpu_hw_setup_misr (&ctx->hw,LM_MISR_CTRL ,0x0 ); }static int dpu_hw_lm_collect_misr (struct dpu_hw_mixer *ctx,u32 *misr_value)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h +2 -1
@@ -1,5 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */
@@ -57,7 +58,7 @@ struct dpu_hw_lm_ops {/** * setup_misr: Enable/disable MISR */ -void (*setup_misr)(struct dpu_hw_mixer *ctx,bool enable,u32 frame_count); +void (*setup_misr)(struct dpu_hw_mixer *ctx);/** * collect_misr: Read MISR signature
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c +5 -14
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. */ #define pr_fmt (fmt) "[drm:%s:%d] " fmt, __func__, __LINE__
@@ -485,9 +485,7 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset,* note: Aside from encoders, input_sel should be set to 0x0 by default */ void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c, -u32 misr_ctrl_offset, -bool enable,u32 frame_count, -u8 input_sel) +u32 misr_ctrl_offset,u8 input_sel) {u32 config =0 ;
@@ -496,16 +494,9 @@ void dpu_hw_setup_misr(struct dpu_hw_blk_reg_map *c,/* Clear old MISR value (in case it's read before a new value is calculated)*/ wmb (); -if (enable) { - config = (frame_count &MISR_FRAME_COUNT_MASK ) | -MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK | - ((input_sel &0xF ) <<24 ); - -DPU_REG_WRITE (c, misr_ctrl_offset, config); - }else { -DPU_REG_WRITE (c, misr_ctrl_offset,0 ); - } - + config =MISR_FRAME_COUNT |MISR_CTRL_ENABLE |MISR_CTRL_FREE_RUN_MASK | + ((input_sel &0xF ) <<24 ); +DPU_REG_WRITE (c, misr_ctrl_offset, config); } int dpu_hw_collect_misr(struct dpu_hw_blk_reg_map *c,
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +3 -6
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. */
@@ -13,7 +13,7 @@#include "dpu_hw_catalog.h" #define REG_MASK (n) ((BIT(n)) - 1) -#define MISR_FRAME_COUNT_MASK 0xFF +#define MISR_FRAME_COUNT 0x1#define MISR_CTRL_ENABLE BIT(8)#define MISR_CTRL_STATUS BIT(9)#define MISR_CTRL_STATUS_CLEAR BIT(10)
@@ -358,10 +358,7 @@ void _dpu_hw_setup_qos_lut(struct dpu_hw_blk_reg_map *c, u32 offset, const struct dpu_hw_qos_cfg *cfg);void dpu_hw_setup_misr (struct dpu_hw_blk_reg_map *c, -u32 misr_ctrl_offset, -bool enable, -u32 frame_count, -u8 input_sel); +u32 misr_ctrl_offset,u8 input_sel); int dpu_hw_collect_misr(struct dpu_hw_blk_reg_map *c, u32 misr_ctrl_offset,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 285/583 drm/mediatek: Return error if MDP RDMA failed to enable the clock
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 21b287146adf39304193e4c49198021e06a28ded ]
Return the result of clk_prepare_enable() instead of always returns 0.
--- drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_mdp_rdma.c +1 -2
@@ -246,8 +246,7 @@ int mtk_mdp_rdma_clk_enable(struct device *dev) {struct mtk_mdp_rdma *rdma =dev_get_drvdata (dev); -clk_prepare_enable (rdma->clk); -return 0 ; +return clk_prepare_enable (rdma->clk); }void mtk_mdp_rdma_clk_disable (struct device *dev)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 286/583 drm/mediatek: Remove the redundant driver data for DPI
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 8ac6935e5689a491f0bec78fec732722b3dad094 ]
DPI input is in 1T2P mode on both MT8195 and MT8188. Remove the redundant driver data to align the settings, or the screen will glitch.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +1 -15
@@ -957,20 +957,6 @@ static const struct mtk_dpi_conf mt8186_conf = { .csc_enable_bit = CSC_ENABLE, }; -static const struct mtk_dpi_conf mt8188_dpintf_conf = { - .cal_factor = mt8195_dpintf_calculate_factor, - .max_clock_khz =600000 , - .output_fmts = mt8195_output_fmts, - .num_output_fmts =ARRAY_SIZE (mt8195_output_fmts), - .pixels_per_iter =4 , - .input_2pixel = false, - .dimension_mask =DPINTF_HPW_MASK , - .hvsize_mask =DPINTF_HSIZE_MASK , - .channel_swap_shift =DPINTF_CH_SWAP , - .yuv422_en_bit =DPINTF_YUV422_EN , - .csc_enable_bit =DPINTF_CSC_ENABLE , -}; -static const struct mtk_dpi_conf mt8192_conf = { .cal_factor = mt8183_calculate_factor, .reg_h_fre_con =0xe0 ,
@@ -1094,7 +1080,7 @@ static const struct of_device_id mtk_dpi_of_ids[] = { { .compatible = "mediatek,mt8173-dpi", .data = &mt8173_conf }, { .compatible = "mediatek,mt8183-dpi", .data = &mt8183_conf }, { .compatible = "mediatek,mt8186-dpi", .data = &mt8186_conf }, - { .compatible = "mediatek,mt8188-dp-intf", .data = &mt8188_dpintf_conf }, + { .compatible = "mediatek,mt8188-dp-intf", .data = &mt8195_dpintf_conf }, { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf }, { .compatible = "mediatek,mt8195-dp-intf", .data = &mt8195_dpintf_conf }, { /* sentinel */ },
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 287/583 drm/mediatek: Fix underrun in VDO1 when switches off the layer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsiao Chien Sung <[email protected]>
[ Upstream commit 73b5ab27ab2ee616f2709dc212c2b0007894a12e ]
Do not reset Merge while using CMDQ because reset API doesn't wait for frame done event as CMDQ does and could lead to underrun when the layer is switching off.
--- drivers/gpu/drm/mediatek/mtk_disp_merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_disp_merge.c +1 -1
@@ -103,7 +103,7 @@ void mtk_merge_stop_cmdq(struct device *dev, struct cmdq_pkt *cmdq_pkt)mtk_ddp_write (cmdq_pkt,0 , &priv->cmdq_reg, priv->regs,DISP_REG_MERGE_CTRL ); -if (priv->async_clk) +if (!cmdq_pkt && priv->async_clk)reset_control_reset (priv->reset_ctl); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 288/583 drm/amdgpu/debugfs: fix error code when smc register accessors are NULL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit afe58346d5d3887b3e49ff623d2f2e471f232a8d ]
Should be -EOPNOTSUPP.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2 -2
@@ -755,7 +755,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,int r;if (!adev->smc_rreg) -return -EPERM ; +return -EOPNOTSUPP ;if (size &0x3 || *pos &0x3 )return -EINVAL ;
@@ -814,7 +814,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *int r;if (!adev->smc_wreg) -return -EPERM ; +return -EOPNOTSUPP ;if (size &0x3 || *pos &0x3 )return -EINVAL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 289/583 drm/amd/pm: fix a double-free in si_dpm_init
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit ac16667237a82e2597e329eb9bc520d1cf9dff30 ]
When the allocation of adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries fails, amdgpu_free_extended_power_table is called to free some fields of adev. However, when the control flow returns to si_dpm_sw_init, it goes to label dpm_failed and calls si_dpm_fini, which calls amdgpu_free_extended_power_table again and free those fields again. Thus a double-free is triggered.
--- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +2 -3
@@ -7379,10 +7379,9 @@ static int si_dpm_init(struct amdgpu_device *adev)kcalloc (4 ,sizeof (struct amdgpu_clock_voltage_dependency_entry ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries)return -ENOMEM ; - } + adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.count =4 ; adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0 ].clk =0 ; adev->pm.dpm.dyn_state.vddc_dependency_on_dispclk.entries[0 ].v =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 290/583 drivers/amd/pm: fix a use-after-free in kv_parse_power_table
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit 28dd788382c43b330480f57cd34cde0840896743 ]
When ps allocated by kzalloc equals to NULL, kv_parse_power_table frees adev->pm.dpm.ps that allocated before. However, after the control flow goes through the following call chains:
kv_parse_power_table
|-> kv_dpm_init
|-> kv_dpm_sw_init |-> kv_dpm_fini
The adev->pm.dpm.ps is used in the for loop of kv_dpm_fini after its first free in kv_parse_power_table and causes a use-after-free bug.
--- drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c +1 -3
@@ -2735,10 +2735,8 @@ static int kv_parse_power_table(struct amdgpu_device *adev) non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; ps =kzalloc (sizeof (struct kv_ps ),GFP_KERNEL ); -if (ps ==NULL ) { -kfree (adev->pm.dpm.ps); +if (ps ==NULL )return -ENOMEM ; - } adev->pm.dpm.ps[i].ps_priv = ps; k =0 ; idx = (u8 *)&power_state->v2.clockInfoIndex[0 ];
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 291/583 gpu/drm/radeon: fix two memleaks in radeon_vm_init
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit c2709b2d6a537ca0fa0f1da36fdaf07e48ef447d ]
When radeon_bo_create and radeon_vm_clear_bo fail, the vm->page_tables allocated before need to be freed. However, neither radeon_vm_init itself nor its caller have done such deallocation.
--- drivers/gpu/drm/radeon/radeon_vm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_vm.c +6 -2
@@ -1204,13 +1204,17 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm) r =radeon_bo_create (rdev, pd_size, align, true,RADEON_GEM_DOMAIN_VRAM ,0 ,NULL ,NULL , &vm->page_directory); -if (r) +if (r) { +kfree (vm->page_tables); + vm->page_tables =NULL ;return r; - + } r =radeon_vm_clear_bo (rdev, vm->page_directory);if (r) {radeon_bo_unref (&vm->page_directory); vm->page_directory =NULL ; +kfree (vm->page_tables); + vm->page_tables =NULL ;return r; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 292/583 drm/amd/pm: fix a double-free in amdgpu_parse_extended_power_table
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhipeng Lu <[email protected]>
[ Upstream commit a6582701178a47c4d0cb2188c965c59c0c0647c8 ]
The amdgpu_free_extended_power_table is called in every error-handling paths of amdgpu_parse_extended_power_table. However, after the following call chain of returning:
amdgpu_parse_extended_power_table
|-> kv_dpm_init / si_dpm_init
(the only two caller of amdgpu_parse_extended_power_table)
|-> kv_dpm_sw_init / si_dpm_sw_init
(the only caller of kv_dpm_init / si_dpm_init, accordingly)
|-> kv_dpm_fini / si_dpm_fini
(goto dpm_failed in xx_dpm_sw_init)
|-> amdgpu_free_extended_power_table
As above, the amdgpu_free_extended_power_table is called twice in this returning chain and thus a double-free is triggered. Similarily, the last kfree in amdgpu_parse_extended_power_table also cause a double free with amdgpu_free_extended_power_table in kv_dpm_fini.
--- .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 52 +++++-------------- 1 file changed, 13 insertions(+), 39 deletions(-)
drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c +13 -39
@@ -272,10 +272,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usVddcDependencyOnSCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.vddc_dependency_on_sclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usVddciDependencyOnMCLKOffset) { dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
@@ -283,10 +281,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usVddciDependencyOnMCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.vddci_dependency_on_mclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usVddcDependencyOnMCLKOffset) { dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
@@ -294,10 +290,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usVddcDependencyOnMCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.vddc_dependency_on_mclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usMvddDependencyOnMCLKOffset) { dep_table = (ATOM_PPLIB_Clock_Voltage_Dependency_Table *)
@@ -305,10 +299,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(power_info->pplib4.usMvddDependencyOnMCLKOffset)); ret =amdgpu_parse_clk_voltage_dep_table (&adev->pm.dpm.dyn_state.mvdd_dependency_on_mclk, dep_table); -if (ret) { -amdgpu_free_extended_power_table (adev); +if (ret)return ret; - } }if (power_info->pplib4.usMaxClockVoltageOnDCOffset) { ATOM_PPLIB_Clock_Voltage_Limit_Table *clk_v =
@@ -339,10 +331,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)kcalloc (psl->ucNumEntries,sizeof (struct amdgpu_phase_shedding_limits_entry ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.phase_shedding_limits_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.phase_shedding_limits_table.entries)return -ENOMEM ; - } entry = &psl->entries[0 ];for (i =0 ; i < psl->ucNumEntries; i++) {
@@ -383,10 +373,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)ATOM_PPLIB_CAC_Leakage_Record *entry;u32 size = cac_table->ucNumEntries *sizeof (struct amdgpu_cac_leakage_table ); adev->pm.dpm.dyn_state.cac_leakage_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.cac_leakage_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.cac_leakage_table.entries)return -ENOMEM ; - } entry = &cac_table->entries[0 ];for (i =0 ; i < cac_table->ucNumEntries; i++) {if (adev->pm.dpm.platform_caps &ATOM_PP_PLATFORM_CAP_EVV ) {
@@ -438,10 +426,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_vce_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.vce_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -493,10 +479,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_uvd_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.uvd_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -525,10 +509,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.samu_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -548,10 +530,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) le16_to_cpu(ext_hdr->usPPMTableOffset)); adev->pm.dpm.dyn_state.ppm_table =kzalloc (sizeof (struct amdgpu_ppm_table ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.ppm_table) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.ppm_table)return -ENOMEM ; - } adev->pm.dpm.dyn_state.ppm_table->ppm_design = ppm->ucPpmDesign; adev->pm.dpm.dyn_state.ppm_table->cpu_core_number =le16_to_cpu (ppm->usCpuCoreNumber);
@@ -583,10 +563,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)sizeof (struct amdgpu_clock_voltage_dependency_entry ); adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.entries =kzalloc (size,GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.entries) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.entries)return -ENOMEM ; - } adev->pm.dpm.dyn_state.acp_clock_voltage_dependency_table.count = limits->numEntries; entry = &limits->entries[0 ];
@@ -606,10 +584,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev)ATOM_PowerTune_Table *pt; adev->pm.dpm.dyn_state.cac_tdp_table =kzalloc (sizeof (struct amdgpu_cac_tdp_table ),GFP_KERNEL ); -if (!adev->pm.dpm.dyn_state.cac_tdp_table) { -amdgpu_free_extended_power_table (adev); +if (!adev->pm.dpm.dyn_state.cac_tdp_table)return -ENOMEM ; - }if (rev >0 ) { ATOM_PPLIB_POWERTUNE_Table_V1 *ppt = (ATOM_PPLIB_POWERTUNE_Table_V1 *) (mode_info->atom_context->bios + data_offset +
@@ -645,10 +621,8 @@ int amdgpu_parse_extended_power_table(struct amdgpu_device *adev) ret =amdgpu_parse_clk_voltage_dep_table ( &adev->pm.dpm.dyn_state.vddgfx_dependency_on_sclk, dep_table); -if (ret) { -kfree (adev->pm.dpm.dyn_state.vddgfx_dependency_on_sclk.entries); +if (ret)return ret; - } } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 293/583 f2fs: fix to check return value of f2fs_recover_xattr_data
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiguo Niu <[email protected]>
[ Upstream commit 86d7d57a3f096c8349b32a0cd5f6f314e4416a6d ]
Should check return value of f2fs_recover_xattr_data in __f2fs_setxattr rather than doing invalid retry if error happen.
Also just do set_page_dirty in f2fs_recover_xattr_data when page is changed really.
--- fs/f2fs/node.c | 6 +++--- fs/f2fs/xattr.c | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-)
fs/f2fs/node.c +3 -3
@@ -2751,11 +2751,11 @@ int f2fs_recover_xattr_data(struct inode *inode, struct page *page)f2fs_update_inode_page (inode);/* 3: update and set xattr node page dirty */ -if (page) +if (page) {memcpy (F2FS_NODE (xpage),F2FS_NODE (page),VALID_XATTR_BLOCK_SIZE ); - -set_page_dirty (xpage); +set_page_dirty (xpage); + }f2fs_put_page (xpage,1 );return 0 ;
fs/f2fs/xattr.c +7 -4
@@ -660,11 +660,14 @@ static int __f2fs_setxattr(struct inode *inode, int index, here =__find_xattr (base_addr, last_base_addr,NULL , index, len, name);if (!here) {if (!F2FS_I (inode)->i_xattr_nid) { + error =f2fs_recover_xattr_data (inode,NULL );f2fs_notice (F2FS_I_SB (inode), -"recover xattr in inode (%lu)" , inode->i_ino); -f2fs_recover_xattr_data (inode,NULL ); -kfree (base_addr); - goto retry; +"recover xattr in inode (%lu), error(%d)" , + inode->i_ino, error); +if (!error) { +kfree (base_addr); + goto retry; + } }f2fs_err (F2FS_I_SB (inode),"set inode (%lu) has corrupted xattr" , inode->i_ino);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 294/583 dt-bindings: clock: Update the videocc resets for sm8150
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Satya Priya Kakitapalli <[email protected]>
[ Upstream commit 3185f96968eedd117ec72ee7b87ead44b6d1bbbd ]
Add all the available resets for the video clock controller on sm8150.
Stable-dep-of: 1fd9a939db24 ("clk: qcom: videocc-sm8150: Update the videocc resets")
--- include/dt-bindings/clock/qcom,videocc-sm8150.h | 4 ++++ 1 file changed, 4 insertions(+)
include/dt-bindings/clock/qcom,videocc-sm8150.h +4 -0
@@ -16,6 +16,10 @@/* VIDEO_CC Resets */ #define VIDEO_CC_MVSC_CORE_CLK_BCR 0 +#define VIDEO_CC_INTERFACE_BCR 1 +#define VIDEO_CC_MVS0_BCR 2 +#define VIDEO_CC_MVS1_BCR 3 +#define VIDEO_CC_MVSC_BCR 4/* VIDEO_CC GDSCRs */ #define VENUS_GDSC 0
Signature · 1 line
2.43.0