Applied to drm-misc-next
On 10/1/2025 9:47 AM, Karol Wachowski wrote: > Reviewed-by: Karol Wachowski <[email protected]> > > On 9/25/2025 4:50 PM, Maciej Falkowski wrote: >> From: Tomasz Rusinowicz <[email protected]> >> >> Add new boot parameter for NPU5+ that enables >> ECC signalling for on-chip memory based on the value >> of MSR_INTEGRITY_CAPS register. >> >> Signed-off-by: Tomasz Rusinowicz <[email protected]> >> Signed-off-by: Maciej Falkowski <[email protected]> >> --- >> drivers/accel/ivpu/ivpu_fw.c | 4 ++++ >> drivers/accel/ivpu/ivpu_hw.c | 23 +++++++++++++++++++++++ >> drivers/accel/ivpu/ivpu_hw.h | 1 + >> 3 files changed, 28 insertions(+) >> >> diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c >> index b81bd143a285..be1290be77fd 100644 >> --- a/drivers/accel/ivpu/ivpu_fw.c >> +++ b/drivers/accel/ivpu/ivpu_fw.c >> @@ -606,6 +606,8 @@ static void ivpu_fw_boot_params_print(struct ivpu_device >> *vdev, struct vpu_boot_ >> boot_params->system_time_us); >> ivpu_dbg(vdev, FW_BOOT, "boot_params.power_profile = 0x%x\n", >> boot_params->power_profile); >> + ivpu_dbg(vdev, FW_BOOT, "boot_params.vpu_uses_ecc_mca_signal = 0x%x\n", >> + boot_params->vpu_uses_ecc_mca_signal); >> } >> >> void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct >> vpu_boot_params *boot_params) >> @@ -708,6 +710,8 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, >> struct vpu_boot_params >> boot_params->d0i3_entry_vpu_ts = 0; >> if (IVPU_WA(disable_d0i2)) >> boot_params->power_profile |= BIT(1); >> + boot_params->vpu_uses_ecc_mca_signal = >> + ivpu_hw_uses_ecc_mca_signal(vdev) ? VPU_BOOT_MCA_ECC_BOTH : 0; >> >> boot_params->system_time_us = ktime_to_us(ktime_get_real()); >> wmb(); /* Flush WC buffers after writing bootparams */ >> diff --git a/drivers/accel/ivpu/ivpu_hw.c b/drivers/accel/ivpu/ivpu_hw.c >> index 8dbf8780920a..d69cd0d93569 100644 >> --- a/drivers/accel/ivpu/ivpu_hw.c >> +++ b/drivers/accel/ivpu/ivpu_hw.c >> @@ -8,6 +8,8 @@ >> #include "ivpu_hw_btrs.h" >> #include "ivpu_hw_ip.h" >> >> +#include <asm/msr-index.h> >> +#include <asm/msr.h> >> #include <linux/dmi.h> >> #include <linux/fault-inject.h> >> #include <linux/pm_runtime.h> >> @@ -22,6 +24,8 @@ MODULE_PARM_DESC(fail_hw, >> "<interval>,<probability>,<space>,<times>"); >> >> #define FW_SHARED_MEM_ALIGNMENT SZ_512K /* VPU MTRR limitation */ >> >> +#define ECC_MCA_SIGNAL_ENABLE_MASK 0xff >> + >> static char *platform_to_str(u32 platform) >> { >> switch (platform) { >> @@ -395,3 +399,22 @@ irqreturn_t ivpu_hw_irq_handler(int irq, void *ptr) >> pm_runtime_mark_last_busy(vdev->drm.dev); >> return IRQ_HANDLED; >> } >> + >> +bool ivpu_hw_uses_ecc_mca_signal(struct ivpu_device *vdev) >> +{ >> + unsigned long long msr_integrity_caps; >> + int ret; >> + >> + if (ivpu_hw_ip_gen(vdev) < IVPU_HW_IP_50XX) >> + return false; >> + >> + ret = rdmsrq_safe(MSR_INTEGRITY_CAPS, &msr_integrity_caps); >> + if (ret) { >> + ivpu_warn(vdev, "Error reading MSR_INTEGRITY_CAPS: %d", ret); >> + return false; >> + } >> + >> + ivpu_dbg(vdev, MISC, "MSR_INTEGRITY_CAPS: 0x%llx\n", >> msr_integrity_caps); >> + >> + return msr_integrity_caps & ECC_MCA_SIGNAL_ENABLE_MASK; >> +} >> diff --git a/drivers/accel/ivpu/ivpu_hw.h b/drivers/accel/ivpu/ivpu_hw.h >> index 511a1a29f7f6..b6d0f0d0dccc 100644 >> --- a/drivers/accel/ivpu/ivpu_hw.h >> +++ b/drivers/accel/ivpu/ivpu_hw.h >> @@ -63,6 +63,7 @@ void ivpu_irq_handlers_init(struct ivpu_device *vdev); >> void ivpu_hw_irq_enable(struct ivpu_device *vdev); >> void ivpu_hw_irq_disable(struct ivpu_device *vdev); >> irqreturn_t ivpu_hw_irq_handler(int irq, void *ptr); >> +bool ivpu_hw_uses_ecc_mca_signal(struct ivpu_device *vdev); >> >> static inline u32 ivpu_hw_btrs_irq_handler(struct ivpu_device *vdev, int >> irq) >> {
