From patchwork Thu Aug 26 17:51:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1521265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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; 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=FCnvSpIw; 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 4GwVlR4NRWz9sWc for ; Fri, 27 Aug 2021 03:51:30 +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 1mJJXB-0007Fk-43; Thu, 26 Aug 2021 17:51:25 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-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 1mJJX6-0007FZ-Nx for fwts-devel@lists.ubuntu.com; Thu, 26 Aug 2021 17:51:20 +0000 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8B09940316 for ; Thu, 26 Aug 2021 17:51:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1630000280; bh=BzK9EaT28KBbPcbhvwvqk9io5p2Hr4JogwgmffmY5uI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=FCnvSpIwKLVuv8D+NXi1ToR5e5z/nG7lNrpiiCDlgnN639lvUZmYBOjfwQ8cmCEqp I5iy8ca9lZLnftffihRtMeXW4Y5WgRJgDazdHopWJ4B4XEeVMEtCMs/E+qR7t/V5BZ 0C9xvd/Wqs5ka3UMZC/UzDpb14uOhTILKPpuVYWLFwq/Ozu10mkPAcfqUTs1hCIfqR 5WhPcHrKDkgajfvPFuJZWr4Wgz21Z2MEw4qy4xIIj09WnlzHuoVCPUJr1yiUvtp0cQ SOh0W0UCU+epiQ+LX3AoHFdO9stlctuF7MFXRVVn9Sw3MdFH0vcyyi7rkh+t7em3L+ tY6qT/fqOZGuQ== Received: by mail-pf1-f199.google.com with SMTP id g17-20020a056a00079100b003e1010a1ad4so862795pfu.5 for ; Thu, 26 Aug 2021 10:51:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BzK9EaT28KBbPcbhvwvqk9io5p2Hr4JogwgmffmY5uI=; b=VB1K/yW6MZJegFhoMXLYfUxb0WBJq7zDRV+C3DncGaiKT7zH6gOtDzw08a0VLRPO9k 8lNBkqGj8Dme0Q20S5C3iFoodhSmwWmXTe0keXWDRMtC3MJ9/fD8v7nTa9/TaDcNjFdc 2BeOSUyGlZixNJWtktfzgQLjY8TEWskgja5N30iS8gVSQ1suUwZUgWxz4CggtM/uJJ3c XqnNC1NUdni2HQnv9F2qGmOjzABkv1PJCyii9xbUj6FCscdfBHrBZS2x1IV/q97iRv+i dHk1rx/lOCiL85H8gzTbBBtLNb17LVLQtez+lb4WxVNAVLxtyrFsH343a1wlgL3QjwkU HO4w== X-Gm-Message-State: AOAM530klWM1FmhMa+ntk87bS7J8D6d9/veF4cW566KpgqKKW1vu1x4i MzonyvOB50s/ron/LqoPR3JqlnN/+Yz58+4ujcMzM+DY8tDo3l4PrquIA2H/bLE3PrPj4Du+5DR u6AzB4Gwyz/ubHcLKyiyiUXhE2/Vdse7amM0JKzZH X-Received: by 2002:a17:90b:206:: with SMTP id fy6mr5607218pjb.73.1630000278545; Thu, 26 Aug 2021 10:51:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnU8mIqvKcf+bVCF5QIfzjhlXxnWLOTh8h9yuBiBAd3uSeyKTJj3Y/mwnkGqm4dC5rNIirDw== X-Received: by 2002:a17:90b:206:: with SMTP id fy6mr5607189pjb.73.1630000278104; Thu, 26 Aug 2021 10:51:18 -0700 (PDT) Received: from canonical.com (node-1w7jr9yebujeq5th4a1ypmgfk.ipv6.telus.net. [2001:56a:78ed:fb00::db0]) by smtp.gmail.com with ESMTPSA id a20sm9479039pjh.46.2021.08.26.10.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 10:51:17 -0700 (PDT) From: Alex Hung To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: replace fwts_firmware_detect() by fw->firmware_type Date: Thu, 26 Aug 2021 11:51:16 -0600 Message-Id: <20210826175116.863036-1-alex.hung@canonical.com> X-Mailer: git-send-email 2.33.0 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" They are used interchangabley in fwts and let's stick with one for readability and save some CPU cycles. There are no functional changes. Signed-off-by: Alex Hung Acked-by: Ivan Hu --- src/acpi/boot/boot.c | 2 +- src/lib/src/fwts_efi_module.c | 2 +- src/opal/power_mgmt_info.c | 2 +- src/opal/reserv_mem.c | 2 +- src/uefi/csm/csm.c | 2 +- src/uefi/esrt/esrt.c | 2 +- src/uefi/esrtdump/esrtdump.c | 2 +- src/uefi/uefibootpath/uefibootpath.c | 2 +- src/uefi/uefidump/uefidump.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/acpi/boot/boot.c b/src/acpi/boot/boot.c index cd41452f..ffbd2cd1 100644 --- a/src/acpi/boot/boot.c +++ b/src/acpi/boot/boot.c @@ -35,7 +35,7 @@ static int boot_init(fwts_framework *fw) fwts_log_error(fw, "Cannot read ACPI tables."); return FWTS_ERROR; } - if (fwts_firmware_detect() == FWTS_FIRMWARE_UEFI) { + if (fw->firmware_type == FWTS_FIRMWARE_UEFI) { fwts_log_error(fw, "ACPI BOOT table is deprecated on UEFI firmware, skipping test"); return FWTS_SKIP; } diff --git a/src/lib/src/fwts_efi_module.c b/src/lib/src/fwts_efi_module.c index 3756d614..c1bc5ea1 100644 --- a/src/lib/src/fwts_efi_module.c +++ b/src/lib/src/fwts_efi_module.c @@ -214,7 +214,7 @@ int fwts_lib_efi_runtime_kernel_lockdown(fwts_framework *fw) int fwts_lib_efi_runtime_module_init(fwts_framework *fw, int *fd) { - if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) { + if (fw->firmware_type != FWTS_FIRMWARE_UEFI) { fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted."); return FWTS_ABORTED; } diff --git a/src/opal/power_mgmt_info.c b/src/opal/power_mgmt_info.c index f53525d2..dc0c79f6 100644 --- a/src/opal/power_mgmt_info.c +++ b/src/opal/power_mgmt_info.c @@ -84,7 +84,7 @@ static int power_mgmt_init(fwts_framework *fw) { int ret; - if (fwts_firmware_detect() != FWTS_FIRMWARE_OPAL) { + if (fw->firmware_type != FWTS_FIRMWARE_OPAL) { fwts_skipped(fw, "The firmware type detected was non OPAL " "so skipping the OPAL Power Management DT checks."); diff --git a/src/opal/reserv_mem.c b/src/opal/reserv_mem.c index 2195f2aa..53274951 100644 --- a/src/opal/reserv_mem.c +++ b/src/opal/reserv_mem.c @@ -105,7 +105,7 @@ static char *make_message(const char *fmt, ...) static int reserv_mem_init(fwts_framework *fw) { - if (fwts_firmware_detect() != FWTS_FIRMWARE_OPAL) { + if (fw->firmware_type != FWTS_FIRMWARE_OPAL) { fwts_skipped(fw, "The firmware type detected was non OPAL " "so skipping the OPAL Reserve Memory DT checks."); diff --git a/src/uefi/csm/csm.c b/src/uefi/csm/csm.c index 372b2919..b26e9c3c 100644 --- a/src/uefi/csm/csm.c +++ b/src/uefi/csm/csm.c @@ -45,7 +45,7 @@ static int csm_test1(fwts_framework *fw) fwts_log_info(fw, "Checking for UEFI Compatibility Support Module (CSM)"); - if (fwts_firmware_detect() == FWTS_FIRMWARE_UEFI) + if (fw->firmware_type == FWTS_FIRMWARE_UEFI) flag |= EFI_SUPPORT; /* Get Int 10h vector from segment/offset realmode address */ diff --git a/src/uefi/esrt/esrt.c b/src/uefi/esrt/esrt.c index 7193ef8c..8d613bcb 100644 --- a/src/uefi/esrt/esrt.c +++ b/src/uefi/esrt/esrt.c @@ -40,7 +40,7 @@ static int esrt_init(fwts_framework *fw) { - if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) { + if (fw->firmware_type != FWTS_FIRMWARE_UEFI) { fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted."); return FWTS_ABORTED; } diff --git a/src/uefi/esrtdump/esrtdump.c b/src/uefi/esrtdump/esrtdump.c index 68e5993b..ff4e40eb 100644 --- a/src/uefi/esrtdump/esrtdump.c +++ b/src/uefi/esrtdump/esrtdump.c @@ -32,7 +32,7 @@ static int esrtdump_init(fwts_framework *fw) { - if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) { + if (fw->firmware_type != FWTS_FIRMWARE_UEFI) { fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted."); return FWTS_ABORTED; } diff --git a/src/uefi/uefibootpath/uefibootpath.c b/src/uefi/uefibootpath/uefibootpath.c index 417d36c3..cb942020 100644 --- a/src/uefi/uefibootpath/uefibootpath.c +++ b/src/uefi/uefibootpath/uefibootpath.c @@ -35,7 +35,7 @@ static inline bool uefibootpath_check_pnpid(uint32_t id) static int uefibootpath_init(fwts_framework *fw) { - if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) { + if (fw->firmware_type != FWTS_FIRMWARE_UEFI) { fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted."); return FWTS_ABORTED; } diff --git a/src/uefi/uefidump/uefidump.c b/src/uefi/uefidump/uefidump.c index 6cd4a05b..c584c50f 100644 --- a/src/uefi/uefidump/uefidump.c +++ b/src/uefi/uefidump/uefidump.c @@ -1523,7 +1523,7 @@ static void uefidump_var(fwts_framework *fw, fwts_uefi_var *var) static int uefidump_init(fwts_framework *fw) { - if (fwts_firmware_detect() != FWTS_FIRMWARE_UEFI) { + if (fw->firmware_type != FWTS_FIRMWARE_UEFI) { fwts_log_info(fw, "Cannot detect any UEFI firmware. Aborted."); return FWTS_ABORTED; }