Commit Graph

5070 Commits

Author SHA1 Message Date
ruofei.zhao 1cafaab93a hdmitx: remove edid parser in plugin handler [1/1]
PD#SWPL-158055

Problem:
remove edid parser in plugin handler

Solution:
remove edid parser to drm

Verify:
SC2
S5

Test:
DRM-TX-78, DRM-TX-79, DRM-TX-80, DRM-TX-81

Change-Id: I44006093c6fff74c23c98a1e89e5d8666a3ecfc4
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
2024-11-19 05:46:21 -08:00
Jianxiong Pan 5bfbb36336 mm: pagetraca, aml_cma, slabtrace support gki1.0. [1/1]
PD#SWPL-185599

Problem:
gki1.0 support.

Solution:
enable pagetrace, aml_cma, slabtrace.

Verify:
sc2.

Change-Id: I99ee48f00829467ae4f09a7277eae30d7b96224d
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-11-19 02:08:54 -08:00
Jiucheng Xu c46ca9adf0 cma: export enable interface for using cma buffer for write file [1/1]
PD#SWPL-185295

Problem:
write file cache couldn't use cma buffer.

Solution:
add module param to control the enable/disable using cma buffer for
write file cache.

Verify:
t3/t5w

Change-Id: Ief6506d24298358560f475eb2f11393989819763
Signed-off-by: Jiucheng Xu <jiucheng.xu@amlogic.com>
2024-11-19 02:08:36 -08:00
Jianxiong Pan c7f3f45461 mm: aml_cma: update vendor hook. [1/1]
PD#SWPL-185599

Problem:
update vendor hook.

Solution:
update vendor hook.

Verify:
sc2.

Change-Id: I8887a753fdb1289f7e5716ae7cf79b1b2b45cc2c
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-11-18 21:57:11 -08:00
hongbin wang b4a9d33cb1 tee: change shm register flag when restore [1/1]
PD#SWPL-185800

Problem:
Youtube can not play when restore in STD function.
the TEE print :
std_entry_with_parg:235 Bad arg address 0x1200c180

Find the dynamic shm flag should not have
OPTEE_SHM_ARG_ALLOC_PRIV flag.  it should same to
optee_probe function , just need OPTEE_SHM_ARG_SHARED

Solution:
remove OPTEE_SHM_ARG_ALLOC_PRIV when re-register

Verify:
S7 + Yocto

Change-Id: Ibe9708cb4db0e0b98f1a144d204f66e93bb56d22
Signed-off-by: hongbin wang <hongbin.wang@amlogic.com>
2024-11-18 21:57:02 -08:00
hongbin wang c5595b6408 bl32: sharemem operation for hibernation [1/1]
PD#SWPL-182675

Problem:
hibernation feature: ta can not be load after restore .

Solution:
add freeze and restore operation.

Verify:
s7 + yocto

Change-Id: Ia80084f04379c50c1f589b1c98fdd9fb2810060d
Signed-off-by: hongbin wang <hongbin.wang@amlogic.com>
2024-11-18 21:56:52 -08:00
Wentao.Sun 7dc193e9d7 tee: support hibernate mode for tee [1/1]
PD#SWPL-172131

Problem:
optee crashed in hibernate mode

Solution:
register freeze and restore functions

Verify:
Android U + T7

Change-Id: I317891404d28a7cfa76a282a6f91ca4d736b8538
Signed-off-by: Wentao.Sun <wentao.sun@amlogic.com>
2024-11-18 21:56:41 -08:00
Liqiang Jin 5a9c5df47e Data pipe: Optimize code [3/3]
PD#RSP-6352

Problem:
Need to optimize code

Solution:
Modify code

Verify:
Android U + S7

Change-Id: I18d32e1a922479761766c9ca0f9e078898db0115
Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
2024-11-18 21:56:28 -08:00
Liqiang Jin 456dc974c6 Data pipe: Remove data pipe pool [2/3]
PD#RSP-6352

Problem:
Need to simplify code

Solution:
Update code

Verify:
Android U + S7

Change-Id: I0116e5e3044899f111c63951fa6ddda4c63a9fb3
Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
2024-11-18 21:56:14 -08:00
Liqiang Jin 8323a476a1 Data pipe: Lock global variables [1/3]
PD#RSP-6350

Problem:
Multiple threads updating the same global variable causes data error

Solution:
Lock global variables

Verify:
Android U + S7

Change-Id: Id65a397c4bcb6566b6f35c143f4391913b9ba996
Signed-off-by: Liqiang Jin <liqiang.jin@amlogic.com>
2024-11-18 21:56:00 -08:00
Wentao.Sun 184847cc32 TEE: compatible dynamic SHM for different platform [1/2]
PD#SWPL-100275

Problem:
Dynamic SHM will be enabled after TDK3.18, but some platform
not support TDK3.18, so compatible different platform.

Solution:
Compatible Dynamic SHM for different platform

Verify:
AndroidU + S7

Change-Id: I57a7f6a557ecf11e085027e0c6338767b0ee5ce0
Signed-off-by: Wentao.Sun <wentao.sun@amlogic.com>
2024-11-18 21:55:46 -08:00
Hangyu Li 108f4b52af mm: fix cma allocation stuck problem. [1/1]
PD#SWPL-161071

Problem:
cma alloc stuck.

Solution:
add FOLL_LONGTERM flags in pin page.

Verify:
S7.

Change-Id: Id011372a9431e07e69e1ee27ea134acda6959c82
Signed-off-by: Hangyu Li <hangyu.li@amlogic.com>
2024-11-18 21:55:31 -08:00
Wentao.Sun abc9e2fee2 logger: fix logger and shm will be reused issue [1/1]
PD#RSP-5982
PD#SWPL-101942

Problem:
logger and shm will be reused if logger contained in shm

Solution:
carve out logger memory if logger is contained in shm

Verify:
AndroidU + sc2

Change-Id: I8d6e9ea837f5e664bc5a41024bb1260a72017a0f
Signed-off-by: Wentao.Sun <wentao.sun@amlogic.com>
2024-11-18 21:55:14 -08:00
Cheng Wang 7758d8d7d7 frm_lock: sync frame lock code from k-5.15 [1/1]
PD#SWPL-192104

Problem:
sync frame lock code from k-5.15

Solution:
sync frame lock code from k-5.15

Verify:
mk build

Change-Id: I304ff938a3282d4b877f228cf46bfbdb4edf0d86
Signed-off-by: Cheng Wang <cheng.wang@amlogic.com>
2024-11-18 19:56:30 -08:00
Long da8fc9bd34 mmc: Synchronize the 5.15 mmc driver code to the 6.12 kernel. [1/1]
PD#SWPL-188384

Problem:
6.12 kernel lacks some MMC driver functionality.

Solution:
Synchronize the 5.15 mmc driver code to the 6.12 kernel.

Verify:
sc2

Change-Id: Ifdc163b67c4daaee268a0fa9758167c9ef1e56e9
Signed-off-by: Long <long.yu@amlogic.com>
2024-11-18 05:58:51 -08:00
jialong.jiang 21181f4ab2 amdv: sync code from kernel5.15 to 6.12 [1/1]
PD#SWPL-191973

Problem:
sync code from kernel5.15 to 6.12.

Solution:
sync code from kernel5.15 to 6.12.

Verify:
sc2

Test:
selt-test

Change-Id: I5d768e0012cb00297c70d24b3377d9495927a9f5
Signed-off-by: jialong.jiang <jialong.jiang@amlogic.com>
2024-11-18 05:58:43 -08:00
Huqiang Qin 930b37ee74 pdd_monitor: Fixed Oops fatal exception [1/1]
PD#SWPL-189562

Problem:
Memory allocated by devm_kmalloc does not set the space to 0.

Solution:
Use devm_kzalloc instead of devm_kmalloc.

Verify:
S6/BL201

Change-Id: I7bc9d5a62596c2a25b45cdd3066afb1fd48aedc0
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:57:58 -08:00
Huqiang Qin 124d774ad5 pdd_monitor: Add driver support [1/1]
PD#SWPL-189562

Problem:
PDD needs to be enabled by default and print a line
of log to the serial port when triggered.

Solution:
Added pdd_monitor driver, which mainly implements
the following functions:
1. Print log to the serial port when triggered.
2. Provide a simple interface for user space.

Verify:
S6/BL201 T6D/BR301

Change-Id: I2b02847049994ab7bb02c1d24126949df23b30e1
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:57:45 -08:00
Huqiang Qin 701804a1ee pdd: t6d: support pdd [1/1]
PD#SWPL-181068

Problem:
T6D Silicon Bringup.

Solution:
Support PDD.

Verify:
T6D/BR301

Change-Id: I9908d1a3a981ff19340d80a8070365227a1fd72e
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:57:32 -08:00
Huqiang Qin 200c27c950 saradc: s6: fix the issue of interval sampling fail [1/1]
PD#SWPL-177668

Problem:
If the interval between two sampling points is more than 100 milliseconds,
the sampling value may not change with the actual voltage.

Solution:
A workaround is to enable ADC_EN before sampling and disable it after
sampling is completed.

Verify:
S6/BL201 S7D/BM201

Change-Id: I71477e446afc584acdf98bfa137c02116bf121c6
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:57:18 -08:00
Huqiang Qin b72c50437c saradc: s7d: put the register initialization value into DT [1/1]
PD#SWPL-172971

Problem:
Preparing for S6.

Solution:
Put the register initialization value into DT.

Verify:
S7D/BM201

Change-Id: I83d525b8509527439122ae415df38fddc2de9a09
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:57:02 -08:00
Huqiang Qin f99c8b8150 pdd: s7: enable the new power down detection driver [1/1]
PD#SWPL-171477

Problem:
Share the same driver with S7D.

Solution:
Enable the new power down detection driver.

Verify:
S7/BH201

Change-Id: Ifa08c2d87a410732a9f67fbde9b1699a8b1410d4
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:56:50 -08:00
Huqiang Qin 22c4926e24 pdd: s7d: add a new power down detection driver [1/1]
PD#SWPL-169074

Problem:
Add a new power down detection driver.

Solution:
1. A new amlogic_saradc_common driver has been added for register mapping.
2. A new independent power-down detection driver has been added.

Verify:
S7D/BM201

Change-Id: I2b72e24da9e7dc288e6df7351c65a50980df3748
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:56:36 -08:00
Huqiang Qin 1614f03a0f saradc: s7d: optimize driver [1/1]
PD#SWPL-164728

Problem:
Optimize driver.

Solution:
1. Use interrupts to wait for sampling to complete.
2. Follow upstream advice and remove use of mlock.
3. Key parameters are configured on DTS.
4. Add self-test interface.
5. Add average sampling interface.
6. Add sampling voltage interface.

Verify:
S7D/BM201

Change-Id: I81f7f8bc8e45c6ca9ec365c5af8ed09544d5cf4b
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:56:24 -08:00
Huqiang Qin c95e8a3895 saradc: s7d: support saradc [1/1]
PD#SWPL-163056

Problem:
S7D Silicon Bringup.

Solution:
Add a new SARADC driver.

Verify:
S7D/BM201

Change-Id: I5049a6f741bcc72691c931bc10830b30dc53913c
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:56:11 -08:00
Huqiang Qin 9884adb717 saradc: s7: support saradc [3/3]
PD#SWPL-152407

Problem:
S7 Silicon Bringup.

Solution:
S7 Silicon Bringup.

Verify:
S7/BH201

Change-Id: Ife576731e5dcd769cd6e589d54242193b6f192a2
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:55:58 -08:00
Huqiang Qin 57140edc33 saradc: software calibration method optional [2/3]
PD#SWPL-152407

Problem:
S7 Silicon Bringup.

Solution:
Modify the calibration method to be bound to the specific SoC.
Next, the S7 will use different calibration methods.

Verify:
S7/BH201

Change-Id: Ica4bbc55bd0a755f166aee94d56a96da8264551b
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:55:45 -08:00
Huqiang Qin 0bff5b7b88 saradc: test channel is no longer fixed to channel 7 [1/3]
PD#SWPL-152407

Problem:
Channel 7 is no longer fixed as a test channel, so some
variables need to be renamed.
(S7 Silicon Bringup)

Solution:
Some variables have been renamed in the following format:
- chan7_mux   -> test_input
- chan7_vol   -> test_vol
- set_ch7_mux -> set_test_input

Verify:
S7/BH201

Change-Id: Ia9141b9e16d42c60b520a8a6b32cdbb22f29db41
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:55:31 -08:00
Huqiang Qin 762cbfc4d8 saradc: s7: support power outage detection [1/1]
PD#SWPL-135763

Problem:
S7 PxP Bringup.

Solution:
S7 PxP Bringup.

Verify:
PTM

Change-Id: Ica4efc1f8fe0f31bb0b05903c8c7bac9deb71215
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-18 03:55:16 -08:00
Jianxiong Pan 71c4e9ec04 mm: pagetrace: use vendor hook to obtain page info. [1/1]
PD#SWPL-185599

Problem:
use vendor hook install of kprobe.

Solution:
use vendor hook install of kprobe.

Verify:
sc2.

Change-Id: I5bd5379cae56d4ad3976027571bb129790b24f1b
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
2024-11-18 02:26:37 -08:00
hongyu.chen1 6984b42b95 regulator: config dts in k6.12. [1/2]
PD#SWPL-193143

Problem:
The regulator dts is not configured.

Solution:
1.Add the corresponding changes to the dts.
2.config A5/SC2/SM1

Verify:
SC2

Change-Id: Idcec2705a5e51e801c85831479e95a65ab3ebdb6
Signed-off-by: hongyu.chen1 <hongyu.chen1@amlogic.com>
2024-11-18 02:13:33 -08:00
Liming Xue 5a81f80607 dsp: kernel6.12 fix efuse register for dsp enable check [1/1]
PD#SWPL-192941

Problem:
kernel6.12 a1/c1/c2 efuse register address for dsp enable check is error

Solution:
kernel6.12 fix efuse register address for dsp enable check

Verify:
a1/c1/c2

Change-Id: I13b73025b44a30ada12a6b168177099a5e49fe85
Signed-off-by: Liming Xue <liming.xue@amlogic.com>
2024-11-18 02:01:04 -08:00
qinglin.li b6bb6672fe ddr_tool: sync patch to 6.12 [1/1]
PD#SWPL-192391

Problem:
sync patch to 6.12

Solution:
sync 14-5.15 commit to 3de6c801e

Verify:
local

Change-Id: Ic45f5a6dec9f66cb1e97c2ce253d35ea87e07734
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-11-17 23:50:01 -08:00
yiting.deng 4b5a486dfa vrtc: fix read alarm warning in probe [1/1]
PD#SWPL-192783

Problem:
insmod rtc will reads alarm and converts it to standard time.
UBSAN detects that the alarm is converted to the standard time and
a data overflow warning is generated

Solution:
fix code

Verify:
sc2

Change-Id: Ia9aacddfa97d15e2019d927cc54747fee539675b
Signed-off-by: yiting.deng <yiting.deng@amlogic.com>
2024-11-17 19:54:19 -08:00
feng.zhang 597b2b8d7f dts: add lowram 4k init dts [2/2]
PD#SWPL-192838

Problem:
kernel 6.12 not support lowram 4k build

Solution:
add init dts for lowram 4k build

Verify:
local test ok

Change-Id: I8437f0857dcc343312bea3d82d9a75ab52f4897f
Signed-off-by: feng.zhang <feng.zhang@amlogic.com>
2024-11-15 04:52:21 -08:00
Junyi Zhao 983a835b0c led: sync patch from 5.15 [1/1]
PD#SWPL-191876

Problem:
kernel6.12 bring up

Solution:
sync tee patch
sync std hib patch
sync optimize patch

Verify:
sc2 ah212

Change-Id: I444307ae06a94a3f6e67d28936ad5b59a8817c29
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-11-15 04:39:24 -08:00
yuhua.lin 699751fd21 kernel6.12: sync codec_io/rdma/canvas code from kernel5.15 to kernel6.12 [1/1]
PD#SWPL-191968

Problem:
sync code from kernel5.15 to kernel6.12

Solution:
complete it

Verify:
sc2

Change-Id: I2ed019e6455d43be2a5367fa8d78bcb9f40cf054
Signed-off-by: yuhua.lin <yuhua.lin@amlogic.com>
2024-11-15 01:50:54 -08:00
qinglin.li 10c4d7b593 cpu_info: add build gki version info in cpu info [1/1]
PD#SWPL-175745

Problem:
add build gki version info in cpu info

Solution:
add build gki version info in cpu info

Verify:
local

Change-Id: Ia690f43867e3b1aaff1c1e59c4634eba71cfc448
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-11-14 23:50:40 -08:00
qinglin.li 96fd57ab39 efuse: efuse sync code by 5.15 [1/1]
PD#SWPL-193081

Problem:
efuse sync code by 5.15

Solution:
sync commit with bfed152a8

Verify:
local

Change-Id: I970f04f0f6cd10eec3eca1dcf4e66dc008af1398
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-11-14 23:50:33 -08:00
qinglin.li f7a01fa688 kernel6.12: build gki10 and nongki [1/1]
PD#SWPL-192260

Problem:
memory need fix
system_dlkm.modules.load need fix

Solution:
disabled CONFIG_AMLOGIC_CMA
disabled CONFIG_AMLOGIC_PAGE_TRACE
disabled CONFIG_AMLOGIC_SLAB_TRACE
rm amlogic modules in system_dlkm.modules.load

Verify:
local

Change-Id: I3119d6579aa15e51151b91609a5ea7a884942e42
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
2024-11-14 23:50:23 -08:00
Junyi Zhao a8d65c3e17 i2c: sync std dts from mercury [1/1]
PD#SWPL-191875

Problem:
support yocto std

Solution:
support yocto std

Verify:
t7c

Change-Id: I5ceb5508c3d2429822434f6bc1f90f9031168157
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
(cherry picked from commit 147e23cc26)
2024-11-14 23:50:18 -08:00
zhenteng.tian 9d6fd5a066 video pipeline: sync code from kernel 5.15 to kernel 6.12. [1/1]
PD#SWPL-192397

Problem:
sync code from kernel 5.15 to kernel 6.12.

Solution:
sync code from kernel 5.15 to kernel 6.12.

Verify:
SC2

Change-Id: I8111de9562e80148ebe90cc29fb272dbd1c50259
Signed-off-by: zhenteng.tian <zhenteng.tian@amlogic.com>
2024-11-14 23:50:10 -08:00
Huqiang Qin ba9fbca9b4 adc_keypad: support blink led [1/1]
PD#SWPL-152938

Problem:
When the button is pressed, the LED will flash.

Solution:
New function.

Verify:
SC2/AH212

Change-Id: I4c4ff83b4b23a138b503647b20b5af09a6fb4336
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-14 21:50:25 -08:00
Huqiang Qin bd18d4e18d watchdog: Keep the watchdog status when driver probe [1/1]
PD#SWPL-189563

Problem:
When the kernel is configured to feed the watchdog
in user space, and if the watchdog is enabled
in U-Boot, the driver probe will disable the watchdog.

Solution:
Synchronize register status to driver.

Verify:
T6D/BR301

Change-Id: I3e06113bf468a8b461e1c3f76b5c0d14a6df83d9
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-14 21:50:19 -08:00
Huqiang Qin 99b1e404b5 wdt: adjusting the watchdog coverage [1/1]
PD#SWPL-184668

Problem:
Adjusting the watchdog coverage.

Solution:
Put the watchdog's suspend, resume, and shutdown functions
into syscore to cover a wider time period.

Verify:
T5M/AY301

Change-Id: If3d40b8a73d44e5e76d94c1d4b1aa90a6b19ef47
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-14 21:50:12 -08:00
Huqiang Qin aed8194bbc wdt: support hibernate [1/1]
PD#SWPL-145758

Problem:
Need to support hibernate mode.

Solution:
Save registers during freeze and restore these
registers after waking up.

Verify:
S5/AX208 T7/AN400

Change-Id: Ief3192aaec70aceef31cff28904c728d6f376cfc
Signed-off-by: Huqiang Qin <huqiang.qin@amlogic.com>
2024-11-14 21:50:05 -08:00
yiting.deng f0cd8c8ff7 clk: sc2: fix cecb error config [1/1]
PD#SWPL-192735

Problem:
fix cecb clk error config

Solution:
fix it

Verify:
sc2

Change-Id: I22641fe52ec60682a85b543ada0c71db51613023
Signed-off-by: yiting.deng <yiting.deng@amlogic.com>
2024-11-14 13:46:01 -08:00
Junyi Zhao 4e0a0c6d87 pwm: sync patch from 5.15 [1/1]
PD#SWPL-191874

Problem:
kernel6.12 bring up

Solution:
sync tee patch
sync std hib patch
sync optimize patch

Verify:
sc2 ah212

Change-Id: I5bdb22b1312575a2b533a5d413439a4325d77c23
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-11-14 04:01:06 -08:00
yujun.zhang 4f7bb4daad drm: add deadlock check for getting state [1/1]
PD#SWPL-191769

Problem:
NULL pointer dereference

Solution:
Deadlock may happen and cause getting pointer
with error, so return it again.

Verify:
sc2

Test:
DRM-OSD-81

Change-Id: Icd61e67542410f072d91f2279c82593137d65ea2
Signed-off-by: yujun.zhang <yujun.zhang@amlogic.com>
2024-11-14 04:00:47 -08:00
Junyi Zhao f34313d3bf i2c: sync patch from 5.15 [1/1]
PD#SWPL-191875

Problem:
kernel6.12 bring up

Solution:
sync tee patch
sync std hib patch
sync optimize patch

Verify:
sc2 ah212

Change-Id: Ia7db081c955226125b9d445fe3e2814321c76967
Signed-off-by: Junyi Zhao <junyi.zhao@amlogic.com>
2024-11-14 02:32:00 -08:00