Commit graph

4925 commits

Author SHA1 Message Date
Robin Peng
7a29a8f195 Use modprobe --all to load all modules in modules.load
Previously, we ran modprobe command for every .ko file listed in
init.insmod.*.cfg. Let's move to a different approach where we call
modprobe with the following command line.

modprobe -b --all=/vendor/lib/modules/modules.load

This will insmod all modules listed in modules.load except for those
that are mentioned in the blocklist at
/vendor/lib/modules/modules.blocklist

A common reason for a module to be on the blocklist is that it must only
be loaded under a certain condition like when a specific service is
launched.

Bug: 192241728
Change-Id: I518426308d0bfc358c8c815a69d431e27ebcf6e4
2021-06-30 03:54:28 +00:00
Robin Peng
955f808124 Add a kernel module blocklist file
Kernel modules on the blocklist are not automatically loaded during
second stage init. Modules are often put on the blocklist if we want
them to get loaded only under certain circumstances.

Bug: 192241728
Change-Id: I05d55f8a2854619b92defcf3fb11cc2b87a8dab6
2021-06-30 03:54:19 +00:00
Robin Peng
5728c951c8 Read vendor_boot.modules.load and vendor_dlkm.modules.load
Previously, we copied all available kernel modules into the vendor_boot
ramdisk except for approx. 14 modules that we explicitly excluded.

Going forward, the kernel build will distribute the two additional files
vendor_boot.modules.load and vendor_dlkm.modules.load which define,
respectively, the lists of modules that should be loaded from
vendor_boot and vendor_dlkm.

The contents of the two *.modules.load files will be copied almost
verbatim into modules.load files in the respective images except for the
fact that the directory names of the .ko files are stripped. So, for
example, kernel/net/core/pktgen.ko becomes just pktgen.ko.

Additionally, we only copy those .ko files into the vendor_boot image
that are listed in vendor_boot.modules.load. On the other hand, the
vendor_dlkm partition image will contain all .ko files regardless of
whether they are listed in vendor_dlkm.modules.load.

Bug: 190652328
Change-Id: I6fc41a0143e7253f193cac509ba30506feb4e2d9
2021-06-30 03:54:09 +00:00
TreeHugger Robot
29de3767e5 Merge "Revert "Add sensors to gs201."" 2021-06-30 00:38:50 +00:00
Pat Tjin
1396b4b523 Revert "Add sensors to gs201."
This reverts commit 4c78229124.

Test: Boot to home
Bug: 192097339
Change-Id: I41fb4f58233f542f9fed7cce8aabad6eb65d3028
2021-06-29 16:56:26 -07:00
Robin Peng
8f884f0db7 gs201: migrate to bootimg header v4 (second attempt)
We migrate to bootimg header v4 and build the following two vendor
ramdisk fragments.

Type: Platform, Name: "", Contents: Everything but kernel modules
Type: DLKM, Name: "dlkm", Contents: Kernel modules (incl. modules.load etc.)

Bug: 192240132
Change-Id: I59d0d5ec89953428e163b54d2fc3e3c3e9da7188
2021-06-28 22:21:36 +08:00
Salmax Chang
65cc9fae12 Merge "Add vcd for userdebug ROM" 2021-06-27 08:52:58 +00:00
SalmaxChang
9a3f7171fd Add vcd for userdebug ROM
Bug: 190331325
Change-Id: I6642f426ba77ea6bfa661d7eb88884df48f7b3ca
2021-06-27 07:32:26 +00:00
Yu-Chi Cheng
6e14b83fe7 Added edgetpu_config_chip soong variable to gs201 edgetpu.mk.
This allows EdgeTPU component to build different components
per target chip.

Bug: 192096682
Test: tested on prebuilt.
Change-Id: Id9ee7de22648c591f8a540c5441ad375a9ee3439
2021-06-25 13:47:10 -07:00
Armelle Laine
ab4c5929db Include /dev/trusty-log0 as one of the Cloudripper's dumpstate_board section
- DumpState add trusty section to dump /dev/trusty-log0
- ueventd.gs101.rc: add /dev/trusty-log0 (system ownership) and r/w permissions to user/group

Test: adb root; adb shell lshal debug android.hardware.dumpstate@1.1::IDumpstateDevice/default trusty
Bug: 192036703
Change-Id: I752ee9c9a88855485d71ed9deb1555df5bb005cd
Signed-off-by: Armelle Laine <armellel@google.com>
2021-06-25 20:37:56 +00:00
Armelle Laine
80b4b76457 Update device.mk to include trusty unit test
Bug: 191324832
Test: adb shell /vendor/bin/trusty-ut-ctrl -D /dev/trusty-ipc-dev0
Change-Id: I53e4b55826c17d6830667c93e68300bc4e3a5a93
Signed-off-by: Armelle Laine <armellel@google.com>
2021-06-25 20:37:48 +00:00
ichihlu
d7035a52dc TUI: enable for cloudripper
Bug: 192038980
Test: Build pass
Change-Id: I590fb0f232879fc2248b089c90daa7d1e10988a7
2021-06-25 07:51:00 +00:00
Thierry Strudel
c74bbb4df9 Revert "Hold wakelock on boot"
This partially reverts commit 28140b7240.

USB will hold a wakelock preventing suspend to happen

Bug: 188796118
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Change-Id: Idc583a025e429a5b5f13a94b732717e9491e4e55
2021-06-24 16:01:27 +00:00
Max Shi
e3c50a383e Merge "Add sensors to gs201." 2021-06-23 21:33:24 +00:00
SalmaxChang
ef1afd402d gs201: fstab: mount modem partition
Bug: 190504416
Change-Id: I51fca8fee2f8a75348152ee408f2c52bec602906
2021-06-23 02:33:08 +00:00
Adlai Holler
fff0d1fa1f Remove redundant build property for reduceOpsTaskSplitting
This flag is true for everyone now. No need for it here. Change has no effect.

Change-Id: Iba023c08ff1cb4f88e460fbb69c6cfb17f6d780f
Bug: 183612348
2021-06-22 17:03:05 +00:00
Thierry Strudel
d045354a90 powerstats: fix ODPM device names
============= PowerStats HAL 2.0 energy consumers ==============
CPUCL0       :       24968.54 mWs
CPUCL1       :        8919.14 mWs
CPUCL2       :       11926.69 mWs
MODEM        :           0.00 mWs
GPS          :           0.00 mWs
Wifi         :           0.00 mWs
BT           :           0.00 mWs
display      :       71299.61 mWs
========== End of PowerStats HAL 2.0 energy consumers ==========

============= PowerStats HAL 2.0 energy meter ==============
                           Channel    Cumulative Energy
     [PPVAR_VSYS_PWR_DISP]:Display         71299.61 mWs
            [VSYS_PWR_MODEM]:Modem             0.00 mWs
          [VSYS_PWR_RFFE]:Cellular             0.00 mWs
                 [S1M_VDD_MIF]:MIF          6768.08 mWs
         [S2M_VDD_CPUCL2]:CPU(BIG)         11926.69 mWs
         [S3M_VDD_CPUCL1]:CPU(MID)          8919.14 mWs
      [S4M_VDD_CPUCL0]:CPU(LITTLE)         24968.54 mWs
                 [S5M_VDD_INT]:INT          6053.63 mWs
                   [S6M_LLDO1]:LDO          4850.91 mWs
                 [S7M_VDD_INT]:INT          3893.55 mWs
                [S10M_VDD_TPU]:TPU          1246.19 mWs
             [L1M_VDD_ALIVE]:Alive          2243.80 mWs
          [S1S_VDD_CAM]:Multimedia          5501.09 mWs
                 [S2S_VDD_G3D]:GPU          6432.73 mWs
                   [S3S_LLDO1]:LDO         15484.51 mWs
               [S4S_VDD2H_MEM]:DDR         11950.26 mWs
                [S5S_VDDQ_MEM]:DDR          5148.75 mWs
                   [S6S_LLDO4]:LDO         13688.50 mWs
                    [S7S_MLDO]:LDO         24895.53 mWs
              [S8S_VDD_G3D_L2]:GPU          6934.05 mWs
                 [S9S_VDD_AOC]:AOC          7403.07 mWs
                  [S10S_VDD2L]:DDR          9040.13 mWs
               [L9S_GNSS_CORE]:GPS             0.00 mWs
              [L21S_VDD2L_MEM]:MEM             0.00 mWs
========== End of PowerStats HAL 2.0 energy meter ==========


Signed-off-by: Thierry Strudel <tstrudel@google.com>
Change-Id: I83053e4e5b1414cf1410b38fe03d8bbadc70e5bd
2021-06-22 01:04:00 +00:00
Wayne Lin
9c5158dade Merge "gps: enable gps module in gs201" 2021-06-18 08:03:26 +00:00
Wayne Lin
c153824304 gps: enable gps module in gs201
Build GPS with RIL due to library dependencies

Bug: 190707050
Bug: 191119634
Test: GPS test pass
Change-Id: I96151b95a8c7a3bf3d9cea340d6f5aaebba8ffde
2021-06-18 11:09:06 +08:00
Richard Hsu
b7408c33ee Merge "[Bringup] Update device.mk for TPU (Janeiro) for PRO." 2021-06-18 01:20:29 +00:00
Richard Hsu
45ff75ce19 [Bringup] Update device.mk for TPU (Janeiro) for PRO.
Give TPU device path (/dev/janeiro) the same access permission as /dev/abrolhos. This change is similar
to what we did for WCH, but for PRO.

Bug: 191185522

Test: run_tflite_test_odc passes.
https://paste.googleplex.com/5466657955774464

Change-Id: If735e699c0c9ec842f915ebc7b59d0896f4c776c
2021-06-17 17:23:04 -07:00
linpeter
6da3eac453 gs201: declare IDisplay to V2
Bug: 190793567
test: check manifest
Change-Id: I5c0a24b340181e06532daa7f0e624fd39fd21def
2021-06-17 10:58:48 +08:00
Taehwan Kim
cb898663cb add "can-swap-width-height" for video codec
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>
Change-Id: Icf149b2ea817785888f2605862d17a925fcac9b5
2021-06-16 23:08:42 +00:00
Taehwan Kim
d065e12bf9 MFC H/W video bring up
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>
Change-Id: I4b39ba082a2f955f4a21fa7f2b107e27c8357681
2021-06-16 23:08:26 +00:00
Wei Wang
daf8a29c31 Enable ADPF for P22
Bug: 191163855
Change-Id: Ie2a3324f5b116271ca790943b70b69291e0f4f05
Test: Build
2021-06-15 18:25:10 +00:00
Nrithya Kanakasabapathy
64f57befb2 Merge "Updates to device make files to include the TPU firmware for whitechapel pro" 2021-06-15 05:02:41 +00:00
Wei Wang
124deebf68 Disable ADPF for bring up
Bug: 191078889
Test: Build
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I9984f9c0214884ca7b29a780bcd5b50ce639d876
2021-06-14 21:14:21 -07:00
Nrithya Kanakasabapathy
87b88bb590 Updates to device make files to include the TPU firmware for whitechapel
pro

Bug: 190569662

Signed-off-by: Nrithya Kanakasabapathy <nrithya@google.com>
Change-Id: I960d7aaafebb377dbcf976381a9dc6edcc01d8c7
2021-06-14 19:36:50 +00:00
Jesse Hall
71aa8f3301 gs201: install libOpenCL
This required disabling the GPU-related PRODUCT_SOONG_NAMESPACES so that
we don't get an installed-path collision between the prebuilt gs201
libOpenCL and the gs101 libOpenCL that we build from source. Once we're
able to build both gs101 and gs201 from the same source (b/185349920)
we'll need to re-add the namespaces.

Bug: 190424017
Test: gfx-score
Change-Id: I9095e099a120494fab0c33fc6bd1ace2c69f3bc4
2021-06-11 15:58:22 -07:00
Max Shi
4c78229124 Add sensors to gs201.
Fixes: 189280780
Bug: 189855134
Test: adb shell dumpsys sensorservice
Test: adb shell sensor_test --version
Change-Id: I658fabeaaf589393047570f15528962c02ec638c
2021-06-09 20:16:49 -07:00
TreeHugger Robot
4820858f2f Merge "Add mali_pixel.ko to vendor_dlkm" 2021-06-09 23:11:15 +00:00
TreeHugger Robot
d30f612aed Merge "Remove GPU module and firmware from ramdisk" 2021-06-09 16:54:37 +00:00
Andrew Scull
dcce238528 Merge "Enable pKVM be default" 2021-06-08 13:43:34 +00:00
Jesse Hall
7326ba359c Add mali_pixel.ko to vendor_dlkm
Bug: 190389925
Test: boot to home, lsmod | grep mali_pixel
Change-Id: I97e6d824caecdde4ad26eedf4cb457407dce0813
2021-06-07 22:58:47 -07:00
Jesse Hall
ee3c76e93a Remove GPU module and firmware from ramdisk
They aren't needed for first-stage boot, and can be loaded from
`/vendor` and `/vendor_dlkm`.

Bug: 189506395
Test: boot to home
Change-Id: Ib4c708c8631586cf25e1535035b8bc81f727ef5f
2021-06-07 13:27:49 -07:00
Andrew Scull
2496a78bdf Enable pKVM be default
Include the com.android.virt APEX in the cloudripper image to bundle the
pKVM user space components.

Test: atest VirtualizationTestCases
Bug: 181324461
Change-Id: If84c957b74dc59faefc88edf6b7f500894eef38b
2021-06-07 12:21:03 +00:00
Aaron Ding
eb7fdf23ad update fstab.gs201
Bug: 183183095
Change-Id: Ic75c341dda02e8bab58542ddb77a7507eabe53ee
2021-06-07 11:55:24 +08:00
Albert Wang
398bdf6dd4 Merge "Correct i2c path for contaminant protection detection and status" 2021-06-04 08:20:36 +00:00
Chien-Yu Chen
020b77a5ac Link Lyric HAL for GCH in cloudripper
Test: Make
Bug: 190088732
Change-Id: I790cfe792374e256a96ac501e612a2759b1772e1
2021-06-03 15:38:07 -07:00
Albert Wang
9b1babb956 Correct i2c path for contaminant protection detection and status
Bug: 189703449
Test: read contaminant status normally
Signed-off-by: Albert Wang <albertccwang@google.com>
Change-Id: Iff31b2846cec2e960e5c5db83371ca3e983a4a3b
2021-06-03 15:29:29 +08:00
Jesse Hall
c6519ab937 Move init.gs201.rc from cloudripper/
Test: boot to home
Change-Id: I35e4c2495029aba1b51ccbd99661c6e83b909ba8
2021-06-02 16:27:10 -07:00
Pat Tjin
5294123ac1 Cloudripper: workaround for USB bring up
This is a workaround to get adb working while USB is being brought up.

(cherry-pick from device/google/cloudripper)
Bug: 188672439
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: Ie114c1f67198a10a6c0dda49d1ed2ee85c8b2bf5
2021-06-02 16:26:59 -07:00
Pat Tjin
28140b7240 Hold wakelock on boot
Hold wakelock on boot to mitigate b/188796118

(cherry-pick from device/google/cloudripper)
Bug: 188796118
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: Ia75d355eaed0d469f791f126aaed1c0059df0abd
2021-06-02 16:26:35 -07:00
Pat Tjin
ac54e6697c add usb features
Prevent crashing of settings when going into Connected Devices.

   E SystemServiceRegistry: No service published for: usb

followed by NPE:

   java.lang.RuntimeException: Unable to start activity
   ComponentInfo{com.android.settings/com.android.settings.Settings$ConnectedDeviceDashboardActivity}:
   java.lang.NullPointerException: Attempt to invoke virtual method
   'java.util.List android.hardware.usb.UsbManager.getPorts()'
   on a null object reference

Bug: 189904047
Test: check settings doesn't crash anymore
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: I1dd8df5cf70500b3dbb95009783dc2ba89e5ce13
2021-06-02 11:56:58 -07:00
Albert Wang
aa78dc8437 Merge "Correct the new udc path" 2021-06-02 01:41:43 +00:00
TreeHugger Robot
c2239dca95 Merge "Install vulkan driver" 2021-06-01 21:02:10 +00:00
Jesse Hall
1946a9b569 Install vulkan driver
Bug: 189832243
Test: adb shell cmd gpu vkjson
Change-Id: Icf262fb95a4909d8eb79d03ce5238dc147a575dc
2021-06-01 13:25:06 -07:00
weichinweng
6546e7e0b6 Add bt_vendor_overlay.conf to gs201 folder
Add bt_vendor_overlay.conf for customizing project configuration
* If the overlay config has same config item with origin config, it
  will overwrite it.

Bug: 189727579
Test: build pass, Bluetooth can up successfully.
Change-Id: I48f160ab87b5d512b78884d4502c790587724cd9
2021-06-01 16:34:27 +08:00
weichinweng
e4ed280188 Add Bluetooth to gs201 device makefile
Bug: 189727579
Test: Bluetooth can be turned ON from settings
Change-Id: I11424bd904771c6173121d8f8b9e67948c03f384
2021-06-01 16:34:06 +08:00
weichinweng
ac85fcac51 Change gs201 bluetooth uart port to dev/ttySAC18
Bug: 189727579
Test: Bluetooth can be turned ON from settings
Change-Id: I8712c2af2ef8dd63cd198f6a29aaeaf7ec22b0ca
2021-06-01 16:33:41 +08:00