Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e58ae82f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "EDAC: arm64: Add option to panic on correctable errors"

parents adc68821 15c4e160
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -377,6 +377,18 @@ config EDAC_CORTEX_ARM64
	   stability and overall system health, you should probably say 'Y'
	   here.

config EDAC_CORTEX_ARM64_PANIC_ON_CE
	depends on EDAC_CORTEX_ARM64
	bool "Panic on correctable errors"
	help
	   Forcibly cause a kernel panic if an correctable error (CE) is
	   detected, even though the error is (by definition) correctable and
	   would otherwise result in no adverse system effects. This can reduce
	   debugging times on hardware which may be operating at voltages or
	   frequencies outside normal specification.

	   For production builds, you should definitely say 'N' here.

config EDAC_CORTEX_ARM64_PANIC_ON_UE
	depends on EDAC_CORTEX_ARM64
	bool "Panic on uncorrectable errors"
@@ -385,6 +397,6 @@ config EDAC_CORTEX_ARM64_PANIC_ON_UE
	   detected. This can reduce debugging times on hardware which may be
	   operating at voltages or frequencies outside normal specification.

	   For production builds, you should should probably say 'N' here.
	   For production builds, you should probably say 'N' here.

endif # EDAC
+7 −0
Original line number Diff line number Diff line
@@ -88,6 +88,12 @@
#define ARM64_ERP_PANIC_ON_UE 0
#endif

#ifdef CONFIG_EDAC_CORTEX_ARM64_PANIC_ON_CE
#define ARM64_ERP_PANIC_ON_CE 1
#else
#define ARM64_ERP_PANIC_ON_CE 0
#endif

#define EDAC_CPU	"arm64"

enum error_type {
@@ -788,6 +794,7 @@ static int arm64_cpu_erp_probe(struct platform_device *pdev)
	if (rc)
		goto out_mem;

	drv->edev_ctl->panic_on_ce = ARM64_ERP_PANIC_ON_CE;
	drv->edev_ctl->panic_on_ue = ARM64_ERP_PANIC_ON_UE;

	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cci");