From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 D4693C4727E for ; Sun, 4 Oct 2020 01:42:10 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 931562067D for ; Sun, 4 Oct 2020 01:42:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="eZDE6xFi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 931562067D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 837CF85540; Sun, 4 Oct 2020 01:42:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M3IzqVBeHSee; Sun, 4 Oct 2020 01:42:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0F1D88551F; Sun, 4 Oct 2020 01:42:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E99F9C0895; Sun, 4 Oct 2020 01:42:09 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3064CC0889 for ; Sun, 4 Oct 2020 01:42:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C3162041F for ; Sun, 4 Oct 2020 01:42:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KvbAQiMoyTS0 for ; Sun, 4 Oct 2020 01:42:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2066.outbound.protection.outlook.com [40.107.93.66]) by silver.osuosl.org (Postfix) with ESMTPS id E80BB20410 for ; Sun, 4 Oct 2020 01:42:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QydiPkyS53WjPkLriKDTmDLUM3hh6o9CbJE2QhW7iidJnQoPlHKzLiYGaigGNhvEPaEh7HC2RSUg+QQ4NDSITM4LzTg+VRHxQbJR2QsAsQzi9S9lM+BZv3qOXs/w+BFVFS48wZy+QIOYCgGapa3pjCAsnh6A9gOnMI60cIbywI4YqcIRYmXzP+GIScTgiha+m8BDLNf0QtRM78bxXpSbSTJUStkV0HiN9FWES6TIW+3vqz11sU1jojTCu3EKURBluIRz8WmqVWYuJORbARvWA9Us5dmF8ZhRFn7GSm8CsrOR8SU6PU5hmX3DnwBkyf2OyXAfaiPL8E7tiZL1ld1BZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JDHQocOfdCg8WMYDLMcWQP2XfX55lGm7CivZTRDKu54=; b=jaKkQocLOi18pSOoe4ZDd2tbTwK2PpRlQVd9oURLeQvirE7nRPB3SA+9RYEEFg/6RvYLqjbBd30zmZ3IqGce40BkjAwbeTzMCKJdKonJ4F1/vXlW6f/Ge4smkehuYIUQjd9JhB5xVZra7BXDYcr3oQ6yuYFaM20YHDOenBx1gQ/5HFMFkhPk6X7zwhqlFNPkExJ6G9CDCSvxclgn7avnlHPfMTznGVdC5Bkjo+x3qlA09SRx44r9sVIVEamyPy0wxb7B8jOUGuXuAuGQrHcLl6BAoEJ7TuRwayXo6wwp4myJCVEHEr7Ct+7yIRz2H9C7Br9zyE/Kj2Ley6k6zCFLkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JDHQocOfdCg8WMYDLMcWQP2XfX55lGm7CivZTRDKu54=; b=eZDE6xFixJVa5kFNug8gni8S6Awmx+RcQTd2L4rSC0sgoUpCe5EgUq00aJVfnGlrGH0gDPSxkvtq/4Y4Xy7dy0pvF1YEeCEgZItpG77D3y2kuBt1bEJfiEa2rZKcagOf3Wgn6k9KCS7/1dc+Ho6oYR2fjjMRYDVDFdCQl1dnwI8= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; Received: from DM5PR12MB1163.namprd12.prod.outlook.com (2603:10b6:3:7a::18) by DM5PR12MB1451.namprd12.prod.outlook.com (2603:10b6:4:d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.39; Sun, 4 Oct 2020 01:42:04 +0000 Received: from DM5PR12MB1163.namprd12.prod.outlook.com ([fe80::48cf:d69:d457:1b1e]) by DM5PR12MB1163.namprd12.prod.outlook.com ([fe80::48cf:d69:d457:1b1e%5]) with mapi id 15.20.3433.042; Sun, 4 Oct 2020 01:42:04 +0000 From: Suravee Suthikulpanit To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Subject: [PATCH v3 11/14] iommu/amd: Introduce iommu_v1_iova_to_phys Date: Sun, 4 Oct 2020 01:45:46 +0000 Message-Id: <20201004014549.16065-12-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201004014549.16065-1-suravee.suthikulpanit@amd.com> References: <20201004014549.16065-1-suravee.suthikulpanit@amd.com> X-Originating-IP: [165.204.78.2] X-ClientProxiedBy: SN4PR0701CA0004.namprd07.prod.outlook.com (2603:10b6:803:28::14) To DM5PR12MB1163.namprd12.prod.outlook.com (2603:10b6:3:7a::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ethanolx5673host.amd.com (165.204.78.2) by SN4PR0701CA0004.namprd07.prod.outlook.com (2603:10b6:803:28::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.34 via Frontend Transport; Sun, 4 Oct 2020 01:42:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a9b027f6-1cd9-43f8-9dbd-08d86806b22e X-MS-TrafficTypeDiagnostic: DM5PR12MB1451: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c8093ofEhzIthbQEDdintbk2FbB/Ga97+BH1J7oXSGbmRG+CSpc15h4yzgW3XNuXWax16Ri4sFm3yYihOOur8j98W8JJ7JBgj0F5eChHIGPTY1CG3dJAvz9GkKDas7uFWb/TD5sKOqhGKyGwmhilN67LpoihP226+gDUvhKd59cuf7uo5Dm8xlwN5xAkww9fAmoPkFhMVv5Lv7RqvR2NK3KqQrV1QIj2Kerb6v+twjFFgPgWNsTrzNtjAR9Z9j7CW3FnkMR5wNz/x+RHPhcBr1RI21DqewfYogG9O5Xj/9YfZh+CzmtIDrB/eYLEd6eifpnQ29p2BL9HPTb9jXoX6g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR12MB1163.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(376002)(136003)(366004)(39850400004)(2616005)(956004)(6486002)(316002)(66946007)(66476007)(66556008)(6666004)(478600001)(44832011)(1076003)(5660300002)(86362001)(8936002)(7696005)(52116002)(2906002)(36756003)(16526019)(26005)(186003)(4326008)(83380400001)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: z9FKjAnd8IYVhP2k7UyIUyFIFKw3GOm2BLJJTSkGQCYAdaIHRDeBXFkopwwM4OwOt354An17ImBd1zO7e5WyU/yIgefa0cvxYnWboCFp7hKuv7a7Lla+BG1pNsXNKe/3mEgklVJkrNLNM+3XoPjC2TjlxzosZmIrnoRSWZJrSOTUXcDYtugfX+sWhmnDmKcTmYim+DiK2fU8Gv+HT778EQLQLTKmaYzGn9O9pSfpLKoZpamElys47j66TJwMuVR1OzI+ZLYWLqZ5DaforUQRWVzp8JBK7g5sNbXxGGA+YqLokrtXiNqKbD+22+WtlyaoP37MvFusYo1yky1yfoS1ZD64YXXoaT8u/f6Tm6NgzpEMIuYODTBeaY60Fzq+jvbWg1JcKwl3Lt1+3j9Mcy6xYvR64l+GbaBTIsRmEyWcD+s6Jm/12bm8wG8LI1Bo8UgM03hV4SVvLwvqIFZHQH1edhUtWKu+3aCOLbhM4n8Q+z5Uqfk1PtwhYQUS/thwbwOI+3KAEXIlEJzHRATITSYxrQUgwTfFhWeRQ7al6iIEgJJF1rwVIIDNZo2c6JECrtrDOvzxU61zx4ORu6fvYEnA+gr4hc1TiwzGU6q3rIyYotLti/DO3CPo1XKYdM7+g0V952vT598H7CML1lapy9NDJQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9b027f6-1cd9-43f8-9dbd-08d86806b22e X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1163.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2020 01:42:04.4185 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wV2rSSJ9mxnBRilGb2JroEJhU0tbv9EJX3Gayg2LMcMg3i3RzoO6u63gRfCHxzw91454RUGt8qsVqcew3B62vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1451 Cc: robin.murphy@arm.com X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" This implements iova_to_phys for AMD IOMMU v1 pagetable, which will be used by the IO page table framework. Signed-off-by: Suravee Suthikulpanit --- drivers/iommu/amd/io_pgtable.c | 22 ++++++++++++++++++++++ drivers/iommu/amd/iommu.c | 16 +--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c index 93ff8cb452ed..7841e5e1e563 100644 --- a/drivers/iommu/amd/io_pgtable.c +++ b/drivers/iommu/amd/io_pgtable.c @@ -494,6 +494,26 @@ unsigned long iommu_unmap_page(struct protection_domain *dom, return unmapped; } +static phys_addr_t iommu_v1_iova_to_phys(struct io_pgtable_ops *ops, unsigned long iova) +{ + struct amd_io_pgtable *pgtable = io_pgtable_ops_to_data(ops); + unsigned long offset_mask, pte_pgsize; + u64 *pte, __pte; + + if (pgtable->mode == PAGE_MODE_NONE) + return iova; + + pte = fetch_pte(pgtable, iova, &pte_pgsize); + + if (!pte || !IOMMU_PTE_PRESENT(*pte)) + return 0; + + offset_mask = pte_pgsize - 1; + __pte = __sme_clr(*pte & PM_ADDR_MASK); + + return (__pte & ~offset_mask) | (iova & offset_mask); +} + /* * ---------------------------------------------------- */ @@ -505,6 +525,8 @@ static struct io_pgtable *v1_alloc_pgtable(struct io_pgtable_cfg *cfg, void *coo { struct amd_io_pgtable *pgtable = io_pgtable_cfg_to_data(cfg); + pgtable->iop.ops.iova_to_phys = iommu_v1_iova_to_phys; + return &pgtable->iop; } diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 87cea1cde414..9a1a16031e00 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -2079,22 +2079,8 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom, { struct protection_domain *domain = to_pdomain(dom); struct io_pgtable_ops *ops = &domain->iop.iop.ops; - struct amd_io_pgtable *pgtable = io_pgtable_ops_to_data(ops); - unsigned long offset_mask, pte_pgsize; - u64 *pte, __pte; - if (domain->iop.mode == PAGE_MODE_NONE) - return iova; - - pte = fetch_pte(pgtable, iova, &pte_pgsize); - - if (!pte || !IOMMU_PTE_PRESENT(*pte)) - return 0; - - offset_mask = pte_pgsize - 1; - __pte = __sme_clr(*pte & PM_ADDR_MASK); - - return (__pte & ~offset_mask) | (iova & offset_mask); + return ops->iova_to_phys(ops, iova); } static bool amd_iommu_capable(enum iommu_cap cap) -- 2.17.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu