Commit 916c0c05 authored by Sai Prakash Ranjan's avatar Sai Prakash Ranjan Committed by Bjorn Andersson

soc: qcom: llcc-qcom: Extract major hardware version

The major hardware version of the LLCC IP is encoded in its
LLCC_COMMON_HW_INFO register. Extract the version and cache it in the
driver data so that it can be used to implement version specific
functionality like enabling Write sub cache for given SCID.
Signed-off-by: default avatarSai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
[mani: splitted the version extract as a single patch and few cleanups]
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20201130093924.45057-4-manivannan.sadhasivam@linaro.orgSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent f426c3b1
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* *
*/ */
#include <linux/bitfield.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/device.h> #include <linux/device.h>
...@@ -35,6 +36,9 @@ ...@@ -35,6 +36,9 @@
#define CACHE_LINE_SIZE_SHIFT 6 #define CACHE_LINE_SIZE_SHIFT 6
#define LLCC_COMMON_HW_INFO 0x00030000
#define LLCC_MAJOR_VERSION_MASK GENMASK(31, 24)
#define LLCC_COMMON_STATUS0 0x0003000c #define LLCC_COMMON_STATUS0 0x0003000c
#define LLCC_LB_CNT_MASK GENMASK(31, 28) #define LLCC_LB_CNT_MASK GENMASK(31, 28)
#define LLCC_LB_CNT_SHIFT 28 #define LLCC_LB_CNT_SHIFT 28
...@@ -476,6 +480,7 @@ static int qcom_llcc_probe(struct platform_device *pdev) ...@@ -476,6 +480,7 @@ static int qcom_llcc_probe(struct platform_device *pdev)
const struct qcom_llcc_config *cfg; const struct qcom_llcc_config *cfg;
const struct llcc_slice_config *llcc_cfg; const struct llcc_slice_config *llcc_cfg;
u32 sz; u32 sz;
u32 version;
drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL); drv_data = devm_kzalloc(dev, sizeof(*drv_data), GFP_KERNEL);
if (!drv_data) { if (!drv_data) {
...@@ -496,6 +501,13 @@ static int qcom_llcc_probe(struct platform_device *pdev) ...@@ -496,6 +501,13 @@ static int qcom_llcc_probe(struct platform_device *pdev)
goto err; goto err;
} }
/* Extract major version of the IP */
ret = regmap_read(drv_data->bcast_regmap, LLCC_COMMON_HW_INFO, &version);
if (ret)
goto err;
drv_data->major_version = FIELD_GET(LLCC_MAJOR_VERSION_MASK, version);
ret = regmap_read(drv_data->regmap, LLCC_COMMON_STATUS0, ret = regmap_read(drv_data->regmap, LLCC_COMMON_STATUS0,
&num_banks); &num_banks);
if (ret) if (ret)
......
...@@ -79,6 +79,7 @@ struct llcc_edac_reg_data { ...@@ -79,6 +79,7 @@ struct llcc_edac_reg_data {
* @bitmap: Bit map to track the active slice ids * @bitmap: Bit map to track the active slice ids
* @offsets: Pointer to the bank offsets array * @offsets: Pointer to the bank offsets array
* @ecc_irq: interrupt for llcc cache error detection and reporting * @ecc_irq: interrupt for llcc cache error detection and reporting
* @major_version: Indicates the LLCC major version
*/ */
struct llcc_drv_data { struct llcc_drv_data {
struct regmap *regmap; struct regmap *regmap;
...@@ -91,6 +92,7 @@ struct llcc_drv_data { ...@@ -91,6 +92,7 @@ struct llcc_drv_data {
unsigned long *bitmap; unsigned long *bitmap;
u32 *offsets; u32 *offsets;
int ecc_irq; int ecc_irq;
u32 major_version;
}; };
#if IS_ENABLED(CONFIG_QCOM_LLCC) #if IS_ENABLED(CONFIG_QCOM_LLCC)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment