* [PATCH net] cxgb4: use port number to set mac addr
@ 2024-12-03 14:41 Anumula Murali Mohan Reddy
2024-12-04 3:09 ` Jakub Kicinski
2024-12-04 10:35 ` Michal Swiatkowski
0 siblings, 2 replies; 5+ messages in thread
From: Anumula Murali Mohan Reddy @ 2024-12-03 14:41 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, andrew+netdev, pabeni, bharat,
Anumula Murali Mohan Reddy
t4_set_vf_mac_acl() uses pf to set mac addr, but t4vf_get_vf_mac_acl()
uses port number to get mac addr, this leads to error when an attempt
to set MAC address on VF's of PF2 and PF3.
This patch fixes the issue by using port number to set mac address.
Signed-off-by: Anumula Murali Mohan Reddy <anumula@chelsio.com>
Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com>
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 75bd69ff61a8..c7c2c15a1815 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -2076,7 +2076,7 @@ void t4_idma_monitor(struct adapter *adapter,
struct sge_idma_monitor_state *idma,
int hz, int ticks);
int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
- unsigned int naddr, u8 *addr);
+ u8 start, unsigned int naddr, u8 *addr);
void t4_tp_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
u32 start_index, bool sleep_ok);
void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 97a261d5357e..bc3af0054406 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -3234,7 +3234,7 @@ static int cxgb4_mgmt_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
dev_info(pi->adapter->pdev_dev,
"Setting MAC %pM on VF %d\n", mac, vf);
- ret = t4_set_vf_mac_acl(adap, vf + 1, 1, mac);
+ ret = t4_set_vf_mac_acl(adap, vf + 1, pi->lport, 1, mac);
if (!ret)
ether_addr_copy(adap->vfinfo[vf].vf_mac_addr, mac);
return ret;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 76de55306c4d..175bf9b13058 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -10215,11 +10215,12 @@ int t4_load_cfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)
* t4_set_vf_mac_acl - Set MAC address for the specified VF
* @adapter: The adapter
* @vf: one of the VFs instantiated by the specified PF
+ * @start: The start port id associated with specified VF
* @naddr: the number of MAC addresses
* @addr: the MAC address(es) to be set to the specified VF
*/
int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
- unsigned int naddr, u8 *addr)
+ u8 start, unsigned int naddr, u8 *addr)
{
struct fw_acl_mac_cmd cmd;
@@ -10234,7 +10235,7 @@ int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
cmd.en_to_len16 = cpu_to_be32((unsigned int)FW_LEN16(cmd));
cmd.nmac = naddr;
- switch (adapter->pf) {
+ switch (start) {
case 3:
memcpy(cmd.macaddr3, addr, sizeof(cmd.macaddr3));
break;
--
2.39.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net] cxgb4: use port number to set mac addr
2024-12-03 14:41 [PATCH net] cxgb4: use port number to set mac addr Anumula Murali Mohan Reddy
@ 2024-12-04 3:09 ` Jakub Kicinski
2024-12-04 10:35 ` Michal Swiatkowski
1 sibling, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2024-12-04 3:09 UTC (permalink / raw)
To: Anumula Murali Mohan Reddy; +Cc: netdev, davem, andrew+netdev, pabeni, bharat
On Tue, 3 Dec 2024 20:11:49 +0530 Anumula Murali Mohan Reddy wrote:
> t4_set_vf_mac_acl() uses pf to set mac addr, but t4vf_get_vf_mac_acl()
> uses port number to get mac addr, this leads to error when an attempt
> to set MAC address on VF's of PF2 and PF3.
> This patch fixes the issue by using port number to set mac address.
Please add a Fixes tag pointing to the first commit where the issue can
be observed.
--
pw-bot: cr
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net] cxgb4: use port number to set mac addr
2024-12-03 14:41 [PATCH net] cxgb4: use port number to set mac addr Anumula Murali Mohan Reddy
2024-12-04 3:09 ` Jakub Kicinski
@ 2024-12-04 10:35 ` Michal Swiatkowski
2024-12-06 6:00 ` Anumula Murali Mohan Reddy
1 sibling, 1 reply; 5+ messages in thread
From: Michal Swiatkowski @ 2024-12-04 10:35 UTC (permalink / raw)
To: Anumula Murali Mohan Reddy
Cc: netdev, davem, kuba, andrew+netdev, pabeni, bharat
On Tue, Dec 03, 2024 at 08:11:49PM +0530, Anumula Murali Mohan Reddy wrote:
> t4_set_vf_mac_acl() uses pf to set mac addr, but t4vf_get_vf_mac_acl()
> uses port number to get mac addr, this leads to error when an attempt
> to set MAC address on VF's of PF2 and PF3.
> This patch fixes the issue by using port number to set mac address.
>
> Signed-off-by: Anumula Murali Mohan Reddy <anumula@chelsio.com>
> Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com>
> ---
> drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +-
> drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
> drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 5 +++--
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> index 75bd69ff61a8..c7c2c15a1815 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> @@ -2076,7 +2076,7 @@ void t4_idma_monitor(struct adapter *adapter,
> struct sge_idma_monitor_state *idma,
> int hz, int ticks);
> int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> - unsigned int naddr, u8 *addr);
> + u8 start, unsigned int naddr, u8 *addr);
> void t4_tp_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
> u32 start_index, bool sleep_ok);
> void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> index 97a261d5357e..bc3af0054406 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> @@ -3234,7 +3234,7 @@ static int cxgb4_mgmt_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
>
> dev_info(pi->adapter->pdev_dev,
> "Setting MAC %pM on VF %d\n", mac, vf);
> - ret = t4_set_vf_mac_acl(adap, vf + 1, 1, mac);
> + ret = t4_set_vf_mac_acl(adap, vf + 1, pi->lport, 1, mac);
> if (!ret)
> ether_addr_copy(adap->vfinfo[vf].vf_mac_addr, mac);
> return ret;
> diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> index 76de55306c4d..175bf9b13058 100644
> --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> @@ -10215,11 +10215,12 @@ int t4_load_cfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)
> * t4_set_vf_mac_acl - Set MAC address for the specified VF
> * @adapter: The adapter
> * @vf: one of the VFs instantiated by the specified PF
> + * @start: The start port id associated with specified VF
> * @naddr: the number of MAC addresses
> * @addr: the MAC address(es) to be set to the specified VF
> */
> int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> - unsigned int naddr, u8 *addr)
> + u8 start, unsigned int naddr, u8 *addr)
> {
> struct fw_acl_mac_cmd cmd;
>
> @@ -10234,7 +10235,7 @@ int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> cmd.en_to_len16 = cpu_to_be32((unsigned int)FW_LEN16(cmd));
> cmd.nmac = naddr;
>
> - switch (adapter->pf) {
> + switch (start) {
> case 3:
> memcpy(cmd.macaddr3, addr, sizeof(cmd.macaddr3));
You can use ether_addr_copy().
Beside that and fixes tag:
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> break;
> --
> 2.39.3
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net] cxgb4: use port number to set mac addr
2024-12-04 10:35 ` Michal Swiatkowski
@ 2024-12-06 6:00 ` Anumula Murali Mohan Reddy
2024-12-06 10:01 ` Michal Swiatkowski
0 siblings, 1 reply; 5+ messages in thread
From: Anumula Murali Mohan Reddy @ 2024-12-06 6:00 UTC (permalink / raw)
To: Michal Swiatkowski; +Cc: bharat, netdev, davem, kuba, pabeni, andrew+netdev
O Wednesday, December 12/04/24, 2024 at 16:05:46 +0530, Michal Swiatkowski wrote:
> On Tue, Dec 03, 2024 at 08:11:49PM +0530, Anumula Murali Mohan Reddy wrote:
> > t4_set_vf_mac_acl() uses pf to set mac addr, but t4vf_get_vf_mac_acl()
> > uses port number to get mac addr, this leads to error when an attempt
> > to set MAC address on VF's of PF2 and PF3.
> > This patch fixes the issue by using port number to set mac address.
> >
> > Signed-off-by: Anumula Murali Mohan Reddy <anumula@chelsio.com>
> > Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com>
> > ---
> > drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +-
> > drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
> > drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 5 +++--
> > 3 files changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> > index 75bd69ff61a8..c7c2c15a1815 100644
> > --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> > +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> > @@ -2076,7 +2076,7 @@ void t4_idma_monitor(struct adapter *adapter,
> > struct sge_idma_monitor_state *idma,
> > int hz, int ticks);
> > int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> > - unsigned int naddr, u8 *addr);
> > + u8 start, unsigned int naddr, u8 *addr);
> > void t4_tp_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
> > u32 start_index, bool sleep_ok);
> > void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
> > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > index 97a261d5357e..bc3af0054406 100644
> > --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > @@ -3234,7 +3234,7 @@ static int cxgb4_mgmt_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
> >
> > dev_info(pi->adapter->pdev_dev,
> > "Setting MAC %pM on VF %d\n", mac, vf);
> > - ret = t4_set_vf_mac_acl(adap, vf + 1, 1, mac);
> > + ret = t4_set_vf_mac_acl(adap, vf + 1, pi->lport, 1, mac);
> > if (!ret)
> > ether_addr_copy(adap->vfinfo[vf].vf_mac_addr, mac);
> > return ret;
> > diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > index 76de55306c4d..175bf9b13058 100644
> > --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > @@ -10215,11 +10215,12 @@ int t4_load_cfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)
> > * t4_set_vf_mac_acl - Set MAC address for the specified VF
> > * @adapter: The adapter
> > * @vf: one of the VFs instantiated by the specified PF
> > + * @start: The start port id associated with specified VF
> > * @naddr: the number of MAC addresses
> > * @addr: the MAC address(es) to be set to the specified VF
> > */
> > int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> > - unsigned int naddr, u8 *addr)
> > + u8 start, unsigned int naddr, u8 *addr)
> > {
> > struct fw_acl_mac_cmd cmd;
> >
> > @@ -10234,7 +10235,7 @@ int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> > cmd.en_to_len16 = cpu_to_be32((unsigned int)FW_LEN16(cmd));
> > cmd.nmac = naddr;
> >
> > - switch (adapter->pf) {
> > + switch (start) {
> > case 3:
> > memcpy(cmd.macaddr3, addr, sizeof(cmd.macaddr3));
> You can use ether_addr_copy().
>
> Beside that and fixes tag:
> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
>
> > break;
> > --
> > 2.39.3
there are multiple instances where memcpy needs to be replaced. I will
send a separate patch to replace memcpy with ethr_addr_copy().
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net] cxgb4: use port number to set mac addr
2024-12-06 6:00 ` Anumula Murali Mohan Reddy
@ 2024-12-06 10:01 ` Michal Swiatkowski
0 siblings, 0 replies; 5+ messages in thread
From: Michal Swiatkowski @ 2024-12-06 10:01 UTC (permalink / raw)
To: Anumula Murali Mohan Reddy
Cc: bharat, netdev, davem, kuba, pabeni, andrew+netdev
On Fri, Dec 06, 2024 at 01:00:12AM -0500, Anumula Murali Mohan Reddy wrote:
> O Wednesday, December 12/04/24, 2024 at 16:05:46 +0530, Michal Swiatkowski wrote:
> > On Tue, Dec 03, 2024 at 08:11:49PM +0530, Anumula Murali Mohan Reddy wrote:
> > > t4_set_vf_mac_acl() uses pf to set mac addr, but t4vf_get_vf_mac_acl()
> > > uses port number to get mac addr, this leads to error when an attempt
> > > to set MAC address on VF's of PF2 and PF3.
> > > This patch fixes the issue by using port number to set mac address.
> > >
> > > Signed-off-by: Anumula Murali Mohan Reddy <anumula@chelsio.com>
> > > Signed-off-by: Potnuri Bharat Teja <bharat@chelsio.com>
> > > ---
> > > drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 +-
> > > drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +-
> > > drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 5 +++--
> > > 3 files changed, 5 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> > > index 75bd69ff61a8..c7c2c15a1815 100644
> > > --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> > > +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
> > > @@ -2076,7 +2076,7 @@ void t4_idma_monitor(struct adapter *adapter,
> > > struct sge_idma_monitor_state *idma,
> > > int hz, int ticks);
> > > int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> > > - unsigned int naddr, u8 *addr);
> > > + u8 start, unsigned int naddr, u8 *addr);
> > > void t4_tp_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
> > > u32 start_index, bool sleep_ok);
> > > void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
> > > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > > index 97a261d5357e..bc3af0054406 100644
> > > --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > > +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > > @@ -3234,7 +3234,7 @@ static int cxgb4_mgmt_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
> > >
> > > dev_info(pi->adapter->pdev_dev,
> > > "Setting MAC %pM on VF %d\n", mac, vf);
> > > - ret = t4_set_vf_mac_acl(adap, vf + 1, 1, mac);
> > > + ret = t4_set_vf_mac_acl(adap, vf + 1, pi->lport, 1, mac);
> > > if (!ret)
> > > ether_addr_copy(adap->vfinfo[vf].vf_mac_addr, mac);
> > > return ret;
> > > diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > > index 76de55306c4d..175bf9b13058 100644
> > > --- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > > +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
> > > @@ -10215,11 +10215,12 @@ int t4_load_cfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)
> > > * t4_set_vf_mac_acl - Set MAC address for the specified VF
> > > * @adapter: The adapter
> > > * @vf: one of the VFs instantiated by the specified PF
> > > + * @start: The start port id associated with specified VF
> > > * @naddr: the number of MAC addresses
> > > * @addr: the MAC address(es) to be set to the specified VF
> > > */
> > > int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> > > - unsigned int naddr, u8 *addr)
> > > + u8 start, unsigned int naddr, u8 *addr)
> > > {
> > > struct fw_acl_mac_cmd cmd;
> > >
> > > @@ -10234,7 +10235,7 @@ int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,
> > > cmd.en_to_len16 = cpu_to_be32((unsigned int)FW_LEN16(cmd));
> > > cmd.nmac = naddr;
> > >
> > > - switch (adapter->pf) {
> > > + switch (start) {
> > > case 3:
> > > memcpy(cmd.macaddr3, addr, sizeof(cmd.macaddr3));
> > You can use ether_addr_copy().
> >
> > Beside that and fixes tag:
> > Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> >
> > > break;
> > > --
> > > 2.39.3
> there are multiple instances where memcpy needs to be replaced. I will
> send a separate patch to replace memcpy with ethr_addr_copy().
>
Great, thanks.
> Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-12-06 10:04 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-03 14:41 [PATCH net] cxgb4: use port number to set mac addr Anumula Murali Mohan Reddy
2024-12-04 3:09 ` Jakub Kicinski
2024-12-04 10:35 ` Michal Swiatkowski
2024-12-06 6:00 ` Anumula Murali Mohan Reddy
2024-12-06 10:01 ` Michal Swiatkowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).