Skip to content

Commit ef6a7c2

Browse files
committed
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
2 parents 5ef3720 + 9483aa4 commit ef6a7c2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/edac/versal_edac.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -966,10 +966,10 @@ static int mc_probe(struct platform_device *pdev)
966966
edac_mc_id = emif_get_id(pdev->dev.of_node);
967967

968968
regval = readl(ddrmc_baseaddr + XDDR_REG_CONFIG0_OFFSET);
969-
num_chans = FIELD_PREP(XDDR_REG_CONFIG0_NUM_CHANS_MASK, regval);
969+
num_chans = FIELD_GET(XDDR_REG_CONFIG0_NUM_CHANS_MASK, regval);
970970
num_chans++;
971971

972-
num_csrows = FIELD_PREP(XDDR_REG_CONFIG0_NUM_RANKS_MASK, regval);
972+
num_csrows = FIELD_GET(XDDR_REG_CONFIG0_NUM_RANKS_MASK, regval);
973973
num_csrows *= 2;
974974
if (!num_csrows)
975975
num_csrows = 1;

0 commit comments

Comments
 (0)