From patchwork Tue Feb 19 06:11:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 10819311 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 B4BDC14E1 for ; Tue, 19 Feb 2019 06:31:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A12D22B567 for ; Tue, 19 Feb 2019 06:31:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 901D02B569; Tue, 19 Feb 2019 06:31:33 +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 467082B567 for ; Tue, 19 Feb 2019 06:31:33 +0000 (UTC) Received: from localhost ([127.0.0.1]:42629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvywG-0002iv-Lx for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Feb 2019 01:31:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvye2-0005cE-5f for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvydx-0007Bu-Dj for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:42 -0500 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:42525) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvydw-00079L-7Q for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:37 -0500 Received: by mail-lf1-x141.google.com with SMTP id l10so13996725lfh.9 for ; Mon, 18 Feb 2019 22:12:30 -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=ZRl+5/245LSzZZokUspYt6J8w5UlnBOPiLDPIwyqU00=; b=mJOm5U/mntMKJiRGJQCUxXUmu9c3kNj9KR6QEmT7asRe4BK/U329+IX64nD0m1tZKN DH4Ce4am2iJuIP5kzbtw/qVdcHqIpVINbKoOWGMBHE14R+Z/avrSpHtGghdqKvuDUNms CtbXL0apK82EzXAURrIJDb0CccQLHsQ9p5XRmKtFpyU3BMsbHQqIrM9ihkTRQw/zfEEx kETezkOqT8s4jOghdnL1smoC37g20HGo2FqMyH1r+R4sqKauJC959n7UnfTduQyTXyaB kqrVwhuinsbJUI2Tu8cFO3cr6wDTMysHnVgiC/iY1+LDGL5Wu71W2KJYpX86srPQEkCK miIw== 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=ZRl+5/245LSzZZokUspYt6J8w5UlnBOPiLDPIwyqU00=; b=bEn2uWSOUEaOgJFqxwcbT/EQI4WGP3J5A2PmzWRmA7qqKF4pKOfbJ9llJlQUsbMRyI DhD0Fwmk/p3xK6JaxVC+iRu2aeddWO8SDvEZSGRdHyNd8xrusKWXPwCLjMGoz3eP/atx csHpf2rt9Z/pefoh7MC+4xsXusGOltzJFlF8tImBL49LqtCNCKoMMQrh/dZaC/fZxk0B VV89Bwrg7n1hTc5uFD/6GxMYRXDSaHeUak4nVjW3G0XyY4LdOetxmzueele7meNwU4kO busmE4EgWI5gxhfrSi4pQI4kKxNc7AWgtsMwcg/EoQ8UtPd2ay+XV2uWjtMiIZTaB19x W2jA== X-Gm-Message-State: AHQUAubVAKEp53I4hYPxblZ89cHwzPx2cWBkLBi7RVAg2nEzXziAbzHj TtIP5wzUNp+Mbn/EK+nR+Evlyu6wDZ8= X-Google-Smtp-Source: AHgI3IZxcptcDCIBoFSTxNm4oYoqEh+19QC9WNXY9yeVF3ozKind2oQJ4rJdMBuLeUbvULJNs1a8YA== X-Received: by 2002:ac2:43aa:: with SMTP id t10mr17135333lfl.107.1550556749267; Mon, 18 Feb 2019 22:12:29 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 22:12:28 -0800 (PST) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2019 22:11:05 -0800 Message-Id: <20190219061111.10231-18-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::141 Subject: [Qemu-devel] [PATCH 17/23] tests/tcg/xtensa: conditionalize MMU-related 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 MMU-related tests conditional on the presence of MMUv2 option. Signed-off-by: Max Filippov --- tests/tcg/xtensa/test_mmu.S | 4 ++++ tests/tcg/xtensa/test_phys_mem.S | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tests/tcg/xtensa/test_mmu.S b/tests/tcg/xtensa/test_mmu.S index a15316ffb317..4cbd6ef4f9d8 100644 --- a/tests/tcg/xtensa/test_mmu.S +++ b/tests/tcg/xtensa/test_mmu.S @@ -2,6 +2,8 @@ test_suite mmu +#if XCHAL_HAVE_PTP_MMU && !XCHAL_HAVE_SPANNING_WAY + .purgem test_init .macro clean_tlb_way way, page_size, n_entries @@ -740,4 +742,6 @@ test cross_page_tb assert eq, a2, a3 test_end +#endif + test_suite_end diff --git a/tests/tcg/xtensa/test_phys_mem.S b/tests/tcg/xtensa/test_phys_mem.S index aae0a793a718..9bb3ee3866ed 100644 --- a/tests/tcg/xtensa/test_phys_mem.S +++ b/tests/tcg/xtensa/test_phys_mem.S @@ -2,6 +2,8 @@ test_suite phys_mem +#if XCHAL_HAVE_PTP_MMU && !XCHAL_HAVE_SPANNING_WAY + .purgem test_init .macro test_init @@ -67,6 +69,8 @@ test write_get_pte_no_phys assert eq, a2, a3 test_end +#endif + test inst_fetch_no_phys set_vector kernel, 2f