0df155b014
- Why I did it Currently, non upstream patches are applied only after upstream patches. Depends on sonic-net/sonic-linux-kernel#313. Can be merged in any order, preferably together - What I did it Non upstream Patches that reside in the sonic repo will not be saved in a tar file bur rather in a folder pointed out by EXTERNAL_KERNEL_PATCH_LOC. This is to make changes to the non upstream patches easily traceable. The build variable name is also updated to INCLUDE_EXTERNAL_PATCHES Files/folders expected under EXTERNAL_KERNEL_PATCH_LOC EXTERNAL_KERNEL_PATCH_LOC/ ├──── patches/ ├── 0001-xxxxx.patch ├── 0001-yyyyyyyy.patch ├── ............. ├──── series.patch series.patch should contain a diff that is applied on the sonic-linux-kernel/patch/series file. The diff should include all the non-upstream patches. How to verify it Build the Kernel and verified if all the patches are applied properly Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
99 lines
3.1 KiB
Diff
99 lines
3.1 KiB
Diff
From ec8e91d320c8cccb8ad59663d2d59810ea5aecb9 Mon Sep 17 00:00:00 2001
|
|
From: Jiri Pirko <jiri@nvidia.com>
|
|
Date: Fri, 29 Jan 2021 08:45:09 +0100
|
|
Subject: [PATCH] mlxsw: reg: Add Ports Mapping event Configuration Register
|
|
|
|
The PMECR register use to enable/disable event trigger in case of
|
|
local port mapping change.
|
|
|
|
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
|
|
---
|
|
drivers/net/ethernet/mellanox/mlxsw/reg.h | 64 +++++++++++++++++++++++
|
|
1 file changed, 64 insertions(+)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
|
|
index 9de037b9a..42169957c 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
|
|
+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
|
|
@@ -5524,6 +5524,69 @@ static inline void mlxsw_reg_pplr_pack(char *payload, u8 local_port,
|
|
MLXSW_REG_PPLR_LB_TYPE_BIT_PHY_LOCAL : 0);
|
|
}
|
|
|
|
+/* PMECR - Ports Mapping event Configuration Register
|
|
+ * --------------------------------------------------
|
|
+ * The PMECR register use to enable/disable event trigger in case of
|
|
+ * local port mapping change.
|
|
+ */
|
|
+#define MLXSW_REG_PMECR_ID 0x501B
|
|
+#define MLXSW_REG_PMECR_LEN 0x20
|
|
+
|
|
+MLXSW_REG_DEFINE(pmecr, MLXSW_REG_PMECR_ID, MLXSW_REG_PMECR_LEN);
|
|
+
|
|
+/* reg_pmecr_local_port
|
|
+ * Local port number.
|
|
+ * Access: Index
|
|
+ */
|
|
+MLXSW_ITEM32(reg, pmecr, local_port, 0x00, 16, 8);
|
|
+
|
|
+/* reg_pmecr_ee
|
|
+ * Event update enable. If this bit is set, event generation will be updated
|
|
+ * based on the e field. Only relevant on Set operations.
|
|
+ * Access: WO
|
|
+ */
|
|
+MLXSW_ITEM32(reg, pmecr, ee, 0x04, 30, 1);
|
|
+
|
|
+/* reg_pmecr_eswi
|
|
+ * Software ignore enable bit. If this bit is set, the value if swi is used.
|
|
+ * If this bit is clear, the value of swi is ignored.
|
|
+ * Only relevant on Set operations.
|
|
+ * Access: WO
|
|
+ */
|
|
+MLXSW_ITEM32(reg, pmecr, eswi, 0x04, 24, 1);
|
|
+
|
|
+/* reg_pmecr_swi
|
|
+ * Software ignore. If this bit is set, the device shouldn't generate events
|
|
+ * in case of PMLP SET operation but only upon self local port mapping change
|
|
+ * (if applicable according to e configuration). This is supplementary
|
|
+ * configuration on top of e value.
|
|
+ * Access: RW
|
|
+ */
|
|
+MLXSW_ITEM32(reg, pmecr, swi, 0x04, 8, 1);
|
|
+
|
|
+enum mlxsw_reg_pmecr_e {
|
|
+ MLXSW_REG_PMECR_E_DO_NOT_GENERATE_EVENT,
|
|
+ MLXSW_REG_PMECR_E_GENERATE_EVENT,
|
|
+ MLXSW_REG_PMECR_E_GENERATE_SINGLE_EVENT,
|
|
+};
|
|
+
|
|
+/* reg_pmecr_e
|
|
+ * Event generation on local port mapping change.
|
|
+ * Access: RW
|
|
+ */
|
|
+MLXSW_ITEM32(reg, pmecr, e, 0x04, 0, 2);
|
|
+
|
|
+static inline void mlxsw_reg_pmecr_pack(char *payload, u8 local_port,
|
|
+ enum mlxsw_reg_pmecr_e e)
|
|
+{
|
|
+ MLXSW_REG_ZERO(pmecr, payload);
|
|
+ mlxsw_reg_pmecr_local_port_set(payload, local_port);
|
|
+ mlxsw_reg_pmecr_e_set(payload, e);
|
|
+ mlxsw_reg_pmecr_ee_set(payload, true);
|
|
+ mlxsw_reg_pmecr_swi_set(payload, true);
|
|
+ mlxsw_reg_pmecr_eswi_set(payload, true);
|
|
+}
|
|
+
|
|
/* PMPE - Port Module Plug/Unplug Event Register
|
|
* ---------------------------------------------
|
|
* This register reports any operational status change of a module.
|
|
@@ -11376,6 +11439,7 @@ static const struct mlxsw_reg_info *mlxsw_reg_infos[] = {
|
|
MLXSW_REG(pspa),
|
|
MLXSW_REG(pmaos),
|
|
MLXSW_REG(pplr),
|
|
+ MLXSW_REG(pmecr),
|
|
MLXSW_REG(pmpe),
|
|
MLXSW_REG(pddr),
|
|
MLXSW_REG(pmtm),
|
|
--
|
|
2.30.2
|
|
|