From patchwork Wed Jan 12 17:35:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1579269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=NH0cVdq+; dkim-atps=neutral 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JYvpb5trBz9s1l for ; Thu, 13 Jan 2022 04:35:19 +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 1n7hWl-00032t-Iz; Wed, 12 Jan 2022 17:35:15 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n7hWj-00032m-7t for fwts-devel@lists.ubuntu.com; Wed, 12 Jan 2022 17:35:13 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (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-1.canonical.com (Postfix) with ESMTPS id EB0383F1C7 for ; Wed, 12 Jan 2022 17:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1642008912; bh=Ox0myFpg43sQr9UjZ6D57ATc78JWGwDTOMMBW265SpY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=NH0cVdq+Ul1VoiLcz3H90AiGaxHc4HOICCjC4pelrzg9OuiEbWZ2LlJ8UJLyRLDXI qrnhnlTWFWFuALwGBs1cKoPnvQdYIubJtQ/uXwWFtG1zSmb8/ZWmnjVAwXbqkE7dZr shQ9oLdlWdB0UOZwNxTjPiNEGDBHHXWivhsbnqCiPJsmYbdGjtzrJC18RyWMvafmqH 6dMbYJvMfnuHa8eZgJmWNJsHhKmBMAdL61eUe71A9Ts0OmDxOsCsr1phpLfgOvw7di Nyyp8o4iODN7Ayfv0ED8FJEpcwjNVzr7VKMYjWRZZJtn7rF9Xu0vyZaYU2Ga7Z1aj7 rmGV3dp8bScKw== Received: by mail-pj1-f71.google.com with SMTP id k13-20020a17090a3ccd00b001b356efebd6so7594499pjd.3 for ; Wed, 12 Jan 2022 09:35:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ox0myFpg43sQr9UjZ6D57ATc78JWGwDTOMMBW265SpY=; b=kwcUSmIWao4R+qX/m/ms0XoFBsf/k7cr63I7GjfHpQH3zlqvt7lGCD34AQDX/Wx24b TWlguLCtppQ1IhpZRx5F9rbi5qxEDxRsjS33xZOZVQeMW1e82E4dI4SQkixVAP/yERSp mXGkNHBXRxZJsfxBDAZzkxVQWkkEiixrDe7O8HRjiJAbnenFguFk4NeRfE6OLYR7ZEl3 EjYDjVK/kUhpLc86lrJrEW8hGVlWyaEWZmq5zQfWDjJfdqHrwNu4QN3gFSeSuxJqili9 N9KJ2BYlZRkvJu25C6sgPEmzpT1Ls3xHO5t5MU8XmUktNcsM+1BCjRRUF/OABdcOEZJX 9xSQ== X-Gm-Message-State: AOAM533k+1MCFgcpetPlxpT6xc+SKumM8o3Rx/jWnqxGIhBXDC5VG6lb 9Py0DtbSLzZyNu9kft3WnQVwTSTUUbud4uphRfYTZ5q2jnAd4cOLs5M6nw7mJEVlQK5QKU0lF0s dBWpQ6KwBTyjYm08+WKVrZzzZY0GbGgU+QcQdP4cG X-Received: by 2002:a17:90b:224c:: with SMTP id hk12mr679326pjb.62.1642008910886; Wed, 12 Jan 2022 09:35:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4mPJ5PlB3FXln9PqgKptxndABavL0nFJ+VR9WQWPqJBh/7Q/rN0BjkF0Iu9/jGUoX76rAhg== X-Received: by 2002:a17:90b:224c:: with SMTP id hk12mr679282pjb.62.1642008910565; Wed, 12 Jan 2022 09:35:10 -0800 (PST) Received: from canonical.com (node-1w7jr9yebujesi6vxbxcb0tc8.ipv6.telus.net. [2001:56a:78ed:fb00:9a1d:cc62:c324:ff88]) by smtp.gmail.com with ESMTPSA id q18sm250744pfn.50.2022.01.12.09.35.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 09:35:09 -0800 (PST) From: Alex Hung To: fwts-devel@lists.ubuntu.com Subject: [PATCH] s3: use system suspend default if --s3-sleep-type is not used Date: Wed, 12 Jan 2022 10:35:07 -0700 Message-Id: <20220112173507.947912-1-alex.hung@canonical.com> X-Mailer: git-send-email 2.32.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" Buglink: https://bugs.launchpad.net/bugs/1956914 Signed-off-by: Alex Hung Acked-by: Alex Hung --- src/acpi/s3/s3.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c index 45007df4..8b1c3ed1 100644 --- a/src/acpi/s3/s3.c +++ b/src/acpi/s3/s3.c @@ -76,10 +76,8 @@ static int s3_init(fwts_framework *fw) strncpy(sleep_type_orig, "deep", strlen("deep") + 1); } - if (!s3_sleep_type) { - if (fwts_set(PM_SUSPEND_PATH, "deep") != FWTS_OK) - fwts_log_error(fw, "Cannot set the sleep type to S3(deep), test with default type."); - } else { + if (s3_sleep_type) { + fwts_log_info(fw, "Override system suspend default by '%s'\n", s3_sleep_type); if (fwts_set(PM_SUSPEND_PATH, s3_sleep_type) != FWTS_OK) fwts_log_error(fw, "Cannot set the sleep type to %s, test with default type.", s3_sleep_type); }