Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4b23f08 authored by Matthias Maennich's avatar Matthias Maennich
Browse files

ANDROID: add latest patches to quilt series 



up to 1caeb408 ("UPSTREAM: base: soc: Handle custom soc information sysfs entries")

Change-Id: I070748e45a9ffbdd0fdba43fe56b99db90a10b08
Signed-off-by: default avatarMatthias Maennich <maennich@google.com>
parent ce235d4c

patches/ANDROID-Fix-x86_64-allmodconfig-build.patch

0 → 100644
+41 −0
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Alistair Delva <adelva@google.com>

Date: Fri, 11 Oct 2019 10:24:23 -0400

Subject: ANDROID: Fix x86_64 allmodconfig build



CONFIG_KVM_INTEL depends on asm volatile goto which is about to be

supported in clang, but we haven't landed the upgraded compiler yet.

Suppress use of this kernel feature for now.



In file included from arch/x86/kvm/vmx/vmx.h:11:

arch/x86/kvm/vmx/ops.h:157:2: error: 'asm goto' constructs are not

supported yet

vmx_asm2(vmwrite, "r"(field), "rm"(value), field, value);

^



Change-Id: If21ca65a7bd1e43c5f66a93a6108cf8aa49a9c64

Signed-off-by: Alistair Delva <adelva@google.com>

---

 build.config.allmodconfig | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/build.config.allmodconfig b/build.config.allmodconfig

index deaa8f3d5a69..854a8f8aa3f2 100644

--- a/build.config.allmodconfig

+++ b/build.config.allmodconfig

@@ -2,12 +2,14 @@ DEFCONFIG=allmodconfig

 KCONFIG_ALLCONFIG=${ROOT_DIR}/common/arch/${ARCH%_*}/configs/gki_defconfig

 

 # XFS_FS is currently broken on this branch with clang-9

+# KVM_INTEL is broken on this branch due to lack of asm-goto support in clang

 POST_DEFCONFIG_CMDS="update_config"

 function update_config() {

     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \

          -d TEST_KMOD  \

          -d XFS_FS \

-         -d CPU_BIG_ENDIAN

+         -d CPU_BIG_ENDIAN \

+         -d KVM_INTEL

     (cd ${OUT_DIR} && \

      make O=${OUT_DIR} $archsubarch CC=${CC} CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)

 }

patches/ANDROID-gki_defconfig-Enable-BPF_JIT-and-BPF_JIT_ALWAYS_ON.patch

0 → 100644
+71 −0
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>

Date: Tue, 8 Oct 2019 08:51:00 -0700

Subject: ANDROID: gki_defconfig: Enable BPF_JIT and BPF_JIT_ALWAYS_ON

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit



Generated via:

  echo 'CONFIG_BPF_JIT=y' >> arch/x86/configs/gki_defconfig

  echo 'CONFIG_BPF_JIT_ALWAYS_ON=y' >> arch/x86/configs/gki_defconfig



  make ARCH=x86_64 gki_defconfig

  make ARCH=x86_64 savedefconfig

  mv defconfig arch/x86/configs/gki_defconfig



  echo 'CONFIG_BPF_JIT=y' >> arch/arm64/configs/gki_defconfig

  echo 'CONFIG_BPF_JIT_ALWAYS_ON=y' >> arch/arm64/configs/gki_defconfig



  make ARCH=arm64 gki_defconfig

  make ARCH=arm64 savedefconfig

  mv defconfig arch/arm64/configs/gki_defconfig



Bug: 140377409

Signed-off-by: Maciej Żenczykowski <maze@google.com>

Change-Id: I84e917b75ca2cbe4d4b61c0d042f9fbcf5bdf519

---

 arch/arm64/configs/gki_defconfig | 2 ++

 arch/x86/configs/gki_defconfig   | 2 ++

 2 files changed, 4 insertions(+)



diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig

index 97e0e47767e2..9e3b34fa8b64 100644

--- a/arch/arm64/configs/gki_defconfig

+++ b/arch/arm64/configs/gki_defconfig

@@ -28,6 +28,7 @@ CONFIG_BLK_DEV_INITRD=y

 # CONFIG_FHANDLE is not set

 CONFIG_KALLSYMS_ALL=y

 CONFIG_BPF_SYSCALL=y

+CONFIG_BPF_JIT_ALWAYS_ON=y

 # CONFIG_RSEQ is not set

 CONFIG_EMBEDDED=y

 # CONFIG_VM_EVENT_COUNTERS is not set

@@ -187,6 +188,7 @@ CONFIG_NET_EMATCH_U32=y

 CONFIG_NET_CLS_ACT=y

 CONFIG_VSOCKETS=y

 CONFIG_VIRTIO_VSOCKETS=y

+CONFIG_BPF_JIT=y

 CONFIG_BT=y

 CONFIG_CFG80211=y

 # CONFIG_CFG80211_DEFAULT_PS is not set

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig

index 7890c249bca9..f539970bf631 100644

--- a/arch/x86/configs/gki_defconfig

+++ b/arch/x86/configs/gki_defconfig

@@ -27,6 +27,7 @@ CONFIG_BLK_DEV_INITRD=y

 # CONFIG_FHANDLE is not set

 CONFIG_KALLSYMS_ALL=y

 CONFIG_BPF_SYSCALL=y

+CONFIG_BPF_JIT_ALWAYS_ON=y

 # CONFIG_RSEQ is not set

 CONFIG_EMBEDDED=y

 # CONFIG_VM_EVENT_COUNTERS is not set

@@ -159,6 +160,7 @@ CONFIG_NET_EMATCH_U32=y

 CONFIG_NET_CLS_ACT=y

 CONFIG_VSOCKETS=m

 CONFIG_VIRTIO_VSOCKETS=m

+CONFIG_BPF_JIT=y

 CONFIG_CAN=m

 # CONFIG_CAN_BCM is not set

 # CONFIG_CAN_GW is not set

patches/ANDROID-gki_defconfig-enable-CONFIG_NLS_.patch

0 → 100644
+139 −0
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Ram Muthiah <rammuthiah@google.com>

Date: Tue, 8 Oct 2019 15:12:37 -0700

Subject: ANDROID: gki_defconfig: enable CONFIG_NLS_*



CONFIG_NLS_CODEPAGE_437 and CONFIG_NLS_ISO8859_1 are needed by cuttlefish

to pass the CTS test - StorageManagerTest#testMountAndUnmountObbNormal



Adding the remaining 47 NLS Configs to account for possible i18n

requirements not caught by CTS/VTS



Bug: 138199351

Change-Id: I897873c8454f8329f4dc53d9af71907ba71790b7

Signed-off-by: Ram Muthiah <rammuthiah@google.com>

---

 arch/arm64/configs/gki_defconfig | 49 ++++++++++++++++++++++++++++++++

 arch/x86/configs/gki_defconfig   | 49 ++++++++++++++++++++++++++++++++

 2 files changed, 98 insertions(+)



diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig

index 0b7669f8fedd..29cc5898a871 100644

--- a/arch/arm64/configs/gki_defconfig

+++ b/arch/arm64/configs/gki_defconfig

@@ -391,6 +391,55 @@ CONFIG_SDCARD_FS=y

 CONFIG_PSTORE=y

 CONFIG_PSTORE_CONSOLE=y

 CONFIG_PSTORE_RAM=y

+CONFIG_NLS_CODEPAGE_437=y

+CONFIG_NLS_CODEPAGE_737=y

+CONFIG_NLS_CODEPAGE_775=y

+CONFIG_NLS_CODEPAGE_850=y

+CONFIG_NLS_CODEPAGE_852=y

+CONFIG_NLS_CODEPAGE_855=y

+CONFIG_NLS_CODEPAGE_857=y

+CONFIG_NLS_CODEPAGE_860=y

+CONFIG_NLS_CODEPAGE_861=y

+CONFIG_NLS_CODEPAGE_862=y

+CONFIG_NLS_CODEPAGE_863=y

+CONFIG_NLS_CODEPAGE_864=y

+CONFIG_NLS_CODEPAGE_865=y

+CONFIG_NLS_CODEPAGE_866=y

+CONFIG_NLS_CODEPAGE_869=y

+CONFIG_NLS_CODEPAGE_936=y

+CONFIG_NLS_CODEPAGE_950=y

+CONFIG_NLS_CODEPAGE_932=y

+CONFIG_NLS_CODEPAGE_949=y

+CONFIG_NLS_CODEPAGE_874=y

+CONFIG_NLS_ISO8859_8=y

+CONFIG_NLS_CODEPAGE_1250=y

+CONFIG_NLS_CODEPAGE_1251=y

+CONFIG_NLS_ASCII=y

+CONFIG_NLS_ISO8859_1=y

+CONFIG_NLS_ISO8859_2=y

+CONFIG_NLS_ISO8859_3=y

+CONFIG_NLS_ISO8859_4=y

+CONFIG_NLS_ISO8859_5=y

+CONFIG_NLS_ISO8859_6=y

+CONFIG_NLS_ISO8859_7=y

+CONFIG_NLS_ISO8859_9=y

+CONFIG_NLS_ISO8859_13=y

+CONFIG_NLS_ISO8859_14=y

+CONFIG_NLS_ISO8859_15=y

+CONFIG_NLS_KOI8_R=y

+CONFIG_NLS_KOI8_U=y

+CONFIG_NLS_MAC_ROMAN=y

+CONFIG_NLS_MAC_CELTIC=y

+CONFIG_NLS_MAC_CENTEURO=y

+CONFIG_NLS_MAC_CROATIAN=y

+CONFIG_NLS_MAC_CYRILLIC=y

+CONFIG_NLS_MAC_GAELIC=y

+CONFIG_NLS_MAC_GREEK=y

+CONFIG_NLS_MAC_ICELAND=y

+CONFIG_NLS_MAC_INUIT=y

+CONFIG_NLS_MAC_ROMANIAN=y

+CONFIG_NLS_MAC_TURKISH=y

+CONFIG_NLS_UTF8=y

 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

 CONFIG_SECURITY=y

 CONFIG_SECURITY_NETWORK=y

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig

index 78283ea8c1c8..5059dcaf01bb 100644

--- a/arch/x86/configs/gki_defconfig

+++ b/arch/x86/configs/gki_defconfig

@@ -324,6 +324,55 @@ CONFIG_SDCARD_FS=y

 CONFIG_PSTORE=y

 CONFIG_PSTORE_CONSOLE=y

 CONFIG_PSTORE_RAM=y

+CONFIG_NLS_CODEPAGE_437=y

+CONFIG_NLS_CODEPAGE_737=y

+CONFIG_NLS_CODEPAGE_775=y

+CONFIG_NLS_CODEPAGE_850=y

+CONFIG_NLS_CODEPAGE_852=y

+CONFIG_NLS_CODEPAGE_855=y

+CONFIG_NLS_CODEPAGE_857=y

+CONFIG_NLS_CODEPAGE_860=y

+CONFIG_NLS_CODEPAGE_861=y

+CONFIG_NLS_CODEPAGE_862=y

+CONFIG_NLS_CODEPAGE_863=y

+CONFIG_NLS_CODEPAGE_864=y

+CONFIG_NLS_CODEPAGE_865=y

+CONFIG_NLS_CODEPAGE_866=y

+CONFIG_NLS_CODEPAGE_869=y

+CONFIG_NLS_CODEPAGE_936=y

+CONFIG_NLS_CODEPAGE_950=y

+CONFIG_NLS_CODEPAGE_932=y

+CONFIG_NLS_CODEPAGE_949=y

+CONFIG_NLS_CODEPAGE_874=y

+CONFIG_NLS_ISO8859_8=y

+CONFIG_NLS_CODEPAGE_1250=y

+CONFIG_NLS_CODEPAGE_1251=y

+CONFIG_NLS_ASCII=y

+CONFIG_NLS_ISO8859_1=y

+CONFIG_NLS_ISO8859_2=y

+CONFIG_NLS_ISO8859_3=y

+CONFIG_NLS_ISO8859_4=y

+CONFIG_NLS_ISO8859_5=y

+CONFIG_NLS_ISO8859_6=y

+CONFIG_NLS_ISO8859_7=y

+CONFIG_NLS_ISO8859_9=y

+CONFIG_NLS_ISO8859_13=y

+CONFIG_NLS_ISO8859_14=y

+CONFIG_NLS_ISO8859_15=y

+CONFIG_NLS_KOI8_R=y

+CONFIG_NLS_KOI8_U=y

+CONFIG_NLS_MAC_ROMAN=y

+CONFIG_NLS_MAC_CELTIC=y

+CONFIG_NLS_MAC_CENTEURO=y

+CONFIG_NLS_MAC_CROATIAN=y

+CONFIG_NLS_MAC_CYRILLIC=y

+CONFIG_NLS_MAC_GAELIC=y

+CONFIG_NLS_MAC_GREEK=y

+CONFIG_NLS_MAC_ICELAND=y

+CONFIG_NLS_MAC_INUIT=y

+CONFIG_NLS_MAC_ROMANIAN=y

+CONFIG_NLS_MAC_TURKISH=y

+CONFIG_NLS_UTF8=y

 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

 CONFIG_SECURITY=y

 CONFIG_SECURITY_NETWORK=y

patches/ANDROID-gki_defconfig-enable-CONFIG_PARAVIRT-and-CONFIG_HYPERVISOR_GUEST.patch

0 → 100644
+30 −0
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Ram Muthiah <rammuthiah@google.com>

Date: Thu, 10 Oct 2019 08:45:15 -0700

Subject: ANDROID: gki_defconfig: enable CONFIG_PARAVIRT and

 CONFIG_HYPERVISOR_GUEST



CONFIG_HYPERVISOR_GUEST is needed by cuttlefish to pass the CTS Bionic tests:

clock_getres_CLOCK_MONOTONIC, clock_getres_CLOCK_REALTIME, and

clock_getres_CLOCK_BOOTTIME



Bug: 138199351

Change-Id: I3e209035cdd7a29e020078f8aba567d9c8446347

Signed-off-by: Ram Muthiah <rammuthiah@google.com>

---

 arch/x86/configs/gki_defconfig | 2 ++

 1 file changed, 2 insertions(+)



diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig

index 5059dcaf01bb..0e23b0cc3a8c 100644

--- a/arch/x86/configs/gki_defconfig

+++ b/arch/x86/configs/gki_defconfig

@@ -37,6 +37,8 @@ CONFIG_SLAB_FREELIST_RANDOM=y

 CONFIG_SLAB_FREELIST_HARDENED=y

 CONFIG_PROFILING=y

 CONFIG_SMP=y

+CONFIG_HYPERVISOR_GUEST=y

+CONFIG_PARAVIRT=y

 CONFIG_NR_CPUS=32

 CONFIG_EFI=y

 CONFIG_PM_WAKELOCKS=y

patches/ANDROID-gki_defconfig-enable-REGULATOR.patch

0 → 100644
+37 −0
Original line number Diff line number Diff line 
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Tri Vo <trong@google.com>

Date: Tue, 8 Oct 2019 12:38:34 -0700

Subject: ANDROID: gki_defconfig: enable REGULATOR



Fixes: 142334529

Change-Id: If2e17aec00c2f2202f6f9203192afcd8e12228a6

Signed-off-by: Tri Vo <trong@google.com>

---

 arch/arm64/configs/gki_defconfig | 1 +

 arch/x86/configs/gki_defconfig   | 1 +

 2 files changed, 2 insertions(+)



diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig

index 9e3b34fa8b64..0b7669f8fedd 100644

--- a/arch/arm64/configs/gki_defconfig

+++ b/arch/arm64/configs/gki_defconfig

@@ -293,6 +293,7 @@ CONFIG_DEVFREQ_THERMAL=y

 CONFIG_WATCHDOG=y

 CONFIG_MFD_ACT8945A=y

 CONFIG_MFD_SYSCON=y

+CONFIG_REGULATOR=y

 CONFIG_MEDIA_SUPPORT=y

 CONFIG_MEDIA_CAMERA_SUPPORT=y

 CONFIG_MEDIA_CONTROLLER=y

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig

index f539970bf631..78283ea8c1c8 100644

--- a/arch/x86/configs/gki_defconfig

+++ b/arch/x86/configs/gki_defconfig

@@ -252,6 +252,7 @@ CONFIG_GPIOLIB=y

 # CONFIG_HWMON is not set

 CONFIG_DEVFREQ_THERMAL=y

 # CONFIG_X86_PKG_TEMP_THERMAL is not set

+CONFIG_REGULATOR=y

 CONFIG_MEDIA_SUPPORT=y

 CONFIG_MEDIA_CAMERA_SUPPORT=y

 CONFIG_DRM=y