Commit b73a74a2 authored by John Allen's avatar John Allen Committed by PrithivishS
Browse files

RAS/AMD/FMPM: Use atl internal.h for INVALID_SPA 

mainline inclusion
from mainline-v6.11-rc1
commit f4c0cd1870afd57181e8087c6cf8da3d7fa2cebe
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYOV8
CVE: NA

Reference: https://github.com/torvalds/linux/commit/f4c0cd1870afd57181e8087c6cf8da3d7fa2cebe



--------------------------------

commit f4c0cd1870afd57181e8087c6cf8da3d7fa2cebe upstream

Both the AMD ATL and the FMPM driver define INVALID_SPA. Include the
definition from the ATL internal.h header in the FMPM driver.

Signed-off-by: default avatarJohn Allen <john.allen@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240606203313.51197-7-john.allen@amd.com


Signed-off-by: default avatarsuryasaimadhu <SaiMadhu.KoyyalaHariVenkata@amd.com>
Signed-off-by: default avatarPrithivishS <sprithiv@amd.com>
parent 1b6ad6dd

arch/x86/configs/openeuler_defconfig

+22 −12
Original line number Diff line number Diff line
@@ -918,6 +918,12 @@ CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y 
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y

# end of GCOV-based kernel profiling



#

# Profile Guided Optimization (PGO)

#

CONFIG_ARCH_SUPPORTS_PGO_CLANG=y

# end of Profile Guided Optimization (PGO)



CONFIG_HAVE_GCC_PLUGINS=y

CONFIG_FUNCTION_ALIGNMENT_4B=y

CONFIG_FUNCTION_ALIGNMENT_16B=y
@@ -1143,6 +1149,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y 
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set

CONFIG_THP_SWAP=y

CONFIG_READ_ONLY_THP_FOR_FS=y

CONFIG_PGTABLE_HAS_HUGE_LEAVES=y

CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y

CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y

CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -3082,6 +3089,8 @@ CONFIG_NET_VENDOR_BZWX=y 
CONFIG_NCE=m

CONFIG_NE6X=m

CONFIG_NE6XVF=m

CONFIG_NET_VENDOR_NEBULA_MATRIX=y

CONFIG_NBL_CORE=m

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

# CONFIG_NET_SB1000 is not set
@@ -3091,8 +3100,6 @@ CONFIG_SWPHY=y 
CONFIG_LED_TRIGGER_PHY=y

CONFIG_FIXED_PHY=y

CONFIG_SFP=m

CONFIG_NET_VENDOR_NEBULA_MATRIX=y

CONFIG_NBL_CORE=m



#

# MII PHY device drivers
@@ -3898,6 +3905,8 @@ CONFIG_TCG_INFINEON=m 
# CONFIG_TCG_XEN is not set

CONFIG_TCG_CRB=y

# CONFIG_TCG_VTPM_PROXY is not set

CONFIG_TCG_HYGON=m

CONFIG_TCM_HYGON=m

CONFIG_TCG_TIS_ST33ZP24=m

CONFIG_TCG_TIS_ST33ZP24_I2C=m

CONFIG_TCG_TIS_ST33ZP24_SPI=m
@@ -5526,6 +5535,7 @@ CONFIG_DVB_CXD2099=m 
# Graphics support

#

CONFIG_APERTURE_HELPERS=y

CONFIG_SCREEN_INFO=y

CONFIG_VIDEO_CMDLINE=y

CONFIG_VIDEO_NOMODESET=y

# CONFIG_AUXDISPLAY is not set
@@ -5736,6 +5746,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y 
# CONFIG_FB_FOREIGN_ENDIAN is not set

CONFIG_FB_SYS_FOPS=y

CONFIG_FB_DEFERRED_IO=y

CONFIG_FB_IOMEM_FOPS=y

CONFIG_FB_IOMEM_HELPERS=y

CONFIG_FB_SYSMEM_HELPERS=y

CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
@@ -6856,8 +6867,8 @@ CONFIG_INFINIBAND_USER_MEM=y 
CONFIG_INFINIBAND_ON_DEMAND_PAGING=y

CONFIG_INFINIBAND_ADDR_TRANS=y

CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y

CONFIG_INFINIBAND_VIRT_DMA=y

CONFIG_INFINIBAND_PEER_MEMORY=y

CONFIG_INFINIBAND_VIRT_DMA=y

CONFIG_INFINIBAND_BNXT_RE=m

CONFIG_INFINIBAND_CXGB4=m

# CONFIG_INFINIBAND_EFA is not set
@@ -7508,8 +7519,8 @@ CONFIG_HID_SENSOR_ACCEL_3D=m 
# CONFIG_AD7923 is not set

# CONFIG_AD7949 is not set

# CONFIG_AD799X is not set

# CONFIG_ADI_AXI_ADC is not set

# CONFIG_AD9467 is not set

# CONFIG_ADI_AXI_ADC is not set

# CONFIG_ENVELOPE_DETECTOR is not set

# CONFIG_HI8435 is not set

# CONFIG_HX711 is not set
@@ -8026,6 +8037,8 @@ CONFIG_IDLE_INJECT=y 


CONFIG_RAS=y

# CONFIG_RAS_CEC is not set

CONFIG_AMD_ATL=m

CONFIG_RAS_FMPM=m

CONFIG_USB4=m

# CONFIG_USB4_DEBUGFS_WRITE is not set

# CONFIG_USB4_DMA_TEST is not set
@@ -8568,8 +8581,6 @@ CONFIG_LIST_HARDENED=y 


CONFIG_RANDSTRUCT_NONE=y

# end of Kernel hardening options



# CONFIG_SECURITY_BOOT_INIT is not set

# end of Security options



CONFIG_XOR_BLOCKS=m
@@ -8590,6 +8601,7 @@ CONFIG_CRYPTO_ALGAPI=y 
CONFIG_CRYPTO_ALGAPI2=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_AEAD2=y

CONFIG_CRYPTO_SIG=y

CONFIG_CRYPTO_SIG2=y

CONFIG_CRYPTO_SKCIPHER=y

CONFIG_CRYPTO_SKCIPHER2=y
@@ -8813,19 +8825,17 @@ CONFIG_CRYPTO_DEV_ZHAOXIN_AES=m 
CONFIG_CRYPTO_DEV_ZHAOXIN_SHA=m

# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set

# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set

CONFIG_HYGON_GM=y

CONFIG_CRYPTO_DEV_CCP=y

CONFIG_CRYPTO_DEV_CCP_DD=m

CONFIG_CRYPTO_DEV_SP_CCP=y

CONFIG_CRYPTO_DEV_CCP_CRYPTO=m

CONFIG_CRYPTO_DEV_SP_PSP=y

CONFIG_HYGON_GM=y

# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set

CONFIG_HYGON_PSP2CPU_CMD=y

CONFIG_TCG_HYGON=m

CONFIG_TCM_HYGON=m

CONFIG_TDM_DEV_HYGON=y

CONFIG_TDM_KERNEL_GUARD=m

CONFIG_CRYPTO_DEV_HCT=m

# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set

CONFIG_CRYPTO_DEV_NITROX=m

CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m

CONFIG_CRYPTO_DEV_QAT=m
@@ -8838,13 +8848,13 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m 
CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m

CONFIG_CRYPTO_DEV_QAT_C62XVF=m

# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set

CONFIG_CRYPTO_DEV_IAA_CRYPTO=m

CONFIG_CRYPTO_DEV_IAA_CRYPTO_STATS=y

CONFIG_CRYPTO_DEV_CHELSIO=m

# CONFIG_CRYPTO_DEV_VIRTIO is not set

# CONFIG_CRYPTO_DEV_SAFEXCEL is not set

# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set

CONFIG_CRYPTO_DEV_TSSE=m

CONFIG_CRYPTO_DEV_IAA_CRYPTO=m

CONFIG_CRYPTO_DEV_IAA_CRYPTO_STATS=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y

CONFIG_X509_CERTIFICATE_PARSER=y

drivers/ras/amd/fmpm.c

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 


#include "../debugfs.h"



#include "atl/internal.h"



#define INVALID_CPU			UINT_MAX



/* Validation Bits */
@@ -116,8 +118,6 @@ static struct fru_rec **fru_records; 
/* system physical addresses array */

static u64 *spa_entries;



#define INVALID_SPA	~0ULL



static struct dentry *fmpm_dfs_dir;

static struct dentry *fmpm_dfs_entries;