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

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

Merge changes I6d64d788,I3298e366,I7effdabb into msm-next

* changes:
  defconfig: arm64: Enable LLCC_EDAC for sdm855 SoC
  drivers: edac: Remove dependency on EDAC_MM_EDAC for LLCC_EDAC
  defconfig: arm64: Enable LLCC driver for sdm855
parents 7d6e5411 210dcb9e
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ CONFIG_ION_MSM=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK_QCOM=y
CONFIG_ARM_SMMU=y
CONFIG_QCOM_LLCC=y
CONFIG_QCOM_SDM855_LLCC=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SCM=y
CONFIG_IIO=y
+5 −0
Original line number Diff line number Diff line
@@ -309,6 +309,9 @@ CONFIG_EDAC=y
CONFIG_EDAC_KRYO_ARM64=y
CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
CONFIG_EDAC_KRYO_ARM64_PANIC_ON_UE=y
CONFIG_EDAC_QCOM_LLCC=y
CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE=y
CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y
CONFIG_RTC_CLASS=y
CONFIG_DMADEVICES=y
CONFIG_UIO=y
@@ -319,6 +322,8 @@ CONFIG_ION_MSM=y
CONFIG_HWSPINLOCK=y
CONFIG_HWSPINLOCK_QCOM=y
CONFIG_ARM_SMMU=y
CONFIG_QCOM_LLCC=y
CONFIG_QCOM_SDM855_LLCC=y
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SCM=y
CONFIG_IIO=y
+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ config EDAC_XGENE
	  APM X-Gene family of SOCs.

config EDAC_QCOM_LLCC
	depends on EDAC_MM_EDAC && QCOM_LLCC
	depends on QCOM_LLCC
	tristate "QCOM LLCC Caches"
	help
	  Support for error detection and correction on the
+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
#include <linux/interrupt.h>
#include "edac_core.h"
#include "edac_mc.h"
#include "edac_device.h"

#ifdef CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE
#define LLCC_ERP_PANIC_ON_CE 1