target/linux/layerscape/patches-5.4/701-net-0365-sdk_dpaa-ceetm-coding-style-cleanup.patch

   1 From fec484580477d93cd69e5355be68e6f5bf1a1e54 Mon Sep 17 00:00:00 2001
   2 From: Camelia Groza <camelia.groza@nxp.com>
   3 Date: Mon, 9 Dec 2019 18:20:05 +0200
   4 Subject: [PATCH] sdk_dpaa: ceetm: coding style cleanup
   5
   6 Fix checkpatch warnings and use reverse Christmas tree variable ordering
   7 throughout the driver.
   8
   9 Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
  10 ---
  11  .../ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c   | 145 +++++++++++----------
  12  1 file changed, 76 insertions(+), 69 deletions(-)
  13
  14 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  15 +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_ceetm.c
  16 @@ -1,4 +1,5 @@
  17  /* Copyright 2008-2016 Freescale Semiconductor Inc.
  18 + * Copyright 2019 NXP
  19   *
  20   * Redistribution and use in source and binary forms, with or without
  21   * modification, are permitted provided that the following conditions are met:
  22 @@ -47,10 +48,10 @@ struct Qdisc_ops ceetm_qdisc_ops;
  23  static void get_dcp_and_sp(struct net_device *dev, enum qm_dc_portal *dcp_id,
  24                            unsigned int *sp_id)
  25  {
  26 -       uint32_t channel;
  27 -       t_LnxWrpFmPortDev *port_dev;
  28         struct dpa_priv_s *dpa_priv = netdev_priv(dev);
  29         struct mac_device *mac_dev = dpa_priv->mac_dev;
  30 +       t_LnxWrpFmPortDev *port_dev;
  31 +       uint32_t channel;
  32
  33         port_dev = (t_LnxWrpFmPortDev *)mac_dev->port_dev[TX];
  34         channel = port_dev->txCh;
  35 @@ -75,7 +76,7 @@ static void dpaa_drain_fqs(struct net_de
  36         struct qman_fq *fq;
  37         int ret, i;
  38
  39 -       for (i = 0; i < DPAA_ETH_TX_QUEUES; i ++) {
  40 +       for (i = 0; i < DPAA_ETH_TX_QUEUES; i++) {
  41                 fq = priv->egress_fqs[i];
  42                 while (true) {
  43                         ret = qman_query_fq_np(fq, &np);
  44 @@ -96,7 +97,7 @@ static void dpaa_drain_fqs(struct net_de
  45  static void ceetm_drain_class(struct ceetm_class *cl)
  46  {
  47         struct qm_mcr_ceetm_cq_query cq_query;
  48 -       struct qm_ceetm_cq *cq;
  49 +       struct qm_ceetm_cq *cq = NULL;
  50         unsigned int idx;
  51         int ret;
  52
  53 @@ -108,10 +109,10 @@ static void ceetm_drain_class(struct cee
  54                 /* The ROOT classes aren't directly linked to CEETM CQs */
  55                 return;
  56         case CEETM_PRIO:
  57 -               cq = (struct qm_ceetm_cq*)cl->prio.cq;
  58 +               cq = (struct qm_ceetm_cq *)cl->prio.cq;
  59                 break;
  60         case CEETM_WBFS:
  61 -               cq = (struct qm_ceetm_cq*)cl->wbfs.cq;
  62 +               cq = (struct qm_ceetm_cq *)cl->wbfs.cq;
  63                 break;
  64         }
  65
  66 @@ -190,10 +191,14 @@ static void ceetm_ern(struct qman_portal
  67  /* Congestion State Change Notification callback */
  68  static void ceetm_cscn(struct qm_ceetm_ccg *ccg, void *cb_ctx, int congested)
  69  {
  70 -       struct ceetm_fq *ceetm_fq = (struct ceetm_fq *)cb_ctx;
  71 -       struct dpa_priv_s *dpa_priv = netdev_priv(ceetm_fq->net_dev);
  72 -       struct ceetm_class *cls = ceetm_fq->ceetm_cls;
  73         struct ceetm_class_stats *cstats = NULL;
  74 +       struct dpa_priv_s *dpa_priv;
  75 +       struct ceetm_fq *ceetm_fq;
  76 +       struct ceetm_class *cls;
  77 +
  78 +       ceetm_fq = (struct ceetm_fq *)cb_ctx;
  79 +       dpa_priv = netdev_priv(ceetm_fq->net_dev);
  80 +       cls = ceetm_fq->ceetm_cls;
  81
  82         switch (cls->type) {
  83         case CEETM_PRIO:
  84 @@ -236,10 +241,10 @@ static int ceetm_config_ccg(struct qm_ce
  85                             struct qm_ceetm_channel *channel, unsigned int id,
  86                             struct ceetm_fq *fq, struct dpa_priv_s *dpa_priv)
  87  {
  88 -       int err;
  89 -       u32 cs_th;
  90 -       u16 ccg_mask;
  91         struct qm_ceetm_ccg_params ccg_params;
  92 +       u16 ccg_mask;
  93 +       u32 cs_th;
  94 +       int err;
  95
  96         err = qman_ceetm_ccg_claim(ccg, channel, id, ceetm_cscn, fq);
  97         if (err)
  98 @@ -284,9 +289,9 @@ static int ceetm_config_ccg(struct qm_ce
  99  static int ceetm_config_lfq(struct qm_ceetm_cq *cq, struct ceetm_fq *fq,
 100                             struct qm_ceetm_lfq **lfq)
 101  {
 102 -       int err;
 103         u64 context_a;
 104         u32 context_b;
 105 +       int err;
 106
 107         err = qman_ceetm_lfq_claim(lfq, cq);
 108         if (err)
 109 @@ -316,8 +321,8 @@ static int ceetm_config_prio_cls(struct
 110                                  struct net_device *dev,
 111                                  unsigned int id)
 112  {
 113 -       int err;
 114         struct dpa_priv_s *dpa_priv = netdev_priv(dev);
 115 +       int err;
 116
 117         err = ceetm_alloc_fq(&cls->prio.fq, dev, cls);
 118         if (err)
 119 @@ -357,8 +362,8 @@ static int ceetm_config_wbfs_cls(struct
 120                                  struct net_device *dev,
 121                                  unsigned int id, int type)
 122  {
 123 -       int err;
 124         struct dpa_priv_s *dpa_priv = netdev_priv(dev);
 125 +       int err;
 126
 127         err = ceetm_alloc_fq(&cls->wbfs.fq, dev, cls);
 128         if (err)
 129 @@ -517,11 +522,11 @@ static void ceetm_cls_destroy(struct Qdi
 130  /* Destroy a ceetm qdisc */
 131  static void ceetm_destroy(struct Qdisc *sch)
 132  {
 133 -       unsigned int ntx, i;
 134 -       struct hlist_node *next;
 135 -       struct ceetm_class *cl;
 136         struct ceetm_qdisc *priv = qdisc_priv(sch);
 137         struct net_device *dev = qdisc_dev(sch);
 138 +       struct hlist_node *next;
 139 +       struct ceetm_class *cl;
 140 +       unsigned int ntx, i;
 141
 142         pr_debug(KBUILD_BASENAME " : %s : destroy qdisc %X\n",
 143                  __func__, sch->handle);
 144 @@ -592,13 +597,13 @@ static void ceetm_destroy(struct Qdisc *
 145
 146  static int ceetm_dump(struct Qdisc *sch, struct sk_buff *skb)
 147  {
 148 +       struct ceetm_qdisc *priv = qdisc_priv(sch);
 149 +       struct net_device *dev = qdisc_dev(sch);
 150 +       struct ceetm_qdisc_stats *qstats;
 151 +       struct tc_ceetm_qopt qopt;
 152         struct Qdisc *qdisc;
 153         unsigned int ntx, i;
 154         struct nlattr *nest;
 155 -       struct tc_ceetm_qopt qopt;
 156 -       struct ceetm_qdisc_stats *qstats;
 157 -       struct net_device *dev = qdisc_dev(sch);
 158 -       struct ceetm_qdisc *priv = qdisc_priv(sch);
 159
 160         pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
 161
 162 @@ -673,17 +678,20 @@ static int ceetm_init_root(struct Qdisc
 163                            struct tc_ceetm_qopt *qopt,
 164                            struct netlink_ext_ack *extack)
 165  {
 166 +       struct net_device *dev = qdisc_dev(sch);
 167 +       unsigned int i, sp_id, parent_id;
 168         struct netdev_queue *dev_queue;
 169 -       struct Qdisc *qdisc;
 170 +       struct dpa_priv_s *dpa_priv;
 171 +       struct mac_device *mac_dev;
 172         enum qm_dc_portal dcp_id;
 173 -       unsigned int i, sp_id, parent_id;
 174 +       struct qm_ceetm_lni *lni;
 175 +       struct qm_ceetm_sp *sp;
 176 +       struct Qdisc *qdisc;
 177         int err;
 178         u64 bps;
 179 -       struct qm_ceetm_sp *sp;
 180 -       struct qm_ceetm_lni *lni;
 181 -       struct net_device *dev = qdisc_dev(sch);
 182 -       struct dpa_priv_s *dpa_priv = netdev_priv(dev);
 183 -       struct mac_device *mac_dev = dpa_priv->mac_dev;
 184 +
 185 +       dpa_priv = netdev_priv(dev);
 186 +       mac_dev = dpa_priv->mac_dev;
 187
 188         pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
 189
 190 @@ -711,9 +719,8 @@ static int ceetm_init_root(struct Qdisc
 191         priv->root.qdiscs = kcalloc(dev->num_tx_queues,
 192                                     sizeof(priv->root.qdiscs[0]),
 193                                     GFP_KERNEL);
 194 -       if (!priv->root.qdiscs) {
 195 +       if (!priv->root.qdiscs)
 196                 return -ENOMEM;
 197 -       }
 198
 199         for (i = 0; i < dev->num_tx_queues; i++) {
 200                 dev_queue = netdev_get_tx_queue(dev, i);
 201 @@ -811,11 +818,11 @@ static int ceetm_init_root(struct Qdisc
 202  static int ceetm_init_prio(struct Qdisc *sch, struct ceetm_qdisc *priv,
 203                            struct tc_ceetm_qopt *qopt)
 204  {
 205 -       int err;
 206 -       unsigned int i;
 207         struct ceetm_class *parent_cl, *child_cl;
 208         struct net_device *dev = qdisc_dev(sch);
 209         struct Qdisc *root_qdisc = dev->qdisc;
 210 +       unsigned int i;
 211 +       int err;
 212
 213         pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
 214
 215 @@ -852,11 +859,8 @@ static int ceetm_init_prio(struct Qdisc
 216         /* Create and configure qcount child classes */
 217         for (i = 0; i < priv->prio.qcount; i++) {
 218                 child_cl = kzalloc(sizeof(*child_cl), GFP_KERNEL);
 219 -               if (!child_cl) {
 220 -                       pr_err(KBUILD_BASENAME " : %s : kzalloc() failed\n",
 221 -                              __func__);
 222 +               if (!child_cl)
 223                         return -ENOMEM;
 224 -               }
 225
 226                 child_cl->prio.cstats = alloc_percpu(struct ceetm_class_stats);
 227                 if (!child_cl->prio.cstats) {
 228 @@ -906,12 +910,12 @@ err_init_prio_cls:
 229  static int ceetm_init_wbfs(struct Qdisc *sch, struct ceetm_qdisc *priv,
 230                            struct tc_ceetm_qopt *qopt)
 231  {
 232 -       int err, group_b, small_group;
 233 -       unsigned int i, id, prio_a, prio_b;
 234         struct ceetm_class *parent_cl, *child_cl, *tmp_cl, *root_cl = NULL;
 235         struct Qdisc *root_qdisc, *parent_qdisc = NULL;
 236 -       struct ceetm_qdisc *root_priv;
 237         struct net_device *dev = qdisc_dev(sch);
 238 +       unsigned int i, id, prio_a, prio_b;
 239 +       int err, group_b, small_group;
 240 +       struct ceetm_qdisc *root_priv;
 241
 242         pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
 243
 244 @@ -1070,11 +1074,8 @@ static int ceetm_init_wbfs(struct Qdisc
 245         /* Create qcount child classes */
 246         for (i = 0; i < priv->wbfs.qcount; i++) {
 247                 child_cl = kzalloc(sizeof(*child_cl), GFP_KERNEL);
 248 -               if (!child_cl) {
 249 -                       pr_err(KBUILD_BASENAME " : %s : kzalloc() failed\n",
 250 -                              __func__);
 251 +               if (!child_cl)
 252                         return -ENOMEM;
 253 -               }
 254
 255                 child_cl->wbfs.cstats = alloc_percpu(struct ceetm_class_stats);
 256                 if (!child_cl->wbfs.cstats) {
 257 @@ -1138,11 +1139,11 @@ err_init_wbfs_cls:
 258  static int ceetm_init(struct Qdisc *sch, struct nlattr *opt,
 259                       struct netlink_ext_ack *extack)
 260  {
 261 -       struct tc_ceetm_qopt *qopt;
 262 -       struct nlattr *tb[TCA_CEETM_QOPS + 1];
 263 -       int ret;
 264         struct ceetm_qdisc *priv = qdisc_priv(sch);
 265         struct net_device *dev = qdisc_dev(sch);
 266 +       struct nlattr *tb[TCA_CEETM_QOPS + 1];
 267 +       struct tc_ceetm_qopt *qopt;
 268 +       int ret;
 269
 270         pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
 271
 272 @@ -1158,7 +1159,8 @@ static int ceetm_init(struct Qdisc *sch,
 273         if (ret)
 274                 return ret;
 275
 276 -       ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
 277 +       ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt,
 278 +                                         ceetm_policy, NULL);
 279         if (ret < 0) {
 280                 pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
 281                 return ret;
 282 @@ -1265,8 +1267,8 @@ change_err:
 283  static int ceetm_change_wbfs(struct Qdisc *sch, struct ceetm_qdisc *priv,
 284                              struct tc_ceetm_qopt *qopt)
 285  {
 286 -       int err;
 287         bool group_b;
 288 +       int err;
 289
 290         if (qopt->qcount) {
 291                 pr_err("CEETM: the qcount can not be modified\n");
 292 @@ -1324,15 +1326,16 @@ change_err:
 293  static int ceetm_change(struct Qdisc *sch, struct nlattr *opt,
 294                         struct netlink_ext_ack *extack)
 295  {
 296 -       struct tc_ceetm_qopt *qopt;
 297 -       struct nlattr *tb[TCA_CEETM_QOPS + 1];
 298 -       int ret;
 299         struct ceetm_qdisc *priv = qdisc_priv(sch);
 300         struct net_device *dev = qdisc_dev(sch);
 301 +       struct nlattr *tb[TCA_CEETM_QOPS + 1];
 302 +       struct tc_ceetm_qopt *qopt;
 303 +       int ret;
 304
 305         pr_debug(KBUILD_BASENAME " : %s : qdisc %X\n", __func__, sch->handle);
 306
 307 -       ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt, ceetm_policy, NULL);
 308 +       ret = nla_parse_nested_deprecated(tb, TCA_CEETM_QOPS, opt,
 309 +                                         ceetm_policy, NULL);
 310         if (ret < 0) {
 311                 pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
 312                 return ret;
 313 @@ -1381,8 +1384,8 @@ static int ceetm_change(struct Qdisc *sc
 314   */
 315  static void ceetm_attach(struct Qdisc *sch)
 316  {
 317 -       struct net_device *dev = qdisc_dev(sch);
 318         struct ceetm_qdisc *priv = qdisc_priv(sch);
 319 +       struct net_device *dev = qdisc_dev(sch);
 320         struct Qdisc *qdisc, *old_qdisc;
 321         unsigned int i;
 322
 323 @@ -1461,8 +1464,8 @@ static int ceetm_cls_change_prio(struct
 324         }
 325
 326         if (cl->prio.cr != (bool)copt->cr) {
 327 -               err = qman_ceetm_channel_set_cq_cr_eligibility(
 328 -                                               cl->prio.cq->parent,
 329 +               err = qman_ceetm_channel_set_cq_cr_eligibility
 330 +                                               (cl->prio.cq->parent,
 331                                                 cl->prio.cq->idx,
 332                                                 copt->cr);
 333                 if (err)
 334 @@ -1471,8 +1474,8 @@ static int ceetm_cls_change_prio(struct
 335         }
 336
 337         if (cl->prio.er != (bool)copt->er) {
 338 -               err = qman_ceetm_channel_set_cq_er_eligibility(
 339 -                                               cl->prio.cq->parent,
 340 +               err = qman_ceetm_channel_set_cq_er_eligibility
 341 +                                               (cl->prio.cq->parent,
 342                                                 cl->prio.cq->idx,
 343                                                 copt->er);
 344                 if (err)
 345 @@ -1517,15 +1520,15 @@ static int ceetm_cls_change(struct Qdisc
 346                             struct nlattr **tca, unsigned long *arg,
 347                             struct netlink_ext_ack *extack)
 348  {
 349 -       int err;
 350 -       u64 bps;
 351 -       struct ceetm_qdisc *priv;
 352         struct ceetm_class *cl = (struct ceetm_class *)*arg;
 353 +       struct net_device *dev = qdisc_dev(sch);
 354         struct nlattr *opt = tca[TCA_OPTIONS];
 355         struct nlattr *tb[__TCA_CEETM_MAX];
 356 -       struct tc_ceetm_copt *copt;
 357         struct qm_ceetm_channel *channel;
 358 -       struct net_device *dev = qdisc_dev(sch);
 359 +       struct tc_ceetm_copt *copt;
 360 +       struct ceetm_qdisc *priv;
 361 +       int err;
 362 +       u64 bps;
 363
 364         pr_debug(KBUILD_BASENAME " : %s : classid %X under qdisc %X\n",
 365                  __func__, classid, sch->handle);
 366 @@ -1552,7 +1555,8 @@ static int ceetm_cls_change(struct Qdisc
 367                 return -EINVAL;
 368         }
 369
 370 -       err = nla_parse_nested_deprecated(tb, TCA_CEETM_COPT, opt, ceetm_policy, NULL);
 371 +       err = nla_parse_nested_deprecated(tb, TCA_CEETM_COPT, opt,
 372 +                                         ceetm_policy, NULL);
 373         if (err < 0) {
 374                 pr_err(KBUILD_BASENAME " : %s : tc error\n", __func__);
 375                 return -EINVAL;
 376 @@ -1714,8 +1718,8 @@ static int ceetm_cls_dump(struct Qdisc *
 377                           struct sk_buff *skb, struct tcmsg *tcm)
 378  {
 379         struct ceetm_class *cl = (struct ceetm_class *)arg;
 380 -       struct nlattr *nest;
 381         struct tc_ceetm_copt copt;
 382 +       struct nlattr *nest;
 383
 384         pr_debug(KBUILD_BASENAME " : %s : class %X under qdisc %X\n",
 385                  __func__, cl->common.classid, sch->handle);
 386 @@ -1770,8 +1774,8 @@ nla_put_failure:
 387
 388  static int ceetm_cls_delete(struct Qdisc *sch, unsigned long arg)
 389  {
 390 -       struct ceetm_qdisc *priv = qdisc_priv(sch);
 391         struct ceetm_class *cl = (struct ceetm_class *)arg;
 392 +       struct ceetm_qdisc *priv = qdisc_priv(sch);
 393
 394         pr_debug(KBUILD_BASENAME " : %s : class %X under qdisc %X\n",
 395                  __func__, cl->common.classid, sch->handle);
 396 @@ -1818,12 +1822,12 @@ static int ceetm_cls_graft(struct Qdisc
 397  static int ceetm_cls_dump_stats(struct Qdisc *sch, unsigned long arg,
 398                                 struct gnet_dump *d)
 399  {
 400 -       unsigned int i;
 401         struct ceetm_class *cl = (struct ceetm_class *)arg;
 402         struct gnet_stats_basic_packed tmp_bstats;
 403         struct ceetm_class_stats *cstats = NULL;
 404         struct qm_ceetm_cq *cq = NULL;
 405         struct tc_ceetm_xstats xstats;
 406 +       unsigned int i;
 407
 408         memset(&xstats, 0, sizeof(xstats));
 409         memset(&tmp_bstats, 0, sizeof(tmp_bstats));
 410 @@ -1872,9 +1876,11 @@ static int ceetm_cls_dump_stats(struct Q
 411  static struct tcf_block *ceetm_tcf_block(struct Qdisc *sch, unsigned long arg,
 412                                          struct netlink_ext_ack *extack)
 413  {
 414 -       struct ceetm_qdisc *priv = qdisc_priv(sch);
 415         struct ceetm_class *cl = (struct ceetm_class *)arg;
 416 -       struct tcf_block *block = cl ? cl->block : priv->block;
 417 +       struct ceetm_qdisc *priv = qdisc_priv(sch);
 418 +       struct tcf_block *block;
 419 +
 420 +       block = cl ? cl->block : priv->block;
 421
 422         pr_debug(KBUILD_BASENAME " : %s : class %X under qdisc %X\n", __func__,
 423                  cl ? cl->common.classid : 0, sch->handle);
 424 @@ -1945,6 +1951,7 @@ static struct ceetm_class *ceetm_classif
 425                 case TC_ACT_STOLEN:
 426                 case TC_ACT_TRAP:
 427                         *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
 428 +                       /* fall through */
 429                 case TC_ACT_SHOT:
 430                         /* No valid class found due to action */
 431                         *act_drop = true;