From patchwork Fri May 1 18:32:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wdavis@nvidia.com X-Patchwork-Id: 6312191 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EE1A69F32B for ; Fri, 1 May 2015 18:45:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A0F82043C for ; Fri, 1 May 2015 18:45:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33B5520439 for ; Fri, 1 May 2015 18:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751252AbbEASpZ (ORCPT ); Fri, 1 May 2015 14:45:25 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:18127 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751109AbbEASpX (ORCPT ); Fri, 1 May 2015 14:45:23 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com id ; Fri, 01 May 2015 11:45:00 -0700 Received: from hqemhub03.nvidia.com ([172.20.12.94]) by hqnvupgp08.nvidia.com (PGP Universal service); Fri, 01 May 2015 11:43:44 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Fri, 01 May 2015 11:43:44 -0700 Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.342.0; Fri, 1 May 2015 11:45:22 -0700 Received: from wdavis-lt.nvidia.com (Not Verified[10.20.168.59]) by hqnvemgw01.nvidia.com with MailMarshal (v7,1,2,5326) id ; Fri, 01 May 2015 11:45:23 -0700 From: To: joro@8bytes.org CC: iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, tripperda@nvidia.com, jhubbard@nvidia.com, jglisse@redhat.com, Will Davis Subject: [PATCH 3/6] dma-mapping: pci: add pci_(un)map_resource Date: Fri, 1 May 2015 13:32:15 -0500 Message-ID: <1430505138-2877-4-git-send-email-wdavis@nvidia.com> X-Mailer: git-send-email 2.3.7 In-Reply-To: <1430505138-2877-1-git-send-email-wdavis@nvidia.com> References: <1430505138-2877-1-git-send-email-wdavis@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Will Davis Simply route these through to the new dma_(un)map_resource APIs. Signed-off-by: Will Davis Reviewed-by: Terence Ripperda Reviewed-by: John Hubbard --- include/asm-generic/pci-dma-compat.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/asm-generic/pci-dma-compat.h b/include/asm-generic/pci-dma-compat.h index c110843..ac4a4ad 100644 --- a/include/asm-generic/pci-dma-compat.h +++ b/include/asm-generic/pci-dma-compat.h @@ -61,6 +61,20 @@ pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address, dma_unmap_page(hwdev == NULL ? NULL : &hwdev->dev, dma_address, size, (enum dma_data_direction)direction); } +static inline dma_addr_t +pci_map_resource(struct pci_dev *hwdev, struct resource *resource, + unsigned long offset, size_t size, int direction) +{ + return dma_map_resource(hwdev == NULL ? NULL : &hwdev->dev, resource, offset, size, (enum dma_data_direction)direction); +} + +static inline void +pci_unmap_resource(struct pci_dev *hwdev, dma_addr_t dma_address, size_t size, + int direction) +{ + dma_unmap_resource(hwdev == NULL ? NULL : &hwdev->dev, dma_address, size, (enum dma_data_direction)direction); +} + static inline int pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, int nents, int direction)