Skip to content

Commit 3bd2706

Browse files
Sai Krishna Potthuribp3tk0v
authored andcommitted
EDAC/zynqmp: Add EDAC support for Xilinx ZynqMP OCM
Add EDAC support for Xilinx ZynqMP OCM Controller, so this driver reports CE and UE errors upon interrupt generation. Also add debugfs files for error injection. On Xilinx ZynqMP platform, both OCM Controller driver(zynqmp_edac) and DDR Memory Controller driver(synopsys_edac) co-exist which means both can be loaded at a time. This scenario is tested on Xilinx ZynqMP platform. Fix following issue reported by the robot: "MAINTAINERS references a file that doesn't exist: Documentation/devicetree/bindings/edac/xlnx,zynqmp-ocmc.yaml" [ bp: - Massage commit message - s/EDAC_ZYNQMP_OCM/EDAC_ZYNQMP/ - Touchups ] Reported-by: kernel test robot <lkp@intel.com> Co-developed-by: Shubhrajyoti Datta <shubhrajyoti.datta@amd.com> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@amd.com> Signed-off-by: Sai Krishna Potthuri <sai.krishna.potthuri@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20230104084512.1855243-3-sai.krishna.potthuri@amd.com
1 parent c67ea7d commit 3bd2706

File tree

4 files changed

+483
-0
lines changed

4 files changed

+483
-0
lines changed

‎MAINTAINERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22908,6 +22908,13 @@ F: Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml
2290822908
F: drivers/dma/xilinx/xilinx_dpdma.c
2290922909
F: include/dt-bindings/dma/xlnx-zynqmp-dpdma.h
2291022910

22911+
XILINX ZYNQMP OCM EDAC DRIVER
22912+
M: Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
22913+
M: Sai Krishna Potthuri <sai.krishna.potthuri@amd.com>
22914+
S: Maintained
22915+
F: Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml
22916+
F: drivers/edac/zynqmp_edac.c
22917+
2291122918
XILINX ZYNQMP PSGTR PHY DRIVER
2291222919
M: Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com>
2291322920
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

‎drivers/edac/Kconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,4 +542,12 @@ config EDAC_DMC520
542542
Support for error detection and correction on the
543543
SoCs with ARM DMC-520 DRAM controller.
544544

545+
config EDAC_ZYNQMP
546+
tristate "Xilinx ZynqMP OCM Controller"
547+
depends on ARCH_ZYNQMP || COMPILE_TEST
548+
help
549+
This driver supports error detection and correction for the
550+
Xilinx ZynqMP OCM (On Chip Memory) controller. It can also be
551+
built as a module. In that case it will be called zynqmp_edac.
552+
545553
endif # EDAC

‎drivers/edac/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,4 @@ obj-$(CONFIG_EDAC_QCOM) += qcom_edac.o
8484
obj-$(CONFIG_EDAC_ASPEED) += aspeed_edac.o
8585
obj-$(CONFIG_EDAC_BLUEFIELD) += bluefield_edac.o
8686
obj-$(CONFIG_EDAC_DMC520) += dmc520_edac.o
87+
obj-$(CONFIG_EDAC_ZYNQMP) += zynqmp_edac.o

0 commit comments

Comments
 (0)