From patchwork Mon Aug 5 12:53:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 816860 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 264C2158DD1; Mon, 5 Aug 2024 12:54:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862446; cv=none; b=P+VjyZqcrtW93kD1hQMaBXouR6UvAUJLxebiaAgDUC/W1KfXF9OiVDmeH6Ieq/3N+xfM+To8ivVP1c7ddOP0l1Gpgu4g0fgF3mFAPMU9p4764R1qipHc8HBmjbHzjnli3bGTN3lUVA2Y02XCyn8+a4FK9I6Dvb1vReSF0gZNEzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862446; c=relaxed/simple; bh=LayJjNlHt7RdDKs2eSpJizuqfyzjoPSkSmmLznNH6CU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bTyHMTkLossnehHq3tORcwtBCag8MJ1DHheZCPtVpqLMMVNPIP7B6lioRIwipR1bB68/f2kErsudvM1vHPkLGkeaX6V6fHUHjy5Vq6ZH/wDzcwh6xocU3W2sAj3XOkE2o3taBojmZoaBA5Ks4oXsNZ6NsZ7ZZZR6WqY40dWofW8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FAfZaQZ0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FAfZaQZ0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC34EC4AF11; Mon, 5 Aug 2024 12:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722862445; bh=LayJjNlHt7RdDKs2eSpJizuqfyzjoPSkSmmLznNH6CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FAfZaQZ0Vn5qzLckjGPsL9rotdZ8LlyXljJ7tOpY0KqBYNt0oh5bbQrERNwE6Z/Q7 CmJiLpmZOsXWEbiXeuSVnHe6leWry6LueQgigkGH8JoLPv+k7hHgCAYOJrSMtFlnXD /k3QkYTNCaOouZC/HDX0mxZifUfMAOGtYQhT/o/JEIH+Tb4cxVoY2EMA0gp9boxr8i pJUjS1Jmj9VCJC2LCgRCe2kXFC99YBE2hkZjOLhlulhDepncGyok7PaeI+sSUbPTEe BSijIxjXCezi2717N6f5XEBsFVauvAUzH2bA5F0rPQ003GYPknnF1x85Drb3LKpCs0 09adocDCXnxUw== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1saxDv-0000000CyYj-3fBo; Mon, 05 Aug 2024 14:54:03 +0200 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , Ard Biesheuvel , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron Subject: [PATCH v3 2/5] efi/cper: Adjust infopfx size to accept an extra space Date: Mon, 5 Aug 2024 14:53:33 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab Compiling with W=1 with werror enabled produces an error: drivers/firmware/efi/cper-arm.c: In function ‘cper_print_proc_arm’: drivers/firmware/efi/cper-arm.c:298:64: error: ‘snprintf’ output may be truncated before the last format character [-Werror=format-truncation=] 298 | snprintf(infopfx, sizeof(infopfx), "%s ", newpfx); | ^ drivers/firmware/efi/cper-arm.c:298:25: note: ‘snprintf’ output between 2 and 65 bytes into a destination of size 64 298 | snprintf(infopfx, sizeof(infopfx), "%s ", newpfx); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As the logic there adds an space at the end of infopx buffer. Add an extra space to avoid such warning. Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jonathan Cameron --- drivers/firmware/efi/cper-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/cper-arm.c b/drivers/firmware/efi/cper-arm.c index fa9c1c3bf168..eb7ee6af55f2 100644 --- a/drivers/firmware/efi/cper-arm.c +++ b/drivers/firmware/efi/cper-arm.c @@ -240,7 +240,7 @@ void cper_print_proc_arm(const char *pfx, int i, len, max_ctx_type; struct cper_arm_err_info *err_info; struct cper_arm_ctx_info *ctx_info; - char newpfx[64], infopfx[64]; + char newpfx[64], infopfx[ARRAY_SIZE(newpfx) + 1]; printk("%sMIDR: 0x%016llx\n", pfx, proc->midr); From patchwork Mon Aug 5 12:53:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 817756 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 285521591F0; Mon, 5 Aug 2024 12:54:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862446; cv=none; b=QruRAjjIyBFjhNZjUYgHdxDUZU5y9/k/MYyagkxo2+VvzA2OaQ2qRIEOqzFF1ZBQjmK8UYJSPr5gsOvHPNqnIOtI4VL7o5kjzvoqhJcrocU9SMRZ8TigO7jmfWpm9KR30zVGGuRWX/+q0dg8LF0U/dSHPQ1z+TTnuASQCK0I4Ds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862446; c=relaxed/simple; bh=2ayTZSkz+6Om/td/hGkUrK8vPsiqWX26wgpjxmBwf7I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I+23hjOTImZlXQHzefn92k0qmJ9+jGMRzf9MseMTRKZBi3gpW7VIkR5z+Z9wTVk2cIqg814Ow7B68vt5ElmQfcRHhJWS94GLZWtCIbL/fFmuOk7cjN4poC6lhKuqF91g5VAVij2qMW9gObk8DqhBYxmaA+O2CloonpMUbQxkt00= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NSIFIw5o; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NSIFIw5o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3B66C4AF0E; Mon, 5 Aug 2024 12:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722862445; bh=2ayTZSkz+6Om/td/hGkUrK8vPsiqWX26wgpjxmBwf7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSIFIw5o9Nsgfn4abbpvSymgPWREtcl+xWFAmAEARQcov5PUPvDsrd1ZwMfQ/Md8w 3K6qqULna55TXrFlfLfOD+NhbD3148iGYJAALv5XwXZDVha9chOsC+0a9CaVwzFRa+ Ka2wAJY3qyymQp/4+dy6NzOjw9FH6DNBysse1PEAVu9bHn5YQMzl8d0em3iqGMJCaH ML6DLoUVif4Vg+wr0a/h0lKw+qO9XZ4HaiAHpB3ISBvlPE3aXBGy6usIu5cO+wYn1Y lRceKZSlykGYJfQDIUUG4oa7Am0XCGiO7WoyDgInfCFfby/3i4FJdhD4yTKd1BZL0w ii0EVExs/sYVw== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1saxDv-0000000CyYm-3lUd; Mon, 05 Aug 2024 14:54:03 +0200 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , Alison Schofield , Ard Biesheuvel , Dave Jiang , Ira Weiny , Jonathan Cameron , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/5] efi/cper: Add a new helper function to print bitmasks Date: Mon, 5 Aug 2024 14:53:34 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab Sometimes it is desired to produce a single log line for errors. Add a new helper function for such purpose. Signed-off-by: Mauro Carvalho Chehab Reviewed-by; Jonathan Cameron --- drivers/firmware/efi/cper.c | 43 +++++++++++++++++++++++++++++++++++++ include/linux/cper.h | 2 ++ 2 files changed, 45 insertions(+) diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c index 7d2cdd9e2227..462d739e8dd1 100644 --- a/drivers/firmware/efi/cper.c +++ b/drivers/firmware/efi/cper.c @@ -106,6 +106,49 @@ void cper_print_bits(const char *pfx, unsigned int bits, printk("%s\n", buf); } +/** + * cper_bits_to_str - return a string for set bits + * @buf: buffer to store the output string + * @buf_size: size of the output string buffer + * @bits: bit mask + * @strs: string array, indexed by bit position + * @strs_size: size of the string array: @strs + * + * Add to @buf the bitmask in hexadecimal. Then, for each set bit in @bits, + * add the corresponding string describing the bit in @strs to @buf. + * + * Return: number of bytes stored or an error code if lower than zero. + */ +int cper_bits_to_str(char *buf, int buf_size, unsigned long bits, + const char * const strs[], unsigned int strs_size) +{ + int len = buf_size; + char *str = buf; + int i, size; + + *buf = '\0'; + + for_each_set_bit(i, &bits, strs_size) { + if (!(bits & (1U << (i)))) + continue; + + if (*buf && len > 0) { + *str = '|'; + len--; + str++; + } + + size = strscpy(str, strs[i], len); + if (size < 0) + return size; + + len -= size; + str += size; + } + return len - buf_size; +} +EXPORT_SYMBOL_GPL(cper_bits_to_str); + static const char * const proc_type_strs[] = { "IA32/X64", "IA64", diff --git a/include/linux/cper.h b/include/linux/cper.h index 265b0f8fc0b3..25858a7608b7 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h @@ -584,6 +584,8 @@ const char *cper_mem_err_type_str(unsigned int); const char *cper_mem_err_status_str(u64 status); void cper_print_bits(const char *prefix, unsigned int bits, const char * const strs[], unsigned int strs_size); +int cper_bits_to_str(char *buf, int buf_size, unsigned long bits, + const char * const strs[], unsigned int strs_size); void cper_mem_err_pack(const struct cper_sec_mem_err *, struct cper_mem_err_compact *); const char *cper_mem_err_unpack(struct trace_seq *, From patchwork Mon Aug 5 12:53:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 817755 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CF57159209; Mon, 5 Aug 2024 12:54:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862446; cv=none; b=EY+1Jtl3mfoDdF2ScF6V1NM3WMjjIKIlnRbtSKlpChDZK/odGUfdZ07gCrhqzNTR7RabgtAdbi4B8MHxr0EOUKZISX1tb8Sxihh3I9QsioTy9d85HMN4fx/8/m77bpBOw7T10VRHstpUS7ERtrisNYZ3BlqIt1GVEmCe5WAmyKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862446; c=relaxed/simple; bh=qvrl/9oyuQCy8rh63h+2SLCQP0eGNCvXSDn8ZBYMvGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZgK3grvtnypRuXlOYUy3ongQHbwrPKzhoLIO5jRetjrXzIRhzNwObT3GMg0Eiov4YTI0rZv1RV0dtJBakgvk2kFDOjDhOb/kva8BZHjSsCirswwu0BlGdURqQtPY3iPh9zk8xTYmPnXkw5w1ziWHS9TB5p9nyHRGsa1zS1pvMNg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Zl36+k44; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Zl36+k44" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA13DC4AF12; Mon, 5 Aug 2024 12:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722862446; bh=qvrl/9oyuQCy8rh63h+2SLCQP0eGNCvXSDn8ZBYMvGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zl36+k44RfYZ/VJm2jDGagXNGHyCk2DO0SeP1iUhXqbPfX9N2ecEjPeYRuBZXi8vx Sp8fBhl2ylBDB+/FkjEnVWibwql155OOb001J5Bzvx1xd4Fy1IFuJJdhwVBwcqP3g7 X3tSKVGptdfLCHEAGESSkFiPgc+8kfe5BrJNiesn2gqTOY60VNbXDpDkvaBKSdBDIl 9QsKvRVauPSOsQJSrYVGgeeHiHbEDg/j1639bOATlacP5dG9EEjRIjerVi+qY+op60 4Nr22REZs3BbZVIM1aEitnM5738eZz5lu2+0gPSthIcwf9hEJM51xrk8+nXl2kkgl2 ISeXZNQRpuB7Q== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1saxDv-0000000CyYs-3saR; Mon, 05 Aug 2024 14:54:03 +0200 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , "Rafael J. Wysocki" , =?utf-8?q?Uwe_Kleine-K?= =?utf-8?q?=C3=B6nig?= , Alison Schofield , Ard Biesheuvel , Borislav Petkov , Dan Williams , Daniel Ferguson , Dave Jiang , Ira Weiny , James Morse , Jonathan Cameron , Len Brown , Shiju Jose , Shuai Xue , Tony Luck , linux-acpi@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] efi/cper: align ARM CPER type with UEFI 2.9A/2.10 specs Date: Mon, 5 Aug 2024 14:53:35 +0200 Message-ID: <65cab717663e79def53d156ccf689235769b070c.1722861911.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab Up to UEFI spec 2.9, the type byte of CPER struct for ARM processor was defined simply as: Type at byte offset 4: - Cache error - TLB Error - Bus Error - Micro-architectural Error All other values are reserved Yet, there was no information about how this would be encoded. Spec 2.9A errata corrected it by defining: - Bit 1 - Cache Error - Bit 2 - TLB Error - Bit 3 - Bus Error - Bit 4 - Micro-architectural Error All other values are reserved That actually aligns with the values already defined on older versions at N.2.4.1. Generic Processor Error Section. Spec 2.10 also preserve the same encoding as 2.9A. Adjust CPER and GHES handling code for both generic and ARM processors to properly handle UEFI 2.9A and 2.10 encoding. Link: https://uefi.org/specs/UEFI/2.10/Apx_N_Common_Platform_Error_Record.html#arm-processor-error-information Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jonathan Cameron --- drivers/acpi/apei/ghes.c | 15 ++++++---- drivers/firmware/efi/cper-arm.c | 50 ++++++++++++++++----------------- include/linux/cper.h | 10 +++---- 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 06d9351a9abc..d7d78d546f68 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -533,6 +533,7 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, { struct cper_sec_proc_arm *err = acpi_hest_get_payload(gdata); int flags = sync ? MF_ACTION_REQUIRED : 0; + char error_type[120]; bool queued = false; int sec_sev, i; char *p; @@ -545,9 +546,8 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, p = (char *)(err + 1); for (i = 0; i < err->err_info_num; i++) { struct cper_arm_err_info *err_info = (struct cper_arm_err_info *)p; - bool is_cache = (err_info->type == CPER_ARM_CACHE_ERROR); + bool is_cache = err_info->type & CPER_ARM_CACHE_ERROR; bool has_pa = (err_info->validation_bits & CPER_ARM_INFO_VALID_PHYSICAL_ADDR); - const char *error_type = "unknown error"; /* * The field (err_info->error_info & BIT(26)) is fixed to set to @@ -561,12 +561,15 @@ static bool ghes_handle_arm_hw_error(struct acpi_hest_generic_data *gdata, continue; } - if (err_info->type < ARRAY_SIZE(cper_proc_error_type_strs)) - error_type = cper_proc_error_type_strs[err_info->type]; + cper_bits_to_str(error_type, sizeof(error_type), + FIELD_GET(CPER_ARM_ERR_TYPE_MASK, err_info->type), + cper_proc_error_type_strs, + ARRAY_SIZE(cper_proc_error_type_strs)); pr_warn_ratelimited(FW_WARN GHES_PFX - "Unhandled processor error type: %s\n", - error_type); + "Unhandled processor error type 0x%02x: %s%s\n", + err_info->type, error_type, + (err_info->type & ~CPER_ARM_ERR_TYPE_MASK) ? " with reserved bit(s)" : ""); p += err_info->length; } diff --git a/drivers/firmware/efi/cper-arm.c b/drivers/firmware/efi/cper-arm.c index eb7ee6af55f2..52d18490b59e 100644 --- a/drivers/firmware/efi/cper-arm.c +++ b/drivers/firmware/efi/cper-arm.c @@ -93,15 +93,11 @@ static void cper_print_arm_err_info(const char *pfx, u32 type, bool proc_context_corrupt, corrected, precise_pc, restartable_pc; bool time_out, access_mode; - /* If the type is unknown, bail. */ - if (type > CPER_ARM_MAX_TYPE) - return; - /* * Vendor type errors have error information values that are vendor * specific. */ - if (type == CPER_ARM_VENDOR_ERROR) + if (type & CPER_ARM_VENDOR_ERROR) return; if (error_info & CPER_ARM_ERR_VALID_TRANSACTION_TYPE) { @@ -116,43 +112,38 @@ static void cper_print_arm_err_info(const char *pfx, u32 type, if (error_info & CPER_ARM_ERR_VALID_OPERATION_TYPE) { op_type = ((error_info >> CPER_ARM_ERR_OPERATION_SHIFT) & CPER_ARM_ERR_OPERATION_MASK); - switch (type) { - case CPER_ARM_CACHE_ERROR: + if (type & CPER_ARM_CACHE_ERROR) { if (op_type < ARRAY_SIZE(arm_cache_err_op_strs)) { - printk("%soperation type: %s\n", pfx, + printk("%scache error, operation type: %s\n", pfx, arm_cache_err_op_strs[op_type]); } - break; - case CPER_ARM_TLB_ERROR: + } + if (type & CPER_ARM_TLB_ERROR) { if (op_type < ARRAY_SIZE(arm_tlb_err_op_strs)) { - printk("%soperation type: %s\n", pfx, + printk("%sTLB error, operation type: %s\n", pfx, arm_tlb_err_op_strs[op_type]); } - break; - case CPER_ARM_BUS_ERROR: + } + if (type & CPER_ARM_BUS_ERROR) { if (op_type < ARRAY_SIZE(arm_bus_err_op_strs)) { - printk("%soperation type: %s\n", pfx, + printk("%sbus error, operation type: %s\n", pfx, arm_bus_err_op_strs[op_type]); } - break; } } if (error_info & CPER_ARM_ERR_VALID_LEVEL) { level = ((error_info >> CPER_ARM_ERR_LEVEL_SHIFT) & CPER_ARM_ERR_LEVEL_MASK); - switch (type) { - case CPER_ARM_CACHE_ERROR: + if (type & CPER_ARM_CACHE_ERROR) printk("%scache level: %d\n", pfx, level); - break; - case CPER_ARM_TLB_ERROR: + + if (type & CPER_ARM_TLB_ERROR) printk("%sTLB level: %d\n", pfx, level); - break; - case CPER_ARM_BUS_ERROR: + + if (type & CPER_ARM_BUS_ERROR) printk("%saffinity level at which the bus error occurred: %d\n", pfx, level); - break; - } } if (error_info & CPER_ARM_ERR_VALID_PROC_CONTEXT_CORRUPT) { @@ -241,6 +232,7 @@ void cper_print_proc_arm(const char *pfx, struct cper_arm_err_info *err_info; struct cper_arm_ctx_info *ctx_info; char newpfx[64], infopfx[ARRAY_SIZE(newpfx) + 1]; + char error_type[120]; printk("%sMIDR: 0x%016llx\n", pfx, proc->midr); @@ -289,9 +281,15 @@ void cper_print_proc_arm(const char *pfx, newpfx); } - printk("%serror_type: %d, %s\n", newpfx, err_info->type, - err_info->type < ARRAY_SIZE(cper_proc_error_type_strs) ? - cper_proc_error_type_strs[err_info->type] : "unknown"); + cper_bits_to_str(error_type, sizeof(error_type), + FIELD_GET(CPER_ARM_ERR_TYPE_MASK, err_info->type), + cper_proc_error_type_strs, + ARRAY_SIZE(cper_proc_error_type_strs)); + + printk("%serror_type: 0x%02x: %s%s\n", newpfx, err_info->type, + error_type, + (err_info->type & ~CPER_ARM_ERR_TYPE_MASK) ? " with reserved bit(s)" : ""); + if (err_info->validation_bits & CPER_ARM_INFO_VALID_ERR_INFO) { printk("%serror_info: 0x%016llx\n", newpfx, err_info->error_info); diff --git a/include/linux/cper.h b/include/linux/cper.h index 25858a7608b7..3670b866ac11 100644 --- a/include/linux/cper.h +++ b/include/linux/cper.h @@ -293,11 +293,11 @@ enum { #define CPER_ARM_INFO_FLAGS_PROPAGATED BIT(2) #define CPER_ARM_INFO_FLAGS_OVERFLOW BIT(3) -#define CPER_ARM_CACHE_ERROR 0 -#define CPER_ARM_TLB_ERROR 1 -#define CPER_ARM_BUS_ERROR 2 -#define CPER_ARM_VENDOR_ERROR 3 -#define CPER_ARM_MAX_TYPE CPER_ARM_VENDOR_ERROR +#define CPER_ARM_ERR_TYPE_MASK GENMASK(4,1) +#define CPER_ARM_CACHE_ERROR BIT(1) +#define CPER_ARM_TLB_ERROR BIT(2) +#define CPER_ARM_BUS_ERROR BIT(3) +#define CPER_ARM_VENDOR_ERROR BIT(4) #define CPER_ARM_ERR_VALID_TRANSACTION_TYPE BIT(0) #define CPER_ARM_ERR_VALID_OPERATION_TYPE BIT(1) From patchwork Mon Aug 5 12:53:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 816858 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC41A15D5BE; Mon, 5 Aug 2024 12:54:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862449; cv=none; b=EiQ1sDEaoixzCEUaP2qPRsRXULPmc3bpkISbiPv7meRw8PJSS0rS8c0Z/urg9KWti6fbRnwEoFbHo7kbdR2Eluv9PXH2oXwGaPiD6H8xebRrnu6e5+s2UA0oPQCIXF9fGLibA+LJ6XLIBOPwGkyS3D/g5ejFA/SkofyzShJqlNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722862449; c=relaxed/simple; bh=BUannu00JepoL1Z7Ukw4YDCb+t7wSdorptXpbpSwoW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pZCqkc2B5uCt8Q2IpYjWGgTMBBpSCoiKdDK/niIVbQjJVUECRSqyCstGUHAub5euGpzWWzfc8p5xdC0DucMot8AtEj9VmJfN96iyhGaaZIwQKf1L7JHAnZ+j6pbap70othhAZjlVHkRdqi6wmXEo7YA6jy3X/Q8wCqIwxRJRO30= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fswYaPcs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fswYaPcs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9059DC4AF0E; Mon, 5 Aug 2024 12:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722862449; bh=BUannu00JepoL1Z7Ukw4YDCb+t7wSdorptXpbpSwoW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fswYaPcs6a/b3lq8DhDNOcQU8A+n9VxOD9+3cysxw316lXiOz6QYsZcUJ73fM2Cj8 ZiUltn/G324MN0iVTWTwbTQLOqPx7YAZFaTEoqLHeOBqt0uBm4LqF0EjcH6VkUZ1V6 36x4CkPTf+RTYrO4eRq5tN5yWZSHgEJIWbnWiRFY5a4KNGkc9MxeIjPM0v1v38/R/o rfd+Fb5D5UR5T342vw425XiAehSwKBWtvPNGIAV+Ostvj1LIMI8lt2RgiUputmgd3D sEwUhobQoKfpukz0lcfYCEE02CW5T/oH9KU+khjxWxlZKx401abpIb0URFIYA2rIqI QG16wJbCqRCtA== Received: from mchehab by mail.kernel.org with local (Exim 4.98) (envelope-from ) id 1saxDv-0000000CyYw-3ytP; Mon, 05 Aug 2024 14:54:03 +0200 From: Mauro Carvalho Chehab To: Cc: Mauro Carvalho Chehab , Ard Biesheuvel , Jonathan Cameron , Jonathan Corbet , linux-doc@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/5] docs: efi: add CPER functions to driver-api Date: Mon, 5 Aug 2024 14:53:36 +0200 Message-ID: <64dd3a377c4ebb1b8cfd2b406fe3f1c24cce0e4e.1722861911.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-efi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Mauro Carvalho Chehab There are two kernel-doc like descriptions at cper, which is used by other parts of cper and on ghes driver. They both have kernel-doc like descriptions. Change the tags for them to be actual kernel-doc tags and add them to the driver-api documentaion at the UEFI section. Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jonathan Cameron --- Documentation/driver-api/firmware/efi/index.rst | 11 ++++++++--- drivers/firmware/efi/cper.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Documentation/driver-api/firmware/efi/index.rst b/Documentation/driver-api/firmware/efi/index.rst index 4fe8abba9fc6..5a6b6229592c 100644 --- a/Documentation/driver-api/firmware/efi/index.rst +++ b/Documentation/driver-api/firmware/efi/index.rst @@ -1,11 +1,16 @@ .. SPDX-License-Identifier: GPL-2.0 -============ -UEFI Support -============ +==================================================== +Unified Extensible Firmware Interface (UEFI) Support +==================================================== UEFI stub library functions =========================== .. kernel-doc:: drivers/firmware/efi/libstub/mem.c :internal: + +UEFI Common Platform Error Record (CPER) functions +================================================== + +.. kernel-doc:: drivers/firmware/efi/cper.c diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c index 462d739e8dd1..295f6f339575 100644 --- a/drivers/firmware/efi/cper.c +++ b/drivers/firmware/efi/cper.c @@ -69,7 +69,7 @@ const char *cper_severity_str(unsigned int severity) } EXPORT_SYMBOL_GPL(cper_severity_str); -/* +/** * cper_print_bits - print strings for set bits * @pfx: prefix for each line, including log level and prefix string * @bits: bit mask