4c80458d1f
Patch I closes besser#1 — the wsm_generic_confirm 0x0007 dmesg storm. One-line guard in bes2600_hw_scan() refuses the 5 GHz iteration of mac80211's per-band hw_scan loop with -EOPNOTSUPP, so the firmware never sees the scan request that would be rejected with status 2 → -EINVAL cascade. Phase 7 verified 2026-05-18 on ohm running pkgrel=2: Pattern A 14.3/h → 0/h over 30-min window, no WARN/BUG, single-band 2.4 GHz scans still return BSSes cleanly. Two flavors imported (scan-filter-5ghz and scan-filter-5ghz-danctnix) matching the convention of other bes2600 series — the code path doesn't touch timer APIs so the two are byte-identical for now; flavor separation is kept to preserve consistency in ohm.yaml. The arm64 scs-arm-neon-build-fix series is a build-environment workaround: GCC 15.2.1 strictly validates that -fsanitize=shadow- call-stack requires -ffixed-x18, and arm_neon.h's #pragma target/ push/pop blocks lose x18 fixing inside the wrapped section. The Makefile tweak re-adds -ffixed-x18 explicitly for xor-neon.o. It's a no-op when SCS is off (current pkgrel=2 ohm config) and unblocks SCS=y once GCC upstream is fixed. ohm.yaml gains a CONFIG_SHADOW_CALL_STACK=n config override with a pointer to besser#20 (the re-enable tracking issue) so future manifest-driven kconfig generation honors the workaround without silently dropping it. Source-of-truth commit for Patch I: marfrit/bes2600-dkms branch bes2600/scan-filter-5ghz sha 093a503 PKGBUILD-side (already deployed to ohm via pkgrel=2): marfrit/besser branch claude-noether-14 sha ae175f9 Refs: besser#1 (closed), besser#20, kernel-agent#5
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From: Markus Fritsche <fritsche.markus@gmail.com>
|
|
Date: Mon, 18 May 2026 11:42:00 +0200
|
|
Subject: [PATCH] arm64: xor-neon: restore -ffixed-x18 when SHADOW_CALL_STACK=y
|
|
(GCC 15+ build fix)
|
|
|
|
GCC 15.2.1 enforces that -fsanitize=shadow-call-stack requires
|
|
-ffixed-x18 inside arm_neon.h's #pragma GCC target() blocks. The
|
|
existing CFLAGS_REMOVE_xor-neon.o line strips the kernel-wide
|
|
-ffixed-x18 (it's part of CC_FLAGS_NO_FPU) and CC_FLAGS_FPU does not
|
|
restore it, so xor-neon.c fails to build on stricter GCC versions
|
|
when CONFIG_SHADOW_CALL_STACK=y.
|
|
|
|
Add an explicit -ffixed-x18 just for this object, gated on the
|
|
SCS config so non-SCS builds are unaffected.
|
|
|
|
Build environment workaround; not a kernel-runtime bug.
|
|
---
|
|
arch/arm64/lib/Makefile | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile
|
|
index 1234567..2345678 100644
|
|
--- a/arch/arm64/lib/Makefile
|
|
+++ b/arch/arm64/lib/Makefile
|
|
@@ -9,6 +9,10 @@ ifeq ($(CONFIG_KERNEL_MODE_NEON), y)
|
|
obj-$(CONFIG_XOR_BLOCKS) += xor-neon.o
|
|
CFLAGS_xor-neon.o += $(CC_FLAGS_FPU)
|
|
CFLAGS_REMOVE_xor-neon.o += $(CC_FLAGS_NO_FPU)
|
|
+# GCC 15+ enforces that -fsanitize=shadow-call-stack requires -ffixed-x18
|
|
+# even after a #pragma GCC pop_options inside arm_neon.h. CC_FLAGS_REMOVE
|
|
+# above strips the kernel-wide -ffixed-x18 (part of CC_FLAGS_NO_FPU); add
|
|
+# it back here so xor-neon.c still compiles when SHADOW_CALL_STACK=y.
|
|
+CFLAGS_xor-neon.o += $(if $(CONFIG_SHADOW_CALL_STACK),-ffixed-x18)
|
|
endif
|
|
|
|
lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o
|