From patchwork Mon Sep 13 23:09:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghavendra Rao Ananta X-Patchwork-Id: 12490937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E27AC433EF for ; Mon, 13 Sep 2021 23:12:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CFA8E61029 for ; Mon, 13 Sep 2021 23:12:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CFA8E61029 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=CZh7nTz+ypJfeS2t3UgPqzVZ7gOr9V0gA0YGGf1pAv8=; b=Rome8fIMYMhKT0fVOal8BcEcY9 pLyFnjshZfWCS3AnoYK+m667DkGn6dwEyNQS6WuAAZaI3lXM6LskqO/pgFzLAQ5GLLi95kSHvWJlY 7qBPEMye3RmT1HUDaxSpSTc+8O45GQp3tsUgMmxYFK2lpyymj8GcH0ZSFDYwma3j2CAAyyBrma9fR rYJF6em+A+vP+VRXkkUnJEuznCWETBhvBS5LtuDqe2V2lo7ki5QLPS4WqKLR6xRSTUooodDY8F9Pv wzwWJ/pK31cgxwlJHSN0Kuqmn5w4iycWm3cX4p0pZYlWtUnLH1nhaXNqId+Y7aVCtOoTF2ZoW62a9 2NADWUjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPv5f-003Xau-LO; Mon, 13 Sep 2021 23:10:19 +0000 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPv5S-003XYO-ML for linux-arm-kernel@lists.infradead.org; Mon, 13 Sep 2021 23:10:08 +0000 Received: by mail-pl1-x649.google.com with SMTP id i2-20020a1709026ac200b0013a0caa0cebso3727675plt.23 for ; Mon, 13 Sep 2021 16:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=S2j8r1BCKqhVhJ+8bR7t/dA2J/PIIE/Rns3zAg7zZww=; b=CuGfX+E1SqFTT5eOBisvWSFYoND4dvqTTB/VIJqY1O8Go94s/YODwQAdP0+plX7Q8H BgNk6fCKeOnA3t5HJ28w95v7aemtW3uKMH2yLOf2i7fygyTU3qd6e1V16BGwiYtoY8Im 6hNV5kQSYMzzuvz8lIuTMXWqUzyNCmIdYiyUP1tD/mn9B/ta7METDZDh7iRmPBrosoAh RiYVxGVxn7XnFrwnuiba1o/9AY07Rzs3AfP932QMyHlF+FN8hJyAtNGINbaH1ENfNh1E ZSjSdxbkzhVPwRlU/LVQ9SFgXvvNMVNBN+A+8zyTqpgbhMYo7sGbl68its1/49FBrf64 mEDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=S2j8r1BCKqhVhJ+8bR7t/dA2J/PIIE/Rns3zAg7zZww=; b=x4qcXkq3Um2d14kTtI2FjXZ/lKHjH2nRtSu4xL+n3wgfwRaShv+wFs8GJ5R6fEEpSQ B0g+gTtD05H32961sNRwrwBh8G/3ExS40NaJbpb7uPgnJXqB281TVTqoy0UVd+RBA8Do n2Z/FRPf590/KbibLpOMqvceB3IY+dNBIyMLWnwjBaBwl9dVU++CWYp8q5R1Le7LDf25 kYNY1Nrl4OsBpkC7nB+M6F6wOEkneDWL2EH5uq0My0SUlV7raXJvrverbJNinTdxq91m cglALfJCA54QATFplKWwfyTKmmptOjZpR4Zhv3g69pGF/MDhjfntm8EYdmNuxpKkgJXn Xzvg== X-Gm-Message-State: AOAM530gcBybC1lmaKpXHH8tshLZ7d/eH3eiwBrJmc102BGwLimHXxLs 80gjrVNzOOt5Q1Q1szT+qpv3q98SNRo3 X-Google-Smtp-Source: ABdhPJwD1Aonn1tWnz16FFRS8kMdQAVk8VivmMOSg0aueBPRNHSF3UfjmuS89nFUfgrdLtxMU5EM5OZnjby+ X-Received: from rananta-virt.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1bcc]) (user=rananta job=sendgmr) by 2002:a17:902:8c83:b029:129:17e5:a1cc with SMTP id t3-20020a1709028c83b029012917e5a1ccmr12488624plo.49.1631574603783; Mon, 13 Sep 2021 16:10:03 -0700 (PDT) Date: Mon, 13 Sep 2021 23:09:42 +0000 In-Reply-To: <20210913230955.156323-1-rananta@google.com> Message-Id: <20210913230955.156323-2-rananta@google.com> Mime-Version: 1.0 References: <20210913230955.156323-1-rananta@google.com> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog Subject: [PATCH v6 01/14] KVM: arm64: selftests: Add MMIO readl/writel support From: Raghavendra Rao Ananta To: Paolo Bonzini , Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose Cc: Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Oliver Upton , Reiji Watanabe , Jing Zhang , Raghavendra Rao Anata , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210913_161006_777463_85030BE5 X-CRM114-Status: GOOD ( 12.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Define the readl() and writel() functions for the guests to access (4-byte) the MMIO region. The routines, and their dependents, are inspired from the kernel's arch/arm64/include/asm/io.h and arch/arm64/include/asm/barrier.h. Signed-off-by: Raghavendra Rao Ananta Reviewed-by: Oliver Upton Reviewed-by: Andrew Jones --- .../selftests/kvm/include/aarch64/processor.h | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index c0273aefa63d..96578bd46a85 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -9,6 +9,7 @@ #include "kvm_util.h" #include +#include #define ARM64_CORE_REG(x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ @@ -130,6 +131,49 @@ void vm_install_sync_handler(struct kvm_vm *vm, val; \ }) -#define isb() asm volatile("isb" : : : "memory") +#define isb() asm volatile("isb" : : : "memory") +#define dsb(opt) asm volatile("dsb " #opt : : : "memory") +#define dmb(opt) asm volatile("dmb " #opt : : : "memory") + +#define dma_wmb() dmb(oshst) +#define __iowmb() dma_wmb() + +#define dma_rmb() dmb(oshld) + +#define __iormb(v) \ +({ \ + unsigned long tmp; \ + \ + dma_rmb(); \ + \ + /* \ + * Courtesy of arch/arm64/include/asm/io.h: \ + * Create a dummy control dependency from the IO read to any \ + * later instructions. This ensures that a subsequent call \ + * to udelay() will be ordered due to the ISB in __delay(). \ + */ \ + asm volatile("eor %0, %1, %1\n" \ + "cbnz %0, ." \ + : "=r" (tmp) : "r" ((unsigned long)(v)) \ + : "memory"); \ +}) + +static __always_inline void __raw_writel(u32 val, volatile void *addr) +{ + asm volatile("str %w0, [%1]" : : "rZ" (val), "r" (addr)); +} + +static __always_inline u32 __raw_readl(const volatile void *addr) +{ + u32 val; + asm volatile("ldr %w0, [%1]" : "=r" (val) : "r" (addr)); + return val; +} + +#define writel_relaxed(v,c) ((void)__raw_writel((__force u32)cpu_to_le32(v),(c))) +#define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32)__raw_readl(c)); __r; }) + +#define writel(v,c) ({ __iowmb(); writel_relaxed((v),(c));}) +#define readl(c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) #endif /* SELFTEST_KVM_PROCESSOR_H */