Commit d896f3f3 authored Jan 06, 2011 by Stephen M. Cameron Committed by James Bottomley Jan 24, 2011

[SCSI] hpsa: fixup DMA address before freeing.



Some low bits might have been set by the driver, causing
a message like this to come out:

 [   13.288062] ------------[ cut here ]------------
 [   13.293211] WARNING: at lib/dma-debug.c:803 check_unmap+0x1a1/0x654()
 [   13.300387] Hardware name: ProLiant DL180 G6
 [   13.305335] hpsa 0000:06:00.0: DMA-API: device driver tries to free
 DMA memory it has not allocated [device address=0x000000007f81e001]
 [size=640 bytes]

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent b03a7771

drivers/scsi/hpsa.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2267,7 +2267,7 @@ static void cmd_special_free(struct ctlr_info h, struct CommandList c)
		pci_free_consistent(h->pdev, sizeof(*c->err_info),
		c->err_info, (dma_addr_t) temp64.val);
		pci_free_consistent(h->pdev, sizeof(*c),
		c, (dma_addr_t) c->busaddr);
		c, (dma_addr_t) (c->busaddr & DIRECT_LOOKUP_MASK));
		}

		#ifdef CONFIG_COMPAT

drivers/scsi/hpsa_cmd.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ struct ErrorInfo {

		#define DIRECT_LOOKUP_SHIFT 5
		#define DIRECT_LOOKUP_BIT 0x10
		#define DIRECT_LOOKUP_MASK (~((1 << DIRECT_LOOKUP_SHIFT) - 1))

		#define HPSA_ERROR_BIT 0x02
		struct ctlr_info; /* defined in hpsa.h */

Admin message