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

Merge branch 'net-ncsi-refactoring-for-GMA-cmd' 



Ivan Mikhaylov says:

====================
net/ncsi: refactoring for GMA command

Make one GMA function for all manufacturers, change ndo_set_mac_address
to dev_set_mac_address for notifiying net layer about MAC change which
ndo_set_mac_address doesn't do.

Changes from v1:
	1. delete ftgmac100.txt changes about mac-address-increment
	2. add convert to yaml from ftgmac100.txt
	3. add mac-address-increment option for ethernet-controller.yaml

Changes from v2:
	1. remove DT changes from series, will be done in another one
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0c6e9d32 79007134

net/ncsi/ncsi-rsp.c

+22 −71
Original line number Diff line number Diff line
@@ -611,14 +611,14 @@ static int ncsi_rsp_handler_snfc(struct ncsi_request *nr) 
	return 0;

}



/* Response handler for Mellanox command Get Mac Address */

static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr)

/* Response handler for Get Mac Address command */

static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id)

{

	struct ncsi_dev_priv *ndp = nr->ndp;

	struct net_device *ndev = ndp->ndev.dev;

	const struct net_device_ops *ops = ndev->netdev_ops;

	struct ncsi_rsp_oem_pkt *rsp;

	struct sockaddr saddr;

	u32 mac_addr_off = 0;

	int ret = 0;



	/* Get the response header */
@@ -626,11 +626,25 @@ static int ncsi_rsp_handler_oem_mlx_gma(struct ncsi_request *nr) 


	saddr.sa_family = ndev->type;

	ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;

	memcpy(saddr.sa_data, &rsp->data[MLX_MAC_ADDR_OFFSET], ETH_ALEN);

	if (mfr_id == NCSI_OEM_MFR_BCM_ID)

		mac_addr_off = BCM_MAC_ADDR_OFFSET;

	else if (mfr_id == NCSI_OEM_MFR_MLX_ID)

		mac_addr_off = MLX_MAC_ADDR_OFFSET;

	else if (mfr_id == NCSI_OEM_MFR_INTEL_ID)

		mac_addr_off = INTEL_MAC_ADDR_OFFSET;



	memcpy(saddr.sa_data, &rsp->data[mac_addr_off], ETH_ALEN);

	if (mfr_id == NCSI_OEM_MFR_BCM_ID || mfr_id == NCSI_OEM_MFR_INTEL_ID)

		eth_addr_inc((u8 *)saddr.sa_data);

	if (!is_valid_ether_addr((const u8 *)saddr.sa_data))

		return -ENXIO;



	/* Set the flag for GMA command which should only be called once */

	ndp->gma_flag = 1;



	ret = ops->ndo_set_mac_address(ndev, &saddr);

	rtnl_lock();

	ret = dev_set_mac_address(ndev, &saddr, NULL);

	rtnl_unlock();

	if (ret < 0)

		netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");
@@ -649,41 +663,10 @@ static int ncsi_rsp_handler_oem_mlx(struct ncsi_request *nr) 


	if (mlx->cmd == NCSI_OEM_MLX_CMD_GMA &&

	    mlx->param == NCSI_OEM_MLX_CMD_GMA_PARAM)

		return ncsi_rsp_handler_oem_mlx_gma(nr);

		return ncsi_rsp_handler_oem_gma(nr, NCSI_OEM_MFR_MLX_ID);

	return 0;

}



/* Response handler for Broadcom command Get Mac Address */

static int ncsi_rsp_handler_oem_bcm_gma(struct ncsi_request *nr)

{

	struct ncsi_dev_priv *ndp = nr->ndp;

	struct net_device *ndev = ndp->ndev.dev;

	const struct net_device_ops *ops = ndev->netdev_ops;

	struct ncsi_rsp_oem_pkt *rsp;

	struct sockaddr saddr;

	int ret = 0;



	/* Get the response header */

	rsp = (struct ncsi_rsp_oem_pkt *)skb_network_header(nr->rsp);



	saddr.sa_family = ndev->type;

	ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;

	memcpy(saddr.sa_data, &rsp->data[BCM_MAC_ADDR_OFFSET], ETH_ALEN);

	/* Increase mac address by 1 for BMC's address */

	eth_addr_inc((u8 *)saddr.sa_data);

	if (!is_valid_ether_addr((const u8 *)saddr.sa_data))

		return -ENXIO;



	/* Set the flag for GMA command which should only be called once */

	ndp->gma_flag = 1;



	ret = ops->ndo_set_mac_address(ndev, &saddr);

	if (ret < 0)

		netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");



	return ret;

}



/* Response handler for Broadcom card */

static int ncsi_rsp_handler_oem_bcm(struct ncsi_request *nr)

{
@@ -695,42 +678,10 @@ static int ncsi_rsp_handler_oem_bcm(struct ncsi_request *nr) 
	bcm = (struct ncsi_rsp_oem_bcm_pkt *)(rsp->data);



	if (bcm->type == NCSI_OEM_BCM_CMD_GMA)

		return ncsi_rsp_handler_oem_bcm_gma(nr);

		return ncsi_rsp_handler_oem_gma(nr, NCSI_OEM_MFR_BCM_ID);

	return 0;

}



/* Response handler for Intel command Get Mac Address */

static int ncsi_rsp_handler_oem_intel_gma(struct ncsi_request *nr)

{

	struct ncsi_dev_priv *ndp = nr->ndp;

	struct net_device *ndev = ndp->ndev.dev;

	const struct net_device_ops *ops = ndev->netdev_ops;

	struct ncsi_rsp_oem_pkt *rsp;

	struct sockaddr saddr;

	int ret = 0;



	/* Get the response header */

	rsp = (struct ncsi_rsp_oem_pkt *)skb_network_header(nr->rsp);



	saddr.sa_family = ndev->type;

	ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;

	memcpy(saddr.sa_data, &rsp->data[INTEL_MAC_ADDR_OFFSET], ETH_ALEN);

	/* Increase mac address by 1 for BMC's address */

	eth_addr_inc((u8 *)saddr.sa_data);

	if (!is_valid_ether_addr((const u8 *)saddr.sa_data))

		return -ENXIO;



	/* Set the flag for GMA command which should only be called once */

	ndp->gma_flag = 1;



	ret = ops->ndo_set_mac_address(ndev, &saddr);

	if (ret < 0)

		netdev_warn(ndev,

			    "NCSI: 'Writing mac address to device failed\n");



	return ret;

}



/* Response handler for Intel card */

static int ncsi_rsp_handler_oem_intel(struct ncsi_request *nr)

{
@@ -742,7 +693,7 @@ static int ncsi_rsp_handler_oem_intel(struct ncsi_request *nr) 
	intel = (struct ncsi_rsp_oem_intel_pkt *)(rsp->data);



	if (intel->cmd == NCSI_OEM_INTEL_CMD_GMA)

		return ncsi_rsp_handler_oem_intel_gma(nr);

		return ncsi_rsp_handler_oem_gma(nr, NCSI_OEM_MFR_INTEL_ID);



	return 0;

}