Commit d075961b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-next' 



Huazhong Tan says:

====================
code optimizations & bugfixes for HNS3 driver

This patchset includes bugfixes and code optimizations for
the HNS3 ethernet controller driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2fb44dd0 34f81f04

drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ enum HCLGE_MBX_OPCODE { 
	HCLGE_MBX_GET_QID_IN_PF,	/* (VF -> PF) get queue id in pf */

	HCLGE_MBX_LINK_STAT_MODE,	/* (PF -> VF) link mode has changed */

	HCLGE_MBX_GET_LINK_MODE,	/* (VF -> PF) get the link mode of pf */



	HCLGE_MBX_GET_VF_FLR_STATUS = 200, /* (M7 -> PF) get vf reset status */

};



/* below are per-VF mac-vlan subcodes */

drivers/net/ethernet/hisilicon/hns3/hnae3.c

+31 −6
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ static bool hnae3_client_match(enum hnae3_client_type client_type, 
void hnae3_set_client_init_flag(struct hnae3_client *client,

				struct hnae3_ae_dev *ae_dev, int inited)

{

	if (!client || !ae_dev)

		return;



	switch (client->type) {

	case HNAE3_CLIENT_KNIC:

		hnae3_set_bit(ae_dev->flag, HNAE3_KNIC_CLIENT_INITED_B, inited);
@@ -109,6 +112,9 @@ int hnae3_register_client(struct hnae3_client *client) 
	struct hnae3_ae_dev *ae_dev;

	int ret = 0;



	if (!client)

		return -ENODEV;



	mutex_lock(&hnae3_common_lock);

	/* one system should only have one client for every type */

	list_for_each_entry(client_tmp, &hnae3_client_list, node) {
@@ -141,6 +147,9 @@ void hnae3_unregister_client(struct hnae3_client *client) 
{

	struct hnae3_ae_dev *ae_dev;



	if (!client)

		return;



	mutex_lock(&hnae3_common_lock);

	/* un-initialize the client on every matched port */

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {
@@ -163,6 +172,9 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo) 
	struct hnae3_client *client;

	int ret = 0;



	if (!ae_algo)

		return;



	mutex_lock(&hnae3_common_lock);



	list_add_tail(&ae_algo->node, &hnae3_ae_algo_list);
@@ -173,8 +185,12 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo) 
		if (!id)

			continue;



		/* ae_dev init should set flag */

		if (!ae_algo->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_algo ops are null\n");

			continue;

		}

		ae_dev->ops = ae_algo->ops;



		ret = ae_algo->ops->init_ae_dev(ae_dev);

		if (ret) {

			dev_err(&ae_dev->pdev->dev,
@@ -182,6 +198,7 @@ void hnae3_register_ae_algo(struct hnae3_ae_algo *ae_algo) 
			continue;

		}



		/* ae_dev init should set flag */

		hnae3_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 1);



		/* check the client list for the match with this ae_dev type and
@@ -209,6 +226,9 @@ void hnae3_unregister_ae_algo(struct hnae3_ae_algo *ae_algo) 
	struct hnae3_ae_dev *ae_dev;

	struct hnae3_client *client;



	if (!ae_algo)

		return;



	mutex_lock(&hnae3_common_lock);

	/* Check if there are matched ae_dev */

	list_for_each_entry(ae_dev, &hnae3_ae_dev_list, node) {
@@ -245,6 +265,9 @@ int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev) 
	struct hnae3_client *client;

	int ret = 0;



	if (!ae_dev)

		return -ENODEV;



	mutex_lock(&hnae3_common_lock);



	list_add_tail(&ae_dev->node, &hnae3_ae_dev_list);
@@ -255,15 +278,13 @@ int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev) 
		if (!id)

			continue;



		ae_dev->ops = ae_algo->ops;



		if (!ae_dev->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_dev ops are null\n");

		if (!ae_algo->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_algo ops are null\n");

			ret = -EOPNOTSUPP;

			goto out_err;

		}

		ae_dev->ops = ae_algo->ops;



		/* ae_dev init should set flag */

		ret = ae_dev->ops->init_ae_dev(ae_dev);

		if (ret) {

			dev_err(&ae_dev->pdev->dev,
@@ -271,6 +292,7 @@ int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev) 
			goto out_err;

		}



		/* ae_dev init should set flag */

		hnae3_set_bit(ae_dev->flag, HNAE3_DEV_INITED_B, 1);

		break;

	}
@@ -307,6 +329,9 @@ void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev) 
	struct hnae3_ae_algo *ae_algo;

	struct hnae3_client *client;



	if (!ae_dev)

		return;



	mutex_lock(&hnae3_common_lock);

	/* Check if there are matched ae_algo */

	list_for_each_entry(ae_algo, &hnae3_ae_algo_list, node) {

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+4 −5
Original line number Diff line number Diff line
@@ -621,12 +621,11 @@ static int hns3_get_link_ksettings(struct net_device *netdev, 
		hns3_get_ksettings(h, cmd);

		break;

	case HNAE3_MEDIA_TYPE_COPPER:

		if (!netdev->phydev)

			return -EOPNOTSUPP;



		cmd->base.port = PORT_TP;

		if (!netdev->phydev)

			hns3_get_ksettings(h, cmd);

		else

			phy_ethtool_ksettings_get(netdev->phydev, cmd);



		break;

	default:

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c

+26 −0
Original line number Diff line number Diff line
@@ -390,6 +390,20 @@ int hclge_cmd_init(struct hclge_dev *hdev) 
	return 0;

}



static void hclge_cmd_uninit_regs(struct hclge_hw *hw)

{

	hclge_write_dev(hw, HCLGE_NIC_CSQ_BASEADDR_L_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CSQ_BASEADDR_H_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CSQ_DEPTH_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CSQ_HEAD_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CSQ_TAIL_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CRQ_BASEADDR_L_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CRQ_BASEADDR_H_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CRQ_DEPTH_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CRQ_HEAD_REG, 0);

	hclge_write_dev(hw, HCLGE_NIC_CRQ_TAIL_REG, 0);

}



static void hclge_destroy_queue(struct hclge_cmq_ring *ring)

{

	spin_lock(&ring->lock);
@@ -402,3 +416,15 @@ void hclge_destroy_cmd_queue(struct hclge_hw *hw) 
	hclge_destroy_queue(&hw->cmq.csq);

	hclge_destroy_queue(&hw->cmq.crq);

}



void hclge_cmd_uninit(struct hclge_dev *hdev)

{

	spin_lock_bh(&hdev->hw.cmq.csq.lock);

	spin_lock(&hdev->hw.cmq.crq.lock);

	set_bit(HCLGE_STATE_CMD_DISABLE, &hdev->state);

	hclge_cmd_uninit_regs(&hdev->hw);

	spin_unlock(&hdev->hw.cmq.crq.lock);

	spin_unlock_bh(&hdev->hw.cmq.csq.lock);



	hclge_destroy_cmd_queue(&hdev->hw);

}

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h

+1 −1
Original line number Diff line number Diff line
@@ -975,6 +975,6 @@ enum hclge_cmd_status hclge_cmd_mdio_write(struct hclge_hw *hw, 
enum hclge_cmd_status hclge_cmd_mdio_read(struct hclge_hw *hw,

					  struct hclge_desc *desc);



void hclge_destroy_cmd_queue(struct hclge_hw *hw);

void hclge_cmd_uninit(struct hclge_dev *hdev);

int hclge_cmd_queue_init(struct hclge_dev *hdev);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE