From patchwork Thu Nov 15 23:25:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 998632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="WBYh7WNB"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42wyCD6z8Qz9s47; Fri, 16 Nov 2018 10:25:28 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gNR0o-0001rV-3z; Thu, 15 Nov 2018 23:25:26 +0000 Received: from mail-wm1-f67.google.com ([209.85.128.67]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1gNR0m-0001qR-J6 for fwts-devel@lists.ubuntu.com; Thu, 15 Nov 2018 23:25:24 +0000 Received: by mail-wm1-f67.google.com with SMTP id y139so3024656wmc.5 for ; Thu, 15 Nov 2018 15:25:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=c7GxPyGTlbxQyAMnZvAAWo/gfMMoc7RurG96v5q1TjY=; b=WBYh7WNBZvhtTKg1Xb1s+JERuMf5sNs00oCwtMDWVIk877zdM5UFBxCMkNKkQF9+Ye N1wo70YuI1gb4qClNW6IQccExxslk8C+R09azZ3Vjx9IElGuldkmtrLy/yLxYoc17N+s 3lRS7FR1W4irW3ufQ5WBEVPdd4uvJEo3HUYqQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=c7GxPyGTlbxQyAMnZvAAWo/gfMMoc7RurG96v5q1TjY=; b=bez+YL8pLPYy4X1cQcnhXPqc1IqFmNJV7HQE7ZJoBWTZE2TlABpdQoTlgi6ojRJlYP KWHyd24WWQVRIGJP90J7rqlZmFzCQxIfWNWdVyKldg1U5wQb7ft78n9rY7QbIJK3F1LZ dBmdiogLEqa7s2KwPTIOncA5ClVU4Y/Bd4uIQ4C+VWlgl10wnZlyKLhf4JM4GW/k4iuU sR4vTniV72KHfarUHKpH7DW0cAHSqpnAmcglmlWhKKnHCSzdPQCjAc6pjjadz8VL1va7 R879vt/O0hTcsa2dSj56DMrnUFArmhmaErBVkJ905v+Kq1VV/q8uTHRyV6R913VoJ6PT r3WA== X-Gm-Message-State: AGRZ1gJjKiPlKKxAHGYhPDB9JcbN+I/shim3Gj/wHs6e3bslJVY3xV9V q1FQgWf2CtB4iR9e7zjy0uvA3//airJqSg== X-Google-Smtp-Source: AJdET5diy2XwKId/AqMRTwKXt54R5+kiN8pVtneBCAWp0djzySYAeGlvoXZ50R6dgVmLuIeq3TXZKg== X-Received: by 2002:a1c:9b4b:: with SMTP id d72-v6mr6797555wme.72.1542324323846; Thu, 15 Nov 2018 15:25:23 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id h2sm5261791wrv.87.2018.11.15.15.25.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 15:25:22 -0800 (PST) From: Leif Lindholm To: fwts-devel@lists.ubuntu.com Subject: [PATCH 4/4] dmicheck: use dmi_load_file in preference to fwts_mmap Date: Thu, 15 Nov 2018 23:25:17 +0000 Message-Id: <20181115232517.4588-5-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181115232517.4588-1-leif.lindholm@linaro.org> References: <20181115232517.4588-1-leif.lindholm@linaro.org> 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: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" dmi_load_file uses the /sys interface to access SMBIOS tables, whereas fwts_mmap maps (or attempts to map) tables directly through /dev/mem. Use the proper kernel interface in preference, falling back to /dev/mem where that is not available. Signed-off-by: Leif Lindholm Acked-by: Alex Hung Acked-by: Colin Ian King --- Note: this one is really unrelated from the other 3 patches in the series, but it sprung from the same itch, so I included it. src/dmi/dmicheck/dmicheck.c | 47 +++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c index c794973b..19c1bd48 100644 --- a/src/dmi/dmicheck/dmicheck.c +++ b/src/dmi/dmicheck/dmicheck.c @@ -322,6 +322,18 @@ static void* dmi_table_smbios(fwts_framework *fw, fwts_smbios_entry *entry) return NULL; } + if (dmi_load_file("/sys/firmware/dmi/tables/smbios_entry_point", anchor, 4) == FWTS_OK + && strncmp(anchor, "_SM_", 4) == 0) { + table = malloc(length); + if (!table) + return NULL; + if (dmi_load_file("/sys/firmware/dmi/tables/DMI", table, length) == FWTS_OK) { + fwts_log_info(fw, "SMBIOS table loaded from /sys/firmware/dmi/tables/DMI\n"); + return table; + } + free(table); + } + mem = fwts_mmap(addr, length); if (mem != FWTS_MAP_FAILED) { /* Can we safely copy the table? */ @@ -337,17 +349,6 @@ static void* dmi_table_smbios(fwts_framework *fw, fwts_smbios_entry *entry) return table; } - if (dmi_load_file("/sys/firmware/dmi/tables/smbios_entry_point", anchor, 4) == FWTS_OK - && strncmp(anchor, "_SM_", 4) == 0) { - table = malloc(length); - if (!table) - return NULL; - if (dmi_load_file("/sys/firmware/dmi/tables/DMI", table, length) == FWTS_OK) { - fwts_log_info(fw, "SMBIOS table loaded from /sys/firmware/dmi/tables/DMI\n"); - return table; - } - free(table); - } fwts_log_error(fw, "Cannot mmap SMBIOS table from %8.8" PRIx32 "..%8.8" PRIx32 ".", entry->struct_table_address, entry->struct_table_address + entry->struct_table_length); @@ -369,6 +370,18 @@ static void* dmi_table_smbios30(fwts_framework *fw, fwts_smbios30_entry *entry) return NULL; } + if (dmi_load_file("/sys/firmware/dmi/tables/smbios_entry_point", anchor, 5) == FWTS_OK + && strncmp(anchor, "_SM3_", 5) == 0) { + table = malloc(length); + if (!table) + return NULL; + if (dmi_load_file_variable_size("/sys/firmware/dmi/tables/DMI", table, &length) == FWTS_OK) { + fwts_log_info(fw, "SMBIOS30 table loaded from /sys/firmware/dmi/tables/DMI\n"); + return table; + } + free(table); + } + mem = fwts_mmap(addr, length); if (mem != FWTS_MAP_FAILED) { /* Can we safely copy the table? */ @@ -384,18 +397,6 @@ static void* dmi_table_smbios30(fwts_framework *fw, fwts_smbios30_entry *entry) return table; } - if (dmi_load_file("/sys/firmware/dmi/tables/smbios_entry_point", anchor, 5) == FWTS_OK - && strncmp(anchor, "_SM3_", 5) == 0) { - table = malloc(length); - if (!table) - return NULL; - if (dmi_load_file_variable_size("/sys/firmware/dmi/tables/DMI", table, &length) == FWTS_OK) { - fwts_log_info(fw, "SMBIOS30 table loaded from /sys/firmware/dmi/tables/DMI\n"); - return table; - } - free(table); - } - fwts_log_error(fw, "Cannot mmap SMBIOS 3.0 table from %16.16" PRIx64 "..%16.16" PRIx64 ".", entry->struct_table_address, entry->struct_table_address + entry->struct_table_max_size); return NULL;