mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
2ad898e091
Removed upstreamed: generic/backport-6.1/789-STABLE-01-net-dsa-mt7530-prevent-possible-incorrect-XTAL-frequ.patch [1] generic/backport-6.1/789-STABLE-02-net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch [2] generic/backport-6.1/789-STABLE-03-net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch [3] generic/pending-6.1/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch [4] generic/pending-6.1/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch [5] Manual adjusted the following patches: mediatek/patches-6.1/100-dts-update-mt7622-rfb1.patch 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=be4512b9ac6fc53e1ca8daccbda84f643215c547 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f1fa919ea59655f73cb3972264e157b8831ba546 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=86c0c154a759f2af9612a04bdf29110f02dce956 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=6b62bad2da1b338f452a9380639fc9b093d75a25 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.83&id=f78807362828ad01db2a9ed005bf79501b620f27 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
110 lines
2.9 KiB
Diff
110 lines
2.9 KiB
Diff
From e7992615acacc27baeec310197108143afc77337 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Fri, 26 May 2023 22:48:02 +0200
|
|
Subject: [PATCH] cpufreq: qcom-nvmem: use helper to get SMEM SoC ID
|
|
|
|
Now that SMEM exports a helper to get the SMEM SoC ID lets utilize it.
|
|
Currently qcom_cpufreq_get_msm_id() is encoding the returned SMEM SoC ID
|
|
into an enum, however there is no reason to do so and we can just match
|
|
directly on the SMEM SoC ID as returned by qcom_smem_get_soc_id().
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
|
|
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|
Link: https://lore.kernel.org/r/20230526204802.3081168-5-robimarko@gmail.com
|
|
---
|
|
drivers/cpufreq/qcom-cpufreq-nvmem.c | 56 +++++-----------------------
|
|
1 file changed, 10 insertions(+), 46 deletions(-)
|
|
|
|
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
|
|
@@ -28,16 +28,8 @@
|
|
#include <linux/slab.h>
|
|
#include <linux/soc/qcom/smem.h>
|
|
|
|
-#define MSM_ID_SMEM 137
|
|
-
|
|
#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 {
|
|
@@ -134,60 +126,32 @@ 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)
|
|
-{
|
|
- size_t len;
|
|
- u32 *msm_id;
|
|
- enum _msm8996_version version;
|
|
-
|
|
- msm_id = qcom_smem_get(QCOM_SMEM_HOST_ANY, MSM_ID_SMEM, &len);
|
|
- if (IS_ERR(msm_id))
|
|
- return NUM_OF_MSM8996_VERSIONS;
|
|
-
|
|
- /* The first 4 bytes are format, next to them is the actual msm-id */
|
|
- msm_id++;
|
|
-
|
|
- switch ((enum _msm_id)*msm_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 version;
|
|
-}
|
|
-
|
|
static int qcom_cpufreq_kryo_name_version(struct device *cpu_dev,
|
|
struct nvmem_cell *speedbin_nvmem,
|
|
char **pvs_name,
|
|
struct qcom_cpufreq_drv *drv)
|
|
{
|
|
size_t len;
|
|
+ u32 msm_id;
|
|
u8 *speedbin;
|
|
- enum _msm8996_version msm8996_version;
|
|
+ int ret;
|
|
*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;
|
|
- }
|
|
+ ret = qcom_smem_get_soc_id(&msm_id);
|
|
+ if (ret)
|
|
+ return ret;
|
|
|
|
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:
|