From patchwork Tue Feb 19 06:11:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 10819301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75C1914E1 for ; Tue, 19 Feb 2019 06:27:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 626762B53A for ; Tue, 19 Feb 2019 06:27:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54F5C2B550; Tue, 19 Feb 2019 06:27:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0CAF32B53A for ; Tue, 19 Feb 2019 06:27:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:42541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvyrr-00084N-8D for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Feb 2019 01:26:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvydy-0005Xz-Mt for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvydx-0007Bp-DD for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:38 -0500 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:33324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvydw-00076d-7C for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:37 -0500 Received: by mail-lj1-x241.google.com with SMTP id f24-v6so16403094ljk.0 for ; Mon, 18 Feb 2019 22:12:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bZgwkejCFmoysDe9euILf3YDQxTNpaYJlTIP0ryX8wU=; b=Ro4C0zMCXMmXDpbFaOSNAbpj6AiwfgockxvKNrD54eDYg4anZI6lCkdPRREMfzvBYN U31mpIrlwb5W2vOaQdCJMLSgW4npUnoeI+Ji3q0V2mfxI7qlrKd5BainedVSYtSaPKxo 5lxQ8CB7RllpZ8dXToobiXj6tq8BxorRhBvBpd556ciFAso3N+ObKPPCJGFS/3x6o2nu HFAWZI8aDisG+gfrhsEaSdkzCIIvqXSjOoa0aCjOg2/1CfKXuV81a6kwQVJ3UV0Jx5Ok CqbwBX+5A2hB7VCDu8NVcxGd9FyMNXh4pUgcgKyr0TZvYo7AAQpsbYQ1B8HHz/Z0blMT qJHA== 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=bZgwkejCFmoysDe9euILf3YDQxTNpaYJlTIP0ryX8wU=; b=FroUdzv07sKM9lXGgbwg3wHaiYFHCZTAbKt5Ft2NeSGKOsIO1EnPnHZ0hyx6lvYwv7 MtIyq6EDfY+Oex2/4sQ9Rl+t60EGi6+4iIejz4FEpQhFvlbGdLOEmIi71FX7GfonHkIe dinLPk0djpLXo7845rwZ0aotE/9ChNQ/UAEWh9NfBy8mPOToheXC9mRTAKyO4AjjvrWv tgZ0tW2jRIepjfR4evFlfR742yyEcVaN6yqcHYpWgyAo3bbuidez+yotcFyNRavH7hyH cNgK78AcTzHpL3wIc38zh527u+AmEJar4+AjDAfbsO3/IHhUuj7Con++hrK0ICLTHyHU aaXw== X-Gm-Message-State: AHQUAua7bGaSaBS6lRyEYWFQhn6GcqRKF/Vlpsrrrj0u6ePlEjXKHWIv tXPBhfTzvzyPLf4BZA8nsKigXcQNcLg= X-Google-Smtp-Source: AHgI3IaXPJYXNPhgxzO3Qkh6SRlwxDHs0pUcu44X+TjNI/Eabg4GUn9uyoNwyp5sEnuelnLHNLWvYQ== X-Received: by 2002:a2e:9cc7:: with SMTP id g7mr7193310ljj.33.1550556745144; Mon, 18 Feb 2019 22:12:25 -0800 (PST) Received: from octofox.hsd1.ca.comcast.net. (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id f16-v6sm4235745lji.88.2019.02.18.22.12.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 22:12:24 -0800 (PST) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2019 22:11:03 -0800 Message-Id: <20190219061111.10231-16-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190219061111.10231-1-jcmvbkbc@gmail.com> References: <20190219061111.10231-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::241 Subject: [Qemu-devel] [PATCH 15/23] tests/tcg/xtensa: conditionalize and fix s32c1i tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make s32c1i tests conditional on the presence of this option. Initialize ATOMCTL SR when it's present to allow RCW transactions on uncached memory. Signed-off-by: Max Filippov --- tests/tcg/xtensa/test_s32c1i.S | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/tcg/xtensa/test_s32c1i.S b/tests/tcg/xtensa/test_s32c1i.S index 93b575db95ba..2885d9d003c0 100644 --- a/tests/tcg/xtensa/test_s32c1i.S +++ b/tests/tcg/xtensa/test_s32c1i.S @@ -2,7 +2,13 @@ test_suite s32c1i +#if XCHAL_HAVE_S32C1I + test s32c1i_nowrite +#if XCHAL_HW_VERSION >= 230000 + movi a2, 0x29 + wsr a2, atomctl +#endif movi a2, 1f movi a3, 1 wsr a3, scompare1 @@ -20,6 +26,10 @@ test s32c1i_nowrite test_end test s32c1i_write +#if XCHAL_HW_VERSION >= 230000 + movi a2, 0x29 + wsr a2, atomctl +#endif movi a2, 1f movi a3, 3 wsr a3, scompare1 @@ -36,4 +46,6 @@ test s32c1i_write .text test_end +#endif + test_suite_end