From patchwork Wed Nov 13 16:11:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 179333 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp9810548ilf; Wed, 13 Nov 2019 08:13:00 -0800 (PST) X-Google-Smtp-Source: APXvYqwXnPk5IlzVLlI59JYQHIGZcX+87FIk/eYJ9tfH49nEzTFkRMtiawVKvRfuQJ3mD1y+aVYE X-Received: by 2002:a50:b262:: with SMTP id o89mr4344100edd.170.1573661580147; Wed, 13 Nov 2019 08:13:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573661580; cv=none; d=google.com; s=arc-20160816; b=JJDfi0KJaQEIeONTaEFYzFvfw3XIaNLiPG+CIYJ19uPEbPz9KLK+5V64QMZNDUZnk5 3GlOBYa+Pi5E++XWw74mZ5jhjvCJBA77/7asi1vWAXAnxknMNjbllqmeMEGb0X2Qvvpf kZ7hVU/oXdreWMO3CFiaJduf4U+pndUJLRsXu3gXiKE7TvaE6ObH7+6+/7mIDb1NV/dG cfe0hRNg6/20uJigZEm68Qb8c3vPpGLf2TzdRovKmIB38eI7g+ffZgna5+keEW9Ky2PD haObsvX+oD7SBpbDJPu7ZpnUUoKs07yx4N/neyXy/7I9TcyHFZKa11yhld/w/TXeZGpI mb4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=YJxNq5jgKySJ46UTIfsuTGfU+Dy2PCM6mhoA0GLObqo=; b=TudLsKgq2/+gf4Y9r21y5ikLWmXyuMKtXtLKacDUGQF9c6wI0PiKBoO3zcolIhg4cA OW/2dI9L4HUS8IVWwRgBm1qI1DLm61UFygR01TfguwGfU4TpDLlDWVzV8tsXmS9NAy/Q vBYjxOrBBOozD0WNvPXrei5TLRYlAyu4jAIaxzGDbJL4uLfXtSyNAgo3FNTIYpDHhQFV 97A1eXXCLiM5fuWVigqBaBpwTrjrxJHuPknHt2EH7kiyGNUnxQVD4h42CeNRO7K7jzxN xDWKZrHhLwYUwS4C4dKa2vDf6WvE8n1WcNbi+B+09XbIB9K3fMQlo9Pl9eW/b/BIrBEC JxtQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p17si1383606ejb.9.2019.11.13.08.12.59; Wed, 13 Nov 2019 08:13:00 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728280AbfKMQM6 (ORCPT + 26 others); Wed, 13 Nov 2019 11:12:58 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:39602 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727470AbfKMQM6 (ORCPT ); Wed, 13 Nov 2019 11:12:58 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 10A3099376CB0B408A91; Thu, 14 Nov 2019 00:12:52 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.439.0; Thu, 14 Nov 2019 00:12:43 +0800 From: Shameer Kolothum To: , CC: , , , , , Subject: [PATCH] iommu/arm-smmu-v3: Populate VMID field for CMDQ_OP_TLBI_NH_VA Date: Wed, 13 Nov 2019 16:11:38 +0000 Message-ID: <20191113161138.22336-1-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CMDQ_OP_TLBI_NH_VA requires VMID and this was missing since commit 1c27df1c0a82 ("iommu/arm-smmu: Use correct address mask for CMD_TLBI_S2_IPA"). Add it back. Fixes: 1c27df1c0a82 ("iommu/arm-smmu: Use correct address mask for CMD_TLBI_S2_IPA") Signed-off-by: Shameer Kolothum --- This came to light while verifying the "SMMUv3 Nested Stage Setup" series by Eric. Please find the discusiion here, https://lore.kernel.org/patchwork/cover/1099617/ --- drivers/iommu/arm-smmu-v3.c | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 Reviewed-by: Robin Murphy Reviewed-by: Eric Auger diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 8da93e730d6f..9b5274346df0 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -856,6 +856,7 @@ static int arm_smmu_cmdq_build_cmd(u64 *cmd, struct arm_smmu_cmdq_ent *ent) cmd[1] |= FIELD_PREP(CMDQ_CFGI_1_RANGE, 31); break; case CMDQ_OP_TLBI_NH_VA: + cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_VMID, ent->tlbi.vmid); cmd[0] |= FIELD_PREP(CMDQ_TLBI_0_ASID, ent->tlbi.asid); cmd[1] |= FIELD_PREP(CMDQ_TLBI_1_LEAF, ent->tlbi.leaf); cmd[1] |= ent->tlbi.addr & CMDQ_TLBI_1_VA_MASK;