[tg3] Fix address truncation bug on 64-bit machines

leendert1966 · mcb30 · commit 5c2a959a72e9 · 2016-06-10T15:45:19.000+01:00
Signed-off-by: Leendert van Doorn &lt;leendert@paramecium.org&gt;
Signed-off-by: Michael Brown &lt;mcb30@ipxe.org&gt;
diff --git a/src/drivers/net/tg3/tg3.c b/src/drivers/net/tg3/tg3.c
@@ -545,7 +545,7 @@ static int tg3_test_dma(struct tg3 *tp)
 		goto out_nofree;
 	}
 	buf_dma = virt_to_bus(buf);
-	DBGC2(tp->dev, "dma test buffer, virt: %p phys: %#08x\n", buf, buf_dma);
+	DBGC2(tp->dev, "dma test buffer, virt: %p phys: %#016lx\n", buf, buf_dma);
 
 	if (tg3_flag(tp, 57765_PLUS)) {
 		tp->dma_rwctrl = DMA_RWCTRL_DIS_CACHE_ALIGNMENT;
diff --git a/src/drivers/net/tg3/tg3.h b/src/drivers/net/tg3/tg3.h
@@ -2788,7 +2788,7 @@ struct tg3_hw_stats {
 	u8				__reserved4[0xb00-0x9c8];
 };
 
-typedef u32 dma_addr_t;
+typedef unsigned long dma_addr_t;
 
 /* 'mapping' is superfluous as the chip does not write into
  * the tx/rx post rings so we could just fetch it from there.

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ static int tg3_test_dma(struct tg3 *tp)`
`545`	`545`	`goto out_nofree;`
`546`	`546`	`}`
`547`	`547`	`buf_dma = virt_to_bus(buf);`
`548`		`- DBGC2(tp->dev, "dma test buffer, virt: %p phys: %#08x\n", buf, buf_dma);`
	`548`	`+ DBGC2(tp->dev, "dma test buffer, virt: %p phys: %#016lx\n", buf, buf_dma);`
`549`	`549`
`550`	`550`	`if (tg3_flag(tp, 57765_PLUS)) {`
`551`	`551`	`tp->dma_rwctrl = DMA_RWCTRL_DIS_CACHE_ALIGNMENT;`