/usr/src/linux-5.17 is contains vanilla 5.17.0 sources. While rebuilding external modules, broadcom-sta-6.30.223.271-r6 fails to compile: /var/tmp/portage/net-wireless/broadcom-sta-6.30.223.271-r6/work/src/wl/sys/wl_linux.c: In function 'wl_proc_read': /var/tmp/portage/net-wireless/broadcom-sta-6.30.223.271-r6/work/src/wl/sys/wl_linux.c:3313:26: error: implicit declaration of function 'PDE_DATA'; did you mean 'NODE_DATA'? [-Werror=implicit-function-declaration] 3313 | wl_info_t * wl = PDE_DATA(file_inode(filp)); | ^~~~~~~~ | NODE_DATA /var/tmp/portage/net-wireless/broadcom-sta-6.30.223.271-r6/work/src/wl/sys/wl_linux.c:3313:26: warning: initialization of 'wl_info_t *' {aka 'struct wl_info *'} from 'int' makes pointer from integer without a cast [-Wint-conversion] /var/tmp/portage/net-wireless/broadcom-sta-6.30.223.271-r6/work/src/wl/sys/wl_linux.c: In function 'wl_proc_write': /var/tmp/portage/net-wireless/broadcom-sta-6.30.223.271-r6/work/src/wl/sys/wl_linux.c:3370:26: warning: initialization of 'wl_info_t *' {aka 'struct wl_info *'} from 'int' makes pointer from integer without a cast [-Wint-conversion] 3370 | wl_info_t * wl = PDE_DATA(file_inode(filp)); | ^~~~~~~~ cc1: some warnings being treated as errors make[1]: *** [scripts/Makefile.build:288: /var/tmp/portage/net-wireless/broadcom-sta-6.30.223.271-r6/work/src/wl/sys/wl_linux.o] Error 1 make: *** [Makefile:1831: /var/tmp/portage/net-wireless/broadcom-sta-6.30.223.271-r6/work] Error 2 make: Leaving directory '/usr/src/linux-5.17' Reproducible: Always
Created attachment 767877 [details] build.log # emerge --info '=net-wireless/broadcom-sta-6.30.223.271-r6::gentoo' Portage 3.0.30 (python 3.9.12-final-0, default/linux/amd64/17.1/no-multilib/hardened, gcc-11.2.1, glibc-2.34-r10, 5.16.17 x86_64) ================================================================= System Settings ================================================================= System uname: Linux-5.16.17-x86_64-Intel-R-_Core-TM-_i7-4810MQ_CPU_@_2.80GHz-with-glibc2.34 KiB Mem: 16284952 total, 9680836 free KiB Swap: 20971516 total, 20971516 free Timestamp of repository gentoo: Sat, 26 Mar 2022 12:30:01 +0000 Head commit of repository gentoo: 27304bf0e24b39ed117f12900e27504ee399280f sh bash 5.1_p16 ld GNU ld (Gentoo 2.38 p3) 2.38 app-misc/pax-utils: 1.3.3::gentoo app-shells/bash: 5.1_p16::gentoo dev-java/java-config: 2.3.1::gentoo dev-lang/perl: 5.34.1::gentoo dev-lang/python: 3.9.12::gentoo, 3.10.4::gentoo dev-lang/rust: 1.59.0::gentoo dev-util/cmake: 3.22.3::gentoo dev-util/meson: 0.61.3::gentoo sys-apps/baselayout: 2.8::gentoo sys-apps/openrc: 0.44.10::gentoo sys-apps/sandbox: 2.29::gentoo sys-devel/autoconf: 2.13-r1::gentoo, 2.71-r1::gentoo sys-devel/automake: 1.16.5::gentoo sys-devel/binutils: 2.38-r1::gentoo sys-devel/binutils-config: 5.4.1::gentoo sys-devel/clang: 13.0.1::gentoo, 14.0.0-r1::gentoo sys-devel/gcc: 11.2.1_p20220115::gentoo sys-devel/gcc-config: 2.5-r1::gentoo sys-devel/libtool: 2.4.7::gentoo sys-devel/lld: 13.0.1::gentoo sys-devel/llvm: 13.0.1::gentoo, 14.0.0::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.16::gentoo (virtual/os-headers) sys-libs/glibc: 2.34-r10::gentoo Repositories: gentoo location: /usr/portage sync-type: rsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 sync-rsync-verify-max-age: 24 sync-rsync-verify-jobs: 1 sync-rsync-verify-metamanifest: yes sync-rsync-extra-opts: --new-compress local location: /var/lib/portage-local/local masters: gentoo priority: 0 ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="@FREE" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=native -mtune=native -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c" CXXFLAGS="-march=native -mtune=native -O2 -pipe" DISTDIR="/usr/portage/distfiles" EMERGE_DEFAULT_OPTS="--with-bdeps=y" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR" FCFLAGS="-O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs binpkg-multi-instance buildpkg-live cgroup collision-protect config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict test unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe" GENTOO_MIRRORS="http://distfiles.gentoo.org" LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu" LINGUAS="" MAKEOPTS="-j8" PKGDIR="/var/cache/binpkgs" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_EXTRA_OPTS="--new-compress" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" SHELL="/bin/bash" USE="X a52 acl acpi alsa amd64 avx bzip2 cairo caps cdda cddb cdparanoia crypt cups dbus dri dts dvd elogind fam ffmpeg fftw flac fontconfig gif gimp gmp gnutls gtk hardened iconv icu idn ipv6 jpeg lame lcms libglvnd libnotify libtirpc lzma mad matroska mmap mmx mmxext mp3 mpeg ncurses networkmanager nptl ogg opengl openmp pam pcre pie png policykit ppds readline sasl sdl seccomp split-usr sse sse2 sse3 sse4 sse4_1 sse4_2 ssl ssp ssse3 startup-notification svg test theora threads tiff truetype udev udisks unicode upower vaapi verify-sig vorbis wayland x264 xattr xcb xinerama xml xtpax xv xvid zlib" ABI_X86="64" ADA_TARGET="gnat_2020" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64" INPUT_DEVICES="evdev synaptics" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-4 php8-0" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="python3_9" RUBY_TARGETS="ruby26 ruby27" USERLAND="GNU" VIDEO_CARDS="crocus intel nouveau" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LANG, LC_ALL, LD, LEX, LFLAGS, LIBTOOL, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS ================================================================= Package Settings ================================================================= net-wireless/broadcom-sta-6.30.223.271-r6::gentoo was built with the following: USE="-dist-kernel" # emerge -pqv '=net-wireless/broadcom-sta-6.30.223.271-r6::gentoo' [ebuild R ] net-wireless/broadcom-sta-6.30.223.271-r6 USE="-dist-kernel"
Created attachment 768771 [details] bradcom-sta-6.30.223.271-r7.ebuild Modified ebuild to add the new patch.
Created attachment 768772 [details, diff] broadcom-sta-6.30.223.271-r7-linux-5.17.patch
I can confirm this issue in a newly compiled 5.17.0 kernel. The problem comes from the change to PDE_DATA() to now being pde_data(). Making this change inside wl_linux.c makes it compile and finish the emerge. I made a custom overlay on my end to address the change, I labelled it as bradcom-sta-*-r7, with a new custom patch file I made manually. They can be checked in the attached files.
Comment on attachment 768772 [details, diff] broadcom-sta-6.30.223.271-r7-linux-5.17.patch >From a commit ??? >From: Shadow >Date: Mon, Apr 4 08:50:33 2022 >Subject: [PATCH] Fixed the PDE_DATA calls for newer kernels. > >Tentative patch for broadcom-sta 6.30.223.271 driver for Linux 5.17 > >Applies on top of all the patches applied to broadcom-wl-dkms 6.30.223.271-23 on Arch Linux. > >Signed-off-by: Unknown >--- > src/wl/sys/wl_linux.c | 2 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c >--- a/src/wl/sys/wl_linux.c >+++ b/src/wl/sys/wl_linux.c >@@ -3244,7 +3244,7 @@ > static ssize_t > wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp) > { >- wl_info_t * wl = PDE_DATA(file_inode(filp)); >+ wl_info_t * wl = pde_data(file_inode(filp)); > #endif > int bcmerror, len; > int to_user = 0; >@@ -3301,7 +3301,7 @@ > static ssize_t > wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp) > { >- wl_info_t * wl = PDE_DATA(file_inode(filp)); >+ wl_info_t * wl = pde_data(file_inode(filp)); > #endif > int from_user = 0; > int bcmerror;
I found a patch that is backward compatible and also addresses another issue with linux-5.17: https://gist.github.com/joanbm/37fd0590f30b41e7e89ade6e242ca16e And linux-5.18 seems to require changes again: https://gist.github.com/joanbm/052d8e951ba63d5eb5b6960bfe4e031a
Patch doesn't apply on top of the gentoo patches. Needs some work...
Created attachment 771107 [details] broadcom-sta-6.30.223.271-r6-linux-5.17.patch This is an extended and backward-compatible by Joan Bruguera. I adapted it to apply on top of the gentoo patches. The changes are the same as in the original patch, just the context needed to be a bit different.
Created attachment 842717 [details, diff] Fixes compilation error with kernel >=5.18 Kernel 5.18 and above have another compilation error with broadcom-sta, this patch addresses that issue.
Created attachment 842719 [details, diff] broadcom-sta-6.30.223.271-r6-linux-6.0.patch Kernel 6.0 and above have yet again another compilation issue with broadcom-sta, which this patch fixes.
Another buildfix, this time for kernels 6.1 and above. The patch can be found here: https://github.com/NixOS/nixpkgs/blob/0d2eab489a18f2bba79e86833bc49961f4b50c1b/pkgs/os-specific/linux/broadcom-sta/linux-6.1.patch
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1469bc903cac37bff61b41532127110909d5f57 commit b1469bc903cac37bff61b41532127110909d5f57 Author: Mike Pagano <mpagano@gentoo.org> AuthorDate: 2023-06-24 16:09:49 +0000 Commit: Mike Pagano <mpagano@gentoo.org> CommitDate: 2023-06-24 16:09:49 +0000 net-wireless/broadcom-sta: add 6.30.223.271-r7 Bump to EAPI-8 Migrate to linux-mod-r1 Include arch patches Address pkgcheck errors concerning S in pkg_setup Fix compilation errors Thanks to the following users that provided patches ShadowOne333 Alan Kyder Closes: https://bugs.gentoo.org/836093 Closes: https://bugs.gentoo.org/852569 Closes: https://bugs.gentoo.org/836165 Closes: https://bugs.gentoo.org/839648 Closes: https://bugs.gentoo.org/908711 Signed-off-by: Mike Pagano <mpagano@gentoo.org> .../broadcom-sta-6.30.223.271-r7.ebuild | 103 ++++++++++ .../broadcom-sta/files/001-null-pointer-fix.patch | 48 +++++ net-wireless/broadcom-sta/files/002-rdtscl.patch | 22 +++ net-wireless/broadcom-sta/files/003-linux47.patch | 109 +++++++++++ net-wireless/broadcom-sta/files/004-linux48.patch | 64 +++++++ .../files/005-debian-fix-kernel-warnings.patch | 161 ++++++++++++++++ net-wireless/broadcom-sta/files/006-linux411.patch | 27 +++ net-wireless/broadcom-sta/files/007-linux412.patch | 78 ++++++++ net-wireless/broadcom-sta/files/008-linux415.patch | 46 +++++ .../files/009-fix_mac_profile_discrepancy.patch | 14 ++ net-wireless/broadcom-sta/files/010-linux56.patch | 55 ++++++ net-wireless/broadcom-sta/files/011-linux59.patch | 211 +++++++++++++++++++++ net-wireless/broadcom-sta/files/012-linux517.patch | 80 ++++++++ net-wireless/broadcom-sta/files/013-linux518.patch | 71 +++++++ net-wireless/broadcom-sta/files/014-linux414.patch | 37 ++++ net-wireless/broadcom-sta/files/015-linux600.patch | 31 +++ net-wireless/broadcom-sta/files/016-linux601.patch | 90 +++++++++ .../broadcom-sta/files/broadcom-sta-modules.conf | 17 ++ 18 files changed, 1264 insertions(+)
