Commit Graph

93 Commits

Author SHA1 Message Date
Dezhen Wang 8d7e86f38b vfp: disable access to FPINST/FPINST2 for aarch32 [1/1]
PD#SWPL-58611

Problem:
upported FP instruction in kernel mode

Solution:
disable  access to FPINST/FPINST2 for aarch32 because there is
no fpinst/fpinst2 in armv8 aarch32.

Verify:
T5D

Change-Id: I7b898f61a6b2fc6a6933b9cba5d3f290f79db3df
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
2023-09-22 03:29:00 -07:00
qi duan f6218e3177 usb: IDT test failed with replacing gki [1/2]
PD#SWPL-139422

Problem:
IDT test failed with replacing GKI

Solution:
using kprobe method to solve problem

Verify:
oppen

Change-Id: Iccdbb2d0a8529a43b2df638b2423ce21580319be
Signed-off-by: qi duan <qi.duan@amlogic.com>
2023-09-21 20:34:24 -07:00
Jianxiong Pan f9469764a3 zapper: add CONFIG_AMLOGIC_ZAPPER_NET_CUT. [1/1]
PD#SWPL-120856

Problem:
zapper 2k s1a ddr optimization net core.

Solution:
define CONFIG_AMLOGIC_ZAPPER_NET_CUT.

Verify:
zapper 2k s1a.

Change-Id: Idd93f7c29717fe9453ecc2e8570af3598ce99708
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-09-20 01:29:18 -07:00
Jianxiong Pan aa87564db2 mm: ANDROID: mm: fix freeing of MIGRATE_ISOLATE page. [1/1]
PD#SWPL-140288

Problem:
fix freeing of MIGRATE_ISOLATE page

Solution:
add autopatch.

Verify:
ohm.

Change-Id: I28228420f1a6ad78fdbf0082706a30465b46b92c
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-09-19 01:59:16 -07:00
Qinglin Li 0f20f1c222 Revert "usb: IDT test failed with replacing gki [2/2]"
This reverts commit 3e82b7c7a5.

SWPL-139422: USB owner submits these patches themselves

Change-Id: I4631ff0477a9a2ac762d5ca674d8777368e45c71
Signed-off-by: Qinglin Li <qinglin.li@amlogic.com>
2023-09-17 23:09:41 -07:00
Wanwei Jiang 567e1419cf Merge "Revert "usb: IDT test failed with replacing gki [2/2]"" into amlogic-5.15-dev 2023-09-17 23:09:23 -07:00
Qinglin Li 605da7cef7 Revert "usb: IDT test failed with replacing gki [2/2]"
This reverts commit 25c8deceb5.

SWPL-139422: USB owner submits these patches themselves

Change-Id: Ic55f9fb8d4f345c767f4b66e952d7f6bd020adef
Signed-off-by: Qinglin Li <qinglin.li@amlogic.com>
2023-09-17 22:47:44 -07:00
Qinglin Li efd37628b9 Revert "scripts: reset commit to head before auto patch [1/1]"
This reverts commit ce650f90b8.

SWPL-138629: this function will be lost common code modify when
user not save commit to auto patch.So revert it.

Change-Id: Ia8164d8772bf986125c08aed18769b86d3211daf
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-09-13 23:03:46 -07:00
Wanwei Jiang 25c8deceb5 usb: IDT test failed with replacing gki [2/2]
PD#SWPL-139422

Problem:
forgot to submit the renamed patch

Solution:
rename 0008-usb-USB-low-speed-problem-1-1.patch
to 0007-usb-USB-low-speed-problem-1-1.patch
https://scgit.amlogic.com/#/c/355969/

Verify:
oppen

Change-Id: I2f6860ce072a7f1f13257be8f46d744a75dbb647
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2023-09-11 22:29:15 -07:00
Wanwei Jiang 3e82b7c7a5 usb: IDT test failed with replacing gki [2/2]
PD#SWPL-139422

Problem:
IDT test failed with replacing gki

Solution:
revert the patch "usb: cts: USB Device Test module fail"

Verify:
oppen

Change-Id: Iafbb6c16f5a29757808c9b306f1d166e479f8f2e
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2023-09-11 16:03:42 -07:00
qinglin.li ce650f90b8 scripts: reset commit to head before auto patch [1/1]
PD#SWPL-138629

Problem:
reset commit to head before auto patch

Solution:
reset commit to head before auto patch

Verify:
local

Change-Id: I0b77bc9d4072c7af1de0249bb7e5e691d2912b6f
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-09-07 21:58:54 -07:00
qinglin.li 85af1edaad upgrade: kernel upgrade by Sep with kernel [1/1]
PD#SWPL-138629

Problem:
modules out remove need fix conflict
update include/linux/upstream_version.h

Solution:
modules out remove function fix
update include/linux/upstream_version.h

Verify:
local

Change-Id: Id2481bd3e13f07f4986db4390e6e02d340872e9e
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-09-07 05:33:16 -07:00
Zhuo Wang 8a41a83095 eth: txhd2 add new flow for suspend [1/2]
PD#SWPL-138487

Problem:
add new flow for txhd2
common14

Solution:
add new flow for txhd2

Verify:
BE311

Change-Id: I79010a4f8b87fdb7cb6302abba8e79fdaef43a70
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2023-09-05 20:14:06 -07:00
Wanwei Jiang 19f88f5099 patch: tidying up patches related to the build environment [1/1]
PD#SWPL-137860

Problem:
tidying up patches related to the build environment

Solution:
1. merge patches
2. delete unused patches

Verify:
ohm

Change-Id: Ie441c4e54a83cb12734d477af7de84153dc05e90
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2023-09-04 07:53:35 -07:00
qiankun.wang b53eee301f ARM: stacktrace: filter irq stacks. [1/1]
PD#SWPL-101774

Problem:
save_stack_trace can't simplify all callers'
use of stackdepot, because the value of
"__irqentry_text_start" and "__irqentry_text_end"
is same.

Solution:
"#define __exception_irq_entry	__irq_entry" to
make the section ".irqentry.text" is not empty.

Verify:
THXD2

Change-Id: I6f13ce8ad14f4417d36789b91db9503d6e2fa470
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2023-09-04 03:54:43 -07:00
Tao Zeng f95a3c8267 mm: fix compound page header problem [3/3]
PD#SWPL-131211

Problem:
kernel crash in check_page_to_cma

Solution:
The problem is that page_mapping function returns a invalid mapping
pointer, when a compound page is building while a compaction is doing
at same time, there will have a risk of compound page status checking.
page->mapping is set to TAIL_MAPPING first then set compound header.
But check_page_to_cma don't check real status of page, which caused
panic

Verify:
local

Change-Id: Ie707573beb1904d4ecf76acd026a7aba4dd07e80
Signed-off-by: Tao Zeng <tao.zeng@amlogic.com>
2023-08-31 20:23:53 -07:00
qinglin.li 9f54c42bbd break_gki: adjust break gki config [2/2]
PD#SWPL-137861

Problem:
adjust break gki config

Solution:
CONFIG_AMLOGIC_BREAK_GKI_20 only break gki2.0
CONFIG_AMLOGIC_BREAK_GKI break gki 1.0 and 2.0

Verify:
local

Change-Id: Ic86c771027980aa24c638d5f89c014240d65ec91
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-08-30 20:13:49 -07:00
Jianxiong Pan c932965831 mm: fix file cma statistic error. [1/1]
PD#SWPL-137522

Problem:
lowmemorykiller abnormal.

Solution:
correct the file cam statistic.

Verify:
txhd2.

Change-Id: Ib5a6320c5a32ea4720af8fe45024a8e7ebe2dc2b
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-08-25 01:54:31 -07:00
qiankun.wang 5880048394 ARM: stacktrace: don't save non kernel and module calls [1/2]
PD#SWPL-101774

Problem:
save_stack_trace now record user calls

Solution:
add kernel_or_module_addr judgement before save stack

Verify:
t5w 32bit

Change-Id: I71d298b12c9822adad413ddbf03c5eb784c999e1
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2023-08-20 23:03:47 -07:00
lei.chen d8de113ad6 BT: fix kernel 5.15 issue for RDK linux system [1/2]
PD#SWPL-128975
PD#SWPL-118242

Problem:
1.rdk kernel 5.15 bt not support deep sleep wake-up
2.rdk kernel 5.15 need user confirm

Solution:
support it

Verify:
T5W T3X

Change-Id: I9bb5adf332ff2fb2d11fc31ec08d845465debe6d
Signed-off-by: lei.chen <lei.chen@amlogic.com>
2023-08-16 00:18:40 -07:00
qiankun.wang f5412875b9 secmon: modify the wrong config [2/2]
PD#SWPL-135009

Problem:
The config 'CONFIG_AMLOGIC_SEC' has been
converted to CONFIG_AMLOGIC_SECMON.

Solution:
delete the config 'CONFIG_AMLOGIC_SEC',and
add the config 'CONFIG_AMLOGIC_SECMON'.

Verify:
SC2

Change-Id: I664ce36b86af24ff3e92adcf31f6149ecf381dcb
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2023-08-09 04:29:35 -07:00
qinglin.li 19c65c43b3 dmc_monitor: arm need check memory map [1/1]
PD#SWPL-132402

Problem:
read no map memory failed when arm build

Solution:
check memory map when arm build

Verify:
local

Change-Id: I9219cf796b2091bed31df485d18621887a50c491
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-08-09 02:59:07 -07:00
Jianxiong Pan 204b2b7d22 mm: remove changes that raised kswapd priority. [1/1]
PD#SWPL-134487

Problem:
high priority of kswapd leads to cpu loading.

Solution:
remove changes that raised kswapd priority.

Verify:
local.

Change-Id: I16097cebea95839099bc60bae9ff7a36710625c4
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-08-09 02:58:48 -07:00
Shunzhou Jiang 6b666dfa39 mbox: mbox driver refactoring [2/2]
PD#SWPL-87115

Problem:
mbox driver refactoring

Solution:
mbox driver refactoring

Verify:
t7/t7c/t5m/sc2/s4/s4d/a1/c2/s5/t3x/t5w/g12b/sm1

Change-Id: I88406d54994e7e99d7a642816505d7a3ac5d4360
Signed-off-by: Shunzhou Jiang <shunzhou.jiang@amlogic.com>
2023-08-08 02:58:41 -07:00
qinglin.li d1164cdfa4 dmc_monitor: arm need check memory map [1/1]
PD#SWPL-132402

Problem:
read no map memory failed when arm build

Solution:
check memory map when arm build

Verify:
local

Change-Id: If806828c60e54e113f7ead52670a97159aac5a22
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-08-07 00:19:00 -07:00
qinglin.li a40f7b66e3 upgrade: kernel upgrade by July with kernel [1/1]
PD#SWPL-132973

Problem:
common14-5.15 rel_path is deprecated
update include/linux/upstream_version.h

Solution:
use 'realpath $1 --relative-to $2' instead.
update include/linux/upstream_version.h

Verify:
local

Change-Id: Iae256322e030a13076c9e40c3162e56d2cb87127
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-07-28 02:16:29 -07:00
Hanjie Lin b257fa1e5d debug: GKI20 clean [2/6]
PD#SWPL-132209

Problem:
GKI20 code clean

Solution:
1, clean irq_check function
2, clean smc_thr and psci smc
3, clean AMLOGIC_BGKI_DEBUG_IOTRACE
4, clean CONFIG_AMLOGIC_BGKI_DEBUG_MISC
5, restore trace_android_vh_ftrace_format_check
6, sched_show_task optimize
7, change cpupri_check_rt kretprobe to kprobe
8, iotrace dump use unbound workqueue

Verify:
sc2

Change-Id: Idcdf9010cfd960b80c493e58b3c81bec8468ac84
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2023-07-25 22:16:21 -07:00
Jianxiong Pan 04dced619a zapper: memory optimization auto patch. [1/1]
PD#SWPL-116862

Problem:
memory optimization.

Solution:
auto patch.

Verify:
t215.

Change-Id: I78f12264064c6670f2a8995b6894dea476b16f16
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-07-18 01:50:29 -07:00
Jiucheng Xu bedb495660 trace: hide apu trace by setting trace cpumask [1/1]
PD#SWPL-131861

Problem:
hide apu trace cause perfetto crash

Solution:
Use cpumask to hide apu trace

Verify:
t5m

Change-Id: I39b60464b06c7b990ed3bfc55a990dfd63fbf65c
Signed-off-by: Jiucheng Xu <jiucheng.xu@amlogic.com>
2023-07-17 21:07:16 -07:00
qinglin.li 7cf37c0d62 kasan: bazel add kasan support [1/2]
PD#SWPL-128976

Problem:
bazel add kasan support

Solution:
add --kasan support

Verify:
local

Change-Id: I493e17ba66fd79a36b53c57bdcee7a7c52711f67
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-07-17 21:06:48 -07:00
qinglin.li 62b23335d8 bazel: support some build command --upgrade [1/2]
PD#SWPL-127872

Problem:
support some build command --upgrade

Solution:
support some build command --upgrade

Verify:
5.15

Change-Id: Ic5f90990d14b40bc1408c88d12f15b86622261c0
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-07-14 03:28:39 -07:00
Mingyen Hung ef3c77caf9 fscrypt: Restrict access to files protected by FBE [1/1]
PD#SWPL-130061

Problem:
RDK reference design wants to restrict accessing to files
protected by FBE

Solution:
Only owner of master key is allowed to access encrypted file

Verify:
1. on SC2(ah212) + RDK(firebolt-dunfell) + kernel 5.15

Change-Id: If8d4a949331d5c52c0064e9ebf0d538d129e37e5
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
2023-07-11 01:00:45 -07:00
Mingyen Hung b5b3938bcd Crypto: Allow trusted key to be used by FBE [1/1]
PD#SWPL-130061

Problem:
Need to support trusted key for FBE.

Solution:
Hook trusted key to fscrypt

Verify:
1. fscryptctl(add_key)
2. on SC2(ah212)

Change-Id: I3b13bcf8dbfebc9d03ff8e2bc16ad3349aa8696a
Signed-off-by: Mingyen Hung <mingyen.hung@amlogic.com>
2023-07-09 21:12:36 -07:00
Feng Chen 8b3b1996e7 nand: erase failed error [1/1]
PD#SWPL-129754

Problem:
erase flash error during OTA upgrade.

Solution:
change the check way of badblock.

Verify:
s4

Change-Id: I82b64b03f584d449e30a435f8ec7e7aa0bab3be7
Signed-off-by: Feng Chen <feng.chen@amlogic.com>
2023-07-09 15:08:14 -07:00
xia.jin 75efa4a45c t7: rtos mipi irq miss frequently when booting kernel [1/1]
PD#SWPL-128739

Problem:
rtos mipi irq miss frequently when booting kernel

Solution:
mark gic distributor disable

Verify:
t7

Change-Id: I99d84ee722a71d5aa4ec3f5349e85c907b9ba229
Signed-off-by: xia.jin <xia.jin@amlogic.com>
2023-07-06 14:43:51 -07:00
Zhuo Wang 63f04d8dcd eth: txhd2 resume eth0 link down [1/2]
PD#SWPL-128836

Problem:
txhd2 resume eth0 down

Solution:
txhd2 use new pll

Verify:
be311

Change-Id: I76559d8f82c18f1c7b54f023c1c993698f853d4b
Signed-off-by: Zhuo Wang <zhuo.wang@amlogic.com>
2023-07-03 03:11:00 -07:00
qinglin.li eafebcfc03 upgrade: kernel upgrade fix conflict [1/1]
PD#SWPL-129165

Problem:
kernel upgrade fix conflict

Solution:
kernel upgrade fix conflict

Verify:
local

Change-Id: I1bdcee4097afc381d67bc6ec1be9ab325c51d1c8
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-06-29 22:49:57 -07:00
pengzhao.liu a923dea38d kernel: Remove Makefile autoreview script [1/2]
PD#SWPL-128588

Problem:
Cannot copy files when compiling

Solution:
Remove Makefile autoreview script

Verify:
no

Change-Id: Icdbe276ef2a5c2aefe0173c0b8457c09a3b40e4b
Signed-off-by: pengzhao.liu <pengzhao.liu@amlogic.com>
2023-06-27 01:17:25 -07:00
qiankun.wang d8b9b89fec iotrace: fix config name error in auto_patch. [1/1]
PD#SWPL-126934

Problem:
because of gki2.0,the config "CONFIG_AMLOGIC_BGKI_DEBUG_IOTRACE"
should be deleted.

Solution:
"CONFIG_AMLOGIC_BGKI_DEBUG_IOTRACE" has been
modified by "CONFIG_AMLOGIC_DEBUG_IOTRACE"

Verify:
on s4d_ap222 and c2_af400

Change-Id: I733c57a11dfc69c692020974bc93b055798e6af5
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2023-06-26 21:10:38 -07:00
song.han 74709af2be kasan: enable kasan on arm32 [2/2]
PD#SWPL-128513

Problem:
enable kasan on arm32 will crash

Solution:
disable AMLOGIC_VMAP when kasan enabled
increase modules region form 16M to 32M

Verify:
TXHD2

Change-Id: Icdf82669750bec436756fbd6cd670eabedaf0096
Signed-off-by: song.han <song.han@amlogic.com>
2023-06-25 03:33:13 -07:00
Jianxiong Pan 123a8747fc mm: add memory optimization auto patch. [1/1]
PD#SWPL-128561

Problem:
add memory optimization auto patch.

Solution:
add memory optimization.

Verify:
local.

Change-Id: I149ba55e4e7c2e4dfa9e2ef3f420ff1e80464bc1
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-06-20 21:01:10 -07:00
Hao Shi b0637309dc zapper: close v4l2-m2m in zapper [1/2]
PD#SWPL-118958

Problem:
Zapper 2K S1A - 128M DDR - optimization v4l2.

Solution:
close V4L2_MEM2MEM_DEV & CONFIG_AMLOGIC_VIDEOBUF_RESOURCE.

Verify:
aq2432

Change-Id: Ibdeb359346185e08d69ed7067549740b7e04e249
Signed-off-by: Hao Shi <hao.shi@amlogic.com>
2023-06-13 21:01:10 -07:00
Hanjie Lin 3fcef5de34 kretprobes: disable irq in ret handler [2/3]
PD#SWPL-121806

Problem:
ret handler running in origin task context with preempt_disable
it's not safe for interrupt and may cause nested kprobe and miss

Solution:
disable irq in ret handler
add AMLOGIC_BGKI_KPROBES

Verify:
sc2

Change-Id: I143e874336d87b143d1607b8e9a7588f84d7bc55
Signed-off-by: Hanjie Lin <hanjie.lin@amlogic.com>
2023-06-13 01:00:25 -07:00
chengbing.wu 836647e3c8 regulator: txhd2 regulator bringup for common14-5.15 [3/3]
PD#SWPL-125798

Problem:
1. need to support regulator at txhd2;
also need support common14-5.15 for common patch;

Solution:
1. add regulator at txhd2 be301 311& be319 309.dts;
2. add vddcpu and vddee voltage table;
add auto_patch at 10_others;

Verify:
build ok

Change-Id: I647dd310fd871aba6bd8b327d0a4a5cc503e5412
Signed-off-by: chengbing.wu <chengbing.wu@amlogic.com>
2023-06-12 19:57:14 -07:00
qinglin.li 468130c61e upgrade: kernel upgrade by June with kernel [1/1]
PD#SWPL-126896

Problem:
update upgrade info

Solution:
update upgrade info

Verify:
local

Change-Id: I70c119d082b0086ab5b6328865712d1b1c39723b
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-06-09 03:18:23 -07:00
qiankun.wang dab0c9e944 smp: apu hide cause android crash [1/1]
PD#SWPL-125211

Problem:
apu hide cause android crash

Solution:
modify

Verify:
t5m

Change-Id: I374bc138a39a833051debb93398e348d563e0e29
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2023-06-08 22:52:01 -07:00
qinglin.li eeea27fd11 upgrade: kernel upgrade by June with tool [1/1]
PD#SWPL-126896

Problem:
kernel upgrade by June

Solution:
kernel upgrade by June

Verify:
local

Change-Id: I36e0e96a6d909dbfa77b2fd4d3d2309ffc4d993d
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2023-06-06 17:41:02 -07:00
Wanwei Jiang 8d1a00f53e patch: support auto lunch's patch [1/3]
PD#SWPL-124735

Problem:
the execution time of the lunch is too long for patching all kernel patches

Solution:
patching the necessary patches to avoid android compilation failure

Verify:
ohm

Change-Id: I917ec47716336cb4c896bce4aeed3229e069c3dc
Signed-off-by: Wanwei Jiang <wanwei.jiang@amlogic.com>
2023-05-31 20:54:14 -07:00
qiankun.wang e6045d91cd sched: vts: vts_kernel_proc_file_api_test [1/2]
PD#SWPL-124519

Problem:
vts_kernel_proc_file_api_test module 3 fail.

Solution:
add 3 proc file interfaces 'sched_latency_ns',
'sched_wakeup_granularity_ns',
'sched_tunable_scaling'.

Verify:
SC2

Change-Id: I88e8d7a91db601d1b1cb773d15583fabe7021a07
Signed-off-by: qiankun.wang <qiankun.wang@amlogic.com>
2023-05-29 23:40:57 -07:00
Jianxiong Pan 728dd734c5 mm: add lowmemory killer auto patch. [1/1]
PD#SWPL-124928

Problem:
Android P no LMKD.

Solution:
port the lowmemorykiller from 4.9.

Verify:
local.

Change-Id: Iafb3e64932c358cefa2b4dacc83d197d5d7c244a
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2023-05-25 01:23:20 -07:00