Fixed sunxi-gmac integer overflow for DMA address when system has more than 1GB memory.

longsleep · longsleep · commit c249f7aaa512 · 2016-04-03T10:53:54.000+02:00
diff --git a/drivers/net/ethernet/allwinner/sunxi-gmac.h b/drivers/net/ethernet/allwinner/sunxi-gmac.h
@@ -293,7 +293,7 @@ void desc_tx_close(struct dma_desc *first, struct dma_desc *end, int csum_insert
 void desc_init(struct dma_desc *p);
 int desc_get_tx_status(struct dma_desc *desc, struct geth_extra_stats *x);
 int desc_buf_get_len(struct dma_desc *desc);
-int desc_buf_get_addr(struct dma_desc *desc);
+unsigned long desc_buf_get_addr(struct dma_desc *desc);
 int desc_get_rx_status(struct dma_desc *desc, struct geth_extra_stats *x);
 int desc_get_own(struct dma_desc *desc);
 int desc_get_tx_ls(struct dma_desc *desc);
diff --git a/drivers/net/ethernet/allwinner/sunxi_gmac_ops.c b/drivers/net/ethernet/allwinner/sunxi_gmac_ops.c
@@ -609,7 +609,7 @@ int desc_buf_get_len(struct dma_desc *desc)
 	return (desc->desc1.all & ((1 << 11) - 1));
 }
 
-int desc_buf_get_addr(struct dma_desc *desc)
+unsigned long desc_buf_get_addr(struct dma_desc *desc)
 {
 	return desc->desc2;
 }

Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ int desc_buf_get_len(struct dma_desc *desc)`
`609`	`609`	`return (desc->desc1.all & ((1 << 11) - 1));`
`610`	`610`	`}`
`611`	`611`
`612`		`-int desc_buf_get_addr(struct dma_desc *desc)`
	`612`	`+unsigned long desc_buf_get_addr(struct dma_desc *desc)`
`613`	`613`	`{`
`614`	`614`	`return desc->desc2;`
`615`	`615`	`}`