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

Merge branch 'hns3-cleanups' 

Huazhong Tan says:

====================
net: hns3: some cleanups for -next

There are some cleanups for the HNS3 ethernet driver.

change log:
V2: remove previous #3 which should target net.

previous version:
V1: https://patchwork.kernel.org/project/netdevbpf/cover/1612784382-27262-1-git-send-email-tanhuazhong@huawei.com/


====================

Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents adbb4fb0 55ff3ed5

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

+3 −4
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ struct hnae3_ring_chain_node { 
};



#define HNAE3_IS_TX_RING(node) \

	(((node)->flag & (1 << HNAE3_RING_TYPE_B)) == HNAE3_RING_TYPE_TX)

	(((node)->flag & 1 << HNAE3_RING_TYPE_B) == HNAE3_RING_TYPE_TX)



/* device specification info from firmware */

struct hnae3_dev_specs {
@@ -292,7 +292,6 @@ struct hnae3_client_ops { 
	int (*init_instance)(struct hnae3_handle *handle);

	void (*uninit_instance)(struct hnae3_handle *handle, bool reset);

	void (*link_status_change)(struct hnae3_handle *handle, bool state);

	int (*setup_tc)(struct hnae3_handle *handle, u8 tc);

	int (*reset_notify)(struct hnae3_handle *handle,

			    enum hnae3_reset_notify_type type);

	void (*process_hw_error)(struct hnae3_handle *handle,
@@ -776,9 +775,9 @@ struct hnae3_handle { 
#define hnae3_get_field(origin, mask, shift) (((origin) & (mask)) >> (shift))



#define hnae3_set_bit(origin, shift, val) \

	hnae3_set_field((origin), (0x1 << (shift)), (shift), (val))

	hnae3_set_field(origin, 0x1 << (shift), shift, val)

#define hnae3_get_bit(origin, shift) \

	hnae3_get_field((origin), (0x1 << (shift)), (shift))

	hnae3_get_field(origin, 0x1 << (shift), shift)



#define HNAE3_DBG_TM_NODES		"tm_nodes"

#define HNAE3_DBG_TM_PRI		"tm_priority"

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

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int hns3_dbg_queue_map(struct hnae3_handle *h) 
			continue;



		dev_info(&h->pdev->dev,

			 "      %4d            %4d            %4d\n",

			 "      %4d            %4u            %4d\n",

			 i, global_qid, priv->ring[i].tqp_vector->vector_irq);

	}

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

+5 −26
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define CREATE_TRACE_POINTS

#include "hns3_trace.h"



#define hns3_set_field(origin, shift, val)	((origin) |= ((val) << (shift)))

#define hns3_set_field(origin, shift, val)	((origin) |= (val) << (shift))

#define hns3_tx_bd_count(S)	DIV_ROUND_UP(S, HNS3_MAX_BD_SIZE)



#define hns3_rl_err(fmt, ...)						\
@@ -2329,7 +2329,7 @@ static pci_ers_result_t hns3_error_detected(struct pci_dev *pdev, 
	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev);

	pci_ers_result_t ret;



	dev_info(&pdev->dev, "PCI error detected, state(=%d)!!\n", state);

	dev_info(&pdev->dev, "PCI error detected, state(=%u)!!\n", state);



	if (state == pci_channel_io_perm_failure)

		return PCI_ERS_RESULT_DISCONNECT;
@@ -4084,7 +4084,7 @@ int hns3_init_all_ring(struct hns3_nic_priv *priv) 
	return -ENOMEM;

}



int hns3_uninit_all_ring(struct hns3_nic_priv *priv)

static void hns3_uninit_all_ring(struct hns3_nic_priv *priv)

{

	struct hnae3_handle *h = priv->ae_handle;

	int i;
@@ -4093,7 +4093,6 @@ int hns3_uninit_all_ring(struct hns3_nic_priv *priv) 
		hns3_fini_ring(&priv->ring[i]);

		hns3_fini_ring(&priv->ring[i + h->kinfo.num_tqps]);

	}

	return 0;

}



/* Set mac addr if it is configured. or leave it to the AE driver */
@@ -4321,7 +4320,6 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) 
{

	struct net_device *netdev = handle->kinfo.netdev;

	struct hns3_nic_priv *priv = netdev_priv(netdev);

	int ret;



	if (netdev->reg_state != NETREG_UNINITIALIZED)

		unregister_netdev(netdev);
@@ -4347,9 +4345,7 @@ static void hns3_client_uninit(struct hnae3_handle *handle, bool reset) 


	hns3_nic_dealloc_vector_data(priv);



	ret = hns3_uninit_all_ring(priv);

	if (ret)

		netdev_err(netdev, "uninit ring error\n");

	hns3_uninit_all_ring(priv);



	hns3_put_ring_config(priv);
@@ -4378,20 +4374,6 @@ static void hns3_link_status_change(struct hnae3_handle *handle, bool linkup) 
	}

}



static int hns3_client_setup_tc(struct hnae3_handle *handle, u8 tc)

{

	struct hnae3_knic_private_info *kinfo = &handle->kinfo;

	struct net_device *ndev = kinfo->netdev;



	if (tc > HNAE3_MAX_TC)

		return -EINVAL;



	if (!ndev)

		return -ENODEV;



	return hns3_nic_set_real_num_queue(ndev);

}



static void hns3_clear_tx_ring(struct hns3_enet_ring *ring)

{

	while (ring->next_to_clean != ring->next_to_use) {
@@ -4676,9 +4658,7 @@ static int hns3_reset_notify_uninit_enet(struct hnae3_handle *handle) 


	hns3_nic_dealloc_vector_data(priv);



	ret = hns3_uninit_all_ring(priv);

	if (ret)

		netdev_err(netdev, "uninit ring error\n");

	hns3_uninit_all_ring(priv);



	hns3_put_ring_config(priv);
@@ -4828,7 +4808,6 @@ static const struct hnae3_client_ops client_ops = { 
	.init_instance = hns3_client_init,

	.uninit_instance = hns3_client_uninit,

	.link_status_change = hns3_link_status_change,

	.setup_tc = hns3_client_setup_tc,

	.reset_notify = hns3_reset_notify,

	.process_hw_error = hns3_process_hw_error,

};

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

+5 −6
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static inline void hns3_write_reg(void __iomem *base, u32 reg, u32 value) 
}



#define hns3_read_dev(a, reg) \

	hns3_read_reg((a)->io_base, (reg))

	hns3_read_reg((a)->io_base, reg)



static inline bool hns3_nic_resetting(struct net_device *netdev)

{
@@ -564,7 +564,7 @@ static inline bool hns3_nic_resetting(struct net_device *netdev) 
}



#define hns3_write_dev(a, reg, value) \

	hns3_write_reg((a)->io_base, (reg), (value))

	hns3_write_reg((a)->io_base, reg, value)



#define ring_to_dev(ring) ((ring)->dev)
@@ -588,15 +588,15 @@ static inline unsigned int hns3_page_order(struct hns3_enet_ring *ring) 


/* iterator for handling rings in ring group */

#define hns3_for_each_ring(pos, head) \

	for (pos = (head).ring; pos; pos = pos->next)

	for (pos = (head).ring; (pos); pos = (pos)->next)



#define hns3_get_handle(ndev) \

	(((struct hns3_nic_priv *)netdev_priv(ndev))->ae_handle)



#define hns3_gl_usec_to_reg(int_gl) (int_gl >> 1)

#define hns3_gl_usec_to_reg(int_gl) ((int_gl) >> 1)

#define hns3_gl_round_down(int_gl) round_down(int_gl, 2)



#define hns3_rl_usec_to_reg(int_rl) (int_rl >> 2)

#define hns3_rl_usec_to_reg(int_rl) ((int_rl) >> 2)

#define hns3_rl_round_down(int_rl) round_down(int_rl, 4)



void hns3_ethtool_set_ops(struct net_device *netdev);
@@ -605,7 +605,6 @@ int hns3_set_channels(struct net_device *netdev, 


void hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget);

int hns3_init_all_ring(struct hns3_nic_priv *priv);

int hns3_uninit_all_ring(struct hns3_nic_priv *priv);

int hns3_nic_reset_all_ring(struct hnae3_handle *h);

void hns3_fini_ring(struct hns3_enet_ring *ring);

netdev_tx_t hns3_nic_net_xmit(struct sk_buff *skb, struct net_device *netdev);

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

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static void *hns3_update_strings(u8 *data, const struct hns3_stats *stats, 
			data[ETH_GSTRING_LEN - 1] = '\0';



			/* first, prepend the prefix string */

			n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%d_",

			n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%u_",

				       prefix, i);

			size_left = (ETH_GSTRING_LEN - 1) - n1;