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

Merge tag 'edac_urgent_for_v6.7_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC fix from Borislav Petkov:

 - A single fix for the EDAC Versal driver to read out register fields
   properly

* tag 'edac_urgent_for_v6.7_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/versal: Read num_csrows and num_chans using the correct bitfield macro
parents 5ef3720d 9483aa44

drivers/edac/versal_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -966,10 +966,10 @@ static int mc_probe(struct platform_device *pdev) 
	edac_mc_id = emif_get_id(pdev->dev.of_node);



	regval = readl(ddrmc_baseaddr + XDDR_REG_CONFIG0_OFFSET);

	num_chans = FIELD_PREP(XDDR_REG_CONFIG0_NUM_CHANS_MASK, regval);

	num_chans = FIELD_GET(XDDR_REG_CONFIG0_NUM_CHANS_MASK, regval);

	num_chans++;



	num_csrows = FIELD_PREP(XDDR_REG_CONFIG0_NUM_RANKS_MASK, regval);

	num_csrows = FIELD_GET(XDDR_REG_CONFIG0_NUM_RANKS_MASK, regval);

	num_csrows *= 2;

	if (!num_csrows)

		num_csrows = 1;