From patchwork Mon Mar 8 21:38:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Carriere X-Patchwork-Id: 395512 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp2062170jai; Mon, 8 Mar 2021 13:39:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJz7FO79/zrLz0fndDO9AKQECp7/NCWvLRA5OnNRwiYenht/XcTqUyo+PCYbqrzTo36yQ/MI X-Received: by 2002:a17:906:3881:: with SMTP id q1mr17152906ejd.490.1615239556087; Mon, 08 Mar 2021 13:39:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615239556; cv=none; d=google.com; s=arc-20160816; b=kr50BtOl8KsqTKWTyclBiLdOwZHHHiTKp+UWrlJSUG7Cbh0IFOdRxz+robZzo06poi OfYOJVqeWqYj31GCRxZfoMElqGwh5SevoIMBjxKXe1vOUcoU/XaiMJFtW7r5cGG9pQfj pHV0PSNEBxZIvg7tgDn7AcdwQ4ajp6kD26XGfuqBJbA6/JGqWuD/mO4qElwOsMjv7Uca iBDoRgEqXEcRnu2gBXg3dn/7TVWbUxuJ6s5t9XiqdvuStY7zF0+RPNIXEttb6Nr5txu2 X0GSUP0s6w9stWulAax7QWkpZBEaoBzWur5tRPYd42sZ0si7VPcpeWgQzzhzNF0dCfmr DFaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=zMge/MdqAxoriKjvpg9+dWvINmk2NCFaSMM9dehnhjo=; b=bQgNeziwENdlyPN/cdUrMXpwlIrbotmI7pA+icbkdKAx42erstlydx+sebDMEB2oQ2 LIAx9JAciGkMSbTYXF3GEejkTVdnuzvrWyvTawvL47pejP+r7Z6nuC04O4wiEmKl0UZd PDGpozav+B+kZS4Jx7dRPzZmI2nziOJ+NWQU4x1Cd5CqPrApXYt8g/YS5+QHZl0cCzMO IlBLSymxhcZmMH+r4fXO2XvaiPQJSQ3nbA4ton5t4yxA508dsZ02tN0tuYuxuz7qpoOU 6FGPBmXEgS3LGu8BVUOHZkc0ksmavY7FxLN9EyWmb40Wu3zFd+vD/v7N8SETJEH0n7Ey DLgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pqSp+KWD; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id s23si7641584ejf.192.2021.03.08.13.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 13:39:16 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pqSp+KWD; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 935628279C; Mon, 8 Mar 2021 22:38:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="pqSp+KWD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1417882790; Mon, 8 Mar 2021 22:38:38 +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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BF956826B2 for ; Mon, 8 Mar 2021 22:38:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=etienne.carriere@linaro.org Received: by mail-wr1-x431.google.com with SMTP id h98so12975882wrh.11 for ; Mon, 08 Mar 2021 13:38:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zMge/MdqAxoriKjvpg9+dWvINmk2NCFaSMM9dehnhjo=; b=pqSp+KWDkZG0UKumvBERXDTDG/V4Sr+vh1qFDYnoOgV1YJa3fCRolifbxd9cQTeXvA nD8N4TXWBrvFN/Bg/M1sVMiM/g9Ki79x0RBHPU6flg8E5SJDmKEDM83jAYUoCD1mPibX ZOM2vrlpivH2NxlpaKT49gFYyAnstskskAw4DtnJLZ8i3/BnFcCYQt/8y+rlqlTn2pDI j0Yd35ECSNjqLGnVS+vvpC6QNhjWbjayhT9bwgEwwDE9l9GnQLgqNg2qFzPJ9NUNxOX6 CUDNVZVIUR8QXdkCvvZWN7KMkAK0++NDoFVh5NtN81fafYKjGLyB1I5K0Ihw4mZTvmka dR2g== 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:in-reply-to :references; bh=zMge/MdqAxoriKjvpg9+dWvINmk2NCFaSMM9dehnhjo=; b=mx8kb7NJSZKIFbffZ8QOt32mrw6gS0LNMzXqUpsYzkvYJdqo4Lx67sqveLCBX4XyGD +hT0GvrsbQzFsnu73QjBlvgeWC8B2WXvd7daS6vxFW53HwTLvM4An+zfJY3EsYhdKb+t fajN2kLsKFU9i87pMEOIZ8HUbADQX33fOoyooj7j+9EW2frMxVqXf4X85/518nc7rn4n UmTPF2NACj6unb9AJwMIyskVAzF030iTV/Rxv+RipCNKLm9blrd1wsO6qoc19RueIzLn YzIeuUeTQTkRzGa4VSLGpAtfjV+EvSyFofxtXDfq8sXIcrhLkw8A203TOi8RYG48lkzH +Ejg== X-Gm-Message-State: AOAM5336ktFwYLfZ0fTVIV0TB0y/xp+Znti+5RcFA/v8oxOLtMmq6ITk WZOpCIPG+HNNXBMgkSiFmCIzYWjBgDsFcA== X-Received: by 2002:a5d:698e:: with SMTP id g14mr24467852wru.127.1615239508985; Mon, 08 Mar 2021 13:38:28 -0800 (PST) Received: from lmecxl0524.home (2a01cb058b85080038d9665c555bdad2.ipv6.abo.wanadoo.fr. [2a01:cb05:8b85:800:38d9:665c:555b:dad2]) by smtp.gmail.com with ESMTPSA id e8sm865238wme.14.2021.03.08.13.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 13:38:28 -0800 (PST) From: Etienne Carriere To: u-boot@lists.denx.de Cc: Simon Glass , Jaehoon Chung , Patrick Delaunay , Patrice Chotard , Etienne Carriere Subject: [PATCH v4 4/5] test: scmi: add local variables for scmi agent reference Date: Mon, 8 Mar 2021 22:38:09 +0100 Message-Id: <20210308213810.29535-4-etienne.carriere@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308213810.29535-1-etienne.carriere@linaro.org> References: <20210308213810.29535-1-etienne.carriere@linaro.org> 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.4 at phobos.denx.de X-Virus-Status: Clean Add local variables agent0/agent1 to refer to SCMI sandbox context agent and ease readability of the test. For consistency, rename regul_dev to regul0_dev and remove sandbox_voltd in dm_test_scmi_voltage_domains(). Signed-off-by: Etienne Carriere --- Changes in v4 - no change Changes in v3 - new change added to the series, suggested from patch v2 review. --- test/dm/scmi.c | 100 +++++++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 45 deletions(-) -- 2.17.1 Reviewed-by: Simon Glass diff --git a/test/dm/scmi.c b/test/dm/scmi.c index 2eaf06392..c938e6d4f 100644 --- a/test/dm/scmi.c +++ b/test/dm/scmi.c @@ -39,6 +39,8 @@ static int ut_assert_scmi_state_postprobe(struct unit_test_state *uts, { struct sandbox_scmi_devices *scmi_devices; struct sandbox_scmi_service *scmi_ctx; + struct sandbox_scmi_agent *agent0; + struct sandbox_scmi_agent *agent1; /* Device references to check context against test sequence */ scmi_devices = sandbox_scmi_devices_ctx(dev); @@ -50,20 +52,22 @@ static int ut_assert_scmi_state_postprobe(struct unit_test_state *uts, /* State of the simulated SCMI server exposed */ scmi_ctx = sandbox_scmi_service_ctx(); + agent0 = scmi_ctx->agent[0]; + agent1 = scmi_ctx->agent[1]; ut_asserteq(2, scmi_ctx->agent_count); - ut_assertnonnull(scmi_ctx->agent[0]); - ut_asserteq(2, scmi_ctx->agent[0]->clk_count); - ut_assertnonnull(scmi_ctx->agent[0]->clk); - ut_asserteq(1, scmi_ctx->agent[0]->reset_count); - ut_assertnonnull(scmi_ctx->agent[0]->reset); - ut_asserteq(2, scmi_ctx->agent[0]->voltd_count); - ut_assertnonnull(scmi_ctx->agent[0]->voltd); + ut_assertnonnull(agent0); + ut_asserteq(2, agent0->clk_count); + ut_assertnonnull(agent0->clk); + ut_asserteq(1, agent0->reset_count); + ut_assertnonnull(agent0->reset); + ut_asserteq(2, agent0->voltd_count); + ut_assertnonnull(agent0->voltd); - ut_assertnonnull(scmi_ctx->agent[1]); - ut_assertnonnull(scmi_ctx->agent[1]->clk); - ut_asserteq(1, scmi_ctx->agent[1]->clk_count); + ut_assertnonnull(agent1); + ut_assertnonnull(agent1->clk); + ut_asserteq(1, agent1->clk_count); return 0; } @@ -114,6 +118,8 @@ static int dm_test_scmi_clocks(struct unit_test_state *uts) { struct sandbox_scmi_devices *scmi_devices; struct sandbox_scmi_service *scmi_ctx; + struct sandbox_scmi_agent *agent0; + struct sandbox_scmi_agent *agent1; struct udevice *dev = NULL; int ret_dev; int ret; @@ -124,6 +130,8 @@ static int dm_test_scmi_clocks(struct unit_test_state *uts) scmi_devices = sandbox_scmi_devices_ctx(dev); scmi_ctx = sandbox_scmi_service_ctx(); + agent0 = scmi_ctx->agent[0]; + agent1 = scmi_ctx->agent[1]; /* Test SCMI clocks rate manipulation */ ut_asserteq(1000, clk_get_rate(&scmi_devices->clk[0])); @@ -133,9 +141,9 @@ static int dm_test_scmi_clocks(struct unit_test_state *uts) ret_dev = clk_set_rate(&scmi_devices->clk[1], 1088); ut_assert(!ret_dev || ret_dev == 1088); - ut_asserteq(1000, scmi_ctx->agent[0]->clk[0].rate); - ut_asserteq(1088, scmi_ctx->agent[0]->clk[1].rate); - ut_asserteq(44, scmi_ctx->agent[1]->clk[0].rate); + ut_asserteq(1000, agent0->clk[0].rate); + ut_asserteq(1088, agent0->clk[1].rate); + ut_asserteq(44, agent1->clk[0].rate); ut_asserteq(1000, clk_get_rate(&scmi_devices->clk[0])); ut_asserteq(1088, clk_get_rate(&scmi_devices->clk[1])); @@ -146,23 +154,23 @@ static int dm_test_scmi_clocks(struct unit_test_state *uts) ut_assert(!ret_dev || ret_dev == 333); /* Test SCMI clocks gating manipulation */ - ut_assert(!scmi_ctx->agent[0]->clk[0].enabled); - ut_assert(!scmi_ctx->agent[0]->clk[1].enabled); - ut_assert(!scmi_ctx->agent[1]->clk[0].enabled); + ut_assert(!agent0->clk[0].enabled); + ut_assert(!agent0->clk[1].enabled); + ut_assert(!agent1->clk[0].enabled); ut_asserteq(0, clk_enable(&scmi_devices->clk[1])); ut_asserteq(0, clk_enable(&scmi_devices->clk[2])); - ut_assert(!scmi_ctx->agent[0]->clk[0].enabled); - ut_assert(scmi_ctx->agent[0]->clk[1].enabled); - ut_assert(scmi_ctx->agent[1]->clk[0].enabled); + ut_assert(!agent0->clk[0].enabled); + ut_assert(agent0->clk[1].enabled); + ut_assert(agent1->clk[0].enabled); ut_assertok(clk_disable(&scmi_devices->clk[1])); ut_assertok(clk_disable(&scmi_devices->clk[2])); - ut_assert(!scmi_ctx->agent[0]->clk[0].enabled); - ut_assert(!scmi_ctx->agent[0]->clk[1].enabled); - ut_assert(!scmi_ctx->agent[1]->clk[0].enabled); + ut_assert(!agent0->clk[0].enabled); + ut_assert(!agent0->clk[1].enabled); + ut_assert(!agent1->clk[0].enabled); return release_sandbox_scmi_test_devices(uts, dev); } @@ -172,6 +180,7 @@ static int dm_test_scmi_resets(struct unit_test_state *uts) { struct sandbox_scmi_devices *scmi_devices; struct sandbox_scmi_service *scmi_ctx; + struct sandbox_scmi_agent *agent0; struct udevice *dev = NULL; int ret; @@ -181,15 +190,16 @@ static int dm_test_scmi_resets(struct unit_test_state *uts) scmi_devices = sandbox_scmi_devices_ctx(dev); scmi_ctx = sandbox_scmi_service_ctx(); + agent0 = scmi_ctx->agent[0]; /* Test SCMI resect controller manipulation */ - ut_assert(!scmi_ctx->agent[0]->reset[0].asserted) + ut_assert(!agent0->reset[0].asserted) ut_assertok(reset_assert(&scmi_devices->reset[0])); - ut_assert(scmi_ctx->agent[0]->reset[0].asserted) + ut_assert(agent0->reset[0].asserted) ut_assertok(reset_deassert(&scmi_devices->reset[0])); - ut_assert(!scmi_ctx->agent[0]->reset[0].asserted); + ut_assert(!agent0->reset[0].asserted); return release_sandbox_scmi_test_devices(uts, dev); } @@ -199,51 +209,51 @@ static int dm_test_scmi_voltage_domains(struct unit_test_state *uts) { struct sandbox_scmi_devices *scmi_devices; struct sandbox_scmi_service *scmi_ctx; - struct sandbox_scmi_voltd *sandbox_voltd; + struct sandbox_scmi_agent *agent0; struct dm_regulator_uclass_plat *uc_pdata; struct udevice *dev; - struct udevice *regul_dev; + struct udevice *regul0_dev; ut_assertok(load_sandbox_scmi_test_devices(uts, &dev)); scmi_devices = sandbox_scmi_devices_ctx(dev); scmi_ctx = sandbox_scmi_service_ctx(); + agent0 = scmi_ctx->agent[0]; /* Set/Get an SCMI voltage domain level */ - sandbox_voltd = &scmi_ctx->agent[0]->voltd[0]; - regul_dev = scmi_devices->regul[0]; - ut_assert(regul_dev); + regul0_dev = scmi_devices->regul[0]; + ut_assert(regul0_dev); - uc_pdata = dev_get_uclass_plat(regul_dev); + uc_pdata = dev_get_uclass_plat(regul0_dev); ut_assert(uc_pdata); - ut_assertok(regulator_set_value(regul_dev, uc_pdata->min_uV)); - ut_asserteq(sandbox_voltd->voltage_uv, uc_pdata->min_uV); + ut_assertok(regulator_set_value(regul0_dev, uc_pdata->min_uV)); + ut_asserteq(agent0->voltd[0].voltage_uv, uc_pdata->min_uV); - ut_assert(regulator_get_value(regul_dev) == uc_pdata->min_uV); + ut_assert(regulator_get_value(regul0_dev) == uc_pdata->min_uV); - ut_assertok(regulator_set_value(regul_dev, uc_pdata->max_uV)); - ut_asserteq(sandbox_voltd->voltage_uv, uc_pdata->max_uV); + ut_assertok(regulator_set_value(regul0_dev, uc_pdata->max_uV)); + ut_asserteq(agent0->voltd[0].voltage_uv, uc_pdata->max_uV); - ut_assert(regulator_get_value(regul_dev) == uc_pdata->max_uV); + ut_assert(regulator_get_value(regul0_dev) == uc_pdata->max_uV); /* Enable/disable SCMI voltage domains */ ut_assertok(regulator_set_enable(scmi_devices->regul[0], false)); ut_assertok(regulator_set_enable(scmi_devices->regul[1], false)); - ut_assert(!scmi_ctx->agent[0]->voltd[0].enabled); - ut_assert(!scmi_ctx->agent[0]->voltd[1].enabled); + ut_assert(!agent0->voltd[0].enabled); + ut_assert(!agent0->voltd[1].enabled); ut_assertok(regulator_set_enable(scmi_devices->regul[0], true)); - ut_assert(scmi_ctx->agent[0]->voltd[0].enabled); - ut_assert(!scmi_ctx->agent[0]->voltd[1].enabled); + ut_assert(agent0->voltd[0].enabled); + ut_assert(!agent0->voltd[1].enabled); ut_assertok(regulator_set_enable(scmi_devices->regul[1], true)); - ut_assert(scmi_ctx->agent[0]->voltd[0].enabled); - ut_assert(scmi_ctx->agent[0]->voltd[1].enabled); + ut_assert(agent0->voltd[0].enabled); + ut_assert(agent0->voltd[1].enabled); ut_assertok(regulator_set_enable(scmi_devices->regul[0], false)); - ut_assert(!scmi_ctx->agent[0]->voltd[0].enabled); - ut_assert(scmi_ctx->agent[0]->voltd[1].enabled); + ut_assert(!agent0->voltd[0].enabled); + ut_assert(agent0->voltd[1].enabled); return release_sandbox_scmi_test_devices(uts, dev); }