Hi, This is the second and last set of preparations towards initial Spectrum-2 support in mlxsw. It mainly re-arranges parts of the code that need to work with both ASICs, but somewhat differ.
The first three patches allow different ASICs to register different set of operations for KVD linear (KVDL) management. In Spectrum-2 there is no linear memory and instead entries that reside there in Spectrum (e.g., nexthops) are hashed and inserted to the hash-based KVD memory. The fourth patch does a similar restructuring in the low-level multicast router code. This is necessary because multicast routing is implemented using regular circuit TCAM (C-TCAM) in Spectrum, whereas Spectrum-2 uses an algorithmic TCAM (A-TCAM). Next six patches prepare the ACL code for the introduction of A-TCAM in follow-up patch sets. Last two patches allow different ASICs to require different firmware versions and add two resources that need to be queried from firmware by Spectrum-2 specific code. Jiri Pirko (12): mlxsw: spectrum_kvdl: Push out KVD linear management into ops mlxsw: spectrum_kvdl: Pass entry type to alloc/free mlxsw: spectrum_kvdl: Pass entry_count to free function mlxsw: spectrum_mr_tcam: Push Spectrum-specific operations into a separate file mlxsw: spectrum_acl: Split TCAM handling 3 ways mlxsw: spectrum_acl: Add tcam init/fini ops mlxsw: spectrum_acl: Convert mlxsw_afk_create args to ops mlxsw: spectrum_acl: Move block items encoding into Spectrum op mlxsw: reg: Add priority field for PTCEV2 register mlxsw: spectrum_acl: Implement priority setting for rules inserted to TCAM mlxsw: spectrum: Prepare for multiple FW versions for Spectrum and Spectrum-2 mlxsw: resources: Add couple of Spectrum-2 KVD resources drivers/net/ethernet/mellanox/mlxsw/Makefile | 15 +- .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 58 +-- .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 13 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 12 +- drivers/net/ethernet/mellanox/mlxsw/resources.h | 4 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 53 ++- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 174 ++++++-- .../ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 245 +++++++++++ .../net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c | 459 +++++++++++++++++++++ .../ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c | 374 +++++++++++++++++ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 30 +- .../ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c | 215 ++++++++++ .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 21 +- ...um_acl_flex_keys.h => spectrum_acl_flex_keys.c} | 61 ++- .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 356 +++++----------- .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 146 +++++++ .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 432 ++----------------- drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.h | 11 +- .../net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c | 322 ++------------- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 20 +- 21 files changed, 1924 insertions(+), 1099 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum1_mr_tcam.c create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c rename drivers/net/ethernet/mellanox/mlxsw/{spectrum_acl_flex_keys.h => spectrum_acl_flex_keys.c} (74%) create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h -- 2.14.4