Merge 40648d246fa4 ("Merge tag 'trace-tools-v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace") am: a1d50df3a3
Original change: https://android-review.googlesource.com/c/kernel/common/+/3573277
Change-Id: I8a8e46b420ec1f8b15224978e94637d24a150d2c
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/OWNERS b/OWNERS
index a5ada4c..d4d5702 100644
--- a/OWNERS
+++ b/OWNERS
@@ -19,3 +19,23 @@
# Test config xml can be made by anyone
per-file */*.xml = *
+
+# Owners for the -desktop branch
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
diff --git a/OWNERS_DrNo b/OWNERS_DrNo
index aabed1b..c767af1 100644
--- a/OWNERS_DrNo
+++ b/OWNERS_DrNo
@@ -32,3 +32,23 @@
# Give DrNo Exceptions to TEST_MAPPING or test xml configs
per-file */TEST_MAPPING = *
per-file */*.xml = *
+
+# Owners for the -desktop branch
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9bf9620..57f60f9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -82,7 +82,7 @@
select ARCH_HAS_DEBUG_VIRTUAL
select ARCH_HAS_DEBUG_VM_PGTABLE if !X86_PAE
select ARCH_HAS_DEVMEM_IS_ALLOWED
- select ARCH_HAS_DMA_OPS if GART_IOMMU || XEN
+ select ARCH_HAS_DMA_OPS if GART_IOMMU || XEN || GKI_HACKS_TO_FIX
select ARCH_HAS_EARLY_DEBUG if KGDB
select ARCH_HAS_ELF_RANDOMIZE
select ARCH_HAS_FAST_MULTIPLIER
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 5c8dd04..ba369f7 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -57,6 +57,7 @@
CONFIG_RUST=y
CONFIG_SMP=y
CONFIG_X86_X2APIC=y
+CONFIG_X86_INTEL_LPSS=y
CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
@@ -76,7 +77,7 @@
CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set
-# CONFIG_ACPI_FAN is not set
+CONFIG_ACPI_FAN=m
# CONFIG_ACPI_THERMAL is not set
# CONFIG_X86_PM_TIMER is not set
CONFIG_CPU_FREQ_STAT=y
@@ -288,12 +289,9 @@
CONFIG_NFC=m
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIEAER=y
CONFIG_PCI_MSI=y
CONFIG_PCI_IOV=y
-CONFIG_HOTPLUG_PCI=y
CONFIG_PCIE_DW_PLAT_EP=y
CONFIG_PCI_ENDPOINT=y
CONFIG_FW_LOADER_USER_HELPER=y
@@ -387,6 +385,7 @@
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=0
+CONFIG_SERIAL_8250_DW=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
@@ -407,21 +406,22 @@
CONFIG_SPI_SLAVE=y
CONFIG_PTP_1588_CLOCK=m
# CONFIG_PTP_1588_CLOCK_VMCLOCK is not set
-CONFIG_GPIOLIB=y
+CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_POWER_SEQUENCING=m
# CONFIG_HWMON is not set
-CONFIG_THERMAL_NETLINK=y
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100
CONFIG_THERMAL_GOV_BANG_BANG=y
-CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
CONFIG_CPU_IDLE_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
CONFIG_THERMAL_EMULATION=y
# CONFIG_X86_PKG_TEMP_THERMAL is not set
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+CONFIG_INT340X_THERMAL=m
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
CONFIG_MFD_SYSCON=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -455,6 +455,7 @@
CONFIG_SND_SOC=y
CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
CONFIG_SND_SOC_UTILS_KUNIT_TEST=m
+CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HIDRAW=y
CONFIG_UHID=y
@@ -483,6 +484,7 @@
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_MON=m
CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
@@ -537,6 +539,7 @@
CONFIG_VHOST_VSOCK=y
CONFIG_STAGING=y
CONFIG_ASHMEM=y
+CONFIG_INTEL_SCU_PCI=y
CONFIG_REMOTEPROC=y
CONFIG_REMOTEPROC_CDEV=y
CONFIG_RPMSG_CHAR=y
@@ -547,6 +550,7 @@
CONFIG_IIO_FORMAT_KUNIT_TEST=m
CONFIG_POWERCAP=y
CONFIG_IDLE_INJECT=y
+CONFIG_USB4=m
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y
CONFIG_ANDROID_VENDOR_HOOKS=y
diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
index b7dbaf7..ab8e80c 100644
--- a/drivers/platform/chrome/Kconfig
+++ b/drivers/platform/chrome/Kconfig
@@ -155,7 +155,7 @@
module will be called cros_ec_lpcs.
config CROS_EC_PROTO
- bool
+ tristate
help
ChromeOS EC communication protocol helpers.
diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile
index fb83354..0b813dd 100644
--- a/drivers/platform/chrome/Makefile
+++ b/drivers/platform/chrome/Makefile
@@ -21,7 +21,8 @@
cros-ec-typec-objs := cros_ec_typec.o cros_typec_vdm.o
obj-$(CONFIG_CROS_EC_TYPEC) += cros-ec-typec.o
obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o
-obj-$(CONFIG_CROS_EC_PROTO) += cros_ec_proto.o cros_ec_trace.o
+cros-ec-proto-objs := cros_ec_proto.o cros_ec_trace.o
+obj-$(CONFIG_CROS_EC_PROTO) += cros-ec-proto.o
obj-$(CONFIG_CROS_KBD_LED_BACKLIGHT) += cros_kbd_led_backlight.o
obj-$(CONFIG_CROS_EC_CHARDEV) += cros_ec_chardev.o
obj-$(CONFIG_CROS_EC_LIGHTBAR) += cros_ec_lightbar.o
diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
index 877b107fe..f90d2e7 100644
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
@@ -1157,3 +1157,6 @@ int cros_ec_get_cmd_versions(struct cros_ec_device *ec_dev, u16 cmd)
return resp.version_mask;
}
EXPORT_SYMBOL_GPL(cros_ec_get_cmd_versions);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ChromeOS EC communication protocol helpers");
diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index 4c7e4f9..ac79e27 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -1,9 +1,12 @@
config GKI_HIDDEN_DRM_CONFIGS
bool "Hidden DRM configs needed for GKI"
+ select AUXILIARY_BUS if (X86)
select DRM_KMS_HELPER if (HAS_IOMEM && DRM)
select DRM_GEM_SHMEM_HELPER if (DRM)
select DRM_MIPI_DSI
+ select DRM_PRIVACY_SCREEN if (X86)
select DRM_TTM if (HAS_IOMEM && DRM)
+ select HMM_MIRROR if (X86 && DRM)
select VIDEOMODE_HELPERS
select WANT_DEV_COREDUMP
select INTERVAL_TREE
@@ -85,11 +88,21 @@
bool "Hidden GPIO configs needed for GKI"
select PINCTRL_SINGLE if (PINCTRL && OF && HAS_IOMEM)
select GPIO_PL061 if (HAS_IOMEM && ARM_AMBA && GPIOLIB)
+ select GPIO_SWNODE_UNDEFINED if (X86)
help
Dummy config option used to enable hidden GPIO configs.
These are normally selected implicitly when a module
that relies on it is configured.
+config GKI_HIDDEN_I2C_CONFIGS
+ bool "Hidden I2C configs needed for GKI"
+ select P2SB if (X86)
+ select CHECK_SIGNATURE if (X86 && DMI)
+ help
+ Dummy config option used to enable hidden I2C configs.
+ These are normally selected implicitly when a module
+ that relies on it is configured.
+
# If this file is included on a 32-bit allmodconfig build, the select for
# IOMMU_IO_PGTABLE_LPAE will trigger an "unmet direct dependency" warning
# because this option is incompatible with GENERIC_ATOMIC64, which is
@@ -254,6 +267,15 @@
Dummy config option used to enable the hidden DMA configs,
required by various SoC platforms.
+config GKI_HIDDEN_THERMAL_CONFIGS
+ bool "Hidden thermal configs needed for GKI"
+ select ACPI_THERMAL_LIB if (X86 && ACPI)
+ select INTEL_TCC if (X86)
+ help
+ Dummy config option used to enable hidden thermal configs.
+ These are normally selected implicitly when a module that
+ relies on it is configured.
+
config GKI_DYNAMIC_TASK_STRUCT_SIZE
bool "Dynamic task_struct size needed for GKI"
select ARCH_WANTS_DYNAMIC_TASK_STRUCT
@@ -287,6 +309,7 @@
select GKI_HIDDEN_UFS_CONFIGS
select GKI_HIDDEN_MMC_CONFIGS
select GKI_HIDDEN_GPIO_CONFIGS
+ select GKI_HIDDEN_I2C_CONFIGS
select GKI_HIDDEN_QCOM_CONFIGS
select GKI_LEGACY_WEXT_ALLCONFIG
select GKI_HIDDEN_MEDIA_CONFIGS
@@ -301,6 +324,7 @@
select GKI_HIDDEN_PHY_CONFIGS
select GKI_HIDDEN_MM_CONFIGS
select GKI_HIDDEN_ETHERNET_CONFIGS
+ select GKI_HIDDEN_THERMAL_CONFIGS
select GKI_HIDDEN_DMA_CONFIGS
select GKI_DYNAMIC_TASK_STRUCT_SIZE
diff --git a/modules.bzl b/modules.bzl
index 5840632..fe87b5c 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -109,7 +109,27 @@
_X86_64_GKI_MODULES_LIST = [
# keep sorted
+ "drivers/acpi/fan.ko",
+ "drivers/powercap/intel_rapl_common.ko",
"drivers/ptp/ptp_kvm.ko",
+ "drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.ko",
+ "drivers/thermal/intel/int340x_thermal/int3400_thermal.ko",
+ "drivers/thermal/intel/int340x_thermal/int3401_thermal.ko",
+ "drivers/thermal/intel/int340x_thermal/int3402_thermal.ko",
+ "drivers/thermal/intel/int340x_thermal/int3403_thermal.ko",
+ "drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_device.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci_legacy.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_mbox.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_power_floor.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_wt_hint.ko",
+ "drivers/thermal/intel/int340x_thermal/processor_thermal_wt_req.ko",
+ "drivers/thermal/intel/intel_soc_dts_iosf.ko",
+ "drivers/thermal/intel/intel_soc_dts_thermal.ko",
+ "drivers/thunderbolt/thunderbolt.ko",
]
# buildifier: disable=unnamed-macro
@@ -191,7 +211,7 @@
elif arch == "i386":
kunit_modules_list += []
elif arch == "x86_64":
- kunit_modules_list += []
+ kunit_modules_list.append("drivers/clk/clk_kunit_helpers.ko")
else:
fail("{}: arch {} not supported. Use one of [arm, arm64, i386, x86_64]".format(
str(native.package_relative_label(":x")).removesuffix(":x"),
