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 0289939478D; Sat, 30 May 2026 18:36:26 +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=1780166187; cv=none; b=PWdcR2gr+WTLHtznUowP/Aep5eiFvHjZf2aA61P2wzBl4FaYmS1Xoq7D/9Y1EPXrmR1ttaliVkS+6YAhw3D4dMKp/VriozO6t75QT3kKjAqagAAKKg4m8575SbQMN9AywYJG/GWLNDZ6QgMFZai2Ygpfe9103tFuMaFWrgUl6Ys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780166187; c=relaxed/simple; bh=ezKg9Fe8IeAG7kkN4UrrvUW72uG9+AXgHJs8h6ciRMI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aJAtJolQWZVySCagbEdX7+XbBlwEckXCi1rhojqjydPmMR1ohp96kvJDMJAaTY4spP8479xnMsVWi/qYQyfZcN3cCkBQ7xdvdQUW15UaeJHp83B/f/CWlS43/zE21TLWcRY7KBEy9TfEppf8Ed7pcu10luhXmSyDic3ek5iJcr4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TpeXv0/J; 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="TpeXv0/J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C97E1F00893; Sat, 30 May 2026 18:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780166185; bh=A2GdpJi4oV8fr0AFgAw9qRzC7zfVtc2KMiRgDxN+fvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TpeXv0/JyXuOopX1oQXUsjhIT5rTRdJ2iF6+H28AO6HyqxgTbzN6gcjpMtdbSPBxA amRIxaHLY6gwhHKqM1Oqr+hX+YB0jWoD2MQCh3xWRJoHJyYj47tTWt3fzNdvvi2Zmg zZYbykwXFSgWAwxKruADyfKZeH8RmRIlBOMCRW58= 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 5.10 299/589] firmware: dmi: Correct an indexing error in dmi.h Date: Sat, 30 May 2026 18:03:00 +0200 Message-ID: <20260530160232.824174163@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160224.570625122@linuxfoundation.org> References: <20260530160224.570625122@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.10-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