From 401f6ee66895c387f26290d33084e6d40747ff81 Mon Sep 17 00:00:00 2001 From: Rishabh Bhatnagar Date: Thu, 7 Feb 2019 16:59:13 -0800 Subject: [PATCH 1/2] drivers: edac: Avoid configuring interrupt register in polling mode Interrupt enable register configuration is only needed for interrupt mode, So avoid interrupt configuration in the polling mode. Change-Id: I0cb9f50573deb580254aebceeee3883d98f6ff85 Signed-off-by: Rishabh Bhatnagar Signed-off-by: Prakruthi Deepak Heragu --- drivers/soc/qcom/llcc-slice.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/soc/qcom/llcc-slice.c b/drivers/soc/qcom/llcc-slice.c index 4dc680e1b173..9dcb6134156d 100644 --- a/drivers/soc/qcom/llcc-slice.c +++ b/drivers/soc/qcom/llcc-slice.c @@ -469,13 +469,11 @@ int qcom_llcc_probe(struct platform_device *pdev, } drv_data->ecc_irq = platform_get_irq(pdev, 0); - if (drv_data->ecc_irq >= 0) { - llcc_edac = platform_device_register_data(&pdev->dev, - "qcom_llcc_edac", -1, drv_data, - sizeof(*drv_data)); - if (IS_ERR(llcc_edac)) - dev_err(dev, "Failed to register llcc edac driver\n"); - } + llcc_edac = platform_device_register_data(&pdev->dev, + "qcom_llcc_edac", -1, drv_data, + sizeof(*drv_data)); + if (IS_ERR(llcc_edac)) + dev_err(dev, "Failed to register llcc edac driver\n"); llcc_perfmon = platform_device_register_data(&pdev->dev, "qcom_llcc_perfmon", -1, From 0cb0d8a9f545494d4b987c8667cacad513ba7fb5 Mon Sep 17 00:00:00 2001 From: Prakruthi Deepak Heragu Date: Thu, 6 Feb 2020 15:30:37 -0800 Subject: [PATCH 2/2] defconfig: lahaina: Enable CONFIG_EDAC_QGKI flag Enable CONFIG_EDAC_QGKI flag in non GKI variants to use defer work feature for EDAC. Change-Id: I8debaa58d36988a60a346ffdaf8d736abd2384d3 Signed-off-by: Prakruthi Deepak Heragu --- arch/arm64/configs/vendor/lahaina_QGKI.config | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config index c100ff72d0b9..89c1e0f7be37 100644 --- a/arch/arm64/configs/vendor/lahaina_QGKI.config +++ b/arch/arm64/configs/vendor/lahaina_QGKI.config @@ -69,6 +69,7 @@ CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y CONFIG_DEVFREQ_GOV_MEMLAT=y CONFIG_DEVFREQ_SIMPLE_DEV=y CONFIG_EDAC_QCOM=y +CONFIG_EDAC_QGKI=y CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y CONFIG_QCOM_DEVFREQ_ICC=y CONFIG_QCOM_LLCC_PMU=y