July 2023 - Linux-stable-mirror

Re: [PATCH 6.4 000/227] 6.4.7-rc1 review

by Ronald Warsow

Hi Greg 6.4.7-rc1 compiles, boots and runs here on x86_64 (Intel Rocket Lake, i5-11400) Thanks Tested-by: Ronald Warsow <rwarsow(a)gmx.de>

2 years, 3 months

1
0
0 0

[RFC 2/3] PCI: acpiphp: Reassign resources on bridge if necessary

by Igor Mammedov

When using ACPI PCI hotplug, hotplugging a device with large BARs may fail if bridge windows programmed by firmware are not large enough. Reproducer: $ qemu-kvm -monitor stdio -M q35 -m 4G \ -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=on \ -device id=rp1,pcie-root-port,bus=pcie.0,chassis=4 \ disk_image wait till linux guest boots, then hotplug device: (qemu) device_add qxl,bus=rp1 hotplug on guest side fails with: pci 0000:01:00.0: [1b36:0100] type 00 class 0x038000 pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x03ffffff] pci 0000:01:00.0: reg 0x14: [mem 0x00000000-0x03ffffff] pci 0000:01:00.0: reg 0x18: [mem 0x00000000-0x00001fff] pci 0000:01:00.0: reg 0x1c: [io 0x0000-0x001f] pci 0000:01:00.0: BAR 0: no space for [mem size 0x04000000] pci 0000:01:00.0: BAR 0: failed to assign [mem size 0x04000000] pci 0000:01:00.0: BAR 1: no space for [mem size 0x04000000] pci 0000:01:00.0: BAR 1: failed to assign [mem size 0x04000000] pci 0000:01:00.0: BAR 2: assigned [mem 0xfe800000-0xfe801fff] pci 0000:01:00.0: BAR 3: assigned [io 0x1000-0x101f] qxl 0000:01:00.0: enabling device (0000 -> 0003) Unable to create vram_mapping qxl: probe of 0000:01:00.0 failed with error -12 However when using native PCIe hotplug '-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' it works fine, since kernel attempts to reassign unused resources. Use the same machinery as native PCIe hotplug to (re)assign resources. Link: https://lore.kernel.org/r/20230424191557.2464760-1-imammedo@redhat.com Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas(a)google.com> Acked-by: Michael S. Tsirkin <mst(a)redhat.com> Acked-by: Rafael J. Wysocki <rafael(a)kernel.org> Cc: stable(a)vger.kernel.org --- drivers/pci/hotplug/acpiphp_glue.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index af1c73f2bee6..c0ffb1389fda 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -499,7 +499,6 @@ pci_info(bus, "enable_slot bus: bridge: %d, bus->self: %p\n", bridge, bus->self) acpiphp_native_scan_bridge(dev); } } else { - LIST_HEAD(add_list); int max, pass; acpiphp_rescan_slot(slot); @@ -513,12 +512,10 @@ pci_info(bus, "enable_slot bus: bridge: %d, bus->self: %p\n", bridge, bus->self) if (pass && dev->subordinate) { check_hotplug_bridge(slot, dev); pcibios_resource_survey_bus(dev->subordinate); - __pci_bus_size_bridges(dev->subordinate, - &add_list); } } } - __pci_bus_assign_resources(bus, &add_list, NULL); + pci_assign_unassigned_bridge_resources(bus->self); } acpiphp_sanitize_bus(bus); -- 2.39.3

2 years, 3 months

1
0
0 0

[PATCH 6.1 0/7] Backports for "drm/amd/display: Add polling method to handle MST reply packet"

by Mario Limonciello

"drm/amd/display: Add polling method to handle MST reply packet" was intended to be backported to kernel 6.1 to solve usage of some non-spec compliant MST hubs. This series has a variety of dependencies across amdgpu_dm though, so the backport requires several manual fixups to avoid hitting file and symbol renames. Details of individual changes are in the commit message for each patch. Hamza Mahfooz (1): drm/amd/display: use max_dsc_bpp in amdgpu_dm Hersen Wu (1): drm/amd/display: fix linux dp link lost handled only one time Qingqing Zhuo (1): drm/amd/display: force connector state when bpc changes during compliance Srinivasan Shanmugam (2): drm/amd/display: fix some coding style issues drm/amd/display: Clean up errors & warnings in amdgpu_dm.c Wayne Lin (2): drm/dp_mst: Clear MSG_RDY flag before sending new message drm/amd/display: Add polling method to handle MST reply packet .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 407 +++++++++--------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 12 + .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 125 ++++++ .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 121 +++++- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 11 + .../gpu/drm/amd/display/dc/core/dc_link_dp.c | 141 +----- drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 + .../gpu/drm/amd/display/dc/inc/dc_link_dp.h | 4 + drivers/gpu/drm/display/drm_dp_mst_topology.c | 54 ++- drivers/gpu/drm/i915/display/intel_dp.c | 7 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 +- include/drm/display/drm_dp_mst_helper.h | 7 +- 12 files changed, 571 insertions(+), 336 deletions(-) -- 2.34.1

2 years, 3 months

2
8
0 0

Kernel 6.4.y stable backports for "drm/amd/display: Add polling method to handle MST reply packet"

by Limonciello, Mario

Hi, The patch "4f6d9e38c4d2 ("drm/amd/display: Add polling method to handle MST reply packet")" was tagged for stable, but it failed to apply to both 6.4.y and 6.1.y. The 6.4.y backport is missing a dependency. So to fix this can you please apply: 87279fdf5ee0 ("drm/amd/display: Clean up errors & warnings in amdgpu_dm.c") 4f6d9e38c4d2 ("drm/amd/display: Add polling method to handle MST reply packet") I intend to also send out a proper 6.1.y backport, but it's a lot more complex due to other driver changes and will come separately. Thanks,

2 years, 3 months

2
1
0 0

RE:Gym sack 2023/7/2516:51:02

by Steven

Hi, Wish my email finds you well. This is Steven from Xiamen Oready Industry & Trade Co.,Ltd. We are one of the leading manufacturer of bags in Xiamen,China. Here is a good quality drawstring backpack I would like to recommend to you: Material: 300D polyester + 10mm cord. Size: 38x42cm Side zipper pocket fits with mobile phone and keys. Print: silkscreen print / heat transfer print / sublimation print MOQ: 1000 pcs We have many more designs you may like, please don't hesitate to contact me if you have any inquiry. Best regards, Steven Xiu Xiamen Oready Industry & Trade Co.,Ltd. Why, Lord Anvers asked me to marry him The mid-day sun beat down upon the stone "Scales 2023/7/25 16:51:02

2 years, 3 months

1
0
0 0

[PATCHv3 bpf 1/2] bpf: Disable preemption in bpf_perf_event_output

by Jiri Olsa

The nesting protection in bpf_perf_event_output relies on disabled preemption, which is guaranteed for kprobes and tracepoints. However bpf_perf_event_output can be also called from uprobes context through bpf_prog_run_array_sleepable function which disables migration, but keeps preemption enabled. This can cause task to be preempted by another one inside the nesting protection and lead eventually to two tasks using same perf_sample_data buffer and cause crashes like: kernel tried to execute NX-protected page - exploit attempt? (uid: 0) BUG: unable to handle page fault for address: ffffffff82be3eea ... Call Trace: ? __die+0x1f/0x70 ? page_fault_oops+0x176/0x4d0 ? exc_page_fault+0x132/0x230 ? asm_exc_page_fault+0x22/0x30 ? perf_output_sample+0x12b/0x910 ? perf_event_output+0xd0/0x1d0 ? bpf_perf_event_output+0x162/0x1d0 ? bpf_prog_c6271286d9a4c938_krava1+0x76/0x87 ? __uprobe_perf_func+0x12b/0x540 ? uprobe_dispatcher+0x2c4/0x430 ? uprobe_notify_resume+0x2da/0xce0 ? atomic_notifier_call_chain+0x7b/0x110 ? exit_to_user_mode_prepare+0x13e/0x290 ? irqentry_exit_to_user_mode+0x5/0x30 ? asm_exc_int3+0x35/0x40 Fixing this by disabling preemption in bpf_perf_event_output. Cc: stable(a)vger.kernel.org Fixes: 8c7dcb84e3b7 ("bpf: implement sleepable uprobes by chaining gps") Acked-by: Hou Tao <houtao1(a)huawei.com> Signed-off-by: Jiri Olsa <jolsa(a)kernel.org> --- kernel/trace/bpf_trace.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 5f2dcabad202..14c9a1a548c9 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -661,8 +661,7 @@ static DEFINE_PER_CPU(int, bpf_trace_nest_level); BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map, u64, flags, void *, data, u64, size) { - struct bpf_trace_sample_data *sds = this_cpu_ptr(&bpf_trace_sds); - int nest_level = this_cpu_inc_return(bpf_trace_nest_level); + struct bpf_trace_sample_data *sds; struct perf_raw_record raw = { .frag = { .size = size, @@ -670,7 +669,12 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map, }, }; struct perf_sample_data *sd; - int err; + int nest_level, err; + + preempt_disable(); + + sds = this_cpu_ptr(&bpf_trace_sds); + nest_level = this_cpu_inc_return(bpf_trace_nest_level); if (WARN_ON_ONCE(nest_level > ARRAY_SIZE(sds->sds))) { err = -EBUSY; @@ -691,6 +695,7 @@ BPF_CALL_5(bpf_perf_event_output, struct pt_regs *, regs, struct bpf_map *, map, out: this_cpu_dec(bpf_trace_nest_level); + preempt_enable(); return err; } -- 2.41.0

2 years, 3 months

1
0
0 0

Re: [PATCH bpf-next] LoongArch: BPF: Fix check condition to call lu32id in move_imm()

by Huacai Chen

Queued for loongarch-next, thanks. Huacai On Tue, Jul 25, 2023 at 3:05 PM Tiezhu Yang <yangtiezhu(a)loongson.cn> wrote: > > As the code comment says, the initial aim is to reduce one instruction > in some corner cases, if bit[51:31] is all 0 or all 1, no need to call > lu32id, that is to say, it should call lu32id only if bit[51:31] is not > all 0 and not all 1. The current code always call lu32id, the result is > right but the logic is unexpected and wrong, fix it. > > Cc: stable(a)vger.kernel.org # 6.1 > Fixes: 5dc615520c4d ("LoongArch: Add BPF JIT support") > Reported-by: Colin King (gmail) <colin.i.king(a)gmail.com> > Closes: https://lore.kernel.org/all/bcf97046-e336-712a-ac68-7fd194f2953e@gmail.com/ > Signed-off-by: Tiezhu Yang <yangtiezhu(a)loongson.cn> > --- > arch/loongarch/net/bpf_jit.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/loongarch/net/bpf_jit.h b/arch/loongarch/net/bpf_jit.h > index c335dc4..6858633 100644 > --- a/arch/loongarch/net/bpf_jit.h > +++ b/arch/loongarch/net/bpf_jit.h > @@ -150,7 +150,7 @@ static inline void move_imm(struct jit_ctx *ctx, enum loongarch_gpr rd, long imm > * no need to call lu32id to do a new filled operation. > */ > imm_51_31 = (imm >> 31) & 0x1fffff; > - if (imm_51_31 != 0 || imm_51_31 != 0x1fffff) { > + if (imm_51_31 != 0 && imm_51_31 != 0x1fffff) { > /* lu32id rd, imm_51_32 */ > imm_51_32 = (imm >> 32) & 0xfffff; > emit_insn(ctx, lu32id, rd, imm_51_32); > -- > 2.1.0 > >

2 years, 3 months

1
0
0 0

stable-rc/linux-4.19.y baseline: 48 runs, 3 regressions (v4.19.289-218-g1cf0365815540)

by kernelci.org bot

stable-rc/linux-4.19.y baseline: 48 runs, 3 regressions (v4.19.289-218-g1cf0365815540) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -------------------------+------+--------------+----------+---------------------+------------ beaglebone-black | arm | lab-cip | gcc-10 | omap2plus_defconfig | 1 cubietruck | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 imx6q-var-dt6customboard | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.28… Test: baseline Tree: stable-rc Branch: linux-4.19.y Describe: v4.19.289-218-g1cf0365815540 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: 1cf0365815540b3e2db00b630d9519430a31b3bc Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -------------------------+------+--------------+----------+---------------------+------------ beaglebone-black | arm | lab-cip | gcc-10 | omap2plus_defconfig | 1 Details: https://kernelci.org/test/plan/id/64bf2b5933738d08d68ace1c Results: 41 PASS, 10 FAIL, 1 SKIP Full config: omap2plus_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.289-218-g1cf0365… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.289-218-g1cf0365… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/64bf2b5933738d08d68ace1f new failure (last pass: v4.19.288-158-g5299d5c89ca8) 2023-07-25T01:53:57.849639 + set +x 2023-07-25T01:53:57.851630 <8>[ 11.479339] <LAVA_SIGNAL_ENDRUN 0_dmesg 988777_1.5.2.4.1> 2023-07-25T01:53:57.963678 / # # 2023-07-25T01:53:58.065606 export SHELL=/bin/sh 2023-07-25T01:53:58.066070 # 2023-07-25T01:53:58.167520 / # export SHELL=/bin/sh. /lava-988777/environment 2023-07-25T01:53:58.167994 2023-07-25T01:53:58.269438 / # . /lava-988777/environment/lava-988777/bin/lava-test-runner /lava-988777/1 2023-07-25T01:53:58.270383 2023-07-25T01:53:58.272664 / # /lava-988777/bin/lava-test-runner /lava-988777/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -------------------------+------+--------------+----------+---------------------+------------ cubietruck | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/64bf2627d251dce6be8acec5 Results: 5 PASS, 1 FAIL, 1 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.289-218-g1cf0365… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.289-218-g1cf0365… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/64bf2627d251dce6be8aceca failing since 188 days (last pass: v4.19.268-50-gbf741d1d7e6d, first fail: v4.19.269-522-gc75d2b5524ab) 2023-07-25T01:32:05.395802 <8>[ 7.338741] <LAVA_SIGNAL_ENDRUN 0_dmesg 3724511_1.5.2.4.1> 2023-07-25T01:32:05.505433 / # # 2023-07-25T01:32:05.609236 export SHELL=/bin/sh 2023-07-25T01:32:05.610397 # 2023-07-25T01:32:05.712773 / # export SHELL=/bin/sh. /lava-3724511/environment 2023-07-25T01:32:05.713940 2023-07-25T01:32:05.816381 / # . /lava-3724511/environment/lava-3724511/bin/lava-test-runner /lava-3724511/1 2023-07-25T01:32:05.818178 2023-07-25T01:32:05.823147 / # /lava-3724511/bin/lava-test-runner /lava-3724511/1 2023-07-25T01:32:05.907259 + export 'TESTRUN_ID=1_bootrr' ... (11 line(s) more) platform | arch | lab | compiler | defconfig | regressions -------------------------+------+--------------+----------+---------------------+------------ imx6q-var-dt6customboard | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 Details: https://kernelci.org/test/plan/id/64bf25e9d251dce6be8ace7f Results: 5 PASS, 1 FAIL, 1 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.289-218-g1cf0365… HTML log: https://storage.kernelci.org//stable-rc/linux-4.19.y/v4.19.289-218-g1cf0365… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/64bf25e9d251dce6be8ace84 failing since 13 days (last pass: v4.19.254, first fail: v4.19.288-88-g86b58f64d958) 2023-07-25T01:30:57.577234 / # # 2023-07-25T01:30:57.679092 export SHELL=/bin/sh 2023-07-25T01:30:57.679532 # 2023-07-25T01:30:57.780849 / # export SHELL=/bin/sh. /lava-3724509/environment 2023-07-25T01:30:57.781204 2023-07-25T01:30:57.882545 / # . /lava-3724509/environment/lava-3724509/bin/lava-test-runner /lava-3724509/1 2023-07-25T01:30:57.883161 2023-07-25T01:30:57.889372 / # /lava-3724509/bin/lava-test-runner /lava-3724509/1 2023-07-25T01:30:57.998348 + export 'TESTRUN_ID=1_bootrr' 2023-07-25T01:30:57.998697 + cd /lava-3724509/1/tests/1_bootrr ... (16 line(s) more)

2 years, 3 months

1
0
0 0

[PATCH v2] kbuild: rust: avoid creating temporary files

by Miguel Ojeda

`rustc` outputs by default the temporary files (i.e. the ones saved by `-Csave-temps`, such as `*.rcgu*` files) in the current working directory when `-o` and `--out-dir` are not given (even if `--emit=x=path` is given, i.e. it does not use those for temporaries). Since out-of-tree modules are compiled from the `linux` tree, `rustc` then tries to create them there, which may not be accessible. Thus pass `--out-dir` explicitly, even if it is just for the temporary files. Similarly, do so for Rust host programs too. Reported-by: Raphael Nestler <raphael.nestler(a)gmail.com> Closes: https://github.com/Rust-for-Linux/linux/issues/1015 Reported-by: Andrea Righi <andrea.righi(a)canonical.com> Tested-by: Raphael Nestler <raphael.nestler(a)gmail.com> # non-hostprogs Tested-by: Andrea Righi <andrea.righi(a)canonical.com> # non-hostprogs Fixes: 295d8398c67e ("kbuild: specify output names separately for each emission type from rustc") Cc: stable(a)vger.kernel.org Signed-off-by: Miguel Ojeda <ojeda(a)kernel.org> --- v2: - Add fix for host programs too (Masahiro). scripts/Makefile.build | 5 ++++- scripts/Makefile.host | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 6413342a03f4..82e3fb19fdaf 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -264,6 +264,9 @@ $(obj)/%.lst: $(src)/%.c FORCE rust_allowed_features := new_uninit +# `--out-dir` is required to avoid temporaries being created by `rustc` in the +# current working directory, which may be not accessible in the out-of-tree +# modules case. rust_common_cmd = \ RUST_MODFILE=$(modfile) $(RUSTC_OR_CLIPPY) $(rust_flags) \ -Zallow-features=$(rust_allowed_features) \ @@ -272,7 +275,7 @@ rust_common_cmd = \ --extern alloc --extern kernel \ --crate-type rlib -L $(objtree)/rust/ \ --crate-name $(basename $(notdir $@)) \ - --emit=dep-info=$(depfile) + --out-dir $(dir $@) --emit=dep-info=$(depfile) # `--emit=obj`, `--emit=asm` and `--emit=llvm-ir` imply a single codegen unit # will be used. We explicitly request `-Ccodegen-units=1` in any case, and diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 7aea9005e497..8f7f842b54f9 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -86,7 +86,11 @@ hostc_flags = -Wp,-MMD,$(depfile) \ hostcxx_flags = -Wp,-MMD,$(depfile) \ $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ $(HOSTCXXFLAGS_$(target-stem).o) -hostrust_flags = --emit=dep-info=$(depfile) \ + +# `--out-dir` is required to avoid temporaries being created by `rustc` in the +# current working directory, which may be not accessible in the out-of-tree +# modules case. +hostrust_flags = --out-dir $(dir $@) --emit=dep-info=$(depfile) \ $(KBUILD_HOSTRUSTFLAGS) $(HOST_EXTRARUSTFLAGS) \ $(HOSTRUSTFLAGS_$(target-stem)) base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 -- 2.41.0

2 years, 3 months

3
2
0 0

FAILED: patch "[PATCH] r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions" failed to apply to 6.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y git checkout FETCH_HEAD git cherry-pick -x cf2ffdea0839398cb0551762af7f5efb0a6e0fea # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023072337-dreamlike-rewrite-a12e@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From cf2ffdea0839398cb0551762af7f5efb0a6e0fea Mon Sep 17 00:00:00 2001 From: Heiner Kallweit <hkallweit1(a)gmail.com> Date: Tue, 18 Jul 2023 13:11:31 +0200 Subject: [PATCH] r8169: revert 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll") There have been reports that on a number of systems this change breaks network connectivity. Therefore effectively revert it. Mainly affected seem to be systems where BIOS denies ASPM access to OS. Due to later changes we can't do a direct revert. Fixes: 2ab19de62d67 ("r8169: remove ASPM restrictions now that ASPM is disabled during NAPI poll") Cc: stable(a)vger.kernel.org Link: https://lore.kernel.org/netdev/e47bac0d-e802-65e1-b311-6acb26d5cf10@freenet… Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217596 Signed-off-by: Heiner Kallweit <hkallweit1(a)gmail.com> Link: https://lore.kernel.org/r/57f13ec0-b216-d5d8-363d-5b05528ec5fb@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index fce4a2b908c2..8a8b7d8a5c3f 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -623,6 +623,7 @@ struct rtl8169_private { int cfg9346_usage_count; unsigned supports_gmii:1; + unsigned aspm_manageable:1; dma_addr_t counters_phys_addr; struct rtl8169_counters *counters; struct rtl8169_tc_offsets tc_offset; @@ -2746,7 +2747,8 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable) if (tp->mac_version < RTL_GIGA_MAC_VER_32) return; - if (enable) { + /* Don't enable ASPM in the chip if OS can't control ASPM */ + if (enable && tp->aspm_manageable) { /* On these chip versions ASPM can even harm * bus communication of other PCI devices. */ @@ -5165,6 +5167,16 @@ static void rtl_init_mac_address(struct rtl8169_private *tp) rtl_rar_set(tp, mac_addr); } +/* register is set if system vendor successfully tested ASPM 1.2 */ +static bool rtl_aspm_is_safe(struct rtl8169_private *tp) +{ + if (tp->mac_version >= RTL_GIGA_MAC_VER_61 && + r8168_mac_ocp_read(tp, 0xc0b2) & 0xf) + return true; + + return false; +} + static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { struct rtl8169_private *tp; @@ -5234,6 +5246,19 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) xid); tp->mac_version = chipset; + /* Disable ASPM L1 as that cause random device stop working + * problems as well as full system hangs for some PCIe devices users. + * Chips from RTL8168h partially have issues with L1.2, but seem + * to work fine with L1 and L1.1. + */ + if (rtl_aspm_is_safe(tp)) + rc = 0; + else if (tp->mac_version >= RTL_GIGA_MAC_VER_46) + rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1_2); + else + rc = pci_disable_link_state(pdev, PCIE_LINK_STATE_L1); + tp->aspm_manageable = !rc; + tp->dash_type = rtl_check_dash(tp); tp->cp_cmd = RTL_R16(tp, CPlusCmd) & CPCMD_MASK;

2 years, 3 months

3
4
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2023