From 648fe99e9f9058368c8cdbbe128929591fd87fc7 Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Fri, 20 May 2016 07:05:00 -0700 Subject: [PATCH] zynqmp: Ignore the revision field of the IDCODE The revision field may change between silicon revisions without changing the mapping to a part. This avoids errors like: ERROR: Incorrect XILINX IDCODE 0x14738093, maskid 0x4600093 NOTICE: ATF running on XCZUUNKN/EP108 v3/RTL5.1 at 0xfffe5000 on parts with a newer revision. Reported-by: Love Kumar Signed-off-by: Soren Brinkmann Acked-by: Alistair Francis Tested-by: Love Kumar --- plat/xilinx/zynqmp/aarch64/zynqmp_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index 21d62570..aefc827c 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -183,11 +183,9 @@ static char *zynqmp_print_silicon_idcode(void) tmp = id; tmp &= ZYNQMP_CSU_IDCODE_XILINX_ID_MASK | - ZYNQMP_CSU_IDCODE_FAMILY_MASK | - ZYNQMP_CSU_IDCODE_REVISION_MASK; + ZYNQMP_CSU_IDCODE_FAMILY_MASK; maskid = ZYNQMP_CSU_IDCODE_XILINX_ID << ZYNQMP_CSU_IDCODE_XILINX_ID_SHIFT | - ZYNQMP_CSU_IDCODE_FAMILY << ZYNQMP_CSU_IDCODE_FAMILY_SHIFT | - ZYNQMP_CSU_IDCODE_REVISION << ZYNQMP_CSU_IDCODE_REVISION_SHIFT; + ZYNQMP_CSU_IDCODE_FAMILY << ZYNQMP_CSU_IDCODE_FAMILY_SHIFT; if (tmp != maskid) { ERROR("Incorrect XILINX IDCODE 0x%x, maskid 0x%x\n", id, maskid); return "UNKN"; -- 2.30.2