EDAC/qcom: Make irq configuration optional
On most modern qualcomm SoCs, the configuration necessary to enable the
Tag/Data RAM related irqs being propagated to the SoC irq controller is
already done in firmware (in DSF or 'DDR System Firmware')
On some like the x1e80100, these registers aren't even accesible to the
kernel causing a crash when edac device is probed.
Hence, make the irq configuration optional in the driver and mark x1e80100
as the SoC on which this should be avoided.
Fixes: af16b00578
("arm64: dts: qcom: Add base X1E80100 dtsi and the QCP dts")
Reported-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Rajendra Nayak <quic_rjendra@quicinc.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Abel Vesa <abel.vesa@linaro.org>
Link: https://lore.kernel.org/r/20240903101510.3452734-1-quic_rjendra@quicinc.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
parent
ca61d6836e
commit
0a97195d21
@ -342,9 +342,11 @@ static int qcom_llcc_edac_probe(struct platform_device *pdev)
|
|||||||
int ecc_irq;
|
int ecc_irq;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
rc = qcom_llcc_core_setup(llcc_driv_data, llcc_driv_data->bcast_regmap);
|
if (!llcc_driv_data->ecc_irq_configured) {
|
||||||
if (rc)
|
rc = qcom_llcc_core_setup(llcc_driv_data, llcc_driv_data->bcast_regmap);
|
||||||
return rc;
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
/* Allocate edac control info */
|
/* Allocate edac control info */
|
||||||
edev_ctl = edac_device_alloc_ctl_info(0, "qcom-llcc", 1, "bank",
|
edev_ctl = edac_device_alloc_ctl_info(0, "qcom-llcc", 1, "bank",
|
||||||
|
@ -139,6 +139,7 @@ struct qcom_llcc_config {
|
|||||||
int size;
|
int size;
|
||||||
bool need_llcc_cfg;
|
bool need_llcc_cfg;
|
||||||
bool no_edac;
|
bool no_edac;
|
||||||
|
bool irq_configured;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct qcom_sct_config {
|
struct qcom_sct_config {
|
||||||
@ -718,6 +719,7 @@ static const struct qcom_llcc_config x1e80100_cfg[] = {
|
|||||||
.need_llcc_cfg = true,
|
.need_llcc_cfg = true,
|
||||||
.reg_offset = llcc_v2_1_reg_offset,
|
.reg_offset = llcc_v2_1_reg_offset,
|
||||||
.edac_reg_offset = &llcc_v2_1_edac_reg_offset,
|
.edac_reg_offset = &llcc_v2_1_edac_reg_offset,
|
||||||
|
.irq_configured = true,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1345,6 +1347,7 @@ static int qcom_llcc_probe(struct platform_device *pdev)
|
|||||||
drv_data->cfg = llcc_cfg;
|
drv_data->cfg = llcc_cfg;
|
||||||
drv_data->cfg_size = sz;
|
drv_data->cfg_size = sz;
|
||||||
drv_data->edac_reg_offset = cfg->edac_reg_offset;
|
drv_data->edac_reg_offset = cfg->edac_reg_offset;
|
||||||
|
drv_data->ecc_irq_configured = cfg->irq_configured;
|
||||||
mutex_init(&drv_data->lock);
|
mutex_init(&drv_data->lock);
|
||||||
platform_set_drvdata(pdev, drv_data);
|
platform_set_drvdata(pdev, drv_data);
|
||||||
|
|
||||||
|
@ -125,6 +125,7 @@ struct llcc_edac_reg_offset {
|
|||||||
* @num_banks: Number of llcc banks
|
* @num_banks: Number of llcc banks
|
||||||
* @bitmap: Bit map to track the active slice ids
|
* @bitmap: Bit map to track the active slice ids
|
||||||
* @ecc_irq: interrupt for llcc cache error detection and reporting
|
* @ecc_irq: interrupt for llcc cache error detection and reporting
|
||||||
|
* @ecc_irq_configured: 'True' if firmware has already configured the irq propagation
|
||||||
* @version: Indicates the LLCC version
|
* @version: Indicates the LLCC version
|
||||||
*/
|
*/
|
||||||
struct llcc_drv_data {
|
struct llcc_drv_data {
|
||||||
@ -139,6 +140,7 @@ struct llcc_drv_data {
|
|||||||
u32 num_banks;
|
u32 num_banks;
|
||||||
unsigned long *bitmap;
|
unsigned long *bitmap;
|
||||||
int ecc_irq;
|
int ecc_irq;
|
||||||
|
bool ecc_irq_configured;
|
||||||
u32 version;
|
u32 version;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user