Skip to content

Commit b17db8c

Browse files
davem330davem330
committed
Merge branch 'DPAA-Ethernet-fixes'
Madalin Bucur says: ==================== DPAA Ethernet fixes Fixed an issue on the Tx path that was visible in netperf TCP_SENDFILE tests. Addressed another issue with Rx errors not being always counted. Adding control for allmulti. v2: rephrased commit message, reduced changes in the SG mapping fix ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents afdd6ae + c893238 commit b17db8c

File tree

9 files changed

+124
-31
lines changed

9 files changed

+124
-31
lines changed

‎drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,16 @@ static void dpaa_set_rx_mode(struct net_device *net_dev)
454454
err);
455455
}
456456

457+
if (!!(net_dev->flags & IFF_ALLMULTI) != priv->mac_dev->allmulti) {
458+
priv->mac_dev->allmulti = !priv->mac_dev->allmulti;
459+
err = priv->mac_dev->set_allmulti(priv->mac_dev->fman_mac,
460+
priv->mac_dev->allmulti);
461+
if (err < 0)
462+
netif_err(priv, drv, net_dev,
463+
"mac_dev->set_allmulti() = %d\n",
464+
err);
465+
}
466+
457467
err = priv->mac_dev->set_multi(net_dev, priv->mac_dev);
458468
if (err < 0)
459469
netif_err(priv, drv, net_dev, "mac_dev->set_multi() = %d\n",
@@ -1916,8 +1926,10 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
19161926
goto csum_failed;
19171927
}
19181928

1929+
/* SGT[0] is used by the linear part */
19191930
sgt = (struct qm_sg_entry *)(sgt_buf + priv->tx_headroom);
1920-
qm_sg_entry_set_len(&sgt[0], skb_headlen(skb));
1931+
frag_len = skb_headlen(skb);
1932+
qm_sg_entry_set_len(&sgt[0], frag_len);
19211933
sgt[0].bpid = FSL_DPAA_BPID_INV;
19221934
sgt[0].offset = 0;
19231935
addr = dma_map_single(dev, skb->data,
@@ -1930,9 +1942,9 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
19301942
qm_sg_entry_set64(&sgt[0], addr);
19311943

19321944
/* populate the rest of SGT entries */
1933-
frag = &skb_shinfo(skb)->frags[0];
1934-
frag_len = frag->size;
1935-
for (i = 1; i <= nr_frags; i++, frag++) {
1945+
for (i = 0; i < nr_frags; i++) {
1946+
frag = &skb_shinfo(skb)->frags[i];
1947+
frag_len = frag->size;
19361948
WARN_ON(!skb_frag_page(frag));
19371949
addr = skb_frag_dma_map(dev, frag, 0,
19381950
frag_len, dma_dir);
@@ -1942,15 +1954,16 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,
19421954
goto sg_map_failed;
19431955
}
19441956

1945-
qm_sg_entry_set_len(&sgt[i], frag_len);
1946-
sgt[i].bpid = FSL_DPAA_BPID_INV;
1947-
sgt[i].offset = 0;
1957+
qm_sg_entry_set_len(&sgt[i + 1], frag_len);
1958+
sgt[i + 1].bpid = FSL_DPAA_BPID_INV;
1959+
sgt[i + 1].offset = 0;
19481960

19491961
/* keep the offset in the address */
1950-
qm_sg_entry_set64(&sgt[i], addr);
1951-
frag_len = frag->size;
1962+
qm_sg_entry_set64(&sgt[i + 1], addr);
19521963
}
1953-
qm_sg_entry_set_f(&sgt[i - 1], frag_len);
1964+
1965+
/* Set the final bit in the last used entry of the SGT */
1966+
qm_sg_entry_set_f(&sgt[nr_frags], frag_len);
19541967

19551968
qm_fd_set_sg(fd, priv->tx_headroom, skb->len);
19561969

@@ -2052,19 +2065,23 @@ static int dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
20522065
/* MAX_SKB_FRAGS is equal or larger than our dpaa_SGT_MAX_ENTRIES;
20532066
* make sure we don't feed FMan with more fragments than it supports.
20542067
*/
2055-
if (nonlinear &&
2056-
likely(skb_shinfo(skb)->nr_frags < DPAA_SGT_MAX_ENTRIES)) {
2057-
/* Just create a S/G fd based on the skb */
2058-
err = skb_to_sg_fd(priv, skb, &fd);
2059-
percpu_priv->tx_frag_skbuffs++;
2060-
} else {
2068+
if (unlikely(nonlinear &&
2069+
(skb_shinfo(skb)->nr_frags >= DPAA_SGT_MAX_ENTRIES))) {
20612070
/* If the egress skb contains more fragments than we support
20622071
* we have no choice but to linearize it ourselves.
20632072
*/
2064-
if (unlikely(nonlinear) && __skb_linearize(skb))
2073+
if (__skb_linearize(skb))
20652074
goto enomem;
20662075

2067-
/* Finally, create a contig FD from this skb */
2076+
nonlinear = skb_is_nonlinear(skb);
2077+
}
2078+
2079+
if (nonlinear) {
2080+
/* Just create a S/G fd based on the skb */
2081+
err = skb_to_sg_fd(priv, skb, &fd);
2082+
percpu_priv->tx_frag_skbuffs++;
2083+
} else {
2084+
/* Create a contig FD from this skb */
20682085
err = skb_to_contig_fd(priv, skb, &fd, &offset);
20692086
}
20702087
if (unlikely(err < 0))
@@ -2201,14 +2218,8 @@ static enum qman_cb_dqrr_result rx_error_dqrr(struct qman_portal *portal,
22012218
if (dpaa_eth_napi_schedule(percpu_priv, portal))
22022219
return qman_cb_dqrr_stop;
22032220

2204-
if (dpaa_eth_refill_bpools(priv))
2205-
/* Unable to refill the buffer pool due to insufficient
2206-
* system memory. Just release the frame back into the pool,
2207-
* otherwise we'll soon end up with an empty buffer pool.
2208-
*/
2209-
dpaa_fd_release(net_dev, &dq->fd);
2210-
else
2211-
dpaa_rx_error(net_dev, priv, percpu_priv, &dq->fd, fq->fqid);
2221+
dpaa_eth_refill_bpools(priv);
2222+
dpaa_rx_error(net_dev, priv, percpu_priv, &dq->fd, fq->fqid);
22122223

22132224
return qman_cb_dqrr_consume;
22142225
}

‎drivers/net/ethernet/freescale/fman/fman_dtsec.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,25 @@ int dtsec_add_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr)
11171117
return 0;
11181118
}
11191119

1120+
int dtsec_set_allmulti(struct fman_mac *dtsec, bool enable)
1121+
{
1122+
u32 tmp;
1123+
struct dtsec_regs __iomem *regs = dtsec->regs;
1124+
1125+
if (!is_init_done(dtsec->dtsec_drv_param))
1126+
return -EINVAL;
1127+
1128+
tmp = ioread32be(&regs->rctrl);
1129+
if (enable)
1130+
tmp |= RCTRL_MPROM;
1131+
else
1132+
tmp &= ~RCTRL_MPROM;
1133+
1134+
iowrite32be(tmp, &regs->rctrl);
1135+
1136+
return 0;
1137+
}
1138+
11201139
int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr)
11211140
{
11221141
struct dtsec_regs __iomem *regs = dtsec->regs;

‎drivers/net/ethernet/freescale/fman/fman_dtsec.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,6 @@ int dtsec_set_exception(struct fman_mac *dtsec,
5555
int dtsec_add_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr);
5656
int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr);
5757
int dtsec_get_version(struct fman_mac *dtsec, u32 *mac_version);
58+
int dtsec_set_allmulti(struct fman_mac *dtsec, bool enable);
5859

5960
#endif /* __DTSEC_H */

‎drivers/net/ethernet/freescale/fman/fman_memac.c

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ struct fman_mac {
350350
struct fman_rev_info fm_rev_info;
351351
bool basex_if;
352352
struct phy_device *pcsphy;
353+
bool allmulti_enabled;
353354
};
354355

355356
static void add_addr_in_paddr(struct memac_regs __iomem *regs, u8 *adr,
@@ -940,6 +941,29 @@ int memac_add_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr)
940941
return 0;
941942
}
942943

944+
int memac_set_allmulti(struct fman_mac *memac, bool enable)
945+
{
946+
u32 entry;
947+
struct memac_regs __iomem *regs = memac->regs;
948+
949+
if (!is_init_done(memac->memac_drv_param))
950+
return -EINVAL;
951+
952+
if (enable) {
953+
for (entry = 0; entry < HASH_TABLE_SIZE; entry++)
954+
iowrite32be(entry | HASH_CTRL_MCAST_EN,
955+
&regs->hashtable_ctrl);
956+
} else {
957+
for (entry = 0; entry < HASH_TABLE_SIZE; entry++)
958+
iowrite32be(entry & ~HASH_CTRL_MCAST_EN,
959+
&regs->hashtable_ctrl);
960+
}
961+
962+
memac->allmulti_enabled = enable;
963+
964+
return 0;
965+
}
966+
943967
int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr)
944968
{
945969
struct memac_regs __iomem *regs = memac->regs;
@@ -963,8 +987,12 @@ int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr)
963987
break;
964988
}
965989
}
966-
if (list_empty(&memac->multicast_addr_hash->lsts[hash]))
967-
iowrite32be(hash & ~HASH_CTRL_MCAST_EN, &regs->hashtable_ctrl);
990+
991+
if (!memac->allmulti_enabled) {
992+
if (list_empty(&memac->multicast_addr_hash->lsts[hash]))
993+
iowrite32be(hash & ~HASH_CTRL_MCAST_EN,
994+
&regs->hashtable_ctrl);
995+
}
968996

969997
return 0;
970998
}

‎drivers/net/ethernet/freescale/fman/fman_memac.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,6 @@ int memac_set_exception(struct fman_mac *memac,
5757
enum fman_mac_exceptions exception, bool enable);
5858
int memac_add_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr);
5959
int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr);
60+
int memac_set_allmulti(struct fman_mac *memac, bool enable);
6061

6162
#endif /* __MEMAC_H */

‎drivers/net/ethernet/freescale/fman/fman_tgec.c

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ struct fman_mac {
217217
struct tgec_cfg *cfg;
218218
void *fm;
219219
struct fman_rev_info fm_rev_info;
220+
bool allmulti_enabled;
220221
};
221222

222223
static void set_mac_address(struct tgec_regs __iomem *regs, u8 *adr)
@@ -564,6 +565,29 @@ int tgec_add_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr)
564565
return 0;
565566
}
566567

568+
int tgec_set_allmulti(struct fman_mac *tgec, bool enable)
569+
{
570+
u32 entry;
571+
struct tgec_regs __iomem *regs = tgec->regs;
572+
573+
if (!is_init_done(tgec->cfg))
574+
return -EINVAL;
575+
576+
if (enable) {
577+
for (entry = 0; entry < TGEC_HASH_TABLE_SIZE; entry++)
578+
iowrite32be(entry | TGEC_HASH_MCAST_EN,
579+
&regs->hashtable_ctrl);
580+
} else {
581+
for (entry = 0; entry < TGEC_HASH_TABLE_SIZE; entry++)
582+
iowrite32be(entry & ~TGEC_HASH_MCAST_EN,
583+
&regs->hashtable_ctrl);
584+
}
585+
586+
tgec->allmulti_enabled = enable;
587+
588+
return 0;
589+
}
590+
567591
int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr)
568592
{
569593
struct tgec_regs __iomem *regs = tgec->regs;
@@ -591,9 +615,12 @@ int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr)
591615
break;
592616
}
593617
}
594-
if (list_empty(&tgec->multicast_addr_hash->lsts[hash]))
595-
iowrite32be((hash & ~TGEC_HASH_MCAST_EN),
596-
&regs->hashtable_ctrl);
618+
619+
if (!tgec->allmulti_enabled) {
620+
if (list_empty(&tgec->multicast_addr_hash->lsts[hash]))
621+
iowrite32be((hash & ~TGEC_HASH_MCAST_EN),
622+
&regs->hashtable_ctrl);
623+
}
597624

598625
return 0;
599626
}

‎drivers/net/ethernet/freescale/fman/fman_tgec.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@ int tgec_set_exception(struct fman_mac *tgec,
5151
int tgec_add_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr);
5252
int tgec_del_hash_mac_address(struct fman_mac *tgec, enet_addr_t *eth_addr);
5353
int tgec_get_version(struct fman_mac *tgec, u32 *mac_version);
54+
int tgec_set_allmulti(struct fman_mac *tgec, bool enable);
5455

5556
#endif /* __TGEC_H */

‎drivers/net/ethernet/freescale/fman/mac.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ static void setup_dtsec(struct mac_device *mac_dev)
470470
mac_dev->set_tx_pause = dtsec_set_tx_pause_frames;
471471
mac_dev->set_rx_pause = dtsec_accept_rx_pause_frames;
472472
mac_dev->set_exception = dtsec_set_exception;
473+
mac_dev->set_allmulti = dtsec_set_allmulti;
473474
mac_dev->set_multi = set_multi;
474475
mac_dev->start = start;
475476
mac_dev->stop = stop;
@@ -488,6 +489,7 @@ static void setup_tgec(struct mac_device *mac_dev)
488489
mac_dev->set_tx_pause = tgec_set_tx_pause_frames;
489490
mac_dev->set_rx_pause = tgec_accept_rx_pause_frames;
490491
mac_dev->set_exception = tgec_set_exception;
492+
mac_dev->set_allmulti = tgec_set_allmulti;
491493
mac_dev->set_multi = set_multi;
492494
mac_dev->start = start;
493495
mac_dev->stop = stop;
@@ -506,6 +508,7 @@ static void setup_memac(struct mac_device *mac_dev)
506508
mac_dev->set_tx_pause = memac_set_tx_pause_frames;
507509
mac_dev->set_rx_pause = memac_accept_rx_pause_frames;
508510
mac_dev->set_exception = memac_set_exception;
511+
mac_dev->set_allmulti = memac_set_allmulti;
509512
mac_dev->set_multi = set_multi;
510513
mac_dev->start = start;
511514
mac_dev->stop = stop;

‎drivers/net/ethernet/freescale/fman/mac.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,15 @@ struct mac_device {
5959
bool rx_pause_active;
6060
bool tx_pause_active;
6161
bool promisc;
62+
bool allmulti;
6263

6364
int (*init)(struct mac_device *mac_dev);
6465
int (*start)(struct mac_device *mac_dev);
6566
int (*stop)(struct mac_device *mac_dev);
6667
void (*adjust_link)(struct mac_device *mac_dev);
6768
int (*set_promisc)(struct fman_mac *mac_dev, bool enable);
6869
int (*change_addr)(struct fman_mac *mac_dev, enet_addr_t *enet_addr);
70+
int (*set_allmulti)(struct fman_mac *mac_dev, bool enable);
6971
int (*set_multi)(struct net_device *net_dev,
7072
struct mac_device *mac_dev);
7173
int (*set_rx_pause)(struct fman_mac *mac_dev, bool en);

0 commit comments

Comments
 (0)