[PATCH -next] enic: fix pci_alloc_consistent argument

[PATCH -next] enic: fix pci_alloc_consistent argument

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix build warning on i386 (32-bit) with 32-bit dma_addr_t:

drivers/net/enic/vnic_dev.c: In function 'vnic_dev_init_prov':
drivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of 'pci_alloc_consistent' from incompatible pointer type
include/asm-generic/pci-dma-compat.h:16: note: expected 'dma_addr_t *' but argument is of type 'u64 *'

Now builds without warnings on i386 and on x86_64.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc:	Scott Feldman <scofeldm@cisco.com>
Cc:	Vasanthy Kolluri <vkolluri@cisco.com>
Cc:	Roopa Prabhu <roprabhu@cisco.com>
---
 drivers/net/enic/vnic_dev.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20100608.orig/drivers/net/enic/vnic_dev.c
+++ linux-next-20100608/drivers/net/enic/vnic_dev.c
@@ -709,7 +709,7 @@ int vnic_dev_init_prov(struct vnic_dev *
 {
 	u64 a0, a1 = len;
 	int wait = 1000;
-	u64 prov_pa;
+	dma_addr_t prov_pa;
 	void *prov_buf;
 	int ret;
 
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH -next] enic: fix pci_alloc_consistent argument

[Scott Feldman]

On 6/8/10 10:00 AM, "Randy Dunlap" <randy.dunlap@oracle.com> wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix build warning on i386 (32-bit) with 32-bit dma_addr_t:
> 
> drivers/net/enic/vnic_dev.c: In function 'vnic_dev_init_prov':
> drivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of
> 'pci_alloc_consistent' from incompatible pointer type
> include/asm-generic/pci-dma-compat.h:16: note: expected 'dma_addr_t *' but
> argument is of type 'u64 *'
> 
> Now builds without warnings on i386 and on x86_64.
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Scott Feldman <scofeldm@cisco.com>
> Cc: Vasanthy Kolluri <vkolluri@cisco.com>
> Cc: Roopa Prabhu <roprabhu@cisco.com>
> ---
>  drivers/net/enic/vnic_dev.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Scott Feldman <scofeldm@cisco.com>

Re: [PATCH -next] enic: fix pci_alloc_consistent argument

[David Miller]

From: Scott Feldman <scofeldm@cisco.com>
Date: Tue, 08 Jun 2010 14:55:27 -0700

> On 6/8/10 10:00 AM, "Randy Dunlap" <randy.dunlap@oracle.com> wrote:
> 
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>> 
>> Fix build warning on i386 (32-bit) with 32-bit dma_addr_t:
>> 
>> drivers/net/enic/vnic_dev.c: In function 'vnic_dev_init_prov':
>> drivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of
>> 'pci_alloc_consistent' from incompatible pointer type
>> include/asm-generic/pci-dma-compat.h:16: note: expected 'dma_addr_t *' but
>> argument is of type 'u64 *'
>> 
>> Now builds without warnings on i386 and on x86_64.
>> 
>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>> Cc: Scott Feldman <scofeldm@cisco.com>
>> Cc: Vasanthy Kolluri <vkolluri@cisco.com>
>> Cc: Roopa Prabhu <roprabhu@cisco.com>
>> ---
>>  drivers/net/enic/vnic_dev.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Acked-by: Scott Feldman <scofeldm@cisco.com>

I'm applying this to net-2.6 since it's also a bug fix, as
passing a u64 pointer in here will make pci_alloc_consistent()
write garbage since it expects a dma_addr_t there which as
on i386 could be 32-bit.