Commit b877ca4d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_urgent_for_v5.18_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC fix from Borislav Petkov:

 - Read the reported error count from the proper register on
   synopsys_edac

* tag 'edac_urgent_for_v5.18_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/synopsys: Read the error count from the correct register
parents 9becb688 e2932d1f

drivers/edac/synopsys_edac.c

+11 −5
Original line number Original line Diff line number Diff line
@@ -164,6 +164,11 @@ 
#define ECC_STAT_CECNT_SHIFT		8

#define ECC_STAT_CECNT_SHIFT		8

#define ECC_STAT_BITNUM_MASK		0x7F

#define ECC_STAT_BITNUM_MASK		0x7F





/* ECC error count register definitions */

#define ECC_ERRCNT_UECNT_MASK		0xFFFF0000

#define ECC_ERRCNT_UECNT_SHIFT		16

#define ECC_ERRCNT_CECNT_MASK		0xFFFF



/* DDR QOS Interrupt register definitions */

/* DDR QOS Interrupt register definitions */

#define DDR_QOS_IRQ_STAT_OFST		0x20200

#define DDR_QOS_IRQ_STAT_OFST		0x20200

#define DDR_QOSUE_MASK			0x4

#define DDR_QOSUE_MASK			0x4
@@ -423,15 +428,16 @@ static int zynqmp_get_error_info(struct synps_edac_priv *priv) 
	base = priv->baseaddr;

	base = priv->baseaddr;

	p = &priv->stat;

	p = &priv->stat;





	regval = readl(base + ECC_ERRCNT_OFST);

	p->ce_cnt = regval & ECC_ERRCNT_CECNT_MASK;

	p->ue_cnt = (regval & ECC_ERRCNT_UECNT_MASK) >> ECC_ERRCNT_UECNT_SHIFT;

	if (!p->ce_cnt)

		goto ue_err;



	regval = readl(base + ECC_STAT_OFST);

	regval = readl(base + ECC_STAT_OFST);

	if (!regval)

	if (!regval)

		return 1;

		return 1;





	p->ce_cnt = (regval & ECC_STAT_CECNT_MASK) >> ECC_STAT_CECNT_SHIFT;

	p->ue_cnt = (regval & ECC_STAT_UECNT_MASK) >> ECC_STAT_UECNT_SHIFT;

	if (!p->ce_cnt)

		goto ue_err;



	p->ceinfo.bitpos = (regval & ECC_STAT_BITNUM_MASK);

	p->ceinfo.bitpos = (regval & ECC_STAT_BITNUM_MASK);





	regval = readl(base + ECC_CEADDR0_OFST);

	regval = readl(base + ECC_CEADDR0_OFST);