soc: qcom: socinfo: move SMEM item struct and defines to a header
Subsystems (4)
PATCH v3 1/5 soc: qcom: socinfo: move SMEM item struct and defines to a header
Move SMEM item struct and related defines to a header in order to be able to reuse them in the SMEM driver instead of duplicating them.
--- drivers/soc/qcom/socinfo.c | 67 +----------------------------- include/linux/soc/qcom/socinfo.h | 70 ++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 66 deletions(-) create mode 100644 include/linux/soc/qcom/socinfo.h
drivers/soc/qcom/socinfo.c +1 -66
@@ -11,6 +11,7 @@#include <linux/random.h> #include <linux/slab.h> #include <linux/soc/qcom/smem.h> +#include <linux/soc/qcom/socinfo.h> #include <linux/string.h> #include <linux/stringify.h> #include <linux/sys_soc.h>
@@ -32,15 +33,6 @@#define qcom_board_id (id) QCOM_ID_ ## id, __stringify(id)#define qcom_board_id_named (id, name) QCOM_ID_ ## id, (name) -#define SMEM_SOCINFO_BUILD_ID_LENGTH 32 -#define SMEM_SOCINFO_CHIP_ID_LENGTH 32 - -/* -* SMEM item id, used to acquire handles to respective -* SMEM region. -*/ -#define SMEM_HW_SW_BUILD_ID 137 -#ifdef CONFIG_DEBUG_FS #define SMEM_IMAGE_VERSION_BLOCKS_COUNT 32#define SMEM_IMAGE_VERSION_SIZE 4096
@@ -126,64 +118,7 @@ static const char *const pmic_models[] = { [58] = "PM8450", [65] = "PM8010", }; -#endif /* CONFIG_DEBUG_FS */ - -/* Socinfo SMEM item structure */ -struct socinfo { -__le32 fmt; -__le32 id; -__le32 ver; -char build_id[SMEM_SOCINFO_BUILD_ID_LENGTH ]; -/* Version 2 */ -__le32 raw_id; -__le32 raw_ver; -/* Version 3 */ -__le32 hw_plat; -/* Version 4 */ -__le32 plat_ver; -/* Version 5 */ -__le32 accessory_chip; -/* Version 6 */ -__le32 hw_plat_subtype; -/* Version 7 */ -__le32 pmic_model; -__le32 pmic_die_rev; -/* Version 8 */ -__le32 pmic_model_1; -__le32 pmic_die_rev_1; -__le32 pmic_model_2; -__le32 pmic_die_rev_2; -/* Version 9 */ -__le32 foundry_id; -/* Version 10 */ -__le32 serial_num; -/* Version 11 */ -__le32 num_pmics; -__le32 pmic_array_offset; -/* Version 12 */ -__le32 chip_family; -__le32 raw_device_family; -__le32 raw_device_num; -/* Version 13 */ -__le32 nproduct_id; -char chip_id[SMEM_SOCINFO_CHIP_ID_LENGTH ]; -/* Version 14 */ -__le32 num_clusters; -__le32 ncluster_array_offset; -__le32 num_defective_parts; -__le32 ndefective_parts_array_offset; -/* Version 15 */ -__le32 nmodem_supported; -/* Version 16 */ -__le32 feature_code; -__le32 pcode; -__le32 npartnamemap_offset; -__le32 nnum_partname_mapping; -/* Version 17 */ -__le32 oem_variant; -}; -#ifdef CONFIG_DEBUG_FS struct socinfo_params {u32 raw_device_family;u32 hw_plat_subtype;
include/linux/soc/qcom/socinfo.h new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v3 2/5 soc: qcom: smem: Switch to EXPORT_SYMBOL_GPL()
SMEM has been GPL licensed from the start, and there is no reason to use EXPORT_SYMBOL() so switch to the GPL version.
--- drivers/soc/qcom/smem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/soc/qcom/smem.c +4 -4
@@ -500,7 +500,7 @@ int qcom_smem_alloc(unsigned host, unsigned item, size_t size)return ret; } -EXPORT_SYMBOL (qcom_smem_alloc); +EXPORT_SYMBOL_GPL (qcom_smem_alloc); static void *qcom_smem_get_global(struct qcom_smem *smem, unsigned item,
@@ -674,7 +674,7 @@ void *qcom_smem_get(unsigned host, unsigned item, size_t *size)return ptr; } -EXPORT_SYMBOL (qcom_smem_get); +EXPORT_SYMBOL_GPL (qcom_smem_get);/** * qcom_smem_get_free_space() - retrieve amount of free space in a partition
@@ -719,7 +719,7 @@ int qcom_smem_get_free_space(unsigned host)return ret; } -EXPORT_SYMBOL (qcom_smem_get_free_space); +EXPORT_SYMBOL_GPL (qcom_smem_get_free_space);static bool addr_in_range (void __iomem *base,size_t size,void *addr) {
@@ -770,7 +770,7 @@ phys_addr_t qcom_smem_virt_to_phys(void *p)return 0 ; } -EXPORT_SYMBOL (qcom_smem_virt_to_phys); +EXPORT_SYMBOL_GPL (qcom_smem_virt_to_phys);static int qcom_smem_get_sbl_version (struct qcom_smem *smem) {
Signature · 1 line
2.40.1
Re: [PATCH v3 2/5] soc: qcom: smem: Switch to EXPORT_SYMBOL_GPL()
Quoted 5 lines · Robert Marko
SMEM has been GPL licensed from the start, and there is no reason to use
EXPORT_SYMBOL()so switch to the GPL version.Signed-off-by Robert Marko <[email protected]>---
Konrad
Quoted 43 lines
drivers/soc/qcom/smem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/soc/qcom/smem.c +4
-4@@ -500,7 +500,7 @@ int qcom_smem_alloc(unsigned host, unsigned item, size_t size)return ret; } -EXPORT_SYMBOL (qcom_smem_alloc); +EXPORT_SYMBOL_GPL (qcom_smem_alloc); static void *qcom_smem_get_global(struct qcom_smem *smem, unsigned item,@@ -674,7 +674,7 @@ void *qcom_smem_get(unsigned host, unsigned item, size_t *size)return ptr; } -EXPORT_SYMBOL (qcom_smem_get); +EXPORT_SYMBOL_GPL (qcom_smem_get);/** * qcom_smem_get_free_space() - retrieve amount of free space in a partition @@ -719,7 +719,7 @@ int qcom_smem_get_free_space(unsigned host)return ret; } -EXPORT_SYMBOL (qcom_smem_get_free_space); +EXPORT_SYMBOL_GPL (qcom_smem_get_free_space);static bool addr_in_range (void __iomem *base,size_t size,void *addr) {@@ -770,7 +770,7 @@ phys_addr_t qcom_smem_virt_to_phys(void *p)return 0 ; } -EXPORT_SYMBOL (qcom_smem_virt_to_phys); +EXPORT_SYMBOL_GPL (qcom_smem_virt_to_phys);static int qcom_smem_get_sbl_version (struct qcom_smem *smem) {
Re: [PATCH v3 2/5] soc: qcom: smem: Switch to EXPORT_SYMBOL_GPL()
In reply to Robert MarkoQuoted 4 lines · Robert Marko
SMEM has been GPL licensed from the start, and there is no reason to use
EXPORT_SYMBOL()so switch to the GPL version.Signed-off-by Robert Marko <[email protected]>
Excellent. Thank you.
---Trilok Soni
Trilok Soni
Reviewed-byRe: [PATCH v3 2/5] soc: qcom: smem: Switch to EXPORT_SYMBOL_GPL()
Quoted 9 lines · Trilok Soni
Quoted 4 lines · Robert Marko
SMEM has been GPL licensed from the start, and there is no reason to use
EXPORT_SYMBOL()so switch to the GPL version.Signed-off-by Robert Marko <[email protected]>Excellent. Thank you.
Reviewed-by Trilok Soni <[email protected]>
Correction in email ID. I have a separate one for open-source work which makes the email clients happy.
Sorry for the trouble.
---Trilok Soni
PATCH v3 3/5 soc: qcom: smem: introduce qcom_smem_get_msm_id()
In reply to Robert MarkoIntroduce a helper to return the SoC SMEM ID, which is used to identify the exact SoC model as there may be differences in the same SoC family.
Currently, cpufreq-nvmem does this completely in the driver and there has been more interest expresed for other drivers to use this information so lets expose a common helper to prevent redoing it in individual drivers since this field is present on every SMEM table version.
---
Changes in v3:
* Change export to EXPORT_SYMBOL_GPL
* Use an argument for returning SoC ID
* Update kerneldoc
--- drivers/soc/qcom/smem.c | 24 ++++++++++++++++++++++++ include/linux/soc/qcom/smem.h | 2 ++ 2 files changed, 26 insertions(+)
drivers/soc/qcom/smem.c +24 -0
@@ -14,6 +14,7 @@#include <linux/sizes.h> #include <linux/slab.h> #include <linux/soc/qcom/smem.h> +#include <linux/soc/qcom/socinfo.h> /* * The Qualcomm shared memory system is a allocate only heap structure that
@@ -772,6 +773,29 @@ phys_addr_t qcom_smem_virt_to_phys(void *p) }EXPORT_SYMBOL_GPL (qcom_smem_virt_to_phys); +/** +* qcom_smem_get_msm_id() - return the SoC ID +* @id: On success, we return the SoC ID here. +* +* Look up SoC ID from HW/SW build ID and return it. +* +* Return: 0 on success, negative errno on failure. +*/ +int qcom_smem_get_msm_id (u32 *id) +{ +size_t len; +struct socinfo *info; + + info =qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_HW_SW_BUILD_ID , &len); +if (IS_ERR (info)) +return PTR_ERR (info); + + *id = info->id; + +return 0 ; +} +EXPORT_SYMBOL_GPL (qcom_smem_get_msm_id); +static int qcom_smem_get_sbl_version (struct qcom_smem *smem) {struct smem_header *header;
include/linux/soc/qcom/smem.h +2 -0
@@ -11,4 +11,6 @@ int qcom_smem_get_free_space(unsigned host);phys_addr_t qcom_smem_virt_to_phys (void *p); +int qcom_smem_get_msm_id (u32 *id); +#endif
Signature · 1 line
2.40.1
Re: [PATCH v3 3/5] soc: qcom: smem: introduce qcom_smem_get_msm_id()
Quoted 34 lines · Robert Marko
Introduce a helper to return the SoC SMEM ID, which is used to identify the exact SoC model as there may be differences in the same SoC family.
Currently, cpufreq-nvmem does this completely in the driver and there has been more interest expresed for other drivers to use this information so lets expose a common helper to prevent redoing it in individual drivers since this field is present on every SMEM table version.
Signed-off-by Robert Marko <[email protected]>---
Changes in v3:
* Change export toEXPORT_SYMBOL_GPL
* Use an argument for returning SoC ID
* Update kerneldoc--- drivers/soc/qcom/smem.c | 24 ++++++++++++++++++++++++ include/linux/soc/qcom/smem.h | 2 ++ 2 files changed, 26 insertions(+)drivers/soc/qcom/smem.c +1
-0@@ -14,6 +14,7 @@#include <linux/sizes.h> #include <linux/slab.h> #include <linux/soc/qcom/smem.h> +#include <linux/soc/qcom/socinfo.h> /* * The Qualcomm shared memory system is a allocate only heap structure that @@ -772,6 +773,29 @@ phys_addr_t qcom_smem_virt_to_phys(void *p) }EXPORT_SYMBOL_GPL (qcom_smem_virt_to_phys);
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 784
Quoted 10 lines
drivers/soc/qcom/smem.c +9
-0+/** +* qcom_smem_get_msm_id() - return the SoC ID +* @id: On success, we return the SoC ID here. +* +* Look up SoC ID from HW/SW build ID and return it. +* +* Return: 0 on success, negative errno on failure. +*/ +int qcom_smem_get_msm_id (u32 *id)
I think, MSM is not the only platform which will leverage this API. qcom_smem_get_soc_id() / qcom_smem_get_cpu_id() would make more sense than qcom_smem_get_msm_id() ?
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 789
Quoted 5 lines
drivers/soc/qcom/smem.c +5
-0+{ +size_t len; +struct socinfo *info; + + info =qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_HW_SW_BUILD_ID , &len);
len is unused after this, can we just pass NULL? Did a quick check on the code, if we pass the address, size of the item will be updated, else no.
Quoted 23 lines
drivers/soc/qcom/smem.c +9
-0+if (IS_ERR (info)) +return PTR_ERR (info); + + *id = info->id; + +return 0 ; +} +EXPORT_SYMBOL_GPL (qcom_smem_get_msm_id); +static int qcom_smem_get_sbl_version (struct qcom_smem *smem) {struct smem_header *header;include/linux/soc/qcom/smem.h +2
-0@@ -11,4 +11,6 @@ int qcom_smem_get_free_space(unsigned host);phys_addr_t qcom_smem_virt_to_phys (void *p); +int qcom_smem_get_msm_id (u32 *id); +#endif
Re: [PATCH v3 3/5] soc: qcom: smem: introduce qcom_smem_get_msm_id()
Quoted 38 lines · Kathiravan T
Quoted 35 lines · Robert Marko
Introduce a helper to return the SoC SMEM ID, which is used to identify the exact SoC model as there may be differences in the same SoC family.
Currently, cpufreq-nvmem does this completely in the driver and there has been more interest expresed for other drivers to use this information so lets expose a common helper to prevent redoing it in individual drivers since this field is present on every SMEM table version.
Signed-off-by Robert Marko <[email protected]>---
Changes in v3:
* Change export toEXPORT_SYMBOL_GPL
* Use an argument for returning SoC ID
* Update kerneldoc--- drivers/soc/qcom/smem.c | 24 ++++++++++++++++++++++++ include/linux/soc/qcom/smem.h | 2 ++ 2 files changed, 26 insertions(+)drivers/soc/qcom/smem.c +1
-0@@ -14,6 +14,7 @@#include <linux/sizes.h> #include <linux/slab.h> #include <linux/soc/qcom/smem.h> +#include <linux/soc/qcom/socinfo.h> /* * The Qualcomm shared memory system is a allocate only heap structure that @@ -772,6 +773,29 @@ phys_addr_t qcom_smem_virt_to_phys(void *p) }EXPORT_SYMBOL_GPL (qcom_smem_virt_to_phys);
Quoted 14 lines
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 784
Quoted 9 lines
drivers/soc/qcom/smem.c +9
-0+/** +* qcom_smem_get_msm_id() - return the SoC ID +* @id: On success, we return the SoC ID here. +* +* Look up SoC ID from HW/SW build ID and return it. +* +* Return: 0 on success, negative errno on failure. +*/ +int qcom_smem_get_msm_id (u32 *id)I think, MSM is not the only platform which will leverage this API.
qcom_smem_get_soc_id()/qcom_smem_get_cpu_id()would make more sense thanqcom_smem_get_msm_id()?
I agree, qcom_smem_get_soc_id() sounds better to me as its not just MSM parts.
Quoted 11 lines
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 789
Quoted 7 lines
drivers/soc/qcom/smem.c +5
-0+{ +size_t len; +struct socinfo *info; + + info =qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_HW_SW_BUILD_ID , &len);len is unused after this, can we just pass NULL? Did a quick check on the code, if we pass the address, size of the item will be updated, else no.
Yes, indeed passing NULL works here for the simple case this helper is handling. Will address in v4.
Regards,
Robert
Quoted 25 lines
Quoted 25 lines
drivers/soc/qcom/smem.c +9
-0+if (IS_ERR (info)) +return PTR_ERR (info); + + *id = info->id; + +return 0 ; +} +EXPORT_SYMBOL_GPL (qcom_smem_get_msm_id); +static int qcom_smem_get_sbl_version (struct qcom_smem *smem) {struct smem_header *header;include/linux/soc/qcom/smem.h +2
-0@@ -11,4 +11,6 @@ int qcom_smem_get_free_space(unsigned host);phys_addr_t qcom_smem_virt_to_phys (void *p); +int qcom_smem_get_msm_id (u32 *id); +#endif
Re: [PATCH v3 3/5] soc: qcom: smem: introduce qcom_smem_get_msm_id()
Quoted 67 lines · Robert Marko
Quoted 38 lines · Kathiravan T
Quoted 35 lines · Robert Marko
Introduce a helper to return the SoC SMEM ID, which is used to identify the exact SoC model as there may be differences in the same SoC family.
Currently, cpufreq-nvmem does this completely in the driver and there has been more interest expresed for other drivers to use this information so lets expose a common helper to prevent redoing it in individual drivers since this field is present on every SMEM table version.
Signed-off-by Robert Marko <[email protected]>---
Changes in v3:
* Change export toEXPORT_SYMBOL_GPL
* Use an argument for returning SoC ID
* Update kerneldoc--- drivers/soc/qcom/smem.c | 24 ++++++++++++++++++++++++ include/linux/soc/qcom/smem.h | 2 ++ 2 files changed, 26 insertions(+)drivers/soc/qcom/smem.c +1
-0@@ -14,6 +14,7 @@#include <linux/sizes.h> #include <linux/slab.h> #include <linux/soc/qcom/smem.h> +#include <linux/soc/qcom/socinfo.h> /* * The Qualcomm shared memory system is a allocate only heap structure that @@ -772,6 +773,29 @@ phys_addr_t qcom_smem_virt_to_phys(void *p) }EXPORT_SYMBOL_GPL (qcom_smem_virt_to_phys);Quoted 14 lines
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 784
Quoted 9 lines
drivers/soc/qcom/smem.c +9
-0+/** +* qcom_smem_get_msm_id() - return the SoC ID +* @id: On success, we return the SoC ID here. +* +* Look up SoC ID from HW/SW build ID and return it. +* +* Return: 0 on success, negative errno on failure. +*/ +int qcom_smem_get_msm_id (u32 *id)I think, MSM is not the only platform which will leverage this API.
qcom_smem_get_soc_id()/qcom_smem_get_cpu_id()would make more sense thanqcom_smem_get_msm_id()?I agree,
qcom_smem_get_soc_id()sounds better to me as its not just MSM parts.Quoted 11 lines
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 789
Quoted 7 lines
drivers/soc/qcom/smem.c +5
-0+{ +size_t len; +struct socinfo *info; + + info =qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_HW_SW_BUILD_ID , &len);len is unused after this, can we just pass NULL? Did a quick check on the code, if we pass the address, size of the item will be updated, else no.
Quoted 2 lines
Yes, indeed passing NULL works here for the simple case this helper is handling. Will address in v4.
Please also consider Bjorn's suggestion of using PTR_ERR
Konrad
Quoted 28 lines
Regards,
RobertQuoted 25 lines
Quoted 25 lines
drivers/soc/qcom/smem.c +9
-0+if (IS_ERR (info)) +return PTR_ERR (info); + + *id = info->id; + +return 0 ; +} +EXPORT_SYMBOL_GPL (qcom_smem_get_msm_id); +static int qcom_smem_get_sbl_version (struct qcom_smem *smem) {struct smem_header *header;include/linux/soc/qcom/smem.h +2
-0@@ -11,4 +11,6 @@ int qcom_smem_get_free_space(unsigned host);phys_addr_t qcom_smem_virt_to_phys (void *p); +int qcom_smem_get_msm_id (u32 *id); +#endif
Re: [PATCH v3 3/5] soc: qcom: smem: introduce qcom_smem_get_msm_id()
Quoted 70 lines · Konrad Dybcio
Quoted 67 lines · Robert Marko
Quoted 38 lines · Kathiravan T
Quoted 35 lines · Robert Marko
Introduce a helper to return the SoC SMEM ID, which is used to identify the exact SoC model as there may be differences in the same SoC family.
Currently, cpufreq-nvmem does this completely in the driver and there has been more interest expresed for other drivers to use this information so lets expose a common helper to prevent redoing it in individual drivers since this field is present on every SMEM table version.
Signed-off-by Robert Marko <[email protected]>---
Changes in v3:
* Change export toEXPORT_SYMBOL_GPL
* Use an argument for returning SoC ID
* Update kerneldoc--- drivers/soc/qcom/smem.c | 24 ++++++++++++++++++++++++ include/linux/soc/qcom/smem.h | 2 ++ 2 files changed, 26 insertions(+)drivers/soc/qcom/smem.c +1
-0@@ -14,6 +14,7 @@#include <linux/sizes.h> #include <linux/slab.h> #include <linux/soc/qcom/smem.h> +#include <linux/soc/qcom/socinfo.h> /* * The Qualcomm shared memory system is a allocate only heap structure that @@ -772,6 +773,29 @@ phys_addr_t qcom_smem_virt_to_phys(void *p) }EXPORT_SYMBOL_GPL (qcom_smem_virt_to_phys);Quoted 14 lines
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 784
Quoted 9 lines
drivers/soc/qcom/smem.c +9
-0+/** +* qcom_smem_get_msm_id() - return the SoC ID +* @id: On success, we return the SoC ID here. +* +* Look up SoC ID from HW/SW build ID and return it. +* +* Return: 0 on success, negative errno on failure. +*/ +int qcom_smem_get_msm_id (u32 *id)I think, MSM is not the only platform which will leverage this API.
qcom_smem_get_soc_id()/qcom_smem_get_cpu_id()would make more sense thanqcom_smem_get_msm_id()?I agree,
qcom_smem_get_soc_id()sounds better to me as its not just MSM parts.Quoted 11 lines
drivers/soc/qcom/smem.c phys_addr_t qcom_smem_virt_to_phys(void *p) · line 789
Quoted 7 lines
drivers/soc/qcom/smem.c +5
-0+{ +size_t len; +struct socinfo *info; + + info =qcom_smem_get (QCOM_SMEM_HOST_ANY ,SMEM_HW_SW_BUILD_ID , &len);len is unused after this, can we just pass NULL? Did a quick check on the code, if we pass the address, size of the item will be updated, else no.
Quoted 3 lines
Quoted 2 lines
Yes, indeed passing NULL works here for the simple case this helper is handling. Will address in v4.
Please also consider Bjorn's suggestion of using
PTR_ERR
Nevermind, brain too laggy ;)
Konrad
Quoted 30 lines
Konrad
Quoted 28 lines
Regards,
RobertQuoted 25 lines
Quoted 25 lines
drivers/soc/qcom/smem.c +9
-0+if (IS_ERR (info)) +return PTR_ERR (info); + + *id = info->id; + +return 0 ; +} +EXPORT_SYMBOL_GPL (qcom_smem_get_msm_id); +static int qcom_smem_get_sbl_version (struct qcom_smem *smem) {struct smem_header *header;include/linux/soc/qcom/smem.h +2
-0@@ -11,4 +11,6 @@ int qcom_smem_get_free_space(unsigned host);phys_addr_t qcom_smem_virt_to_phys (void *p); +int qcom_smem_get_msm_id (u32 *id); +#endif
PATCH v3 4/5 cpufreq: qcom-nvmem: use SoC ID-s from bindings
In reply to Robert MarkoSMEM SoC ID-s are now stored in DT bindings so lets use those instead of defining them in the driver again.
--- drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/cpufreq/qcom-cpufreq-nvmem.c +5 -10
@@ -31,12 +31,7 @@#define MSM_ID_SMEM 137 -enum _msm_id { -MSM8996V3 =0xF6ul , -APQ8096V3 =0x123ul , -MSM8996SG =0x131ul , -APQ8096SG =0x138ul , -}; +#include <dt-bindings/arm/qcom,ids.h> enum _msm8996_version {MSM8996_V3 ,
@@ -154,12 +149,12 @@ static enum _msm8996_version qcom_cpufreq_get_msm_id(void) msm_id++;switch ((enum _msm_id )*msm_id) { -case MSM8996V3 : -case APQ8096V3 : +case QCOM_ID_MSM8996 : +case QCOM_ID_APQ8096 : version =MSM8996_V3 ;break ; -case MSM8996SG : -case APQ8096SG : +case QCOM_ID_MSM8996SG : +case QCOM_ID_APQ8096SG : version =MSM8996_SG ;break ;default :
Signature · 1 line
2.40.1
PATCH v3 5/5 cpufreq: qcom-nvmem: use helper to get SMEM SoC ID
In reply to Robert MarkoNow 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_msm_id().
---
Changes in v3:
* Adapt to helper using argument now
Changes in v2:
* Utilize helper exported by SMEM instead of refactoring qcom_cpufreq_get_msm_id()
--- drivers/cpufreq/qcom-cpufreq-nvmem.c | 56 +++++----------------------- 1 file changed, 10 insertions(+), 46 deletions(-)
drivers/cpufreq/qcom-cpufreq-nvmem.c +10 -46
@@ -29,16 +29,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 {
@@ -135,60 +127,32 @@ static void get_krait_bin_format_b(struct device *cpu_dev,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_msm_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 :
Signature · 1 line
2.40.1