diff mbox series

[4/6] soc: qcom: Add LLCC support for multi channel DDR

Message ID 20230810061140.15608-5-quic_kbajaj@quicinc.com
State Superseded
Headers show
Series soc: qcom: llcc: Add support for QDU1000/QRU1000 | expand

Commit Message

Komal Bajaj Aug. 10, 2023, 6:11 a.m. UTC 
Add LLCC support for multi channel DDR configuration
based on a feature register.

Signed-off-by: Komal Bajaj <quic_kbajaj@quicinc.com>
---
 drivers/soc/qcom/llcc-qcom.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

--
2.41.0

Comments

Komal Bajaj Aug. 24, 2023, 8:58 a.m. UTC | #1 
On 8/10/2023 6:02 PM, Bryan O'Donoghue wrote:
> On 10/08/2023 07:11, Komal Bajaj wrote:
>> +    ret = nvmem_cell_read_u8(&pdev->dev, "multi-chan-ddr", cfg_index);
>> +    if (ret == -ENOENT || ret == -EOPNOTSUPP) {
>> +        if (num_config != DEF_NUM_CFG)
>> +            return -EINVAL;
>
> In other words if multi-chan-ddr is not present in the dts and the 
> num_config != 1 return -EINVAL
>
> You can just as easily say if (num_config > 1) and drop the define 
> from this code.

Sure, will make the suggested changes.

>
>> +        *cfg_index = DEF_NUM_CFG - 1;
>> +        return 0;
>
> *cfg_index = 0;
>
> For example if #define DEF_NUM_CFG 0x20 then taking the last index of 
> it would be 100% wrong.
>
> Please kill that define.

Will remove the macro.

>
> ---
> bod
diff mbox series

Patch

diff --git a/drivers/soc/qcom/llcc-qcom.c b/drivers/soc/qcom/llcc-qcom.c
index 76e8083d053d..4fad2cff5e1e 100644
--- a/drivers/soc/qcom/llcc-qcom.c
+++ b/drivers/soc/qcom/llcc-qcom.c
@@ -12,6 +12,7 @@ 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/nvmem-consumer.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/regmap.h>
@@ -998,6 +999,24 @@  static int qcom_llcc_cfg_program(struct platform_device *pdev,
 	return ret;
 }

+static int qcom_llcc_get_cfg_index(struct platform_device *pdev, u8 *cfg_index, int num_config)
+{
+	int ret;
+
+	ret = nvmem_cell_read_u8(&pdev->dev, "multi-chan-ddr", cfg_index);
+	if (ret == -ENOENT || ret == -EOPNOTSUPP) {
+		if (num_config != DEF_NUM_CFG)
+			return -EINVAL;
+		*cfg_index = DEF_NUM_CFG - 1;
+		return 0;
+	}
+
+	if (!ret && *cfg_index >= num_config)
+		ret = -EINVAL;
+
+	return ret;
+}
+
 static int qcom_llcc_remove(struct platform_device *pdev)
 {
 	/* Set the global pointer to a error code to avoid referencing it */
@@ -1034,6 +1053,7 @@  static int qcom_llcc_probe(struct platform_device *pdev)
 	const struct qcom_llcc_config *cfg;
 	const struct llcc_slice_config *llcc_cfg;
 	u32 sz;
+	u8 cfg_index;
 	u32 version;
 	struct regmap *regmap;

@@ -1051,11 +1071,14 @@  static int qcom_llcc_probe(struct platform_device *pdev)
 	}

 	cfgs = of_device_get_match_data(&pdev->dev);
-	if (!cfgs || cfgs->num_config != DEF_NUM_CFG) {
+	if (!cfgs) {
 		ret = -EINVAL;
 		goto err;
 	}
-	cfg = &cfgs->llcc_config[DEF_NUM_CFG - 1];
+	ret = qcom_llcc_get_cfg_index(pdev, &cfg_index, cfgs->num_config);
+	if (ret)
+		goto err;
+	cfg = &cfgs->llcc_config[cfg_index];

 	ret = regmap_read(regmap, cfg->reg_offset[LLCC_COMMON_STATUS0], &num_banks);
 	if (ret)