Commit 9ad08c11 authored by Qiuxu Zhuo's avatar Qiuxu Zhuo Committed by Tony Luck
Browse files

EDAC/i10nm: Add Intel Granite Rapids-D support 



The Granite Rapids-D CPU model uses memory controller registers similar
to those of the Granite Rapids server CPU but with a different memory
controller MMIO base.

Add the Granite Rapids-D CPU model ID and use the new memory controller
MMIO base for EDAC support.

Signed-off-by: default avatarQiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Tested-by: default avatarVikasX Chougule <vikasx.chougule@intel.com>
Link: https://lore.kernel.org/r/20250704151609.7833-2-qiuxu.zhuo@intel.com
parent 815703e2

drivers/edac/i10nm_base.c

+11 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
	((GET_BITFIELD(reg, 0, 10) << 12) + 0x140000)



#define I10NM_GNR_IMC_MMIO_OFFSET	0x24c000

#define I10NM_GNR_D_IMC_MMIO_OFFSET	0x206000

#define I10NM_GNR_IMC_MMIO_SIZE		0x4000

#define I10NM_HBM_IMC_MMIO_SIZE		0x9000

#define I10NM_DDR_IMC_CH_CNT(reg)	GET_BITFIELD(reg, 21, 24)
@@ -687,6 +688,14 @@ static struct pci_dev *get_gnr_mdev(struct skx_dev *d, int logical_idx, int *phy 
	return NULL;

}



static u32 get_gnr_imc_mmio_offset(void)

{

	if (boot_cpu_data.x86_vfm == INTEL_GRANITERAPIDS_D)

		return I10NM_GNR_D_IMC_MMIO_OFFSET;



	return I10NM_GNR_IMC_MMIO_OFFSET;

}



/**

 * get_ddr_munit() - Get the resource of the i-th DDR memory controller.

 *
@@ -715,7 +724,7 @@ static struct pci_dev *get_ddr_munit(struct skx_dev *d, int i, u32 *offset, unsi 
			return NULL;



		*offset = I10NM_GET_IMC_MMIO_OFFSET(reg) +

			  I10NM_GNR_IMC_MMIO_OFFSET +

			  get_gnr_imc_mmio_offset() +

			  physical_idx * I10NM_GNR_IMC_MMIO_SIZE;

		*size   = I10NM_GNR_IMC_MMIO_SIZE;
@@ -1030,6 +1039,7 @@ static const struct x86_cpu_id i10nm_cpuids[] = { 
	X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &spr_cfg),

	X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X,  &spr_cfg),

	X86_MATCH_VFM(INTEL_GRANITERAPIDS_X,  &gnr_cfg),

	X86_MATCH_VFM(INTEL_GRANITERAPIDS_D,  &gnr_cfg),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, &gnr_cfg),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT,   &gnr_cfg),

	X86_MATCH_VFM(INTEL_ATOM_DARKMONT_X,  &gnr_cfg),