Add new helper cpsw_ale_policer_reset_entry() to reset a single
policer entry. Clear all fields instead of just clearing the enable bits.
Export cpsw_ale_policer_reset() as it will be required by cpsw
drivers using policer.
Signed-off-by: Roger Quadros <rogerq@xxxxxxxxxx>
---
drivers/net/ethernet/ti/cpsw_ale.c | 35 +++++++++++++++--------------------
drivers/net/ethernet/ti/cpsw_ale.h | 4 ++++
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c
index 2c780efed402..630e3a555190 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.c
+++ b/drivers/net/ethernet/ti/cpsw_ale.c
@@ -1674,30 +1674,25 @@ static void cpsw_ale_policer_thread_idx_enable(struct cpsw_ale *ale, u32 idx,
regmap_field_write(ale->fields[ALE_THREAD_ENABLE], enable ? 1 : 0);
}
+static void cpsw_ale_policer_reset_entry(struct cpsw_ale *ale, u32 idx)
+{
+ int i;
+
+ cpsw_ale_policer_read_idx(ale, idx);
+ for (i = 0; i < CPSW_ALE_POLICER_ENTRY_WORDS; i++)
+ writel_relaxed(0, ale->params.ale_regs +
+ ALE_POLICER_PORT_OUI + 4 * i);
+ cpsw_ale_policer_thread_idx_enable(ale, idx, 0, 0);
+ cpsw_ale_policer_write_idx(ale, idx);
+}
+
/* Disable all policer entries and thread mappings */
-static void cpsw_ale_policer_reset(struct cpsw_ale *ale)
+void cpsw_ale_policer_reset(struct cpsw_ale *ale)
{
int i;
- for (i = 0; i < ale->params.num_policers ; i++) {
- cpsw_ale_policer_read_idx(ale, i);
- regmap_field_write(ale->fields[POL_PORT_MEN], 0);
- regmap_field_write(ale->fields[POL_PRI_MEN], 0);
- regmap_field_write(ale->fields[POL_OUI_MEN], 0);
- regmap_field_write(ale->fields[POL_DST_MEN], 0);
- regmap_field_write(ale->fields[POL_SRC_MEN], 0);
- regmap_field_write(ale->fields[POL_OVLAN_MEN], 0);
- regmap_field_write(ale->fields[POL_IVLAN_MEN], 0);
- regmap_field_write(ale->fields[POL_ETHERTYPE_MEN], 0);
- regmap_field_write(ale->fields[POL_IPSRC_MEN], 0);
- regmap_field_write(ale->fields[POL_IPDST_MEN], 0);
- regmap_field_write(ale->fields[POL_EN], 0);
- regmap_field_write(ale->fields[POL_RED_DROP_EN], 0);
- regmap_field_write(ale->fields[POL_YELLOW_DROP_EN], 0);
- regmap_field_write(ale->fields[POL_PRIORITY_THREAD_EN], 0);
-
- cpsw_ale_policer_thread_idx_enable(ale, i, 0, 0);
- }
+ for (i = 0; i < ale->params.num_policers ; i++)
+ cpsw_ale_policer_reset_entry(ale, i);
}
/* Default classifier is to map 8 user priorities to N receive channels */
diff --git a/drivers/net/ethernet/ti/cpsw_ale.h b/drivers/net/ethernet/ti/cpsw_ale.h
index 87b7d1b3a34a..ce59fec75774 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.h
+++ b/drivers/net/ethernet/ti/cpsw_ale.h
@@ -156,6 +156,9 @@ enum cpsw_ale_port_state {
#define ALE_ENTRY_BITS 68
#define ALE_ENTRY_WORDS DIV_ROUND_UP(ALE_ENTRY_BITS, 32)
+/* Policer */
+#define CPSW_ALE_POLICER_ENTRY_WORDS 8
+
struct cpsw_ale *cpsw_ale_create(struct cpsw_ale_params *params);
void cpsw_ale_start(struct cpsw_ale *ale);
@@ -195,5 +198,6 @@ int cpsw_ale_vlan_del_modify(struct cpsw_ale *ale, u16 vid, int port_mask);
void cpsw_ale_set_unreg_mcast(struct cpsw_ale *ale, int unreg_mcast_mask,
bool add);
void cpsw_ale_classifier_setup_default(struct cpsw_ale *ale, int num_rx_ch);
+void cpsw_ale_policer_reset(struct cpsw_ale *ale);
#endif
--
2.34.1
