From patchwork Fri Feb 22 08:23:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 10825505 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 542D8139A for ; Fri, 22 Feb 2019 08:23:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DBDA22F3E for ; Fri, 22 Feb 2019 08:23:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FFDB28739; Fri, 22 Feb 2019 08:23:57 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E856622F3E for ; Fri, 22 Feb 2019 08:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GgO/TRLL3hUMPwlOcR2gcSHVmCdQ1u+KtEcphtbfMo4=; b=dnZXCrfQyF+UxweBtddpbSRTS8 DqzNB9zJRkVHqdRZO5w1bYw7jHuqttIbgYHO1QItH2DlaiLdsAEa8D4NkwjqrMjsnv0AdUaEp8uV0 iuJInFv2hr5yQqzX63KYlfVcBsQ4vBiao0UCxDF2OC1PBUkjnmIStqiVqdjGqLx45KqzMM22uVhHU ALglwyNI5hAyjUOHamu52dCqrwJAuUhah3Mb4hZ69F4cBmtZL46A+iVGEUSFnsi/mC1Do/IbKjDNO 6tnLNBelrA5R6vRuu5a1C8thzgZ9c03YNfQXuK/UhhC7ZiXGC9DKGWMMcbyTuPy5XKzXxTsS1HZY6 z2hgsDMg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx67g-0001zC-9T; Fri, 22 Feb 2019 08:23:56 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx67V-0001lT-9d for linux-arm-kernel@lists.infradead.org; Fri, 22 Feb 2019 08:23:47 +0000 Received: by mail-pl1-x644.google.com with SMTP id bj4so762259plb.7 for ; Fri, 22 Feb 2019 00:23:45 -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=CWZpOa7KU5IoSG9K/3vLaR3fHpcin2VffNYLaVd5Roo=; b=E9JykKxLXU3+k4vQJjpERuNJgwqlLMYvxWPzlcoDPM4s+cbq4WMQ0swQVCbYdMDISL iJKV68RQ/EIyFU3hfa8393jPd6Aqbq6IBo2ph/gROiRMlHFGhQSyQ/UY/+HBwhDWK967 Ayz64rJ09cxSRy1x06vCxiU9EaBJCnx8LMa5kzfj8e+zbJpKACzO4ixm2dw1JCJ5rwR6 N4wHGXkLrKU50tsEGFyYyRrAG5kmj/J+HvSLF0lDGv570H6htjawDDrc5ZqhxrhU2IzK tI2juO2pHVCJY99UuLB+Y5mU13QgvatV2cyQWjrjfspX123dEnZifYcd8tNqxYU/DOj+ I8Ug== 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=CWZpOa7KU5IoSG9K/3vLaR3fHpcin2VffNYLaVd5Roo=; b=Wr94DL6k9qV8h62AEOgkSGet4/qGU/8Ub4nQ81Qr8cQZHl0nNA/IjlriY8EqOf2wIQ okmjXgbogjmKZ4bAxa79smWVid8WHaOXLl3b3lyNyabMmcsfWSQS69nSXa8TploCHYD3 S3qWHAy0p8HwerEtfbYRNgoCLE2hrC6YQNfGbX58TZCm2vfxjSaDb/I3t3a1PN9Vxi8J YmEp3Lf2r82tPm0j4f1dsHoLo7s2rBnt+buLeCvIgc3vDeuQStGM2c638JOYKfRIRsGE ndUsxjDITtkceJ9WesGHQC2BoVUfdRKhElHiWdSKHf/k3TZtLrjxgPzX8T8xljq0FskH 6c3g== X-Gm-Message-State: AHQUAuYi/nVCxV4LTFAJoyp9k1SjuNLj5HPi9KhPFKwO+Fom+K37XKHF rvJxTHRmv5Xwq7LFvz7imkXJqw== X-Google-Smtp-Source: AHgI3IZAlCgx+vdzMMXnYCfqie9DawIRzNKTXpKS+YqirqUzOYE8VP/uLh0i/02vD5sHe2HBX09mbg== X-Received: by 2002:a17:902:45:: with SMTP id 63mr3010111pla.281.1550823824594; Fri, 22 Feb 2019 00:23:44 -0800 (PST) Received: from localhost.localdomain (li1195-158.members.linode.com. [45.79.96.158]) by smtp.gmail.com with ESMTPSA id y22sm133821pfn.136.2019.02.22.00.23.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 00:23:43 -0800 (PST) From: Leo Yan To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon , Mark Rutland , James Morse , Andre Przywara , Jun Yao , Paolo Bonzini , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/4] KVM: arm64: Use macro to replace hard number Date: Fri, 22 Feb 2019 16:23:23 +0800 Message-Id: <20190222082327.3312-2-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190222082327.3312-1-leo.yan@linaro.org> References: <20190222082327.3312-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190222_002345_563490_E1318588 X-CRM114-Status: GOOD ( 12.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use macro for ID_AA64MMFR1_EL1.VH bits shift instead of 8 directly. Signed-off-by: Leo Yan Reviewed-by: Mark Rutland --- arch/arm64/kernel/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 4471f570a295..3ac377e9fd28 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -490,7 +490,7 @@ ENTRY(el2_setup) * kernel is intended to run at EL2. */ mrs x2, id_aa64mmfr1_el1 - ubfx x2, x2, #8, #4 + ubfx x2, x2, #ID_AA64MMFR1_VHE_SHIFT, #4 #else mov x2, xzr #endif From patchwork Fri Feb 22 08:23:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 10825507 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 21E4F1390 for ; Fri, 22 Feb 2019 08:24:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F43322F3E for ; Fri, 22 Feb 2019 08:24:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 025CB28739; Fri, 22 Feb 2019 08:24:08 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B706522F3E for ; Fri, 22 Feb 2019 08:24:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=7deutLApuZhhFRHV4pGQsRhn1ZSZGvfhAQO2yembTBw=; b=VuFrfx5DOl6cusI4LLlyItmLoE 1xM6U8hUYIt6OqMRi8wJe9wd0NgShJWWPrjnJ84fmSnkXcwiaELoWDGZr9bzPwlHlRQt5NPIqHqbJ MvwFsmQ1TotMX9Y1Q4++UtlShqpo+kpwNdDi3Syq7WwM2COR3TrL3PsZaUMNd0g3YNH9/7pTk41f8 3GsnnhDBsJDIXYUvnBvuLFdkmnW39nqt7i/dQdnjxkNZC59adibSazRIriOHnObvOn6wnh2AuaYTb dRrNXrwyltX3b7xi/ipwDfyOpy0lYLUvl30jF8MAH3PYW/FfES6HCb1a6lHkMiviXOQcefOG+cHp4 /gas1K2w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx67q-0002D8-DM; Fri, 22 Feb 2019 08:24:06 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx67Z-0001qN-4T for linux-arm-kernel@lists.infradead.org; Fri, 22 Feb 2019 08:23:52 +0000 Received: by mail-pl1-x641.google.com with SMTP id r14so749226pls.12 for ; Fri, 22 Feb 2019 00:23:48 -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=kVzojLvyJg8CcO1+5mzWEKYitIoofAkDltlfNCBnwRI=; b=KjfjDletYe2Gtz8dr94Kle7Id+AdDFAyRuqtC1gVPe2D+yRqWa5Mp7QaMT7TdxW380 gbyuZhHjXcVxhcKWGjGvlVS/34VShvvl5tUyfFciiLIR7IgI1IASoxuRxWiDvjvRijUR k2Zeh2pj3ZZ44oZ+fRoJxZFaUjBrdB2M/vMa3HF88jMxOswoaVlgCWSGsi+9MJM6oApn TlRpSyxbIRr8xdLdjLjy6YZUUNxTIS7oong30k9mQ6Icmtnu2zWZrZ2VBYl88+SoM2gJ d7OE2cRo1TL0bSCUm5nJ6h4M9TDVdkd474mi0zYsD6fvJ4wPs99XtNDOKmJNhxsUbgPs nQQA== 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=kVzojLvyJg8CcO1+5mzWEKYitIoofAkDltlfNCBnwRI=; b=bSuLHwDRhlImUC7txBzQFD5Bg8ZARRW13kW40el2e8XdhAONXHVGmvR9jkyTk/DOa+ or8HqxNH9Ugpv7n3i1ceNkzHlDr8c1ckMnHWN6rNXdEDBPodWwUYG3d1zNaererzK4+t 117kxU2ko35EGm7+xIJ2yuEe8QFwlAeqixGu49Vo5CrHDQu9oqxWpFbsSKk01ZHHzcP9 5buxgWcTxgmQazanwfb0fqp9686xlvZIDR47gq9ut3OFTND4n89HGgw0LKPTI0h5NY5i 9BPkavAEJ1/ijrG0F6Z2DSmo+GxKB3qYe8GLlZorxW+46U14a2nnhYWe8i4V8sSQFxvF AB5g== X-Gm-Message-State: AHQUAuYVd4M+1I3Fm01NXBf2mRUgRKDgPNxZ1W05Ag2NWcBWmC0x1VwO JqyMAMJ4VXNcOmrP1OlLpxuoOFiLTqrUDQ== X-Google-Smtp-Source: AHgI3IZ55XtbrNFbkQrDgrsmr7mdr4l6vEwAO7J8uZuW5jEBEg9XUvtG8XtenIsY3FNaYjdMyX7w4w== X-Received: by 2002:a17:902:b20e:: with SMTP id t14mr2927069plr.97.1550823828410; Fri, 22 Feb 2019 00:23:48 -0800 (PST) Received: from localhost.localdomain (li1195-158.members.linode.com. [45.79.96.158]) by smtp.gmail.com with ESMTPSA id y22sm133821pfn.136.2019.02.22.00.23.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 00:23:47 -0800 (PST) From: Leo Yan To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon , Mark Rutland , James Morse , Andre Przywara , Jun Yao , Paolo Bonzini , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/4] KVM: arm/arm64: vgic: Improve comment on kvm_vgic_inject_irq Date: Fri, 22 Feb 2019 16:23:24 +0800 Message-Id: <20190222082327.3312-3-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190222082327.3312-1-leo.yan@linaro.org> References: <20190222082327.3312-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190222_002349_606691_4507025C X-CRM114-Status: GOOD ( 14.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The function kvm_vgic_inject_irq() is not only used by PPIs but also can be used to inject interrupt for SPIs; this patch improves comment for argument @cpuid to reflect support SPIs as well. Signed-off-by: Leo Yan --- virt/kvm/arm/vgic/vgic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c index 7cfdfbc910e0..79fe64c15051 100644 --- a/virt/kvm/arm/vgic/vgic.c +++ b/virt/kvm/arm/vgic/vgic.c @@ -394,7 +394,7 @@ bool vgic_queue_irq_unlock(struct kvm *kvm, struct vgic_irq *irq, /** * kvm_vgic_inject_irq - Inject an IRQ from a device to the vgic * @kvm: The VM structure pointer - * @cpuid: The CPU for PPIs + * @cpuid: The CPU for PPIs and SPIs * @intid: The INTID to inject a new state to. * @level: Edge-triggered: true: to trigger the interrupt * false: to ignore the call From patchwork Fri Feb 22 08:23:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 10825509 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 AF0521390 for ; Fri, 22 Feb 2019 08:24:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99AA32EF16 for ; Fri, 22 Feb 2019 08:24:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CE602EB42; Fri, 22 Feb 2019 08:24:41 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8319D2EB42 for ; Fri, 22 Feb 2019 08:24:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=icW3cOluFYTCB92WkEqSmZNHvcvPwCkmSex4h9dvh6M=; b=rPAFtA2gxUvJVRfDPC8wt50kKJ xQtT59oHvXF5Qvd3D0uMMzMHq5I6hehUzJT2NIE3XFp9gz0VAnXVmGYiGZt/D7WYvztsfsJ0AkN4r JaMOOmAJNqSI45ioHvC4dsZRg6xDOH7kSn8YH99auZUITIBaIwJrsM6pr6Hg8Yj7n805kDQdu67al PTXfN9kyMQVoKSR99nCMt+pVx/XzNWcCU4dHwwrzHs2BSnY6SqgW+Y6fqI0w1vJloYVtPTcz+OCGH VUAqHyyGqK9P8lZaIDVoaLXsiHndqvsBr4emiupuOYzuAYdY6BKBkX3bubVhV/E6Cr7w+gTv1F9vE +LYi+75g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx68I-0002jk-RV; Fri, 22 Feb 2019 08:24:34 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx67f-0001yF-7Y for linux-arm-kernel@lists.infradead.org; Fri, 22 Feb 2019 08:23:56 +0000 Received: by mail-pf1-x442.google.com with SMTP id n22so788954pfa.3 for ; Fri, 22 Feb 2019 00:23:55 -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=bgi/EwWWX2Li81Mw0qcYS+JuoX7DsHGY+9JFpKlkgdc=; b=glVX89XfORwvW7FkND8gZJzWrHSHwaG4itLrZHBr4FtkNJ6lMhUsHHTNzqDKS+iDZU bDGk298KA7z/RP0due2fQziBZ1CPnNU5zcNXON30p1+uPXUpkTTxg1TvH1i771k0me3p VAQys7QShIJSO7z3/1EpSU4HBnERZ7ZESzp98tv8XgB37kyCSfqd6sr/13ohOgbRHjEb nlVeJ/tRVyyq6BG92HILxgNZs42uQ7uk6hV695t8Hhm07nf1JeSlHTJGs09pQdG2KWox DgFleQLZaYeMp2ARvyttG9DHqV1d/+6Dm5adgI16HdcMCRNk1O+awlRX7d4wh396+frB zrtw== 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=bgi/EwWWX2Li81Mw0qcYS+JuoX7DsHGY+9JFpKlkgdc=; b=hBbf0yN2sV6uEGgG7X7OVk5QYG3cBgJyqNP1ReiikCAHJCl56l8Q00FN0WX485N9FN Y2zz9rVQzteHMCEaZLwKck1uuwBIk8mvqtYgWVzNAqvMAD4UBDwKTO4CN8FJzyeI2D0u 8Ql5/eLmLepMXfOvEfDyYtzuU+OVMkivb8+U01YNTxeoMj7RxyZEl/cjarTwO+0ut6Bx 8/ZFR2Z/ZQA7XqdyLYzbTz1LF9U9dT1lW9e3gg4f9IRzhkcuBoX7MyJSV81NmMWZo9+Y FN7YHR5uTqgArOggY5+ALhSpJtFrKGYQnBz45KiRL/sDJV8rbF6y3TpxV20CPEcBXZlp LyeQ== X-Gm-Message-State: AHQUAuaf5a9a0LAUcuf6Oji1Pjwc8HV6q6mGZ0zRidqALlvML+Ccn1+8 65iP8dB1Wxvgkjam+eN5fOdfQQ== X-Google-Smtp-Source: AHgI3Ia5hNRiwxytszVdshV3NZynVSqQC4W3Tw34lPMYufhILVuh352r8QGCnNq/B8RT2OANfG46xA== X-Received: by 2002:a62:e716:: with SMTP id s22mr2984891pfh.35.1550823834722; Fri, 22 Feb 2019 00:23:54 -0800 (PST) Received: from localhost.localdomain (li1195-158.members.linode.com. [45.79.96.158]) by smtp.gmail.com with ESMTPSA id y22sm133821pfn.136.2019.02.22.00.23.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 00:23:54 -0800 (PST) From: Leo Yan To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon , Mark Rutland , James Morse , Andre Przywara , Jun Yao , Paolo Bonzini , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: [PATCH v1 3/4] KVM: arm/arm64: Define TCR_EL2_T0SZ_MASK as TCR_T0SZ_MASK Date: Fri, 22 Feb 2019 16:23:25 +0800 Message-Id: <20190222082327.3312-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190222082327.3312-1-leo.yan@linaro.org> References: <20190222082327.3312-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190222_002355_276073_37008C99 X-CRM114-Status: GOOD ( 12.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Define macro TCR_EL2_T0SZ_MASK as TCR_T0SZ_MASK, so can remove the hard number 0x3f. Signed-off-by: Leo Yan Reviewed-by: Mark Rutland --- arch/arm64/include/asm/kvm_arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 6f602af5263c..d945a787f36e 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -99,7 +99,7 @@ #define TCR_EL2_SH0_MASK TCR_SH0_MASK #define TCR_EL2_ORGN0_MASK TCR_ORGN0_MASK #define TCR_EL2_IRGN0_MASK TCR_IRGN0_MASK -#define TCR_EL2_T0SZ_MASK 0x3f +#define TCR_EL2_T0SZ_MASK TCR_T0SZ_MASK #define TCR_EL2_MASK (TCR_EL2_TG0_MASK | TCR_EL2_SH0_MASK | \ TCR_EL2_ORGN0_MASK | TCR_EL2_IRGN0_MASK | TCR_EL2_T0SZ_MASK) From patchwork Fri Feb 22 08:23:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 10825511 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 2CFB7139A for ; Fri, 22 Feb 2019 08:24:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A69E2EEE9 for ; Fri, 22 Feb 2019 08:24:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E00F2F047; Fri, 22 Feb 2019 08:24:45 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B92932EEE9 for ; Fri, 22 Feb 2019 08:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=JF6Hc15TwPfuMXNCQOJK6pBAvy44vKEgsQ+6YKNYm9k=; b=TuyAT71iwTRePoSMAXQdSeGJFM O8Hycc2tJQWGdbvEh89o+s3RbaIChrtfUcrQYOqvKh9LD2MzCQa2aUoVCxMhP2VJmlTB/mvHt1dMv nBvcQuSmZ7urxQQa5VF9aGcHvpgnIy5uqPm/b+lNn6c+/EYtmX5EhqAYHP5umYsPQa/pMQS5dxT6/ zjSD+jr/EVLFS7QXVWbmG2x82wfEczMy7gbMYtOaaJod3j/ea01Nr8Pr5dlrpZmL/LVazZw9f0U8q Kz2K1AsrfCYqO9sqhAiKL+shsYAPBdVH60lxtbk8nsKnh8jelje7ezINnRzNA78O4MRs6lpOmnLmm KXRGRPPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx68P-0002sJ-Rf; Fri, 22 Feb 2019 08:24:41 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gx67k-00025o-N6 for linux-arm-kernel@lists.infradead.org; Fri, 22 Feb 2019 08:24:06 +0000 Received: by mail-pl1-x644.google.com with SMTP id q3so774729pll.4 for ; Fri, 22 Feb 2019 00:24:00 -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=yToDsQHz3ALMgK9EtUQgb46vvC2ZQAohlXLeU3oKRKI=; b=iNDxPbyyWhQMppHJsSCDsV+gjSyBJy0WimqXj0Zezyafuk6tomK/Xpt2ifNex/GF18 zN2zDgecC0MfI5c8GruuMobJ7jBysUACkeUYWFdaCIusTrt0ucF8l1vVINzPUJpHFBsr 2FogixqkYPdDK3t9W8RZj9rmOdCqTjYuyPUekjVq+gnNopoRq8U1KEykJxMMgLU5gMj7 Tm5zVXAykk1ldds6XoIzsBxawpkkhfJjsvyqoFbnpi9ntVN/9GXEHQQ1/eogTqeC8Xfu L7E2Abc5Xe0RowZjqh7fpUuPuOWqaqXkbwUJIZ1rRmGHkg8r8aM+pFjhPsx4+F4Roo3k 1N6A== 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=yToDsQHz3ALMgK9EtUQgb46vvC2ZQAohlXLeU3oKRKI=; b=LYFgOx7Zr50M9OubLt50LjaZQdoY8PEAhia5zsY+fpgb6lYNflhekCL1vaVIvWDeu5 cMGyR0RGBw7T8ZaSMwC+/vgqeUW47PdJpY3dPUm/FPDC3Q+AIzufNB9QAKyBr0cEdXDl RSjrgnYArFkBPYlrKukKviH4g6MjrZjuU4Qg+iS41hK/E90MwbPIgApD6XT09AICoHfh uJyyzguAcdh3wMTAs1bEleYaIkijeMOIl7FbbNoee/GFInY0WstFxRkA9Oal/HLIhFtI oITNB0ps5cFw5qkRY+OPIwOxFsw5i89f4CiU1PoE6UvZeg+hNh4ri/jEuT4y3CG/JC9m sWkg== X-Gm-Message-State: AHQUAuZnPhs3tC9nuWeJZ3d4QJ4Y/Jsjdls+hVMZ3nvrJ5SqywkgdVl1 jEe4Ldf3ENdrsUa7waN2LSP55Q== X-Google-Smtp-Source: AHgI3IaV33tJQbsIeXVfmlMvaEdoQdrnhGr4bVSBQNDS2guL74fAKBX27EW4pzq3bzzTzFOEQyF+/Q== X-Received: by 2002:a17:902:9689:: with SMTP id n9mr3026924plp.8.1550823840196; Fri, 22 Feb 2019 00:24:00 -0800 (PST) Received: from localhost.localdomain (li1195-158.members.linode.com. [45.79.96.158]) by smtp.gmail.com with ESMTPSA id y22sm133821pfn.136.2019.02.22.00.23.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 00:23:59 -0800 (PST) From: Leo Yan To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon , Mark Rutland , James Morse , Andre Przywara , Jun Yao , Paolo Bonzini , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: [PATCH v1 4/4] KVM: arm/arm64: Fix comment on create_hyp_mappings() Date: Fri, 22 Feb 2019 16:23:26 +0800 Message-Id: <20190222082327.3312-5-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190222082327.3312-1-leo.yan@linaro.org> References: <20190222082327.3312-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190222_002401_311715_5F26BE05 X-CRM114-Status: GOOD ( 14.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit f7bec68d2fae ("arm/arm64: KVM: Prune unused #defines"), the macro HYP_PAGE_OFFSET has been removed, but it's kept in the comment for the function create_hyp_mappings(). This patch uses PAGE_OFFSET to replace HYP_PAGE_OFFSET and this is consistent with what is doing in the function. Signed-off-by: Leo Yan --- virt/kvm/arm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index 5eca48bdb1a6..9634f47c2c8b 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -734,7 +734,7 @@ static phys_addr_t kvm_kaddr_to_phys(void *kaddr) * @prot: The protection to be applied to this range * * The same virtual address as the kernel virtual address is also used - * in Hyp-mode mapping (modulo HYP_PAGE_OFFSET) to the same underlying + * in Hyp-mode mapping (modulo PAGE_OFFSET) to the same underlying * physical pages. */ int create_hyp_mappings(void *from, void *to, pgprot_t prot)