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

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

Merge branch 'hns-fixes' 



Salil Mehta says:

====================
Bug fixes & Code improvements in HNS driver

This patch-set introduces some bug fixes and code improvements.
These have been identified during internal review or testing of
the driver by internal Hisilicon teams.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f522a5fc 66355f52

Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt

+8 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ Required properties: 
  depends on the hardware user manual.

- port-mode-offset: is offset of port mode field for each port in dsaf. Its

  value depends on the hardware user manual.

- mc-mac-mask: mask of multicast address, determines bit in multicast address

  to set:

  1 stands for this bit will be precisely matched, TCAM will check this bit of

    MAC address.

  0 stands for this bit will be fuzzy matched, TCAM won't care about this bit

    of MAC address.



[1] Documentation/devicetree/bindings/net/phy.txt
@@ -74,10 +80,12 @@ dsaf0: dsa@c7000000 { 
		reg = 0;

		phy-handle = <&phy0>;

		serdes-syscon = <&serdes>;

		mc-mac-mask = [ff f0 00 00 00 00];

	};



	port@1 {

                reg = 1;

                serdes-syscon = <&serdes>;

		mc-mac-mask = [ff f0 00 00 00 00];

        };

};

drivers/net/ethernet/hisilicon/hns/hnae.h

+14 −3
Original line number Diff line number Diff line
@@ -426,8 +426,14 @@ enum hnae_media_type { 
 *   get mac address

 * set_mac_addr()

 *   set mac address

 * clr_mc_addr()

 *   clear mcast tcam table

 * set_mc_addr()

 *   set multicast mode

 * add_uc_addr()

 *   add ucast address

 * rm_uc_addr()

 *   remove ucast address

 * set_mtu()

 *   set mtu

 * update_stats()
@@ -488,6 +494,11 @@ struct hnae_ae_ops { 
	void (*set_promisc_mode)(struct hnae_handle *handle, u32 en);

	int (*get_mac_addr)(struct hnae_handle *handle, void **p);

	int (*set_mac_addr)(struct hnae_handle *handle, void *p);

	int (*add_uc_addr)(struct hnae_handle *handle,

			   const unsigned char *addr);

	int (*rm_uc_addr)(struct hnae_handle *handle,

			  const unsigned char *addr);

	int (*clr_mc_addr)(struct hnae_handle *handle);

	int (*set_mc_addr)(struct hnae_handle *handle, void *addr);

	int (*set_mtu)(struct hnae_handle *handle, int new_mtu);

	void (*set_tso_stats)(struct hnae_handle *handle, int enable);
@@ -590,7 +601,7 @@ static inline int hnae_alloc_buffer_attach(struct hnae_ring *ring, int i) 
	if (ret)

		return ret;



	ring->desc[i].addr = (__le64)ring->desc_cb[i].dma;

	ring->desc[i].addr = cpu_to_le64(ring->desc_cb[i].dma);



	return 0;

}
@@ -621,14 +632,14 @@ static inline void hnae_replace_buffer(struct hnae_ring *ring, int i, 


	bops->unmap_buffer(ring, &ring->desc_cb[i]);

	ring->desc_cb[i] = *res_cb;

	ring->desc[i].addr = (__le64)ring->desc_cb[i].dma;

	ring->desc[i].addr = cpu_to_le64(ring->desc_cb[i].dma);

	ring->desc[i].rx.ipoff_bnum_pid_flag = 0;

}



static inline void hnae_reuse_buffer(struct hnae_ring *ring, int i)

{

	ring->desc_cb[i].reuse_flag = 0;

	ring->desc[i].addr = (__le64)(ring->desc_cb[i].dma

	ring->desc[i].addr = cpu_to_le64(ring->desc_cb[i].dma

		+ ring->desc_cb[i].page_offset);

	ring->desc[i].rx.ipoff_bnum_pid_flag = 0;

}

drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c

+35 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
#include "hns_dsaf_rcb.h"



#define AE_NAME_PORT_ID_IDX 6

#define ETH_STATIC_REG	 1

#define ETH_DUMP_REG	 5

#define ETH_GSTRING_LEN	32



static struct hns_mac_cb *hns_get_mac_cb(struct hnae_handle *handle)

{
@@ -202,6 +199,28 @@ static int hns_ae_set_mac_address(struct hnae_handle *handle, void *p) 
	return 0;

}



static int hns_ae_add_uc_address(struct hnae_handle *handle,

				 const unsigned char *addr)

{

	struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);



	if (mac_cb->mac_type != HNAE_PORT_SERVICE)

		return -ENOSPC;



	return hns_mac_add_uc_addr(mac_cb, handle->vf_id, addr);

}



static int hns_ae_rm_uc_address(struct hnae_handle *handle,

				const unsigned char *addr)

{

	struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);



	if (mac_cb->mac_type != HNAE_PORT_SERVICE)

		return -ENOSPC;



	return hns_mac_rm_uc_addr(mac_cb, handle->vf_id, addr);

}



static int hns_ae_set_multicast_one(struct hnae_handle *handle, void *addr)

{

	int ret;
@@ -235,6 +254,16 @@ static int hns_ae_set_multicast_one(struct hnae_handle *handle, void *addr) 
	return ret;

}



static int hns_ae_clr_multicast(struct hnae_handle *handle)

{

	struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);



	if (mac_cb->mac_type != HNAE_PORT_SERVICE)

		return 0;



	return hns_mac_clr_multicast(mac_cb, handle->vf_id);

}



static int hns_ae_set_mtu(struct hnae_handle *handle, int new_mtu)

{

	struct hns_mac_cb *mac_cb = hns_get_mac_cb(handle);
@@ -823,7 +852,10 @@ static struct hnae_ae_ops hns_dsaf_ops = { 
	.get_coalesce_range = hns_ae_get_coalesce_range,

	.set_promisc_mode = hns_ae_set_promisc_mode,

	.set_mac_addr = hns_ae_set_mac_address,

	.add_uc_addr = hns_ae_add_uc_address,

	.rm_uc_addr = hns_ae_rm_uc_address,

	.set_mc_addr = hns_ae_set_multicast_one,

	.clr_mc_addr = hns_ae_clr_multicast,

	.set_mtu = hns_ae_set_mtu,

	.update_stats = hns_ae_update_stats,

	.set_tso_stats = hns_ae_set_tso_stats,

drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ static const struct mac_stats_string g_gmac_stats_string[] = { 
	{"gmac_rx_very_long_err", MAC_STATS_FIELD_OFF(rx_long_err)},

	{"gmac_rx_runt_err", MAC_STATS_FIELD_OFF(rx_minto64)},

	{"gmac_rx_short_err", MAC_STATS_FIELD_OFF(rx_under_min)},

	{"gmac_rx_filt_pkt", MAC_STATS_FIELD_OFF(rx_filter_bytes)},

	{"gmac_rx_octets_total_filt", MAC_STATS_FIELD_OFF(rx_filter_pkts)},

	{"gmac_rx_filt_pkt", MAC_STATS_FIELD_OFF(rx_filter_pkts)},

	{"gmac_rx_octets_total_filt", MAC_STATS_FIELD_OFF(rx_filter_bytes)},

	{"gmac_rx_overrun_cnt", MAC_STATS_FIELD_OFF(rx_fifo_overrun_err)},

	{"gmac_rx_length_err", MAC_STATS_FIELD_OFF(rx_len_err)},

	{"gmac_rx_fail_comma", MAC_STATS_FIELD_OFF(rx_comma_err)},

drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c

+64 −6
Original line number Diff line number Diff line
@@ -263,6 +263,46 @@ int hns_mac_change_vf_addr(struct hns_mac_cb *mac_cb, 
	return 0;

}



int hns_mac_add_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,

			const unsigned char *addr)

{

	struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;

	struct dsaf_drv_mac_single_dest_entry mac_entry;

	int ret;



	if (HNS_DSAF_IS_DEBUG(dsaf_dev))

		return -ENOSPC;



	memset(&mac_entry, 0, sizeof(mac_entry));

	memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));

	mac_entry.in_port_num = mac_cb->mac_id;

	ret = hns_mac_get_inner_port_num(mac_cb, vf_id, &mac_entry.port_num);

	if (ret)

		return ret;



	return hns_dsaf_set_mac_uc_entry(dsaf_dev, &mac_entry);

}



int hns_mac_rm_uc_addr(struct hns_mac_cb *mac_cb, u8 vf_id,

		       const unsigned char *addr)

{

	struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;

	struct dsaf_drv_mac_single_dest_entry mac_entry;

	int ret;



	if (HNS_DSAF_IS_DEBUG(dsaf_dev))

		return -ENOSPC;



	memset(&mac_entry, 0, sizeof(mac_entry));

	memcpy(mac_entry.addr, addr, sizeof(mac_entry.addr));

	mac_entry.in_port_num = mac_cb->mac_id;

	ret = hns_mac_get_inner_port_num(mac_cb, vf_id, &mac_entry.port_num);

	if (ret)

		return ret;



	return hns_dsaf_rm_mac_addr(dsaf_dev, &mac_entry);

}



int hns_mac_set_multi(struct hns_mac_cb *mac_cb,

		      u32 port_num, char *addr, bool enable)

{
@@ -330,13 +370,24 @@ int hns_mac_del_mac(struct hns_mac_cb *mac_cb, u32 vfn, char *mac) 
	return 0;

}



int hns_mac_clr_multicast(struct hns_mac_cb *mac_cb, int vfn)

{

	struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;

	u8 port_num;

	int ret = hns_mac_get_inner_port_num(mac_cb, vfn, &port_num);



	if (ret)

		return ret;



	return hns_dsaf_clr_mac_mc_port(dsaf_dev, mac_cb->mac_id, port_num);

}



static void hns_mac_param_get(struct mac_params *param,

			      struct hns_mac_cb *mac_cb)

{

	param->vaddr = (void *)mac_cb->vaddr;

	param->mac_mode = hns_get_enet_interface(mac_cb);

	memcpy(param->addr, mac_cb->addr_entry_idx[0].addr,

	       MAC_NUM_OCTETS_PER_ADDR);

	ether_addr_copy(param->addr, mac_cb->addr_entry_idx[0].addr);

	param->mac_id = mac_cb->mac_id;

	param->dev = mac_cb->dev;

}
@@ -353,8 +404,7 @@ static int hns_mac_port_config_bc_en(struct hns_mac_cb *mac_cb, 
{

	int ret;

	struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;

	u8 addr[MAC_NUM_OCTETS_PER_ADDR]

		= {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	u8 addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	struct dsaf_drv_mac_single_dest_entry mac_entry;



	/* directy return ok in debug network mode */
@@ -389,8 +439,7 @@ int hns_mac_vm_config_bc_en(struct hns_mac_cb *mac_cb, u32 vmid, bool enable) 
	int ret;

	struct dsaf_device *dsaf_dev = mac_cb->dsaf_dev;

	u8 port_num;

	u8 addr[MAC_NUM_OCTETS_PER_ADDR]

		= {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	u8 addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	struct mac_entry_idx *uc_mac_entry;

	struct dsaf_drv_mac_single_dest_entry mac_entry;
@@ -868,6 +917,13 @@ static int hns_mac_get_info(struct hns_mac_cb *mac_cb) 
		}

	}



	if (fwnode_property_read_u8_array(mac_cb->fw_port, "mc-mac-mask",

					  mac_cb->mc_mask, ETH_ALEN)) {

		dev_warn(mac_cb->dev,

			 "no mc-mac-mask property, set to default value.\n");

		eth_broadcast_addr(mac_cb->mc_mask);

	}



	return 0;

}
@@ -1081,6 +1137,8 @@ void hns_mac_set_promisc(struct hns_mac_cb *mac_cb, u8 en) 
{

	struct mac_driver *mac_ctrl_drv = hns_mac_get_drv(mac_cb);



	hns_dsaf_set_promisc_tcam(mac_cb->dsaf_dev, mac_cb->mac_id, !!en);



	if (mac_ctrl_drv->set_promiscuous)

		mac_ctrl_drv->set_promiscuous(mac_ctrl_drv, en);

}