net/ncsi: refactoring for GMA command
Subsystems (4)
v3 cover 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
Ivan Mikhaylov (2):
net/ncsi: make one oem_gma function for all mfr id net/ncsi: change from ndo_set_mac_address to dev_set_mac_address
net/ncsi/ncsi-rsp.c | 93 +++++++++++---------------------------------- 1 file changed, 22 insertions(+), 71 deletions(-)
Signature · 1 line
2.40.1
PATCH v3 1/2 net/ncsi: make one oem_gma function for all mfr id
Make the one Get Mac Address function for all manufacturers and change this call in handlers accordingly.
--- net/ncsi/ncsi-rsp.c | 88 ++++++++++----------------------------------- 1 file changed, 19 insertions(+), 69 deletions(-)
net/ncsi/ncsi-rsp.c +19 -69
@@ -611,14 +611,15 @@ 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,7 +627,19 @@ 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 ;
@@ -649,41 +662,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 +677,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 +692,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 ; }
Signature · 1 line
2.40.1
PATCH v3 2/2 net/ncsi: change from ndo_set_mac_address to dev_set_mac_address
In reply to Ivan MikhaylovChange ndo_set_mac_address to dev_set_mac_address because dev_set_mac_address provides a way to notify network layer about MAC change. In other case, services may not aware about MAC change and keep using old one which set from network adapter driver.
As example, DHCP client from systemd do not update MAC address without notification from net subsystem which leads to the problem with acquiring the right address from DHCP server.
--- net/ncsi/ncsi-rsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ncsi/ncsi-rsp.c +3 -2
@@ -616,7 +616,6 @@ 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 ;
@@ -643,7 +642,9 @@ static int ncsi_rsp_handler_oem_gma(struct ncsi_request *nr, int mfr_id)/* 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" );
Signature · 1 line
2.40.1
Re: [PATCH v3 2/2] net/ncsi: change from ndo_set_mac_address to dev_set_mac_address
Quoted 5 lines · Ivan Mikhaylov
Change
ndo_set_mac_addresstodev_set_mac_addressbecausedev_set_mac_addressprovides a way to notify network layer about MAC change. In other case, services may not aware about MAC change and keep using old one which set from network adapter driver.
Quoted 8 lines
As example, DHCP client from systemd do not update MAC address without notification from net subsystem which leads to the problem with acquiring the right address from DHCP server.
Fixes cb10c7c0dfd9e ("net/ncsi: Add NCSI Broadcom OEM command")Cc [email protected] # v6.0+ 2f38e84 net/ncsi: make one oem_gma function for all mfr idSigned-off-by Paul Fertser <[email protected]>Signed-off-by Ivan Mikhaylov <[email protected]>
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 10 lines · On Wed, 7 Jun 2023 18:17:40 +0300 you wrote:
Make one GMA function for all manufacturers, change
ndo_set_mac_addresstodev_set_mac_addressfor notifiying net layer about MAC change whichndo_set_mac_addressdoesn'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 forethernet-controller.yaml[...]
Here is the summary with links:
- [v3,1/2] net/ncsi: make one oem_gma function for all mfr id
https://git.kernel.org/netdev/net-next/c/74b449b98dcc - [v3,2/2] net/ncsi: change from ndo_set_mac_address to dev_set_mac_address https://git.kernel.org/netdev/net-next/c/790071347a0a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html