Commit aab8d1c6 authored by Jie Wang's avatar Jie Wang Committed by David S. Miller
Browse files

net: hns3: delete the hclge_cmd.c and hclgevf_cmd.c 



currently most cmdq APIs are unified in hclge_comm_cmd.c. Newly developed
cmdq APIs should also be placed in hclge_comm_cmd.c. So there is no need to
keep hclge_cmd.c and hclgevf_cmd.c.

This patch moves the hclge(vf)_cmd_send to hclge(vf)_main.c and deletes
the source files and makefile scripts.

Signed-off-by: default avatarJie Wang <wangjie125@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb413bfa

drivers/net/ethernet/hisilicon/hns3/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o 


obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o



hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_cmd.o hns3vf/hclgevf_mbx.o  hns3vf/hclgevf_devlink.o \

hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o  hns3vf/hclgevf_devlink.o \

		hns3_common/hclge_comm_cmd.o



obj-$(CONFIG_HNS3_HCLGE) += hclge.o

hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_cmd.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o \

hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o \

		hns3pf/hclge_mbx.o hns3pf/hclge_err.o  hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o \

		hns3_common/hclge_comm_cmd.o

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

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

// Copyright (c) 2016-2017 Hisilicon Limited.



#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/pci.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/dma-direction.h>

#include "hclge_cmd.h"

#include "hnae3.h"

#include "hclge_main.h"



/**

 * hclge_cmd_send - send command to command queue

 * @hw: pointer to the hw struct

 * @desc: prefilled descriptor for describing the command

 * @num : the number of descriptors to be sent

 *

 * This is the main send command for command queue, it

 * sends the queue, cleans the queue, etc

 **/

int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num)

{

	return hclge_comm_cmd_send(&hw->hw, desc, num, true);

}

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

+14 −0
Original line number Diff line number Diff line
@@ -479,6 +479,20 @@ static const struct key_info tuple_key_info[] = { 
	  offsetof(struct hclge_fd_rule, tuples_mask.l4_user_def) },

};



/**

 * hclge_cmd_send - send command to command queue

 * @hw: pointer to the hw struct

 * @desc: prefilled descriptor for describing the command

 * @num : the number of descriptors to be sent

 *

 * This is the main send command for command queue, it

 * sends the queue, cleans the queue, etc

 **/

int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num)

{

	return hclge_comm_cmd_send(&hw->hw, desc, num, true);

}



static int hclge_mac_update_stats_defective(struct hclge_dev *hdev)

{

#define HCLGE_MAC_CMD_NUM 21

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

// Copyright (c) 2016-2017 Hisilicon Limited.



#include <linux/device.h>

#include <linux/dma-direction.h>

#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/pci.h>

#include <linux/slab.h>

#include "hclgevf_cmd.h"

#include "hclgevf_main.h"

#include "hnae3.h"



/* hclgevf_cmd_send - send command to command queue

 * @hw: pointer to the hw struct

 * @desc: prefilled descriptor for describing the command

 * @num : the number of descriptors to be sent

 *

 * This is the main send command for command queue, it

 * sends the queue, cleans the queue, etc

 */

int hclgevf_cmd_send(struct hclgevf_hw *hw, struct hclge_desc *desc, int num)

{

	return hclge_comm_cmd_send(&hw->hw, desc, num, false);

}



void hclgevf_arq_init(struct hclgevf_dev *hdev)

{

	struct hclge_comm_cmq *cmdq = &hdev->hw.hw.cmq;



	spin_lock(&cmdq->crq.lock);

	/* initialize the pointers of async rx queue of mailbox */

	hdev->arq.hdev = hdev;

	hdev->arq.head = 0;

	hdev->arq.tail = 0;

	atomic_set(&hdev->arq.count, 0);

	spin_unlock(&cmdq->crq.lock);

}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+26 −0
Original line number Diff line number Diff line
@@ -92,6 +92,32 @@ static const u32 tqp_intr_reg_addr_list[] = {HCLGEVF_TQP_INTR_CTRL_REG, 
					     HCLGEVF_TQP_INTR_GL2_REG,

					     HCLGEVF_TQP_INTR_RL_REG};



/* hclgevf_cmd_send - send command to command queue

 * @hw: pointer to the hw struct

 * @desc: prefilled descriptor for describing the command

 * @num : the number of descriptors to be sent

 *

 * This is the main send command for command queue, it

 * sends the queue, cleans the queue, etc

 */

int hclgevf_cmd_send(struct hclgevf_hw *hw, struct hclge_desc *desc, int num)

{

	return hclge_comm_cmd_send(&hw->hw, desc, num, false);

}



void hclgevf_arq_init(struct hclgevf_dev *hdev)

{

	struct hclge_comm_cmq *cmdq = &hdev->hw.hw.cmq;



	spin_lock(&cmdq->crq.lock);

	/* initialize the pointers of async rx queue of mailbox */

	hdev->arq.hdev = hdev;

	hdev->arq.head = 0;

	hdev->arq.tail = 0;

	atomic_set(&hdev->arq.count, 0);

	spin_unlock(&cmdq->crq.lock);

}



static struct hclgevf_dev *hclgevf_ae_get_hdev(struct hnae3_handle *handle)

{

	if (!handle->client)