On 03/08/10 20:53, FUJITA Tomonori wrote:
> - replace the PCI DMA API (i.e. pci_dma_*) with the generic DMA API.
>
> - make the document more generic (use the PCI specific explanation as
> an example).
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
> ---
> Documentation/PCI/PCI-DMA-mapping.txt | 352 ++++++++++++++++-----------------
> 1 files changed, 172 insertions(+), 180 deletions(-)
>
> diff --git a/Documentation/PCI/PCI-DMA-mapping.txt b/Documentation/PCI/PCI-DMA-mapping.txt
> index ecad88d..55a3ac5 100644
> --- a/Documentation/PCI/PCI-DMA-mapping.txt
> +++ b/Documentation/PCI/PCI-DMA-mapping.txt
> @@ -133,31 +135,30 @@ of your driver reports that performance is bad or that the device is not
> even detected, you can ask them for the kernel messages to find out
> exactly why.
>
> -The standard 32-bit addressing PCI device would do something like
> -this:
> +The standard 32-bit addressing device would do something like this:
>
> - if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
> + if (dma_set_mask(dev, DMA_BIT_MASK(32))) {
> printk(KERN_WARNING
> "mydev: No suitable DMA available.\n");
> goto ignore_this_device;
> }
>
> -Another common scenario is a 64-bit capable device. The approach
> -here is to try for 64-bit DAC addressing, but back down to a
> -32-bit mask should that fail. The PCI platform code may fail the
> -64-bit mask not because the platform is not capable of 64-bit
> -addressing. Rather, it may fail in this case simply because
> -32-bit SAC addressing is done more efficiently than DAC addressing.
> -Sparc64 is one platform which behaves in this way.
> +Another common scenario is a 64-bit capable device. The approach here
> +is to try for 64-bit addressing, but back down to a 32-bit mask that
> +should not fail. The kernel may fail the 64-bit mask not because the
> +platform is not capable of 64-bit addressing. Rather, it may fail in
> +this case simply because 32-bit addressing is done more efficiently
> +than addressing. For example, Sparc64 PCI SAC addressing is more
than 64-bit addressing. (?)
> +efficient than DAC addressing.
>
> Here is how you would handle a 64-bit capable device which can drive
> all 64-bits when accessing streaming DMA:
>
> int using_dac;
>
> - if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
> + if (!dma_set_mask(dev, DMA_BIT_MASK(64))) {
> using_dac = 1;
> - } else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
> + } else if (!dma_set_mask(dev, DMA_BIT_MASK(32))) {
> using_dac = 0;
> } else {
> printk(KERN_WARNING
> @@ -315,33 +316,27 @@ you should do:
>
> dma_addr_t dma_handle;
>
> - cpu_addr = pci_alloc_consistent(pdev, size, &dma_handle);
> -
> -where pdev is a struct pci_dev *. This may be called in interrupt context.
> -You should use dma_alloc_coherent (see DMA-API.txt) for buses
> -where devices don't have struct pci_dev (like ISA, EISA).
> + cpu_addr = dma_alloc_coherent(dev, size, &dma_handle, gfp);
>
> -This argument is needed because the DMA translations may be bus
> -specific (and often is private to the bus which the device is attached
> -to).
> +where device is a struct device *. This may be called in interrupt
> +context with the GFP_ATOMIC flag.
>
> Size is the length of the region you want to allocate, in bytes.
>
> This routine will allocate RAM for that region, so it acts similarly to
> __get_free_pages (but takes size instead of a page order). If your
> driver needs regions sized smaller than a page, you may prefer using
> -the pci_pool interface, described below.
> -
> -The consistent DMA mapping interfaces, for non-NULL pdev, will by
> -default return a DMA address which is SAC (Single Address Cycle)
> -addressable. Even if the device indicates (via PCI dma mask) that it
> -may address the upper 32-bits and thus perform DAC cycles, consistent
> -allocation will only return > 32-bit PCI addresses for DMA if the
> -consistent dma mask has been explicitly changed via
> -pci_set_consistent_dma_mask(). This is true of the pci_pool interface
> -as well.
> -
> -pci_alloc_consistent returns two values: the virtual address which you
> +the dma_pool interface, described below.
> +
> +The consistent DMA mapping interfaces, for non-NULL dev, will by
> +default return a DMA address which is 32-bit addressable. Even if the
> +device indicates (via dma mask) that it may address the upper 32-bits,
DMA
> +consistent allocation will only return > 32-bit addresses for DMA if
> +the consistent dma mask has been explicitly changed via
DMA
> +dma_set_coherent_mask(). This is true of the dma_pool interface as
> +well.
> +
> +dma_alloc_coherent returns two values: the virtual address which you
> can use to access it from the CPU and dma_handle which you pass to the
> card.
>
This looks like a really nice update/change. Thanks.
Reviewed-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
--
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
