X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fbus%2Fdpaa%2Fbase%2Ffman%2Ffman.c;h=692071b4b0ac8bc4fc67bd318d5123fe6795d63c;hb=d309785f00bb37b40e19f28147a804052b06a601;hp=bdb70042331706af72205dc3e250fbc6b8741011;hpb=fe33fe37fd8b63e140e9ed91443dc44fa62472d4;p=dpdk.git diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index bdb7004233..692071b4b0 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2010-2016 Freescale Semiconductor Inc. - * Copyright 2017 NXP + * Copyright 2017-2020 NXP * */ @@ -11,8 +11,10 @@ /* This header declares the driver interface we implement */ #include -#include +#include +#include #include +#include #define QMI_PORT_REGS_OFFSET 0x400 @@ -143,6 +145,61 @@ fman_get_mac_index(uint64_t regs_addr_host, uint8_t *mac_idx) return ret; } +static void fman_if_vsp_init(struct __fman_if *__if) +{ + const phandle *prop; + int cell_index; + const struct device_node *dev; + size_t lenp; + const uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1}; + + if (__if->__if.mac_type == fman_mac_1g) { + for_each_compatible_node(dev, NULL, + "fsl,fman-port-1g-rx-extended-args") { + prop = of_get_property(dev, "cell-index", &lenp); + if (prop) { + cell_index = of_read_number( + &prop[0], + lenp / sizeof(phandle)); + if (cell_index == mac_idx[__if->__if.mac_idx]) { + prop = of_get_property( + dev, + "vsp-window", &lenp); + if (prop) { + __if->__if.num_profiles = + of_read_number( + &prop[0], 1); + __if->__if.base_profile_id = + of_read_number( + &prop[1], 1); + } + } + } + } + } else if (__if->__if.mac_type == fman_mac_10g) { + for_each_compatible_node(dev, NULL, + "fsl,fman-port-10g-rx-extended-args") { + prop = of_get_property(dev, "cell-index", &lenp); + if (prop) { + cell_index = of_read_number( + &prop[0], lenp / sizeof(phandle)); + if (cell_index == mac_idx[__if->__if.mac_idx]) { + prop = of_get_property( + dev, "vsp-window", &lenp); + if (prop) { + __if->__if.num_profiles = + of_read_number( + &prop[0], 1); + __if->__if.base_profile_id = + of_read_number( + &prop[1], 1); + } + } + } + } + } +} + static int fman_if_init(const struct device_node *dpa_node) { @@ -154,52 +211,148 @@ fman_if_init(const struct device_node *dpa_node) const phandle *mac_phandle, *ports_phandle, *pools_phandle; const phandle *tx_channel_id = NULL, *mac_addr, *cell_idx; const phandle *rx_phandle, *tx_phandle; + const phandle *port_cell_idx, *ext_args_cell_idx; + const struct device_node *parent_node_ext_args; uint64_t tx_phandle_host[4] = {0}; uint64_t rx_phandle_host[4] = {0}; uint64_t regs_addr_host = 0; uint64_t cell_idx_host = 0; + uint64_t port_cell_idx_val = 0; + uint64_t ext_args_cell_idx_val = 0; - const struct device_node *mac_node = NULL, *tx_node; + const struct device_node *mac_node = NULL, *tx_node, *ext_args_node; const struct device_node *pool_node, *fman_node, *rx_node; const uint32_t *regs_addr = NULL; const char *mname, *fname; const char *dname = dpa_node->full_name; size_t lenp; - int _errno; + int _errno, is_shared = 0; const char *char_prop; uint32_t na; if (of_device_is_available(dpa_node) == false) return 0; + if (!of_device_is_compatible(dpa_node, "fsl,dpa-ethernet-init") && + !of_device_is_compatible(dpa_node, "fsl,dpa-ethernet")) { + return 0; + } + rprop = "fsl,qman-frame-queues-rx"; mprop = "fsl,fman-mac"; - /* Allocate an object for this network interface */ - __if = malloc(sizeof(*__if)); - if (!__if) { - FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if)); - goto err; - } - memset(__if, 0, sizeof(*__if)); - INIT_LIST_HEAD(&__if->__if.bpool_list); - strncpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1); - __if->node_path[PATH_MAX - 1] = '\0'; - /* Obtain the MAC node used by this interface except macless */ mac_phandle = of_get_property(dpa_node, mprop, &lenp); if (!mac_phandle) { FMAN_ERR(-EINVAL, "%s: no %s\n", dname, mprop); - goto err; + return -EINVAL; } assert(lenp == sizeof(phandle)); mac_node = of_find_node_by_phandle(*mac_phandle); if (!mac_node) { FMAN_ERR(-ENXIO, "%s: bad 'fsl,fman-mac\n", dname); - goto err; + return -ENXIO; } mname = mac_node->full_name; + /* Extract the Rx and Tx ports */ + ports_phandle = of_get_property(mac_node, "fsl,port-handles", + &lenp); + if (!ports_phandle) + ports_phandle = of_get_property(mac_node, "fsl,fman-ports", + &lenp); + if (!ports_phandle) { + FMAN_ERR(-EINVAL, "%s: no fsl,port-handles\n", + mname); + return -EINVAL; + } + assert(lenp == (2 * sizeof(phandle))); + rx_node = of_find_node_by_phandle(ports_phandle[0]); + if (!rx_node) { + FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[0]\n", mname); + return -ENXIO; + } + tx_node = of_find_node_by_phandle(ports_phandle[1]); + if (!tx_node) { + FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[1]\n", mname); + return -ENXIO; + } + + /* Check if the port is shared interface */ + if (of_device_is_compatible(dpa_node, "fsl,dpa-ethernet")) { + port_cell_idx = of_get_property(rx_node, "cell-index", &lenp); + if (!port_cell_idx) { + FMAN_ERR(-ENXIO, + "%s: no cell-index for port\n", mname); + return -ENXIO; + } + assert(lenp == sizeof(*port_cell_idx)); + port_cell_idx_val = + of_read_number(port_cell_idx, lenp / sizeof(phandle)); + + if (of_device_is_compatible(rx_node, "fsl,fman-port-1g-rx")) + port_cell_idx_val -= 0x8; + else if (of_device_is_compatible( + rx_node, "fsl,fman-port-10g-rx")) + port_cell_idx_val -= 0x10; + + parent_node_ext_args = of_find_compatible_node(NULL, + NULL, "fsl,fman-extended-args"); + if (!parent_node_ext_args) + return 0; + + for_each_child_node(parent_node_ext_args, ext_args_node) { + ext_args_cell_idx = of_get_property(ext_args_node, + "cell-index", &lenp); + if (!ext_args_cell_idx) { + FMAN_ERR(-ENXIO, + "%s: no cell-index for ext args\n", + mname); + return -ENXIO; + } + assert(lenp == sizeof(*ext_args_cell_idx)); + ext_args_cell_idx_val = + of_read_number(ext_args_cell_idx, lenp / + sizeof(phandle)); + + if (port_cell_idx_val == ext_args_cell_idx_val) { + if (of_device_is_compatible(ext_args_node, + "fsl,fman-port-1g-rx-extended-args") && + of_device_is_compatible(rx_node, + "fsl,fman-port-1g-rx")) { + if (of_get_property(ext_args_node, + "vsp-window", &lenp)) + is_shared = 1; + break; + } + if (of_device_is_compatible(ext_args_node, + "fsl,fman-port-10g-rx-extended-args") && + of_device_is_compatible(rx_node, + "fsl,fman-port-10g-rx")) { + if (of_get_property(ext_args_node, + "vsp-window", &lenp)) + is_shared = 1; + break; + } + } + } + if (!is_shared) + return 0; + } + + /* Allocate an object for this network interface */ + __if = rte_malloc(NULL, sizeof(*__if), RTE_CACHE_LINE_SIZE); + if (!__if) { + FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*__if)); + goto err; + } + memset(__if, 0, sizeof(*__if)); + INIT_LIST_HEAD(&__if->__if.bpool_list); + strlcpy(__if->node_name, dpa_node->name, IF_NAME_MAX_LEN - 1); + __if->node_name[IF_NAME_MAX_LEN - 1] = '\0'; + strlcpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1); + __if->node_path[PATH_MAX - 1] = '\0'; + /* Map the CCSR regs for the MAC node */ regs_addr = of_get_address(mac_node, 0, &__if->regs_size, NULL); if (!regs_addr) { @@ -223,7 +376,6 @@ fman_if_init(const struct device_node *dpa_node) /* Get rid of endianness (issues). Convert to host byte order */ regs_addr_host = of_read_number(regs_addr, na); - /* Get the index of the Fman this i/f belongs to */ fman_node = of_get_parent(mac_node); na = of_n_addr_cells(mac_node); @@ -261,7 +413,7 @@ fman_if_init(const struct device_node *dpa_node) fman_dealloc_bufs_mask_hi = 0; fman_dealloc_bufs_mask_lo = 0; } - /* Is the MAC node 1G, 10G? */ + /* Is the MAC node 1G, 2.5G, 10G? */ __if->__if.is_memac = 0; if (of_device_is_compatible(mac_node, "fsl,fman-1g-mac")) @@ -277,7 +429,9 @@ fman_if_init(const struct device_node *dpa_node) /* Right now forcing memac to 1g in case of error*/ __if->__if.mac_type = fman_mac_1g; } else { - if (strstr(char_prop, "sgmii")) + if (strstr(char_prop, "sgmii-2500")) + __if->__if.mac_type = fman_mac_2_5g; + else if (strstr(char_prop, "sgmii")) __if->__if.mac_type = fman_mac_1g; else if (strstr(char_prop, "rgmii")) { __if->__if.mac_type = fman_mac_1g; @@ -315,25 +469,6 @@ fman_if_init(const struct device_node *dpa_node) } memcpy(&__if->__if.mac_addr, mac_addr, ETHER_ADDR_LEN); - /* Extract the Tx port (it's the second of the two port handles) - * and get its channel ID - */ - ports_phandle = of_get_property(mac_node, "fsl,port-handles", - &lenp); - if (!ports_phandle) - ports_phandle = of_get_property(mac_node, "fsl,fman-ports", - &lenp); - if (!ports_phandle) { - FMAN_ERR(-EINVAL, "%s: no fsl,port-handles\n", - mname); - goto err; - } - assert(lenp == (2 * sizeof(phandle))); - tx_node = of_find_node_by_phandle(ports_phandle[1]); - if (!tx_node) { - FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[1]\n", mname); - goto err; - } /* Extract the channel ID (from tx-port-handle) */ tx_channel_id = of_get_property(tx_node, "fsl,qman-channel-id", &lenp); @@ -343,11 +478,6 @@ fman_if_init(const struct device_node *dpa_node) goto err; } - rx_node = of_find_node_by_phandle(ports_phandle[0]); - if (!rx_node) { - FMAN_ERR(-ENXIO, "%s: bad fsl,port-handle[0]\n", mname); - goto err; - } regs_addr = of_get_address(rx_node, 0, &__if->regs_size, NULL); if (!regs_addr) { FMAN_ERR(-EINVAL, "of_get_address(%s)\n", mname); @@ -381,7 +511,7 @@ fman_if_init(const struct device_node *dpa_node) goto err; } - assert(lenp == (4 * sizeof(phandle))); + assert(lenp >= (4 * sizeof(phandle))); na = of_n_addr_cells(mac_node); /* Get rid of endianness (issues). Convert to host byte order */ @@ -402,7 +532,7 @@ fman_if_init(const struct device_node *dpa_node) goto err; } - assert(lenp == (4 * sizeof(phandle))); + assert(lenp >= (4 * sizeof(phandle))); /*TODO: Fix for other cases also */ na = of_n_addr_cells(mac_node); /* Get rid of endianness (issues). Convert to host byte order */ @@ -432,7 +562,7 @@ fman_if_init(const struct device_node *dpa_node) uint64_t bpool_host[6] = {0}; const char *pname; /* Allocate an object for the pool */ - bpool = malloc(sizeof(*bpool)); + bpool = rte_malloc(NULL, sizeof(*bpool), RTE_CACHE_LINE_SIZE); if (!bpool) { FMAN_ERR(-ENOMEM, "malloc(%zu)\n", sizeof(*bpool)); goto err; @@ -442,7 +572,7 @@ fman_if_init(const struct device_node *dpa_node) if (!pool_node) { FMAN_ERR(-ENXIO, "%s: bad fsl,bman-buffer-pools\n", dname); - free(bpool); + rte_free(bpool); goto err; } pname = pool_node->full_name; @@ -450,7 +580,7 @@ fman_if_init(const struct device_node *dpa_node) prop = of_get_property(pool_node, "fsl,bpid", &proplen); if (!prop) { FMAN_ERR(-EINVAL, "%s: no fsl,bpid\n", pname); - free(bpool); + rte_free(bpool); goto err; } assert(proplen == sizeof(*prop)); @@ -502,6 +632,11 @@ fman_if_init(const struct device_node *dpa_node) pools_phandle++; } + if (is_shared) + __if->__if.is_shared_mac = 1; + + fman_if_vsp_init(__if); + /* Parsing of the network interface is complete, add it to the list */ DPAA_BUS_LOG(DEBUG, "Found %s, Tx Channel = %x, FMAN = %x," "Port ID = %x", @@ -518,7 +653,7 @@ err: int fman_init(void) { - const struct device_node *dpa_node; + const struct device_node *dpa_node, *parent_node; int _errno; /* If multiple dependencies try to initialise the Fman driver, don't @@ -533,7 +668,13 @@ fman_init(void) return fman_ccsr_map_fd; } - for_each_compatible_node(dpa_node, NULL, "fsl,dpa-ethernet-init") { + parent_node = of_find_compatible_node(NULL, NULL, "fsl,dpaa"); + if (!parent_node) { + DPAA_BUS_LOG(ERR, "Unable to find fsl,dpaa node"); + return -ENODEV; + } + + for_each_child_node(parent_node, dpa_node) { _errno = fman_if_init(dpa_node); if (_errno) { FMAN_ERR(_errno, "if_init(%s)\n", dpa_node->full_name); @@ -573,7 +714,7 @@ fman_finish(void) -errno, strerror(errno)); printf("Tearing down %s\n", __if->node_path); list_del(&__if->__if.node); - free(__if); + rte_free(__if); } close(fman_ccsr_map_fd);