Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25a3ba61 authored by Aviad Krawczyk's avatar Aviad Krawczyk Committed by David S. Miller
Browse files

net-next/hinic: Add port management commands 



Add the port management commands that are sent as management messages.
The port management commands are used for netdev operations.

Signed-off-by: default avatarAviad Krawczyk <aviad.krawczyk@huawei.com>
Signed-off-by: default avatarZhao Chen <zhaochen6@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f00fe738

drivers/net/ethernet/huawei/hinic/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_HINIC) += hinic.o



hinic-y := hinic_main.o hinic_hw_dev.o hinic_hw_mgmt.o hinic_hw_api_cmd.o \

	   hinic_hw_eqs.o hinic_hw_if.o
 
hinic-y := hinic_main.o hinic_port.o hinic_hw_dev.o hinic_hw_mgmt.o \

	   hinic_hw_api_cmd.o hinic_hw_eqs.o hinic_hw_if.o

drivers/net/ethernet/huawei/hinic/hinic_dev.h

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <linux/netdevice.h>

#include <linux/types.h>

#include <linux/semaphore.h>



#include "hinic_hw_dev.h"
@@ -28,6 +29,9 @@ struct hinic_dev { 
	struct hinic_hwdev              *hwdev;



	u32                             msg_enable;



	struct semaphore                mgmt_lock;

	unsigned long                   *vlan_bitmap;

};



#endif

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c

+30 −0
Original line number Diff line number Diff line
@@ -199,6 +199,36 @@ static void disable_msix(struct hinic_hwdev *hwdev) 
	pci_disable_msix(pdev);

}



/**

 * hinic_port_msg_cmd - send port msg to mgmt

 * @hwdev: the NIC HW device

 * @cmd: the port command

 * @buf_in: input buffer

 * @in_size: input size

 * @buf_out: output buffer

 * @out_size: returned output size

 *

 * Return 0 - Success, negative - Failure

 **/

int hinic_port_msg_cmd(struct hinic_hwdev *hwdev, enum hinic_port_cmd cmd,

		       void *buf_in, u16 in_size, void *buf_out, u16 *out_size)

{

	struct hinic_hwif *hwif = hwdev->hwif;

	struct pci_dev *pdev = hwif->pdev;

	struct hinic_pfhwdev *pfhwdev;



	if (!HINIC_IS_PF(hwif) && !HINIC_IS_PPF(hwif)) {

		dev_err(&pdev->dev, "unsupported PCI Function type\n");

		return -EINVAL;

	}



	pfhwdev = container_of(hwdev, struct hinic_pfhwdev, hwdev);



	return hinic_msg_to_mgmt(&pfhwdev->pf_to_mgmt, HINIC_MOD_L2NIC, cmd,

				 buf_in, in_size, buf_out, out_size,

				 HINIC_MGMT_MSG_SYNC);

}



/**

 * init_pfhwdev - Initialize the extended components of PF

 * @pfhwdev: the HW device for PF

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h

+29 −0
Original line number Diff line number Diff line
@@ -30,6 +30,31 @@ struct hinic_cap { 
	u16     num_qps;

};



enum hinic_port_cmd {

	HINIC_PORT_CMD_CHANGE_MTU       = 2,



	HINIC_PORT_CMD_ADD_VLAN         = 3,

	HINIC_PORT_CMD_DEL_VLAN         = 4,



	HINIC_PORT_CMD_SET_MAC          = 9,

	HINIC_PORT_CMD_GET_MAC          = 10,

	HINIC_PORT_CMD_DEL_MAC          = 11,



	HINIC_PORT_CMD_SET_RX_MODE      = 12,



	HINIC_PORT_CMD_GET_LINK_STATE   = 24,



	HINIC_PORT_CMD_SET_PORT_STATE   = 41,



	HINIC_PORT_CMD_FWCTXT_INIT      = 69,



	HINIC_PORT_CMD_SET_FUNC_STATE   = 93,



	HINIC_PORT_CMD_GET_GLOBAL_QPN   = 102,



	HINIC_PORT_CMD_GET_CAP          = 170,

};



struct hinic_hwdev {

	struct hinic_hwif               *hwif;

	struct msix_entry               *msix_entries;
@@ -45,6 +70,10 @@ struct hinic_pfhwdev { 
	struct hinic_pf_to_mgmt         pf_to_mgmt;

};



int hinic_port_msg_cmd(struct hinic_hwdev *hwdev, enum hinic_port_cmd cmd,

		       void *buf_in, u16 in_size, void *buf_out,

		       u16 *out_size);



struct hinic_hwdev *hinic_init_hwdev(struct pci_dev *pdev);



void hinic_free_hwdev(struct hinic_hwdev *hwdev);

drivers/net/ethernet/huawei/hinic/hinic_main.c

+194 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 *

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/device.h>
@@ -20,9 +21,16 @@ 
#include <linux/types.h>

#include <linux/etherdevice.h>

#include <linux/netdevice.h>

#include <linux/slab.h>

#include <linux/if_vlan.h>

#include <linux/semaphore.h>

#include <net/ip.h>

#include <linux/bitops.h>

#include <linux/bitmap.h>

#include <linux/err.h>



#include "hinic_hw_dev.h"

#include "hinic_port.h"

#include "hinic_dev.h"



MODULE_AUTHOR("Huawei Technologies CO., Ltd");
@@ -35,10 +43,163 @@ MODULE_LICENSE("GPL"); 
					 NETIF_MSG_IFUP |                  \

					 NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR)



#define VLAN_BITMAP_SIZE(nic_dev)       (ALIGN(VLAN_N_VID, 8) / 8)



static int hinic_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct hinic_dev *nic_dev = netdev_priv(netdev);

	int err;



	netif_info(nic_dev, drv, netdev, "set_mtu = %d\n", new_mtu);



	err = hinic_port_set_mtu(nic_dev, new_mtu);

	if (err)

		netif_err(nic_dev, drv, netdev, "Failed to set port mtu\n");

	else

		netdev->mtu = new_mtu;



	return err;

}



/**

 * change_mac_addr - change the main mac address of network device

 * @netdev: network device

 * @addr: mac address to set

 *

 * Return 0 - Success, negative - Failure

 **/

static int change_mac_addr(struct net_device *netdev, const u8 *addr)

{

	struct hinic_dev *nic_dev = netdev_priv(netdev);

	u16 vid = 0;

	int err;



	if (!is_valid_ether_addr(addr))

		return -EADDRNOTAVAIL;



	netif_info(nic_dev, drv, netdev, "change mac addr = %02x %02x %02x %02x %02x %02x\n",

		   addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);



	down(&nic_dev->mgmt_lock);



	do {

		err = hinic_port_del_mac(nic_dev, netdev->dev_addr, vid);

		if (err) {

			netif_err(nic_dev, drv, netdev,

				  "Failed to delete mac\n");

			break;

		}



		err = hinic_port_add_mac(nic_dev, addr, vid);

		if (err) {

			netif_err(nic_dev, drv, netdev, "Failed to add mac\n");

			break;

		}



		vid = find_next_bit(nic_dev->vlan_bitmap, VLAN_N_VID, vid + 1);

	} while (vid != VLAN_N_VID);



	up(&nic_dev->mgmt_lock);

	return err;

}



static int hinic_set_mac_addr(struct net_device *netdev, void *addr)

{

	unsigned char new_mac[ETH_ALEN];

	struct sockaddr *saddr = addr;

	int err;



	memcpy(new_mac, saddr->sa_data, ETH_ALEN);



	err = change_mac_addr(netdev, new_mac);

	if (!err)

		memcpy(netdev->dev_addr, new_mac, ETH_ALEN);



	return err;

}



static int hinic_vlan_rx_add_vid(struct net_device *netdev,

				 __always_unused __be16 proto, u16 vid)

{

	struct hinic_dev *nic_dev = netdev_priv(netdev);

	int ret, err;



	netif_info(nic_dev, drv, netdev, "add vid = %d\n", vid);



	down(&nic_dev->mgmt_lock);



	err = hinic_port_add_vlan(nic_dev, vid);

	if (err) {

		netif_err(nic_dev, drv, netdev, "Failed to add vlan\n");

		goto err_vlan_add;

	}



	err = hinic_port_add_mac(nic_dev, netdev->dev_addr, vid);

	if (err) {

		netif_err(nic_dev, drv, netdev, "Failed to set mac\n");

		goto err_add_mac;

	}



	bitmap_set(nic_dev->vlan_bitmap, vid, 1);



	up(&nic_dev->mgmt_lock);

	return 0;



err_add_mac:

	ret = hinic_port_del_vlan(nic_dev, vid);

	if (ret)

		netif_err(nic_dev, drv, netdev,

			  "Failed to revert by removing vlan\n");



err_vlan_add:

	up(&nic_dev->mgmt_lock);

	return err;

}



static int hinic_vlan_rx_kill_vid(struct net_device *netdev,

				  __always_unused __be16 proto, u16 vid)

{

	struct hinic_dev *nic_dev = netdev_priv(netdev);

	int err;



	netif_info(nic_dev, drv, netdev, "remove vid = %d\n", vid);



	down(&nic_dev->mgmt_lock);



	err = hinic_port_del_vlan(nic_dev, vid);

	if (err) {

		netif_err(nic_dev, drv, netdev, "Failed to delete vlan\n");

		goto err_del_vlan;

	}



	bitmap_clear(nic_dev->vlan_bitmap, vid, 1);



	up(&nic_dev->mgmt_lock);

	return 0;



err_del_vlan:

	up(&nic_dev->mgmt_lock);

	return err;

}



static const struct net_device_ops hinic_netdev_ops = {

	/* Operations are empty, should be filled */

	.ndo_change_mtu = hinic_change_mtu,

	.ndo_set_mac_address = hinic_set_mac_addr,

	.ndo_validate_addr = eth_validate_addr,

	.ndo_vlan_rx_add_vid = hinic_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid = hinic_vlan_rx_kill_vid,

	/* more operations should be filled */

};



static void netdev_features_init(struct net_device *netdev)

{

	netdev->hw_features = NETIF_F_SG | NETIF_F_HIGHDMA;



	netdev->vlan_features = netdev->hw_features;



	netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;

}



/**

 * nic_dev_init - Initialize the NIC device

 * @pdev: the NIC pci device
@@ -79,8 +240,36 @@ static int nic_dev_init(struct pci_dev *pdev) 
	nic_dev->hwdev  = hwdev;

	nic_dev->msg_enable = MSG_ENABLE_DEFAULT;



	sema_init(&nic_dev->mgmt_lock, 1);



	nic_dev->vlan_bitmap = devm_kzalloc(&pdev->dev,

					    VLAN_BITMAP_SIZE(nic_dev),

					    GFP_KERNEL);

	if (!nic_dev->vlan_bitmap) {

		err = -ENOMEM;

		goto err_vlan_bitmap;

	}



	pci_set_drvdata(pdev, netdev);



	err = hinic_port_get_mac(nic_dev, netdev->dev_addr);

	if (err)

		dev_warn(&pdev->dev, "Failed to get mac address\n");



	err = hinic_port_add_mac(nic_dev, netdev->dev_addr, 0);

	if (err) {

		dev_err(&pdev->dev, "Failed to add mac\n");

		goto err_add_mac;

	}



	err = hinic_port_set_mtu(nic_dev, netdev->mtu);

	if (err) {

		dev_err(&pdev->dev, "Failed to set mtu\n");

		goto err_set_mtu;

	}



	netdev_features_init(netdev);



	netif_carrier_off(netdev);



	err = register_netdev(netdev);
@@ -92,7 +281,11 @@ static int nic_dev_init(struct pci_dev *pdev) 
	return 0;



err_reg_netdev:

err_set_mtu:

err_add_mac:

	pci_set_drvdata(pdev, NULL);



err_vlan_bitmap:

	free_netdev(netdev);



err_alloc_etherdev: