Commit graph

132 commits

Author SHA1 Message Date
Sam Dubey
293b0c871d Revert "Enable load kernel modules in parallel"
This reverts commit 264b325dd1.

Reason for revert: Boot crashes on gs101 devices

Bug: 226705295
Change-Id: Id074bbc5fdc9f747f45d01405f5b08f37e5617f3
2022-03-25 10:30:47 +00:00
chungkai
264b325dd1 Enable load kernel modules in parallel
Test: enable successfully
Bug: 180676019
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I61678ea8123123af4a4b1d2b45a3cf78bfd5d4f7
2022-03-25 02:33:18 +00:00
Gina Ko
d8a9805e95 Fix typos
Remove redundant spaces so the variable is set correctly

Bug: 224556677
Test: Built R4 64bit
Signed-off-by: Gina Ko <yichunko@google.com>
Change-Id: Ide1f48cf04806234f637faea5edcd988403bafca
2022-03-14 20:17:22 +00:00
Gina Ko
18bd11a39e Refactor conditional to use DEVICE_IS_64BIT_ONLY
Bug: 218458605
Bug: 223622655
Signed-off-by: Gina Ko <yichunko@google.com>
Change-Id: Ia74ef39ab8433d036925a30217f49da8f6fd863b
2022-03-14 16:44:25 +00:00
Ramji Jiyani
58893b442f gs101: Enable system_dlkm dynamic partition
Set flags to enable system_dlkm dynamic partition
for GKI Modules for gs101 devices.

Partition will be empty as of now but this adds
enough support to pass the vts for the feature.

Bug: 222334390
Test: TH, manual build, flash and verification on 6Pro
      Full OTA Update test from S to T as below:
      1. go/flash: git_sc-v2-release - SP2A.220405.004 (8233519)
      2. Full ota build from tm-dev
      3. Manual push full ota update and verify boot
      4. Verify system_dlkm partition is present & mounted
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I0b4038b100add965737527b72a8d5f905907e23e
2022-03-10 21:03:31 +00:00
Pat Tjin
a63220bcd1 Add tangor% to the pattern match
Some targets are using tangor_xxx and some use xxx_tangor,
cover both to avoid duplicate zygote props.

Test: Build
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: I43b18f6b5296f7b1575a8d5e817b3f2281dc1e1c
2022-01-28 00:48:26 +00:00
Robin Peng
85e14851ed Migrate vendor_dlkm modules.blocklist from android side to kernel side
Moving vendor_dlkm.modules.blocklist to the source repo and picking to
/<DEVICE>-kernel, the development experience can be aligned between
Kernel and Android codebase.

Bug: 214017561
Change-Id: I9f556178f882dc15cc7066df16dd59e1da86091b
2022-01-21 11:56:15 +00:00
Cole Faust
23a4d7bfb3 Remove usage of intermediates-dir-for
intermediates-dir-for relies on several variables that
haven't been set at the time the board configuration
runs. The board configuration got around that by using
deferred expansion, but deferred expansion is something
that starlark doesn't support. Remove intermediates-dir-for
by switching to TARGET_RECOVERY_FSTAB_GENRULE, which
accepts a genrule module to use instead of a file.

Bug: 201700692
Test: Presubmits
Change-Id: I6ebb75073abeebce71873f414129759789096b0f
2022-01-13 02:50:08 +00:00
Pat Tjin
dae7d3ea02 Move tangor to 64-bit only
Bug: 213924541
Test: Build
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: I8e237ab1bf387608331375bee18dbf9b4912e5c1
2022-01-12 21:44:31 +00:00
Chris Fries
efd5649bb8 Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS"
This reverts commit 871071afbc.

Reason for revert: Can't OTA forward from 16.002

Change-Id: I25091c3caacd0109def6d5fc10ec7ae273b6ea20
Bug: 211070100
2021-12-20 20:45:16 +00:00
Sasha Smundak
b44a662861 Use soong_config_ macros to set Soong config variables.
Bug: 198503843
Test: treehugger
Change-Id: Ifd1aed04267d952a13cfd9b93933e500ba07dbad
2021-12-16 18:03:47 +00:00
Pierre-Clément Tosi
871071afbc gs101: Add pvmfw to AB_OTA_PARTITIONS
Suggested-by: Cyan_Hsieh <cyanhsieh@google.com>
Bug: 210833963
Test: OTA update
Change-Id: Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d
2021-12-16 08:15:20 +00:00
kensun
c6aa4c2c31 wifi: Isolate wifi configurations for customization.
move wifi configurations from BoardConfig-common.mk to wifi/BoardConfig-wifi.mk.
So, each project can decide whether it should share the same configurations or create a new one on their own.

Bug: 208159314
Test: ifconfig after attempting STA+SAP concurrency.
Change-Id: Id2474df377f242528be661fefe712d7203cdddf8
2021-12-13 02:29:15 +00:00
Martin Liu
f9cd87c0c4 gs101: set swiotlb as noforce am: 5bcfdac788 am: 26b36bda5f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16212520

Change-Id: Iee5d40fb27ed3f7ca14311fd6f1b5a93c233fac0
2021-11-11 00:42:15 +00:00
Martin Liu
5bcfdac788 gs101: set swiotlb as noforce
As dma devices are 36bit bounded, we don't need SWIOTLB
bounce buffers. Set swiotlb=noforce to disable this and
make the minimum amount of memory allocation.

Bug: 205246642
Test: check total memory and io_tlb_nslabs
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: If9f68b269f326f0f4b8e165593ec5dd4787fbb52
2021-11-11 00:07:28 +00:00
Aaron Ding
b5ae5ecd57 Enable VABC OTA am: 81b8d2cbd6 am: 6ced1a6df3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/16091241

Change-Id: I08958dcaa58207a521c0540ecb2f8e1bc0044c88
2021-10-28 19:30:58 +00:00
Aaron Ding
aad20a2f04 Enable VABC OTA
Bug: 203437381
Change-Id: If9eb8a4b1cefb75cf3d310a27a52aa889b28d0b5
Signed-off-by: Aaron Ding <aaronding@google.com>
2021-10-28 18:45:34 +00:00
Pierre-Clément Tosi
38cad31af0 gs101: Use AOSP build framework for pvmfw.img
Remove the definition for BOARD_PREBUILT_PVMFWIMAGE (which currently
points to the shared AOSP pre-built of pvmfw.img) to fall back to the
default behavior of the AOSP framework. Even though this will result in
the same pre-built being used (for now), not setting that variable still
partially modifies the overall behavior (e.g. for packaging) and allows
upcoming framework changes to be automatically picked up.

Bug: 199717422
Test: m
Change-Id: I7c3bbbee8c83d262b707f8582b5f43040bc25a06
2021-10-21 09:23:43 +00:00
Pierre-Clément Tosi
d96639e490 gs101: Remove BOARD_PVMFWIMG_PARTITION_SIZE
Remove the deprecated variable now that it has been replaced by
BOARD_PVMFWIMAGE_PARTITION_SIZE in AOSP.

Bug: 199717422
Test: m ${ANDROID_PRODUCT_OUT}/pvmfw.img
Change-Id: I96fba129d0b0f9a2e845e8a507a9ec8f65910942
2021-10-18 08:19:47 +00:00
David Brazdil
ae3c59fc0b Revert^2: pKVM: Include pvmfw and virt APEX in gs101 builds
Support for pKVM is being added to all gs101 builds starting with T,
disabled by default. So far, the userspace components have been included
only in special _pkvm builds. Include them unconditionally.

Also move BOARD_* variables specifying location and partition size of
pvmfw from vendor board config file here.

This adds 89MB to the size of the system image.

Bug: 192819132
Test: build a gs101 target, check /apex/com.android.virt exists
Change-Id: Ie46b0ad5f45bd4757570b72cb275d002df7b4616
2021-10-12 16:12:39 +00:00
Petri Gynther
79f0a19d4d Revert^2 "gs101: re-enable prebuilt boot.img/boot-user.img usage" am: 0f9dfceecf am: eeed916048
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15955989

Change-Id: I7e7db4da20097bc61c5fbb4dfe7d9bf2b2ff418e
2021-10-01 06:32:59 +00:00
Petri Gynther
96a90bd47a Revert^2 "gs101: re-enable prebuilt boot.img/boot-user.img usage"
This reverts commit 48a5fe4304e3c5720f468d6b9147ca36bbe9eb4e.

Reason for revert:
Re-enable gs101 prebuilt boot image usage.
All necessary prerequisites have been merged:
cl/399995993, ag/15953678, ag/15953343, ag/15953037, ag/15953719

Bug: 201469630
Bug: 201476061
Change-Id: Idb46a74e7830a274c45fee1f43a52dbcd7e96ca4
2021-10-01 06:00:08 +00:00
Jason Chiu
b7c042fb27 Revert "gs101: re-enable prebuilt boot.img/boot-user.img usage" am: 48a5fe4304 am: f2cef18852
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15939093

Change-Id: Id49f4530b9e83ee2270dae3021894e5d795a0dfb
2021-09-29 11:24:25 +00:00
Jason Chiu
d037bee915 Revert "gs101: re-enable prebuilt boot.img/boot-user.img usage"
This reverts commit 7badc4b5f1c7b6adff8cd9142f5c97bd4a5a0d49.

Reason for revert: it introduce b/201469630 and b/201476061

Bug: 201469630
Bug: 201476061
Change-Id: Id48ea931410a55bfd382feb7a0da02994fdf8928
2021-09-29 07:30:10 +00:00
Petri Gynther
5b3f9232a8 gs101: re-enable prebuilt boot.img/boot-user.img usage am: 7badc4b5f1 am: 6fcfb9953f am: 55261cf700
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15934983

Change-Id: I7862834fc3a6c2b908cc9db5ee73a712647ce0c0
2021-09-28 21:17:33 +00:00
Petri Gynther
d60cbacc12 gs101: re-enable prebuilt boot.img/boot-user.img usage am: 7badc4b5f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15934983

Change-Id: Ib6489b4b5797eea2b8ecc32ee10e3c4d1998f4d8
2021-09-28 20:45:42 +00:00
Petri Gynther
50f56ac8c9 gs101: re-enable prebuilt boot.img/boot-user.img usage
When $(TARGET_KERNEL_DIR) contains:
* boot.img
* boot-user.img

then use those as prebuilt boot images for the target build.

Note that debug kernels (e.g. $(TARGET_KERNEL_DIR)/kasan) only have
Image.lz4, so the debug build ends up building boot.img from source.

Bug: 199997188
Change-Id: I6bb70644d8ab7356986f6ca6a77f3098d1ee0f83
2021-09-28 10:56:06 -07:00
Vince Leung
972bcdfe6e gs101: add haptics actuator model config am: ed5333f0cc am: 80be097132
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15688905

Change-Id: If0d29f9b887dd9c3cc125085af1d0130ed243a2c
2021-09-04 00:23:11 +00:00
Vince Leung
58180f0c16 gs101: add haptics actuator model config
Actuator models can vary across devices. Actuator models can have
different characteristics that need to be handled appropriately. Add
support to define the actuator model used in Soong makefiles.

Bug: 195894512
Test: verified that different actuator model configs are used on
different targets

Change-Id: Ic7fd5f52c3bfed252fa3956f3e926c90c1632013
2021-09-03 23:44:04 +00:00
Sasha Smundak
70f028eb27 Simplify the check
Fixes: 198503238
Test: treehugger
Change-Id: Ia27a4413e42821310d1fe0bcad4cfc78595c6841
2021-09-03 18:58:30 +00:00
Petri Gynther
299ca16835 gs101: clean up kernel variables
1) remove TARGET_BOARD_KERNEL_HEADERS
2) remove TARGET_PREBUILT_KERNEL

Bug: 198682676
Change-Id: I9ab161ee75dc33e135ad87e084b3373350ca0c93
2021-09-03 12:35:16 +00:00
Eric Biggers
f739cf68c0 Generate a separate fstab file for FIPS mode
Add a file "fstab.gs101-fips" alongside the existing "fstab.gs101" in
order to specify different encryption settings in FIPS mode.

"androidboot.fstab_suffix=gs101-fips" on the kernel command line will be
used to select the FIPS fstab when needed.

As the two fstabs should be otherwise identical, generate them from a
template file so that they will stay in sync.

Note that generating the fstabs requires that they be installed as build
system modules rather than via PRODUCT_COPY_FILES, which results in the
vendor_ramdisk copy of the fstabs being installed to system/etc rather
than /.  This shouldn't cause any problem, now that Android has been
updated to look for the fstab in this location too.

Bug: 191417025
Change-Id: I1d115e014df8ba2fb83046ac0b9b791597364846
2021-08-30 14:09:06 -07:00
Petri Gynther
ccbd2c7431 Revert "gs101: use prebuilt GKI boot.img for production builds"
This reverts commit 96007d8f9cab5f6028cb4a1b15e30c6ffe8bf5dd.

Temporarily revert prebuilt boot.img usage on sc-qpr1-dev
until we have official signed GKI boot images available.

Bug: 188095549
Bug: 191417025
Change-Id: I2f9907d3674f8a8869aac3c926994e116c76a91b
2021-08-23 19:20:43 +00:00
linjoey
3097b78f95 Change prebuild path to gs101
Bug: 181204804
Test: Build passed and boot to home.

Change-Id: I4fdc6032ac16134de53675a5f00ee7e7765c7f32
SigSigned-off-by: linjoey <linjoey@google.com>
2021-08-04 12:17:24 +00:00
Petri Gynther
645bea6054 gs101: use prebuilt GKI boot.img for production builds
Use:
* boot-user.img for -user builds
* boot.img for -userdebug and -eng builds

Bug: 188095549
Test: make dist (oriole-user)
Test: make dist (oriole-userdebug)
Change-Id: Ic4df227f2b4c261297272f17e6645b7ce1f5d4f3
2021-07-22 16:08:00 +00:00
Chris Fries
091b1e141b Revert "gs101: use prebuilt GKI boot.img for production builds"
This reverts commit 63ba0cb1affa83446f10585d403c81cc618be71a.

Reason for revert: Tentatively trying to address, http://b/193588301 OTA full package does not exist in O6/R4_SD1A.210714.001 userdebug build [SD1A]

Bug: 193588301
Change-Id: I9d5d9fc132bc7eaf7c0adccee7a18558d80edb40
2021-07-14 16:22:17 +00:00
Petri Gynther
7eec55ab4e gs101: use prebuilt GKI boot.img for production builds
Use prebuilt GKI boot.img for production builds.
Debug builds continue to use their own Image.lz4.

Bug: 191764119
Change-Id: I2b4950ce334cc990e858e0ea410ad7e57d6decf6
2021-07-13 20:42:08 +00:00
Krzysztof Kosiński
74b7a2a871 Remove gralloc3 support for gs101.
All devices use gralloc4 now, so this code is unused.

Bug: 174998182
Test: builds for the affected devices
Change-Id: Icff36a0204f7f9fd10ae7269248aef8a08c5fc1e
2021-07-08 22:28:25 +00:00
Jeffrey Carlyle
15d83480cb add gs101-specific recovery library
This library is hooked into the recovery code via
hardware/google/pixel/recovery and contains routines specific to the
GS101-based hardware.

Bug: 182508814
Test: did master reset on device with keys, verified no keys present after reset
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Signed-off-by: Harpreet Eli Sangha <eliptus@google.com>
Change-Id: I18357f5ac8db7a765a5464fd3366af3d14928ce6
2021-06-30 17:39:37 +00:00
Kevin Han
432f3bc640 Revert "add gs101-specific recovery library"
Revert "recovery: enable support for device-specific WipeSe impl..."

Revert "clear secure element of Digital Car Keys during factory ..."

Revert submission 14983788-clear_keys

Reason for revert: b/192373955
Reverted Changes:
Ia8fc29e6c:add gs101-specific recovery library
Icc1eabfd4:clear secure element of Digital Car Keys during fa...
I943d97b26:recovery: enable support for device-specific WipeS...
I15c7fbd7f:allow recovery and fastboot to access secure elmen...

Change-Id: I545698bc7da1aa12f520c0190775358dae70de61
2021-06-29 19:19:24 +00:00
Jeffrey Carlyle
7af529801c add gs101-specific recovery library
This library is hooked into the recovery code via
hardware/google/pixel/recovery and contains routines specific to the
GS101-based hardware.

Bug: 182508814
Test: did master reset on device with keys, verified no keys present after reset
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Change-Id: Ia8fc29e6c043c58c09f189ac5dc91c4093cf64b6
2021-06-29 17:50:34 +00:00
Carter Hsu
977c44c195 audio: add AOSP build flag
Bug: 184016430
Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I4a32e82fdcdd51f813c9dc6b013b26aabf66c078
2021-06-25 10:08:04 +00:00
Roger Wang
2b65b15e7c wifi: update interface combination.
In this commit, we update the interface combination
for P21.

Bug: 191020902
Test: local test on PP23935602 build.
      Check STA+STA, STA+SAP, STA+P2P and STA+NAN are workable.
Change-Id: I424c4ea854f3a4f7b615038db8d63729fd32adda
2021-06-22 17:03:54 +00:00
Daniel Mentz
24b12e2935 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: 190652328
Change-Id: Ib67463555f498f4dc85d5d175e0bf9e4150771dd
2021-06-18 15:41:21 +00:00
Daniel Mentz
6a6d8f81c2 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: Ibda5b9368547ad089575333e2566697ec0e8465f
2021-06-17 03:57:10 +00:00
Kelvin Zhang
a8fdc57387 Add a build time constant to disable VABC
Test: m
Bug: 185400304

Change-Id: I4ed5676f4a1195f084ed447196ee9e3ce71ec84a
(cherry picked from commit c76afcf1ef68ce4e6362032aaa8b5e2ea77f9233)
2021-06-16 20:48:14 +00:00
Daniel Mentz
c37a73b74f gs101: 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: 183237066
Change-Id: I626cb87ba8111d0615b80cf981ebc288893a0624
2021-06-08 22:29:48 +00:00
Philip Cuadra
0111d397d2 Target arm v8.2a and A55 for GS101
This will let bionic use 8.2a atomics which helps scudo locking.

Bug 189248298
Test: Presubmit

Change-Id: Ifa7a6d8386c8adcadb81cb762758b06a8164f700
2021-06-03 22:13:43 +00:00
Minchan Kim
c9f14081cd gs101: enable page_pinner
Enable Page Pinner.

Bug: 187552095
Test: adb bugreport <zip> and confirmed it contains page_pinner
      information at dumpstate_board.txt
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: I509c5a825a798d8f1851cb65c5dd28dbddf11d33
2021-05-17 18:22:16 +00:00
Adam Shih
f2457f2d1e remove redundant setting
The path does not exist.
Bug: 187128213
Test: build pass and boot to home

Change-Id: I18aa60fafe1538972ad2111bfad483b54c6fab06
2021-05-07 04:31:02 +00:00