Skip to content

Commit

Permalink
Merge tag 'android-t-qpr2-beta-1_r0.4' of https://android.googlesourc…
Browse files Browse the repository at this point in the history
…e.com/kernel/gs into rebase

Android t qpr2 beta 1 release 0.4

Signed-off-by: celtare21 <[email protected]>
  • Loading branch information
celtare21 committed Dec 16, 2022
2 parents 6626acb + 82c5cf7 commit 5e3c14f
Show file tree
Hide file tree
Showing 669 changed files with 143,410 additions and 15,710 deletions.
247 changes: 241 additions & 6 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,245 @@ package(
],
)

load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels")
package(
default_visibility = [
"//private/google-modules:__subpackages__",
],
)

load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
load("//build/kernel/kleaf:common_kernels.bzl", "aarch64_outs", "define_common_kernels")
load("//build/kleaf:kernel.bzl", "kernel_build", "kernel_modules_install")
load("@kernel_toolchain_info//:dict.bzl", "CLANG_VERSION")

_aarch64_additional_kmi_symbol_lists = [
# keep sorted
"android/abi_gki_aarch64_core",
"android/abi_gki_aarch64_db845c",
"android/abi_gki_aarch64_exynos",
"android/abi_gki_aarch64_fips140",
"android/abi_gki_aarch64_generic",
"android/abi_gki_aarch64_hikey960",
"android/abi_gki_aarch64_rockchip",
"android/abi_gki_aarch64_type_visibility",
"android/abi_gki_aarch64_virtual_device",
]

define_common_kernels(target_configs = {
# Sync with build.config.gki.aarch64
"kernel_aarch64": {
"kmi_symbol_list": "android/abi_gki_aarch64",
"additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
"abi_definition": "android/abi_gki_aarch64.xml",
},
"kernel_aarch64_debug": {
"kmi_symbol_list": "android/abi_gki_aarch64",
"additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists,
"abi_definition": "android/abi_gki_aarch64.xml",
},
})

kernel_build(
name = "cloudripper",
srcs = glob(
["**"],
exclude = [
".*",
".*/**",
"BUILD.bazel",
"**/*.bzl",
],
),
outs = aarch64_outs + [
# Sync with build.config.cloudripper
"arch/arm64/boot/dts/google/gs201-a0.dtb",
"arch/arm64/boot/dts/google/dtbo.img",

# TODO(b/197995714): Add other things built by build.sh
# "abi_symbollist",
# "boot.img",
# "vendor_boot.img",
],
build_config = "build.config.cloudripper",
module_outs = [
"acpm_flexpmu_dbg.ko",
"acpm_mbox_test.ko",
"at24.ko",
"bbd.ko",
"bcm47765.ko",
"bc_max77759.ko",
"bcm_dbg.ko",
"boot_device_spi.ko",
"bts.ko",
"clk_exynos.ko",
"cmupmucal.ko",
"cpif.ko",
"cpif_page.ko",
"cp_thermal_zone.ko",
"dbgcore-dump.ko",
"debug-reboot.ko",
"debug-snapshot-debug-kinfo.ko",
"dss.ko",
"dwc3-exynos-usb.ko",
"ect_parser.ko",
"eh.ko",
"ehld.ko",
"exynos-acme.ko",
"exynos-adv-tracer.ko",
"exynos-bcm_dbg-dump.ko",
"exynos-coresight-etm.ko",
"exynos-coresight.ko",
"exynos-cpuhp.ko",
"exynos-cpupm.ko",
"exynos-debug-test.ko",
"exynos_devfreq.ko",
"exynos_dit.ko",
"exynos-dm.ko",
"exynos-ecc-handler.ko",
"exynos_mct.ko",
"exynos_mfc.ko",
"exynos-pcie-iommu.ko",
"exynos-pd-dbg.ko",
"exynos-pd_el3.ko",
"exynos-pd.ko",
"exynos-pm.ko",
"exynos_pm_qos.ko",
"exynos-pmu-if.ko",
"exynos-seclog.ko",
"exynos_tty.ko",
"g2d.ko",
"google_bcl.ko",
"gpu_cooling.ko",
"gs_acpm.ko",
"gsa_gsc.ko",
"gsa.ko",
"gs-chipid.ko",
"gs_thermal.ko",
"gvotable.ko",
"hardlockup-debug.ko",
"hardlockup-watchdog.ko",
"i2c-acpm.ko",
"i2c-dev.ko",
"i2c-exynos5.ko",
"itmon.ko",
"keycombo.ko",
"keydebug.ko",
"logbuffer.ko",
"lzo.ko",
"lzo-rle.ko",
"max77759_contaminant.ko",
"max77759_helper.ko",
"memlat-devfreq.ko",
"odpm.ko",
"pcie-exynos-core.ko",
"pcie-exynos-gs201-rc-cal.ko",
"phy-exynos-mipi-dsim.ko",
"phy-exynos-mipi.ko",
"phy-exynos-usbdrd-super.ko",
"pinctrl-samsung-core.ko",
"pinctrl-slg51000.ko",
"pinctrl-slg51002.ko",
"pixel-boot-metrics.ko",
"pixel-debug-test.ko",
"pl330.ko",
"pmic_class.ko",
"power_stats.ko",
"rtc-s2mpg12.ko",
"s2mpg12-key.ko",
"s2mpg12-mfd.ko",
"s2mpg12-powermeter.ko",
"s2mpg12-regulator.ko",
"s2mpg13-mfd.ko",
"s2mpg13-powermeter.ko",
"s2mpg13-regulator.ko",
"s2mpg1x-gpio.ko",
"s3c2410_wdt.ko",
"samsung_dma_heap.ko",
"samsung-dma.ko",
"samsung-iommu-group.ko",
"samsung_iommu.ko",
"samsung-secure-iova.ko",
"sbb-mux.ko",
"sched_tp.ko",
"sg.ko",
"shm_ipc.ko",
"sjtag-driver.ko",
"slc_acpm.ko",
"slc_dummy.ko",
"slc_pmon.ko",
"slc_pt.ko",
"slg51000-core.ko",
"slg51000-regulator.ko",
"slg51002-core.ko",
"slg51002-regulator.ko",
"smfc.ko",
"spidev.ko",
"spi-s3c64xx.ko",
"sscoredump.ko",
"stmvl53l1.ko",
"systrace.ko",
"tcpci_max77759.ko",
"trusty-core.ko",
"trusty-ipc.ko",
"trusty-irq.ko",
"trusty-log.ko",
"trusty-test.ko",
"trusty-virtio.ko",
"ufs-exynos-core.ko",
"usb_f_dm1.ko",
"usb_f_dm.ko",
"usb_f_etr_miu.ko",
"usb_psy.ko",
"vh_cgroup.ko",
"vh_fs.ko",
"vh_i2c.ko",
"vh_preemptirq_long.ko",
"vh_sched.ko",
"vh_thermal.ko",
"videobuf2-dma-sg.ko",
"xhci-exynos.ko",
"zcomp_cpu.ko",
"zcomp_eh.ko",
"zram.ko",
"zsmalloc.ko",
],
deps = [
"//prebuilts/misc/linux-x86/libufdt:mkdtimg",
],
)

# This uses android/abi_gki_aarch64* in kmi_configs. If the list of
# glob(["android/abi_gki_aarch64*"]) differs from
# KMI_SYMBOL_LIST + ADDITIONAL_KMI_SYMBOL_LISTS in build.config.gki.aarch64,
# or TRIM_NONLISTED_KMI changes, override kmi_configs here.
define_common_kernels()
kernel_modules_install(
name = "cloudripper_modules_install",
kernel_build = ":cloudripper",
kernel_modules = [
"//private/google-modules/amplifiers/cs35l41:cs35l41.cloudripper",
"//private/google-modules/amplifiers/cs35l45:cs35l45.cloudripper",
"//private/google-modules/amplifiers/cs40l26:cs40l26.cloudripper",
"//private/google-modules/amplifiers/drv2624:drv2624.cloudripper",
"//private/google-modules/aoc/alsa:alsa.cloudripper",
"//private/google-modules/aoc/usb:usb.cloudripper",
"//private/google-modules/aoc:aoc.cloudripper",
"//private/google-modules/bluetooth/broadcom:broadcom.cloudripper",
"//private/google-modules/bms:bms.cloudripper",
"//private/google-modules/display/samsung:samsung.cloudripper",
"//private/google-modules/edgetpu/drivers/edgetpu:edgetpu.cloudripper",
"//private/google-modules/gpu/mali_kbase:mali_kbase.cloudripper",
"//private/google-modules/gpu/mali_pixel:mali_pixel.cloudripper",
"//private/google-modules/lwis:lwis.cloudripper",
"//private/google-modules/nfc:nfc.cloudripper",
"//private/google-modules/power/reset:reset.cloudripper",
"//private/google-modules/touch/common:common.cloudripper",
"//private/google-modules/touch/sec:sec.cloudripper",
"//private/google-modules/uwb/kernel:kernel.cloudripper",
"//private/google-modules/video/gchips:gchips.cloudripper",
"//private/google-modules/wlan/bcmdhd4389:bcmdhd4389.cloudripper",
],
)

copy_to_dist_dir(
name = "cloudripper_dist",
data = [
":cloudripper_for_dist",
":cloudripper_modules_install",
],
)
12 changes: 12 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-i2c-devices-slg51002
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
What: /sys/bus/i2c/devices/.../chip_id
Date: June 2021
KernelVersion: 5.10
Contact: CY Tseng <[email protected]>
Description: Reports the chip identifier as a hexadecimal number.

What: /sys/bus/i2c/devices/.../chip_always_on
Date: June 2021
KernelVersion: 5.10
Contact: CY Tseng <[email protected]>
Description: Sets the power state of the device. 0 sets the device into
power saving mode. 1 sets the device into power always-on mode.
19 changes: 19 additions & 0 deletions Documentation/ABI/testing/sysfs-driver-ufs-pixel
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@

What: /sys/devices/platform/<....>ufs/power_stats
Date: April, 2022
Contact: "Konstantin Vyshetsky" <[email protected]>
Description:
This directory contains UFS power related statistical info.
fdevinit_read_count: number of time fDeviceInit flag read was
issued
fdevinit_read_max_latency_us: total amount of time in
microseconds fDeviceInit flag read operations consumed
fdevinit_read_time_spent_us: maximum latency in microseconds
of a single fDeviceInit flag read operation
fdevinit_set_count: number of time fDeviceInit flag set was
issued
fdevinit_set_max_latency_us: total amount of time in
microseconds fDeviceInit flag set operations consumed
fdevinit_set_time_spent_us: maximum latency in microseconds
of a single fDeviceInit flag set operation

What: /sys/devices/platform/<....>ufs/power_info
Date: December, 2020
Contact: "Konstantin Vyshetsky" <[email protected]>
Expand Down
68 changes: 68 additions & 0 deletions Makefile.ext_modules.cloudripper
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# SPDX-License-Identifier: GPL-2.0-only

rel_path := ../google-modules

ext_modules :=
ext_modules += amplifiers/audiometrics
ext_modules += amplifiers/cs35l41
ext_modules += amplifiers/cs35l45
ext_modules += amplifiers/cs40l26
ext_modules += amplifiers/drv2624
ext_modules += aoc
ext_modules += aoc/alsa
ext_modules += aoc/usb
ext_modules += bluetooth/broadcom
ext_modules += bms
ext_modules += display/samsung
ext_modules += edgetpu/janeiro/drivers/edgetpu
ext_modules += gpu/mali_kbase
ext_modules += gpu/mali_pixel
ext_modules += gxp/gs201
ext_modules += lwis
ext_modules += nfc
ext_modules += power/reset
ext_modules += touch/common
ext_modules += touch/focaltech/ft3658
ext_modules += touch/sec
ext_modules += touch/synaptics
ext_modules += wlan/wlan_ptracker
ext_modules += wlan/bcmdhd4389
ext_modules += video/gchips

# Add any modules which have their own UAPI headers to this list. This will
# cause the build to run the module makefile with headers_install target.
has_uapi_headers :=
has_uapi_headers += touch/common
has_uapi_headers += video/gchips

install_uapi_headers_targets := $(has_uapi_headers:=_headers_install)

ifneq ($(wildcard $(KERNEL_SRC)/$(rel_path)/uwb/kernel),)
ext_modules += uwb/kernel
endif

.PHONY: $(ext_modules) $(install_uapi_headers_targets) depmod allmodules

allmodules: $(ext_modules) $(install_uapi_headers_targets) depmod

touch/focaltech/ft3658: | touch/common

touch/sec: | touch/common

touch/synaptics: | touch/common

aoc/alsa: | aoc

aoc/usb: | aoc/alsa aoc

power/reset: | bms

# amplifiers/cs35l45 and amplifiers/cs35l41 both build identical version of
# snd-soc-wm-adsp.ko. To make sure the makefiles don't step on each other,
# create this fake order only dependency
# TODO(b/198105924): Identically named kernel modules: snd-soc-wm-adsp.ko
amplifiers/cs35l45: | amplifiers/cs35l41

gxp/gs201: | edgetpu/janeiro/drivers/edgetpu

include $(KERNEL_SRC)/Makefile.ext_modules.include
2 changes: 2 additions & 0 deletions Makefile.ext_modules.slider
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ ext_modules += touch/common
ext_modules += touch/fts/ftm5
ext_modules += touch/sec
ext_modules += wlan/bcmdhd4389
ext_modules += video/gchips

# Add any modules which have their own UAPI headers to this list. This will
# cause the build to run the module makefile with headers_install target.
has_uapi_headers :=
has_uapi_headers += touch/common
has_uapi_headers += video/gchips

install_uapi_headers_targets := $(has_uapi_headers:=_headers_install)

Expand Down
10 changes: 3 additions & 7 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
file:/OWNERS_core
per-file build*=set noparent
per-file build*[email protected],[email protected],[email protected]
per-file vendor_dlkm*=*
per-file vendor_{boot,kernel,dlkm}*=*
per-file Makefile.ext_modules*=*
per-file build.config.slider*=*
per-file BUILD.bazel=*
per-file repack_kernel_boot_images.sh=*
per-file download_hlos_boot_images_and_repack_kernel_boot_images.sh=*

# These changes will be reviewed by pixel kernel module approvers, see go/pixelkernel-owners-approval-of-kernel-modules for details.
per-file vendor_{boot,kernel_boot}*=set noparent
per-file vendor_{boot,kernel_boot}*=file:kernel/private/google-modules/misc:android-gs-pixel-mainline:OWNERS_kernel_modules
per-file Makefile.ext_modules*=set noparent
per-file Makefile.ext_modules*=file:kernel/private/google-modules/misc:android-gs-pixel-mainline:OWNERS_kernel_modules
Loading

0 comments on commit 5e3c14f

Please sign in to comment.