Skip to content

L
linux
Commit 4158e389 authored by Paolo Abeni's avatar Paolo Abeni
Browse files
Options

Revert "Merge branch 'octeontx2-minor-tc-fixes'" 

This reverts commit 35d099da, reversing
changes made to 58d8bcd4.

I wrongly applied that to the net-next tree instead of the intended
target tree (net). Reverting it on net-next.
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent cc1049cc
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 73 deletions
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c
View file @ 4158e389
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
#define MAX_RATE_EXPONENT 0x0FULL #define MAX_RATE_EXPONENT 0x0FULL
#define MAX_RATE_MANTISSA 0xFFULL #define MAX_RATE_MANTISSA 0xFFULL
#define CN10K_MAX_BURST_MANTISSA 0x7FFFULL
#define CN10K_MAX_BURST_SIZE 8453888ULL
/* Bitfields in NIX_TLX_PIR register */ /* Bitfields in NIX_TLX_PIR register */
#define TLX_RATE_MANTISSA GENMASK_ULL(8, 1) #define TLX_RATE_MANTISSA GENMASK_ULL(8, 1)
#define TLX_RATE_EXPONENT GENMASK_ULL(12, 9) #define TLX_RATE_EXPONENT GENMASK_ULL(12, 9)
...@@ -38,9 +35,6 @@ ...@@ -38,9 +35,6 @@
#define TLX_BURST_MANTISSA GENMASK_ULL(36, 29) #define TLX_BURST_MANTISSA GENMASK_ULL(36, 29)
#define TLX_BURST_EXPONENT GENMASK_ULL(40, 37) #define TLX_BURST_EXPONENT GENMASK_ULL(40, 37)
#define CN10K_TLX_BURST_MANTISSA GENMASK_ULL(43, 29)
#define CN10K_TLX_BURST_EXPONENT GENMASK_ULL(47, 44)
struct otx2_tc_flow_stats { struct otx2_tc_flow_stats {
u64 bytes; u64 bytes;
u64 pkts; u64 pkts;
...@@ -83,42 +77,33 @@ int otx2_tc_alloc_ent_bitmap(struct otx2_nic *nic) ...@@ -83,42 +77,33 @@ int otx2_tc_alloc_ent_bitmap(struct otx2_nic *nic)
} }
EXPORT_SYMBOL(otx2_tc_alloc_ent_bitmap); EXPORT_SYMBOL(otx2_tc_alloc_ent_bitmap);
static void otx2_get_egress_burst_cfg(struct otx2_nic *nic, u32 burst, static void otx2_get_egress_burst_cfg(u32 burst, u32 *burst_exp,
u32 *burst_exp, u32 *burst_mantissa) u32 *burst_mantissa)
{ {
int max_burst, max_mantissa;
unsigned int tmp; unsigned int tmp;
if (is_dev_otx2(nic->pdev)) {
max_burst = MAX_BURST_SIZE;
max_mantissa = MAX_BURST_MANTISSA;
} else {
max_burst = CN10K_MAX_BURST_SIZE;
max_mantissa = CN10K_MAX_BURST_MANTISSA;
}
/* Burst is calculated as /* Burst is calculated as
* ((256 + BURST_MANTISSA) << (1 + BURST_EXPONENT)) / 256 * ((256 + BURST_MANTISSA) << (1 + BURST_EXPONENT)) / 256
* Max supported burst size is 130,816 bytes. * Max supported burst size is 130,816 bytes.
*/ */
burst = min_t(u32, burst, max_burst); burst = min_t(u32, burst, MAX_BURST_SIZE);
if (burst) { if (burst) {
*burst_exp = ilog2(burst) ? ilog2(burst) - 1 : 0; *burst_exp = ilog2(burst) ? ilog2(burst) - 1 : 0;
tmp = burst - rounddown_pow_of_two(burst); tmp = burst - rounddown_pow_of_two(burst);
if (burst < max_mantissa) if (burst < MAX_BURST_MANTISSA)
*burst_mantissa = tmp * 2; *burst_mantissa = tmp * 2;
else else
*burst_mantissa = tmp / (1ULL << (*burst_exp - 7)); *burst_mantissa = tmp / (1ULL << (*burst_exp - 7));
} else { } else {
*burst_exp = MAX_BURST_EXPONENT; *burst_exp = MAX_BURST_EXPONENT;
*burst_mantissa = max_mantissa; *burst_mantissa = MAX_BURST_MANTISSA;
} }
} }
static void otx2_get_egress_rate_cfg(u64 maxrate, u32 *exp, static void otx2_get_egress_rate_cfg(u32 maxrate, u32 *exp,
u32 *mantissa, u32 *div_exp) u32 *mantissa, u32 *div_exp)
{ {
u64 tmp; unsigned int tmp;
/* Rate calculation by hardware /* Rate calculation by hardware
* *
...@@ -147,44 +132,21 @@ static void otx2_get_egress_rate_cfg(u64 maxrate, u32 *exp, ...@@ -147,44 +132,21 @@ static void otx2_get_egress_rate_cfg(u64 maxrate, u32 *exp,
} }
} }
static u64 otx2_get_txschq_rate_regval(struct otx2_nic *nic, static int otx2_set_matchall_egress_rate(struct otx2_nic *nic, u32 burst, u32 maxrate)
u64 maxrate, u32 burst)
{
u32 burst_exp, burst_mantissa;
u32 exp, mantissa, div_exp;
u64 regval = 0;
/* Get exponent and mantissa values from the desired rate */
otx2_get_egress_burst_cfg(nic, burst, &burst_exp, &burst_mantissa);
otx2_get_egress_rate_cfg(maxrate, &exp, &mantissa, &div_exp);
if (is_dev_otx2(nic->pdev)) {
regval = FIELD_PREP(TLX_BURST_EXPONENT, (u64)burst_exp) |
FIELD_PREP(TLX_BURST_MANTISSA, (u64)burst_mantissa) |
FIELD_PREP(TLX_RATE_DIVIDER_EXPONENT, div_exp) |
FIELD_PREP(TLX_RATE_EXPONENT, exp) |
FIELD_PREP(TLX_RATE_MANTISSA, mantissa) | BIT_ULL(0);
} else {
regval = FIELD_PREP(CN10K_TLX_BURST_EXPONENT, (u64)burst_exp) |
FIELD_PREP(CN10K_TLX_BURST_MANTISSA, (u64)burst_mantissa) |
FIELD_PREP(TLX_RATE_DIVIDER_EXPONENT, div_exp) |
FIELD_PREP(TLX_RATE_EXPONENT, exp) |
FIELD_PREP(TLX_RATE_MANTISSA, mantissa) | BIT_ULL(0);
}
return regval;
}
static int otx2_set_matchall_egress_rate(struct otx2_nic *nic,
u32 burst, u64 maxrate)
{ {
struct otx2_hw *hw = &nic->hw; struct otx2_hw *hw = &nic->hw;
struct nix_txschq_config *req; struct nix_txschq_config *req;
u32 burst_exp, burst_mantissa;
u32 exp, mantissa, div_exp;
int txschq, err; int txschq, err;
/* All SQs share the same TL4, so pick the first scheduler */ /* All SQs share the same TL4, so pick the first scheduler */
txschq = hw->txschq_list[NIX_TXSCH_LVL_TL4][0]; txschq = hw->txschq_list[NIX_TXSCH_LVL_TL4][0];
/* Get exponent and mantissa values from the desired rate */
otx2_get_egress_burst_cfg(burst, &burst_exp, &burst_mantissa);
otx2_get_egress_rate_cfg(maxrate, &exp, &mantissa, &div_exp);
mutex_lock(&nic->mbox.lock); mutex_lock(&nic->mbox.lock);
req = otx2_mbox_alloc_msg_nix_txschq_cfg(&nic->mbox); req = otx2_mbox_alloc_msg_nix_txschq_cfg(&nic->mbox);
if (!req) { if (!req) {
...@@ -195,7 +157,11 @@ static int otx2_set_matchall_egress_rate(struct otx2_nic *nic, ...@@ -195,7 +157,11 @@ static int otx2_set_matchall_egress_rate(struct otx2_nic *nic,
req->lvl = NIX_TXSCH_LVL_TL4; req->lvl = NIX_TXSCH_LVL_TL4;
req->num_regs = 1; req->num_regs = 1;
req->reg[0] = NIX_AF_TL4X_PIR(txschq); req->reg[0] = NIX_AF_TL4X_PIR(txschq);
req->regval[0] = otx2_get_txschq_rate_regval(nic, maxrate, burst); req->regval[0] = FIELD_PREP(TLX_BURST_EXPONENT, burst_exp) |
FIELD_PREP(TLX_BURST_MANTISSA, burst_mantissa) |
FIELD_PREP(TLX_RATE_DIVIDER_EXPONENT, div_exp) |
FIELD_PREP(TLX_RATE_EXPONENT, exp) |
FIELD_PREP(TLX_RATE_MANTISSA, mantissa) | BIT_ULL(0);
err = otx2_sync_mbox_msg(&nic->mbox); err = otx2_sync_mbox_msg(&nic->mbox);
mutex_unlock(&nic->mbox.lock); mutex_unlock(&nic->mbox.lock);
...@@ -264,7 +230,7 @@ static int otx2_tc_egress_matchall_install(struct otx2_nic *nic, ...@@ -264,7 +230,7 @@ static int otx2_tc_egress_matchall_install(struct otx2_nic *nic,
struct netlink_ext_ack *extack = cls->common.extack; struct netlink_ext_ack *extack = cls->common.extack;
struct flow_action *actions = &cls->rule->action; struct flow_action *actions = &cls->rule->action;
struct flow_action_entry *entry; struct flow_action_entry *entry;
u64 rate; u32 rate;
int err; int err;
err = otx2_tc_validate_flow(nic, actions, extack); err = otx2_tc_validate_flow(nic, actions, extack);
...@@ -290,7 +256,7 @@ static int otx2_tc_egress_matchall_install(struct otx2_nic *nic, ...@@ -290,7 +256,7 @@ static int otx2_tc_egress_matchall_install(struct otx2_nic *nic,
} }
/* Convert bytes per second to Mbps */ /* Convert bytes per second to Mbps */
rate = entry->police.rate_bytes_ps * 8; rate = entry->police.rate_bytes_ps * 8;
rate = max_t(u64, rate / 1000000, 1); rate = max_t(u32, rate / 1000000, 1);
err = otx2_set_matchall_egress_rate(nic, entry->police.burst, rate); err = otx2_set_matchall_egress_rate(nic, entry->police.burst, rate);
if (err) if (err)
return err; return err;
...@@ -648,27 +614,21 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node, ...@@ -648,27 +614,21 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic, struct otx2_tc_flow *node,
flow_spec->dport = match.key->dst; flow_spec->dport = match.key->dst;
flow_mask->dport = match.mask->dst; flow_mask->dport = match.mask->dst;
if (ip_proto == IPPROTO_UDP)
if (flow_mask->dport) { req->features |= BIT_ULL(NPC_DPORT_UDP);
if (ip_proto == IPPROTO_UDP) else if (ip_proto == IPPROTO_TCP)
req->features |= BIT_ULL(NPC_DPORT_UDP); req->features |= BIT_ULL(NPC_DPORT_TCP);
else if (ip_proto == IPPROTO_TCP) else if (ip_proto == IPPROTO_SCTP)
req->features |= BIT_ULL(NPC_DPORT_TCP); req->features |= BIT_ULL(NPC_DPORT_SCTP);
else if (ip_proto == IPPROTO_SCTP)
req->features |= BIT_ULL(NPC_DPORT_SCTP);
}
flow_spec->sport = match.key->src; flow_spec->sport = match.key->src;
flow_mask->sport = match.mask->src; flow_mask->sport = match.mask->src;
if (ip_proto == IPPROTO_UDP)
if (flow_mask->sport) { req->features |= BIT_ULL(NPC_SPORT_UDP);
if (ip_proto == IPPROTO_UDP) else if (ip_proto == IPPROTO_TCP)
req->features |= BIT_ULL(NPC_SPORT_UDP); req->features |= BIT_ULL(NPC_SPORT_TCP);
else if (ip_proto == IPPROTO_TCP) else if (ip_proto == IPPROTO_SCTP)
req->features |= BIT_ULL(NPC_SPORT_TCP); req->features |= BIT_ULL(NPC_SPORT_SCTP);
else if (ip_proto == IPPROTO_SCTP)
req->features |= BIT_ULL(NPC_SPORT_SCTP);
}
} }
return otx2_tc_parse_actions(nic, &rule->action, req, f, node); return otx2_tc_parse_actions(nic, &rule->action, req, f, node);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7