From patchwork Tue Oct 22 12:55:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 1181287 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="q/eafR5I"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46yD4p4J6Pz9sPh for ; Tue, 22 Oct 2019 23:55:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389156AbfJVMzS (ORCPT ); Tue, 22 Oct 2019 08:55:18 -0400 Received: from mail-eopbgr50045.outbound.protection.outlook.com ([40.107.5.45]:11892 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388150AbfJVMzR (ORCPT ); Tue, 22 Oct 2019 08:55:17 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOsFq5SAanE2gYZju8xjWhZnAEk5/mJ88g6duqf5S6OuJ8jDGjPg4PvCJqImvwcQDqKR8NW/tzr1p3d1Y7pKdcfmbbPsxdkOK4KhXY5zlq+HO30orPtyZK6qai+U1SF7qEBmvY+TXoUznRSJSy2W2PiJCTKpP8YHp0SYJHuw4Yi18Tq2yaWRZUq/c+IheOVBL4Uempr1xV894m5PQp1LgfoO6xasiOKowJ1i9onbKIAl0Oxxmtad5zNwQpGt5ggVivYONkJw9g2iduaIlywD11qjqMkCzIkUBi5JH913EiHzjZcWMpUe8AF5y1KrmfFZs0zp3EYssYPOL8xtLK6LNg== 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=yGD0jjORZmQW5QO3lINfC969KZL0GxYHLC4Wb89bhg4=; b=eeleywsLg0zbKcPObivqk1KtPhT22ULpUfRE8TR/cGYBuNxgcx3mqJtKR/pmMGdIv4kNguXsKTZGuq9jBlIvlPYmFI8orF4zZJ3w+vg9hvtocqi/bjsGTXqmpUbBqKRnZbaqT/CvS1MAl0QIe7A/9jCjUy/VRnAVPuAHouxa+sgpohNLwfMcEVcr1lV4b6i136JPGdsWBc9RoJAX5973SUMssjlVimj35z9pTLz5pHmHCcKtKaqAaG+q6TlbRpnTaVnW11usbsANpwNmgdj9hI+0woYHFs+ibl7eemIzKMFa0ExjqAeOTT3OSUXe/HufxiNI+LtcGL7PpF6+/cCCJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yGD0jjORZmQW5QO3lINfC969KZL0GxYHLC4Wb89bhg4=; b=q/eafR5IL4K3Pv34TKhVG07NLV37R1tWPwPFR29ZQD2kgSIierIcH3UXADAiSrIdvqjbOH8QN/dBmZfI39bFWccaU67yn/b9clW30NIgc3SDchmy9xKIsBs7w3XlTthLcYsBlyJvqashrGkKWUpgYOwzOMUys90WAzi/3qVrFxc= Received: from VI1PR04MB5134.eurprd04.prod.outlook.com (20.177.51.208) by VI1PR04MB5053.eurprd04.prod.outlook.com (20.177.49.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.16; Tue, 22 Oct 2019 12:55:14 +0000 Received: from VI1PR04MB5134.eurprd04.prod.outlook.com ([fe80::10f0:af2c:76ac:dfb]) by VI1PR04MB5134.eurprd04.prod.outlook.com ([fe80::10f0:af2c:76ac:dfb%7]) with mapi id 15.20.2347.029; Tue, 22 Oct 2019 12:55:14 +0000 From: Laurentiu Tudor To: "hch@lst.de" , "joro@8bytes.org" , Ioana Ciocoi Radulescu , "linux-kernel@vger.kernel.org" , "iommu@lists.linux-foundation.org" , "netdev@vger.kernel.org" , Ioana Ciornei CC: Leo Li , "robin.murphy@arm.com" , Diana Madalina Craciun , "davem@davemloft.net" , Madalin-cristian Bucur , Laurentiu Tudor Subject: [RFC PATCH 1/3] dma-mapping: introduce a new dma api dma_addr_to_phys_addr() Thread-Topic: [RFC PATCH 1/3] dma-mapping: introduce a new dma api dma_addr_to_phys_addr() Thread-Index: AQHViNfyo/IzAF7o50+e1U9qS9i5xQ== Date: Tue, 22 Oct 2019 12:55:13 +0000 Message-ID: <20191022125502.12495-2-laurentiu.tudor@nxp.com> References: <20191022125502.12495-1-laurentiu.tudor@nxp.com> In-Reply-To: <20191022125502.12495-1-laurentiu.tudor@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0066.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::43) To VI1PR04MB5134.eurprd04.prod.outlook.com (2603:10a6:803:5f::16) x-mailer: git-send-email 2.17.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=laurentiu.tudor@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [89.37.124.34] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9928d6bc-a698-4e44-9d6d-08d756ef147e x-ms-traffictypediagnostic: VI1PR04MB5053:|VI1PR04MB5053: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4502; x-forefront-prvs: 01986AE76B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(66446008)(64756008)(5660300002)(66556008)(25786009)(66476007)(66946007)(36756003)(2501003)(14454004)(71190400001)(71200400001)(110136005)(54906003)(1076003)(478600001)(316002)(66066001)(7736002)(102836004)(6636002)(186003)(2906002)(6486002)(476003)(6512007)(3846002)(386003)(6436002)(50226002)(2201001)(26005)(81156014)(305945005)(81166006)(8936002)(86362001)(76176011)(6116002)(6506007)(99286004)(8676002)(52116002)(2616005)(44832011)(446003)(4326008)(486006)(256004)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5053; H:VI1PR04MB5134.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pcX6PL195c4JEtRNn0fBodkaST32z0OBzmsxVp68yq5fG1ESB3pWw6xbcm7IdbCoLz7Iv3IutGpbGKsiUzSERwCYrM0enjo2cJdwIqpTkArXUn4lrLEg5L7U8KXzowxjYVzLicCg/E5K0bHRWeYCQnLQG/qp6MrkICWoR8XAXPOxfWLy7cc56S4mgzBQbn7d4Jx0BH4v8YaeEFXQYjFZGbl+IDsOeIjkS5rbKfRQXY3yJ6cSIcWKZx0jBckns0ml2+7s2U/D7DL2gqdYKONfhEF1R+I0Qs6YA54aQK5MVs59qjFIo1/GcxN+tRbXN2A1IAy9rZiOThPT8MJsDhKXI630FobhJaZ2e38dRVRghQL/Pe+K7pywYcpwfGhkrBE6tl3DFUcUh78N9j9W8ZU6hC+gbJhRwLxqgzu4o7/Zp1aCVcYJiWvbbzsHf1TJxZqv Content-ID: <8947CA0246151F4A89CAF14C1FC89F95@eurprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9928d6bc-a698-4e44-9d6d-08d756ef147e X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2019 12:55:13.9687 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: NSGnWyAqlZwrXC6KqQGfmWcR3SJP7pmfimgCUa7iLl7WaANqnn39+QMsDzhB3L6pP1dTNRuTLoskjAWOt+Dsrg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5053 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Laurentiu Tudor Introduce a new dma map op called dma_addr_to_phys_addr() that converts a dma address to the physical address backing it up and add wrapper for it. Signed-off-by: Laurentiu Tudor --- include/linux/dma-mapping.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 4a1c4fca475a..5965d159c9a9 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -132,6 +132,8 @@ struct dma_map_ops { u64 (*get_required_mask)(struct device *dev); size_t (*max_mapping_size)(struct device *dev); unsigned long (*get_merge_boundary)(struct device *dev); + phys_addr_t (*dma_addr_to_phys_addr)(struct device *dev, + dma_addr_t dma_handle); }; #define DMA_MAPPING_ERROR (~(dma_addr_t)0) @@ -442,6 +444,19 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) return 0; } +static inline phys_addr_t dma_addr_to_phys_addr(struct device *dev, + dma_addr_t dma_handle) +{ + const struct dma_map_ops *ops = get_dma_ops(dev); + + if (dma_is_direct(ops)) + return (phys_addr_t)dma_handle; + else if (ops->dma_addr_to_phys_addr) + return ops->dma_addr_to_phys_addr(dev, dma_handle); + + return 0; +} + void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag, unsigned long attrs); void dma_free_attrs(struct device *dev, size_t size, void *cpu_addr, @@ -578,6 +593,12 @@ static inline unsigned long dma_get_merge_boundary(struct device *dev) { return 0; } + +static inline phys_addr_t dma_addr_to_phys_addr(struct device *dev, + dma_addr_t dma_handle) +{ + return 0; +} #endif /* CONFIG_HAS_DMA */ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr, From patchwork Tue Oct 22 12:55:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 1181288 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="rUhYxRrA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46yD4v3db6z9sPh for ; Tue, 22 Oct 2019 23:55:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389179AbfJVMzX (ORCPT ); Tue, 22 Oct 2019 08:55:23 -0400 Received: from mail-eopbgr140051.outbound.protection.outlook.com ([40.107.14.51]:59022 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388150AbfJVMzU (ORCPT ); Tue, 22 Oct 2019 08:55:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mFFst3xb2cRumq8mW093jRyLkHp1zP/vCBX9x/Xogkzi5P4UHryx7ZYn8DV5zoqKRbsZNwWwBSsCpZ3k5MHmOMi1urN8Pe2t8G0NAmrxLX+1PN2e/S6wt7z8zoAbVUFwETOJIL+lbmcnb/ow2Dd1L3MBSltktQxLsWJgrajgp5IH7/NWNnHRzC7w5POySC1+p+UqI5aEyRpWlMHS3A44eZP5HvFBtCCzzAxrbvCUhwf9/GjX3zDrSKOhNeW0wttCYX4YqUirZ9DDTm4QDIzWFzqA+AT4pJMiS6fOavsLGHH2G80cWNCqYLO8YHsZvpdFZuUKYfztY4Lvp1DS3Y4law== 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=viOZsT/ko0NUbQpxkY17xqGAZLfzy6WUH86M6aiWDRM=; b=FqxZcVRAQPSAw3zFJznJO2VNBZQ8VVYsm+MpowYTR8PlbZ0VxJ3tCCy7tjufns9xK0z8Xh8P86/YwLs1bsoh30m/GUSinLchM50RrEKSB8T5lq9+gD3UeJx7Yhl9+oNtBUUK7fljJXEBBu3RFwcj4/BJCqGkKHcfZu1lx8LzMBUTArUvkSLLAUpxpa791IYXioYsHURr1DtYYRtybOu/r1CM8FAy1HaL9dswB4EoX3rS/2Rowp67Cj64BjIvyNnBlFzAcX0XbjdZeOYoNIHblIDc/f4ikZY+gtZgq1VU0f5I9e8gtwAeQ0ZUG/Ag/dcagtlzDdMf8M824ob0yWtf0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=viOZsT/ko0NUbQpxkY17xqGAZLfzy6WUH86M6aiWDRM=; b=rUhYxRrAR1tIT3LxjLZeymPKxwSotuTVI6YkhjwKx0Uc9R/ewfqH4vK9vzRvsBobIHlvwiFJ9KW/yg/6lli+a8VleJ6KDG4R2qL9pII1rh2K67XXvLMsKcQWYkBgnSZ9U5L0VEM6JR4l+sGC3eq0PgPXHgdkvPMa9UKwi4xjERs= Received: from VI1PR04MB5134.eurprd04.prod.outlook.com (20.177.51.208) by VI1PR04MB4208.eurprd04.prod.outlook.com (52.133.14.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2367.24; Tue, 22 Oct 2019 12:55:16 +0000 Received: from VI1PR04MB5134.eurprd04.prod.outlook.com ([fe80::10f0:af2c:76ac:dfb]) by VI1PR04MB5134.eurprd04.prod.outlook.com ([fe80::10f0:af2c:76ac:dfb%7]) with mapi id 15.20.2347.029; Tue, 22 Oct 2019 12:55:16 +0000 From: Laurentiu Tudor To: "hch@lst.de" , "joro@8bytes.org" , Ioana Ciocoi Radulescu , "linux-kernel@vger.kernel.org" , "iommu@lists.linux-foundation.org" , "netdev@vger.kernel.org" , Ioana Ciornei CC: Leo Li , "robin.murphy@arm.com" , Diana Madalina Craciun , "davem@davemloft.net" , Madalin-cristian Bucur , Laurentiu Tudor Subject: [RFC PATCH 2/3] iommu/dma: wire-up new dma op dma_addr_to_phys_addr() Thread-Topic: [RFC PATCH 2/3] iommu/dma: wire-up new dma op dma_addr_to_phys_addr() Thread-Index: AQHViNfz5abage57dEawKYHQ0us7sQ== Date: Tue, 22 Oct 2019 12:55:16 +0000 Message-ID: <20191022125502.12495-3-laurentiu.tudor@nxp.com> References: <20191022125502.12495-1-laurentiu.tudor@nxp.com> In-Reply-To: <20191022125502.12495-1-laurentiu.tudor@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0066.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::43) To VI1PR04MB5134.eurprd04.prod.outlook.com (2603:10a6:803:5f::16) x-mailer: git-send-email 2.17.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=laurentiu.tudor@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [89.37.124.34] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d0e04da6-71fc-41ca-2b48-08d756ef15bf x-ms-traffictypediagnostic: VI1PR04MB4208:|VI1PR04MB4208: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 01986AE76B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(396003)(346002)(376002)(366004)(39860400002)(199004)(189003)(386003)(6506007)(102836004)(6486002)(76176011)(25786009)(54906003)(110136005)(26005)(186003)(44832011)(486006)(2616005)(476003)(4326008)(446003)(11346002)(316002)(66946007)(64756008)(66556008)(66476007)(6116002)(66446008)(3846002)(6636002)(2201001)(86362001)(7736002)(305945005)(52116002)(99286004)(8936002)(2501003)(2906002)(50226002)(81166006)(81156014)(6512007)(8676002)(36756003)(5660300002)(66066001)(71190400001)(71200400001)(478600001)(256004)(1076003)(6436002)(14454004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4208; H:VI1PR04MB5134.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZIpP49oW72my8L1mzwnrSXJ43qNS0D0T24/4boDa9hvrpkUsS10P7xJrRO/cfg69XOkB/hBhReJPuwlwvjAxJ6b7bhctdMMtVM4icZeUk4+hNAlBji7pddYsAZ6u8f51D/ZLQ4Kk1duoOX9KErEjLohaoNMWE5ZEMxX6evcJSwVo+oY1OfscJycuCGZVnlETHlfqYdQVEI84/CUs2HdRkNPimh9tFXK1OGkaDboc/H4DDYzbDD1Tc07cJHcTgR5z/jvwqwRsXxPbUFpUpTBef+rqLxfgoDel1HRm7cbfAPuBoAdtcNaUDfGGPd4d5cl1KjDdPjcOWyrexM2VaDwnRcYlFbPPcyIJ2GC95LWLE5snlCByJBcONCyMWI1jH0nDAXLI2cA8F/ra+B3hkRosc9RdnK8yr6Ne8PYI61kCSgj2r3wigM1Tm3pMj28OlJMs Content-ID: MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0e04da6-71fc-41ca-2b48-08d756ef15bf X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2019 12:55:16.1924 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: zBZLDSLu/LuCDXu65F0XTT/8XNk4yK2lDLdKUJKmv9TS65tb3OKAAtXYdecOUMm1M/Qsmm40HhYcrsW9yHuyBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4208 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Laurentiu Tudor Add an implementation of the newly introduced dma map op in the generic DMA IOMMU generic glue layer and wire it up. Signed-off-by: Laurentiu Tudor --- drivers/iommu/dma-iommu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index f321279baf9e..0d2856793ecd 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1091,6 +1091,17 @@ static unsigned long iommu_dma_get_merge_boundary(struct device *dev) return (1UL << __ffs(domain->pgsize_bitmap)) - 1; } +static phys_addr_t iommu_dma_dma_addr_to_phys_addr(struct device *dev, + dma_addr_t dma_handle) +{ + struct iommu_domain *domain = iommu_get_domain_for_dev(dev); + + if (domain) + return iommu_iova_to_phys(domain, dma_handle); + + return 0; +} + static const struct dma_map_ops iommu_dma_ops = { .alloc = iommu_dma_alloc, .free = iommu_dma_free, @@ -1107,6 +1118,7 @@ static const struct dma_map_ops iommu_dma_ops = { .map_resource = iommu_dma_map_resource, .unmap_resource = iommu_dma_unmap_resource, .get_merge_boundary = iommu_dma_get_merge_boundary, + .dma_addr_to_phys_addr = iommu_dma_dma_addr_to_phys_addr, }; /* From patchwork Tue Oct 22 12:55:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 1181289 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="X+hVdefr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46yD4y4Yz0z9sPh for ; Tue, 22 Oct 2019 23:55:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389168AbfJVMzW (ORCPT ); Tue, 22 Oct 2019 08:55:22 -0400 Received: from mail-eopbgr50068.outbound.protection.outlook.com ([40.107.5.68]:18986 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388814AbfJVMzU (ORCPT ); Tue, 22 Oct 2019 08:55:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xvjz0h2ow+jh/wstdHaOrzvqkdRZXqD292zeLgbfL1ZELa3CsXksarCSEE+8XZpNO+RjtFV9wdUzymQP/qMKCgLzU3a3ShLfufM/KF9spLRN53+NVjccgD8k8U1etUWzaSBsgjchYT4NviBGexuvFCzwe8wdHYfzo4RPuXpt7PRfEklzHrrGG4K6o1RIu+vW+ZmWa9ILFeV0vHN/NRF+/l/CzhGE9w8+urfgTeT5pBYSkyBkjBMMIytgIYdOXnos5HXze9VKbY6A3sbWdBmpQWh50lIUUBzgIIMFCmxPJokRTGrRjk46df5g8LwjVxGqsNxKKyyJHpkuf3kzY2629w== 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=Qm5JDl1y8kuM97BxSrOo/kjgn6CuTVIJx95FYjY4qJg=; b=ivgM3NtNwIC7RaOR1bZIYtalNQsB20P/qrAv1m2zjzeJpppBRfT2/kjORsIEsNt8hnAEMz4Y7wJ3F0sORXed8OOStX/l53esALv1Wz6zKx8l+Y907FzTBjtf//ckoyk3zP5ejNsaPW8NlCZKRPsna7p1JjUUhyEDP3nrwZlVcwho7SdYfAyE16stTr3KD2vKjA2akgtNQsSZhpiVTLy9We3G3zyvrnzWC6jDPsJjebY75XR5MQ6Z0U+pqMegej+VfmpYWeFJ6dwA3K7cI35GlMWuexQqJmc0wnSXYLQlwQ7pqzUWOFaIMK7FQ+cvf2NifY4T/yuUAIoSw8pOe7jeVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qm5JDl1y8kuM97BxSrOo/kjgn6CuTVIJx95FYjY4qJg=; b=X+hVdefrTKPahvwR8zks85pNDeAv9vchcMwffvYPadmNgc5evo/QZ7LyXEr62SZZFoPL2BAJtKBhRo96ohP1DGL40c+jZ18C1lF7c69W2Y8NIohQdQkpDmgo9N8cIIpArsk0aUOVJjQ/gqhpI3e/xvsw4o0qE7/f6lJ+Ivga1oc= Received: from VI1PR04MB5134.eurprd04.prod.outlook.com (20.177.51.208) by VI1PR04MB5053.eurprd04.prod.outlook.com (20.177.49.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2347.16; Tue, 22 Oct 2019 12:55:18 +0000 Received: from VI1PR04MB5134.eurprd04.prod.outlook.com ([fe80::10f0:af2c:76ac:dfb]) by VI1PR04MB5134.eurprd04.prod.outlook.com ([fe80::10f0:af2c:76ac:dfb%7]) with mapi id 15.20.2347.029; Tue, 22 Oct 2019 12:55:17 +0000 From: Laurentiu Tudor To: "hch@lst.de" , "joro@8bytes.org" , Ioana Ciocoi Radulescu , "linux-kernel@vger.kernel.org" , "iommu@lists.linux-foundation.org" , "netdev@vger.kernel.org" , Ioana Ciornei CC: Leo Li , "robin.murphy@arm.com" , Diana Madalina Craciun , "davem@davemloft.net" , Madalin-cristian Bucur , Laurentiu Tudor Subject: [RFC PATCH 3/3] dpaa2_eth: use dma_addr_to_phys_addr() new dma api Thread-Topic: [RFC PATCH 3/3] dpaa2_eth: use dma_addr_to_phys_addr() new dma api Thread-Index: AQHViNf0dhnJpC3HQk2GUJXKAPp57w== Date: Tue, 22 Oct 2019 12:55:17 +0000 Message-ID: <20191022125502.12495-4-laurentiu.tudor@nxp.com> References: <20191022125502.12495-1-laurentiu.tudor@nxp.com> In-Reply-To: <20191022125502.12495-1-laurentiu.tudor@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0066.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::43) To VI1PR04MB5134.eurprd04.prod.outlook.com (2603:10a6:803:5f::16) x-mailer: git-send-email 2.17.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=laurentiu.tudor@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [89.37.124.34] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b9a16084-3fc9-4449-303e-08d756ef16a8 x-ms-traffictypediagnostic: VI1PR04MB5053:|VI1PR04MB5053: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1728; x-forefront-prvs: 01986AE76B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(376002)(346002)(136003)(396003)(366004)(199004)(189003)(66446008)(64756008)(5660300002)(66556008)(25786009)(66476007)(66946007)(36756003)(2501003)(14454004)(71190400001)(71200400001)(110136005)(54906003)(1076003)(478600001)(316002)(66066001)(7736002)(102836004)(6636002)(186003)(2906002)(6486002)(476003)(6512007)(3846002)(386003)(6436002)(50226002)(2201001)(26005)(81156014)(305945005)(81166006)(8936002)(86362001)(76176011)(6116002)(6506007)(99286004)(8676002)(52116002)(2616005)(44832011)(446003)(4326008)(486006)(256004)(14444005)(11346002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5053; H:VI1PR04MB5134.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: B5yRbk2awoUFSbGV2VchzgEhLgzEj3iIDOtUv78G6zSPzcDKCW6M+ME9BxHovze42pgqPq1qCBc32nqIRisN0vibwZyq0c2tWfr3TaMzNJF6/6or7L0pyBJdNcGeFz1P0jZvlmzbxsElCMP6bvEMS691SdJI/qsSvSu6B1yLbMO00+oFxzY4iwiwLH4Nf/OZq6he60ybr+BnCbZnYwou1Hh/EUfjT35OgtxafXA9QFc2MPNb4UuhMGGFzkhxhtqVcZX1WR6w5PmHVll9+1jZNQ02VSzEE/F9KT2ooA63JofEfdJ8OcWThLQ5+4Zoq5Wg7xUbiwQzqgTmoaQGD0eGVPpqiwHCoWD/gSjlbCQvppiT2d5SuSuGKYiKVvzOif/B3kTabrr+FeSNf7zvlJ+GF06kuaF/r3GDEHWr/sbXAL6gpGOf3LcvTmHCf3peZZUu Content-ID: <2BF0507B532F9846BF9B8147FD22494A@eurprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9a16084-3fc9-4449-303e-08d756ef16a8 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Oct 2019 12:55:17.8455 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: X+G5RyTWCfhi2iye2oirdIOHEmvCCNfsJF8YH+WJCfv3StD6IUHPwfvVeR7xpKB1H0+m3f1iH92Xd9A45S7CGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5053 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Laurentiu Tudor Convert this driver to usage of the newly introduced dma_addr_to_phys_addr() DMA API. This will get rid of the unsupported direct usage of iommu_iova_to_phys() API. Signed-off-by: Laurentiu Tudor --- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 21 +++++++------------ .../net/ethernet/freescale/dpaa2/dpaa2-eth.h | 1 - 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index 19379bae0144..7332b91ca3a2 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -29,14 +29,9 @@ MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Freescale Semiconductor, Inc"); MODULE_DESCRIPTION("Freescale DPAA2 Ethernet Driver"); -static void *dpaa2_iova_to_virt(struct iommu_domain *domain, - dma_addr_t iova_addr) +static void *dpaa2_iova_to_virt(struct device *dev, dma_addr_t dma_handle) { - phys_addr_t phys_addr; - - phys_addr = domain ? iommu_iova_to_phys(domain, iova_addr) : iova_addr; - - return phys_to_virt(phys_addr); + return phys_to_virt(dma_addr_to_phys_addr(dev, dma_handle)); } static void validate_rx_csum(struct dpaa2_eth_priv *priv, @@ -85,7 +80,7 @@ static void free_rx_fd(struct dpaa2_eth_priv *priv, sgt = vaddr + dpaa2_fd_get_offset(fd); for (i = 1; i < DPAA2_ETH_MAX_SG_ENTRIES; i++) { addr = dpaa2_sg_get_addr(&sgt[i]); - sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr); + sg_vaddr = dpaa2_iova_to_virt(dev, addr); dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE, DMA_BIDIRECTIONAL); @@ -143,7 +138,7 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv, /* Get the address and length from the S/G entry */ sg_addr = dpaa2_sg_get_addr(sge); - sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, sg_addr); + sg_vaddr = dpaa2_iova_to_virt(dev, sg_addr); dma_unmap_page(dev, sg_addr, DPAA2_ETH_RX_BUF_SIZE, DMA_BIDIRECTIONAL); @@ -210,7 +205,7 @@ static void free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array, int count) int i; for (i = 0; i < count; i++) { - vaddr = dpaa2_iova_to_virt(priv->iommu_domain, buf_array[i]); + vaddr = dpaa2_iova_to_virt(dev, buf_array[i]); dma_unmap_page(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE, DMA_BIDIRECTIONAL); free_pages((unsigned long)vaddr, 0); @@ -369,7 +364,7 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, /* Tracing point */ trace_dpaa2_rx_fd(priv->net_dev, fd); - vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr); + vaddr = dpaa2_iova_to_virt(dev, addr); dma_sync_single_for_cpu(dev, addr, DPAA2_ETH_RX_BUF_SIZE, DMA_BIDIRECTIONAL); @@ -682,7 +677,7 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, u32 fd_len = dpaa2_fd_get_len(fd); fd_addr = dpaa2_fd_get_addr(fd); - buffer_start = dpaa2_iova_to_virt(priv->iommu_domain, fd_addr); + buffer_start = dpaa2_iova_to_virt(dev, fd_addr); swa = (struct dpaa2_eth_swa *)buffer_start; if (fd_format == dpaa2_fd_single) { @@ -3448,8 +3443,6 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev) priv = netdev_priv(net_dev); priv->net_dev = net_dev; - priv->iommu_domain = iommu_get_domain_for_dev(dev); - /* Obtain a MC portal */ err = fsl_mc_portal_allocate(dpni_dev, FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, &priv->mc_io); diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h index 8a0e65b3267f..4e5183617ebd 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h @@ -374,7 +374,6 @@ struct dpaa2_eth_priv { struct fsl_mc_device *dpbp_dev; u16 bpid; - struct iommu_domain *iommu_domain; bool tx_tstamp; /* Tx timestamping enabled */ bool rx_tstamp; /* Rx timestamping enabled */