From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 4540B3D75C7; Wed, 20 May 2026 18:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779300162; cv=none; b=gcXWhh2dDrGdsEjMvKFdvwfqo0hiag/3AIjgubSe7teXP6/5PAckDa/aiBT4Z4wTiAp/aWtj57oRFBc9/BDyGtGHqU4P7wgLoWUIOXZPkmv23OPAvTYHKEqYN9akMMCSemWZYvqXhr0sw4divjLAC0YZ07gJ+sSMmP4mUxnzqd8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779300162; c=relaxed/simple; bh=YisQn0RfaRR2UNmGQ31JPvt0GMHk+dZX6i9Us5YiKNY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nik1vc3nmeJ+l0OQUGA5M7SekH4YaV6JYiszEFihahT9tohnPZO058kJND2IXXcxA3Zj+JY4T0j26Ap1KytpnPKb7STIofj7zmx7tV+ae88UCt7My4aCs93pe7uciHdAAZNWNFkH/vJAklRxaRcYNhuBV0Z1CGR6xnU7IyMj4No= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KzLp1twH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KzLp1twH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA0971F000E9; Wed, 20 May 2026 18:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779300161; bh=6hv9AYGztws1ao6ChNoIy+PZbL8ZDhTxZDONjGzG0/k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KzLp1twH/OmR0697uhxxaf/UHpohbbmraL2OxtBqirmurZxrdLX0RzifngAqsLVmF 5sBRFKx/pvzR2mbtxMbOFcGTkTMYH5SH6cLxH9jsX0OfOVQQ1DiESXsgjT+WhvUceY WI5AhGVoytH1gDE2hh/26b9JezBUXWTPAdsYxKBQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Mario Limonciello (AMD)" , "Borislav Petkov (AMD)" , Jean Delvare , Yazen Ghannam , Sasha Levin Subject: [PATCH 6.12 033/666] firmware: dmi: Correct an indexing error in dmi.h Date: Wed, 20 May 2026 18:14:04 +0200 Message-ID: <20260520162111.951809788@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162111.222830634@linuxfoundation.org> References: <20260520162111.222830634@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mario Limonciello (AMD) [ Upstream commit c064abc68e009d2cc18416e7132d9c25e03125b6 ] The entries later in enum dmi_entry_type don't match the SMBIOS specification¹. The entry for type 33: `64-Bit Memory Error Information` is not present and thus the index for all later entries is incorrect. Add it. Also, add missing entry types 43-46, while at it. ¹ Search for "System Management BIOS (SMBIOS) Reference Specification" [ bp: Drop the flaky SMBIOS spec URL. ] Fixes: 93c890dbe5287 ("firmware: Add DMI entry types to the headers") Signed-off-by: Mario Limonciello (AMD) Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Jean Delvare Reviewed-by: Yazen Ghannam Link: https://patch.msgid.link/20260307141024.819807-2-superm1@kernel.org Signed-off-by: Sasha Levin --- include/linux/dmi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 927f8a8b7a1dd..2eedf44e68012 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -60,6 +60,7 @@ enum dmi_entry_type { DMI_ENTRY_OOB_REMOTE_ACCESS, DMI_ENTRY_BIS_ENTRY, DMI_ENTRY_SYSTEM_BOOT, + DMI_ENTRY_64_MEM_ERROR, DMI_ENTRY_MGMT_DEV, DMI_ENTRY_MGMT_DEV_COMPONENT, DMI_ENTRY_MGMT_DEV_THRES, @@ -69,6 +70,10 @@ enum dmi_entry_type { DMI_ENTRY_ADDITIONAL, DMI_ENTRY_ONBOARD_DEV_EXT, DMI_ENTRY_MGMT_CONTROLLER_HOST, + DMI_ENTRY_TPM_DEVICE, + DMI_ENTRY_PROCESSOR_ADDITIONAL, + DMI_ENTRY_FIRMWARE_INVENTORY, + DMI_ENTRY_STRING_PROPERTY, DMI_ENTRY_INACTIVE = 126, DMI_ENTRY_END_OF_TABLE = 127, }; -- 2.53.0