AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-04 13:36:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

skge: fix build on 32 bit

Browse Source 
The following is needed as well to fix warning/error about shifting a 32 bit
value 32 bits which occurs if building on 32 bit platform caused by conversion
to using dma_addr_t

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2013-08-04 20:40:34 -07:00 committed by David S. Miller
parent bf37d2b3fd
commit f7b7a36533
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/marvell/skge.c
View File

@ -943,8 +943,8 @@ static int skge_rx_setup(struct skge_port *skge, struct skge_element *e,
if (pci_dma_mapping_error(skge->hw->pdev, map)) if (pci_dma_mapping_error(skge->hw->pdev, map))
return -1; return -1;
rd->dma_lo = map; rd->dma_lo = lower_32_bits(map);
rd->dma_hi = map >> 32; rd->dma_hi = upper_32_bits(map);
e->skb = skb; e->skb = skb;
rd->csum1_start = ETH_HLEN; rd->csum1_start = ETH_HLEN;
rd->csum2_start = ETH_HLEN; rd->csum2_start = ETH_HLEN;
@ -2551,7 +2551,7 @@ static int skge_up(struct net_device *dev)
BUG_ON(skge->dma & 7); BUG_ON(skge->dma & 7);
if ((u64)skge->dma >> 32 != ((u64) skge->dma + skge->mem_size) >> 32) { if (upper_32_bits(skge->dma) != upper_32_bits(skge->dma + skge->mem_size)) {
dev_err(&hw->pdev->dev, "pci_alloc_consistent region crosses 4G boundary\n"); dev_err(&hw->pdev->dev, "pci_alloc_consistent region crosses 4G boundary\n");
err = -EINVAL; err = -EINVAL;
goto free_pci_mem; goto free_pci_mem;
@ -2756,8 +2756,8 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
dma_unmap_addr_set(e, mapaddr, map); dma_unmap_addr_set(e, mapaddr, map);
dma_unmap_len_set(e, maplen, len); dma_unmap_len_set(e, maplen, len);
td->dma_lo = map; td->dma_lo = lower_32_bits(map);
td->dma_hi = map >> 32; td->dma_hi = upper_32_bits(map);
if (skb->ip_summed == CHECKSUM_PARTIAL) { if (skb->ip_summed == CHECKSUM_PARTIAL) {
const int offset = skb_checksum_start_offset(skb); const int offset = skb_checksum_start_offset(skb);
@ -2796,8 +2796,8 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
tf = e->desc; tf = e->desc;
BUG_ON(tf->control & BMU_OWN); BUG_ON(tf->control & BMU_OWN);
tf->dma_lo = map; tf->dma_lo = lower_32_bits(map);
tf->dma_hi = (u64) map >> 32; tf->dma_hi = upper_32_bits(map);
dma_unmap_addr_set(e, mapaddr, map); dma_unmap_addr_set(e, mapaddr, map);
dma_unmap_len_set(e, maplen, skb_frag_size(frag)); dma_unmap_len_set(e, maplen, skb_frag_size(frag));