From patchwork Fri Jan 29 11:00:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 373328 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2109147jam; Fri, 29 Jan 2021 03:33:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxevIzyXMkSlBmo8Jk+kW1SvlY8ZT5mdgRmMOm2/q1cEOYw7aSVSxdODElNucLNWk/NmZ1E X-Received: by 2002:a25:360f:: with SMTP id d15mr5332470yba.378.1611920010537; Fri, 29 Jan 2021 03:33:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611920010; cv=none; d=google.com; s=arc-20160816; b=jMPjwZqFwEf2pSKkwQAD1IqQssXRK+9C0z6ePq+FHeFK5oj4V2NexBUgYvGThb+el1 qAgxkhQVLfz+hS2G3Rq7ZIC8iBzNTYu3vTiRWOmeOfbx4dbPvbHKWygnYVK5+klcl1Qc fvL7xr1YyoQWbiuvTlxv47/PgaL1E6lrOmF+RQPTynJXI0qp4tgrUZ4auFs3DT0Mhc+c srGaDI6VqefaQeGP0BdnBTqhDwzEekZ+Nft/Uip16kUVeSkYruTsAZiKFWcUqzkmjfsC AXvkAPWmiAGzqCrXlo5Crzva4A8q8uWERyMuIva+yfFYUChhemDlwHC1kWq4dZXl10gk 86OA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=I+7L5SpLExP6qZhOnla6nrvNT3mA6kf2oerfjRIUi8o=; b=ZSKvrnrOGTipUVF6kxNmU3yOc6f9kbAcYEyRlrks8VsyYNmHuKnJg0/b+Y2GfKWktk KVmUVbTbdVuI6Uom+QEDFsCPhNw7M1r+Jdl8gBCetd/fJAFtVvt2tLF+NU9jTw9ZYeCe 0ZoR74dYRTkJ4OPctrUx3czX7WzUjXWEP3zFhbL3gwTccLeYvyjfY+1lzB9AS8vJ522h aCEpf8LC2l8bkDfOs6v2Xsv5upX8qAWN5EJsPUxyFWCpEPDGCZwlyPJ3ex4NZE0BrNQo pCVZ6v8qRmvyrFLQCwTc6Ua1vEacyC/zLADMR+8qKiB8GwIYSeo5u5zpdP/EvYFjfqke w5Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MjWu6j1J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e82si8926418ybb.115.2021.01.29.03.33.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 03:33:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MjWu6j1J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5S1q-0006yY-13 for patch@linaro.org; Fri, 29 Jan 2021 06:33:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5RWP-00059q-3t for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:01:01 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:36442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5RWH-00079q-Sy for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:01:00 -0500 Received: by mail-wm1-x32e.google.com with SMTP id i9so6832745wmq.1 for ; Fri, 29 Jan 2021 03:00:53 -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:mime-version :content-transfer-encoding; bh=I+7L5SpLExP6qZhOnla6nrvNT3mA6kf2oerfjRIUi8o=; b=MjWu6j1J0olS5a4qfbUKDzDRHG3JdN4lzMRUNxPbMFp4e8J7mpzKNmpnu7t2X+QtFj AglvAyGCfGG3HQjfroATfz04UVoNHyLwKno4wnm6QhRxuGqTTOAMET2X0clXB1Dvux+f PvGo1rtBzWfqJm3fpwrh2oF916pOI2Ea2F6ieB56nAnJKNZKjQdlPgK+eLgpBBmVVIQe fG0obiChm8U+xRxiq+0Ev9jDSob32ddhtxRyU+v8nEXB6/Qm0nOWInmpNKbHMzuMeIx2 6xPrpTmZdTZiEH7HE7cKeahsG6ahUcuG+bpvThbM2P774Z7e2moBMroSbbbx5mfPumP+ X7vg== 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:mime-version:content-transfer-encoding; bh=I+7L5SpLExP6qZhOnla6nrvNT3mA6kf2oerfjRIUi8o=; b=n4iJGeTNWPTVjTPA2Lt3soGTXT3PSxPxfVwdRmDgdOFVJo1wksvWe2UXKVG4i2FJuy by0grMW3UPvp63ZQRu8x0ZS9b97FCC3pUVgkpxAlL96Bo2mkMSzo+Ubl8CHFwGawj+Hm LaQcNixINxhtWzMq83Dvm3a5C59RWKmCWhdoQhRzNQisTX+Ej7nnZer0lkm8xbpreK3+ nn9ltqNut90BgA9sFS0yT51RJEpXnw60q0eFCN7QthclsecgNahu/KOtndSecTWmniaq 5/IMmN6mqg3AEwfs4jTG0L7pbO20K2lNb/kaXbDGIWsNxWXocbNtRyiHACi9+RrZ3vb+ 4Ejg== X-Gm-Message-State: AOAM5322I6czn7/p6yOCYXZ9lPhV6NwlSs77la9bN6isuE6LJK5jz0jT Lw9tw2pTETuS7abmV/MFLFsF9jkChRitUA== X-Received: by 2002:a7b:c8c3:: with SMTP id f3mr3286643wml.110.1611918052432; Fri, 29 Jan 2021 03:00:52 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w20sm9268761wmm.12.2021.01.29.03.00.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 03:00:51 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 42/46] tests/qtest/cmsdk-apb-watchdog-test: Test clock changes Date: Fri, 29 Jan 2021 11:00:08 +0000 Message-Id: <20210129110012.8660-43-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org> References: <20210129110012.8660-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now that the CMSDK APB watchdog uses its Clock input, it will correctly respond when the system clock frequency is changed using the RCC register on in the Stellaris board system registers. Test that when the RCC register is written it causes the watchdog timer to change speed. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Luc Michel Tested-by: Philippe Mathieu-Daudé Message-id: 20210128114145.20536-22-peter.maydell@linaro.org Message-id: 20210121190622.22000-22-peter.maydell@linaro.org --- tests/qtest/cmsdk-apb-watchdog-test.c | 52 +++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) -- 2.20.1 diff --git a/tests/qtest/cmsdk-apb-watchdog-test.c b/tests/qtest/cmsdk-apb-watchdog-test.c index 950f64c527b..2710cb17b86 100644 --- a/tests/qtest/cmsdk-apb-watchdog-test.c +++ b/tests/qtest/cmsdk-apb-watchdog-test.c @@ -15,6 +15,7 @@ */ #include "qemu/osdep.h" +#include "qemu/bitops.h" #include "libqtest-single.h" /* @@ -31,6 +32,11 @@ #define WDOGMIS 0x14 #define WDOGLOCK 0xc00 +#define SSYS_BASE 0x400fe000 +#define RCC 0x60 +#define SYSDIV_SHIFT 23 +#define SYSDIV_LENGTH 4 + static void test_watchdog(void) { g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0); @@ -61,6 +67,50 @@ static void test_watchdog(void) g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0); } +static void test_clock_change(void) +{ + uint32_t rcc; + + /* + * Test that writing to the stellaris board's RCC register to + * change the system clock frequency causes the watchdog + * to change the speed it counts at. + */ + g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0); + + writel(WDOG_BASE + WDOGCONTROL, 1); + writel(WDOG_BASE + WDOGLOAD, 1000); + + /* Step to just past the 500th tick */ + clock_step(80 * 500 + 1); + g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0); + g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 500); + + /* Rewrite RCC.SYSDIV from 16 to 8, so the clock is now 40ns per tick */ + rcc = readl(SSYS_BASE + RCC); + g_assert_cmpuint(extract32(rcc, SYSDIV_SHIFT, SYSDIV_LENGTH), ==, 0xf); + rcc = deposit32(rcc, SYSDIV_SHIFT, SYSDIV_LENGTH, 7); + writel(SSYS_BASE + RCC, rcc); + + /* Just past the 1000th tick: timer should have fired */ + clock_step(40 * 500); + g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 1); + + g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 0); + + /* VALUE reloads at following tick */ + clock_step(41); + g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 1000); + + /* Writing any value to WDOGINTCLR clears the interrupt and reloads */ + clock_step(40 * 500); + g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 500); + g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 1); + writel(WDOG_BASE + WDOGINTCLR, 0); + g_assert_cmpuint(readl(WDOG_BASE + WDOGVALUE), ==, 1000); + g_assert_cmpuint(readl(WDOG_BASE + WDOGRIS), ==, 0); +} + int main(int argc, char **argv) { int r; @@ -70,6 +120,8 @@ int main(int argc, char **argv) qtest_start("-machine lm3s811evb"); qtest_add_func("/cmsdk-apb-watchdog/watchdog", test_watchdog); + qtest_add_func("/cmsdk-apb-watchdog/watchdog_clock_change", + test_clock_change); r = g_test_run();