* [PATCH net 0/2] mlxsw: Two small fixes
@ 2019-07-31 6:33 Ido Schimmel
2019-07-31 6:33 ` [PATCH net 1/2] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() Ido Schimmel
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Ido Schimmel @ 2019-07-31 6:33 UTC (permalink / raw)
To: netdev; +Cc: davem, jiri, petrm, mlxsw, Ido Schimmel
From: Ido Schimmel <idosch@mellanox.com>
Patch #1 from Jiri fixes the error path of the module initialization
function. Found during manual code inspection.
Patch #2 from Petr further reduces the default shared buffer pool sizes
in order to work around a problem that was originally described in
commit e891ce1dd2a5 ("mlxsw: spectrum_buffers: Reduce pool size on
Spectrum-2").
Jiri Pirko (1):
mlxsw: spectrum: Fix error path in mlxsw_sp_module_init()
Petr Machata (1):
mlxsw: spectrum_buffers: Further reduce pool size on Spectrum-2
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH net 1/2] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init()
2019-07-31 6:33 [PATCH net 0/2] mlxsw: Two small fixes Ido Schimmel
@ 2019-07-31 6:33 ` Ido Schimmel
2019-08-08 5:19 ` Jesse Brandeburg
2019-07-31 6:33 ` [PATCH net 2/2] mlxsw: spectrum_buffers: Further reduce pool size on Spectrum-2 Ido Schimmel
2019-07-31 15:24 ` [PATCH net 0/2] mlxsw: Two small fixes David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Ido Schimmel @ 2019-07-31 6:33 UTC (permalink / raw)
To: netdev; +Cc: davem, jiri, petrm, mlxsw, Ido Schimmel
From: Jiri Pirko <jiri@mellanox.com>
In case of sp2 pci driver registration fail, fix the error path to
start with sp1 pci driver unregister.
Fixes: c3ab435466d5 ("mlxsw: spectrum: Extend to support Spectrum-2 ASIC")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 650638152bbc..eda9c23e87b2 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -6330,7 +6330,7 @@ static int __init mlxsw_sp_module_init(void)
return 0;
err_sp2_pci_driver_register:
- mlxsw_pci_driver_unregister(&mlxsw_sp2_pci_driver);
+ mlxsw_pci_driver_unregister(&mlxsw_sp1_pci_driver);
err_sp1_pci_driver_register:
mlxsw_core_driver_unregister(&mlxsw_sp2_driver);
err_sp2_core_driver_register:
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net 1/2] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init()
2019-07-31 6:33 ` [PATCH net 1/2] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() Ido Schimmel
@ 2019-08-08 5:19 ` Jesse Brandeburg
0 siblings, 0 replies; 6+ messages in thread
From: Jesse Brandeburg @ 2019-08-08 5:19 UTC (permalink / raw)
To: Ido Schimmel
Cc: netdev, davem, jiri, petrm, mlxsw, Ido Schimmel, jesse.brandeburg
On Wed, 31 Jul 2019 09:33:14 +0300
Ido Schimmel <idosch@idosch.org> wrote:
> From: Jiri Pirko <jiri@mellanox.com>
>
> In case of sp2 pci driver registration fail, fix the error path to
> start with sp1 pci driver unregister.
>
> Fixes: c3ab435466d5 ("mlxsw: spectrum: Extend to support Spectrum-2 ASIC")
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
> Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net 2/2] mlxsw: spectrum_buffers: Further reduce pool size on Spectrum-2
2019-07-31 6:33 [PATCH net 0/2] mlxsw: Two small fixes Ido Schimmel
2019-07-31 6:33 ` [PATCH net 1/2] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() Ido Schimmel
@ 2019-07-31 6:33 ` Ido Schimmel
2019-08-08 5:19 ` Jesse Brandeburg
2019-07-31 15:24 ` [PATCH net 0/2] mlxsw: Two small fixes David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Ido Schimmel @ 2019-07-31 6:33 UTC (permalink / raw)
To: netdev; +Cc: davem, jiri, petrm, mlxsw, Ido Schimmel
From: Petr Machata <petrm@mellanox.com>
In commit e891ce1dd2a5 ("mlxsw: spectrum_buffers: Reduce pool size on
Spectrum-2"), pool size was reduced to mitigate a problem in port buffer
usage of ports split four ways. It turns out that this work around does not
solve the issue, and a further reduction is required.
Thus reduce the size of pool 0 by another 2.7 MiB, and round down to the
whole number of cells.
Fixes: e891ce1dd2a5 ("mlxsw: spectrum_buffers: Reduce pool size on Spectrum-2")
Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
index 1537f70bc26d..888ba4300bcc 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
@@ -437,8 +437,8 @@ static const struct mlxsw_sp_sb_pr mlxsw_sp1_sb_prs[] = {
MLXSW_SP1_SB_PR_CPU_SIZE, true, false),
};
-#define MLXSW_SP2_SB_PR_INGRESS_SIZE 38128752
-#define MLXSW_SP2_SB_PR_EGRESS_SIZE 38128752
+#define MLXSW_SP2_SB_PR_INGRESS_SIZE 35297568
+#define MLXSW_SP2_SB_PR_EGRESS_SIZE 35297568
#define MLXSW_SP2_SB_PR_CPU_SIZE (256 * 1000)
/* Order according to mlxsw_sp2_sb_pool_dess */
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH net 2/2] mlxsw: spectrum_buffers: Further reduce pool size on Spectrum-2
2019-07-31 6:33 ` [PATCH net 2/2] mlxsw: spectrum_buffers: Further reduce pool size on Spectrum-2 Ido Schimmel
@ 2019-08-08 5:19 ` Jesse Brandeburg
0 siblings, 0 replies; 6+ messages in thread
From: Jesse Brandeburg @ 2019-08-08 5:19 UTC (permalink / raw)
To: Ido Schimmel
Cc: netdev, davem, jiri, petrm, mlxsw, Ido Schimmel, jesse.brandeburg
On Wed, 31 Jul 2019 09:33:15 +0300
Ido Schimmel <idosch@idosch.org> wrote:
> From: Petr Machata <petrm@mellanox.com>
>
> In commit e891ce1dd2a5 ("mlxsw: spectrum_buffers: Reduce pool size on
> Spectrum-2"), pool size was reduced to mitigate a problem in port buffer
> usage of ports split four ways. It turns out that this work around does not
> solve the issue, and a further reduction is required.
>
> Thus reduce the size of pool 0 by another 2.7 MiB, and round down to the
> whole number of cells.
>
> Fixes: e891ce1dd2a5 ("mlxsw: spectrum_buffers: Reduce pool size on Spectrum-2")
> Signed-off-by: Petr Machata <petrm@mellanox.com>
> Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net 0/2] mlxsw: Two small fixes
2019-07-31 6:33 [PATCH net 0/2] mlxsw: Two small fixes Ido Schimmel
2019-07-31 6:33 ` [PATCH net 1/2] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() Ido Schimmel
2019-07-31 6:33 ` [PATCH net 2/2] mlxsw: spectrum_buffers: Further reduce pool size on Spectrum-2 Ido Schimmel
@ 2019-07-31 15:24 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-07-31 15:24 UTC (permalink / raw)
To: idosch; +Cc: netdev, jiri, petrm, mlxsw, idosch
From: Ido Schimmel <idosch@idosch.org>
Date: Wed, 31 Jul 2019 09:33:13 +0300
> From: Ido Schimmel <idosch@mellanox.com>
>
> Patch #1 from Jiri fixes the error path of the module initialization
> function. Found during manual code inspection.
>
> Patch #2 from Petr further reduces the default shared buffer pool sizes
> in order to work around a problem that was originally described in
> commit e891ce1dd2a5 ("mlxsw: spectrum_buffers: Reduce pool size on
> Spectrum-2").
Series applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-08-08 5:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-31 6:33 [PATCH net 0/2] mlxsw: Two small fixes Ido Schimmel
2019-07-31 6:33 ` [PATCH net 1/2] mlxsw: spectrum: Fix error path in mlxsw_sp_module_init() Ido Schimmel
2019-08-08 5:19 ` Jesse Brandeburg
2019-07-31 6:33 ` [PATCH net 2/2] mlxsw: spectrum_buffers: Further reduce pool size on Spectrum-2 Ido Schimmel
2019-08-08 5:19 ` Jesse Brandeburg
2019-07-31 15:24 ` [PATCH net 0/2] mlxsw: Two small fixes David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).