mainline: fold fix for cpufreq dummy driver into original patch
Change-Id: I2821e39b4b9bf4f7890d4549e33f9f1294497b46
Cc: Alistair Delva <adelva@google.com>
Cc: Connor O'Brien <connoro@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
diff --git a/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch b/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch
index 9a64968..391cd06 100644
--- a/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch
+++ b/android-mainline/ANDROID-cpufreq-create-dummy-cpufreq-driver.patch
@@ -19,13 +19,16 @@
Bug: 141206930
Change-Id: I8c7fe1007a80c21a9bcba9455bf837947cf42963
Signed-off-by: Connor O'Brien <connoro@google.com>
+[maennich: Folded the following patch into this patch
+ 50118fa88e6a ("ANDROID: dummy_cpufreq: Implement get()")]
+Signed-off-by: Matthias Maennich <maennich@google.com>
---
arch/arm64/configs/gki_defconfig | 1 +
arch/x86/configs/gki_defconfig | 1 +
- drivers/cpufreq/Kconfig | 9 ++++++
+ drivers/cpufreq/Kconfig | 9 +++++
drivers/cpufreq/Makefile | 2 ++
- drivers/cpufreq/dummy-cpufreq.c | 54 ++++++++++++++++++++++++++++++++
- 5 files changed, 67 insertions(+)
+ drivers/cpufreq/dummy-cpufreq.c | 60 ++++++++++++++++++++++++++++++++
+ 5 files changed, 73 insertions(+)
create mode 100644 drivers/cpufreq/dummy-cpufreq.c
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
@@ -87,10 +90,10 @@
# Link order matters. K8 is preferred to ACPI because of firmware bugs in early
diff --git a/drivers/cpufreq/dummy-cpufreq.c b/drivers/cpufreq/dummy-cpufreq.c
new file mode 100644
-index 000000000000..914f3e39ca9b
+index 000000000000..ea40d5c7a9fa
--- /dev/null
+++ b/drivers/cpufreq/dummy-cpufreq.c
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 Google, Inc.
@@ -116,6 +119,11 @@
+ return 0;
+}
+
++static unsigned int dummy_cpufreq_get(unsigned int cpu)
++{
++ return 1;
++}
++
+static int dummy_cpufreq_verify(struct cpufreq_policy *policy)
+{
+ return 0;
@@ -125,6 +133,7 @@
+ .name = "dummy",
+ .target_index = dummy_cpufreq_target_index,
+ .init = dummy_cpufreq_driver_init,
++ .get = dummy_cpufreq_get,
+ .verify = dummy_cpufreq_verify,
+ .attr = cpufreq_generic_attr,
+};
diff --git a/android-mainline/ANDROID-dummy_cpufreq-Implement-get.patch b/android-mainline/ANDROID-dummy_cpufreq-Implement-get.patch
deleted file mode 100644
index 9e6cdc2..0000000
--- a/android-mainline/ANDROID-dummy_cpufreq-Implement-get.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alistair Delva <adelva@google.com>
-Date: Mon, 28 Oct 2019 15:07:10 -0700
-Subject: ANDROID: dummy_cpufreq: Implement get()
-
-Fixes panic in time_cpufreq_notifier+0x94 caused by notifying the x86
-TSC synchronization code that a CPU frequency change has occurred, but
-not properly updating policy->cur beforehand, causing a division by
-zero.
-
-Link: https://github.com/ClangBuiltLinux/linux/issues/756
-Change-Id: I687093bbdb402a13341762bf9d91dd7f9daffe8b
-Signed-off-by: Alistair Delva <adelva@google.com>
----
- drivers/cpufreq/dummy-cpufreq.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/cpufreq/dummy-cpufreq.c b/drivers/cpufreq/dummy-cpufreq.c
-index 914f3e39ca9b..ea40d5c7a9fa 100644
---- a/drivers/cpufreq/dummy-cpufreq.c
-+++ b/drivers/cpufreq/dummy-cpufreq.c
-@@ -23,6 +23,11 @@ static int dummy_cpufreq_driver_init(struct cpufreq_policy *policy)
- return 0;
- }
-
-+static unsigned int dummy_cpufreq_get(unsigned int cpu)
-+{
-+ return 1;
-+}
-+
- static int dummy_cpufreq_verify(struct cpufreq_policy *policy)
- {
- return 0;
-@@ -32,6 +37,7 @@ static struct cpufreq_driver dummy_cpufreq_driver = {
- .name = "dummy",
- .target_index = dummy_cpufreq_target_index,
- .init = dummy_cpufreq_driver_init,
-+ .get = dummy_cpufreq_get,
- .verify = dummy_cpufreq_verify,
- .attr = cpufreq_generic_attr,
- };
diff --git a/android-mainline/series b/android-mainline/series
index fee1d3b..d5a28a0 100644
--- a/android-mainline/series
+++ b/android-mainline/series
@@ -199,7 +199,6 @@
ANDROID-gki_defconfig-enable-CONFIG_CPU_FREQ_GOV_CONSERVATIVE.patch
ANDROID-virtio-virtio_input-Set-the-amount-of-multitouch-slots-in-virtio-input.patch
ANDROID-gki_defconfig-enable-CONFIG_CPUSETS.patch
-ANDROID-dummy_cpufreq-Implement-get.patch
ANDROID-Revert-sched-Rework-pick_next_task-slow-path.patch
ANDROID-media-increase-video-max-frame-number.patch
FROMLIST-fscrypt-invoke-crypto-API-for-ESSIV-handling.patch
