| @@ -314,7 +314,7 @@ netdev_tx_t nfp_nfdk_tx(struct sk_buff *skb, struct net_device *netdev) · 313 unmodified lines |
| 314 | FIELD_PREP(NFDK_DESC_TX_TYPE_HEAD, type); | 314 | FIELD_PREP(NFDK_DESC_TX_TYPE_HEAD, type); |
| 315 | | 315 | |
| 316 | txd->dma_len_type = cpu_to_le16(dlen_type); | 316 | txd->dma_len_type = cpu_to_le16(dlen_type); |
| 317 | nfp_desc_set_dma_addr(txd, dma_addr); | 317 | nfp_nfdk_tx_desc_set_dma_addr(txd, dma_addr); |
| 318 | | 318 | |
| 319 | /* starts at bit 0 */ | 319 | /* starts at bit 0 */ |
| 320 | BUILD_BUG_ON(!(NFDK_DESC_TX_DMA_LEN_HEAD & 1)); | 320 | BUILD_BUG_ON(!(NFDK_DESC_TX_DMA_LEN_HEAD & 1)); |
| @@ -339,7 +339,7 @@ netdev_tx_t nfp_nfdk_tx(struct sk_buff *skb, struct net_device *netdev) · 18 unmodified lines |
| 339 | dlen_type = FIELD_PREP(NFDK_DESC_TX_DMA_LEN, dma_len); | 339 | dlen_type = FIELD_PREP(NFDK_DESC_TX_DMA_LEN, dma_len); |
| 340 | | 340 | |
| 341 | txd->dma_len_type = cpu_to_le16(dlen_type); | 341 | txd->dma_len_type = cpu_to_le16(dlen_type); |
| 342 | nfp_desc_set_dma_addr(txd, dma_addr); | 342 | nfp_nfdk_tx_desc_set_dma_addr(txd, dma_addr); |
| 343 | | 343 | |
| 344 | dma_len -= dlen_type; | 344 | dma_len -= dlen_type; |
| 345 | dma_addr += dlen_type + 1; | 345 | dma_addr += dlen_type + 1; |
| @@ -929,7 +929,7 @@ nfp_nfdk_tx_xdp_buf(struct nfp_net_dp *dp, struct nfp_net_rx_ring *rx_ring, · 583 unmodified lines |
| 929 | FIELD_PREP(NFDK_DESC_TX_TYPE_HEAD, type); | 929 | FIELD_PREP(NFDK_DESC_TX_TYPE_HEAD, type); |
| 930 | | 930 | |
| 931 | txd->dma_len_type = cpu_to_le16(dlen_type); | 931 | txd->dma_len_type = cpu_to_le16(dlen_type); |
| 932 | nfp_desc_set_dma_addr(txd, dma_addr); | 932 | nfp_nfdk_tx_desc_set_dma_addr(txd, dma_addr); |
| 933 | | 933 | |
| 934 | tmp_dlen = dlen_type & NFDK_DESC_TX_DMA_LEN_HEAD; | 934 | tmp_dlen = dlen_type & NFDK_DESC_TX_DMA_LEN_HEAD; |
| 935 | dma_len -= tmp_dlen; | 935 | dma_len -= tmp_dlen; |
| @@ -940,7 +940,7 @@ nfp_nfdk_tx_xdp_buf(struct nfp_net_dp *dp, struct nfp_net_rx_ring *rx_ring, · 4 unmodified lines |
| 940 | dma_len -= 1; | 940 | dma_len -= 1; |
| 941 | dlen_type = FIELD_PREP(NFDK_DESC_TX_DMA_LEN, dma_len); | 941 | dlen_type = FIELD_PREP(NFDK_DESC_TX_DMA_LEN, dma_len); |
| 942 | txd->dma_len_type = cpu_to_le16(dlen_type); | 942 | txd->dma_len_type = cpu_to_le16(dlen_type); |
| 943 | nfp_desc_set_dma_addr(txd, dma_addr); | 943 | nfp_nfdk_tx_desc_set_dma_addr(txd, dma_addr); |
| 944 | | 944 | |
| 945 | dlen_type &= NFDK_DESC_TX_DMA_LEN; | 945 | dlen_type &= NFDK_DESC_TX_DMA_LEN; |
| 946 | dma_len -= dlen_type; | 946 | dma_len -= dlen_type; |
| @@ -1332,7 +1332,7 @@ nfp_nfdk_ctrl_tx_one(struct nfp_net *nn, struct nfp_net_r_vector *r_vec, · 385 unmodified lines |
| 1332 | FIELD_PREP(NFDK_DESC_TX_TYPE_HEAD, type); | 1332 | FIELD_PREP(NFDK_DESC_TX_TYPE_HEAD, type); |
| 1333 | | 1333 | |
| 1334 | txd->dma_len_type = cpu_to_le16(dlen_type); | 1334 | txd->dma_len_type = cpu_to_le16(dlen_type); |
| 1335 | nfp_desc_set_dma_addr(txd, dma_addr); | 1335 | nfp_nfdk_tx_desc_set_dma_addr(txd, dma_addr); |
| 1336 | | 1336 | |
| 1337 | tmp_dlen = dlen_type & NFDK_DESC_TX_DMA_LEN_HEAD; | 1337 | tmp_dlen = dlen_type & NFDK_DESC_TX_DMA_LEN_HEAD; |
| 1338 | dma_len -= tmp_dlen; | 1338 | dma_len -= tmp_dlen; |
| @@ -1343,7 +1343,7 @@ nfp_nfdk_ctrl_tx_one(struct nfp_net *nn, struct nfp_net_r_vector *r_vec, · 4 unmodified lines |
| 1343 | dma_len -= 1; | 1343 | dma_len -= 1; |
| 1344 | dlen_type = FIELD_PREP(NFDK_DESC_TX_DMA_LEN, dma_len); | 1344 | dlen_type = FIELD_PREP(NFDK_DESC_TX_DMA_LEN, dma_len); |
| 1345 | txd->dma_len_type = cpu_to_le16(dlen_type); | 1345 | txd->dma_len_type = cpu_to_le16(dlen_type); |
| 1346 | nfp_desc_set_dma_addr(txd, dma_addr); | 1346 | nfp_nfdk_tx_desc_set_dma_addr(txd, dma_addr); |
| 1347 | | 1347 | |
| 1348 | dlen_type &= NFDK_DESC_TX_DMA_LEN; | 1348 | dlen_type &= NFDK_DESC_TX_DMA_LEN; |
| 1349 | dma_len -= dlen_type; | 1349 | dma_len -= dlen_type; |