Backport for kernels 5.10 / 5.15

[razvanphp]

First batch of errors:

$ make
make -j`nproc` -C /lib/modules/`uname -r`/build M=$PWD modules
make[1]: Entering directory '/usr/src/linux-headers-5.15.136-tegra-ubuntu22.04_aarch64/3rdparty/canonical/linux-jammy/kernel-source'
  CC [M]  /home/jetson/mt76/mmio.o
  CC [M]  /home/jetson/mt76/util.o
  CC [M]  /home/jetson/mt76/trace.o
  CC [M]  /home/jetson/mt76/mt76x0/usb.o
  CC [M]  /home/jetson/mt76/mt76x2/eeprom.o
  CC [M]  /home/jetson/mt76/mt76x2/mac.o
  CC [M]  /home/jetson/mt76/mt7921/mac.o
  CC [M]  /home/jetson/mt76/mt76x0/usb_mcu.o
/home/jetson/mt76/mt76x2/eeprom.c:8:10: fatal error: linux/unaligned.h: No such file or directory
    8 | #include <linux/unaligned.h>
      |          ^~~~~~~~~~~~~~~~~~~
compilation terminated.
make[3]: *** [scripts/Makefile.build:295: /home/jetson/mt76/mt76x2/eeprom.o] Error 1
make[3]: *** Waiting for unfinished jobs....
  CC [M]  /home/jetson/mt76/mt76x0/init.o
In file included from /home/jetson/mt76/trace.h:10,
                 from /home/jetson/mt76/trace.c:10:
/home/jetson/mt76/mt76.h:16:10: fatal error: linux/soc/mediatek/mtk_wed.h: No such file or directory
   16 | #include <linux/soc/mediatek/mtk_wed.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

[morrownr]

@razvanphp

Thanks for starting a new issue. It needed to happen.

I changed the title as this is going to take more than backporting for 5.10 and 5.15.

This is going to have to go one problem at a time:

/home/jetson/mt76/mt76x2/eeprom.c:8:10: fatal error: linux/unaligned.h: No such file or directory

I compared this repo (kernel 6.14) to OpenWRT's mt76: What I found is that linux/unalingned.h has changed places:

Here: #include <linux/unaligned.h>

OpenWRT: #include <asm/unaligned.h>

What we need to know is with what kernel did this change take place. Try to chase that down and then we can add something like this:

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0))
#include <linux/unaligned.h>
#else
#include <asm/unaligned.h>
#endif

[morrownr]

FYI: I am seeing this first problem in 3 places:

$ grep -r "#include <linux/unaligned.h>" *
mt76x0/eeprom.c:#include <linux/unaligned.h>
mt76x02_eeprom.c:#include <linux/unaligned.h>
mt76x2/eeprom.c:#include <linux/unaligned.h>

so it will have to be fixed in all 3 places.

[razvanphp]

Yeap, found it in kernel 6.12-rc2:

https://lkml.org/lkml/2024/10/6/423

Al Viro (5):
close_range(): fix the logics in descriptor table trimming
parisc: get rid of private asm/unaligned.h
ufs_rename(): fix bogus argument of folio_release_kmap()
arc: get rid of private asm/unaligned.h
move asm/unaligned.h to linux/unaligned.h

How should we do this? Can I get acces to this repo or should I create MRs from my fork?

Thank you once again for your time!
R

[morrownr]

...found it in kernel 6.12-rc2

So this is recent. It looks like 3 places to replace the existing line with:

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0))
#include <linux/unaligned.h>
#else
#include <asm/unaligned.h>
#endif

Can I get access to this repo or should I create MRs from my fork?

I sent you an invitation. What I ask is that you work in an organized manner so that it is easy to go back and see what has been done and why. Each patch should only fix one problem and it should have a simply descriptive name. Test before patching.

While you work on patches, I am going to work on making sure we have all of the firmware we need for the 7 drivers I identified to be available to compile. We also have a lot of work to do on the Makefile but that can wait for now.

Once you have the first problem fixed, compile again and post the next problem like you did earlier so I can see. I might be able to provide info to speed things up. As you patch, I will test on kernels 6.1, 6.6 and 6.12 while you concentrate of 5.10 and 5.15.

[razvanphp]

Sounds good!

I will work in a separate branch so I can force push if needed and I open a MR when I have something working.

Next error is obviously:

/home/jetson/mt76/mt76.h:16:10: fatal error: linux/soc/mediatek/mtk_wed.h: No such file or directory
   16 | #include <linux/soc/mediatek/mtk_wed.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

How should we approach this? create a folder like backport-include/linux/soc/mediatek/mtk_wed.h with a dummy header? Not sure if the driver will work without the real wed functionality from the kernel....

[morrownr]

How should we approach this? create a folder like backport-include/linux/soc/mediatek/mtk_wed.h with a dummy header?

It looks like the patch that added this came about in the middle of the year in 2024 so it is recent but was backported to 6.6 and 6.1:

https://patchwork.kernel.org/project/backports/patch/20240627234808.1253337-45-hauke@hauke-m.de/

I'm pondering this but so far I have not come up with a good idea.

I took a look at OpenWRT mt76 but no real help on this one. I suspect the OpenWRT devs added this file to the header files they are using.

[morrownr]

The file on my system is located at:

/usr/src/linux-headers-6.12.9+bpo-common/include/linux/soc/mediatek

header files must be backward compatible, right? What happens if you copy the file to the right place in your system?

I can upload the file from my system booted to kernel 6.12 into the repo if you want.

[razvanphp]

Yes, I've downloaded mtk_wed.h from the latest kernel source into mine and it passes without complaining.

Then it's this one, but it's easy:
https://github.com/openwrt/mt76/blob/a22d59e4ad50c89326342a0736cd2c1ba32e8a0b/mt76.h#L19-L23

But then hell unleashes 🙂 there are many many errors, I've tried openwrt-23.05 branch and there are less errors, but still some of the ones in your fork as well:

$ make -C /lib/modules/$(uname -r)/build M=$(pwd) modules
make: Entering directory '/usr/src/linux-headers-5.15.136-tegra-ubuntu22.04_aarch64/3rdparty/canonical/linux-jammy/kernel-source'
  CC [M]  /home/jetson/mt76/mmio.o
In file included from /home/jetson/mt76/mmio.c:6:
/home/jetson/mt76/mt76.h:795:42: error: ‘IEEE80211_MLD_MAX_NUM_LINKS’ undeclared here (not in a function); did you mean ‘IEEE80211_MAX_TIM_LEN’?
  795 |         struct mt76_vif_link __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];
      |                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                                          IEEE80211_MAX_TIM_LEN
In file included from ./arch/arm64/include/asm/atomic.h:15,
                 from ./include/linux/atomic.h:7,
                 from ./include/asm-generic/bitops/atomic.h:5,
                 from ./arch/arm64/include/asm/bitops.h:26,
                 from ./include/linux/bitops.h:33,
                 from ./include/linux/kernel.h:12,
                 from /home/jetson/mt76/mt76.h:9,
                 from /home/jetson/mt76/mmio.c:6:
/home/jetson/mt76/mt76.h: In function ‘mt76_vif_init’:
./arch/arm64/include/asm/barrier.h:113:27: error: passing argument 1 of ‘kasan_check_write’ makes pointer from integer without a cast [-Werror=int-conversion]
  113 |         kasan_check_write(__p, sizeof(*p));                             \
      |                           ^~~
      |                           |
      |                           int
./include/asm-generic/barrier.h:138:33: note: in expansion of macro ‘__smp_store_release’
  138 | #define smp_store_release(p, v) __smp_store_release(p, v)
      |                                 ^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:468:17: note: in expansion of macro ‘smp_store_release’
  468 |                 smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
      |                 ^~~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1845:9: note: in expansion of macro ‘rcu_assign_pointer’
 1845 |         rcu_assign_pointer(mvif->link[0], mlink);
      |         ^~~~~~~~~~~~~~~~~~
In file included from ./include/asm-generic/rwonce.h:26,
                 from ./arch/arm64/include/asm/rwonce.h:71,
                 from ./include/linux/compiler.h:255,
                 from ./include/linux/export.h:45,
                 from ./include/linux/linkage.h:7,
                 from ./include/linux/kernel.h:8,
                 from /home/jetson/mt76/mt76.h:9,
                 from /home/jetson/mt76/mmio.c:6:
./include/linux/kasan-checks.h:44:59: note: expected ‘const volatile void *’ but argument is of type ‘int’
   44 | static inline bool kasan_check_write(const volatile void *p, unsigned int size)
      |                                      ~~~~~~~~~~~~~~~~~~~~~^
In file included from ./arch/arm64/include/asm/atomic.h:15,
                 from ./include/linux/atomic.h:7,
                 from ./include/asm-generic/bitops/atomic.h:5,
                 from ./arch/arm64/include/asm/bitops.h:26,
                 from ./include/linux/bitops.h:33,
                 from ./include/linux/kernel.h:12,
                 from /home/jetson/mt76/mt76.h:9,
                 from /home/jetson/mt76/mmio.c:6:
./arch/arm64/include/asm/barrier.h:117:41: error: invalid type argument of unary ‘*’ (have ‘int’)
  117 |                                 : "=Q" (*__p)                           \
      |                                         ^~~~
./include/asm-generic/barrier.h:138:33: note: in expansion of macro ‘__smp_store_release’
  138 | #define smp_store_release(p, v) __smp_store_release(p, v)
      |                                 ^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:468:17: note: in expansion of macro ‘smp_store_release’
  468 |                 smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
      |                 ^~~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1845:9: note: in expansion of macro ‘rcu_assign_pointer’
 1845 |         rcu_assign_pointer(mvif->link[0], mlink);
      |         ^~~~~~~~~~~~~~~~~~
./arch/arm64/include/asm/barrier.h:123:41: error: invalid type argument of unary ‘*’ (have ‘int’)
  123 |                                 : "=Q" (*__p)                           \
      |                                         ^~~~
./include/asm-generic/barrier.h:138:33: note: in expansion of macro ‘__smp_store_release’
  138 | #define smp_store_release(p, v) __smp_store_release(p, v)
      |                                 ^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:468:17: note: in expansion of macro ‘smp_store_release’
  468 |                 smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
      |                 ^~~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1845:9: note: in expansion of macro ‘rcu_assign_pointer’
 1845 |         rcu_assign_pointer(mvif->link[0], mlink);
      |         ^~~~~~~~~~~~~~~~~~
./arch/arm64/include/asm/barrier.h:129:41: error: invalid type argument of unary ‘*’ (have ‘int’)
  129 |                                 : "=Q" (*__p)                           \
      |                                         ^~~~
./include/asm-generic/barrier.h:138:33: note: in expansion of macro ‘__smp_store_release’
  138 | #define smp_store_release(p, v) __smp_store_release(p, v)
      |                                 ^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:468:17: note: in expansion of macro ‘smp_store_release’
  468 |                 smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
      |                 ^~~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1845:9: note: in expansion of macro ‘rcu_assign_pointer’
 1845 |         rcu_assign_pointer(mvif->link[0], mlink);
      |         ^~~~~~~~~~~~~~~~~~
./arch/arm64/include/asm/barrier.h:135:41: error: invalid type argument of unary ‘*’ (have ‘int’)
  135 |                                 : "=Q" (*__p)                           \
      |                                         ^~~~
./include/asm-generic/barrier.h:138:33: note: in expansion of macro ‘__smp_store_release’
  138 | #define smp_store_release(p, v) __smp_store_release(p, v)
      |                                 ^~~~~~~~~~~~~~~~~~~
./include/linux/rcupdate.h:468:17: note: in expansion of macro ‘smp_store_release’
  468 |                 smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
      |                 ^~~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1845:9: note: in expansion of macro ‘rcu_assign_pointer’
 1845 |         rcu_assign_pointer(mvif->link[0], mlink);
      |         ^~~~~~~~~~~~~~~~~~
In file included from ./include/linux/rbtree.h:24,
                 from ./include/linux/mm_types.h:10,
                 from ./include/linux/page-flags.h:13,
                 from ./arch/arm64/include/asm/mte.h:14,
                 from ./arch/arm64/include/asm/pgtable.h:12,
                 from ./include/linux/pgtable.h:6,
                 from ./arch/arm64/include/asm/io.h:12,
                 from ./include/linux/io.h:13,
                 from /home/jetson/mt76/mt76.h:10,
                 from /home/jetson/mt76/mmio.c:6:
/home/jetson/mt76/mt76.h: In function ‘mt76_vif_conf_link’:
/home/jetson/mt76/mt76.h:1869:53: error: ‘struct ieee80211_bss_conf’ has no member named ‘link_id’
 1869 |         return mt76_dereference(mvif->link[link_conf->link_id], dev);
      |                                                     ^~
./include/linux/rcupdate.h:414:19: note: in definition of macro ‘__rcu_dereference_protected’
  414 |         ((typeof(*p) __force __kernel *)(p)); \
      |                   ^
/home/jetson/mt76/mt76.h:1217:9: note: in expansion of macro ‘rcu_dereference_protected’
 1217 |         rcu_dereference_protected(p, lockdep_is_held(&(dev)->mutex))
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1869:16: note: in expansion of macro ‘mt76_dereference’
 1869 |         return mt76_dereference(mvif->link[link_conf->link_id], dev);
      |                ^~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1869:53: error: ‘struct ieee80211_bss_conf’ has no member named ‘link_id’
 1869 |         return mt76_dereference(mvif->link[link_conf->link_id], dev);
      |                                                     ^~
./include/linux/rcupdate.h:414:42: note: in definition of macro ‘__rcu_dereference_protected’
  414 |         ((typeof(*p) __force __kernel *)(p)); \
      |                                          ^
/home/jetson/mt76/mt76.h:1217:9: note: in expansion of macro ‘rcu_dereference_protected’
 1217 |         rcu_dereference_protected(p, lockdep_is_held(&(dev)->mutex))
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~
/home/jetson/mt76/mt76.h:1869:16: note: in expansion of macro ‘mt76_dereference’
 1869 |         return mt76_dereference(mvif->link[link_conf->link_id], dev);
      |                ^~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [scripts/Makefile.build:296: /home/jetson/mt76/mmio.o] Error 1
make: *** [Makefile:1912: /home/jetson/mt76] Error 2
make: Leaving directory '/usr/src/linux-headers-5.15.136-tegra-ubuntu22.04_aarch64/3rdparty/canonical/linux-jammy/kernel-source'

[morrownr]

But then hell unleashes ...

It happens. We can figure this out.

However, first, can I get you to merge patches for Compile Problem 1 and 2?

To help us better keep track, how about you name the fixes to the compile problems as such:

Compile Problem 1 -
Compile Problem 2 -
etc...

And give good descriptions so that we don't have to run back into the code to remember what it does... if possible.

Now on to this next problem: It is not obvious to me what is causing this. I am going to reboot my system and go back to kernel 6.1 so as to have a kernel that is closer to yours for now. I don't have much time today to work this.

[razvanphp]

However, first, can I get you to merge patches for Compile Problem 1 and 2?

Sure, PR open.

Next one is:

In file included from /home/jetson/mt76/mmio.c:6:
/home/jetson/mt76/mt76.h:795:42: error: ‘IEEE80211_MLD_MAX_NUM_LINKS’ undeclared here (not in a function); did you mean ‘IEEE80211_MAX_TIM_LEN’?
  795 |         struct mt76_vif_link __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];
      |                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                                          IEEE80211_MAX_TIM_LEN

It was added here: torvalds/linux@7b0a0e3#diff-40da38cf0934dd9d7dc2b6ca8f485936c2e12758935c0c870af47a0753101862R4379-R4381

Can we fix it with just this in mt76.h or should we look into upgrading/embedding the whole new version of mac80211.h and ieee80211?

#ifndef IEEE80211_MLD_MAX_NUM_LINKS
/* multi-link device */
#define IEEE80211_MLD_MAX_NUM_LINKS 15
#endif

I'm asking because then we need to add this, also related to MLO (multi-link operation):

/home/jetson/mt76/mt76.h: In function ‘mt76_vif_conf_link’:
/home/jetson/mt76/mt76.h:1874:53: error: ‘struct ieee80211_bss_conf’ has no member named ‘link_id’
 1874 |         return mt76_dereference(mvif->link[link_conf->link_id], dev);
      |                                                     ^~

added here: torvalds/linux@3fbddae