Commit b0048092 authored by Dan Williams's avatar Dan Williams Committed by Ard Biesheuvel
Browse files

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 <Smita.KoralahalliChannabasappa@amd.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 1758817e

drivers/firmware/efi/cper_cxl.c

+11 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/cper.h>

#include "cper_cxl.h"

#include <linux/cxl_err.h>



#define PROT_ERR_VALID_AGENT_TYPE		BIT_ULL(0)

#define PROT_ERR_VALID_AGENT_ADDRESS		BIT_ULL(1)
@@ -19,6 +18,17 @@ 
#define PROT_ERR_VALID_DVSEC			BIT_ULL(5)

#define PROT_ERR_VALID_ERROR_LOG		BIT_ULL(6)



/* CXL RAS Capability Structure, CXL v3.0 sec 8.2.4.16 */

struct cxl_ras_capability_regs {

	u32 uncor_status;

	u32 uncor_mask;

	u32 uncor_severity;

	u32 cor_status;

	u32 cor_mask;

	u32 cap_control;

	u32 header_log[16];

};



static const char * const prot_err_agent_type_strs[] = {

	"Restricted CXL Device",

	"Restricted CXL Host Downstream Port",

include/linux/cxl_err.h

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2022 Advanced Micro Devices, Inc.

 *

 * Author: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>

 */



#ifndef LINUX_CXL_ERR_H

#define LINUX_CXL_ERR_H



/* CXL RAS Capability Structure, CXL v3.1 sec 8.2.4.16 */

struct cxl_ras_capability_regs {

	u32 uncor_status;

	u32 uncor_mask;

	u32 uncor_severity;

	u32 cor_status;

	u32 cor_mask;

	u32 cap_control;

	u32 header_log[16];

};



#endif //__CXL_ERR_