diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2025-05-23 13:26:24 -0700 |
|---|---|---|
| committer | Dave Jiang <dave.jiang@intel.com> | 2025-05-23 13:26:24 -0700 |
| commit | 9f153b7fb5ae45c7d426851f896487927f40e501 (patch) | |
| tree | d7de5dd157f8e8a9fbead7c33a29054486f05351 /include | |
| parent | 6eed708a5693709ff0d4dd8512b6934be30d4283 (diff) | |
| parent | be9b359e056a78bb6cc2e17cf457338f6aef57f9 (diff) | |
Merge branch 'for-6.16/cxl-features-ras' into cxl-for-next
Add CXL RAS Features support. Features include "patrol scrub control",
"error check scrub", "perform maintenance", and "memory sparing". This
support connects the RAS Featurs to EDAC.
Diffstat (limited to 'include')
| -rw-r--r-- | include/cxl/features.h | 2 | ||||
| -rw-r--r-- | include/linux/edac.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/cxl/features.h b/include/cxl/features.h index 5f7f842765a5..b9297693dae7 100644 --- a/include/cxl/features.h +++ b/include/cxl/features.h @@ -64,7 +64,7 @@ struct cxl_features_state { struct cxl_mailbox; struct cxl_memdev; #ifdef CONFIG_CXL_FEATURES -inline struct cxl_features_state *to_cxlfs(struct cxl_dev_state *cxlds); +struct cxl_features_state *to_cxlfs(struct cxl_dev_state *cxlds); int devm_cxl_setup_features(struct cxl_dev_state *cxlds); int devm_cxl_setup_fwctl(struct device *host, struct cxl_memdev *cxlmd); #else diff --git a/include/linux/edac.h b/include/linux/edac.h index 451f9c152c99..fa32f2aca22f 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -745,9 +745,16 @@ static inline int edac_ecs_get_desc(struct device *ecs_dev, #endif /* CONFIG_EDAC_ECS */ enum edac_mem_repair_type { + EDAC_REPAIR_PPR, + EDAC_REPAIR_CACHELINE_SPARING, + EDAC_REPAIR_ROW_SPARING, + EDAC_REPAIR_BANK_SPARING, + EDAC_REPAIR_RANK_SPARING, EDAC_REPAIR_MAX }; +extern const char * const edac_repair_type[]; + enum edac_mem_repair_cmd { EDAC_DO_MEM_REPAIR = 1, }; |