The RX classifier can now be configured by user using ethtool -N.
So drop cpsw_ale_classifier_setup_default().
Signed-off-by: Roger Quadros <rogerq@xxxxxxxxxx>
---
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 3 --
drivers/net/ethernet/ti/cpsw_ale.c | 52 --------------------------------
drivers/net/ethernet/ti/cpsw_ale.h | 1 -
3 files changed, 56 deletions(-)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 700eb42dd381..12edf2a3bea7 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2497,9 +2497,6 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common)
am65_cpsw_nuss_rx_poll);
}
- /* setup classifier to route priorities to flows */
- cpsw_ale_classifier_setup_default(common->ale, common->rx_ch_num_flows);
-
return 0;
err_flow:
diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c
index 48592441085a..6058c0125af4 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.c
+++ b/drivers/net/ethernet/ti/cpsw_ale.c
@@ -1695,58 +1695,6 @@ void cpsw_ale_policer_reset(struct cpsw_ale *ale)
cpsw_ale_policer_reset_entry(ale, i);
}
-/* Default classifier is to map 8 user priorities to N receive channels */
-void cpsw_ale_classifier_setup_default(struct cpsw_ale *ale, int num_rx_ch)
-{
- int pri, idx;
-
- /* Reference:
- * IEEE802.1Q-2014, Standard for Local and metropolitan area networks
- * Table I-2 - Traffic type acronyms
- * Table I-3 - Defining traffic types
- * Section I.4 Traffic types and priority values, states:
- * "0 is thus used both for default priority and for Best Effort, and
- * Background is associated with a priority value of 1. This means
- * that the value 1 effectively communicates a lower priority than 0."
- *
- * In the table below, Priority Code Point (PCP) 0 is assigned
- * to a higher priority thread than PCP 1 wherever possible.
- * The table maps which thread the PCP traffic needs to be
- * sent to for a given number of threads (RX channels). Upper threads
- * have higher priority.
- * e.g. if number of threads is 8 then user priority 0 will map to
- * pri_thread_map[8-1][0] i.e. thread 1
- */
-
- int pri_thread_map[8][8] = { /* BK,BE,EE,CA,VI,VO,IC,NC */
- { 0, 0, 0, 0, 0, 0, 0, 0, },
- { 0, 0, 0, 0, 1, 1, 1, 1, },
- { 0, 0, 0, 0, 1, 1, 2, 2, },
- { 0, 0, 1, 1, 2, 2, 3, 3, },
- { 0, 0, 1, 1, 2, 2, 3, 4, },
- { 1, 0, 2, 2, 3, 3, 4, 5, },
- { 1, 0, 2, 3, 4, 4, 5, 6, },
- { 1, 0, 2, 3, 4, 5, 6, 7 } };
-
- cpsw_ale_policer_reset(ale);
-
- /* use first 8 classifiers to map 8 (DSCP/PCP) priorities to channels */
- for (pri = 0; pri < 8; pri++) {
- idx = pri;
-
- /* Classifier 'idx' match on priority 'pri' */
- cpsw_ale_policer_read_idx(ale, idx);
- regmap_field_write(ale->fields[POL_PRI_VAL], pri);
- regmap_field_write(ale->fields[POL_PRI_MEN], 1);
- cpsw_ale_policer_write_idx(ale, idx);
-
- /* Map Classifier 'idx' to thread provided by the map */
- cpsw_ale_policer_thread_idx_enable(ale, idx,
- pri_thread_map[num_rx_ch - 1][pri],
- 1);
- }
-}
-
#define HOST_PORT_NUM 0
/* Clear Policer and associated ALE table entries */
diff --git a/drivers/net/ethernet/ti/cpsw_ale.h b/drivers/net/ethernet/ti/cpsw_ale.h
index dbc095397389..5c9614730998 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.h
+++ b/drivers/net/ethernet/ti/cpsw_ale.h
@@ -223,7 +223,6 @@ int cpsw_ale_vlan_add_modify(struct cpsw_ale *ale, u16 vid, int port_mask,
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);
int cpsw_ale_policer_set_entry(struct cpsw_ale *ale, u32 policer_idx,
struct cpsw_ale_policer_cfg *cfg);
--
2.34.1
