33 Commits

Author SHA1 Message Date
Hisping Lin
7b28f3480b rk3288: tee with ta: update optee version to v2.03
build from optee commit in develop-rk3228 branch:
    24f5da14 rk3288: close seure video path

update feature:
    d1ae97e2 sta: secure_video: fix bug for parameters unchecked
    6291d83b sta: rkwvm: fix bug for parameters unchecked
    31f929d4 plat: rk3288: fix 194MHz DQ/DQS phase not suitable

Change-Id: I5a03060e6f5b7ba3262f158cc1bf32af12179a3c
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2023-08-14 16:54:40 +08:00
Joseph Chen
846084ddda rk3288: tee: update version to v2.02
build from:
	1089bf090 plat: rk3288: Set pmu can be reset by 1st global reset
update feature:
	1089bf090 plat: rk3288: Set pmu can be reset by 1st global reset

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I82b13377a3b252a26e044a7b50f6acd409e999ca
2022-10-21 02:15:12 +00:00
Elon Zhang
e14927b373 rk3288: tee with ta: update optee version to v2.01
build from optee commit in develop-rk3228 branch:
	c99a453d console_init: close serial only rely on t->u.serial.enable

update feature:
	c99a453d console_init: close serial only rely on t->u.serial.enable
	ad07ae73 thread: alloc rpc arg when arg is null

Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
Change-Id: I760d38ccee75555977b116df255d89554ca42732
2020-08-17 17:29:24 +08:00
Elon Zhang
5181498df0 rk3288: tee with ta: update optee version to v2.00
build from optee commit in develop-rk3228 branch:
	29146f83 BACKPORT: optee_msg: add OPTEE_MSG_RPC_CMD_SHM_FREE

update feature:
	29146f83 BACKPORT: optee_msg: add OPTEE_MSG_RPC_CMD_SHM_FREE
	3550ba73 smc: add smc call define compatibility check
	d837fe7b rockchip: refine rockchip SiP share memory config
	6ad0ab41 plat-rockchip: support new OPTEE_MSG interface
	c35033c1 rockchip: svc: support new OPTEE_MSG interface
	c80ec6cd sta: support new OPTEE_MSG interface
	8a4b634b UPSTREAM: core: new OPTEE_MSG interface

Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
Change-Id: Ic770989b0a5cf2f66189e5ada103542bdbfd08fd
2020-08-04 10:34:40 +08:00
Hisping Lin
b572f0f8e5 rk3288: tee with ta: update optee version to v1.45
build from optee commit in develop-rk3228 branch:
    6a30fc35 static ta: modify length judgement in uboot storedata

update feature:
    05fb3282 static ta: add support write data from user ta
    d098c6d2 rk322x/rk3128x/rk3288: increase shm size from 1MB to 2MB
    ad25cd57 static ta: return error if tee fs read data len is zero

Change-Id: I863db5b36753ea5262257a55f5780962b46be573
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2020-03-13 09:58:04 +08:00
Hisping Lin
d2c797dbea rk3288: tee with ta: update optee version to v1.44
build from optee commit in develop-rk3228 branch:
    d098c6d2 rk322x/rk3128x/rk3288: increase shm size from 1MB to 2MB

update feature:
    ad25cd57 static ta: return error if tee fs read data len is zero
    ef321390 plat: rk3288: suspend: support default suspend mode
    5e3b27cf rk312x: ddr freq: fix bug about 2T

Change-Id: I8bd74e6421c71a0ecb48dbd5e9ca4eaa9ac5ff8e
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2020-02-20 09:31:01 +08:00
shengfei Xu
a4d73914fa rk3288: tee with ta: update optee version to v1.43
build from optee commit in develop-rk3228 branch:
    ad25cd57 static ta: return error if tee fs read data len is zero

update feature:
    ad25cd57 static ta: return error if tee fs read data len is zero
    ef321390 plat: rk3288: suspend: support default suspend mode

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I61251f8a8ccaccbe44cd1092cc71fcc4457a5ef0
2020-01-06 11:05:58 +08:00
Hisping Lin
1ef1e5ad94 rk3288: tee with ta: update optee version to v1.42
build from optee commit in develop-rk3228 branch:
    1d667fcf thread: alloc rpc arg if rpc_arg == null

update feature:
    d65a69f4 ddr: rk3288: add ddr_wait_vop_finish() in _ddr_adjust_config()
    aa67a2b8 rockchip: flush all cache when cpu off
    7a43c16b plat-rockchip: config: remove RK3368 related code

Change-Id: I9675bd69e5a31f9d9ae711e9e32a037c3d707ff9
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2019-11-19 16:34:10 +08:00
Zhihuan He
a875ba02a7 rk3288: tee with ta: update optee version to v1.41
build from optee commit in develop-rk3228 branch:
	d65a69f ddr: rk3288: add ddr_wait_vop_finish() in _ddr_adjust_config()
update feature:
	d65a69f ddr: rk3288: add ddr_wait_vop_finish() in _ddr_adjust_config()
	aa67a2b rockchip: flush all cache when cpu off
	7a43c16 plat-rockchip: config: remove RK3368 related code
	6c02489 scripts: optimize build scripts
	805c30d scripts: add checkbuild.sh to build all platforms

Change-Id: I2cf6051caac47e77d6f53e56745353a659e24522
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2019-11-12 18:11:58 +08:00
Shengfei Xu
e65b97b511 rk3288: tee with ta: update optee version to v1.40
build from optee commit in develop-rk3228 branch:
    2003f53 rk3288: change system reset mode
update feature:
    2003f53 rk3288: change system reset mode
    bddb413 rk3288: suspend: gating watchdog clock when suspend

Change-Id: I6bfeccbe43cd0d743c2ee8fcd13b01be3fde006b
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2019-10-15 08:02:10 +08:00
Hisping Lin
9795aa376e rk3288: tee with ta: update optee version to v1.39
build from optee commit in develop-rk3228 branch:
    be1b074d static ta: do not return error if head.magic != TEE_SVC_STORAGE_MAGIC

update feature:
    746912b1 rk322x: ddr: set pll bypass if this pll was in power-down
    28bcc014 plat-rockchip: support rv1108 soc
    6cf8251c plat: rk312x: support suspend from uboot

Change-Id: I1a0e1f75ea25c0d22659ddb123d1cae40246b6ec
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2019-08-15 16:30:09 +08:00
Hisping Lin
d32d94a767 rk3288: tee with ta: update optee version to v1.38
build from optee commit in develop-rk3228 branch:
        6cf8251c plat: rk312x: support suspend from uboot

update feature:
        941d97c5 ree fs: recreate file if open meta file fail
        f4d9818f ree fs: return fail if meta file is empty
        c767f33e static ta: modify R&W ATX hash print information

Change-Id: I0043daa9bcccc39e312b9f72eaf8bb4b86474edd
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2019-06-17 10:56:41 +08:00
Joseph Chen
5bbca2794c RKTRUST: remove prefix path "tools/rk_tools/"
This is a prefix path from legacy rkdevelop U-Boot, we remove
it since there is not such path in rkbin project.

Change-Id: I7149b77a2d7ddaaf741ea98beeb75ecba63ad4c1
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-27 14:23:17 +08:00
Shengfei Xu
98c82eebb6 rk3288: tee: update version to v1.37
build from commit:
    2c8ed95 rk3288: fix a flush dcache bug
update features:
    2c8ed95 rk3288: fix a flush dcache bug

Change-Id: Ia34080e77b78136ee90aa6664c0257146276c771
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2019-04-09 11:55:35 +08:00
Joseph Chen
b32aa7db9e rk3288: tee: update version to v1.36
build from commit:
	4981120 plat-rockchip: add support for A12/A17 errata CR711784
update features:
	4981120 plat-rockchip: add support for A12/A17 errata CR711784

Change-Id: I67f781c6c0582e75f37799934a682b89aa78c504
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-20 11:33:50 +08:00
Hisping Lin
68df2bfd09 rk3288: tee with ta: update optee version to v1.35
build from optee commit:
        ca9b9a06 static ta: support store widevine keybox

update feature:
        a7c49851 rk3126b/rk3126c: fix reboot bug for no ddr-reset-pin
        bccd3587 rockchip: rk_atags: destroy atags only when atags header is valid
        d415d1ac rockchip: rk_atags: add tag_atf_mem support
        ecabd869 rockchip: rk_atags: add atags_stat()

Change-Id: I2bfc4102f91e82e556add838809a0cfaf222ad69
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2018-12-05 14:27:59 +08:00
Hisping Lin
31610cd3ac rk3288: tee with ta: update optee version to v1.34
build from optee commit:
        96e1b6e0 rk3228: update version to 2.0

update feature:
        96e1b6e0 rk3228: update version to 2.0
        aef72a2e static ta: support read data from user ta
        08aa75b8 rk3288: enable uboot and kernel interface
        beb116a5 rk312x: enable kernel android interface
        f150013c rk312x & rk3288: enable uboot R&W public key hash
        b93a7293 ta verify: support new key to sign TA

Change-Id: I092cc76c68de82d8f04dbe46acebccfb99bfd876
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2018-10-31 11:47:05 +08:00
Hisping Lin
5258932b9f rk3288: tee with ta: update optee version to v1.33
build from optee commit:
        7b4ec903 plat-rockchip: config: add configs for dual filesystems

update feature:
        7b4ec903 plat-rockchip: config: add configs for dual filesystems
        778c7c9f libutee: remove storageID check, let TEE kernel validate instead
        4ed35d6f storage: return TEE_ERROR_ITEM_NOT_FOUND when storage ID is unknown

Change-Id: I56afb8c5c4c494ce86fddba901c123c139c0a409
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2018-06-06 17:22:12 +08:00
Joseph Chen
163972acb9 rk3288: tee: update version to v1.32
build from optee:
	c72e46 rk322x: ddr: use vop raw status to wait line flag
update features:
	apply arm errata 825619 and FOOBAR

Change-Id: Icfb7fd16803dbabaae70b50be67636afa2bf02ab
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-05-08 09:18:44 +08:00
Joseph Chen
81db5cb650 rk3288: tee: update version to v1.31
build from commit:
	e18ec91 workaround: rockchip: invalidate dcache before enable MMU

update features:
	1. fix rk3288w recognize wrongly issus;
	2. fix rk3288 spinlock occupied issue when start up;

Change-Id: If9cc50c1bbfa104791e02f8f67277dbcfbac12ff
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-04-16 11:10:25 +08:00
Joseph Chen
82818da224 rk3288: update tee to v1.3
build from commit:
	c135d93 rk3288: update version to v1.3

update features:
	c135d93 rk3288: update version to v1.3
	39fa77f core: arm32: thread: invalidate branch predictor
	b4b61ef core: arm32: sm: runtime selection of spectre workaround
	39fecbb core: arm.h: move midr definitions
	1bdfaa6 arm32: enable ACTLR_CA15_ENABLE_INVALIDATE_BTB
	eeaa4de core: arm32: sm: invalidate branch predictor

Change-Id: I1782d9d5dac70e74127b11882b3980edf3a5b456
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-01 10:02:27 +08:00
XiaoDong Huang
93304add86 rk3288: tee: update version to 1.26
Build from optee commit:
    6ee860c rk3288: dump wakeup source when system resume

update features:
    1) 6ee860c rk3288: dump wakeup source when system resume
    2) 17f400a rk3288: suspend: save/restore pmic_sleep iomux

Change-Id: I149c41d1ef380423e88180a6455c3ba4536999c4
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-01-03 16:17:27 +08:00
XiaoDong Huang
cdef8aa284 rk3288: tee: update version to 1.25
Build from optee commit:
    0d867b1 rk3288: suspend: only set arm_int_wkup_en and enable global_int_dis

update features:
    1) 0d867b1 rk3288: suspend: only set arm_int_wkup_en and enable global_int_dis
    2) 60b9e9a plat-rockchip: fix bugs of function "v7_flush_dcache_all"
    3) 2bc8f7b plat-rockchip: rk3288: fix only one ddr channel's bug

Change-Id: Ic88fe4b630f019ff536ce2cb33ed3800141afd22
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-11-24 15:15:54 +08:00
shengfei Xu
2e263d060e rk3288: tee: update version to 1.24
build from optee commit: 6d63b1c2711826d33d958dcc19c00205ce172d15

update features: fix the system clock error

Change-Id: Ie497545d5498e9e2c6cd2a1d75a641deab70c030
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-09-12 09:18:51 +08:00
shengfei Xu
f8e3881fb7 rk3288: tee: update version to 1.23
build from optee commit: decbfaf1239a2d3452547fab6283e6d4adcdedde

update features:
1. support the suspend clock switch to 32k
2. fix bug for DDR3 DRAM side ODT disable

Change-Id: Ic4f492553e840f17c8a6066a60265aadd42d9398
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-09-05 11:34:21 +08:00
shengfei Xu
bf9bee42f9 rk3288: tee: update version to 1.22
build from optee commit: 897ad0f2e06e5d5dd87738d446f7eceb4f5e22fb

update features: add interface to read/write efuse

Change-Id: I8fe888f619c50b17c02c76515231909d7010e5ea
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-08-08 16:05:09 +08:00
shengfei Xu
5f7681ed24 rk3288: tee: update version to 1.21
build from optee commit:bcd26438eeb060bbf060a5f2cd8d9dd8cf2262f2

update features:
1.add noc timing config
2.save/restore the sram data in suspend/resume

Change-Id: Id81afba57fb2ccefdd06db9b3d40d2607b8ec59b
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-06-27 15:31:01 +08:00
Zhang Zhijie
a8b4a01dc7 rk3288: tee: update version to 1.20
build from optee commit: fc0d7b0db652ee6293cffd6ff2c53be9f2318e00

update features:
1.clear SCTLR_V bit when cpu init
2.add CFG_OTP_SUPPORT and CFG_BCH_SUPPORT
3.config: move fs config from script to conf.mk, enable rpmb
4.set Non-Secure banked TTBCR to zero

Change-Id: I2d650cf33c8e7f09008d8b8614cc87c1cfc31923
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2017-06-12 17:52:51 +08:00
chenjh
ea0cf57502 rk3288: tee: update version to v1.11
build from optee commit: debc2d5

update features:
	debc2d5 rockchip: sip: page number not larger than requested one means query
	4ab8acc rockchip: system suspend: disable fiq_debugger
	ebdd9c2 ddr: rk3288: using unify scanning frequency parameters

Change-Id: I4c985274f8f833a1be54ce35deae4a35c31aae2a
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-05-27 09:03:20 +08:00
chenjh
c7f4a0b850 rk3288: tee: use with ta by default
Change-Id: Ib9065ea20d45efb6ac88f2345202428c5ea1c568
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-05-22 15:31:28 +08:00
XiaoDong Huang
1d7ea07860 RK3288: optee version update to v1.10
built from optee commit:
	0bd05ab RK3288: optee version update to v1.1

update features:
	1) plat-rockchip: rk3288: flush(clean & invalidate) entire D-cache
	2) rk3288: fix bus about ISRAM_CODE_BASE redefined
	3) rk3288: add ddr change frequency function
	4) rk3288: fiq_dfs: add fiq_dfs_stop_cpus for rk3288
	5) plat-rockchip: rk3288: support the sleep mode config from kernel
	6) rk3288: check the cpu is in WFI before resetting it

Change-Id: I042019b3aa73debbcb0bbd9aa352bf95a1632a8f
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-05-19 17:03:29 +08:00
chenjh
8624232b4b rk3288: tee: update version to v1.01
support system reset and system suspend

Change-Id: I978fcc3a91c54dd2a2b6e31ada409342d3b0d0f5
Signed-off-by: chenjh <chenjh@rock-chips.com>
2017-04-11 14:51:42 +08:00
William Zhang
1475d29bb1 rk3288: support trust merger
Change-Id: I2f4dff1ff1e04f87ecda1fca1a9a8560c5e9dc15
Signed-off-by: William Zhang <william.zhang@rock-chips.com>
2017-03-28 21:16:08 +08:00