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

Commit 257e4f29 authored by Huazhong Tan's avatar Huazhong Tan Committed by David S. Miller
Browse files

net: hns3: use HNS3_NIC_STATE_RESETTING to indicate resetting 



While hclge is going to reset, it will notify its client with
HNAE3_DOWN_CLIENT, so this client should get into a resetting
status from this moment, other operations from the stack need to
be blocked as well. And when the reset is finished, the client
will be notified with HNAE3_UP_CLIENT, so this is the end of
the resetting status.

This patch uses HNS3_NIC_STATE_RESETTING flag to implement that,
and adds hns3_nic_resetting() to indicate which operation is not
allowed.

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8df0fa91

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

+12 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ int hns3_dcbnl_ieee_getets(struct net_device *ndev, struct ieee_ets *ets) 
{

	struct hnae3_handle *h = hns3_get_handle(ndev);



	if (hns3_nic_resetting(ndev))

		return -EBUSY;



	if (h->kinfo.dcb_ops->ieee_getets)

		return h->kinfo.dcb_ops->ieee_getets(h, ets);
@@ -20,6 +23,9 @@ int hns3_dcbnl_ieee_setets(struct net_device *ndev, struct ieee_ets *ets) 
{

	struct hnae3_handle *h = hns3_get_handle(ndev);



	if (hns3_nic_resetting(ndev))

		return -EBUSY;



	if (h->kinfo.dcb_ops->ieee_setets)

		return h->kinfo.dcb_ops->ieee_setets(h, ets);
@@ -31,6 +37,9 @@ int hns3_dcbnl_ieee_getpfc(struct net_device *ndev, struct ieee_pfc *pfc) 
{

	struct hnae3_handle *h = hns3_get_handle(ndev);



	if (hns3_nic_resetting(ndev))

		return -EBUSY;



	if (h->kinfo.dcb_ops->ieee_getpfc)

		return h->kinfo.dcb_ops->ieee_getpfc(h, pfc);
@@ -42,6 +51,9 @@ int hns3_dcbnl_ieee_setpfc(struct net_device *ndev, struct ieee_pfc *pfc) 
{

	struct hnae3_handle *h = hns3_get_handle(ndev);



	if (hns3_nic_resetting(ndev))

		return -EBUSY;



	if (h->kinfo.dcb_ops->ieee_setpfc)

		return h->kinfo.dcb_ops->ieee_setpfc(h, pfc);

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

+10 −0
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ static int hns3_nic_net_open(struct net_device *netdev) 
	struct hnae3_knic_private_info *kinfo;

	int i, ret;



	if (hns3_nic_resetting(netdev))

		return -EBUSY;



	netif_carrier_off(netdev);



	ret = hns3_nic_set_real_num_queue(netdev);
@@ -3749,6 +3752,10 @@ static int hns3_reset_notify_down_enet(struct hnae3_handle *handle) 
	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);

	struct hnae3_knic_private_info *kinfo = &handle->kinfo;

	struct net_device *ndev = kinfo->netdev;

	struct hns3_nic_priv *priv = netdev_priv(ndev);



	if (test_and_set_bit(HNS3_NIC_STATE_RESETTING, &priv->state))

		return 0;



	/* it is cumbersome for hardware to pick-and-choose entries for deletion

	 * from table space. Hence, for function reset software intervention is
@@ -3768,6 +3775,7 @@ static int hns3_reset_notify_down_enet(struct hnae3_handle *handle) 
static int hns3_reset_notify_up_enet(struct hnae3_handle *handle)

{

	struct hnae3_knic_private_info *kinfo = &handle->kinfo;

	struct hns3_nic_priv *priv = netdev_priv(kinfo->netdev);

	int ret = 0;



	if (netif_running(kinfo->netdev)) {
@@ -3780,6 +3788,8 @@ static int hns3_reset_notify_up_enet(struct hnae3_handle *handle) 
		handle->last_reset_time = jiffies;

	}



	clear_bit(HNS3_NIC_STATE_RESETTING, &priv->state);



	return ret;

}

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

+7 −0
Original line number Diff line number Diff line
@@ -599,6 +599,13 @@ static inline bool hns3_dev_ongoing_func_reset(struct hnae3_ae_dev *ae_dev) 
#define hns3_read_dev(a, reg) \

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



static inline bool hns3_nic_resetting(struct net_device *netdev)

{

	struct hns3_nic_priv *priv = netdev_priv(netdev);



	return test_bit(HNS3_NIC_STATE_RESETTING, &priv->state);

}



#define hns3_write_dev(a, reg, value) \

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

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

+19 −0
Original line number Diff line number Diff line
@@ -291,6 +291,11 @@ static void hns3_self_test(struct net_device *ndev, 
	int test_index = 0;

	u32 i;



	if (hns3_nic_resetting(ndev)) {

		netdev_err(ndev, "dev resetting!");

		return;

	}



	/* Only do offline selftest, or pass by default */

	if (eth_test->flags != ETH_TEST_FL_OFFLINE)

		return;
@@ -530,6 +535,11 @@ static void hns3_get_ringparam(struct net_device *netdev, 
	struct hnae3_handle *h = priv->ae_handle;

	int queue_num = h->kinfo.num_tqps;



	if (hns3_nic_resetting(netdev)) {

		netdev_err(netdev, "dev resetting!");

		return;

	}



	param->tx_max_pending = HNS3_RING_MAX_PENDING;

	param->rx_max_pending = HNS3_RING_MAX_PENDING;
@@ -760,6 +770,9 @@ static int hns3_set_ringparam(struct net_device *ndev, 
	u32 old_desc_num, new_desc_num;

	int ret;



	if (hns3_nic_resetting(ndev))

		return -EBUSY;



	if (param->rx_mini_pending || param->rx_jumbo_pending)

		return -EINVAL;
@@ -872,6 +885,9 @@ static int hns3_get_coalesce_per_queue(struct net_device *netdev, u32 queue, 
	struct hnae3_handle *h = priv->ae_handle;

	u16 queue_num = h->kinfo.num_tqps;



	if (hns3_nic_resetting(netdev))

		return -EBUSY;



	if (queue >= queue_num) {

		netdev_err(netdev,

			   "Invalid queue value %d! Queue max id=%d\n",
@@ -1033,6 +1049,9 @@ static int hns3_set_coalesce(struct net_device *netdev, 
	int ret;

	int i;



	if (hns3_nic_resetting(netdev))

		return -EBUSY;



	ret = hns3_check_coalesce_para(netdev, cmd);

	if (ret)

		return ret;