From patchwork Thu Nov 15 23:25:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 998628 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="RlJitblH"; 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 42wyCB3Xfnz9s9G; Fri, 16 Nov 2018 10:25:26 +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 1gNR0j-0001pW-O3; Thu, 15 Nov 2018 23:25:21 +0000 Received: from mail-wm1-f65.google.com ([209.85.128.65]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1gNR0i-0001pK-LG for fwts-devel@lists.ubuntu.com; Thu, 15 Nov 2018 23:25:20 +0000 Received: by mail-wm1-f65.google.com with SMTP id u13-v6so19541867wmc.4 for ; Thu, 15 Nov 2018 15:25:20 -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=YQFTGw94dQik8EbF5r8VkxpzpE8opOrJTQleJA7D1m0=; b=RlJitblHYIoDx7UytKrwqs+D9S3O9mFABVYBdH1zghHOoqpljayIVeR4iSLpd2LmyC K//tvQumhTvJpmY1a2mgseyK1hoJzdf/h9riSooM0fN8AdevGrWiH/ojIfMAp9z7ekY7 I0R7mP3jYcoU1+0kTpIYdYdN0EXDOlv8eftkc= 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=YQFTGw94dQik8EbF5r8VkxpzpE8opOrJTQleJA7D1m0=; b=OBPnXcJlBKrq8YN/EKbMBVGBCJxzc9uNsgfFieVM+6ZD8cF3/uobKnFTm+2GHQMPVW A7M0BGpUx10OCXj9op8j4v4naz5mNKrwJvo9vnXhTrBWlNhWSNUkc/uRA1fSHn+7vs7Z ZkUp1Oy3xUqTNv8m62jNBtc3wvr7rja7QxAt94osrXUQ/utARIkq6nN8yzDL3wwB/EGF k7msZUbxMLKuVMEGyyrws0s3JGnPXgu0PWfW2Nz/8A4yxLh1NBt9EviMzxaOgIqM7jpc cKXrMWiBm6gIKzCgXYTEYDtVmGCWVWRV4dQJUlH0XuZEGyssxG0tUAjqR/KT59aTpBPB DNzg== X-Gm-Message-State: AGRZ1gLQUBFKAijw0E+EK3mWeNwZROm64yTriSivHF4ip0SWXXuOE3bR GgCSioDNPugRCcwdRugsfJrlFXKsTE8DVg== X-Google-Smtp-Source: AJdET5euM74aLlHr41gIDE116UIzHxvVIqzuRy6w3C8Z5vQVRR/eoflRtFPg6ZiS/VsF4nEvPx/APA== X-Received: by 2002:a1c:a906:: with SMTP id s6mr758512wme.44.1542324319877; Thu, 15 Nov 2018 15:25:19 -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.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 15:25:19 -0800 (PST) From: Leif Lindholm To: fwts-devel@lists.ubuntu.com Subject: [PATCH 1/4] lib: disable /dev/mem access on aarch64 Date: Thu, 15 Nov 2018 23:25:14 +0000 Message-Id: <20181115232517.4588-2-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" There is no valid use-case for having the /dev/mem interface enabled, let alone using it, on a multi-user aarch64 system. So turn fwts_mmap/ fwts_munmap into no-ops here. Signed-off-by: Leif Lindholm Acked-by: Alex Hung Acked-by: Colin Ian King --- src/lib/include/fwts.h | 3 +++ src/lib/src/fwts_mmap.c | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/lib/include/fwts.h b/src/lib/include/fwts.h index 3f343ef2..67d0b8f2 100644 --- a/src/lib/include/fwts.h +++ b/src/lib/include/fwts.h @@ -98,6 +98,7 @@ #define FWTS_ARCH_INTEL 1 #define FWTS_HAS_ACPI 1 #define FWTS_HAS_UEFI 1 +#define FWTS_USE_DEVMEM 1 #endif #if defined(__aarch64__) @@ -108,11 +109,13 @@ #if defined(__s390x__) #define FWTS_ARCH_S390X 1 +#define FWTS_USE_DEVMEM 1 #endif #if defined(__PPC64__) #undef FWTS_HAS_ACPI #undef FWTS_HAS_UEFI +#define FWTS_USE_DEVMEM 1 #endif /* verision 3-tuple into integer */ diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c index e28abf87..71c5135d 100644 --- a/src/lib/src/fwts_mmap.c +++ b/src/lib/src/fwts_mmap.c @@ -42,6 +42,7 @@ size_t fwts_page_size(void) return (size_t)(page_size == -1 ? FWTS_DEFAULT_PAGE_SIZE : page_size); } +#ifdef FWTS_USE_DEVMEM /* * fwts_mmap() * Try and map physical memory from offset address 'start' and length @@ -88,3 +89,15 @@ int fwts_munmap(void *mem, const size_t size) return FWTS_OK; } +#else /* FWTS_USE_DEVMEM */ +void *fwts_mmap(const off_t start __attribute__ ((unused)), + const size_t size __attribute__ ((unused))) +{ + return FWTS_MAP_FAILED; +} + +int fwts_munmap(void *mem __attribute__ ((unused)), + const size_t size __attribute__ ((unused))) { + return FWTS_ERROR; +} +#endif /* FWTS_USE_DEVMEM */ From patchwork Thu Nov 15 23:25:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 998630 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="TGhAO2Yn"; 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 42wyCC2wfJz9s9h; Fri, 16 Nov 2018 10:25:27 +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 1gNR0m-0001qb-RQ; Thu, 15 Nov 2018 23:25:24 +0000 Received: from mail-wm1-f66.google.com ([209.85.128.66]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1gNR0j-0001pe-UO for fwts-devel@lists.ubuntu.com; Thu, 15 Nov 2018 23:25:21 +0000 Received: by mail-wm1-f66.google.com with SMTP id r11-v6so20337306wmb.2 for ; Thu, 15 Nov 2018 15:25:21 -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=bJASZ1mIwy75elj73L5FS7GngUoqSAM4UwZ8IgCZZ0g=; b=TGhAO2YnX9W3G2kPL4c4j8VIwqdMU9vSoGAnnKkLgKaHJ0DT0cDkbLiDTluJrbrj0o xnV6JVU2MntB+SgB/FOoeBCB3/k4xl6e90XXdQmtsn8uezbJbmudBjLlVGoidD5wRjQY 0sa9t4groxxkSsufpDAE0FoiEGcp6P6q/NKbY= 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=bJASZ1mIwy75elj73L5FS7GngUoqSAM4UwZ8IgCZZ0g=; b=TPBbp0FYKMA0yCsSy/08cGGRpMAIgSYUpjuBknIamsAfiXCHbcGaEsdbXPqlkyDNr+ kijrbQN8/C4mHsaMS38xfDCc/FIUt2nu9XwM951yZzjNuk2K3M3xv9GdyiTSKFXrEEQe Hh95uFpRF11lMXhgHGgwWF7fZ8ijOmsfR+6XGx794Ha3n+rmCKaMfkNt0VLkji8PE1h2 +lDmLHyi+HoTflP7KHqIf6boWkq1k5j++VqzvMLHJ271aRYsqoIgzySkRkmdzRj5UTr3 XaA1dQ4RfyNiVQV9ieaQ12wpDn/NZ9efjBJce1UXCDeAM0t4JkLJTgNeR5K/7Tcr1qzj qCag== X-Gm-Message-State: AGRZ1gI4+7+fGqPxfCa/S6ZxK1GCgECiT/TuhUjVMU7JqTMvYwsXhXrB v1xdiwyuBoFhh9STySfmRr3Ekcy4Acb0VQ== X-Google-Smtp-Source: AJdET5f7Zg1RBznJBL9aRU9EOBEJxYIyJqwhGUeoNRyn1/1l7n4kwKestq15MjgWiBUG2ulawaoc8Q== X-Received: by 2002:a1c:f30b:: with SMTP id q11-v6mr6762755wmq.45.1542324321208; Thu, 15 Nov 2018 15:25:21 -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.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 15:25:20 -0800 (PST) From: Leif Lindholm To: fwts-devel@lists.ubuntu.com Subject: [PATCH 2/4] dmicheck: drop unaligned memcpy Date: Thu, 15 Nov 2018 23:25:15 +0000 Message-Id: <20181115232517.4588-3-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" fwts_memcpy_unaligned was used to deal with the fact that the kernel was giving access to smbios tables through /dev/mem on aarch64 with device memory mappings. This was never a valid way of accessing SMBIOS tables on aarch64, so now /dev/mem access has been disabled on that architecture, go back to a normal memcpy. Signed-off-by: Leif Lindholm Acked-by: Alex Hung Acked-by: Colin Ian King --- src/dmi/dmicheck/dmicheck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c index ba6f03c0..c794973b 100644 --- a/src/dmi/dmicheck/dmicheck.c +++ b/src/dmi/dmicheck/dmicheck.c @@ -379,7 +379,7 @@ static void* dmi_table_smbios30(fwts_framework *fw, fwts_smbios30_entry *entry) } table = malloc(length); if (table) - fwts_memcpy_unaligned(table, mem, length); + memcpy(table, mem, length); (void)fwts_munmap(mem, length); return table; } From patchwork Thu Nov 15 23:25:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 998631 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="PNzrEbyp"; 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 42wyCC5Ltwz9sB5; Fri, 16 Nov 2018 10:25:27 +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 1gNR0m-0001qi-Um; Thu, 15 Nov 2018 23:25:24 +0000 Received: from mail-wm1-f65.google.com ([209.85.128.65]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1gNR0l-0001q2-90 for fwts-devel@lists.ubuntu.com; Thu, 15 Nov 2018 23:25:23 +0000 Received: by mail-wm1-f65.google.com with SMTP id u13-v6so19541928wmc.4 for ; Thu, 15 Nov 2018 15:25:23 -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=9nECLmmFZYzO9ksJHG6L+Bur5sVIUZ5bYbKbSC72cqQ=; b=PNzrEbypyHPGZUHvkX/hwreiriU2SgzqcuZ5BiiL1qIzRphZhmP18gzGm++WBn8ZWs ZgPQohTIwT5OBDy5ZVvKLs45OMHoltFy6m3PITd1LGcIPE77Yu/BFXsqPrtnBtzLeNZu LSdfwVqbZlZ+1UPTclDbj1Fb//3mUVWYVCaX4= 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=9nECLmmFZYzO9ksJHG6L+Bur5sVIUZ5bYbKbSC72cqQ=; b=gxh9uYSzfLqaW1yzw6Onavs6VmyZ5OEKrUrRDuvzDjl0L9FU/6vlDyLGPuMhI7UXUO PWviM4wePJrShmeYRtmw+oz8uIGaHsJSCPlMX2mAApSX2qn+sLeCDbCJp4QM6tVUDEL+ LP78cZOnFEUJF3nkXyFdRSI147SM/ik95PWRaM0+6ONE5E7tYN8uwyqjhald47p3xYMc 2fEg8F/QtUEP8jv+n3EDAVB7LGHfgnhI5bQaP5k9m67SP/x7usj2oyd5PINvJXchD55S dlwJvUVL02ghnKp7ppqtHVqZgTo5HdZbIPUEVL1TLF7EMCKpEpHylrPIv8skce05jLGm NHRw== X-Gm-Message-State: AGRZ1gKXYGZ4Z8tShM6VHSqnLSzGEwbOzW+AlP8bKmGVh+8/L+msdQUr Re0R5eBsXGbNWoG2pitJ5O3fGaC8vKoLWA== X-Google-Smtp-Source: AJdET5d9wR+cD8Be5I0Et0x+vB4w6RTj+VHUsHiajJuJdpguwNXXwYLEt0y1v0uj9DF1rEx0r/7aNQ== X-Received: by 2002:a1c:9c88:: with SMTP id f130-v6mr7055553wme.135.1542324322552; Thu, 15 Nov 2018 15:25:22 -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.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 15:25:21 -0800 (PST) From: Leif Lindholm To: fwts-devel@lists.ubuntu.com Subject: [PATCH 3/4] lib: drop fwts_memcpy_unaligned Date: Thu, 15 Nov 2018 23:25:16 +0000 Message-Id: <20181115232517.4588-4-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" fwts_memcpy_unaligned has no users left in the tree, so drop it. Signed-off-by: Leif Lindholm Acked-by: Alex Hung Acked-by: Colin Ian King --- src/lib/include/fwts_stringextras.h | 1 - src/lib/src/fwts_stringextras.c | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/src/lib/include/fwts_stringextras.h b/src/lib/include/fwts_stringextras.h index cd5fa822..7b605b4b 100644 --- a/src/lib/include/fwts_stringextras.h +++ b/src/lib/include/fwts_stringextras.h @@ -25,6 +25,5 @@ void fwts_chop_newline(char *str); char *fwts_realloc_strcat(char *orig, const char *newstr); const char *fwts_string_endswith(const char *str, const char *postfix); -void fwts_memcpy_unaligned(void *dst, const void *src, size_t n); #endif diff --git a/src/lib/src/fwts_stringextras.c b/src/lib/src/fwts_stringextras.c index 1f22224d..b4053579 100644 --- a/src/lib/src/fwts_stringextras.c +++ b/src/lib/src/fwts_stringextras.c @@ -98,18 +98,3 @@ const char *fwts_string_endswith(const char *str, const char *postfix) return str + sl - pl; } - -/* - * fwts_memcpy_unaligned() - * perform byte copy of n bytes from src to dst. - */ -void fwts_memcpy_unaligned(void *dst, const void *src, size_t n) -{ - size_t i = n; - - if (dst == NULL || src == NULL || n == 0 ) - return; - - while (i--) - ((uint8_t *)dst)[i] = ((const uint8_t *)src)[i]; -} 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;