* [PATCH v3 3/4] sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory() [not found] <20140508204257.17877.4639.stgit@bhelgaas-glaptop.roam.corp.google.com> @ 2014-05-08 20:49 ` Bjorn Helgaas 2014-05-26 14:46 ` Geert Uytterhoeven 0 siblings, 1 reply; 3+ messages in thread From: Bjorn Helgaas @ 2014-05-08 20:49 UTC (permalink / raw) Cc: Arnd Bergmann, linux-doc, linux-sh, Greg Kroah-Hartman, Joerg Roedel, Randy Dunlap, Liviu Dudau, linux-kernel, James Bottomley, Magnus Damm, linux-pci, David Woodhouse dma_declare_coherent_memory() needs both the CPU physical address and the bus address of the device memory. They are the same on this platform, but in general we should use pcibios_resource_to_bus() to account for any address translation done by the PCI host bridge. This makes no difference on Dreamcast, but is safer if the usage is copied to future drivers. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Arnd Bergmann <arnd@arndb.de> CC: Magnus Damm <damm@opensource.se> CC: linux-sh@vger.kernel.org --- arch/sh/drivers/pci/fixups-dreamcast.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index d6cde700e316..f22127f966ce 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c @@ -31,6 +31,8 @@ static void gapspci_fixup_resources(struct pci_dev *dev) { struct pci_channel *p = dev->sysdata; + struct resource res; + struct pci_bus_region region; printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev)); @@ -50,11 +52,21 @@ static void gapspci_fixup_resources(struct pci_dev *dev) /* * Redirect dma memory allocations to special memory window. + * + * If this GAPSPCI region were mapped by a BAR, the CPU + * phys_addr_t would be pci_resource_start(), and the bus + * address would be pci_bus_address(pci_resource_start()). + * But apparently there's no BAR mapping it, so we just + * "know" its CPU address is GAPSPCI_DMA_BASE. */ + res.start = GAPSPCI_DMA_BASE; + res.end = GAPSPCI_DMA_BASE + GAPSPCI_DMA_SIZE - 1; + res.flags = IORESOURCE_MEM; + pcibios_resource_to_bus(dev, ®ion, &resource); BUG_ON(!dma_declare_coherent_memory(&dev->dev, - GAPSPCI_DMA_BASE, - GAPSPCI_DMA_BASE, - GAPSPCI_DMA_SIZE, + res.start, + region.start, + resource_size(&res), DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE)); break; ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 3/4] sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory() 2014-05-08 20:49 ` [PATCH v3 3/4] sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory() Bjorn Helgaas @ 2014-05-26 14:46 ` Geert Uytterhoeven 2014-05-26 23:33 ` Bjorn Helgaas 0 siblings, 1 reply; 3+ messages in thread From: Geert Uytterhoeven @ 2014-05-26 14:46 UTC (permalink / raw) To: Bjorn Helgaas Cc: Arnd Bergmann, linux-doc@vger.kernel.org, Linux-sh list, Greg Kroah-Hartman, Joerg Roedel, Randy Dunlap, Liviu Dudau, linux-kernel@vger.kernel.org, James Bottomley, Magnus Damm, linux-pci, David Woodhouse On Thu, May 8, 2014 at 10:49 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: > --- a/arch/sh/drivers/pci/fixups-dreamcast.c > +++ b/arch/sh/drivers/pci/fixups-dreamcast.c > @@ -31,6 +31,8 @@ > static void gapspci_fixup_resources(struct pci_dev *dev) > { > struct pci_channel *p = dev->sysdata; > + struct resource res; > + struct pci_bus_region region; > > printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev)); > > @@ -50,11 +52,21 @@ static void gapspci_fixup_resources(struct pci_dev *dev) > > /* > * Redirect dma memory allocations to special memory window. > + * > + * If this GAPSPCI region were mapped by a BAR, the CPU > + * phys_addr_t would be pci_resource_start(), and the bus > + * address would be pci_bus_address(pci_resource_start()). > + * But apparently there's no BAR mapping it, so we just > + * "know" its CPU address is GAPSPCI_DMA_BASE. > */ > + res.start = GAPSPCI_DMA_BASE; > + res.end = GAPSPCI_DMA_BASE + GAPSPCI_DMA_SIZE - 1; > + res.flags = IORESOURCE_MEM; > + pcibios_resource_to_bus(dev, ®ion, &resource); In response to http://kisskb.ellerman.id.au/kisskb/buildresult/11212250/ | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c: In function 'gapspci_fixup_resources': | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c:65:42: error: 'resource' undeclared (first use in this function) | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c:65:42: note: each undeclared identifier is reported only once for each function it appears in "resource" seem to have been replaced by "res", but this warning still happens: | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c:65:3: warning: passing argument 1 of 'pcibios_resource_to_bus' from incompatible pointer type [enabled by default] | /scratch/kisskb/src/include/linux/pci.h:737:6: note: expected 'struct pci_bus *' but argument is of type 'struct pci_dev *' > BUG_ON(!dma_declare_coherent_memory(&dev->dev, > - GAPSPCI_DMA_BASE, > - GAPSPCI_DMA_BASE, > - GAPSPCI_DMA_SIZE, > + res.start, > + region.start, > + resource_size(&res), > DMA_MEMORY_MAP | > DMA_MEMORY_EXCLUSIVE)); > break; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3 3/4] sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory() 2014-05-26 14:46 ` Geert Uytterhoeven @ 2014-05-26 23:33 ` Bjorn Helgaas 0 siblings, 0 replies; 3+ messages in thread From: Bjorn Helgaas @ 2014-05-26 23:33 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Arnd Bergmann, linux-doc@vger.kernel.org, Linux-sh list, Greg Kroah-Hartman, Joerg Roedel, Randy Dunlap, Liviu Dudau, linux-kernel@vger.kernel.org, James Bottomley, Magnus Damm, linux-pci, David Woodhouse On Mon, May 26, 2014 at 8:46 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Thu, May 8, 2014 at 10:49 PM, Bjorn Helgaas <bhelgaas@google.com> wrote: >> --- a/arch/sh/drivers/pci/fixups-dreamcast.c >> +++ b/arch/sh/drivers/pci/fixups-dreamcast.c >> @@ -31,6 +31,8 @@ >> static void gapspci_fixup_resources(struct pci_dev *dev) >> { >> struct pci_channel *p = dev->sysdata; >> + struct resource res; >> + struct pci_bus_region region; >> >> printk(KERN_NOTICE "PCI: Fixing up device %s\n", pci_name(dev)); >> >> @@ -50,11 +52,21 @@ static void gapspci_fixup_resources(struct pci_dev *dev) >> >> /* >> * Redirect dma memory allocations to special memory window. >> + * >> + * If this GAPSPCI region were mapped by a BAR, the CPU >> + * phys_addr_t would be pci_resource_start(), and the bus >> + * address would be pci_bus_address(pci_resource_start()). >> + * But apparently there's no BAR mapping it, so we just >> + * "know" its CPU address is GAPSPCI_DMA_BASE. >> */ >> + res.start = GAPSPCI_DMA_BASE; >> + res.end = GAPSPCI_DMA_BASE + GAPSPCI_DMA_SIZE - 1; >> + res.flags = IORESOURCE_MEM; >> + pcibios_resource_to_bus(dev, ®ion, &resource); > > In response to http://kisskb.ellerman.id.au/kisskb/buildresult/11212250/ > > | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c: In > function 'gapspci_fixup_resources': > | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c:65:42: > error: 'resource' undeclared (first use in this function) > | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c:65:42: > note: each undeclared identifier is reported only once for each > function it appears in > > "resource" seem to have been replaced by "res", but this warning still happens: > > | /scratch/kisskb/src/arch/sh/drivers/pci/fixups-dreamcast.c:65:3: > warning: passing argument 1 of 'pcibios_resource_to_bus' from > incompatible pointer type [enabled by default] > | /scratch/kisskb/src/include/linux/pci.h:737:6: note: expected > 'struct pci_bus *' but argument is of type 'struct pci_dev *' Sheesh, this really has not been my day. Fixed, thanks. >> BUG_ON(!dma_declare_coherent_memory(&dev->dev, >> - GAPSPCI_DMA_BASE, >> - GAPSPCI_DMA_BASE, >> - GAPSPCI_DMA_SIZE, >> + res.start, >> + region.start, >> + resource_size(&res), >> DMA_MEMORY_MAP | >> DMA_MEMORY_EXCLUSIVE)); >> break; > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-26 23:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20140508204257.17877.4639.stgit@bhelgaas-glaptop.roam.corp.google.com>
2014-05-08 20:49 ` [PATCH v3 3/4] sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory() Bjorn Helgaas
2014-05-26 14:46 ` Geert Uytterhoeven
2014-05-26 23:33 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).