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: 158999 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1454430jaa; Fri, 22 Feb 2019 00:23:47 -0800 (PST) X-Google-Smtp-Source: AHgI3IbtTIYojrSEmnX2Noa1+zEHLGLR4zVwyU8IXJ1myFD7dAPE+JEp+WspADJHuVbH4U0/6DqM X-Received: by 2002:a62:e802:: with SMTP id c2mr1867309pfi.249.1550823827910; Fri, 22 Feb 2019 00:23:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550823827; cv=none; d=google.com; s=arc-20160816; b=0plHTcQAXUyVmsVySmh8nyirf3s5NM3K6OjgNNwRivyyTHxeqOV6e06k8Sh9xJbbmU fzn5UINTehX+X50Gs+m0aOrlXyzjw894uJ94aioQWbtYA/y8TbMNebyfLXaJhp1waAga sXsVSes4DYN4KUcn5UPZjLG7l2yK0RSRHaZ1gfRzt1Ur0LpwTEpI6WI00RBtJojyECVi T9V4CRtf9CxE/LkMSoYUbvf0DCfERW57wT5cslF3U3uBUrA717XWx4bYrj1PvwA1RVYk 3xa6NBoG+rk0oAN/UKW0cp3MOcEGijtHdib7gj3CdYODB+3lHUdoRztfsztQemLVWYkx tMdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=CWZpOa7KU5IoSG9K/3vLaR3fHpcin2VffNYLaVd5Roo=; b=P1Jnu1xW2NpzRN5PXLf80k/3c7l4PdwJWYlYmHFOaQ9Qa9L+1xxKT11/OCEHYRcrLI AZhEEsIQYLRsGLSba1bDz8Y4nzGRQlBg9DdN9d5dS+s0weXpTeSxafJKLWEMXfGK224S Oc709kjGS+2PxsmO27Ft8RI6Y+q3mOJi+3NFroVZO5/AohNajSmNzla9CfWdXpIn//r0 ji6GpYVdMz+Ni4Z6A8Av2dhohFxZyr3X4Bd6ktS2cNqhnOPHd0nWsGJgtQoFaJLywUL8 CUeaVudecwOUJBo3ydqIKHCHqUBYn53ev1662tpYViY9L7AC46aHtubj8uuZaYDiGaWT 5Aqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E9JykKxL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s9si792602plr.316.2019.02.22.00.23.47; Fri, 22 Feb 2019 00:23:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E9JykKxL; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726555AbfBVIXq (ORCPT + 32 others); Fri, 22 Feb 2019 03:23:46 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:35951 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbfBVIXp (ORCPT ); Fri, 22 Feb 2019 03:23:45 -0500 Received: by mail-pl1-f196.google.com with SMTP id k2so778350plt.3 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=aw83wWKAEPLzOtx8h76VFM0p1MjRbD5kaoo8+cgKm1yFOTrv+hbrmDrmaxj6AjL16X sJ9LWOF0wvxKpUyrtVC7UkkgrTohy6sC9pG+c3DlZxOp5aB61qssmOP6tOBDJybZ6Yuo 8uiCzc9WX6aqBFZier7QURnRh2kgVbhiB+R+MJcOn9BTP7qM3+udoEGGUlmwULmLXB7Y rWzsvup7ZkQ8pyh7cGxzW1wGJU42D3kx92oUS+T6n0f2OTCccNT1Uc2EXEKNubHhr1TJ VbYNHoyw3os1XoeddZz05DLS3uSoo4OwJAr4ynFyGmHCqOhcidZ9Rau9a8ItsszsOZJg mjhA== X-Gm-Message-State: AHQUAubSY8CxRd66uC9vHINdnDOLTKI0PRXyvbREoYmGg347dRWKvLYd ClqfIYfPeaFTyKe5foqa/XFXUA== 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 Cc: Leo Yan 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use macro for ID_AA64MMFR1_EL1.VH bits shift instead of 8 directly. Signed-off-by: Leo Yan --- arch/arm64/kernel/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Mark Rutland 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: 159000 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1454478jaa; Fri, 22 Feb 2019 00:23:51 -0800 (PST) X-Google-Smtp-Source: AHgI3IYWdEajd8c4upivkKY5YJl07SkZbPIjS3YxlGv9zeyjdJHcfk9CofzE4k51A+CcU8Igk9Jw X-Received: by 2002:a63:2a89:: with SMTP id q131mr2782440pgq.216.1550823831446; Fri, 22 Feb 2019 00:23:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550823831; cv=none; d=google.com; s=arc-20160816; b=ctvqTNSG8svHoT//cbPPhEFqoVjFeUvcH4r/b1RGmqKrQcGHNtLkaz6ZsG7wjMkbVk FuxOPSNo7CIioPN+S9lNqYb2saket0fSS2dmXCzpuAAhIBKvZpwvQWCL9Gp6oXirb2g+ H6bUpsAOhXg4RMFa6e9WyaB6yCWzKaAJU+zeUUHNcKwgGzbYeV9ngWank0G2ZLmQPh35 Wjhy+TLe5ICo3RQ4QxN1iBKn8xSB3lTFX/lGvZ52HWdbNbHCpdt4/O4aIye3fH8ytOxX UhGMF7wl1WPVeajzRo0fhTgaUDPON2RVQI2ypX/86Y4UX8ybptrUZbQZy7wZ30WUD7gp wh2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=kVzojLvyJg8CcO1+5mzWEKYitIoofAkDltlfNCBnwRI=; b=qtCmzRtCdadLz4G9qTW1NuLiKFAXJKtaqkcz2E6W+9uOporL7zXpepMFB3TBQNyL11 SndF0lBkpS4rMfg3iH+sFAN3YvSzkaGjxT2sapCqj5GgyLdUtUKB/MFZXxImF8GCYxTr T4MGqdiXTAKCVZjf9y0FYqtjN0mBU7pZRV/Sg2KzEmAw4X+daDnOMCC1ygg+2jdY1VaU OmnetMaIQh8ylwNzVcB366piyuDNSklz82xXYT2jHgTzsfTXPZA9uq24HQ8PxqWVMO0v /6BrsrZfzUSy73Ry/FI5xiDtk6Jk3semaoum0VjcNjITABoPVf1TOUiwi2wOWHY5ayJS vyxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KjfjDlet; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s9si792602plr.316.2019.02.22.00.23.50; Fri, 22 Feb 2019 00:23:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KjfjDlet; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726694AbfBVIXt (ORCPT + 32 others); Fri, 22 Feb 2019 03:23:49 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:47034 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbfBVIXt (ORCPT ); Fri, 22 Feb 2019 03:23:49 -0500 Received: by mail-pl1-f195.google.com with SMTP id o6so741587pls.13 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=nsbX874cGofnbEHtvLHxYVVL3O1KFdm8L7v3KZGJiJ0wfBLFm1rIjNBz4g+KWhMgyO Wt8u/+dW+dt2EObWAuWuXo0P1VSomYHI54RqEX3QaX/AvN4by+7HaidR3kyEX52NOjlF Dru6/LpnBXDAH0CF3RFYNiOtQq2Iz056YT8oERlLBPQLGeE3mxKeidLNwUUchuT9GflF IsL6DHw+i/MeJMXRvI5fhCz9OkgRAlIlumeSIF1XWbR3r8JBzE6ZwUWUrvCPGDShUsA3 XmA/ZFIGcVZu544UbVHpRhDTv16OM5NLw5J+o9J1b4jme7OzT+EbfgrX1KHOJ0DsP5ON grjg== X-Gm-Message-State: AHQUAuaI9RhQypHNudqvL1xY9rEhVHsumZjDwO3FycsuNBxuK5Gxsx8n TL6wbBxwaYM4ANvdsoLPesep8w== 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 Cc: Leo Yan 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.17.1 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: 159001 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1454548jaa; Fri, 22 Feb 2019 00:23:57 -0800 (PST) X-Google-Smtp-Source: AHgI3IaWxOMHGP0heXAkybUynw7gt29trv3OaWwTV5P1x43UpbirBqvCDK337GnE44WJs8OpzN6D X-Received: by 2002:a63:4652:: with SMTP id v18mr2778779pgk.356.1550823837668; Fri, 22 Feb 2019 00:23:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550823837; cv=none; d=google.com; s=arc-20160816; b=R8+vxHyXCyY0BIZB/b4KzSYc+MwG4t3IwfI8eLk0ae8wP7iOmN2iYoLX9x4ynkCTn2 5ko0mopEHMXvSQDWnJpRD/wihMUuHlqYUUfMMpwGc1qHnWCkox+eFDB120vByPEUWcgO lR2XBd9nw92YIoyoBOMsgXglCzpFgm0S+gchvjFScF80yJedU6B1UZeKU9xUcDeLBKJG fXm1v3bat1J67IXjmT6sWm9Iu3tgjB/iG85sHoCnndj7PDjVcUwHTrasq00yXW8tO0Nd Y3JwECN7pjBBDNVgIKoPx3iT+U3Tait6/vEd2EtOT8DAyGej8xoMk8lrGMPQ49E7qULD c/Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=bgi/EwWWX2Li81Mw0qcYS+JuoX7DsHGY+9JFpKlkgdc=; b=1DwwtRml1MU7kU58usYLpdmwr9ucHO+CvLofuLRBFdD6xfP0fvhzAZO7PLHwN3rdyJ Dfy8IIWSNlGpL0kAc14jXX1fsC1EsTsXrD/SmT6lp58HB7xdYKSDIDqFlZzC7kE05/7o 2ChF3DhrXNcGvvsXK28cm4Z1aR4UCDldzHPSweAqgNjZjgxuBRBmb61QcMOQRhJ1orUp jxCKtaRUR3PfsX9zmmjLZ9qf7xXqFj3OL2OX2CREHAvXR2a+rHuCz++2FqF/1Zn6ipmk mQj4fkKmGM80pSnT52ARSYOoUzttPsP/d7G/3r5lzGBavIbZY/HokxqdFCbflGPJOOnZ Ng/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=glVX89Xf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s9si792602plr.316.2019.02.22.00.23.57; Fri, 22 Feb 2019 00:23:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=glVX89Xf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726833AbfBVIX4 (ORCPT + 32 others); Fri, 22 Feb 2019 03:23:56 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38682 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbfBVIXz (ORCPT ); Fri, 22 Feb 2019 03:23:55 -0500 Received: by mail-pg1-f194.google.com with SMTP id m2so795318pgl.5 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=OE/oODjByPe2n9f+PJ/yj1sUST5a2HWdZEwEGzIE/v8+OIo9c3KJJ39emNfVcvmxLe k8tsjT3b+Ee035GbVBRbS906/I40z1PfLQTiQQbOm2+iQuw8njkY+ur9B/g/1vy5VKG8 OOIDViwZ+6JWc7rCkr5sTWdfyNlPEM/Hz24GOqMyCf4Menljsa4xXsVxFE6skVs510A+ Ls+qAQRMVqeJz5eodAdxdorFFZRtSdeOp6ChdZHBCLvQ+fxd3UtFN2Q/+Qb/5M4EfV7U FFVv7sHIKndaJ+3Mt+0k89qavM2Gh/Fw0Mh9ACGQCmNmBRtmiphHy6ORh+5bH3xqK67q PTcg== X-Gm-Message-State: AHQUAuZQa7nP0GJY2h2QYs/CubiBHocf5eZc1YNqB//DbzjjHuwvDBH6 vwSmMEJI2GtjmtrpCDWyDMRfJQ== 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 Cc: Leo Yan 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Define macro TCR_EL2_T0SZ_MASK as TCR_T0SZ_MASK, so can remove the hard number 0x3f. Signed-off-by: Leo Yan --- arch/arm64/include/asm/kvm_arm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Mark Rutland 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: 159002 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1454602jaa; Fri, 22 Feb 2019 00:24:03 -0800 (PST) X-Google-Smtp-Source: AHgI3IY8p8gGdtPYE6/u42JQMPTOFmCVLbI/5rMz/OZKkxKXV1gKMQZd4pwQFLyiQOMLGWvxOYH+ X-Received: by 2002:a17:902:2:: with SMTP id 2mr3077520pla.228.1550823843035; Fri, 22 Feb 2019 00:24:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550823843; cv=none; d=google.com; s=arc-20160816; b=OHvYuh+ASuzZtNAaP/pZXIm0URORQl1ifztZbH8EhdrsAzKYoohtopv31jfW6i99Oh zLgLWDDkKC1hx9hF+bCsD2FBju+SD1B/qIBhKEQz3JXsJxf1FO9SUr1S92+MIRHyQk9p 0oWWtrNt36oUCgnN9dn+/V1iRyuEqjoNpJ0OXuxaxuDjmoM3IeZQaz3oBl+bovdYzRPW iiFcAY2cGY7aSlHwyCaR++vxhXvW75mNFSWm6dnpRRh0OBIDLUYdNBnqVI9Z5kAFkVnU 4UrrWroDPrSzSIaFNLV86vkv77Rj8Rq3YZ5vWkvhRS+0ewFcaN7Lft6S3qw5TbrtiGRH MtjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=yToDsQHz3ALMgK9EtUQgb46vvC2ZQAohlXLeU3oKRKI=; b=gDeeILHFrjjEh9/1hmwXgqP0j5UzIp/o/0J6pHZByUx7txkQReVWv07FSmzybnyhLA kPlNMzjOmvXV6AbM4SYldKNWVvgi4S71MqXRElJxxBG7iBqMjUNDrz8oyd8GUGYlE9+C 2c8YFoX1UrnEAHcS4YINOf25lhbVBVwbcJaMgHnqOMwLgG1ntQc4R0vo4I9HJIO1sLuO eyadizs3kHR0WnJz3eoyE+O7mLMkn03COzmC7JG/HuV/QXYaLraCNvuq0hRa8naQwbp8 0fbVqaUBetQbLaaM5IRBS3XlZZTvcN7LMWAw3CJo/YzImWMn0TdvnspUwce7So3vSo8P +pnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iNDxPbyy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u6si801577pgh.438.2019.02.22.00.24.02; Fri, 22 Feb 2019 00:24:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iNDxPbyy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726908AbfBVIYB (ORCPT + 32 others); Fri, 22 Feb 2019 03:24:01 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:45268 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbfBVIYA (ORCPT ); Fri, 22 Feb 2019 03:24:00 -0500 Received: by mail-pl1-f194.google.com with SMTP id r14so749456pls.12 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=YFtpwykgjCJEOMFNtN4JNjsk5B97wYf2aLIKF6NVAiTNIDWe5AqaCPMupt/sYNxo2c q8pe5SHcB3PsHnWrlVPmJcwlcuUCN4dReFeZiJ2wBcnF/DbDcAcHiAHZ26av+t+qIQjl tRMdr7KtsWDldwQMa1kZeuW6Ze4sTuysH24+keDBv4ZJh/41+O17LdaCraN+IGOg1OXm IUQz0cINiFBaeggUIJ8i4WOl0kVCpO3BDrPHTZVqrV4UC/OcPEETAFXIPanE1vE+Ms1T n18E+3T2IFTEPmpF7B8nruK1iI0NeMrA1rP2vaTNZD8kKTJ72fcbTFKF+Fjg2TYR/708 5Crw== X-Gm-Message-State: AHQUAuaF6tUf6l++vqG7WQHsaLAOteDNr8fKFQG06pq19CzbTppRWAhR f/QSdRBRRDbYch/XRLJeokXDyQ== 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 Cc: Leo Yan 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.17.1 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)