deadman96385 [Thu, 1 Jul 2021 22:48:53 +0000 (15:48 -0700)]
arm64: dts: sti6130d3x0: Apply dopinder/wade's stock DTS changes
* Dummy-Charger/Battery added to main DTB instead of DTBO.
* IR Remote disabled in main DTS, enabled in Wade DTBO.
Co-authored-by: Stricted <info@stricted.net>
Co-authored-by: Sean McCreary <mccreary@mcwest.org>
Change-Id: I9ae1d2a56596e5f3c3ed4d3d08fda6b8b45efe8b
deadman96385 [Thu, 1 Jul 2021 22:47:37 +0000 (15:47 -0700)]
arm64: dts: sti6130d3x0: Rebrand to track device-specific changes
Change-Id: I738ae3065b9a932619c7774d543031e829432892
Stricted [Sat, 19 Jun 2021 23:28:55 +0000 (23:28 +0000)]
arm64: dts: amlogic: Build all DTBs
Change-Id: I424c2f57b537371d980f4f1ead3d4c4516d67161
Nolen Johnson [Mon, 5 Dec 2022 20:07:06 +0000 (15:07 -0500)]
arm64: configs: g12a_defconfig: Update from TTT1.220909.001.B7-
9305992
Change-Id: I5aeefbe586dadadd257259db9f314f1babda5d2a
Stricted [Sat, 19 Jun 2021 23:30:26 +0000 (23:30 +0000)]
arm64: configs: Add g12a defconfig from STT1.211025.001.Z4-
7928920
* Extracted from stock package: adt3-user-12-STT1.211025.001.Z4-
7928920-release-keys.
* Ran through `make savedconfig` to sanitize/minimalize.
Change-Id: I55fc74de8ab3c6eeef072c95dc6b7f589ed8922c
Daniel Micay [Tue, 16 May 2017 21:51:48 +0000 (17:51 -0400)]
Add toggle for disabling newly added USB devices
Based on the public grsecurity patches.
Change-Id: I2cbea91b351cda7d098f4e1aa73dff1acbd23cce
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Andy Shevchenko [Mon, 22 Jan 2018 16:05:43 +0000 (18:05 +0200)]
UPSTREAM: seq_file: Introduce DEFINE_SHOW_ATTRIBUTE() helper
macro
The DEFINE_SHOW_ATTRIBUTE() helper macro would be useful for current
users, which are many of them, and for new comers to decrease code
duplication.
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Darren Hart (VMware) <dvhart@infradead.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Bug:
136497735
(cherry picked from commit
a08f06bb7a0743a7fc8d571899c93d882468096e)
Change-Id: Ib60cf57dc5e979915a83848919644150d82e7058
Signed-off-by: Hridya Valsaraju <hridya@google.com>
Heikki Krogerus [Tue, 21 Mar 2017 11:56:46 +0000 (13:56 +0200)]
lib/string: add sysfs_match_string helper
Make a simple helper for matching strings with sysfs
attribute files. In most parts the same as match_string(),
except sysfs_match_string() uses sysfs_streq() instead of
strcmp() for matching. This is more convenient when used
with sysfs attributes.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Icf173608d9814e1aaf6bc05ed4223f893763960b
Heikki Krogerus [Tue, 20 Mar 2018 12:57:02 +0000 (15:57 +0300)]
drivers: base: Unified device connection lookup
Several frameworks - clk, gpio, phy, pmw, etc. - maintain
lookup tables for describing connections and provide custom
API for handling them. This introduces a single generic
lookup table and API for the connections.
The motivation for this commit is centralizing the
connection lookup, but the goal is to ultimately extract the
connection descriptions also from firmware by using the
fwnode_graph_* functions and other mechanisms that are
available.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I5dd10228fc5a1e2c96a116b0de547dae35a3cddb
Christopher R. Palmer [Tue, 12 Aug 2014 09:43:23 +0000 (05:43 -0400)]
Don't require a VARIANT_DEFCONFIG
Change-Id: I4a652c22ad4e29cd2a7eb31ae533d1e09a015ced
dhacker29 [Fri, 23 Aug 2013 22:29:35 +0000 (17:29 -0500)]
scripts: Add support for variant and selinux defconfig
Change-Id: I853d82d970d14839906e4242f147cdd122f18c4c
LuK1337 [Tue, 11 Dec 2018 08:50:01 +0000 (09:50 +0100)]
Android: Add empty Android.mk file
* This prevents inclusion of drivers/staging/greybus/toolsAndroid.mk
which will conflict in case we have more than 1 kernel tree in AOSP
source dir.
Change-Id: I335bca7b6d6463b1ffc673ab5367603347516e13
Nolen Johnson [Tue, 21 Dec 2021 19:47:24 +0000 (14:47 -0500)]
usb: typec: tcpm: Unconditionally return port->current_limit
* For the function `tcpm_psy_get_current_max`, normally we compare max
of `port->current_limit` and `tcpm_get_max_fixed_current(port)`, but
`tcpm_get_max_fixed_current` is guarded by a messy DEBUGFS config
check. So, lets play it safe and assume that the port's limit is the
limit.
Change-Id: I9df703cd47f3a94b723b861fbfae0aabf13fb92c
Timi Rautamäki [Mon, 6 Dec 2021 18:00:27 +0000 (18:00 +0000)]
usb: typec: Fix enum conversion warning
Change-Id: Id61b8673915551bfa6ce81058bea066312b16345
Timi Rautamäki [Mon, 6 Dec 2021 18:00:27 +0000 (18:00 +0000)]
amlogic: media: di_multi: Fix enum conversion warnings
Change-Id: Idc9f800662e543b036fb44c3056980dc9163c18d
Stefan Agner [Sun, 11 Feb 2018 22:17:36 +0000 (23:17 +0100)]
ubifs: Remove unnecessary assignment
Assigning a value of a variable to itself is not useful. This
fixes a warning shown when using clang:
warning: explicitly assigning value of variable of type 'int' to itself [-Wself-assign]
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Richard Weinberger <richard@nod.at>
Change-Id: I282cad6e2d0c820e7dbece2f61ce046646aac3c9
Stefan Agner [Mon, 17 Apr 2017 02:22:43 +0000 (19:22 -0700)]
ubifs: Remove unnecessary assignment
Assigning a value of a variable to itself is not useful.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Richard Weinberger <richard@nod.at>
Change-Id: I0ac4db5bb670dde5e86af187a209fbbade6a3ba5
Stricted [Sat, 19 Jun 2021 23:14:08 +0000 (23:14 +0000)]
net: wireless: ath10k: Fix null check warnings
Change-Id: If6625cd0ddb96f6c056a8068efe033c69dc80bc3
Stricted [Wed, 23 Jun 2021 22:14:25 +0000 (22:14 +0000)]
media: dvb-frontends: Remove extra parentheses
Change-Id: I43119a75f3cb9d14e052c26e249d3215e60add99
Stricted [Sat, 19 Jun 2021 23:13:05 +0000 (23:13 +0000)]
media: dvb-frontends: Fix self assign warning
Change-Id: Ie343bf04cdc1843395663d1ac5a09cd3a49a43ca
Stricted [Sat, 19 Jun 2021 23:12:06 +0000 (23:12 +0000)]
amlogic: usb: Remove extra parentheses
Change-Id: Ide547d68899ef8150344b1f9d43e8db843317f63
Stricted [Sat, 19 Jun 2021 23:11:27 +0000 (23:11 +0000)]
amlogic: mtd: Remove extra parentheses
Change-Id: If0265d086d1f0453c0080b372878390f0050856f
Stricted [Sat, 19 Jun 2021 23:10:46 +0000 (23:10 +0000)]
amlogic: mmc: Fix null check
Change-Id: I08b33f1971b753cd443ac2006c08642414cee5fb
Stricted [Sat, 19 Jun 2021 23:09:39 +0000 (23:09 +0000)]
amlogic: memory_ext: Fix sizeof-array-div warning
Change-Id: Ief3bec13d2096c4d94bbbcb0e2654feec2c5dce9
Stricted [Sat, 19 Jun 2021 23:07:43 +0000 (23:07 +0000)]
amlogic: tvout: Remove extra parentheses
Change-Id: I4ec4b04576d043c5898263905a5db3ffa81a6c11
Stricted [Sat, 19 Jun 2021 23:06:58 +0000 (23:06 +0000)]
amlogic: tvin: Fix enum conversion warnings
Change-Id: Ib93abbeb272370b9e520a6eabdae8d9f1ca061cc
Stricted [Sat, 19 Jun 2021 23:05:13 +0000 (23:05 +0000)]
amlogic: osd: Fix self assign warnings
Change-Id: Ib7cbf268dcaf9115c423f5fea3eb88c5819aea24
Stricted [Sat, 19 Jun 2021 23:04:31 +0000 (23:04 +0000)]
amlogic: osd: Fix comparsion checks
Change-Id: Ide1f24ad8b6e6348df9ea5b1902116a2dc6ecae3
Stricted [Sat, 19 Jun 2021 23:03:23 +0000 (23:03 +0000)]
amlogic: amvecm: Fix if check warnings
Change-Id: If3696b4a33677f1a3d4db2fade1524a363d90fc7
Stricted [Sat, 19 Jun 2021 22:56:03 +0000 (22:56 +0000)]
amlogic: di_multi: Fix enum conversion warnings
Change-Id: Ie4c96994a79d1e824ef375d2bb4868da1d41750a
Stricted [Sat, 19 Jun 2021 22:53:25 +0000 (22:53 +0000)]
amlogic: deinterlace: Fix indentation
Change-Id: Ia49e62bcab7d4a0d49088e77b15234e8e783b096
Stricted [Sat, 19 Jun 2021 22:52:22 +0000 (22:52 +0000)]
amlogic: hifi4dsp: Fix null check
Change-Id: I3b8bc51863bb69662193d8e5e3f99f4319b81e65
Stricted [Sat, 19 Jun 2021 22:51:24 +0000 (22:51 +0000)]
amlogic: esm: Fix indentation
Change-Id: I48cb46f9b6bc1222a5a83273ed6e7f8329a5f2b9
Stricted [Sat, 19 Jun 2021 22:50:37 +0000 (22:50 +0000)]
amlogic: clk: Remove unused variables
Change-Id: I252bdd6b66bc87db7a4242ef5ffdf880bc931a3a
Stricted [Sat, 19 Jun 2021 22:48:54 +0000 (22:48 +0000)]
vmscan: Fix enum conversion warning
Change-Id: Ib06e0e5ec2660eb63c14c5e4ad2b5d8bb2261467
Stricted [Sat, 19 Jun 2021 22:46:42 +0000 (22:46 +0000)]
treewide: Remove unknown warning build flags
Change-Id: Ia6ebfc9a9438a0aff23a58fbb660b4e10f144db4
deadman96385 [Thu, 22 Jul 2021 00:31:04 +0000 (19:31 -0500)]
drivers: net: usb: Import Google's Realtek RTL8152/RTL8153 changes
Change-Id: I310354ab560e53b1d93bb9414423f51eabfb6b52
deadman96385 [Thu, 22 Jul 2021 00:22:32 +0000 (19:22 -0500)]
drivers: amlogic: Import Google's OTG changes
Change-Id: I79dfd43e7fae1f79cac2e45e5bf081b2d16240db
deadman96385 [Thu, 22 Jul 2021 00:19:50 +0000 (19:19 -0500)]
drivers: usb: Import Google's Type-C driver
Change-Id: Ib224baf7f88334a07f1f1d106f4d0af36b59c72d
deadman96385 [Thu, 22 Jul 2021 00:21:31 +0000 (19:21 -0500)]
drivers: usb: Import Google's role switch driver
Change-Id: Ie8e5b6759feea920d6fe903be43e94a8762842c1
deadman96385 [Wed, 21 Jul 2021 23:54:28 +0000 (18:54 -0500)]
drivers: google: Import USB power monitor driver
Change-Id: I5f56663798cbd790f4ec9f164e83d07404c157a3
xiang.wu1 [Tue, 25 Oct 2022 14:21:52 +0000 (22:21 +0800)]
hdmitx: adjust edid parsing [1/2]
PD#SWPL-97387
BUG=
244782420
Problem:
TVTS/2.4_R2 failed
Solution:
remove useless parsing code, and adjust
edid parsing and fallback policy
1.if edid checksum invalid in any block,
or header of cta extension block is 0,
then use fallback mode list
2.if base block header invalid, or
checksum invalid, then don't parse
base block except dtd / standard timing
3.for cta extension block, if block
byte0 != 0x2, it means not valid
extension block, skip parsing whole
block. if block byte1 <= 2, it means
that it's DVI block, skip parsing data
block, just parse DTD.
4.fallback mode list:
480p/720p/1080p60hz, RGB,8bit, and uplayer
should use 720p60hz RGB,8bit by default
Verify:
ah212
Signed-off-by: xiang.wu1 <xiang.wu1@amlogic.com>
Change-Id: I6e4b04888ce097846d18acaf3ba0df3e92313440
MingLiang Dong [Tue, 28 Jun 2022 11:57:04 +0000 (19:57 +0800)]
amvecm: merge stb eye protect for 4.9 [1/3]
PD#SWPL-61674
PD#SWPL-88705
BUG=
239526007
BUG=
235156795
Problem:
merge stb eye protect for 4.9
Solution:
merge stb eye protect for 4.9
Verify:
verify on adt3
Signed-off-by: MingLiang Dong <mingliang.dong@amlogic.com>
Change-Id: I0f7979a588a98ffee5a4c20ef96a9dd941eae8ed
Jeff Koo [Mon, 25 Jul 2022 06:45:22 +0000 (06:45 +0000)]
Merge "dts: add sg12a_s905y2_deadpool_1g.dts for 1G RAM [1/1]" into android-tv-deadpool-4.9-android12
Change-Id: I4cbc2a38fa05815341ba535d9cebdc6e1a35908a
yidong zhang [Mon, 27 Jun 2022 05:41:25 +0000 (13:41 +0800)]
dts: add sg12a_s905y2_deadpool_1g.dts for 1G RAM [1/1]
PD#SWPL-86236
BUG=
236953393
Problem:
add sg12a_s905y2_deadpool_1g.dts for 1G RAM.
Solution:
add sg12a_s905y2_deadpool_1g.dts for 1G RAM.
increase codec_mm
Verify:
adt3
Change-Id: I7fafff5ba3f535e6d95e585b85e365e06cd1428e
Signed-off-by: yidong zhang <yidong.zhang@amlogic.com>
TreeHugger Robot [Fri, 10 Jun 2022 05:49:54 +0000 (05:49 +0000)]
Merge "Android T: green screen issue [1/1]" into android-tv-deadpool-4.9-android12
Change-Id: I7b3899ae673863b069cf63b6bb53ec980a272aee
Maciej Żenczykowski [Wed, 5 May 2021 16:58:31 +0000 (09:58 -0700)]
net: fix nla_strcmp to handle more then one trailing null character
Android userspace has been using TCA_KIND with a char[IFNAMESIZ]
many-null-terminated buffer containing the string 'bpf'.
This works on 4.19 and ceases to work on 5.10.
I'm not entirely sure what fixes tag to use, but I think the issue
was likely introduced in the below mentioned 5.4 commit.
Reported-by: Nucca Chen <nuccachen@google.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Fixes:
62794fc4fbf5 ("net_sched: add max len check for TCA_KIND")
Change-Id: I66dc281f165a2858fc29a44869a270a2d698a82b
Signed-off-by: David S. Miller <davem@davemloft.net>
lele.liu [Thu, 9 Jun 2022 07:30:44 +0000 (15:30 +0800)]
Android T: green screen issue [1/1]
PD#SWPL-84229
BUG=
234891437
BUG=
235170159
Problem:
Connecting HDMI after 15+ seconds of device boot gives only green screen
Solution:
create new branch
Verify:
local
Signed-off-by: lele.liu <lele.liu@amlogic.com>
Change-Id: I3addbf52a0ffe2f4b101bc06a71e9c2ee9afcc9c
Hongguang [Fri, 3 Jun 2022 17:18:57 +0000 (10:18 -0700)]
Update ap6356 to bcmdhd.101.10.361.x
Bug:
232494797
Change-Id: Ifc2b73876a0895b7a442dc91aec783333a5ef874
Hongguang [Mon, 23 May 2022 23:56:59 +0000 (16:56 -0700)]
Update install script to use private modules.
Example:
./install_deadpool_artifacts.sh --build_id=
8633315 \
--install_path=/android/tm-tv-dev/device/askey/deadpool-kernel/
Change-Id: I9696a73449760e153a6c541c0478e512b45c70e7
Hongguang [Tue, 24 May 2022 02:27:25 +0000 (19:27 -0700)]
Install firmwares
Bug:
220644706
Test: make and find the private modules in dist.
Change-Id: I4866d6ade1d13c640d26974d0a0590cba602fde7
Hongguang [Mon, 23 May 2022 23:54:20 +0000 (16:54 -0700)]
Add two optee kos into private module list
Bug:
220644706
Test: make and find the private modules in dist.
Change-Id: I20ce519c5bdea4db191aa20cf742efaebf326542
Hongguang [Mon, 23 May 2022 21:58:53 +0000 (14:58 -0700)]
Add private modules list.
Bug:
220644706
Test: make and find the private modules in dist.
Change-Id: Ic563fe6d2bc85a0255c6bc1ab363ce83cdc51793
Hongguang [Fri, 13 May 2022 21:43:25 +0000 (14:43 -0700)]
Add a script to install deadpool artifacts from go/ab
Bug:
220644706
Change-Id: I6eb8f7d50016def7275a35b3ca2d358f617a4181
Max Zhang [Wed, 11 May 2022 05:50:34 +0000 (05:50 +0000)]
ADT3: kernel build config file
Provide the kernel build config file for build server.
Bug:
220644706
Change-Id: Ib52f329fc7082de053fd37e20596d69c4dc7bfc0
Max Zhang [Tue, 10 May 2022 18:30:19 +0000 (18:30 +0000)]
ADT-3: Enable bandwidth limiting options
Enable the following options to support go/bandwidth-limiting:
- CONFIG_NET_SCH_TBF
- CONFIG_NET_CLS_MATCHALL
- CONFIG_NET_ACT_POLICE
- CONFIG_NET_ACT_BPF
bug:
157552970
181855645
Change-Id: I6c7609ca642858d1282c7ddd0e9b1583ff4f4165
Hongguang Chen [Tue, 3 May 2022 16:49:58 +0000 (16:49 +0000)]
Merge "tee: add vp9 prob interfaces [1/2]" into android-tv-deadpool-4.9-android12
Change-Id: Id15fffe760ac3c2ffde260159a8ee50e73891e97
Xiaohang Cui [Sun, 1 May 2022 13:13:50 +0000 (21:13 +0800)]
tee: add vp9 prob interfaces [1/2]
PD#SWPL-80006
b/
229652967
Problem:
move vp9 prob process to Tee
Solution:
add interfaces for vp9 prob process
refer to:
https://scgit.amlogic.com/#/c/166331/
Verify:
android t + S905Y2-U221
Change-Id: I24002c71e537bef189f2cbfda86c9b855f43a23f
Signed-off-by: Xiaohang Cui <xiaohang.cui@amlogic.com>
jintao xu [Mon, 13 Sep 2021 10:32:59 +0000 (18:32 +0800)]
v4lvideo: support max 128 fd [1/1]
PD#SWPL-57099
b/
228938762
Problem:
TvtsJankHostTestCases need keep too many fd
Solution:
support max 128 fd
Verify:
T3
Change-Id: I082d6252250614344130233f92baf3845c1048ba
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
Hongguang Chen [Tue, 26 Apr 2022 20:08:11 +0000 (20:08 +0000)]
Merge "vts: vts_ltp_test_arm fail [1/1]" into android-tv-deadpool-4.9-android12
Change-Id: I95896fbeebf3cf440a131baa2672b812ccd4b216
weifang.liu [Sat, 2 Apr 2022 04:47:41 +0000 (12:47 +0800)]
vts: vts_ltp_test_arm fail [1/1]
PD#SWPL-75722
Problem:
need skip this test to rm CONFIG_CHECKPOINT_RESTORE
Solution:
rm CONFIG_CHECKPOINT_RESTORE to test
Verify:
Verify local
Change-Id: Ia53d0c5b55ee17e7223c418ddc8d23dfb97dcf56
Signed-off-by: weifang.liu <weifang.liu@amlogic.com>
pengzhao.liu [Wed, 30 Mar 2022 09:29:29 +0000 (17:29 +0800)]
dts: ramoops: enable ramoops [1/1]
PD#SWPL-76989
Bug:
227141269
Problem:
enable ramoops ramoops
Solution:
enable ramoops ramoops
Verify:
adt3
Signed-off-by: pengzhao.liu <pengzhao.liu@amlogic.com>
Change-Id: I76b01359c048f9945ccfbde676c14d218510b17a
hao.qi [Tue, 29 Mar 2022 09:35:43 +0000 (17:35 +0800)]
vts: 2 Testcases failed in the module "vts_fs_test" [1/2]
PD#SWPL-75717
b/
225279764
Problem:
2 Testcases failed in the module "vts_fs_test"
Solution:
change data partition to userdata
move partition mount from dts to fstab
Verify:
S905Y2-U221
Change-Id: I4a530337ef8c4220b68b3b1a49860c89044b89f9
Signed-off-by: hao.qi <hao.qi@amlogic.com>
pengzhao.liu [Tue, 22 Mar 2022 06:03:33 +0000 (14:03 +0800)]
ANDROID: selinux: modify RTM_GETNEIGH [1/1]
PD#SWPL-71742
Bug:
171572148
Problem:
Map the permission gating RTM_GETNEIGH/RTM_GETNEIGHTBL messages to a
new permission so that it can be distinguished from the other netlink
route permissions in selinux policy. The new permission is triggered by
a flag set in system images T and up.
Solution:
This change is intended to be backported to all kernels that a T system
image can run on top of.
Verify:
on adt3-t kernel
Test: ateddst NetworkInterfaceTest
Test: atest CtsSelinuxTargetSdkCurrentTestCases
Test: atest bionic-unit-tests-static
Test: On Cuttlefish, run combinations of:
- Policy bit set or omitted (see https://r.android.com/
1701847)
- This patch applied or omitted
- App having nlmsg_readneigh permission or not
Verify that only the combination of this patch + the policy bit being
set + the app not having the nlmsg_readneigh permission prevents the
app from sending RTM_GETNEIGH messages.
Change-Id: I4bcfce4decb34ea9388eeedfc4be67403de8a980
Signed-off-by: Bram Bonné <brambonne@google.com>
Signed-off-by: pengzhao.liu <pengzhao.liu@amlogic.com>
Change-Id: Ic9d51cebab8c195537d54a28a23a7e93f09ba0b3
weifang.liu [Fri, 18 Mar 2022 07:13:06 +0000 (15:13 +0800)]
vts: netd_integration_test fail [1/1]
PD#SWPL-75333
BUG=
225139017
Problem:
KernelTest#TestRateLimitingSupport fail
Solution:
add related kernel config
Verify:
local
Change-Id: Id1ec210fbe5d927061a70675652523079934b522
Signed-off-by: weifang.liu <weifang.liu@amlogic.com>
TreeHugger Robot [Tue, 4 Jan 2022 20:28:48 +0000 (20:28 +0000)]
Merge changes Ifc5bd922,I57affad1,I92d3d3ce into android-tv-deadpool-4.9-android12
* changes:
VPP: VPP code style modify [1/1]
vpp: coding style modify [1/1]
vpp: coding style modify [2/6]
Robin Lee [Thu, 4 Nov 2021 07:28:19 +0000 (07:28 +0000)]
Merge "Revert "Enable CONFIG_DM_BOW for checkpointing"" into android-tv-deadpool-4.9-android12
Change-Id: I0e760cc35b91b65021bfeda1914eeb9e7839559b
Robin Lee [Thu, 4 Nov 2021 07:26:45 +0000 (07:26 +0000)]
Revert "Enable CONFIG_DM_BOW for checkpointing"
This reverts commit
830f673c981ba4da2663a91cc8590eed9fc2032e.
Reason for revert: Merged wrong CL
Change-Id: I16d4614c52a41f48fb657db48caff92aa5bff419
Robin Lee [Thu, 4 Nov 2021 07:26:28 +0000 (07:26 +0000)]
Merge "Enable CONFIG_DM_BOW for checkpointing" into android-tv-deadpool-4.9-android12
lele.liu [Thu, 4 Nov 2021 01:46:43 +0000 (01:46 +0000)]
vts: vts_kernel_checkpoint_test [1/2]
PD#SWPL-63211
Problem:
short of dm_bow config
Solution:
enable dm_bow config
Verify:
local
Change-Id: I503d20b44651b91ab13449d51814c2b1b668d9d7
Signed-off-by: lele.liu <lele.liu@amlogic.com>
liang ji [Thu, 4 Nov 2021 02:57:34 +0000 (02:57 +0000)]
Revert "fstab: checkpoint configuration [1/1]"
This reverts commit
8e0c306593c39066dca21a87151dcfba4a1c3957.
Reason for revert:
Reason for revert: a better formatted patch will be submitted later
Change-Id: Ieb7dfa4f0bcbec9a4e26904618575baf840741e7
Pengfei Zhao [Wed, 3 Nov 2021 14:47:34 +0000 (22:47 +0800)]
fstab: checkpoint configuration [1/1]
PD#NONE
Problem:
vts_kernel_checkpoint_test fail
Solution:
add config checkpoint and DB_BOW
Verify:
adt3
Signed-off-by: Pengfei Zhao <pengfei.zhao@amlogic.com>
Change-Id: I62102ab3d2c37afbb40c7c7a3e4ca212d83fe7e3
Liang Ji [Tue, 19 Oct 2021 02:12:12 +0000 (10:12 +0800)]
adt3: Release 52 MB of unused memory allocated in "ion-dev" [1/1]
PD#SWPL-61729
BUG=
203412562
Problem:
Release 52 MB of unused memory allocated in "ion-dev"
Solution:
Release 52 MB of unused memory allocated in "ion-dev"
Verify:
adt3-S
Signed-off-by: Liang Ji <liang.ji@amlogic.com>
Change-Id: I87a24212cbf5b6ffac39fff94d52c498b226bb65
yao zhang1 [Fri, 15 Oct 2021 06:45:28 +0000 (06:45 +0000)]
BACKPORT: gup: document and work around "COW can break either way" issue
PD#SWPL-61507
BUG=
202208062
commit
17839856fd588f4ab6b789f482ed3ffd7c403e1f upstream.
Doing a "get_user_pages()" on a copy-on-write page for reading can be
ambiguous: the page can be COW'ed at any time afterwards, and the
direction of a COW event isn't defined.
Yes, whoever writes to it will generally do the COW, but if the thread
that did the get_user_pages() unmapped the page before the write (and
that could happen due to memory pressure in addition to any outright
action), the writer could also just take over the old page instead.
End result: the get_user_pages() call might result in a page pointer
that is no longer associated with the original VM, and is associated
with - and controlled by - another VM having taken it over instead.
So when doing a get_user_pages() on a COW mapping, the only really safe
thing to do would be to break the COW when getting the page, even when
only getting it for reading.
At the same time, some users simply don't even care.
For example, the perf code wants to look up the page not because it
cares about the page, but because the code simply wants to look up the
physical address of the access for informational purposes, and doesn't
really care about races when a page might be unmapped and remapped
elsewhere.
This adds logic to force a COW event by setting FOLL_WRITE on any
copy-on-write mapping when FOLL_GET (or FOLL_PIN) is used to get a page
pointer as a result.
The current semantics end up being:
- __get_user_pages_fast(): no change. If you don't ask for a write,
you won't break COW. You'd better know what you're doing.
- get_user_pages_fast(): the fast-case "look it up in the page tables
without anything getting mmap_sem" now refuses to follow a read-only
page, since it might need COW breaking. Which happens in the slow
path - the fast path doesn't know if the memory might be COW or not.
- get_user_pages() (including the slow-path fallback for gup_fast()):
for a COW mapping, turn on FOLL_WRITE for FOLL_GET/FOLL_PIN, with
very similar semantics to FOLL_FORCE.
If it turns out that we want finer granularity (ie "only break COW when
it might actually matter" - things like the zero page are special and
don't need to be broken) we might need to push these semantics deeper
into the lookup fault path. So if people care enough, it's possible
that we might end up adding a new internal FOLL_BREAK_COW flag to go
with the internal FOLL_COW flag we already have for tracking "I had a
COW".
Alternatively, if it turns out that different callers might want to
explicitly control the forced COW break behavior, we might even want to
make such a flag visible to the users of get_user_pages() instead of
using the above default semantics.
But for now, this is mostly commentary on the issue (this commit message
being a lot bigger than the patch, and that patch in turn is almost all
comments), with that minimal "enable COW breaking early" logic using the
existing FOLL_WRITE behavior.
[ It might be worth noting that we've always had this ambiguity, and it
could arguably be seen as a user-space issue.
You only get private COW mappings that could break either way in
situations where user space is doing cooperative things (ie fork()
before an execve() etc), but it _is_ surprising and very subtle, and
fork() is supposed to give you independent address spaces.
So let's treat this as a kernel issue and make the semantics of
get_user_pages() easier to understand. Note that obviously a true
shared mapping will still get a page that can change under us, so this
does _not_ mean that get_user_pages() somehow returns any "stable"
page ]
[surenb: backport notes
Replaced (gup_flags | FOLL_WRITE) with write=1 in gup_pgd_range.
Removed FOLL_PIN usage in should_force_cow_break since it's missing in
the earlier kernels.
Since gup_pgd_range does not exist, made appropriate changes on
the the gup_huge_pgd, gup_huge_pd and gup_pud_range calls]
Reported-by: Jann Horn <jannh@google.com>
Tested-by: Christoph Hellwig <hch@lst.de>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Kirill Shutemov <kirill@shutemov.name>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[surenb: backport to 4.9 kernel]
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: yao zhang1 <yao.zhang1@amlogic.com>
Change-Id: I877999f7b789aee6078ccade2ae54b827d88368f
binqi zhang [Thu, 30 Sep 2021 12:08:35 +0000 (20:08 +0800)]
v4lvideo: workaround for ctsMediaTest
PD#SWPL-54808
BUG=
197895076
Problem:
CtsMediaTestCases 44 DecodeAccuracyTest cases failed
Solution:
add extend column and row for special resolution cts
add dump yuv data interface
add debug flag for cts workaround
Verify:
adt3
Change-Id: Ie461422fddab008d4d905930f5f40a612bb1a98b
Signed-off-by: binqi zhang <binqi.zhang@amlogic.com>
Signed-off-by: Pengfei Zhao <pengfei.zhao@amlogic.com>
Shuide Chen [Wed, 22 Sep 2021 10:33:29 +0000 (18:33 +0800)]
memory: use new stratedy for all R+ device [2/2]
SWPL-59636
Problem:
cma shrinker is not standard implement, which may cause
app being unexpected killed
Solution:
use lmkd to kill app.
disable cma shrinker
Signed-off-by: Shuide Chen <shuide.chen@amlogic.com>
Change-Id: I9e510f837047fdb2c8617efb3ba403c69d8f1b9c
jintao xu [Tue, 20 Jul 2021 12:47:54 +0000 (20:47 +0800)]
ionvideo: support no drop i for cts [1/1]
PD#SWPL-54823
Problem:
ionvideo drop i cause cts fail
Solution:
ionvideo not drop i
Verify:
U221
Change-Id: Icbfcb56b69a657a43aaee26428568a5140836167
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
jintao xu [Fri, 21 Aug 2020 09:04:16 +0000 (17:04 +0800)]
v4lvideo: set field V4L2_FIELD_INTERLACED when video is interlace [1/2]
PD#SWPL-32080
Problem:
omx need know interlace or not
Solution:
v4lvideo sent interlace info to omx
Verify:
AH212
Change-Id: I4ce4c5e8aeafe5ed920855cc5e1f3f2245eec9ce
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
Max Zhang [Mon, 13 Sep 2021 23:18:17 +0000 (23:18 +0000)]
Disable debugfs in ADT3 kernel
debug_fs should be disable in release build and pass XTS
Change-Id: Ica01a743a9ad64dab3c79ff00edea5d92202fd8e
hang cheng [Wed, 1 Sep 2021 12:50:35 +0000 (20:50 +0800)]
hdmitx: add extra uevents to supplement extcon [4/4]
PD#SWPL-57172
Problem:
hal can't receive suspend/resume uevent
on android S + 4.9-q
Solution:
add extra uevents to supplement extcon;
on android S, it will only listen to uevent
on android Q, it will only listen to extcon
Verify:
u221
Change-Id: I52fbe9756a824d6876753ae3ff36c7bb7b9b6f97
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
hang cheng [Fri, 7 May 2021 09:09:13 +0000 (17:09 +0800)]
hdmitx: correct hdmipwr uevent init state [3/4]
PD#SWPL-49008
Problem:
hdmi early suspend uevent is not received by sysctl
Solution:
correct hdmipwr uevent init state
Verify:
AC214
Change-Id: I91f4e1643a58d54a8d0ca0f8cf50bd9ab6e1bd13
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
Zongdong Jiao [Tue, 10 Aug 2021 05:15:14 +0000 (13:15 +0800)]
hdmitx: adjust the hdmi resume power uevent [2/4]
PD#SWPL-56597
Problem:
Current the hdmi resume power uevent is early and before reading
edid, and this will make application can't get sink capability and
set the 480p as default
Solution:
Adjust the hdmi resume power uevent after reading edid
Verify:
g12/u212
Change-Id: I20acd118762d167ccfbf790c8fbace3171b0fda3
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
Zongdong Jiao [Mon, 26 Jul 2021 14:21:29 +0000 (22:21 +0800)]
hdmitx: head the hdmi_pwr in resume [1/4]
PD#SWPL-55323
Problem:
the hdmi_pwr is too late in resume
Solution:
head the hdmi_pwr in resume
Verify:
G12/U212
Change-Id: I86bd4dfd0c6b51578cb09fd4fc8902b858de9eae
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
jian.cao [Fri, 27 Aug 2021 06:21:43 +0000 (14:21 +0800)]
osd: avoid color_info NULL [1/1]
PD#SWPL-57980
Problem:
after the device is powered on
plug in the HDMI cable a few seconds
then OSD panic
Solution:
avoid color_info NULL
Verify:
g12a
Change-Id: I69202bc06d889e59a391b50b609237689eb29d31
Signed-off-by: jian.cao <jian.cao@amlogic.com>
song.han [Mon, 23 Aug 2021 08:32:52 +0000 (16:32 +0800)]
defconfig: open DEBUG_FS by defconfig [1/1]
PD#SWPL-57714
Problem:
can't open DEBUG_FS by Kconfig
Solution:
CONFIG_DEBUG_FS=y
Verify:
local
Change-Id: Idc201854cb819c23059f981eab6f7341273ba58e
Signed-off-by: song.han <song.han@amlogic.com>
jian.cao [Tue, 3 Aug 2021 06:39:42 +0000 (14:39 +0800)]
media: osd: fix depend error in arm32 user version [2/4]
PD#SWPL-47101
Problem:
CONFIG_AMLOGIC_MEDIA_FB_OSD_SYNC_FENCE depends on CONFIG_DEBUG_FS
and is not enabled in arm32 user version
Solution:
fix depend error
Verify:
s4 ap222
Change-Id: I5ff794630ca933cb33c523b49b83f6185c18182d
Signed-off-by: jian.cao <jian.cao@amlogic.com>
(cherry picked from commit
8e8cabbd2b8a20ce4e06d7898682b2665187012c)
song.han [Fri, 13 Aug 2021 08:18:23 +0000 (16:18 +0800)]
Kconfig: close DEBUG_FS select by TRACING [3/4]
PD#SWPL-57714
Problem:
can't close DEBUG_FS by config
Solution:
modify Kconfig about TRACING
Verify:
local
Change-Id: I6b926143fd94f952214e0f1fff2551fb891b1020
Signed-off-by: song.han <song.han@amlogic.com>
Bichao Zheng [Mon, 16 Aug 2021 08:00:54 +0000 (16:00 +0800)]
clkmsr: adjust register debugfs [1/4]
PD#SWPL-57735
Problem:
close DEBUG_FS then clkmsr crash.
Solution:
adjust register debugfs
Verify:
g12a_u212
Change-Id: I7988c6d4a9508dad26a6f886289ec3509c0af1df
Signed-off-by: Bichao Zheng <bichao.zheng@amlogic.com>
hang cheng [Tue, 29 Jun 2021 12:59:51 +0000 (20:59 +0800)]
hdmitx: fix edid parse crash [1/1]
PD#SWPL-56548
Problem:
may block during spinlock cause crash
Solution:
move block outside of spinlock
Verify:
AB311
Change-Id: If0086cf3dd53b3426c8c2132e4718e36d06cb866
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
Liang Ji [Tue, 10 Aug 2021 06:47:05 +0000 (14:47 +0800)]
Increase framebuffer memory pool so it can hold 6 framebuffers [1/1]
PD#GH-1202
BUG=
190485198
Problem:
Increase framebuffer memory pool so it can hold 6 framebuffers
Solution:
Increase framebuffer memory pool so it can hold 6 framebuffers
Verify:
adt3
Signed-off-by: Liang Ji <liang.ji@amlogic.com>
Change-Id: I2711107539efacdb810e8e10ca1f14f3e3d14533
Zongdong Jiao [Tue, 27 Jul 2021 11:45:30 +0000 (19:45 +0800)]
hdmitx: correct the unit of physical size [1/1]
PD#SWPL-54362
Problem:
The physical size is cm, while the screen size is mm.
Need unify the unit.
Solution:
Correct the unit of physical size as mm.
Verify:
g12/u212
Change-Id: I0c1f3d71f2df4930d8a91f692b713ad537133a55
Signed-off-by: Zongdong Jiao <zongdong.jiao@amlogic.com>
lele.liu [Wed, 28 Jul 2021 06:34:12 +0000 (14:34 +0800)]
Android S bt: kernel get BT-WAKE,do not send power key[1/1]
PD#SWPL-49147
Problem:
Bluetooth wakes up device unexpectedly
Solution:
kernel get BT-WAKE,do not send power key
Verify:
local
Signed-off-by: lele.liu <lele.liu@amlogic.com>
Change-Id: I8ccc0a719f8b54537b932c66f29a52c4a956d69b
Signed-off-by: lele.liu <lele.liu@amlogic.com>
hang cheng [Mon, 7 Jun 2021 11:20:36 +0000 (19:20 +0800)]
cec: fix complie issue [1/1]
PD#SWPL-52256
Problem:
CONFIG_AMLOGIC_HDMITX macro is not defined on
TV platform, cause complie issue
Solution:
fix complie issue
Verify:
am301
Change-Id: Ib9bcfe3d613f8affe2469adcce4383b315eee3fc
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
jintao xu [Mon, 21 Jun 2021 06:43:18 +0000 (14:43 +0800)]
video_composer: add in the uvm type to check whether has vframe. [1/1]
PD#SWPL-52333
Problem:
hdmitx audio setting function is called on TV
platform and cause crash
Solution:
if hdmitx driver is not enabled, export function
just return
Verify:
pb
Signed-off-by: jintao xu <jintao.xu@amlogic.com>
Change-Id: Ic87135d8621a2a37e74c2ac8ddc6d7096e3d75d1
Dezhi Kong [Fri, 19 Mar 2021 08:23:10 +0000 (16:23 +0800)]
ion: add fb heap for hw-fb [1/1]
PD#SWPL-45003
Problem:
hw-fb may alloc fail from cma heap,
which will result in display messed up
Solution:
add a separate ion fb heap only used for HW_FB
Verify:
sm1-newton-ac214
g12a-franklin-u212
Change-Id: I154fe5c61ad1c92cfc652234a093090284c4d2f3
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
Yonghui Yu [Fri, 18 Jun 2021 14:03:06 +0000 (22:03 +0800)]
cts: fix CtsDownloadManagerApi28 1 fail [1/2]
PD#SWPL-51104
Problem:
CtsDownloadManagerApi28 fail because of ioctrl
failure on EXT4_IOC_FSGETXATTR and EXT4_IOC_FSSETXATTR.
Solution:
Add those two IOC to the compat_ioctrl.
Verify:
adt3
Signed-off-by: Yonghui Yu <yonghui.yu@amlogic.com>
Change-Id: I2ed64202819b15d6b8aa75b6aefd255a3580cbd1
Cao Jian [Wed, 16 Jun 2021 05:51:44 +0000 (13:51 +0800)]
picdec: skip putting vframe if current buffer is being in used [1/1]
PD#SWPL-52807
Problem:
GIF pictures flicker after quickly switching pictures
Solution:
skip putting vframe if current buffer is being in used
Verify:
on t5
Change-Id: Id1366ead409967a6055d5de5413f16774407c778
Signed-off-by: Cao Jian <jian.cao@amlogic.com>
hang cheng [Tue, 15 Jun 2021 06:37:48 +0000 (14:37 +0800)]
hdmitx: enhance robustness for export function [1/1]
PD#SWPL-52333
Problem:
hdmitx audio setting function is called on TV
platform and cause crash
Solution:
if hdmitx driver is not enabled, export function
just return
Verify:
am301
Change-Id: I5e369e6951dfbb5da1784a7245b9c08bc7684c6f
Signed-off-by: hang cheng <hang.cheng@amlogic.com>
Ruixuan Li [Tue, 8 Jun 2021 07:31:23 +0000 (15:31 +0800)]
emmc: build fake bootloader0 & bootloader1 [1/1]
PD#SWPL-52307
Problem:
need bootloader0 & bootloader1 offset from 1 sector
Solution:
add fake partition
Verify:
passed on t3_t982
Signed-off-by: Ruixuan Li <ruixuan.li@amlogic.com>
Change-Id: Iddac88632af72fb9251a19c4941efc9a29cd6b59
Pengfei Liu [Tue, 15 Jun 2021 09:07:46 +0000 (17:07 +0800)]
demux: clean demux output buffer [1/1]
PD#SWPL-52784
Problem:
dmx have remaining data.
Solution:
clean dmx output buffer
Verify:
verified at vo svp.
Signed-off-by: Pengfei Liu <pengfei.liu@amlogic.com>
Change-Id: Ia392e83533a0ec8e3b6d9ed13a219a07a23eced3