Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp76763pxk; Fri, 11 Sep 2020 00:22:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8h5xQkFu01GLSJfDLPrixULLaoXhiPSR56PI78PB1s/REbpx5/XdlZkNA+4PAqEK7Mw7z X-Received: by 2002:a05:6402:17fc:: with SMTP id t28mr642529edy.244.1599808953392; Fri, 11 Sep 2020 00:22:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599808953; cv=none; d=google.com; s=arc-20160816; b=P7YAlOtF1IHq7VZISBHFLoSQgDE+Ctzwk2/Qikihw4KNoKHnwq1z1jUBXzzqeI+MvH 05C1c0clfZn3US6+bylfOjIqGiZNh3DULRA8e+cbfZX902BoZIyrAJg+65ITExHoWjog STbB6UGFjrSmbYJrHtywC4yrQfufNKH1Pzg1DNA64sd6FPQ9Zq7nc2paQ+jKhtI/pPxR NKJ+JBQXXpRNn08i/FHgusGuLdIAGK6Qd8JRNzFcYdk8YGnrF1gSBFFgO2PsTvMMg068 vkOs61oQxNxqOKFmkF6L2krANxslRZQiuxbYF4Dd1jgBGFtMhsZ4mHLwfmBm+mQBWPHd LPsg== 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=cGYTBEv6g30jYHt4cdTq/c1g79ggDOFP0r3LMo62bBA=; b=kwVi7N0/7jpMoqgaKDot55K6ZmwfBdUtRfOSjcw7rA53jLyefrzJd7dt/52KiB9LHU fiuC3YXSe7tZOxby8fnYsRtr7w4HrzRljZucHMOFqCQBUfZvm0l26nQv07/0bsQlcNAc ZqNkMUzFsbN3G+sl2W6rfkE091wqKB5bQo9C6soxX6AxLLkWcAQlr+LsH9R4Wwcj52LK r8D8weKqN7fU5btFSXV8w5SiLIKiNkk/bS1vXMVTCUgt8ue6sGJ28qM9Gmw98iMvi9Fy +gttllqQ4I4qJtjmWJP11YBRkUeYKYCg/TNMGy4/5C06/YCV8NeywjSHRmLxHrxbUVs7 JY0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gqFXSJCc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c9si740276edl.424.2020.09.11.00.22.10; Fri, 11 Sep 2020 00:22:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gqFXSJCc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725838AbgIKHTV (ORCPT + 99 others); Fri, 11 Sep 2020 03:19:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725783AbgIKHTB (ORCPT ); Fri, 11 Sep 2020 03:19:01 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BD4FC061757; Fri, 11 Sep 2020 00:19:00 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id fa1so1285866pjb.0; Fri, 11 Sep 2020 00:19:00 -0700 (PDT) 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=cGYTBEv6g30jYHt4cdTq/c1g79ggDOFP0r3LMo62bBA=; b=gqFXSJCchjmN+3IhIFj8p5RjLbBWt/19Ys9tktWnFE1eEYnt5q5iGnWHNhTMks+iqK b0NCEBV+tmQh/qf0Vap62vKCEX4BiEdJqWk/0fNXjsQjtqoje3xQ8tD64tNaCXhJGZEN +PdbkA+U6zcv69VRmd5Y7nB1UikA1Yd7/vUljAwpV1R0Cav2OxkSBA368tZa0/2lPNBH cpdQxOFw5+M4+8hVmvzVLWDp45ldlx4Zinyz/n9mG+uxuZczKE7TAl2YH/nYwCxTUzH0 TDMkdYhHqMfrLRfqNJDqx2Zs6T6lnF/3y3Lo5EB+kBffm4tefn7oUQtp/pO+/Poix78v CRMw== 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=cGYTBEv6g30jYHt4cdTq/c1g79ggDOFP0r3LMo62bBA=; b=iDyqqMQhUvZ4IjClYSvHdC5kFOElrI+W2MWkY8JnbbNONDELiT6NtTKdXYah6AST2C ks5+bZ3M37jY0PbYBRZbSp1gTtUq/3ODLEWsqS6c8HQaS0KROX0swdwutHeZ85X1w6zB OcgdttXek5HBPHljxFoKwrnOhJhb/AbMttdiI6yUgRITEdGHYtu9pb9rs22EC1vPXxyr 2SmFXEnj4vFETAabLJVEr/D68GM96MqBGq2YPCHWqLkPiGfk1FHRt0ekx6iaDmoKcIU1 luS25g5BNJbB+utZzVIBB4kk12V4sm1G9DQodcdXCjl4Fsln6y4OVSBlWPH89kk3Nqja Ze7g== X-Gm-Message-State: AOAM530KuA+4amMy02ZpCefPeHjXykPnMT6DIZvcwUpd3bMCjI48IdQ1 aiN9RxVRqQNszkGwWARg2H8= X-Received: by 2002:a17:90a:ea0c:: with SMTP id w12mr1003887pjy.65.1599808740186; Fri, 11 Sep 2020 00:19:00 -0700 (PDT) Received: from Asurada-Nvidia.nvidia.com (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id 131sm1264692pfc.20.2020.09.11.00.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 00:18:59 -0700 (PDT) From: Nicolin Chen To: joro@8bytes.org, thierry.reding@gmail.com Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-tegra@vger.kernel.org, jonathanh@nvidia.com, vdumpa@nvidia.com Subject: [PATCH 2/3] iommu/tegra-smmu: Fix iova->phys translation Date: Fri, 11 Sep 2020 00:16:42 -0700 Message-Id: <20200911071643.17212-3-nicoleotsuka@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200911071643.17212-1-nicoleotsuka@gmail.com> References: <20200911071643.17212-1-nicoleotsuka@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org IOVA might not be always 4KB aligned. So tegra_smmu_iova_to_phys function needs to add on the lower 12-bit offset from input iova. Signed-off-by: Nicolin Chen --- drivers/iommu/tegra-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 789d21c01b77..50b962b0647e 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -795,7 +795,7 @@ static phys_addr_t tegra_smmu_iova_to_phys(struct iommu_domain *domain, pfn = *pte & as->smmu->pfn_mask; - return SMMU_PFN_PHYS(pfn); + return SMMU_PFN_PHYS(pfn) + SMMU_OFFSET_IN_PAGE(iova); } static struct tegra_smmu *tegra_smmu_find(struct device_node *np) -- 2.17.1