* [patch net-next 00/15] mlxsw: Driver update, cleanups
@ 2015-10-15 15:43 Jiri Pirko
2015-10-15 15:43 ` [patch net-next 01/15] mlxsw: Remove multicast ID configuration Jiri Pirko
` (15 more replies)
0 siblings, 16 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
This patchset contains various cleanups and improvements in mlxsw driver.
Ido Schimmel (5):
mlxsw: Remove multicast ID configuration
mlxsw: reg: Adjust definition of enum mlxsw_reg_sfgc_type
mlxsw: Simplify traps creation
mlxsw: Add trap group for control packets
mlxsw: cmd: Update CONFIG_PROFILE command documentation
Jiri Pirko (10):
mlxsw: switchx2: Use ETH_ALEN for mac address length
mlxsw: pci: Use MLXSW_PCI_CQS_MAX instead of MLXSW_PCI_CQS_COUNT
mlxsw: pci: Do not use MLXSW_PCI_SDQS_COUNT define
mlxsw: pci: Remove MLXSW_PCI_RDQS/SDQS defines and checks
mlxsw: pci: Limit number of entries being sent in single MAP_FA cmd
mlxsw: core: Do not use EMADs in mlxsw_emad_fini
mlxsw: Use dev_level_ratelimited instead of net_ratelimit & dev_level
mlxsw: reg: Uppercase letters in register IDs
mlxsw: reg: Remove extra space in SFGC ID define
mlxsw: Introduce mlxsw_reg_spms_vid_pack helper and use it
drivers/net/ethernet/mellanox/mlxsw/cmd.h | 26 +++---
drivers/net/ethernet/mellanox/mlxsw/core.c | 3 +-
drivers/net/ethernet/mellanox/mlxsw/pci.c | 49 ++++++----
drivers/net/ethernet/mellanox/mlxsw/pci.h | 4 +-
drivers/net/ethernet/mellanox/mlxsw/reg.h | 121 ++++++++++---------------
drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 34 +++----
6 files changed, 103 insertions(+), 134 deletions(-)
--
1.9.3
^ permalink raw reply [flat|nested] 17+ messages in thread
* [patch net-next 01/15] mlxsw: Remove multicast ID configuration
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 02/15] mlxsw: switchx2: Use ETH_ALEN for mac address length Jiri Pirko
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Ido Schimmel <idosch@mellanox.com>
With respect to a firmware change, the Switch Multicast ID (SMID)
register is no longer needed, so the related configuration code can be
removed.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/reg.h | 53 --------------------------
drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 11 ------
2 files changed, 64 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 096e1c1..5e0c957 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -99,57 +99,6 @@ static const struct mlxsw_reg_info mlxsw_reg_spad = {
*/
MLXSW_ITEM_BUF(reg, spad, base_mac, 0x02, 6);
-/* SMID - Switch Multicast ID
- * --------------------------
- * In multi-chip configuration, each device should maintain mapping between
- * Multicast ID (MID) into a list of local ports. This mapping is used in all
- * the devices other than the ingress device, and is implemented as part of the
- * FDB. The MID record maps from a MID, which is a unique identi- fier of the
- * multicast group within the stacking domain, into a list of local ports into
- * which the packet is replicated.
- */
-#define MLXSW_REG_SMID_ID 0x2007
-#define MLXSW_REG_SMID_LEN 0x420
-
-static const struct mlxsw_reg_info mlxsw_reg_smid = {
- .id = MLXSW_REG_SMID_ID,
- .len = MLXSW_REG_SMID_LEN,
-};
-
-/* reg_smid_swid
- * Switch partition ID.
- * Access: Index
- */
-MLXSW_ITEM32(reg, smid, swid, 0x00, 24, 8);
-
-/* reg_smid_mid
- * Multicast identifier - global identifier that represents the multicast group
- * across all devices
- * Access: Index
- */
-MLXSW_ITEM32(reg, smid, mid, 0x00, 0, 16);
-
-/* reg_smid_port
- * Local port memebership (1 bit per port).
- * Access: RW
- */
-MLXSW_ITEM_BIT_ARRAY(reg, smid, port, 0x20, 0x20, 1);
-
-/* reg_smid_port_mask
- * Local port mask (1 bit per port).
- * Access: W
- */
-MLXSW_ITEM_BIT_ARRAY(reg, smid, port_mask, 0x220, 0x20, 1);
-
-static inline void mlxsw_reg_smid_pack(char *payload, u16 mid)
-{
- MLXSW_REG_ZERO(smid, payload);
- mlxsw_reg_smid_swid_set(payload, 0);
- mlxsw_reg_smid_mid_set(payload, mid);
- mlxsw_reg_smid_port_set(payload, MLXSW_PORT_CPU_PORT, 1);
- mlxsw_reg_smid_port_mask_set(payload, MLXSW_PORT_CPU_PORT, 1);
-}
-
/* SSPR - Switch System Port Record Register
* -----------------------------------------
* Configures the system port to local port mapping.
@@ -1272,8 +1221,6 @@ static inline const char *mlxsw_reg_id_str(u16 reg_id)
return "SGCR";
case MLXSW_REG_SPAD_ID:
return "SPAD";
- case MLXSW_REG_SMID_ID:
- return "SMID";
case MLXSW_REG_SSPR_ID:
return "SSPR";
case MLXSW_REG_SPMS_ID:
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 633f3e7..4dadc46 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -1371,20 +1371,9 @@ static int mlxsw_sx_flood_init(struct mlxsw_sx *mlxsw_sx)
{
char sfgc_pl[MLXSW_REG_SFGC_LEN];
char sgcr_pl[MLXSW_REG_SGCR_LEN];
- char *smid_pl;
char *sftr_pl;
int err;
- /* Due to FW bug, we must configure SMID. */
- smid_pl = kmalloc(MLXSW_REG_SMID_LEN, GFP_KERNEL);
- if (!smid_pl)
- return -ENOMEM;
- mlxsw_reg_smid_pack(smid_pl, MLXSW_PORT_MID);
- err = mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(smid), smid_pl);
- kfree(smid_pl);
- if (err)
- return err;
-
/* Configure a flooding table, which includes only CPU port. */
sftr_pl = kmalloc(MLXSW_REG_SFTR_LEN, GFP_KERNEL);
if (!sftr_pl)
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 02/15] mlxsw: switchx2: Use ETH_ALEN for mac address length
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
2015-10-15 15:43 ` [patch net-next 01/15] mlxsw: Remove multicast ID configuration Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 03/15] mlxsw: pci: Use MLXSW_PCI_CQS_MAX instead of MLXSW_PCI_CQS_COUNT Jiri Pirko
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 4dadc46..fd6f438 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -57,13 +57,11 @@ static const char mlxsw_sx_driver_version[] = "1.0";
struct mlxsw_sx_port;
-#define MLXSW_SW_HW_ID_LEN 6
-
struct mlxsw_sx {
struct mlxsw_sx_port **ports;
struct mlxsw_core *core;
const struct mlxsw_bus_info *bus_info;
- u8 hw_id[MLXSW_SW_HW_ID_LEN];
+ u8 hw_id[ETH_ALEN];
};
struct mlxsw_sx_port_pcpu_stats {
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 03/15] mlxsw: pci: Use MLXSW_PCI_CQS_MAX instead of MLXSW_PCI_CQS_COUNT
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
2015-10-15 15:43 ` [patch net-next 01/15] mlxsw: Remove multicast ID configuration Jiri Pirko
2015-10-15 15:43 ` [patch net-next 02/15] mlxsw: switchx2: Use ETH_ALEN for mac address length Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 04/15] mlxsw: pci: Do not use MLXSW_PCI_SDQS_COUNT define Jiri Pirko
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
The count of CQs can be different for various ASICs, so just define
maximal value and check for that.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/pci.c | 8 ++++----
drivers/net/ethernet/mellanox/mlxsw/pci.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 462cea3..5ba740a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -830,7 +830,8 @@ static void mlxsw_pci_eq_tasklet(unsigned long data)
{
struct mlxsw_pci_queue *q = (struct mlxsw_pci_queue *) data;
struct mlxsw_pci *mlxsw_pci = q->pci;
- unsigned long active_cqns[BITS_TO_LONGS(MLXSW_PCI_CQS_COUNT)];
+ u8 cq_count = mlxsw_pci_cq_count(mlxsw_pci);
+ unsigned long active_cqns[BITS_TO_LONGS(MLXSW_PCI_CQS_MAX)];
char *eqe;
u8 cqn;
bool cq_handle = false;
@@ -866,7 +867,7 @@ static void mlxsw_pci_eq_tasklet(unsigned long data)
if (!cq_handle)
return;
- for_each_set_bit(cqn, active_cqns, MLXSW_PCI_CQS_COUNT) {
+ for_each_set_bit(cqn, active_cqns, cq_count) {
q = mlxsw_pci_cq_get(mlxsw_pci, cqn);
mlxsw_pci_queue_tasklet_schedule(q);
}
@@ -1069,8 +1070,7 @@ static int mlxsw_pci_aqs_init(struct mlxsw_pci *mlxsw_pci, char *mbox)
if ((num_sdqs != MLXSW_PCI_SDQS_COUNT) ||
(num_rdqs != MLXSW_PCI_RDQS_COUNT) ||
- (num_cqs != MLXSW_PCI_CQS_COUNT) ||
- (num_eqs != MLXSW_PCI_EQS_COUNT)) {
+ num_cqs > MLXSW_PCI_CQS_MAX || num_eqs != MLXSW_PCI_EQS_COUNT) {
dev_err(&pdev->dev, "Unsupported number of queues\n");
return -EINVAL;
}
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.h b/drivers/net/ethernet/mellanox/mlxsw/pci.h
index 1ef9664..efe1b4b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.h
@@ -73,7 +73,7 @@
#define MLXSW_PCI_RDQS_COUNT 24
#define MLXSW_PCI_SDQS_COUNT 24
-#define MLXSW_PCI_CQS_COUNT (MLXSW_PCI_RDQS_COUNT + MLXSW_PCI_SDQS_COUNT)
+#define MLXSW_PCI_CQS_MAX 96
#define MLXSW_PCI_EQS_COUNT 2
#define MLXSW_PCI_EQ_ASYNC_NUM 0
#define MLXSW_PCI_EQ_COMP_NUM 1
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 04/15] mlxsw: pci: Do not use MLXSW_PCI_SDQS_COUNT define
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (2 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 03/15] mlxsw: pci: Use MLXSW_PCI_CQS_MAX instead of MLXSW_PCI_CQS_COUNT Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 05/15] mlxsw: pci: Remove MLXSW_PCI_RDQS/SDQS defines and checks Jiri Pirko
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Use mlxsw_pci_sdq_count helper instead.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/pci.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 5ba740a..946341e 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -497,6 +497,7 @@ static int mlxsw_pci_rdq_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
struct mlxsw_pci_queue *q)
{
struct mlxsw_pci_queue_elem_info *elem_info;
+ u8 sdq_count = mlxsw_pci_sdq_count(mlxsw_pci);
int i;
int err;
@@ -504,9 +505,9 @@ static int mlxsw_pci_rdq_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
q->consumer_counter = 0;
/* Set CQ of same number of this RDQ with base
- * above MLXSW_PCI_SDQS_MAX as the lower ones are assigned to SDQs.
+ * above SDQ count as the lower ones are assigned to SDQs.
*/
- mlxsw_cmd_mbox_sw2hw_dq_cq_set(mbox, q->num + MLXSW_PCI_SDQS_COUNT);
+ mlxsw_cmd_mbox_sw2hw_dq_cq_set(mbox, sdq_count + q->num);
mlxsw_cmd_mbox_sw2hw_dq_log2_dq_sz_set(mbox, 3); /* 8 pages */
for (i = 0; i < MLXSW_PCI_AQ_PAGES; i++) {
dma_addr_t mapaddr = __mlxsw_pci_queue_page_get(q, i);
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 05/15] mlxsw: pci: Remove MLXSW_PCI_RDQS/SDQS defines and checks
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (3 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 04/15] mlxsw: pci: Do not use MLXSW_PCI_SDQS_COUNT define Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 06/15] mlxsw: pci: Limit number of entries being sent in single MAP_FA cmd Jiri Pirko
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Remove strict number check of queues count as various ASICs have
different counts.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/pci.c | 3 +--
drivers/net/ethernet/mellanox/mlxsw/pci.h | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 946341e..870d443 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -1069,8 +1069,7 @@ static int mlxsw_pci_aqs_init(struct mlxsw_pci *mlxsw_pci, char *mbox)
num_eqs = mlxsw_cmd_mbox_query_aq_cap_max_num_eqs_get(mbox);
eq_log2sz = mlxsw_cmd_mbox_query_aq_cap_log_max_eq_sz_get(mbox);
- if ((num_sdqs != MLXSW_PCI_SDQS_COUNT) ||
- (num_rdqs != MLXSW_PCI_RDQS_COUNT) ||
+ if (num_sdqs + num_rdqs > num_cqs ||
num_cqs > MLXSW_PCI_CQS_MAX || num_eqs != MLXSW_PCI_EQS_COUNT) {
dev_err(&pdev->dev, "Unsupported number of queues\n");
return -EINVAL;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.h b/drivers/net/ethernet/mellanox/mlxsw/pci.h
index efe1b4b..5b3453b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.h
@@ -71,8 +71,6 @@
#define MLXSW_PCI_DOORBELL(offset, type_offset, num) \
((offset) + (type_offset) + (num) * 4)
-#define MLXSW_PCI_RDQS_COUNT 24
-#define MLXSW_PCI_SDQS_COUNT 24
#define MLXSW_PCI_CQS_MAX 96
#define MLXSW_PCI_EQS_COUNT 2
#define MLXSW_PCI_EQ_ASYNC_NUM 0
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 06/15] mlxsw: pci: Limit number of entries being sent in single MAP_FA cmd
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (4 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 05/15] mlxsw: pci: Remove MLXSW_PCI_RDQS/SDQS defines and checks Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 07/15] mlxsw: core: Do not use EMADs in mlxsw_emad_fini Jiri Pirko
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Firmware accepts only limited number of mapping entries for MAP_FA
command. In order to prevent overflow, introduce a limit and in case the
number of entries is bigger, call MAP_FA multiple times.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/cmd.h | 2 ++
drivers/net/ethernet/mellanox/mlxsw/pci.c | 26 ++++++++++++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/cmd.h b/drivers/net/ethernet/mellanox/mlxsw/cmd.h
index 770db17..27e48b4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/cmd.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/cmd.h
@@ -464,6 +464,8 @@ MLXSW_ITEM32(cmd_mbox, query_aq_cap, max_sg_rq, 0x10, 0, 8);
* passed in this command must be pinned.
*/
+#define MLXSW_CMD_MAP_FA_VPM_ENTRIES_MAX 32
+
static inline int mlxsw_cmd_map_fa(struct mlxsw_core *mlxsw_core,
char *in_mbox, u32 vpm_entries_count)
{
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 870d443..87afa5f 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -171,8 +171,8 @@ struct mlxsw_pci {
struct msix_entry msix_entry;
struct mlxsw_core *core;
struct {
- u16 num_pages;
struct mlxsw_pci_mem_item *items;
+ unsigned int count;
} fw_area;
struct {
struct mlxsw_pci_mem_item out_mbox;
@@ -1272,6 +1272,7 @@ static int mlxsw_pci_fw_area_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
u16 num_pages)
{
struct mlxsw_pci_mem_item *mem_item;
+ int nent = 0;
int i;
int err;
@@ -1279,7 +1280,7 @@ static int mlxsw_pci_fw_area_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
GFP_KERNEL);
if (!mlxsw_pci->fw_area.items)
return -ENOMEM;
- mlxsw_pci->fw_area.num_pages = num_pages;
+ mlxsw_pci->fw_area.count = num_pages;
mlxsw_cmd_mbox_zero(mbox);
for (i = 0; i < num_pages; i++) {
@@ -1293,13 +1294,22 @@ static int mlxsw_pci_fw_area_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
err = -ENOMEM;
goto err_alloc;
}
- mlxsw_cmd_mbox_map_fa_pa_set(mbox, i, mem_item->mapaddr);
- mlxsw_cmd_mbox_map_fa_log2size_set(mbox, i, 0); /* 1 page */
+ mlxsw_cmd_mbox_map_fa_pa_set(mbox, nent, mem_item->mapaddr);
+ mlxsw_cmd_mbox_map_fa_log2size_set(mbox, nent, 0); /* 1 page */
+ if (++nent == MLXSW_CMD_MAP_FA_VPM_ENTRIES_MAX) {
+ err = mlxsw_cmd_map_fa(mlxsw_pci->core, mbox, nent);
+ if (err)
+ goto err_cmd_map_fa;
+ nent = 0;
+ mlxsw_cmd_mbox_zero(mbox);
+ }
}
- err = mlxsw_cmd_map_fa(mlxsw_pci->core, mbox, num_pages);
- if (err)
- goto err_cmd_map_fa;
+ if (nent) {
+ err = mlxsw_cmd_map_fa(mlxsw_pci->core, mbox, nent);
+ if (err)
+ goto err_cmd_map_fa;
+ }
return 0;
@@ -1322,7 +1332,7 @@ static void mlxsw_pci_fw_area_fini(struct mlxsw_pci *mlxsw_pci)
mlxsw_cmd_unmap_fa(mlxsw_pci->core);
- for (i = 0; i < mlxsw_pci->fw_area.num_pages; i++) {
+ for (i = 0; i < mlxsw_pci->fw_area.count; i++) {
mem_item = &mlxsw_pci->fw_area.items[i];
pci_free_consistent(mlxsw_pci->pdev, mem_item->size,
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 07/15] mlxsw: core: Do not use EMADs in mlxsw_emad_fini
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (5 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 06/15] mlxsw: pci: Limit number of entries being sent in single MAP_FA cmd Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 08/15] mlxsw: Use dev_level_ratelimited instead of net_ratelimit & dev_level Jiri Pirko
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Be symmetric with mlxsw_emad_init and don't use EMADs in mlxsw_emad_fini
cleanup function. Use command interface instead.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index 28c19cc..cf7c9d2 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -556,6 +556,7 @@ static void mlxsw_emad_fini(struct mlxsw_core *mlxsw_core)
{
char hpkt_pl[MLXSW_REG_HPKT_LEN];
+ mlxsw_core->emad.use_emad = false;
mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_DISCARD,
MLXSW_REG_HTGT_TRAP_GROUP_EMAD,
MLXSW_TRAP_ID_ETHEMAD);
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 08/15] mlxsw: Use dev_level_ratelimited instead of net_ratelimit & dev_level
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (6 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 07/15] mlxsw: core: Do not use EMADs in mlxsw_emad_fini Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 09/15] mlxsw: reg: Uppercase letters in register IDs Jiri Pirko
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 +++----
drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 5 ++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 87afa5f..974ce47 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -431,8 +431,7 @@ static int mlxsw_pci_wqe_frag_map(struct mlxsw_pci *mlxsw_pci, char *wqe,
mapaddr = pci_map_single(pdev, frag_data, frag_len, direction);
if (unlikely(pci_dma_mapping_error(pdev, mapaddr))) {
- if (net_ratelimit())
- dev_err(&pdev->dev, "failed to dma map tx frag\n");
+ dev_err_ratelimited(&pdev->dev, "failed to dma map tx frag\n");
return -EIO;
}
mlxsw_pci_wqe_address_set(wqe, index, mapaddr);
@@ -700,8 +699,8 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci,
put_new_skb:
memset(wqe, 0, q->elem_size);
err = mlxsw_pci_rdq_skb_alloc(mlxsw_pci, elem_info);
- if (err && net_ratelimit())
- dev_dbg(&pdev->dev, "Failed to alloc skb for RDQ\n");
+ if (err)
+ dev_dbg_ratelimited(&pdev->dev, "Failed to alloc skb for RDQ\n");
/* Everything is set up, ring doorbell to pass elem to HW */
q->producer_counter++;
mlxsw_pci_queue_doorbell_producer_ring(mlxsw_pci, q);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index fd6f438..39a0074 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -1210,9 +1210,8 @@ static void mlxsw_sx_rx_listener_func(struct sk_buff *skb, u8 local_port,
struct mlxsw_sx_port_pcpu_stats *pcpu_stats;
if (unlikely(!mlxsw_sx_port)) {
- if (net_ratelimit())
- dev_warn(mlxsw_sx->bus_info->dev, "Port %d: skb received for non-existent port\n",
- local_port);
+ dev_warn_ratelimited(mlxsw_sx->bus_info->dev, "Port %d: skb received for non-existent port\n",
+ local_port);
return;
}
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 09/15] mlxsw: reg: Uppercase letters in register IDs
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (7 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 08/15] mlxsw: Use dev_level_ratelimited instead of net_ratelimit & dev_level Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 10/15] mlxsw: reg: Remove extra space in SFGC ID define Jiri Pirko
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/reg.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 5e0c957..a2ebb79 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -161,7 +161,7 @@ static inline void mlxsw_reg_sspr_pack(char *payload, u8 local_port)
* -------------------------------------------
* Configures the spanning tree state of a physical port.
*/
-#define MLXSW_REG_SPMS_ID 0x200d
+#define MLXSW_REG_SPMS_ID 0x200D
#define MLXSW_REG_SPMS_LEN 0x404
static const struct mlxsw_reg_info mlxsw_reg_spms = {
@@ -962,7 +962,7 @@ static inline void mlxsw_reg_ppcnt_pack(char *payload, u8 local_port)
* Controls the association of a port with a switch partition and enables
* configuring ports as stacking ports.
*/
-#define MLXSW_REG_PSPA_ID 0x500d
+#define MLXSW_REG_PSPA_ID 0x500D
#define MLXSW_REG_PSPA_LEN 0x8
static const struct mlxsw_reg_info mlxsw_reg_pspa = {
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 10/15] mlxsw: reg: Remove extra space in SFGC ID define
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (8 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 09/15] mlxsw: reg: Uppercase letters in register IDs Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 11/15] mlxsw: reg: Adjust definition of enum mlxsw_reg_sfgc_type Jiri Pirko
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index a2ebb79..34b95a1 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -205,7 +205,7 @@ static inline void mlxsw_reg_spms_pack(char *payload, u8 local_port, u16 vid,
* The following register controls the association of flooding tables and MIDs
* to packet types used for flooding.
*/
-#define MLXSW_REG_SFGC_ID 0x2011
+#define MLXSW_REG_SFGC_ID 0x2011
#define MLXSW_REG_SFGC_LEN 0x10
static const struct mlxsw_reg_info mlxsw_reg_sfgc = {
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 11/15] mlxsw: reg: Adjust definition of enum mlxsw_reg_sfgc_type
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (9 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 10/15] mlxsw: reg: Remove extra space in SFGC ID define Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 12/15] mlxsw: Introduce mlxsw_reg_spms_vid_pack helper and use it Jiri Pirko
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Ido Schimmel <idosch@mellanox.com>
Define max which would be needed later on.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/reg.h | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 34b95a1..6fca13a 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -214,13 +214,15 @@ static const struct mlxsw_reg_info mlxsw_reg_sfgc = {
};
enum mlxsw_reg_sfgc_type {
- MLXSW_REG_SFGC_TYPE_BROADCAST = 0,
- MLXSW_REG_SFGC_TYPE_UNKNOWN_UNICAST = 1,
- MLXSW_REG_SFGC_TYPE_UNREGISTERED_MULTICAST_IPV4 = 2,
- MLXSW_REG_SFGC_TYPE_UNREGISTERED_MULTICAST_IPV6 = 3,
- MLXSW_REG_SFGC_TYPE_UNREGISTERED_MULTICAST_NON_IP = 5,
- MLXSW_REG_SFGC_TYPE_IPV4_LINK_LOCAL = 6,
- MLXSW_REG_SFGC_TYPE_IPV6_ALL_HOST = 7,
+ MLXSW_REG_SFGC_TYPE_BROADCAST,
+ MLXSW_REG_SFGC_TYPE_UNKNOWN_UNICAST,
+ MLXSW_REG_SFGC_TYPE_UNREGISTERED_MULTICAST_IPV4,
+ MLXSW_REG_SFGC_TYPE_UNREGISTERED_MULTICAST_IPV6,
+ MLXSW_REG_SFGC_TYPE_RESERVED,
+ MLXSW_REG_SFGC_TYPE_UNREGISTERED_MULTICAST_NON_IP,
+ MLXSW_REG_SFGC_TYPE_IPV4_LINK_LOCAL,
+ MLXSW_REG_SFGC_TYPE_IPV6_ALL_HOST,
+ MLXSW_REG_SFGC_TYPE_MAX,
};
/* reg_sfgc_type
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 12/15] mlxsw: Introduce mlxsw_reg_spms_vid_pack helper and use it
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (10 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 11/15] mlxsw: reg: Adjust definition of enum mlxsw_reg_sfgc_type Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 13/15] mlxsw: Simplify traps creation Jiri Pirko
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Jiri Pirko <jiri@mellanox.com>
Introduce separate helper for packing SPMS VIDs, as it can be used for
multiple VIDs and not only for one as previous SPMS pack function
provided.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/reg.h | 8 ++++++--
drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 6fca13a..7595cf1 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -192,11 +192,15 @@ enum mlxsw_reg_spms_state {
*/
MLXSW_ITEM_BIT_ARRAY(reg, spms, state, 0x04, 0x400, 2);
-static inline void mlxsw_reg_spms_pack(char *payload, u8 local_port, u16 vid,
- enum mlxsw_reg_spms_state state)
+static inline void mlxsw_reg_spms_pack(char *payload, u8 local_port)
{
MLXSW_REG_ZERO(spms, payload);
mlxsw_reg_spms_local_port_set(payload, local_port);
+}
+
+static inline void mlxsw_reg_spms_vid_pack(char *payload, u16 vid,
+ enum mlxsw_reg_spms_state state)
+{
mlxsw_reg_spms_state_set(payload, vid, state);
}
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 39a0074..0c0205c 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -923,7 +923,8 @@ static int mlxsw_sx_port_stp_state_set(struct mlxsw_sx_port *mlxsw_sx_port,
spms_pl = kmalloc(MLXSW_REG_SPMS_LEN, GFP_KERNEL);
if (!spms_pl)
return -ENOMEM;
- mlxsw_reg_spms_pack(spms_pl, mlxsw_sx_port->local_port, vid, state);
+ mlxsw_reg_spms_pack(spms_pl, mlxsw_sx_port->local_port);
+ mlxsw_reg_spms_vid_pack(spms_pl, vid, state);
err = mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(spms), spms_pl);
kfree(spms_pl);
return err;
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 13/15] mlxsw: Simplify traps creation
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (11 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 12/15] mlxsw: Introduce mlxsw_reg_spms_vid_pack helper and use it Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 14/15] mlxsw: Add trap group for control packets Jiri Pirko
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Ido Schimmel <idosch@mellanox.com>
The Host Trap Group Table (HTGT) register configures trap groups, which
are populated with trap IDs using the Host PacKet Trap (HPKT) register.
However, a trap ID can only be present inside one trap group (the last
configured).
Instead of passing both the trap group and ID for the function that
packs HPKT, pass only the trap ID and derive from it the trap group.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/core.c | 2 --
drivers/net/ethernet/mellanox/mlxsw/reg.h | 14 ++++++++++++--
drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 6 +-----
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index cf7c9d2..bd80ac7 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -511,7 +511,6 @@ static int mlxsw_emad_traps_set(struct mlxsw_core *mlxsw_core)
return err;
mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_TRAP_TO_CPU,
- MLXSW_REG_HTGT_TRAP_GROUP_EMAD,
MLXSW_TRAP_ID_ETHEMAD);
return mlxsw_reg_write(mlxsw_core, MLXSW_REG(hpkt), hpkt_pl);
}
@@ -558,7 +557,6 @@ static void mlxsw_emad_fini(struct mlxsw_core *mlxsw_core)
mlxsw_core->emad.use_emad = false;
mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_DISCARD,
- MLXSW_REG_HTGT_TRAP_GROUP_EMAD,
MLXSW_TRAP_ID_ETHEMAD);
mlxsw_reg_write(mlxsw_core, MLXSW_REG(hpkt), hpkt_pl);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 7595cf1..fc6f520 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -1209,12 +1209,22 @@ enum {
*/
MLXSW_ITEM32(reg, hpkt, ctrl, 0x04, 16, 2);
-static inline void mlxsw_reg_hpkt_pack(char *payload, u8 action,
- u8 trap_group, u16 trap_id)
+static inline void mlxsw_reg_hpkt_pack(char *payload, u8 action, u16 trap_id)
{
+ u8 trap_group;
+
MLXSW_REG_ZERO(hpkt, payload);
mlxsw_reg_hpkt_ack_set(payload, MLXSW_REG_HPKT_ACK_NOT_REQUIRED);
mlxsw_reg_hpkt_action_set(payload, action);
+ switch (trap_id) {
+ case MLXSW_TRAP_ID_ETHEMAD:
+ case MLXSW_TRAP_ID_PUDE:
+ trap_group = MLXSW_REG_HTGT_TRAP_GROUP_EMAD;
+ break;
+ default:
+ trap_group = MLXSW_REG_HTGT_TRAP_GROUP_RX;
+ break;
+ }
mlxsw_reg_hpkt_trap_group_set(payload, trap_group);
mlxsw_reg_hpkt_trap_id_set(payload, trap_id);
mlxsw_reg_hpkt_ctrl_set(payload, MLXSW_REG_HPKT_CTRL_PACKET_DEFAULT);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index 0c0205c..ef3c4af 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -1177,8 +1177,7 @@ static int mlxsw_sx_event_register(struct mlxsw_sx *mlxsw_sx,
if (err)
return err;
- mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_FORWARD,
- MLXSW_REG_HTGT_TRAP_GROUP_EMAD, trap_id);
+ mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_FORWARD, trap_id);
err = mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(hpkt), hpkt_pl);
if (err)
goto err_event_trap_set;
@@ -1322,7 +1321,6 @@ static int mlxsw_sx_traps_init(struct mlxsw_sx *mlxsw_sx)
goto err_rx_listener_register;
mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_TRAP_TO_CPU,
- MLXSW_REG_HTGT_TRAP_GROUP_RX,
mlxsw_sx_rx_listener[i].trap_id);
err = mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(hpkt), hpkt_pl);
if (err)
@@ -1337,7 +1335,6 @@ err_rx_trap_set:
err_rx_listener_register:
for (i--; i >= 0; i--) {
mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_FORWARD,
- MLXSW_REG_HTGT_TRAP_GROUP_RX,
mlxsw_sx_rx_listener[i].trap_id);
mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(hpkt), hpkt_pl);
@@ -1355,7 +1352,6 @@ static void mlxsw_sx_traps_fini(struct mlxsw_sx *mlxsw_sx)
for (i = 0; i < ARRAY_SIZE(mlxsw_sx_rx_listener); i++) {
mlxsw_reg_hpkt_pack(hpkt_pl, MLXSW_REG_HPKT_ACTION_FORWARD,
- MLXSW_REG_HTGT_TRAP_GROUP_RX,
mlxsw_sx_rx_listener[i].trap_id);
mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(hpkt), hpkt_pl);
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 14/15] mlxsw: Add trap group for control packets
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (12 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 13/15] mlxsw: Simplify traps creation Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-15 15:43 ` [patch net-next 15/15] mlxsw: cmd: Update CONFIG_PROFILE command documentation Jiri Pirko
2015-10-16 6:28 ` [patch net-next 00/15] mlxsw: Driver update, cleanups David Miller
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Ido Schimmel <idosch@mellanox.com>
Previously, we trapped flooded and control packets using the same trap
group. This can cause flooded packets to overflow the PCI bus and
prevent control packets (e.g. STP, LACP) from getting to the CPU.
Solve this by splitting the RX trap group to RX and control, which allows
us to configure a policer on the first, thereby preventing it from
overflowing the PCI bus.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/reg.h | 26 +++++++++++++++++++-------
drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 5 +++++
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
index fc6f520..7b245af 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -1029,8 +1029,11 @@ MLXSW_ITEM32(reg, htgt, swid, 0x00, 24, 8);
*/
MLXSW_ITEM32(reg, htgt, type, 0x00, 8, 4);
-#define MLXSW_REG_HTGT_TRAP_GROUP_EMAD 0x0
-#define MLXSW_REG_HTGT_TRAP_GROUP_RX 0x1
+enum mlxsw_reg_htgt_trap_group {
+ MLXSW_REG_HTGT_TRAP_GROUP_EMAD,
+ MLXSW_REG_HTGT_TRAP_GROUP_RX,
+ MLXSW_REG_HTGT_TRAP_GROUP_CTRL,
+};
/* reg_htgt_trap_group
* Trap group number. User defined number specifying which trap groups
@@ -1097,6 +1100,7 @@ MLXSW_ITEM32(reg, htgt, local_path_cpu_tclass, 0x10, 16, 6);
#define MLXSW_REG_HTGT_LOCAL_PATH_RDQ_EMAD 0x15
#define MLXSW_REG_HTGT_LOCAL_PATH_RDQ_RX 0x14
+#define MLXSW_REG_HTGT_LOCAL_PATH_RDQ_CTRL 0x13
/* reg_htgt_local_path_rdq
* Receive descriptor queue (RDQ) to use for the trap group.
@@ -1104,21 +1108,29 @@ MLXSW_ITEM32(reg, htgt, local_path_cpu_tclass, 0x10, 16, 6);
*/
MLXSW_ITEM32(reg, htgt, local_path_rdq, 0x10, 0, 6);
-static inline void mlxsw_reg_htgt_pack(char *payload, u8 trap_group)
+static inline void mlxsw_reg_htgt_pack(char *payload,
+ enum mlxsw_reg_htgt_trap_group group)
{
u8 swid, rdq;
MLXSW_REG_ZERO(htgt, payload);
- if (MLXSW_REG_HTGT_TRAP_GROUP_EMAD == trap_group) {
+ switch (group) {
+ case MLXSW_REG_HTGT_TRAP_GROUP_EMAD:
swid = MLXSW_PORT_SWID_ALL_SWIDS;
rdq = MLXSW_REG_HTGT_LOCAL_PATH_RDQ_EMAD;
- } else {
+ break;
+ case MLXSW_REG_HTGT_TRAP_GROUP_RX:
swid = 0;
rdq = MLXSW_REG_HTGT_LOCAL_PATH_RDQ_RX;
+ break;
+ case MLXSW_REG_HTGT_TRAP_GROUP_CTRL:
+ swid = 0;
+ rdq = MLXSW_REG_HTGT_LOCAL_PATH_RDQ_CTRL;
+ break;
}
mlxsw_reg_htgt_swid_set(payload, swid);
mlxsw_reg_htgt_type_set(payload, MLXSW_REG_HTGT_PATH_TYPE_LOCAL);
- mlxsw_reg_htgt_trap_group_set(payload, trap_group);
+ mlxsw_reg_htgt_trap_group_set(payload, group);
mlxsw_reg_htgt_pide_set(payload, MLXSW_REG_HTGT_POLICER_DISABLE);
mlxsw_reg_htgt_pid_set(payload, 0);
mlxsw_reg_htgt_mirror_action_set(payload, MLXSW_REG_HTGT_TRAP_TO_CPU);
@@ -1211,7 +1223,7 @@ MLXSW_ITEM32(reg, hpkt, ctrl, 0x04, 16, 2);
static inline void mlxsw_reg_hpkt_pack(char *payload, u8 action, u16 trap_id)
{
- u8 trap_group;
+ enum mlxsw_reg_htgt_trap_group trap_group;
MLXSW_REG_ZERO(hpkt, payload);
mlxsw_reg_hpkt_ack_set(payload, MLXSW_REG_HPKT_ACK_NOT_REQUIRED);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
index ef3c4af..176c159 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/switchx2.c
@@ -1313,6 +1313,11 @@ static int mlxsw_sx_traps_init(struct mlxsw_sx *mlxsw_sx)
if (err)
return err;
+ mlxsw_reg_htgt_pack(htgt_pl, MLXSW_REG_HTGT_TRAP_GROUP_CTRL);
+ err = mlxsw_reg_write(mlxsw_sx->core, MLXSW_REG(htgt), htgt_pl);
+ if (err)
+ return err;
+
for (i = 0; i < ARRAY_SIZE(mlxsw_sx_rx_listener); i++) {
err = mlxsw_core_rx_listener_register(mlxsw_sx->core,
&mlxsw_sx_rx_listener[i],
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [patch net-next 15/15] mlxsw: cmd: Update CONFIG_PROFILE command documentation
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (13 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 14/15] mlxsw: Add trap group for control packets Jiri Pirko
@ 2015-10-15 15:43 ` Jiri Pirko
2015-10-16 6:28 ` [patch net-next 00/15] mlxsw: Driver update, cleanups David Miller
15 siblings, 0 replies; 17+ messages in thread
From: Jiri Pirko @ 2015-10-15 15:43 UTC (permalink / raw
To: netdev; +Cc: davem, idosch, eladr
From: Ido Schimmel <idosch@mellanox.com>
The meaning of certain parameters in the profile passed to the device
during initialization has changed, so update their documentation
accordingly.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/cmd.h | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/cmd.h b/drivers/net/ethernet/mellanox/mlxsw/cmd.h
index 27e48b4..c7889f4 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/cmd.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/cmd.h
@@ -570,7 +570,7 @@ MLXSW_ITEM32(cmd_mbox, config_profile, set_max_vlan_groups, 0x0C, 6, 1);
*/
MLXSW_ITEM32(cmd_mbox, config_profile, set_max_regions, 0x0C, 7, 1);
-/* cmd_mbox_config_profile_set_fid_based
+/* cmd_mbox_config_profile_set_flood_mode
* Capability bit. Setting a bit to 1 configures the profile
* according to the mailbox contents.
*/
@@ -651,12 +651,8 @@ MLXSW_ITEM32(cmd_mbox, config_profile, max_vlan_groups, 0x28, 0, 12);
MLXSW_ITEM32(cmd_mbox, config_profile, max_regions, 0x2C, 0, 16);
/* cmd_mbox_config_profile_max_flood_tables
- * Maximum number of Flooding Tables. Flooding Tables are associated to
- * the different packet types for the different switch partitions.
- * Note that the table size depends on the fid_based mode.
- * In SwitchX silicon, tables are split equally between the switch
- * partitions. e.g. for 2 swids and 8 tables, the first 4 are associated
- * with swid-1 and the last 4 are associated with swid-2.
+ * Maximum number of single-entry flooding tables. Different flooding tables
+ * can be associated with different packet types.
*/
MLXSW_ITEM32(cmd_mbox, config_profile, max_flood_tables, 0x30, 16, 4);
@@ -667,12 +663,14 @@ MLXSW_ITEM32(cmd_mbox, config_profile, max_flood_tables, 0x30, 16, 4);
*/
MLXSW_ITEM32(cmd_mbox, config_profile, max_vid_flood_tables, 0x30, 8, 4);
-/* cmd_mbox_config_profile_fid_based
- * FID Based Flood Mode
- * 00 Do not use FID to offset the index into the Port Group Table/Multicast ID
- * 01 Use FID to offset the index to the Port Group Table (pgi)
- * 10 Use FID to offset the index to the Port Group Table (pgi) and
- * the Multicast ID
+/* cmd_mbox_config_profile_flood_mode
+ * Flooding mode to use.
+ * 0-2 - Backward compatible modes for SwitchX devices.
+ * 3 - Mixed mode, where:
+ * max_flood_tables indicates the number of single-entry tables.
+ * max_vid_flood_tables indicates the number of per-VID tables.
+ * max_fid_offset_flood_tables indicates the number of FID-offset tables.
+ * max_fid_flood_tables indicates the number of per-FID tables.
*/
MLXSW_ITEM32(cmd_mbox, config_profile, flood_mode, 0x30, 0, 2);
--
1.9.3
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [patch net-next 00/15] mlxsw: Driver update, cleanups
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
` (14 preceding siblings ...)
2015-10-15 15:43 ` [patch net-next 15/15] mlxsw: cmd: Update CONFIG_PROFILE command documentation Jiri Pirko
@ 2015-10-16 6:28 ` David Miller
15 siblings, 0 replies; 17+ messages in thread
From: David Miller @ 2015-10-16 6:28 UTC (permalink / raw
To: jiri; +Cc: netdev, idosch, eladr
From: Jiri Pirko <jiri@resnulli.us>
Date: Thu, 15 Oct 2015 17:43:14 +0200
> This patchset contains various cleanups and improvements in mlxsw driver.
Series applied, thanks Jiri.
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-10-16 6:12 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-15 15:43 [patch net-next 00/15] mlxsw: Driver update, cleanups Jiri Pirko
2015-10-15 15:43 ` [patch net-next 01/15] mlxsw: Remove multicast ID configuration Jiri Pirko
2015-10-15 15:43 ` [patch net-next 02/15] mlxsw: switchx2: Use ETH_ALEN for mac address length Jiri Pirko
2015-10-15 15:43 ` [patch net-next 03/15] mlxsw: pci: Use MLXSW_PCI_CQS_MAX instead of MLXSW_PCI_CQS_COUNT Jiri Pirko
2015-10-15 15:43 ` [patch net-next 04/15] mlxsw: pci: Do not use MLXSW_PCI_SDQS_COUNT define Jiri Pirko
2015-10-15 15:43 ` [patch net-next 05/15] mlxsw: pci: Remove MLXSW_PCI_RDQS/SDQS defines and checks Jiri Pirko
2015-10-15 15:43 ` [patch net-next 06/15] mlxsw: pci: Limit number of entries being sent in single MAP_FA cmd Jiri Pirko
2015-10-15 15:43 ` [patch net-next 07/15] mlxsw: core: Do not use EMADs in mlxsw_emad_fini Jiri Pirko
2015-10-15 15:43 ` [patch net-next 08/15] mlxsw: Use dev_level_ratelimited instead of net_ratelimit & dev_level Jiri Pirko
2015-10-15 15:43 ` [patch net-next 09/15] mlxsw: reg: Uppercase letters in register IDs Jiri Pirko
2015-10-15 15:43 ` [patch net-next 10/15] mlxsw: reg: Remove extra space in SFGC ID define Jiri Pirko
2015-10-15 15:43 ` [patch net-next 11/15] mlxsw: reg: Adjust definition of enum mlxsw_reg_sfgc_type Jiri Pirko
2015-10-15 15:43 ` [patch net-next 12/15] mlxsw: Introduce mlxsw_reg_spms_vid_pack helper and use it Jiri Pirko
2015-10-15 15:43 ` [patch net-next 13/15] mlxsw: Simplify traps creation Jiri Pirko
2015-10-15 15:43 ` [patch net-next 14/15] mlxsw: Add trap group for control packets Jiri Pirko
2015-10-15 15:43 ` [patch net-next 15/15] mlxsw: cmd: Update CONFIG_PROFILE command documentation Jiri Pirko
2015-10-16 6:28 ` [patch net-next 00/15] mlxsw: Driver update, cleanups David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.