Skip to content

Commit b004809

Browse files
djbwardbiesheuvel
authored andcommitted
efi/cper, cxl: Remove cxl_err.h
While going to create include/linux/cxl.h for some cross-subsystem CXL definitions I noticed that include/linux/cxl_err.h was already present. That header has no reason to be global, and it duplicates the RAS Capability Structure definitions in drivers/cxl/cxl.h. A follow-on patch can consider unifying the CXL native error tracing with the CPER error printing. Also fixed up the spec reference as the latest released spec is v3.0. Cc: Smita Koralahalli <[email protected]> Signed-off-by: Dan Williams <[email protected]> Reviewed-by: Ira Weiny <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]>
1 parent 1758817 commit b004809

File tree

2 files changed

+11
-23
lines changed

2 files changed

+11
-23
lines changed

drivers/firmware/efi/cper_cxl.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <linux/cper.h>
1111
#include "cper_cxl.h"
12-
#include <linux/cxl_err.h>
1312

1413
#define PROT_ERR_VALID_AGENT_TYPE BIT_ULL(0)
1514
#define PROT_ERR_VALID_AGENT_ADDRESS BIT_ULL(1)
@@ -19,6 +18,17 @@
1918
#define PROT_ERR_VALID_DVSEC BIT_ULL(5)
2019
#define PROT_ERR_VALID_ERROR_LOG BIT_ULL(6)
2120

21+
/* CXL RAS Capability Structure, CXL v3.0 sec 8.2.4.16 */
22+
struct cxl_ras_capability_regs {
23+
u32 uncor_status;
24+
u32 uncor_mask;
25+
u32 uncor_severity;
26+
u32 cor_status;
27+
u32 cor_mask;
28+
u32 cap_control;
29+
u32 header_log[16];
30+
};
31+
2232
static const char * const prot_err_agent_type_strs[] = {
2333
"Restricted CXL Device",
2434
"Restricted CXL Host Downstream Port",

include/linux/cxl_err.h

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)