* [PATCH net-next 01/16] bnxt_en: Support ingress rate limiting with TC-offload.
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
@ 2020-01-26 9:02 ` Michael Chan
2020-01-27 0:12 ` Jakub Kicinski
2020-01-26 9:02 ` [PATCH net-next 02/16] bnxt_en: Improve link up detection Michael Chan
` (14 subsequent siblings)
15 siblings, 1 reply; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:02 UTC (permalink / raw)
To: davem; +Cc: netdev, Sriharsha Basavapatna
From: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
This patch enables offloading of ingress rate limiting TC-action
on a VF. The driver processes "cls_matchall" filter callbacks to
add and remove ingress rate limiting actions. The driver parses
police action parameter and sends the command to FW to configure
rate limiting for the VF.
For example, to configure rate limiting offload on a VF using OVS,
use the below command on the corresponding VF-rep port. The example
below configures min and max tx rates of 200 and 600 Mbps.
# ovs-vsctl set interface bnxt0_pf0vf0 \
ingress_policing_rate=600000 ingress_policing_burst=200000
Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 90 +++++++++++++++++++++++++++
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h | 3 +
drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +
4 files changed, 96 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index f143354..534bc9e 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1069,6 +1069,7 @@ struct bnxt_vf_info {
u32 max_tx_rate;
void *hwrm_cmd_req_addr;
dma_addr_t hwrm_cmd_req_dma_addr;
+ unsigned long police_id;
};
#endif
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
index 0cc6ec5..2dfb650 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
@@ -10,6 +10,7 @@
#include <linux/netdevice.h>
#include <linux/inetdevice.h>
#include <linux/if_vlan.h>
+#include <linux/pci.h>
#include <net/flow_dissector.h>
#include <net/pkt_cls.h>
#include <net/tc_act/tc_gact.h>
@@ -1983,6 +1984,95 @@ static int bnxt_tc_indr_block_event(struct notifier_block *nb,
return NOTIFY_DONE;
}
+static inline int bnxt_tc_find_vf_by_fid(struct bnxt *bp, u16 fid)
+{
+ int num_vfs = pci_num_vf(bp->pdev);
+ int i;
+
+ for (i = 0; i < num_vfs; i++) {
+ if (bp->pf.vf[i].fw_fid == fid)
+ break;
+ }
+ if (i >= num_vfs)
+ return -EINVAL;
+ return i;
+}
+
+static int bnxt_tc_del_matchall(struct bnxt *bp, u16 src_fid,
+ struct tc_cls_matchall_offload *matchall_cmd)
+{
+ int vf_idx;
+
+ vf_idx = bnxt_tc_find_vf_by_fid(bp, src_fid);
+ if (vf_idx < 0)
+ return vf_idx;
+
+ if (bp->pf.vf[vf_idx].police_id != matchall_cmd->cookie)
+ return -ENOENT;
+
+ bnxt_set_vf_bw(bp->dev, vf_idx, 0, 0);
+ bp->pf.vf[vf_idx].police_id = 0;
+ return 0;
+}
+
+static int bnxt_tc_add_matchall(struct bnxt *bp, u16 src_fid,
+ struct tc_cls_matchall_offload *matchall_cmd)
+{
+ struct flow_action_entry *action;
+ int vf_idx;
+ s64 burst;
+ u64 rate;
+ int rc;
+
+ vf_idx = bnxt_tc_find_vf_by_fid(bp, src_fid);
+ if (vf_idx < 0)
+ return vf_idx;
+
+ action = &matchall_cmd->rule->action.entries[0];
+ if (action->id != FLOW_ACTION_POLICE) {
+ netdev_err(bp->dev, "%s: Unsupported matchall action: %d",
+ __func__, action->id);
+ return -EOPNOTSUPP;
+ }
+ if (bp->pf.vf[vf_idx].police_id && bp->pf.vf[vf_idx].police_id !=
+ matchall_cmd->cookie) {
+ netdev_err(bp->dev,
+ "%s: Policer is already configured for VF: %d",
+ __func__, vf_idx);
+ return -EEXIST;
+ }
+
+ rate = (u32)div_u64(action->police.rate_bytes_ps, 1024 * 1000) * 8;
+ burst = (u32)div_u64(action->police.rate_bytes_ps *
+ PSCHED_NS2TICKS(action->police.burst),
+ PSCHED_TICKS_PER_SEC);
+ burst = (u32)PSCHED_TICKS2NS(burst) / (1 << 20);
+
+ rc = bnxt_set_vf_bw(bp->dev, vf_idx, burst, rate);
+ if (rc) {
+ netdev_err(bp->dev,
+ "Error: %s: VF: %d rate: %llu burst: %llu rc: %d",
+ __func__, vf_idx, rate, burst, rc);
+ return rc;
+ }
+
+ bp->pf.vf[vf_idx].police_id = matchall_cmd->cookie;
+ return 0;
+}
+
+int bnxt_tc_setup_matchall(struct bnxt *bp, u16 src_fid,
+ struct tc_cls_matchall_offload *cls_matchall)
+{
+ switch (cls_matchall->command) {
+ case TC_CLSMATCHALL_REPLACE:
+ return bnxt_tc_add_matchall(bp, src_fid, cls_matchall);
+ case TC_CLSMATCHALL_DESTROY:
+ return bnxt_tc_del_matchall(bp, src_fid, cls_matchall);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
static const struct rhashtable_params bnxt_tc_flow_ht_params = {
.head_offset = offsetof(struct bnxt_tc_flow_node, node),
.key_offset = offsetof(struct bnxt_tc_flow_node, cookie),
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
index 10c62b0..963788e 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
@@ -220,6 +220,9 @@ int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,
int bnxt_init_tc(struct bnxt *bp);
void bnxt_shutdown_tc(struct bnxt *bp);
void bnxt_tc_flow_stats_work(struct bnxt *bp);
+int bnxt_tc_setup_matchall(struct bnxt *bp, u16 src_fid,
+ struct tc_cls_matchall_offload *cls_matchall);
+
static inline bool bnxt_tc_flower_enabled(struct bnxt *bp)
{
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
index b010b34..b9d3dae 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c
@@ -156,6 +156,8 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type,
switch (type) {
case TC_SETUP_CLSFLOWER:
return bnxt_tc_setup_flower(bp, vf_fid, type_data);
+ case TC_SETUP_CLSMATCHALL:
+ return bnxt_tc_setup_matchall(bp, vf_fid, type_data);
default:
return -EOPNOTSUPP;
}
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH net-next 01/16] bnxt_en: Support ingress rate limiting with TC-offload.
2020-01-26 9:02 ` [PATCH net-next 01/16] bnxt_en: Support ingress rate limiting with TC-offload Michael Chan
@ 2020-01-27 0:12 ` Jakub Kicinski
0 siblings, 0 replies; 23+ messages in thread
From: Jakub Kicinski @ 2020-01-27 0:12 UTC (permalink / raw)
To: Michael Chan; +Cc: davem, netdev, Sriharsha Basavapatna
On Sun, 26 Jan 2020 04:02:55 -0500, Michael Chan wrote:
> From: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
>
> This patch enables offloading of ingress rate limiting TC-action
> on a VF. The driver processes "cls_matchall" filter callbacks to
> add and remove ingress rate limiting actions. The driver parses
> police action parameter and sends the command to FW to configure
> rate limiting for the VF.
>
> For example, to configure rate limiting offload on a VF using OVS,
> use the below command on the corresponding VF-rep port. The example
> below configures min and max tx rates of 200 and 600 Mbps.
>
> # ovs-vsctl set interface bnxt0_pf0vf0 \
> ingress_policing_rate=600000 ingress_policing_burst=200000
>
> Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Does the device drop or back-pressure when VF goes over the rate?
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
> index f143354..534bc9e 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
> @@ -1069,6 +1069,7 @@ struct bnxt_vf_info {
> u32 max_tx_rate;
> void *hwrm_cmd_req_addr;
> dma_addr_t hwrm_cmd_req_dma_addr;
> + unsigned long police_id;
> };
> #endif
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
> index 0cc6ec5..2dfb650 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
> @@ -10,6 +10,7 @@
> #include <linux/netdevice.h>
> #include <linux/inetdevice.h>
> #include <linux/if_vlan.h>
> +#include <linux/pci.h>
> #include <net/flow_dissector.h>
> #include <net/pkt_cls.h>
> #include <net/tc_act/tc_gact.h>
> @@ -1983,6 +1984,95 @@ static int bnxt_tc_indr_block_event(struct notifier_block *nb,
> return NOTIFY_DONE;
> }
>
> +static inline int bnxt_tc_find_vf_by_fid(struct bnxt *bp, u16 fid)
No static inlines in C files
> +{
> + int num_vfs = pci_num_vf(bp->pdev);
> + int i;
> +
> + for (i = 0; i < num_vfs; i++) {
> + if (bp->pf.vf[i].fw_fid == fid)
return i;
> + break;
> + }
return -EINVAL;
> + if (i >= num_vfs)
> + return -EINVAL;
> + return i;
> +}
> +static int bnxt_tc_add_matchall(struct bnxt *bp, u16 src_fid,
> + struct tc_cls_matchall_offload *matchall_cmd)
> +{
> + struct flow_action_entry *action;
> + int vf_idx;
> + s64 burst;
> + u64 rate;
> + int rc;
> +
> + vf_idx = bnxt_tc_find_vf_by_fid(bp, src_fid);
> + if (vf_idx < 0)
> + return vf_idx;
You need to check this is the only action, check priority, check
shared, etc. Just look as one of the drivers which do this right :/
> + action = &matchall_cmd->rule->action.entries[0];
> + if (action->id != FLOW_ACTION_POLICE) {
> + netdev_err(bp->dev, "%s: Unsupported matchall action: %d",
> + __func__, action->id);
> + return -EOPNOTSUPP;
> + }
> + if (bp->pf.vf[vf_idx].police_id && bp->pf.vf[vf_idx].police_id !=
> + matchall_cmd->cookie) {
> + netdev_err(bp->dev,
> + "%s: Policer is already configured for VF: %d",
> + __func__, vf_idx);
> + return -EEXIST;
> + }
> +
> + rate = (u32)div_u64(action->police.rate_bytes_ps, 1024 * 1000) * 8;
> + burst = (u32)div_u64(action->police.rate_bytes_ps *
> + PSCHED_NS2TICKS(action->police.burst),
> + PSCHED_TICKS_PER_SEC);
> + burst = (u32)PSCHED_TICKS2NS(burst) / (1 << 20);
> +
> + rc = bnxt_set_vf_bw(bp->dev, vf_idx, burst, rate);
> + if (rc) {
> + netdev_err(bp->dev,
> + "Error: %s: VF: %d rate: %llu burst: %llu rc: %d",
> + __func__, vf_idx, rate, burst, rc);
> + return rc;
> + }
> +
> + bp->pf.vf[vf_idx].police_id = matchall_cmd->cookie;
> + return 0;
> +}
> +
> +int bnxt_tc_setup_matchall(struct bnxt *bp, u16 src_fid,
> + struct tc_cls_matchall_offload *cls_matchall)
> +{
> + switch (cls_matchall->command) {
> + case TC_CLSMATCHALL_REPLACE:
> + return bnxt_tc_add_matchall(bp, src_fid, cls_matchall);
> + case TC_CLSMATCHALL_DESTROY:
> + return bnxt_tc_del_matchall(bp, src_fid, cls_matchall);
> + default:
> + return -EOPNOTSUPP;
> + }
> +}
> +
> static const struct rhashtable_params bnxt_tc_flow_ht_params = {
> .head_offset = offsetof(struct bnxt_tc_flow_node, node),
> .key_offset = offsetof(struct bnxt_tc_flow_node, cookie),
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
> index 10c62b0..963788e 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h
> @@ -220,6 +220,9 @@ int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,
> int bnxt_init_tc(struct bnxt *bp);
> void bnxt_shutdown_tc(struct bnxt *bp);
> void bnxt_tc_flow_stats_work(struct bnxt *bp);
> +int bnxt_tc_setup_matchall(struct bnxt *bp, u16 src_fid,
> + struct tc_cls_matchall_offload *cls_matchall);
> +
>
Spurious new line
> static inline bool bnxt_tc_flower_enabled(struct bnxt *bp)
> {
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH net-next 02/16] bnxt_en: Improve link up detection.
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
2020-01-26 9:02 ` [PATCH net-next 01/16] bnxt_en: Support ingress rate limiting with TC-offload Michael Chan
@ 2020-01-26 9:02 ` Michael Chan
2020-01-26 9:02 ` [PATCH net-next 03/16] bnxt_en: Improve bnxt_probe_phy() Michael Chan
` (13 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:02 UTC (permalink / raw)
To: davem; +Cc: netdev
In bnxt_update_phy_setting(), ethtool_get_link_ksettings() and
bnxt_disable_an_for_lpbk(), we inconsistently use netif_carrier_ok()
to determine link. Instead, we should use bp->link_info.link_up
which has the true link state. The netif_carrier state may be off
during self-test and while the device is being reset and may not always
reflect the true link state.
By always using bp->link_info.link_up, the code is now more
consistent and more correct. Some unnecessary link toggles are
now prevented with this patch.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 198c69dc..4b6f746 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -9064,7 +9064,7 @@ static int bnxt_update_phy_setting(struct bnxt *bp)
/* The last close may have shutdown the link, so need to call
* PHY_CFG to bring it back up.
*/
- if (!netif_carrier_ok(bp->dev))
+ if (!bp->link_info.link_up)
update_link = true;
if (!bnxt_eee_config_ok(bp))
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 08d56ec..6171fa8 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1462,15 +1462,15 @@ static int bnxt_get_link_ksettings(struct net_device *dev,
ethtool_link_ksettings_add_link_mode(lk_ksettings,
advertising, Autoneg);
base->autoneg = AUTONEG_ENABLE;
- if (link_info->phy_link_status == BNXT_LINK_LINK)
+ base->duplex = DUPLEX_UNKNOWN;
+ if (link_info->phy_link_status == BNXT_LINK_LINK) {
bnxt_fw_to_ethtool_lp_adv(link_info, lk_ksettings);
+ if (link_info->duplex & BNXT_LINK_DUPLEX_FULL)
+ base->duplex = DUPLEX_FULL;
+ else
+ base->duplex = DUPLEX_HALF;
+ }
ethtool_speed = bnxt_fw_to_ethtool_speed(link_info->link_speed);
- if (!netif_carrier_ok(dev))
- base->duplex = DUPLEX_UNKNOWN;
- else if (link_info->duplex & BNXT_LINK_DUPLEX_FULL)
- base->duplex = DUPLEX_FULL;
- else
- base->duplex = DUPLEX_HALF;
} else {
base->autoneg = AUTONEG_DISABLE;
ethtool_speed =
@@ -2707,7 +2707,7 @@ static int bnxt_disable_an_for_lpbk(struct bnxt *bp,
return rc;
fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB;
- if (netif_carrier_ok(bp->dev))
+ if (bp->link_info.link_up)
fw_speed = bp->link_info.link_speed;
else if (fw_advertising & BNXT_LINK_SPEED_MSK_10GB)
fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10GB;
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 03/16] bnxt_en: Improve bnxt_probe_phy().
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
2020-01-26 9:02 ` [PATCH net-next 01/16] bnxt_en: Support ingress rate limiting with TC-offload Michael Chan
2020-01-26 9:02 ` [PATCH net-next 02/16] bnxt_en: Improve link up detection Michael Chan
@ 2020-01-26 9:02 ` Michael Chan
2020-01-26 9:02 ` [PATCH net-next 04/16] bnxt_en: Remove the setting of dev_port Michael Chan
` (12 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:02 UTC (permalink / raw)
To: davem; +Cc: netdev
If the 2nd parameter fw_dflt is not set, we are calling bnxt_probe_phy()
after the firmware has reset. There is no need to query the current
PHY settings from firmware as these settings may be different from
the ethtool settings that the driver will re-establish later. So
return earlier in bnxt_probe_phy() to save one firmware call.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4b6f746..4d790bc 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11471,6 +11471,9 @@ static int bnxt_probe_phy(struct bnxt *bp, bool fw_dflt)
rc);
return rc;
}
+ if (!fw_dflt)
+ return 0;
+
rc = bnxt_update_link(bp, false);
if (rc) {
netdev_err(bp->dev, "Probe phy can't update link (rc: %x)\n",
@@ -11484,9 +11487,6 @@ static int bnxt_probe_phy(struct bnxt *bp, bool fw_dflt)
if (link_info->auto_link_speeds && !link_info->support_auto_speeds)
link_info->support_auto_speeds = link_info->support_speeds;
- if (!fw_dflt)
- return 0;
-
bnxt_init_ethtool_link_settings(bp);
return 0;
}
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 04/16] bnxt_en: Remove the setting of dev_port.
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (2 preceding siblings ...)
2020-01-26 9:02 ` [PATCH net-next 03/16] bnxt_en: Improve bnxt_probe_phy() Michael Chan
@ 2020-01-26 9:02 ` Michael Chan
2020-01-26 9:02 ` [PATCH net-next 05/16] bnxt_en: Support UDP RSS hashing on 575XX chips Michael Chan
` (11 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:02 UTC (permalink / raw)
To: davem; +Cc: netdev
The dev_port is meant to distinguish the network ports belonging to
the same PCI function. Our devices only have one network port
associated with each PCI function and so we should not set it for
correctness.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4d790bc..6c0c926 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -6998,7 +6998,6 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
pf->fw_fid = le16_to_cpu(resp->fid);
pf->port_id = le16_to_cpu(resp->port_id);
- bp->dev->dev_port = pf->port_id;
memcpy(pf->mac_addr, resp->mac_address, ETH_ALEN);
pf->first_vf_id = le16_to_cpu(resp->first_vf_id);
pf->max_vfs = le16_to_cpu(resp->max_vfs);
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 05/16] bnxt_en: Support UDP RSS hashing on 575XX chips.
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (3 preceding siblings ...)
2020-01-26 9:02 ` [PATCH net-next 04/16] bnxt_en: Remove the setting of dev_port Michael Chan
@ 2020-01-26 9:02 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 06/16] bnxt_en: Do not accept fragments for aRFS flow steering Michael Chan
` (10 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:02 UTC (permalink / raw)
To: davem; +Cc: netdev
575XX (P5) chips have the same UDP RSS hashing capability as P4 chips,
so we can enable it on P5 chips.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 6c0c926..fb4a65f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -10568,7 +10568,7 @@ static void bnxt_set_dflt_rss_hash_type(struct bnxt *bp)
VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 |
VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 |
VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;
- if (BNXT_CHIP_P4(bp) && bp->hwrm_spec_code >= 0x10501) {
+ if (BNXT_CHIP_P4_PLUS(bp) && bp->hwrm_spec_code >= 0x10501) {
bp->flags |= BNXT_FLAG_UDP_RSS_CAP;
bp->rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4 |
VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 06/16] bnxt_en: Do not accept fragments for aRFS flow steering.
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (4 preceding siblings ...)
2020-01-26 9:02 ` [PATCH net-next 05/16] bnxt_en: Support UDP RSS hashing on 575XX chips Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 07/16] bnxt_en: Periodically check and remove aged-out ntuple filters Michael Chan
` (9 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev
In bnxt_rx_flow_steer(), if the dissected packet is a fragment, do not
proceed to create the ntuple filter and return error instead. Otherwise
we would create a filter with 0 source and destination ports because
the dissected ports would not be available for fragments.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index fb4a65f..fb67e66 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11100,6 +11100,7 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
struct ethhdr *eth = (struct ethhdr *)skb_mac_header(skb);
int rc = 0, idx, bit_id, l2_idx = 0;
struct hlist_head *head;
+ u32 flags;
if (!ether_addr_equal(dev->dev_addr, eth->h_dest)) {
struct bnxt_vnic_info *vnic = &bp->vnic_info[0];
@@ -11139,8 +11140,9 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,
rc = -EPROTONOSUPPORT;
goto err_free;
}
- if ((fkeys->control.flags & FLOW_DIS_ENCAPSULATION) &&
- bp->hwrm_spec_code < 0x10601) {
+ flags = fkeys->control.flags;
+ if (((flags & FLOW_DIS_ENCAPSULATION) &&
+ bp->hwrm_spec_code < 0x10601) || (flags & FLOW_DIS_IS_FRAGMENT)) {
rc = -EPROTONOSUPPORT;
goto err_free;
}
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 07/16] bnxt_en: Periodically check and remove aged-out ntuple filters
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (5 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 06/16] bnxt_en: Do not accept fragments for aRFS flow steering Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 08/16] bnxt_en: Disable workaround for lost interrupts on 575XX B0 and newer chips Michael Chan
` (8 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Pavan Chebbi
From: Pavan Chebbi <pavan.chebbi@broadcom.com>
Currently the only time we check and remove expired filters is
when we are inserting new filters.
Improving the aRFS expiry handling by adding code to do the above
work periodically.
Signed-off-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index fb67e66..7d53672 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -10040,6 +10040,13 @@ static void bnxt_timer(struct timer_list *t)
bnxt_queue_sp_work(bp);
}
+#ifdef CONFIG_RFS_ACCEL
+ if ((bp->flags & BNXT_FLAG_RFS) && bp->ntp_fltr_count) {
+ set_bit(BNXT_RX_NTP_FLTR_SP_EVENT, &bp->sp_event);
+ bnxt_queue_sp_work(bp);
+ }
+#endif /*CONFIG_RFS_ACCEL*/
+
if (bp->link_info.phy_retry) {
if (time_after(jiffies, bp->link_info.phy_retry_expires)) {
bp->link_info.phy_retry = false;
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 08/16] bnxt_en: Disable workaround for lost interrupts on 575XX B0 and newer chips.
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (6 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 07/16] bnxt_en: Periodically check and remove aged-out ntuple filters Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 09/16] bnxt_en: Refactor bnxt_dl_register() Michael Chan
` (7 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev
The hardware bug has been fixed on B0 and newer chips, so disable the
workaround on these chips.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +++-
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 7d53672..676f4da 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7288,6 +7288,7 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)
bp->hwrm_max_ext_req_len = HWRM_MAX_REQ_LEN;
bp->chip_num = le16_to_cpu(resp->chip_num);
+ bp->chip_rev = resp->chip_rev;
if (bp->chip_num == CHIP_NUM_58700 && !resp->chip_rev &&
!resp->chip_metal)
bp->flags |= BNXT_FLAG_CHIP_NITRO_A0;
@@ -10057,7 +10058,8 @@ static void bnxt_timer(struct timer_list *t)
}
}
- if ((bp->flags & BNXT_FLAG_CHIP_P5) && netif_carrier_ok(dev)) {
+ if ((bp->flags & BNXT_FLAG_CHIP_P5) && !bp->chip_rev &&
+ netif_carrier_ok(dev)) {
set_bit(BNXT_RING_COAL_NOW_SP_EVENT, &bp->sp_event);
bnxt_queue_sp_work(bp);
}
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 534bc9e..cb2b833 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1458,6 +1458,8 @@ struct bnxt {
#define CHIP_NUM_58804 0xd804
#define CHIP_NUM_58808 0xd808
+ u8 chip_rev;
+
#define BNXT_CHIP_NUM_5730X(chip_num) \
((chip_num) >= CHIP_NUM_57301 && \
(chip_num) <= CHIP_NUM_57304)
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 09/16] bnxt_en: Refactor bnxt_dl_register()
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (7 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 08/16] bnxt_en: Disable workaround for lost interrupts on 575XX B0 and newer chips Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 11:32 ` Jiri Pirko
2020-01-26 9:03 ` [PATCH net-next 10/16] bnxt_en: Register devlink irrespective of firmware spec version Michael Chan
` (6 subsequent siblings)
15 siblings, 1 reply; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Define bnxt_dl_params_register() and bnxt_dl_params_unregister()
functions and move params register/unregister code to these newly
defined functions. This patch is in preparation to register
devlink irrespective of firmware spec. version in the next patch.
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 60 ++++++++++++++---------
1 file changed, 36 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 0c3d224..9253eed 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -485,6 +485,38 @@ static const struct devlink_param bnxt_dl_params[] = {
static const struct devlink_param bnxt_dl_port_params[] = {
};
+static int bnxt_dl_params_register(struct bnxt *bp)
+{
+ int rc;
+
+ rc = devlink_params_register(bp->dl, bnxt_dl_params,
+ ARRAY_SIZE(bnxt_dl_params));
+ if (rc) {
+ netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",
+ rc);
+ return rc;
+ }
+ rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
+ ARRAY_SIZE(bnxt_dl_port_params));
+ if (rc) {
+ netdev_err(bp->dev, "devlink_port_params_register failed");
+ devlink_params_unregister(bp->dl, bnxt_dl_params,
+ ARRAY_SIZE(bnxt_dl_params));
+ return rc;
+ }
+ devlink_params_publish(bp->dl);
+
+ return 0;
+}
+
+static void bnxt_dl_params_unregister(struct bnxt *bp)
+{
+ devlink_params_unregister(bp->dl, bnxt_dl_params,
+ ARRAY_SIZE(bnxt_dl_params));
+ devlink_port_params_unregister(&bp->dl_port, bnxt_dl_port_params,
+ ARRAY_SIZE(bnxt_dl_port_params));
+}
+
int bnxt_dl_register(struct bnxt *bp)
{
struct devlink *dl;
@@ -520,40 +552,24 @@ int bnxt_dl_register(struct bnxt *bp)
if (!BNXT_PF(bp))
return 0;
- rc = devlink_params_register(dl, bnxt_dl_params,
- ARRAY_SIZE(bnxt_dl_params));
- if (rc) {
- netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",
- rc);
- goto err_dl_unreg;
- }
-
devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
bp->pf.port_id, false, 0,
bp->switch_id, sizeof(bp->switch_id));
rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
if (rc) {
netdev_err(bp->dev, "devlink_port_register failed");
- goto err_dl_param_unreg;
+ goto err_dl_unreg;
}
devlink_port_type_eth_set(&bp->dl_port, bp->dev);
- rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
- ARRAY_SIZE(bnxt_dl_port_params));
- if (rc) {
- netdev_err(bp->dev, "devlink_port_params_register failed");
+ rc = bnxt_dl_params_register(bp);
+ if (rc)
goto err_dl_port_unreg;
- }
-
- devlink_params_publish(dl);
return 0;
err_dl_port_unreg:
devlink_port_unregister(&bp->dl_port);
-err_dl_param_unreg:
- devlink_params_unregister(dl, bnxt_dl_params,
- ARRAY_SIZE(bnxt_dl_params));
err_dl_unreg:
devlink_unregister(dl);
err_dl_free:
@@ -570,12 +586,8 @@ void bnxt_dl_unregister(struct bnxt *bp)
return;
if (BNXT_PF(bp)) {
- devlink_port_params_unregister(&bp->dl_port,
- bnxt_dl_port_params,
- ARRAY_SIZE(bnxt_dl_port_params));
+ bnxt_dl_params_unregister(bp);
devlink_port_unregister(&bp->dl_port);
- devlink_params_unregister(dl, bnxt_dl_params,
- ARRAY_SIZE(bnxt_dl_params));
}
devlink_unregister(dl);
devlink_free(dl);
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH net-next 09/16] bnxt_en: Refactor bnxt_dl_register()
2020-01-26 9:03 ` [PATCH net-next 09/16] bnxt_en: Refactor bnxt_dl_register() Michael Chan
@ 2020-01-26 11:32 ` Jiri Pirko
2020-01-27 4:51 ` Vasundhara Volam
0 siblings, 1 reply; 23+ messages in thread
From: Jiri Pirko @ 2020-01-26 11:32 UTC (permalink / raw)
To: Michael Chan; +Cc: davem, netdev, Vasundhara Volam
Sun, Jan 26, 2020 at 10:03:03AM CET, michael.chan@broadcom.com wrote:
>From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
>
>Define bnxt_dl_params_register() and bnxt_dl_params_unregister()
>functions and move params register/unregister code to these newly
>defined functions. This patch is in preparation to register
>devlink irrespective of firmware spec. version in the next patch.
>
>Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
>Signed-off-by: Michael Chan <michael.chan@broadcom.com>
>---
> drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 60 ++++++++++++++---------
> 1 file changed, 36 insertions(+), 24 deletions(-)
>
>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
>index 0c3d224..9253eed 100644
>--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
>+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
>@@ -485,6 +485,38 @@ static const struct devlink_param bnxt_dl_params[] = {
> static const struct devlink_param bnxt_dl_port_params[] = {
> };
>
>+static int bnxt_dl_params_register(struct bnxt *bp)
>+{
>+ int rc;
>+
>+ rc = devlink_params_register(bp->dl, bnxt_dl_params,
>+ ARRAY_SIZE(bnxt_dl_params));
>+ if (rc) {
>+ netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",
>+ rc);
>+ return rc;
>+ }
>+ rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
>+ ARRAY_SIZE(bnxt_dl_port_params));
Wait, this assumes that you have 1:1 devlink:devlink_port setup. Is that
correct? Don't you have other devlink_ports for eswitch representors
that have params?
>+ if (rc) {
>+ netdev_err(bp->dev, "devlink_port_params_register failed");
>+ devlink_params_unregister(bp->dl, bnxt_dl_params,
>+ ARRAY_SIZE(bnxt_dl_params));
>+ return rc;
>+ }
>+ devlink_params_publish(bp->dl);
>+
>+ return 0;
>+}
>+
>+static void bnxt_dl_params_unregister(struct bnxt *bp)
>+{
>+ devlink_params_unregister(bp->dl, bnxt_dl_params,
>+ ARRAY_SIZE(bnxt_dl_params));
>+ devlink_port_params_unregister(&bp->dl_port, bnxt_dl_port_params,
>+ ARRAY_SIZE(bnxt_dl_port_params));
>+}
>+
> int bnxt_dl_register(struct bnxt *bp)
> {
> struct devlink *dl;
>@@ -520,40 +552,24 @@ int bnxt_dl_register(struct bnxt *bp)
> if (!BNXT_PF(bp))
> return 0;
>
>- rc = devlink_params_register(dl, bnxt_dl_params,
>- ARRAY_SIZE(bnxt_dl_params));
>- if (rc) {
>- netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",
>- rc);
>- goto err_dl_unreg;
>- }
>-
> devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
> bp->pf.port_id, false, 0,
> bp->switch_id, sizeof(bp->switch_id));
> rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
> if (rc) {
> netdev_err(bp->dev, "devlink_port_register failed");
>- goto err_dl_param_unreg;
>+ goto err_dl_unreg;
> }
> devlink_port_type_eth_set(&bp->dl_port, bp->dev);
>
>- rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
>- ARRAY_SIZE(bnxt_dl_port_params));
>- if (rc) {
>- netdev_err(bp->dev, "devlink_port_params_register failed");
>+ rc = bnxt_dl_params_register(bp);
>+ if (rc)
> goto err_dl_port_unreg;
>- }
>-
>- devlink_params_publish(dl);
>
> return 0;
>
> err_dl_port_unreg:
> devlink_port_unregister(&bp->dl_port);
>-err_dl_param_unreg:
>- devlink_params_unregister(dl, bnxt_dl_params,
>- ARRAY_SIZE(bnxt_dl_params));
> err_dl_unreg:
> devlink_unregister(dl);
> err_dl_free:
>@@ -570,12 +586,8 @@ void bnxt_dl_unregister(struct bnxt *bp)
> return;
>
> if (BNXT_PF(bp)) {
>- devlink_port_params_unregister(&bp->dl_port,
>- bnxt_dl_port_params,
>- ARRAY_SIZE(bnxt_dl_port_params));
>+ bnxt_dl_params_unregister(bp);
> devlink_port_unregister(&bp->dl_port);
>- devlink_params_unregister(dl, bnxt_dl_params,
>- ARRAY_SIZE(bnxt_dl_params));
> }
> devlink_unregister(dl);
> devlink_free(dl);
>--
>2.5.1
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [PATCH net-next 09/16] bnxt_en: Refactor bnxt_dl_register()
2020-01-26 11:32 ` Jiri Pirko
@ 2020-01-27 4:51 ` Vasundhara Volam
0 siblings, 0 replies; 23+ messages in thread
From: Vasundhara Volam @ 2020-01-27 4:51 UTC (permalink / raw)
To: Jiri Pirko; +Cc: Michael Chan, David Miller, Netdev
On Sun, Jan 26, 2020 at 5:02 PM Jiri Pirko <jiri@resnulli.us> wrote:
>
> Sun, Jan 26, 2020 at 10:03:03AM CET, michael.chan@broadcom.com wrote:
> >From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
> >
> >Define bnxt_dl_params_register() and bnxt_dl_params_unregister()
> >functions and move params register/unregister code to these newly
> >defined functions. This patch is in preparation to register
> >devlink irrespective of firmware spec. version in the next patch.
> >
> >Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
> >Signed-off-by: Michael Chan <michael.chan@broadcom.com>
> >---
> > drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 60 ++++++++++++++---------
> > 1 file changed, 36 insertions(+), 24 deletions(-)
> >
> >diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
> >index 0c3d224..9253eed 100644
> >--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
> >+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
> >@@ -485,6 +485,38 @@ static const struct devlink_param bnxt_dl_params[] = {
> > static const struct devlink_param bnxt_dl_port_params[] = {
> > };
> >
> >+static int bnxt_dl_params_register(struct bnxt *bp)
> >+{
> >+ int rc;
> >+
> >+ rc = devlink_params_register(bp->dl, bnxt_dl_params,
> >+ ARRAY_SIZE(bnxt_dl_params));
> >+ if (rc) {
> >+ netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",
> >+ rc);
> >+ return rc;
> >+ }
> >+ rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
> >+ ARRAY_SIZE(bnxt_dl_port_params));
>
> Wait, this assumes that you have 1:1 devlink:devlink_port setup. Is that
> correct? Don't you have other devlink_ports for eswitch representors
> that have params?
Yes Jiri, this assumes 1:1 setup. Our driver does not register params for VFs.
It will register params only for PFs.
This patch is refactoring of code and moving params_registers to a new function,
which will not be called for VFs.
There is a check for PF in bnxt_dl_register() and return before calling
bnxt_dl_params_register(), if check fails.
>
>
> >+ if (rc) {
> >+ netdev_err(bp->dev, "devlink_port_params_register failed");
> >+ devlink_params_unregister(bp->dl, bnxt_dl_params,
> >+ ARRAY_SIZE(bnxt_dl_params));
> >+ return rc;
> >+ }
> >+ devlink_params_publish(bp->dl);
> >+
> >+ return 0;
> >+}
> >+
> >+static void bnxt_dl_params_unregister(struct bnxt *bp)
> >+{
> >+ devlink_params_unregister(bp->dl, bnxt_dl_params,
> >+ ARRAY_SIZE(bnxt_dl_params));
> >+ devlink_port_params_unregister(&bp->dl_port, bnxt_dl_port_params,
> >+ ARRAY_SIZE(bnxt_dl_port_params));
> >+}
> >+
> > int bnxt_dl_register(struct bnxt *bp)
> > {
> > struct devlink *dl;
> >@@ -520,40 +552,24 @@ int bnxt_dl_register(struct bnxt *bp)
> > if (!BNXT_PF(bp))
> > return 0;
> >
> >- rc = devlink_params_register(dl, bnxt_dl_params,
> >- ARRAY_SIZE(bnxt_dl_params));
> >- if (rc) {
> >- netdev_warn(bp->dev, "devlink_params_register failed. rc=%d",
> >- rc);
> >- goto err_dl_unreg;
> >- }
> >-
> > devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
> > bp->pf.port_id, false, 0,
> > bp->switch_id, sizeof(bp->switch_id));
> > rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
> > if (rc) {
> > netdev_err(bp->dev, "devlink_port_register failed");
> >- goto err_dl_param_unreg;
> >+ goto err_dl_unreg;
> > }
> > devlink_port_type_eth_set(&bp->dl_port, bp->dev);
> >
> >- rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
> >- ARRAY_SIZE(bnxt_dl_port_params));
> >- if (rc) {
> >- netdev_err(bp->dev, "devlink_port_params_register failed");
> >+ rc = bnxt_dl_params_register(bp);
> >+ if (rc)
> > goto err_dl_port_unreg;
> >- }
> >-
> >- devlink_params_publish(dl);
> >
> > return 0;
> >
> > err_dl_port_unreg:
> > devlink_port_unregister(&bp->dl_port);
> >-err_dl_param_unreg:
> >- devlink_params_unregister(dl, bnxt_dl_params,
> >- ARRAY_SIZE(bnxt_dl_params));
> > err_dl_unreg:
> > devlink_unregister(dl);
> > err_dl_free:
> >@@ -570,12 +586,8 @@ void bnxt_dl_unregister(struct bnxt *bp)
> > return;
> >
> > if (BNXT_PF(bp)) {
> >- devlink_port_params_unregister(&bp->dl_port,
> >- bnxt_dl_port_params,
> >- ARRAY_SIZE(bnxt_dl_port_params));
> >+ bnxt_dl_params_unregister(bp);
> > devlink_port_unregister(&bp->dl_port);
> >- devlink_params_unregister(dl, bnxt_dl_params,
> >- ARRAY_SIZE(bnxt_dl_params));
> > }
> > devlink_unregister(dl);
> > devlink_free(dl);
> >--
> >2.5.1
> >
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH net-next 10/16] bnxt_en: Register devlink irrespective of firmware spec version
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (8 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 09/16] bnxt_en: Refactor bnxt_dl_register() Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 11/16] bnxt_en: Move devlink_register before registering netdev Michael Chan
` (5 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
This will allow to register for devlink port and use port features.
Also register params only if firmware spec version is at least 0x10600
which will support reading/setting numbered variables in NVRAM.
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 9253eed..a8cdfbdd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -489,6 +489,9 @@ static int bnxt_dl_params_register(struct bnxt *bp)
{
int rc;
+ if (bp->hwrm_spec_code < 0x10600)
+ return 0;
+
rc = devlink_params_register(bp->dl, bnxt_dl_params,
ARRAY_SIZE(bnxt_dl_params));
if (rc) {
@@ -511,6 +514,9 @@ static int bnxt_dl_params_register(struct bnxt *bp)
static void bnxt_dl_params_unregister(struct bnxt *bp)
{
+ if (bp->hwrm_spec_code < 0x10600)
+ return;
+
devlink_params_unregister(bp->dl, bnxt_dl_params,
ARRAY_SIZE(bnxt_dl_params));
devlink_port_params_unregister(&bp->dl_port, bnxt_dl_port_params,
@@ -522,11 +528,6 @@ int bnxt_dl_register(struct bnxt *bp)
struct devlink *dl;
int rc;
- if (bp->hwrm_spec_code < 0x10600) {
- netdev_warn(bp->dev, "Firmware does not support NVM params");
- return -ENOTSUPP;
- }
-
if (BNXT_PF(bp))
dl = devlink_alloc(&bnxt_dl_ops, sizeof(struct bnxt_dl));
else
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 11/16] bnxt_en: Move devlink_register before registering netdev
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (9 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 10/16] bnxt_en: Register devlink irrespective of firmware spec version Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 12/16] bnxt_en: Add support to update progress of flash update Michael Chan
` (4 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam, Jiri Pirko
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Latest kernels get the phys_port_name via devlink, if
ndo_get_phys_port_name is not defined. To provide the phys_port_name
correctly, register devlink before registering netdev.
Also call devlink_port_type_eth_set() after registering netdev as
devlink port updates the netdev structure and notifies user.
Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 ++++++++----
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 1 -
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 676f4da..8579415 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11445,9 +11445,9 @@ static void bnxt_remove_one(struct pci_dev *pdev)
bnxt_sriov_disable(bp);
bnxt_dl_fw_reporters_destroy(bp, true);
- bnxt_dl_unregister(bp);
pci_disable_pcie_error_reporting(pdev);
unregister_netdev(dev);
+ bnxt_dl_unregister(bp);
bnxt_shutdown_tc(bp);
bnxt_cancel_sp_work(bp);
bp->sp_event = 0;
@@ -11917,11 +11917,14 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
bnxt_init_tc(bp);
}
+ bnxt_dl_register(bp);
+
rc = register_netdev(dev);
if (rc)
- goto init_err_cleanup_tc;
+ goto init_err_cleanup;
- bnxt_dl_register(bp);
+ if (BNXT_PF(bp))
+ devlink_port_type_eth_set(&bp->dl_port, bp->dev);
bnxt_dl_fw_reporters_create(bp);
netdev_info(dev, "%s found at mem %lx, node addr %pM\n",
@@ -11931,7 +11934,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0;
-init_err_cleanup_tc:
+init_err_cleanup:
+ bnxt_dl_unregister(bp);
bnxt_shutdown_tc(bp);
bnxt_clear_int_mode(bp);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index a8cdfbdd..f2d9cd6 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -561,7 +561,6 @@ int bnxt_dl_register(struct bnxt *bp)
netdev_err(bp->dev, "devlink_port_register failed");
goto err_dl_unreg;
}
- devlink_port_type_eth_set(&bp->dl_port, bp->dev);
rc = bnxt_dl_params_register(bp);
if (rc)
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 12/16] bnxt_en: Add support to update progress of flash update
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (10 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 11/16] bnxt_en: Move devlink_register before registering netdev Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 13/16] bnxt_en: Rename switch_id to dsn Michael Chan
` (3 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam, Jiri Pirko
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
This patch adds status notification to devlink flash update
while flashing is in progress.
$ devlink dev flash pci/0000:05:00.0 file 103.pkg
Preparing to flash
Flashing done
Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index f2d9cd6..265a68c 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -21,6 +21,7 @@ bnxt_dl_flash_update(struct devlink *dl, const char *filename,
const char *region, struct netlink_ext_ack *extack)
{
struct bnxt *bp = bnxt_get_bp_from_dl(dl);
+ int rc;
if (region)
return -EOPNOTSUPP;
@@ -31,7 +32,18 @@ bnxt_dl_flash_update(struct devlink *dl, const char *filename,
return -EPERM;
}
- return bnxt_flash_package_from_file(bp->dev, filename, 0);
+ devlink_flash_update_begin_notify(dl);
+ devlink_flash_update_status_notify(dl, "Preparing to flash", region, 0,
+ 0);
+ rc = bnxt_flash_package_from_file(bp->dev, filename, 0);
+ if (!rc)
+ devlink_flash_update_status_notify(dl, "Flashing done", region,
+ 0, 0);
+ else
+ devlink_flash_update_status_notify(dl, "Flashing failed",
+ region, 0, 0);
+ devlink_flash_update_end_notify(dl);
+ return rc;
}
static int bnxt_fw_reporter_diagnose(struct devlink_health_reporter *reporter,
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 13/16] bnxt_en: Rename switch_id to dsn
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (11 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 12/16] bnxt_en: Add support to update progress of flash update Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg" Michael Chan
` (2 subsequent siblings)
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Instead of switch_id, renaming it to dsn will be more meaningful
so that it can be used to display device serial number in follow up
patch via devlink_info command.
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +++---
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8579415..483935b 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11388,8 +11388,8 @@ int bnxt_get_port_parent_id(struct net_device *dev,
if (!BNXT_PF(bp) || !(bp->flags & BNXT_FLAG_DSN_VALID))
return -EOPNOTSUPP;
- ppid->id_len = sizeof(bp->switch_id);
- memcpy(ppid->id, bp->switch_id, ppid->id_len);
+ ppid->id_len = sizeof(bp->dsn);
+ memcpy(ppid->id, bp->dsn, ppid->id_len);
return 0;
}
@@ -11870,7 +11870,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if (BNXT_PF(bp)) {
/* Read the adapter's DSN to use as the eswitch switch_id */
- bnxt_pcie_dsn_get(bp, bp->switch_id);
+ rc = bnxt_pcie_dsn_get(bp, bp->dsn);
}
/* MTU range: 60 - FW defined max */
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index cb2b833..1f6ea58 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1849,7 +1849,7 @@ struct bnxt {
enum devlink_eswitch_mode eswitch_mode;
struct bnxt_vf_rep **vf_reps; /* array of vf-rep ptrs */
u16 *cfa_code_map; /* cfa_code -> vf_idx map */
- u8 switch_id[8];
+ u8 dsn[8];
struct bnxt_tc_info *tc_info;
struct list_head tc_indr_block_list;
struct notifier_block tc_netdev_nb;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 265a68c..35e2a22 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -566,8 +566,8 @@ int bnxt_dl_register(struct bnxt *bp)
return 0;
devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
- bp->pf.port_id, false, 0,
- bp->switch_id, sizeof(bp->switch_id));
+ bp->pf.port_id, false, 0, bp->dsn,
+ sizeof(bp->dsn));
rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
if (rc) {
netdev_err(bp->dev, "devlink_port_register failed");
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg"
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (12 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 13/16] bnxt_en: Rename switch_id to dsn Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-27 0:18 ` Jakub Kicinski
2020-01-26 9:03 ` [PATCH net-next 15/16] bnxt_en: Add support for devlink info command Michael Chan
2020-01-26 9:03 ` [PATCH net-next 16/16] devlink: document devlink info versions reported by bnxt_en driver Michael Chan
15 siblings, 1 reply; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam, Jiri Pirko
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Add definitions and documentation for 2 new generic info "fw.roce" and
"board.nvm_cfg".
Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
Documentation/networking/devlink/devlink-info.rst | 11 +++++++++++
include/net/devlink.h | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/Documentation/networking/devlink/devlink-info.rst b/Documentation/networking/devlink/devlink-info.rst
index 0385f15..ab0690e 100644
--- a/Documentation/networking/devlink/devlink-info.rst
+++ b/Documentation/networking/devlink/devlink-info.rst
@@ -59,6 +59,11 @@ board.manufacture
An identifier of the company or the facility which produced the part.
+board.nvm_cfg
+-------------
+
+Non-volatile memory version of the board.
+
fw
--
@@ -92,3 +97,9 @@ fw.psid
-------
Unique identifier of the firmware parameter set.
+
+fw.roce
+-------
+
+RoCE firmware version which is responsible for handling roce
+management.
diff --git a/include/net/devlink.h b/include/net/devlink.h
index 5e46c24..9e168a3 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -469,6 +469,8 @@ enum devlink_param_generic_id {
#define DEVLINK_INFO_VERSION_GENERIC_BOARD_REV "board.rev"
/* Maker of the board */
#define DEVLINK_INFO_VERSION_GENERIC_BOARD_MANUFACTURE "board.manufacture"
+/* Non-volatile memory version of the board */
+#define DEVLINK_INFO_VERSION_GENERIC_BOARD_NVM_CFG "board.nvm_cfg"
/* Part number, identifier of asic design */
#define DEVLINK_INFO_VERSION_GENERIC_ASIC_ID "asic.id"
@@ -487,6 +489,8 @@ enum devlink_param_generic_id {
#define DEVLINK_INFO_VERSION_GENERIC_FW_NCSI "fw.ncsi"
/* FW parameter set id */
#define DEVLINK_INFO_VERSION_GENERIC_FW_PSID "fw.psid"
+/* RoCE FW version */
+#define DEVLINK_INFO_VERSION_GENERIC_FW_ROCE "fw.roce"
struct devlink_region;
struct devlink_info_req;
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* Re: [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg"
2020-01-26 9:03 ` [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg" Michael Chan
@ 2020-01-27 0:18 ` Jakub Kicinski
2020-01-27 5:42 ` Vasundhara Volam
0 siblings, 1 reply; 23+ messages in thread
From: Jakub Kicinski @ 2020-01-27 0:18 UTC (permalink / raw)
To: Michael Chan; +Cc: davem, netdev, Vasundhara Volam, Jiri Pirko
On Sun, 26 Jan 2020 04:03:08 -0500, Michael Chan wrote:
> --- a/Documentation/networking/devlink/devlink-info.rst
> +++ b/Documentation/networking/devlink/devlink-info.rst
> @@ -59,6 +59,11 @@ board.manufacture
>
> An identifier of the company or the facility which produced the part.
>
> +board.nvm_cfg
> +-------------
> +
> +Non-volatile memory version of the board.
Could you describe a little more detail? Sounds a little similar to
fw.psid which Mellanox has added, perhaps it serves the same purpose
and we could reuse that one?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg"
2020-01-27 0:18 ` Jakub Kicinski
@ 2020-01-27 5:42 ` Vasundhara Volam
2020-01-27 14:25 ` Jakub Kicinski
0 siblings, 1 reply; 23+ messages in thread
From: Vasundhara Volam @ 2020-01-27 5:42 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: Michael Chan, David Miller, Netdev, Jiri Pirko
On Mon, Jan 27, 2020 at 5:48 AM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Sun, 26 Jan 2020 04:03:08 -0500, Michael Chan wrote:
> > --- a/Documentation/networking/devlink/devlink-info.rst
> > +++ b/Documentation/networking/devlink/devlink-info.rst
> > @@ -59,6 +59,11 @@ board.manufacture
> >
> > An identifier of the company or the facility which produced the part.
> >
> > +board.nvm_cfg
> > +-------------
> > +
> > +Non-volatile memory version of the board.
>
> Could you describe a little more detail? Sounds a little similar to
> fw.psid which Mellanox has added, perhaps it serves the same purpose
> and we could reuse that one?
It is almost similar. We can reuse and update documentation in
bnxt.rst mentioning
that parameter set is present in NVM .
Thanks.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg"
2020-01-27 5:42 ` Vasundhara Volam
@ 2020-01-27 14:25 ` Jakub Kicinski
0 siblings, 0 replies; 23+ messages in thread
From: Jakub Kicinski @ 2020-01-27 14:25 UTC (permalink / raw)
To: Vasundhara Volam; +Cc: Michael Chan, David Miller, Netdev, Jiri Pirko
On Mon, 27 Jan 2020 11:12:52 +0530, Vasundhara Volam wrote:
> On Mon, Jan 27, 2020 at 5:48 AM Jakub Kicinski <kuba@kernel.org> wrote:
> > On Sun, 26 Jan 2020 04:03:08 -0500, Michael Chan wrote:
> > > --- a/Documentation/networking/devlink/devlink-info.rst
> > > +++ b/Documentation/networking/devlink/devlink-info.rst
> > > @@ -59,6 +59,11 @@ board.manufacture
> > >
> > > An identifier of the company or the facility which produced the part.
> > >
> > > +board.nvm_cfg
> > > +-------------
> > > +
> > > +Non-volatile memory version of the board.
> >
> > Could you describe a little more detail? Sounds a little similar to
> > fw.psid which Mellanox has added, perhaps it serves the same purpose
> > and we could reuse that one?
> It is almost similar. We can reuse and update documentation in
> bnxt.rst mentioning
> that parameter set is present in NVM .
Thanks!
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH net-next 15/16] bnxt_en: Add support for devlink info command
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (13 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 14/16] devlink: add macros for "fw.roce" and "board.nvm_cfg" Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
2020-01-26 9:03 ` [PATCH net-next 16/16] devlink: document devlink info versions reported by bnxt_en driver Michael Chan
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam, Jiri Pirko, Jakub Kicinski
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Display the following information via devlink info command:
- Driver name
- Board id
- Broad revision
- Board Serial number
- Board FW version
- Board NVM CFG version
- FW App version
- FW management version
- FW RoCE version
Standard output example:
$ devlink dev info pci/0000:3b:00.0
pci/0000:3b:00.0:
driver bnxt_en
serial_number 00-10-18-FF-FE-AD-05-00
versions:
fixed:
asic.id D802
asic.rev 1
running:
fw 216.1.124.0
board.nvm_cfg_ver 0.0.0
fw.app 216.1.122.0
fw.mgmt 864.0.32.0
fw.roce 216.1.15.0
[ This version has incorporated changes suggested by Jakub Kicinski to
use generic devlink version tags. ]
Cc: Jiri Pirko <jiri@mellanox.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 135 ++++++++++++++++++++++
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 4 +
2 files changed, 139 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
index 35e2a22..0297fa1 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -284,11 +284,15 @@ void bnxt_dl_health_recovery_done(struct bnxt *bp)
devlink_health_reporter_recovery_done(hlth->fw_reset_reporter);
}
+static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
+ struct netlink_ext_ack *extack);
+
static const struct devlink_ops bnxt_dl_ops = {
#ifdef CONFIG_BNXT_SRIOV
.eswitch_mode_set = bnxt_dl_eswitch_mode_set,
.eswitch_mode_get = bnxt_dl_eswitch_mode_get,
#endif /* CONFIG_BNXT_SRIOV */
+ .info_get = bnxt_dl_info_get,
.flash_update = bnxt_dl_flash_update,
};
@@ -355,6 +359,137 @@ static void bnxt_copy_from_nvm_data(union devlink_param_value *dst,
dst->vu8 = (u8)val32;
}
+static int bnxt_hwrm_get_nvm_cfg_ver(struct bnxt *bp,
+ union devlink_param_value *nvm_cfg_ver)
+{
+ struct hwrm_nvm_get_variable_input req = {0};
+ union bnxt_nvm_data *data;
+ dma_addr_t data_dma_addr;
+ int rc;
+
+ bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_NVM_GET_VARIABLE, -1, -1);
+ data = dma_alloc_coherent(&bp->pdev->dev, sizeof(*data),
+ &data_dma_addr, GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ req.dest_data_addr = cpu_to_le64(data_dma_addr);
+ req.data_len = cpu_to_le16(BNXT_NVM_CFG_VER_BITS);
+ req.option_num = cpu_to_le16(NVM_OFF_NVM_CFG_VER);
+
+ rc = hwrm_send_message_silent(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+ if (!rc)
+ bnxt_copy_from_nvm_data(nvm_cfg_ver, data,
+ BNXT_NVM_CFG_VER_BITS,
+ BNXT_NVM_CFG_VER_BYTES);
+
+ dma_free_coherent(&bp->pdev->dev, sizeof(*data), data, data_dma_addr);
+ return rc;
+}
+
+static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
+ struct netlink_ext_ack *extack)
+{
+ struct bnxt *bp = bnxt_get_bp_from_dl(dl);
+ union devlink_param_value nvm_cfg_ver;
+ struct hwrm_ver_get_output *ver_resp;
+ char mgmt_ver[FW_VER_STR_LEN];
+ char roce_ver[FW_VER_STR_LEN];
+ char fw_ver[FW_VER_STR_LEN];
+ char buf[32];
+ int rc;
+
+ rc = devlink_info_driver_name_put(req, DRV_MODULE_NAME);
+ if (rc)
+ return rc;
+
+ sprintf(buf, "%X", bp->chip_num);
+ rc = devlink_info_version_fixed_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_ASIC_ID, buf);
+ if (rc)
+ return rc;
+
+ ver_resp = &bp->ver_resp;
+ sprintf(buf, "%X", ver_resp->chip_rev);
+ rc = devlink_info_version_fixed_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_ASIC_REV, buf);
+ if (rc)
+ return rc;
+
+ if (BNXT_PF(bp)) {
+ sprintf(buf, "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X",
+ bp->dsn[7], bp->dsn[6], bp->dsn[5], bp->dsn[4],
+ bp->dsn[3], bp->dsn[2], bp->dsn[1], bp->dsn[0]);
+ rc = devlink_info_serial_number_put(req, buf);
+ if (rc)
+ return rc;
+ }
+
+ if (strlen(ver_resp->active_pkg_name)) {
+ rc =
+ devlink_info_version_running_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_FW,
+ ver_resp->active_pkg_name);
+ if (rc)
+ return rc;
+ }
+
+ if (BNXT_PF(bp) && !bnxt_hwrm_get_nvm_cfg_ver(bp, &nvm_cfg_ver)) {
+ u32 ver = nvm_cfg_ver.vu32;
+
+ sprintf(buf, "%X.%X.%X", (ver >> 16) & 0xF, (ver >> 8) & 0xF,
+ ver & 0xF);
+ rc = devlink_info_version_running_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_BOARD_NVM_CFG,
+ buf);
+ if (rc)
+ return rc;
+ }
+
+ if (ver_resp->flags & VER_GET_RESP_FLAGS_EXT_VER_AVAIL) {
+ snprintf(fw_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+ ver_resp->hwrm_fw_major, ver_resp->hwrm_fw_minor,
+ ver_resp->hwrm_fw_build, ver_resp->hwrm_fw_patch);
+
+ snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+ ver_resp->mgmt_fw_major, ver_resp->mgmt_fw_minor,
+ ver_resp->mgmt_fw_build, ver_resp->mgmt_fw_patch);
+
+ snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+ ver_resp->roce_fw_major, ver_resp->roce_fw_minor,
+ ver_resp->roce_fw_build, ver_resp->roce_fw_patch);
+ } else {
+ snprintf(fw_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+ ver_resp->hwrm_fw_maj_8b, ver_resp->hwrm_fw_min_8b,
+ ver_resp->hwrm_fw_bld_8b, ver_resp->hwrm_fw_rsvd_8b);
+
+ snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+ ver_resp->mgmt_fw_maj_8b, ver_resp->mgmt_fw_min_8b,
+ ver_resp->mgmt_fw_bld_8b, ver_resp->mgmt_fw_rsvd_8b);
+
+ snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",
+ ver_resp->roce_fw_maj_8b, ver_resp->roce_fw_min_8b,
+ ver_resp->roce_fw_bld_8b, ver_resp->roce_fw_rsvd_8b);
+ }
+ rc = devlink_info_version_running_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_FW_APP, fw_ver);
+ if (rc)
+ return rc;
+
+ if (!(bp->flags & BNXT_FLAG_CHIP_P5)) {
+ rc = devlink_info_version_running_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);
+ if (rc)
+ return rc;
+
+ rc = devlink_info_version_running_put(req,
+ DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);
+ if (rc)
+ return rc;
+ }
+ return 0;
+}
+
static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
int msg_len, union devlink_param_value *val)
{
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
index 08aaa44..95f893f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
@@ -38,6 +38,10 @@ static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl)
#define NVM_OFF_IGNORE_ARI 164
#define NVM_OFF_DIS_GRE_VER_CHECK 171
#define NVM_OFF_ENABLE_SRIOV 401
+#define NVM_OFF_NVM_CFG_VER 602
+
+#define BNXT_NVM_CFG_VER_BITS 24
+#define BNXT_NVM_CFG_VER_BYTES 4
#define BNXT_MSIX_VEC_MAX 1280
#define BNXT_MSIX_VEC_MIN_MAX 128
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread* [PATCH net-next 16/16] devlink: document devlink info versions reported by bnxt_en driver
2020-01-26 9:02 [PATCH net-next 00/16] bnxt_en: Updates for net-next Michael Chan
` (14 preceding siblings ...)
2020-01-26 9:03 ` [PATCH net-next 15/16] bnxt_en: Add support for devlink info command Michael Chan
@ 2020-01-26 9:03 ` Michael Chan
15 siblings, 0 replies; 23+ messages in thread
From: Michael Chan @ 2020-01-26 9:03 UTC (permalink / raw)
To: davem; +Cc: netdev, Vasundhara Volam, Jiri Pirko
From: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Add the set of info versions reported by bnxt_en driver, including
a description of what the version represents, and what modes (fixed,
running, stored) it reports.
Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
Documentation/networking/devlink/bnxt.rst | 33 +++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/Documentation/networking/devlink/bnxt.rst b/Documentation/networking/devlink/bnxt.rst
index 79e746d..9048e7b 100644
--- a/Documentation/networking/devlink/bnxt.rst
+++ b/Documentation/networking/devlink/bnxt.rst
@@ -39,3 +39,36 @@ parameters.
- Generic Routing Encapsulation (GRE) version check will be enabled in
the device. If disabled, the device will skip the version check for
incoming packets.
+
+Info versions
+=============
+
+The ``bnxt_en`` driver reports the following versions
+
+.. list-table:: devlink info versions implemented
+ :widths: 5 5 90
+
+ * - Name
+ - Type
+ - Description
+ * - ``asic.id``
+ - fixed
+ - ASIC design identifier
+ * - ``asic.rev``
+ - fixed
+ - ASIC design revision
+ * - ``board.nvm_cfg_ver``
+ - stored, running
+ - Non-volatile memory version of the board
+ * - ``fw``
+ - stored, running
+ - Overall board firmware version
+ * - ``fw.app``
+ - stored, running
+ - Data path firmware version
+ * - ``fw.mgmt``
+ - stored, running
+ - Management firmware version
+ * - ``fw.roce``
+ - stored, running
+ - RoCE management firmware version
--
2.5.1
^ permalink raw reply related [flat|nested] 23+ messages in thread