Sep
14
1 month ago
pull request

derfelot pull request whatawurst/android_kernel_sony_msm8998

derfelot
derfelot

Kernel 4.4.283 update

Merged the new tag

push

derfelot push whatawurst/android_kernel_sony_msm8998

derfelot
derfelot

Merge f5421bd1a8234dc7d9a95fc4fdaa5ae41befa8e4 on remote branch

Change-Id: Ia7af33c78332c6ddb6d324743cd604b61e443bed

derfelot
derfelot

Merge cac1fc5e5a665df80170c0d74ea33269ae75ded7 on remote branch

Change-Id: Ib6798496d64b031368ed889d09cf2078f4e13b4f

derfelot
derfelot

Merge 382e54f122beaf93fd990d974bb77774c34acb3c on remote branch

Change-Id: Ie380f8ead79a9c279bc11fa62c1425946898d048

derfelot
derfelot

Merge 4f7147b112720eb53aa088b2e40a57c07e2827d7 on remote branch

Change-Id: I107343e272b7adf94a3147e253cd17f10c612b29

derfelot
derfelot

Merge f93a7f538e10faeb969e6a96cf68982ae5364087 on remote branch

Change-Id: Ie7dff735d8a76859ca19d5bac65205d3167daea2

derfelot
derfelot

Merge 21a2827a62cebcc49e4a606bfadce3c6110a514f on remote branch

Change-Id: Icb250a9ad822486bab9437b1eebdfcaf7e0f1431

derfelot
derfelot

Merge ab9f60b51d5e33daaaf95bff8fa07ce604a18223 on remote branch

Change-Id: If112ddd2ea16ef0c3db2d60e5b9cb1ddeb84189c

derfelot
derfelot

Merge 0da2b18f8a49ca2c93c9cb6428546b3729f7af0f on remote branch

Change-Id: I20981cf57a198ede6a9940f4c20c01d11af042a2

derfelot
derfelot

Merge 1083615c2ba0f9f973cc778082f842775e55e19b on remote branch

Change-Id: I661a7ddb411565378bf526f7b960ea536c23eb74

derfelot
derfelot

Merge bdca97fb188e7c1b0c829dfa2978e5a8e4ddcd5b on remote branch

Change-Id: I17eabc85b2fb2e99ca391efa4abbbf97c0fe374e

derfelot
derfelot

Merge ece8bc124d708f8bc5a83de3d0b721a04e018cb5 on remote branch

Change-Id: I0189009585bf7b889df4ae90bae2272766082628

derfelot
derfelot

Merge 3f97d298ee0c3a76e1de529cf15680086c26b975 on remote branch

Change-Id: I8092ee9905dfc83a25abc1b223cd76fb670a5d08

derfelot
derfelot

Merge a4c2a161be312c852c4e0b649d6ebf731a9a6f86 on remote branch

Change-Id: I759d284b8ec4bc521247b938f519366984c34964

derfelot
derfelot

qcacld-3.0: Avoid NULL pointer dereference for frag_indication

Avoid NULL pointer dereference for frag indication in T2H msg.

Change-Id: I9c1baf682fc0b52cbf70a4fbcca5be7585c3d02a CRs-Fixed: 2501146

derfelot
derfelot

Merge a8dbcb2407602e74ba4ddc21fc2b63619f8c06b2 on remote branch

Change-Id: Ie50db9ac76a06672346b80850adc34de5ff6e2fe

derfelot
derfelot

Merge a97a917c1a361a11d8b40490aaf0d885e1dd1632 on remote branch

Change-Id: I03112b21430880707be1ec1b728d66c7beb14de4

derfelot
derfelot

Merge d625fb696695fa3587c4985f3974e8a9ea40d920 on remote branch

Change-Id: Id315245c4c63cbf33241233661abe5a854a3cb5b

derfelot
derfelot

Merge 9e1c106692a7facb611754274b7d5720718cf99f on remote branch

Change-Id: I4c427986875d7526aab6d0997215ae9d5032a16e

derfelot
derfelot

Merge 700a1204af197134f49fdbe3a536acb3603407cc on remote branch

Change-Id: I0a6e626595cc5f62a3a37b337d56aa216c7eb0eb

derfelot
derfelot

Merge 220041f19e8b30674ed8dd18b3f574cfbc71f7f1 on remote branch

Change-Id: I34d1e358c0c74de5c71d4a8e50d2d856bd61b724

commit sha: bb7798cbca68b0a79bcc6b8554ac7209f5b70fa3

push time in 1 month ago
pull request

derfelot pull request whatawurst/android_kernel_sony_msm8998

derfelot
derfelot

Merge tag 'LA.UM.7.2.r2-09300-8x98.0'

Merge tag 'LA.UM.7.2.r2-09300-8x98.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0

via

  • git subtree pull --prefix drivers/staging/qcacld-3.0/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/qca-wifi-host-cmn https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/fw-api/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/fw-api LA.UM.7.2.r2-09300-8x98.0

https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn

CC @bananafunction for review

Activity icon
issue

derfelot issue comment whatawurst/android_kernel_sony_msm8998

derfelot
derfelot

Merge tag 'LA.UM.7.2.r2-09300-8x98.0'

Merge tag 'LA.UM.7.2.r2-09300-8x98.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0

via

  • git subtree pull --prefix drivers/staging/qcacld-3.0/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/qca-wifi-host-cmn https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/fw-api/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/fw-api LA.UM.7.2.r2-09300-8x98.0

https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn

CC @bananafunction for review

derfelot
derfelot

Thanks again. Got some updates for device-side coming up as well

Activity icon
fork

Amy07i forked whatawurst/android_kernel_sony_msm8998

⚡ LineageOS Kernel Tree for Sony Xperia XZ Premium, XZ1 and XZ1 Compact
Amy07i Updated
fork time in 1 month ago
Activity icon
issue

Flamefire issue comment whatawurst/android_kernel_sony_msm8998

Flamefire
Flamefire

Kernel 4.4.283 update

Merged the new tag

Flamefire
Flamefire

Reset the branch and merged the tag again. Running all 4 PRs combined on my phone for a day now and looking good so far.

Activity icon
issue

Flamefire issue comment whatawurst/android_kernel_sony_msm8998

Flamefire
Flamefire

Merge tag 'LA.UM.7.2.r2-09300-8x98.0'

Merge tag 'LA.UM.7.2.r2-09300-8x98.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0

via

  • git subtree pull --prefix drivers/staging/qcacld-3.0/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/qca-wifi-host-cmn https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/fw-api/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/fw-api LA.UM.7.2.r2-09300-8x98.0

https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn

CC @bananafunction for review

Flamefire
Flamefire

Do you already run this kernel with all the PRs included?

Flashed yesterday, no issues so far.

Sep
13
1 month ago
Activity icon
issue

bananafunction issue comment whatawurst/android_kernel_sony_msm8998

bananafunction
bananafunction

Merge tag 'LA.UM.7.2.r2-09300-8x98.0'

Merge tag 'LA.UM.7.2.r2-09300-8x98.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0

via

  • git subtree pull --prefix drivers/staging/qcacld-3.0/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/qca-wifi-host-cmn https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn LA.UM.7.2.r2-09300-8x98.0
  • git subtree pull --prefix drivers/staging/fw-api/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/fw-api LA.UM.7.2.r2-09300-8x98.0

https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn

CC @bananafunction for review

bananafunction
bananafunction

Merge tag 'LA.UM.7.2.r2-09300-8x98.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0

via

* `git subtree pull --prefix drivers/staging/qcacld-3.0/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 LA.UM.7.2.r2-09300-8x98.0`

* `git subtree pull --prefix drivers/staging/qca-wifi-host-cmn https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn LA.UM.7.2.r2-09300-8x98.0`

* `git subtree pull --prefix drivers/staging/fw-api/ https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/fw-api LA.UM.7.2.r2-09300-8x98.0`

https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn

CC @bananafunction for review

Hi @Flamefire

thank you for merging a lot of stuff into this kernel! For me, it looks good. I am gonna build the kernel with this PR and flash it to test. Do you already run this kernel with all the PRs included?

Cheers

Activity icon
issue

derfelot issue comment whatawurst/android_kernel_sony_msm8998

derfelot
derfelot

Help building kernel

Hello! I'm hoping to build linux and maybe attempt to build postmarketOS.

I'm using Arch Linux. I will adjust this later for building using pmbootstrap.

Here is my current progress

export ARCH=arm64
export KERNEL=kernel
export CROSS_COMPILE=aarch-linux-gnu-
export CROSS_COMPILE_ARM32=arm-none-eabi-

make lineage-msm8998-yoshino-lilac_defconfig

make

I did my own changes so that I could continue building, fixing errors along the way

diff --git a/drivers/bluetooth/btfm_slim.c b/drivers/bluetooth/btfm_slim.c
index 0a61186167ba..7cf59ccbe38c 100644
--- a/drivers/bluetooth/btfm_slim.c
+++ b/drivers/bluetooth/btfm_slim.c
@@ -23,8 +23,8 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
-#include <btfm_slim.h>
-#include <btfm_slim_wcn3990.h>
+#include "btfm_slim.h"
+#include "btfm_slim_wcn3990.h"
 #include <linux/bluetooth-power.h>
 
 int btfm_slim_write(struct btfmslim *btfmslim,
diff --git a/drivers/bluetooth/btfm_slim_codec.c b/drivers/bluetooth/btfm_slim_codec.c
index 035e8d9fb5fd..5a1b1fef29fd 100644
--- a/drivers/bluetooth/btfm_slim_codec.c
+++ b/drivers/bluetooth/btfm_slim_codec.c
@@ -24,7 +24,7 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
-#include <btfm_slim.h>
+#include "btfm_slim.h"
 
 static int bt_soc_enable_status;
diff --git a/drivers/bluetooth/btfm_slim_wcn3990.c b/drivers/bluetooth/btfm_slim_wcn3990.c
index 7abd5598c47b..7d611f803328 100644
--- a/drivers/bluetooth/btfm_slim_wcn3990.c
+++ b/drivers/bluetooth/btfm_slim_wcn3990.c
@@ -10,8 +10,8 @@
  * GNU General Public License for more details.
  */
 #include <linux/slimbus/slimbus.h>
-#include <btfm_slim.h>
-#include <btfm_slim_wcn3990.h>
+#include "btfm_slim.h"
+#include "btfm_slim_wcn3990.h"
 
 /* WCN3990 Port assignment */
 struct btfmslim_ch wcn3990_rxport[] = {
diff --git a/drivers/bluetooth/btfm_slim_wcn3990.h b/drivers/bluetooth/btfm_slim_wcn3990.h
index b637ac581201..5b75ed6e9cfe 100644
--- a/drivers/bluetooth/btfm_slim_wcn3990.h
+++ b/drivers/bluetooth/btfm_slim_wcn3990.h
@@ -12,7 +12,7 @@
 #ifndef BTFM_SLIM_WCN3990_H
 #define BTFM_SLIM_WCN3990_H
 #ifdef CONFIG_BTFM_SLIM_WCN3990
-#include <btfm_slim.h>
+#include "btfm_slim.h"
 
 /* Registers Address */
 #define CHRK_SB_COMP_TEST                      0x00000000
diff --git a/include/trace/define_trace.h b/include/trace/define_trace.h
index 2d8639ea64d5..7580edf268d4 100644
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
@@ -80,7 +80,10 @@
 /* Let the trace headers be reread */
 #define TRACE_HEADER_MULTI_READ
 
-#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/msm
+#include <trace/define_trace.h>
 
 /* Make all open coded DECLARE_TRACE nops */
 #undef DECLARE_TRACE
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index af0cb7907922..4196bcb29378 100644
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -195,7 +195,10 @@ TRACE_MAKE_SYSTEM_STR();
 #undef TRACE_EVENT_PERF_PERM
 #define TRACE_EVENT_PERF_PERM(event, expr...)
 
-#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/gpu/msm
+#include <trace/define_trace.h>
 
 /*
  * Stage 3 of the trace events.

I have also moved these files to drivers/gpu/msm/

drivers/gpu/msm/binder_trace.h
drivers/gpu/msm/perf_trace_counters.c
drivers/gpu/msm/perf_trace_counters.h
drivers/gpu/msm/perf_trace_user.c
drivers/gpu/msm/perf_trace_user.h
drivers/gpu/msm/trace-events-emulation.h
drivers/gpu/msm/trace.h

I'm now stuck here and I don't know what to do

In file included from include/trace/events/syscalls.h:72,                                                                                                                                              
                 from arch/arm64/kernel/ptrace.c:50:                                                                                                                                                   
include/trace/define_trace.h:85: warning: "TRACE_INCLUDE_PATH" redefined                                                                                                                               
   85 | #define TRACE_INCLUDE_PATH ../../drivers/gpu/msm                                                                                                                                               
      |                                                                                                                                                                                                
include/trace/define_trace.h:84: note: this is the location of the previous definition                                                                                                                 
   84 | #define TRACE_INCLUDE_PATH .                                                                                                                                                                   
      |                                                                                                                                                                                                
In file included from include/trace/define_trace.h:93,                                                                                                                                                 
                 from include/trace/events/syscalls.h:72,                                                                                                                                              
                 from arch/arm64/kernel/ptrace.c:50:                                                                                                                                                   
include/trace/trace_events.h:200: warning: "TRACE_INCLUDE_PATH" redefined                                                                                                                              
  200 | #define TRACE_INCLUDE_PATH ../../drivers/gpu/msm                                                                                                                                               
      |                                                                                                                                                                                                
include/trace/trace_events.h:199: note: this is the location of the previous definition                                                                                                                
  199 | #define TRACE_INCLUDE_PATH .                                                                                                                                                                   
      |                                                                                                                                                                                                
In file included from include/trace/define_trace.h:93,                                                                                                                                                 
                 from include/trace/events/syscalls.h:72,                                                                                                                                              
                 from arch/arm64/kernel/ptrace.c:50:                                                                                                                                                   
include/trace/trace_events.h:492:16: warning: 'struct trace_event_data_offsets_sys_enter' declared inside parameter list will not be visible outside of this definition or declaration                 
  492 |         struct trace_event_data_offsets_##call *__data_offsets, proto)  \                                                                                                                      
      |                ^~~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                                       
include/trace/trace_events.h:60:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'                                                                                                                   
   60 |         DECLARE_EVENT_CLASS(name,                              \                                                                                                                               
      |         ^~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:123:9: note: in expansion of macro 'TRACE_EVENT'
  123 |         TRACE_EVENT(name, PARAMS(proto), PARAMS(args),                  \
      |         ^~~~~~~~~~~
include/trace/events/syscalls.h:17:1: note: in expansion of macro 'TRACE_EVENT_FN'
   17 | TRACE_EVENT_FN(sys_enter,
      | ^~~~~~~~~~~~~~
include/trace/trace_events.h:492:16: warning: 'struct trace_event_data_offsets_sys_exit' declared inside parameter list will not be visible outside of this definition or declaration
  492 |         struct trace_event_data_offsets_##call *__data_offsets, proto)  \
      |                ^~~~~~~~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:60:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
   60 |         DECLARE_EVENT_CLASS(name,                              \
      |         ^~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:123:9: note: in expansion of macro 'TRACE_EVENT'
  123 |         TRACE_EVENT(name, PARAMS(proto), PARAMS(args),                  \
      |         ^~~~~~~~~~~
include/trace/events/syscalls.h:43:1: note: in expansion of macro 'TRACE_EVENT_FN'
   43 | TRACE_EVENT_FN(sys_exit,
      | ^~~~~~~~~~~~~~
In file included from include/trace/define_trace.h:93,                                                                                                                                         [10/306]
                 from include/trace/events/syscalls.h:72,
                 from arch/arm64/kernel/ptrace.c:50:
include/trace/events/syscalls.h: In function 'trace_event_raw_event_sys_enter':
include/trace/trace_events.h:668:63: error: storage size of '__data_offsets' isn't known
  668 |         struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
      |                                                               ^~~~~~~~~~~~~~
include/trace/trace_events.h:60:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
   60 |         DECLARE_EVENT_CLASS(name,                              \
      |         ^~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:123:9: note: in expansion of macro 'TRACE_EVENT'
  123 |         TRACE_EVENT(name, PARAMS(proto), PARAMS(args),                  \
      |         ^~~~~~~~~~~
include/trace/events/syscalls.h:17:1: note: in expansion of macro 'TRACE_EVENT_FN'
   17 | TRACE_EVENT_FN(sys_enter,
      | ^~~~~~~~~~~~~~
include/trace/events/syscalls.h: In function 'trace_event_raw_event_sys_exit':
include/trace/trace_events.h:668:63: error: storage size of '__data_offsets' isn't known
  668 |         struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
      |                                                               ^~~~~~~~~~~~~~
include/trace/trace_events.h:60:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
   60 |         DECLARE_EVENT_CLASS(name,                              \
      |         ^~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:123:9: note: in expansion of macro 'TRACE_EVENT'
  123 |         TRACE_EVENT(name, PARAMS(proto), PARAMS(args),                  \
      |         ^~~~~~~~~~~
include/trace/events/syscalls.h:43:1: note: in expansion of macro 'TRACE_EVENT_FN'
   43 | TRACE_EVENT_FN(sys_exit,
      | ^~~~~~~~~~~~~~
In file included from include/trace/define_trace.h:94,
                 from include/trace/events/syscalls.h:72,
                 from arch/arm64/kernel/ptrace.c:50:
include/trace/events/syscalls.h: In function 'perf_trace_sys_enter':
include/trace/perf.h:38:63: error: storage size of '__data_offsets' isn't known
   38 |         struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
      |                                                               ^~~~~~~~~~~~~~
include/trace/trace_events.h:60:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
   60 |         DECLARE_EVENT_CLASS(name,                              \
      |         ^~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:123:9: note: in expansion of macro 'TRACE_EVENT'
  123 |         TRACE_EVENT(name, PARAMS(proto), PARAMS(args),                  \
      |         ^~~~~~~~~~~
include/trace/events/syscalls.h:17:1: note: in expansion of macro 'TRACE_EVENT_FN'
   17 | TRACE_EVENT_FN(sys_enter,
      | ^~~~~~~~~~~~~~
include/trace/events/syscalls.h: In function 'perf_trace_sys_exit':
include/trace/perf.h:38:63: error: storage size of '__data_offsets' isn't known
   38 |         struct trace_event_data_offsets_##call __maybe_unused __data_offsets;\
      |                                                               ^~~~~~~~~~~~~~
include/trace/trace_events.h:60:9: note: in expansion of macro 'DECLARE_EVENT_CLASS'
   60 |         DECLARE_EVENT_CLASS(name,                              \
      |         ^~~~~~~~~~~~~~~~~~~
include/trace/trace_events.h:123:9: note: in expansion of macro 'TRACE_EVENT'
  123 |         TRACE_EVENT(name, PARAMS(proto), PARAMS(args),                  \
      |         ^~~~~~~~~~~
include/trace/events/syscalls.h:43:1: note: in expansion of macro 'TRACE_EVENT_FN'
   43 | TRACE_EVENT_FN(sys_exit,
      | ^~~~~~~~~~~~~~
make[1]: *** [scripts/Makefile.build:286: arch/arm64/kernel/ptrace.o] Error 1
make: *** [Makefile:1034: arch/arm64/kernel] Error 2
derfelot
derfelot

So coming back to using clang, one of the issues with gcc is also that for some reason, our BL doesn't like a too large kernel inside the boot.img, if it's built with gcc (or outdated clang's that is). As a result, the boot would get stuck at the BL unlock warning and then reboot (iirc). Can you try to disable the qcacld driver from the defconfig and see if it continues then?

An alternative would then be to build wlan as a module, which also requires some init changes to load the module etc, but we can go through that once we know if that helps at all.