bus/dpaa: enable link state interrupt

[dpdk.git] / drivers / bus / dpaa / base / fman / netcfg_layer.c

diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 26cff84..b7009f2 100644 (file)
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -1,44 +1,11 @@
-/*-
- * This file is provided under a dual BSD/GPLv2 license. When using or
- * redistributing this file, you may do so under either license.
- *
- *   BSD LICENSE
+/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
  *
  * Copyright 2010-2016 Freescale Semiconductor Inc.
- * Copyright 2017 NXP.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the above-listed copyright holders nor the
- * names of any contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *   GPL LICENSE SUMMARY
+ * Copyright 2017-2019 NXP
  *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <inttypes.h>
-#include <of.h>
+#include <dpaa_of.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <error.h>
@@ -51,15 +18,10 @@
 #include <rte_dpaa_logs.h>
 #include <netcfg.h>
 
-/* Structure contains information about all the interfaces given by user
- * on command line.
- */
-struct netcfg_interface *netcfg_interface;
-
 /* This data structure contaings all configurations information
  * related to usages of DPA devices.
  */
-struct netcfg_info *netcfg;
+static struct netcfg_info *netcfg;
 /* fd to open a socket for making ioctl request to disable/enable shared
  *  interfaces.
  */
@@ -82,7 +44,8 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
 
                printf("\n+ Fman %d, MAC %d (%s);\n",
                       __if->fman_idx, __if->mac_idx,
-                      (__if->mac_type == fman_mac_1g) ? "1G" : "10G");
+                      (__if->mac_type == fman_mac_1g) ? "1G" :
+                      (__if->mac_type == fman_mac_2_5g) ? "2.5G" : "10G");
 
                printf("\tmac_addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
                       (&__if->mac_addr)->addr_bytes[0],
@@ -109,22 +72,6 @@ dump_netcfg(struct netcfg_info *cfg_ptr)
 }
 #endif /* RTE_LIBRTE_DPAA_DEBUG_DRIVER */
 
-static inline int
-get_num_netcfg_interfaces(char *str)
-{
-       char *pch;
-       uint8_t count = 0;
-
-       if (str == NULL)
-               return -EINVAL;
-       pch = strtok(str, ",");
-       while (pch != NULL) {
-               count++;
-               pch = strtok(NULL, ",");
-       }
-       return count;
-}
-
 struct netcfg_info *
 netcfg_acquire(void)
 {
@@ -168,7 +115,7 @@ netcfg_acquire(void)
        size = sizeof(*netcfg) +
                (num_ports * sizeof(struct fm_eth_port_cfg));
 
-       netcfg = calloc(1, size);
+       netcfg = rte_calloc(NULL, 1, size, 0);
        if (unlikely(netcfg == NULL)) {
                DPAA_BUS_LOG(ERR, "Unable to allocat mem for netcfg");
                goto error;
@@ -195,7 +142,7 @@ netcfg_acquire(void)
 
 error:
        if (netcfg) {
-               free(netcfg);
+               rte_free(netcfg);
                netcfg = NULL;
        }
 
@@ -205,7 +152,7 @@ error:
 void
 netcfg_release(struct netcfg_info *cfg_ptr)
 {
-       free(cfg_ptr);
+       rte_free(cfg_ptr);
        /* Close socket for shared interfaces */
        if (skfd >= 0) {
                close(skfd);