openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mlxsw: pci: Limit number of entries being sent in single MAP_FA cmd 

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2015-10-15 17:43:20 +02:00 committed by David S. Miller
parent c85c3882ad
commit 3e2206da73
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/mellanox/mlxsw/cmd.h
View File

@ -464,6 +464,8 @@ MLXSW_ITEM32(cmd_mbox, query_aq_cap, max_sg_rq, 0x10, 0, 8);
* passed in this command must be pinned. * 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, static inline int mlxsw_cmd_map_fa(struct mlxsw_core *mlxsw_core,
char *in_mbox, u32 vpm_entries_count) char *in_mbox, u32 vpm_entries_count)
{ {

26
drivers/net/ethernet/mellanox/mlxsw/pci.c
View File

@ -171,8 +171,8 @@ struct mlxsw_pci {
struct msix_entry msix_entry; struct msix_entry msix_entry;
struct mlxsw_core *core; struct mlxsw_core *core;
struct { struct {
u16 num_pages;
struct mlxsw_pci_mem_item *items; struct mlxsw_pci_mem_item *items;
unsigned int count;
} fw_area; } fw_area;
struct { struct {
struct mlxsw_pci_mem_item out_mbox; 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) u16 num_pages)
{ {
struct mlxsw_pci_mem_item *mem_item; struct mlxsw_pci_mem_item *mem_item;
int nent = 0;
int i; int i;
int err; int err;
@ -1279,7 +1280,7 @@ static int mlxsw_pci_fw_area_init(struct mlxsw_pci *mlxsw_pci, char *mbox,
GFP_KERNEL); GFP_KERNEL);
if (!mlxsw_pci->fw_area.items) if (!mlxsw_pci->fw_area.items)
return -ENOMEM; return -ENOMEM;
mlxsw_pci->fw_area.num_pages = num_pages; mlxsw_pci->fw_area.count = num_pages;
mlxsw_cmd_mbox_zero(mbox); mlxsw_cmd_mbox_zero(mbox);
for (i = 0; i < num_pages; i++) { 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; err = -ENOMEM;
goto err_alloc; goto err_alloc;
} }
mlxsw_cmd_mbox_map_fa_pa_set(mbox, i, mem_item->mapaddr); mlxsw_cmd_mbox_map_fa_pa_set(mbox, nent, mem_item->mapaddr);
mlxsw_cmd_mbox_map_fa_log2size_set(mbox, i, 0); /* 1 page */ 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);
err = mlxsw_cmd_map_fa(mlxsw_pci->core, mbox, num_pages);
if (err) if (err)
goto err_cmd_map_fa; goto err_cmd_map_fa;
nent = 0;
mlxsw_cmd_mbox_zero(mbox);
}
}
if (nent) {
err = mlxsw_cmd_map_fa(mlxsw_pci->core, mbox, nent);
if (err)
goto err_cmd_map_fa;
}
return 0; 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); 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]; mem_item = &mlxsw_pci->fw_area.items[i];
pci_free_consistent(mlxsw_pci->pdev, mem_item->size, pci_free_consistent(mlxsw_pci->pdev, mem_item->size,