git.openwrt.org Git - openwrt/staging/mkresin.git/blob

   1 From c095bbc29eeae597c47c90d41fab472be9e14ca6 Mon Sep 17 00:00:00 2001
   2 From: Camelia Groza <camelia.groza@nxp.com>
   3 Date: Wed, 30 May 2018 15:26:47 +0300
   4 Subject: [PATCH] sdk_dpaa: ceetm: WQ/CEETM mode switchover cleanup
   5
   6 Wait for the WQ TX FQs to empty before switching from WQ to CEETM mode.
   7
   8 Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
   9 ---
  10  .../ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c   | 26 ++++++++++++++++++++++
  11  1 file changed, 26 insertions(+)
  12
  13 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  14 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  15 @@ -65,6 +65,31 @@ static void get_dcp_and_sp(struct net_de
  16         }
  17  }
  18
  19 +/* Wait for the DPAA Eth driver WQ TX FQs to empty */
  20 +static void dpaa_drain_fqs(struct net_device *dev)
  21 +{
  22 +       const struct dpa_priv_s *priv = netdev_priv(dev);
  23 +       struct qm_mcr_queryfq_np np;
  24 +       struct qman_fq *fq;
  25 +       int ret, i;
  26 +
  27 +       for (i = 0; i < DPAA_ETH_TX_QUEUES; i ++) {
  28 +               fq = priv->egress_fqs[i];
  29 +               while (true) {
  30 +                       ret = qman_query_fq_np(fq, &np);
  31 +                       if (unlikely(ret)) {
  32 +                               pr_err(KBUILD_BASENAME
  33 +                                      " : %s : unable to query FQ %x: %d\n",
  34 +                                      __func__, fq->fqid, ret);
  35 +                               break;
  36 +                       }
  37 +
  38 +                       if (np.frm_cnt == 0)
  39 +                               break;
  40 +               }
  41 +       }
  42 +}
  43 +
  44  /* Enqueue Rejection Notification callback */
  45  static void ceetm_ern(struct qman_portal *portal, struct qman_fq *fq,
  46                       const struct qm_mr_entry *msg)
  47 @@ -1103,6 +1128,7 @@ static int ceetm_init(struct Qdisc *sch,
  48         switch (priv->type) {
  49         case CEETM_ROOT:
  50                 netif_tx_stop_all_queues(dev);
  51 +               dpaa_drain_fqs(dev);
  52                 ret = ceetm_init_root(sch, priv, qopt, extack);
  53                 netif_tx_wake_all_queues(dev);
  54                 break;