lkml.org 
[lkml]   [2016]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v10 03/22] IB/hns: Add initial main frame driver and get cfg info
    On Thu, Jun 16, 2016 at 10:35:11PM +0800, Lijun Ou wrote:
    > This patch mainly added the initial bare main driver. It
    > could get the relative configure information of net node.
    >
    > Signed-off-by: Wei Hu <xavier.huwei@huawei.com>
    > Signed-off-by: Nenglong Zhao <zhaonenglong@hisilicon.com>
    > Signed-off-by: Lijun Ou <oulijun@huawei.com>
    > ---
    > PATCH v9:
    > This fixes comments given by Leon Romanovsky over the PATCH v8:
    > Link: https://lkml.org/lkml/2016/6/9/56
    >
    > PATCH v8/v7/v6:
    > - No change over the PATCH v5
    >
    > PATCH v5:
    > - The initial patch which was redesigned based on the second patch
    > in PATCH v4
    > ---
    > ---
    > drivers/infiniband/hw/hns/hns_roce_device.h | 73 ++++++++++
    > drivers/infiniband/hw/hns/hns_roce_main.c | 200 ++++++++++++++++++++++++++++
    > 2 files changed, 273 insertions(+)
    > create mode 100644 drivers/infiniband/hw/hns/hns_roce_device.h
    > create mode 100644 drivers/infiniband/hw/hns/hns_roce_main.c
    >
    > diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
    > new file mode 100644
    > index 0000000..946b470
    > --- /dev/null
    > +++ b/drivers/infiniband/hw/hns/hns_roce_device.h
    > @@ -0,0 +1,73 @@
    > +/*
    > + * Copyright (c) 2016 Hisilicon Limited.
    > + *
    > + * This software is available to you under a choice of one of two
    > + * licenses. You may choose to be licensed under the terms of the GNU
    > + * General Public License (GPL) Version 2, available from the file
    > + * COPYING in the main directory of this source tree, or the
    > + * OpenIB.org BSD license below:
    > + *
    > + * 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.
    > + *
    > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
    > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
    > + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
    > + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    > + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    > + * SOFTWARE.
    > + */
    > +
    > +#ifndef _HNS_ROCE_DEVICE_H
    > +#define _HNS_ROCE_DEVICE_H
    > +
    > +#include <linux/platform_device.h>
    > +#include <linux/radix-tree.h>
    > +#include <linux/semaphore.h>
    > +#include <rdma/ib_addr.h>
    > +#include <rdma/ib_smi.h>
    > +#include <rdma/ib_umem.h>
    > +#include <rdma/ib_user_verbs.h>
    > +#include <rdma/ib_verbs.h>
    > +
    > +#define DRV_NAME "hns_roce"
    > +
    > +#define HNS_ROCE_MAX_IRQ_NUM 34
    > +#define HNS_ROCE_MAX_PORTS 6
    > +
    > +struct hns_roce_ib_iboe {
    > + struct net_device *netdevs[HNS_ROCE_MAX_PORTS];
    > + u8 phy_port[HNS_ROCE_MAX_PORTS];
    > +};
    > +
    > +struct hns_roce_caps {
    > + u8 num_ports;
    > +};
    > +
    > +struct hns_roce_dev {
    > + struct ib_device ib_dev;
    > + struct platform_device *pdev;
    > + const char *irq_names;
    > + struct hns_roce_ib_iboe iboe;
    > +
    > + int irq[HNS_ROCE_MAX_IRQ_NUM];
    > + u8 __iomem *reg_base;
    > + struct hns_roce_caps caps;
    > +
    > + int cmd_mod;
    > + int loop_idc;
    > +};
    > +
    > +#endif /* _HNS_ROCE_DEVICE_H */
    > diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
    > new file mode 100644
    > index 0000000..8924ce3
    > --- /dev/null
    > +++ b/drivers/infiniband/hw/hns/hns_roce_main.c
    > @@ -0,0 +1,200 @@
    > +/*
    > + * Copyright (c) 2016 Hisilicon Limited.
    > + * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
    > + *
    > + * This software is available to you under a choice of one of two
    > + * licenses. You may choose to be licensed under the terms of the GNU
    > + * General Public License (GPL) Version 2, available from the file
    > + * COPYING in the main directory of this source tree, or the
    > + * OpenIB.org BSD license below:
    > + *
    > + * 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.
    > + *
    > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    > + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
    > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
    > + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
    > + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    > + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    > + * SOFTWARE.
    > + */
    > +
    > +#include <linux/cdev.h>
    > +#include <linux/delay.h>
    > +#include <linux/device.h>
    > +#include <linux/dma-mapping.h>
    > +#include <linux/ethtool.h>
    > +#include <linux/etherdevice.h>
    > +#include <linux/fs.h>
    > +#include <linux/init.h>
    > +#include <linux/interrupt.h>
    > +#include <linux/kernel.h>
    > +#include <linux/list.h>
    > +#include <linux/module.h>
    > +#include <linux/netdevice.h>
    > +#include <linux/of.h>
    > +#include <linux/of_address.h>
    > +#include <linux/of_net.h>
    > +#include <linux/of_platform.h>
    > +#include <linux/platform_device.h>
    > +#include <linux/slab.h>
    > +#include <net/ipv6.h>
    > +#include <net/addrconf.h>
    > +#include <rdma/ib_addr.h>
    > +#include <rdma/ib_smi.h>
    > +#include <rdma/ib_umem.h>
    > +#include <rdma/ib_user_verbs.h>
    > +#include <rdma/ib_verbs.h>
    > +#include "hns_roce_device.h"

    Most of the headers are not needed here.
    Please clean them.

    > +
    > +static int hns_roce_get_cfg(struct hns_roce_dev *hr_dev)
    > +{
    > + int i;
    > + u8 phy_port;
    > + int port_cnt = 0;
    > + struct device *dev = &hr_dev->pdev->dev;
    > + struct device_node *np = dev->of_node;
    > + struct device_node *net_node;
    > + struct net_device *netdev = NULL;
    > + struct platform_device *pdev = NULL;
    > + struct resource *res;
    > +
    > + if (!of_device_is_compatible(np, "hisilicon,hns-roce-v1")) {
    > + dev_err(dev, "device no compatible!\n");
    > + return -EINVAL;
    > + }
    > +
    > + res = platform_get_resource(hr_dev->pdev, IORESOURCE_MEM, 0);
    > + hr_dev->reg_base = devm_ioremap_resource(dev, res);
    > + if (!hr_dev->reg_base)
    > + return -ENOMEM;
    > +
    > + for (i = 0; i < HNS_ROCE_MAX_PORTS; i++) {
    > + net_node = of_parse_phandle(np, "eth-handle", i);
    > + if (net_node) {
    > + pdev = of_find_device_by_node(net_node);
    > + netdev = platform_get_drvdata(pdev);
    > + phy_port = (u8)i;
    > + if (netdev) {
    > + hr_dev->iboe.netdevs[port_cnt] = netdev;
    > + hr_dev->iboe.phy_port[port_cnt] = phy_port;
    > + } else {
    > + return -ENODEV;
    > + }
    > + port_cnt++;
    > + }
    > + }

    Do you want to check port_cnt value, before continue?

    > +
    > + hr_dev->caps.num_ports = port_cnt;
    > +
    > + /* Cmd issue mode: 0 is poll, 1 is event */
    > + hr_dev->cmd_mod = 1;
    > + hr_dev->loop_idc = 0;
    > +
    > + for (i = 0; i < HNS_ROCE_MAX_IRQ_NUM; i++) {
    > + hr_dev->irq[i] = platform_get_irq(hr_dev->pdev, i);
    > + if (hr_dev->irq[i] <= 0) {
    > + dev_err(dev, "Get No.%d irq resource failed!\n", i);
    > + return -EINVAL;
    > + }
    > +
    > + if (of_property_read_string_index(np, "interrupt-names", i,
    > + &hr_dev->irq_names))
    > + return -EINVAL;
    > + }
    > +
    > + return 0;
    > +}
    > +
    > +/**
    > +* hns_roce_probe - RoCE driver entrance
    > +* @pdev: pointer to platform device
    > +* Return : int
    > +*
    > +*/
    > +static int hns_roce_probe(struct platform_device *pdev)
    > +{
    > + int ret;
    > + struct hns_roce_dev *hr_dev;
    > + struct device *dev = &pdev->dev;
    > +
    > + hr_dev = (struct hns_roce_dev *)ib_alloc_device(sizeof(*hr_dev));
    > + if (!hr_dev)
    > + return -ENOMEM;
    > +
    > + memset((u8 *)hr_dev + sizeof(struct ib_device), 0,
    > + sizeof(struct hns_roce_dev) - sizeof(struct ib_device));
    > +
    > + hr_dev->pdev = pdev;
    > + platform_set_drvdata(pdev, hr_dev);
    > +
    > + if (!dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64ULL)))
    > + dev_info(dev, "set mask to 64bit\n");
    > + else if (!dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32ULL)))
    > + dev_info(dev, "set mask to 32bit\n");
    > + else {
    > + dev_err(dev, "No usable DMA addressing mode\n");

    Can you please use one style in your prints "set mask..." vs. "No usable
    .."?

    > + ret = -EIO;
    > + goto error_failed_get_cfg;
    > + }
    > +
    > + ret = hns_roce_get_cfg(hr_dev);
    > + if (ret) {
    > + dev_err(dev, "Get Configuration failed!\n");
    > + goto error_failed_get_cfg;
    > + }
    > +
    > +error_failed_get_cfg:
    > + ib_dealloc_device(&hr_dev->ib_dev);
    > +
    > + return ret;
    > +}
    > +
    > +/**
    > +* hns_roce_remove - remove roce device
    > +* @pdev: pointer to platform device
    > +*/
    > +static int hns_roce_remove(struct platform_device *pdev)
    > +{
    > + struct hns_roce_dev *hr_dev = platform_get_drvdata(pdev);
    > +
    > + ib_dealloc_device(&hr_dev->ib_dev);
    > +
    > + return 0;
    > +}
    > +
    > +static const struct of_device_id hns_roce_of_match[] = {
    > + { .compatible = "hisilicon,hns-roce-v1",},
    > + {},
    > +};
    > +MODULE_DEVICE_TABLE(of, hns_roce_of_match);
    > +
    > +static struct platform_driver hns_roce_driver = {
    > + .probe = hns_roce_probe,
    > + .remove = hns_roce_remove,
    > + .driver = {
    > + .name = DRV_NAME,
    > + .of_match_table = hns_roce_of_match,
    > + },
    > +};
    > +
    > +module_platform_driver(hns_roce_driver);
    > +
    > +MODULE_LICENSE("GPL v2");

    I'm not a lawyer and don't know if relicensing is possible, but original
    code (mlx4) was licensed under GPL/BSD.

    > +MODULE_AUTHOR("Wei Hu <xavier.huwei@huawei.com>");
    > +MODULE_AUTHOR("Nenglong Zhao <zhaonenglong@hisilicon.com>");
    > +MODULE_AUTHOR("Lijun Ou <oulijun@huawei.com>");
    > +MODULE_DESCRIPTION("HISILICON RoCE driver");
    > +MODULE_ALIAS("platform:" DRV_NAME);

    Is this alias needed? Did you check it? Will it concatenate strings?

    > --
    > 1.9.1
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2016-06-24 14:41    [W:6.763 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site