From patchwork Mon Aug 7 09:36:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ivanhu X-Patchwork-Id: 1817712 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=GEt14kUj; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RKB6D5dkQz1yYl for ; Mon, 7 Aug 2023 19:36:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qSwf9-0006OR-0z; Mon, 07 Aug 2023 09:36:31 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qSwf7-0006O3-72 for fwts-devel@lists.ubuntu.com; Mon, 07 Aug 2023 09:36:29 +0000 Received: from canonical.com (unknown [106.104.136.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 83286400F1 for ; Mon, 7 Aug 2023 09:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1691400988; bh=yvF0sARlBF1g9NrelylnK4KS8d9PfCXGQ1Bj54WZOk4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=GEt14kUj72EdPn09Z3pWJE+bmi2/Vv0HeGVO3F/AJ/98xoR8GQzB6LVqAyEM8KXgW jRXPQT1RfCfH3wYe3IocUteF3NCsDXZHx2TNA1RpAMyWG6ddSR084Em/UVTP+2wx8L +MOm0bu2p3F5J2WUffGSPgkOQszNug9A3RdTJWcVq7FWR0LpVKMqEcxl3kSl4uJvia KqEgpvoCYIFrtZKeOVk2g+NVuik0QXBsXwQG5glxe+Nd8sHsFbs3clAPtyMEzHSvPL CAOGiuwXYtNsUh6GjwJWn5Dzst18/E1yZgomV6A/UUYByp8v9h9Y8e1oRJSct9eoCv qxC/F8JHLoSVg== From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH] dmicheck: update supported DMI version to 3.7 Date: Mon, 7 Aug 2023 17:36:23 +0800 Message-Id: <20230807093623.38827-1-ivan.hu@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" BugLink: https://bugs.launchpad.net/fwts/+bug/2029884i SMBIOS specification version 3.7.0 release on 2023-07-21. https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.7.0.pdf Signed-off-by: Ivan Hu --- src/dmi/dmicheck/dmicheck.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c index 50082b24..90c60fbb 100644 --- a/src/dmi/dmicheck/dmicheck.c +++ b/src/dmi/dmicheck/dmicheck.c @@ -35,7 +35,7 @@ #include #include -#define DMI_VERSION (0x0360) +#define DMI_VERSION (0x0370) #define VERSION_MAJOR(v) ((v) >> 8) #define VERSION_MINOR(v) ((v) & 0xff) @@ -299,7 +299,8 @@ static const fwts_dmi_type_length type_info[] = { { 17, 0x208, 0x207, 0x22 }, { 17, 0x302, 0x208, 0x28 }, { 17, 0x303, 0x302, 0x54 }, - { 17, MAX_VERSION, 0x303, 0x5c }, + { 17, 0x307, 0x303, 0x5c }, + { 17, MAX_VERSION, 0x307, 0x64 }, { 19, 0x207, 0x201, 0xf }, { 19, MAX_VERSION, 0x207, 0x1f }, { 20, 0x207, 0x201, 0x13 }, @@ -1499,8 +1500,6 @@ static void dmicheck_entry(fwts_framework *fw, if (hdr->length < 0x0d) break; - dmi_reserved_bits_check(fw, table, addr, "Slot Characteristics 2", hdr, sizeof(uint8_t), 0x0c, 7, 7); - if (hdr->length < 0x11) break; if (!((data[0x5] == 0x06) ||