From patchwork Tue Oct 27 19:29:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1388947 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=TYfgVVdG; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLMJ81S1cz9sV0 for ; Wed, 28 Oct 2020 06:31:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6856F824F7; Tue, 27 Oct 2020 20:30:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="TYfgVVdG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 045F98249C; Tue, 27 Oct 2020 20:29:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_FILL_THIS_FORM_SHORT,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6C82D8249E for ; Tue, 27 Oct 2020 20:29:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1603826985; bh=Vq7ZXRWEeWyzGmY5c9MDelZiF1eEtC2Cg7/C5imrZcM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=TYfgVVdGtCMp9ydIS05mE/XB8qUqpmD55VtqyWZR3lMy6n6sO3bCQsn+I2+lQuomy 3ZzpR2wgp+kC8itRx/yl/F5G9B7xufZnXTSAI+YT17vhlBchGmBNhcj69l4658GOjK 9Y01bTvKQYKSjPHSuXXXORxbL+ISlM2SyQk5B2ho= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MkYXm-1k6egh1gnm-00m6Hs; Tue, 27 Oct 2020 20:29:45 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: Rasmus Villemoes , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH v3 6/8] test: adjust sysreset tests Date: Tue, 27 Oct 2020 20:29:26 +0100 Message-Id: <20201027192928.16508-7-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027192928.16508-1-xypron.glpk@gmx.de> References: <20201027192928.16508-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:PqoCeZqP785UW48MHAiUyjzOqfk/8lEvl82ovbZf74EKFY6S8kW zKzyXkpwUA9rBXncPiIUuJHxnaYmei4yuRjlgznnHNwPoZayVv0SxlohlH6dGoDzoVUTczc uVRpBFKZIQaM5tuB/Mj3Oqv78+/pJ5nRmtLNQUwrbbMiqYWsVhOdykCBz2dZtQ4NbQAr5zt Bc4iKNceLR2w5owA1JuOw== X-UI-Out-Filterresults: notjunk:1;V03:K0:nonTKHhSJLg=:U1SBISsY/lL2kC4p7RR9+D FAzdtUfRFboiacSg7wfObcO2+hdTXtTf4FlAYCxLiiN8k7ro5oFFVQzBUxRgLLW1wR3eBa7/j gXvsZD4gej/gUvAJrgChLVnv2Aelhjb4oPEkH/1dTZgn7H86/2YOjlrOoxVwgO8qHU2BMlaB3 0paB/oHE+/UYs61F5LAXm9vKazd6iGJEoeyWE3v6xSo4ZeHQ2OZEJOLxZtSU3XnmoavvncVTB 3kbzRCxKKlxiDpCQ1arqZ8W0dljJ5ETyiUh5oJozbzaePwhMm3+P213CWYhFeVGkmJI0qTNde dCqpVTmZMyWXXrjivCFT112jWBcu1/7P/GuB/lSwP+CivYtjk9D7l48e/vtqIHGnSxQbO9WnE uF++pHW09F3QKmkYaGYjNs7dnjyr2NaVYT6taso6UndU5anccZyJppshuHRzX6LuzITpbOmnt NuGv4WyvbmXym5Iq9bjGm575wvhvUzYMpOvDab92fusfXB4I4hsq2Atdz8mayT+ZCkAbu3Czr RBcgBmopkv7X5vNivOoSlOR0S1PHoqCUnxTTnTADVJvivlHh03zEOdN4uY8jQD8EvvGVInVyd GEEasJZ+FwoD+Op2+8H47feuQr+zuWTEb6OVj4+fm/NeK+rmZ0HDUqnbK/qWrVSLgtPR1bu7b 7xcXwGyizNgl3FKSJTjk+NnrZ95tdveUy5EgEMkUyzmocmKNiyI64gIiC63slyeXm0BEBPtVk 4pC/QXK5M5n7lQpkxwwhFKxwDtFX/f3TpM7jY6OfNlxaNnkCpyC/5EjYrfN14xFw/ivGSwc86 9i3NLXJj/xiO64xu/VWB5h1jVmdZOLSQITK0m1e6LR8TqQFg90FGN5l+xM/G7kYBvIoP6yTfs 2YLbMAN7vlSBoyv6pUjg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean As we have a working COLD_RESET on the sandbox the sysreset test has to be adjusted. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- v3: no change v2: no change --- test/dm/sysreset.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.28.0 diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index aec97b1cbb..691683c567 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -37,7 +37,9 @@ static int dm_test_sysreset_base(struct unit_test_state *uts) /* Device 2 is the cold sysreset device */ ut_assertok(uclass_get_device(UCLASS_SYSRESET, 2, &dev)); ut_asserteq(-ENOSYS, sysreset_request(dev, SYSRESET_WARM)); + state->sysreset_allowed[SYSRESET_COLD] = false; ut_asserteq(-EACCES, sysreset_request(dev, SYSRESET_COLD)); + state->sysreset_allowed[SYSRESET_COLD] = true; state->sysreset_allowed[SYSRESET_POWER] = false; ut_asserteq(-EACCES, sysreset_request(dev, SYSRESET_POWER)); state->sysreset_allowed[SYSRESET_POWER] = true; @@ -71,22 +73,25 @@ static int dm_test_sysreset_walk(struct unit_test_state *uts) struct sandbox_state *state = state_get_current(); /* If we generate a power sysreset, we will exit sandbox! */ + state->sysreset_allowed[SYSRESET_WARM] = false; + state->sysreset_allowed[SYSRESET_COLD] = false; state->sysreset_allowed[SYSRESET_POWER] = false; state->sysreset_allowed[SYSRESET_POWER_OFF] = false; ut_asserteq(-EACCES, sysreset_walk(SYSRESET_WARM)); ut_asserteq(-EACCES, sysreset_walk(SYSRESET_COLD)); ut_asserteq(-EACCES, sysreset_walk(SYSRESET_POWER)); + ut_asserteq(-EACCES, sysreset_walk(SYSRESET_POWER_OFF)); /* * Enable cold system reset - this should make cold system reset work, * plus a warm system reset should be promoted to cold, since this is * the next step along. */ - state->sysreset_allowed[SYSRESET_COLD] = true; + state->sysreset_allowed[SYSRESET_WARM] = true; ut_asserteq(-EINPROGRESS, sysreset_walk(SYSRESET_WARM)); - ut_asserteq(-EINPROGRESS, sysreset_walk(SYSRESET_COLD)); + ut_asserteq(-EACCES, sysreset_walk(SYSRESET_COLD)); ut_asserteq(-EACCES, sysreset_walk(SYSRESET_POWER)); - state->sysreset_allowed[SYSRESET_COLD] = false; + state->sysreset_allowed[SYSRESET_COLD] = true; state->sysreset_allowed[SYSRESET_POWER] = true; return 0;