8f8d5decc9
Removed because they are upstream: generic/backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=c5c0760adc260d55265c086b9efb350ea6dda38b generic/pending-5.15/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=448cc8b5f743985f6d1d98aa4efb386fef4c3bf2 generic/pending-5.15/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=9fcadd125044007351905d40c405fadc2d3bb6d6 Add new configuration symbols for tegra target. Tested-by: Stijn Segers <foss@volatilesystems.org> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit fb2c6e9d4da8753b91f79f4ab2d00c0fd8efa038)
107 lines
2.9 KiB
Diff
107 lines
2.9 KiB
Diff
From 85bf71b130ab0e939f53ec9cf1131d67d148bc9a Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Sat, 31 Dec 2022 12:45:31 +0100
|
|
Subject: [PATCH] cpufreq: qcom-nvmem: make qcom_cpufreq_get_msm_id() return
|
|
the SoC ID
|
|
|
|
Currently, qcom_cpufreq_get_msm_id() does not simply return the SoC ID
|
|
after getting it via SMEM call but instead uses an enum to encode the
|
|
matched SMEM ID to 2 variants of MSM8996 which are then used in
|
|
qcom_cpufreq_kryo_name_version() to set the supported version.
|
|
|
|
This prevents qcom_cpufreq_get_msm_id() from being universal and its doing
|
|
more than its name suggests, so lets make it just return the SoC ID
|
|
directly which allows matching directly on the SoC ID and removes the need
|
|
for msm8996_version enum which simplifies the driver.
|
|
It also allows reusing the qcom_cpufreq_get_msm_id() for new SoC-s.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
drivers/cpufreq/qcom-cpufreq-nvmem.c | 44 ++++++++--------------------
|
|
1 file changed, 12 insertions(+), 32 deletions(-)
|
|
|
|
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
@@ -31,12 +31,6 @@
|
|
|
|
#include <dt-bindings/arm/qcom,ids.h>
|
|
|
|
-enum _msm8996_version {
|
|
- MSM8996_V3,
|
|
- MSM8996_SG,
|
|
- NUM_OF_MSM8996_VERSIONS,
|
|
-};
|
|
-
|
|
struct qcom_cpufreq_drv;
|
|
|
|
struct qcom_cpufreq_match_data {
|
|
@@ -135,30 +129,16 @@ static void get_krait_bin_format_b(struc
|
|
dev_dbg(cpu_dev, "PVS version: %d\n", *pvs_ver);
|
|
}
|
|
|
|
-static enum _msm8996_version qcom_cpufreq_get_msm_id(void)
|
|
+static int qcom_cpufreq_get_msm_id(void)
|
|
{
|
|
size_t len;
|
|
struct socinfo *info;
|
|
- enum _msm8996_version version;
|
|
|
|
info = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, &len);
|
|
if (IS_ERR(info))
|
|
- return NUM_OF_MSM8996_VERSIONS;
|
|
-
|
|
- switch (info->id) {
|
|
- case QCOM_ID_MSM8996:
|
|
- case QCOM_ID_APQ8096:
|
|
- version = MSM8996_V3;
|
|
- break;
|
|
- case QCOM_ID_MSM8996SG:
|
|
- case QCOM_ID_APQ8096SG:
|
|
- version = MSM8996_SG;
|
|
- break;
|
|
- default:
|
|
- version = NUM_OF_MSM8996_VERSIONS;
|
|
- }
|
|
+ return PTR_ERR(info);
|
|
|
|
- return version;
|
|
+ return info->id;
|
|
}
|
|
|
|
static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev,
|
|
@@ -167,25 +147,25 @@ static int qcom_cpufreq_kryo_name_versio
|
|
struct qcom_cpufreq_drv *drv)
|
|
{
|
|
size_t len;
|
|
+ int msm_id;
|
|
u8 *speedbin;
|
|
- enum _msm8996_version msm8996_version;
|
|
*pvs_name = NULL;
|
|
|
|
- msm8996_version = qcom_cpufreq_get_msm_id();
|
|
- if (NUM_OF_MSM8996_VERSIONS == msm8996_version) {
|
|
- dev_err(cpu_dev, "Not Snapdragon 820/821!");
|
|
- return -ENODEV;
|
|
- }
|
|
+ msm_id = qcom_cpufreq_get_msm_id();
|
|
+ if (msm_id < 0)
|
|
+ return msm_id;
|
|
|
|
speedbin = nvmem_cell_read(speedbin_nvmem, &len);
|
|
if (IS_ERR(speedbin))
|
|
return PTR_ERR(speedbin);
|
|
|
|
- switch (msm8996_version) {
|
|
- case MSM8996_V3:
|
|
+ switch (msm_id) {
|
|
+ case QCOM_ID_MSM8996:
|
|
+ case QCOM_ID_APQ8096:
|
|
drv->versions = 1 << (unsigned int)(*speedbin);
|
|
break;
|
|
- case MSM8996_SG:
|
|
+ case QCOM_ID_MSM8996SG:
|
|
+ case QCOM_ID_APQ8096SG:
|
|
drv->versions = 1 << ((unsigned int)(*speedbin) + 4);
|
|
break;
|
|
default:
|