Re: [PATCH] ibmvscsi driver - sixth version

Dave Boutcher
2004-03-31T22:37:37Z

On 31 Mar 2004 16:58:28 -0500, James Bottomley
<James.Bottomley@SteelEye.com> wrote:
> Actually, this:
>
> + (u64) (unsigned long)dma_map_single(dev, cmd->request_buffer,
> + cmd->request_bufflen,
> + DMA_BIDIRECTIONAL);
> + if (pci_dma_mapping_error(data->virtual_address)) {
> + printk(KERN_ERR
> + "ibmvscsi: Unable to map request_buffer for command!\n");
> + return 0;
>
> Should be
>
> if(dma_mapping_error())
>
> I have no idea why there are two identical APIs for the mapping error,
> but since you use the DMA API, you should use its version. You can also
> drop the #include <linux/pci.h> as well.

Well, that would be true if arch/ppc64 had dma_mapping_error implemented.
Which it not. You would need something like the following patch, which
will show up when we rationalize it with the rest of ppc64 and an
appropriate bk pull happens...I'll work with my ppc64 bretheren and then
re-submit the ibmvscsi patch.

===== dma-mapping.h 1.5 vs edited =====
--- 1.5/include/asm-ppc64/dma-mapping.hTue Mar 16 18:47:00 2004
+++ edited/dma-mapping.hWed Mar 31 16:33:07 2004
@@ -15,6 +15,11 @@
#include <asm/scatterlist.h>
#include <asm/bug.h>

+#define DMA_ERROR_CODE (~(dma_addr_t)0x0)
+static inline int dma_mapping_error(dma_addr_t dma_addr) {
+ return (dma_addr == DMA_ERROR_CODE);
+}
+
extern int dma_supported(struct device *dev, u64 mask);
extern int dma_set_mask(struct device *dev, u64 dma_mask);
extern void *dma_alloc_coherent(struct device *dev, size_t size,

> This:
>
> + sg_mapped = dma_map_sg(dev, sg, cmd->use_sg, DMA_BIDIRECTIONAL);
> +
> + if (pci_dma_mapping_error(sg_dma_address(&sg[0])))
> + return 0;
>
> Is wrong. dma_map_sg returns zero if there's a mapping error, you
> should check for that.

Yes, my bad. I was so delighted with pci_dma_mapping_error() that I
got a little carried away. Thanks.

Dave B