From: Christoph Hellwig <hch@lst.de> To: torvalds@linux-foundation.org, axboe@kernel.dk Cc: dan.j.williams@intel.com, vgupta@synopsys.com, hskinnemoen@gmail.com, egtvedt@samfundet.no, realmz6@gmail.com, dhowells@redhat.com, monstr@monstr.eu, x86@kernel.org, dwmw2@infradead.org, alex.williamson@redhat.com, grundler@parisc-linux.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-nvdimm@ml01.01.org, linux-media@vger.kernel.org Subject: [PATCH 16/31] s390: handle page-less SG entries Date: Wed, 12 Aug 2015 09:05:35 +0200 [thread overview] Message-ID: <1439363150-8661-17-git-send-email-hch@lst.de> (raw) In-Reply-To: <1439363150-8661-1-git-send-email-hch@lst.de> Use sg_phys() instead of page_to_phys(sg_page(sg)) so that we don't require a page structure for all DMA memory. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/s390/pci/pci_dma.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c index 6fd8d58..aae5a47 100644 --- a/arch/s390/pci/pci_dma.c +++ b/arch/s390/pci/pci_dma.c @@ -272,14 +272,13 @@ int dma_set_mask(struct device *dev, u64 mask) } EXPORT_SYMBOL_GPL(dma_set_mask); -static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, - unsigned long offset, size_t size, +static dma_addr_t s390_dma_map_phys(struct device *dev, unsigned long pa, + size_t size, enum dma_data_direction direction, struct dma_attrs *attrs) { struct zpci_dev *zdev = get_zdev(to_pci_dev(dev)); unsigned long nr_pages, iommu_page_index; - unsigned long pa = page_to_phys(page) + offset; int flags = ZPCI_PTE_VALID; dma_addr_t dma_addr; @@ -301,7 +300,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, if (!dma_update_trans(zdev, pa, dma_addr, size, flags)) { atomic64_add(nr_pages, &zdev->mapped_pages); - return dma_addr + (offset & ~PAGE_MASK); + return dma_addr + (pa & ~PAGE_MASK); } out_free: @@ -312,6 +311,16 @@ out_err: return DMA_ERROR_CODE; } +static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, + unsigned long offset, size_t size, + enum dma_data_direction direction, + struct dma_attrs *attrs) +{ + unsigned long pa = page_to_phys(page) + offset; + + return s390_dma_map_phys(dev, pa, size, direction, attrs); +} + static void s390_dma_unmap_pages(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction direction, struct dma_attrs *attrs) @@ -384,8 +393,7 @@ static int s390_dma_map_sg(struct device *dev, struct scatterlist *sg, int i; for_each_sg(sg, s, nr_elements, i) { - struct page *page = sg_page(s); - s->dma_address = s390_dma_map_pages(dev, page, s->offset, + s->dma_address = s390_dma_map_phys(dev, sg_phys(s), s->length, dir, NULL); if (!dma_mapping_error(dev, s->dma_address)) { s->dma_length = s->length; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: torvalds@linux-foundation.org, axboe@kernel.dk Cc: dan.j.williams@intel.com, vgupta@synopsys.com, hskinnemoen@gmail.com, egtvedt@samfundet.no, realmz6@gmail.com, dhowells@redhat.com, monstr@monstr.eu, x86@kernel.org, dwmw2@infradead.org, alex.williamson@redhat.com, grundler@parisc-linux.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-metag@vger.kernel.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-nvdimm@ml01.01.org, linux-media@vger.kernel.org Subject: [PATCH 16/31] s390: handle page-less SG entries Date: Wed, 12 Aug 2015 07:05:35 +0000 [thread overview] Message-ID: <1439363150-8661-17-git-send-email-hch@lst.de> (raw) In-Reply-To: <1439363150-8661-1-git-send-email-hch@lst.de> Use sg_phys() instead of page_to_phys(sg_page(sg)) so that we don't require a page structure for all DMA memory. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/s390/pci/pci_dma.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c index 6fd8d58..aae5a47 100644 --- a/arch/s390/pci/pci_dma.c +++ b/arch/s390/pci/pci_dma.c @@ -272,14 +272,13 @@ int dma_set_mask(struct device *dev, u64 mask) } EXPORT_SYMBOL_GPL(dma_set_mask); -static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, - unsigned long offset, size_t size, +static dma_addr_t s390_dma_map_phys(struct device *dev, unsigned long pa, + size_t size, enum dma_data_direction direction, struct dma_attrs *attrs) { struct zpci_dev *zdev = get_zdev(to_pci_dev(dev)); unsigned long nr_pages, iommu_page_index; - unsigned long pa = page_to_phys(page) + offset; int flags = ZPCI_PTE_VALID; dma_addr_t dma_addr; @@ -301,7 +300,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, if (!dma_update_trans(zdev, pa, dma_addr, size, flags)) { atomic64_add(nr_pages, &zdev->mapped_pages); - return dma_addr + (offset & ~PAGE_MASK); + return dma_addr + (pa & ~PAGE_MASK); } out_free: @@ -312,6 +311,16 @@ out_err: return DMA_ERROR_CODE; } +static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, + unsigned long offset, size_t size, + enum dma_data_direction direction, + struct dma_attrs *attrs) +{ + unsigned long pa = page_to_phys(page) + offset; + + return s390_dma_map_phys(dev, pa, size, direction, attrs); +} + static void s390_dma_unmap_pages(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction direction, struct dma_attrs *attrs) @@ -384,8 +393,7 @@ static int s390_dma_map_sg(struct device *dev, struct scatterlist *sg, int i; for_each_sg(sg, s, nr_elements, i) { - struct page *page = sg_page(s); - s->dma_address = s390_dma_map_pages(dev, page, s->offset, + s->dma_address = s390_dma_map_phys(dev, sg_phys(s), s->length, dir, NULL); if (!dma_mapping_error(dev, s->dma_address)) { s->dma_length = s->length; -- 1.9.1
next prev parent reply other threads:[~2015-08-12 7:05 UTC|newest] Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-08-12 7:05 RFC: prepare for struct scatterlist entries without page backing Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 01/31] scatterlist: add sg_pfn and sg_has_page helpers Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 02/31] scatterlist: use sg_phys() Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 03/31] dma-debug: handle page-less SG entries Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 04/31] x86/pci-nommu: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 05/31] x86/pci-calgary: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 06/31] alpha/pci-noop: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 07/31] alpha/pci_iommu: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 08/31] c6x: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 09/31] ia64/pci_dma: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 10/31] powerpc/iommu: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 11/31] sparc/iommu: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 12/31] mn10300: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 13/31] sparc/ldc: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 14/31] sparc32/io-unit: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-14 12:03 ` Josip Rodin [not found] ` <1439363150-8661-1-git-send-email-hch-jcswGhMUV9g@public.gmane.org> 2015-08-12 7:05 ` [PATCH 15/31] sparc32/iommu: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 20/31] avr32: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 9:36 ` Hans-Christian Egtvedt 2015-08-12 9:36 ` Hans-Christian Egtvedt 2015-08-12 12:42 ` RFC: prepare for struct scatterlist entries without page backing Boaz Harrosh 2015-08-12 12:42 ` Boaz Harrosh 2015-08-12 12:42 ` Boaz Harrosh 2015-08-12 23:37 ` Julian Calaby 2015-08-12 23:37 ` Julian Calaby 2015-08-13 14:35 ` Christoph Hellwig 2015-08-13 14:35 ` Christoph Hellwig 2015-08-13 14:35 ` Christoph Hellwig 2015-08-13 23:40 ` Julian Calaby 2015-08-13 23:40 ` Julian Calaby 2015-08-13 23:40 ` Julian Calaby 2015-08-13 14:40 ` Christoph Hellwig 2015-08-13 14:40 ` Christoph Hellwig 2015-08-13 15:42 ` Boaz Harrosh 2015-08-13 15:42 ` Boaz Harrosh 2015-08-12 7:05 ` Christoph Hellwig [this message] 2015-08-12 7:05 ` [PATCH 16/31] s390: handle page-less SG entries Christoph Hellwig 2015-08-12 11:51 ` Sebastian Ott 2015-08-12 11:51 ` Sebastian Ott 2015-08-12 7:05 ` [PATCH 17/31] ia64/sba_iommu: remove sba_sg_address Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 18/31] nios2: handle page-less SG entries Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 19/31] arc: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 10:28 ` Vineet Gupta 2015-08-12 10:28 ` Vineet Gupta 2015-08-12 10:28 ` Vineet Gupta 2015-08-12 10:28 ` Vineet Gupta 2015-08-12 7:05 ` [PATCH 21/31] blackfin: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 22/31] metag: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 23/31] sh: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 24/31] xtensa: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 25/31] frv: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 26/31] openrisc: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 27/31] mips: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 28/31] powerpc: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 7:05 ` [PATCH 29/31] parisc: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 16:01 ` Linus Torvalds 2015-08-12 16:01 ` Linus Torvalds 2015-08-12 16:01 ` Linus Torvalds 2015-08-12 16:01 ` Linus Torvalds 2015-08-13 14:31 ` Christoph Hellwig 2015-08-13 14:31 ` Christoph Hellwig 2015-08-13 14:31 ` Christoph Hellwig 2015-08-13 14:31 ` Christoph Hellwig 2015-08-14 3:30 ` Dan Williams 2015-08-14 3:30 ` Dan Williams 2015-08-14 3:30 ` Dan Williams 2015-08-14 3:30 ` Dan Williams 2015-08-14 3:59 ` James Bottomley 2015-08-14 3:59 ` James Bottomley 2015-08-14 3:59 ` James Bottomley 2015-08-14 3:59 ` James Bottomley 2015-08-14 4:11 ` David Miller 2015-08-14 4:11 ` David Miller [not found] ` <20150813.211155.1774898831276303437.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> 2015-08-14 16:17 ` Dan Williams 2015-08-14 16:17 ` Dan Williams 2015-08-14 16:17 ` Dan Williams 2015-08-12 7:05 ` [PATCH 30/31] intel-iommu: " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 9:51 ` David Woodhouse 2015-08-12 9:51 ` David Woodhouse 2015-08-12 9:51 ` David Woodhouse 2015-08-12 7:05 ` [PATCH 31/31] dma-mapping-common: skip kmemleak checks for " Christoph Hellwig 2015-08-12 7:05 ` Christoph Hellwig 2015-08-12 16:05 ` Linus Torvalds 2015-08-12 16:05 ` Linus Torvalds 2015-08-12 16:05 ` Linus Torvalds 2015-08-12 16:05 ` Linus Torvalds 2015-08-13 14:33 ` Christoph Hellwig 2015-08-13 14:33 ` Christoph Hellwig 2015-08-13 14:33 ` Christoph Hellwig 2015-08-13 14:33 ` Christoph Hellwig 2015-08-12 16:26 ` Catalin Marinas 2015-08-12 16:26 ` Catalin Marinas 2015-08-12 16:26 ` Catalin Marinas 2015-08-12 16:26 ` Catalin Marinas 2015-08-12 16:26 ` Catalin Marinas 2015-08-12 16:26 ` Catalin Marinas 2015-08-12 17:00 ` RFC: prepare for struct scatterlist entries without page backing James Bottomley 2015-08-12 17:00 ` James Bottomley 2015-08-12 17:00 ` James Bottomley 2015-08-12 17:56 ` Grant Grundler 2015-08-12 17:56 ` Grant Grundler
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1439363150-8661-17-git-send-email-hch@lst.de \ --to=hch@lst.de \ --cc=alex.williamson@redhat.com \ --cc=axboe@kernel.dk \ --cc=dan.j.williams@intel.com \ --cc=dhowells@redhat.com \ --cc=dwmw2@infradead.org \ --cc=egtvedt@samfundet.no \ --cc=grundler@parisc-linux.org \ --cc=hskinnemoen@gmail.com \ --cc=linux-alpha@vger.kernel.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-ia64@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-metag@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=linux-nvdimm@ml01.01.org \ --cc=linux-parisc@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-xtensa@linux-xtensa.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=monstr@monstr.eu \ --cc=realmz6@gmail.com \ --cc=sparclinux@vger.kernel.org \ --cc=torvalds@linux-foundation.org \ --cc=vgupta@synopsys.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.