/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2020 Intel Corporation
+ * Copyright(c) 2001-2021 Intel Corporation
*/
#include "ice_acl.h"
* normal priority: start from the highest index, 50% of total entries
* high priority: start from the lowest index, 25% of total entries
*/
- scen->first_idx[ICE_LOW] = scen->num_entry - 1;
- scen->first_idx[ICE_NORMAL] = scen->num_entry - scen->num_entry / 4 - 1;
- scen->first_idx[ICE_HIGH] = 0;
-
- scen->last_idx[ICE_LOW] = scen->num_entry - scen->num_entry / 4;
- scen->last_idx[ICE_NORMAL] = scen->num_entry / 4;
- scen->last_idx[ICE_HIGH] = scen->num_entry / 4 - 1;
+ scen->first_idx[ICE_ACL_PRIO_LOW] = scen->num_entry - 1;
+ scen->first_idx[ICE_ACL_PRIO_NORMAL] = scen->num_entry -
+ scen->num_entry / 4 - 1;
+ scen->first_idx[ICE_ACL_PRIO_HIGH] = 0;
+
+ scen->last_idx[ICE_ACL_PRIO_LOW] = scen->num_entry -
+ scen->num_entry / 4;
+ scen->last_idx[ICE_ACL_PRIO_NORMAL] = scen->num_entry / 4;
+ scen->last_idx[ICE_ACL_PRIO_HIGH] = scen->num_entry / 4 - 1;
}
/**
* ice_acl_scen_assign_entry_idx
* @scen: pointer to the scenario struct
- * @prior: the priority of the flow entry being allocated
+ * @prio: the priority of the flow entry being allocated
*
* To find the index of an available entry in scenario
*
*/
static u16
ice_acl_scen_assign_entry_idx(struct ice_acl_scen *scen,
- enum ice_acl_entry_prior prior)
+ enum ice_acl_entry_prio prio)
{
u16 first_idx, last_idx, i;
s8 step;
- if (prior >= ICE_MAX_PRIOR)
+ if (prio >= ICE_ACL_MAX_PRIO)
return ICE_ACL_SCEN_ENTRY_INVAL;
- first_idx = scen->first_idx[prior];
- last_idx = scen->last_idx[prior];
+ first_idx = scen->first_idx[prio];
+ last_idx = scen->last_idx[prio];
step = first_idx <= last_idx ? 1 : -1;
for (i = first_idx; i != last_idx + step; i += step)
u16 idx;
tbl = hw->acl_tbl;
- if (!tbl) {
- status = ICE_ERR_CFG;
- return status;
- }
+ if (!tbl)
+ return ICE_ERR_CFG;
ice_memset(&buf, 0, sizeof(buf), ICE_NONDMA_MEM);
ice_memset(&act_buf, 0, sizeof(act_buf), ICE_NONDMA_MEM);
break;
}
- row = (dir > 0) ? (row + width) : (row - width);
+ row = dir > 0 ? row + width : row - width;
if (row > hw->acl_tbl->last_tcam ||
row < hw->acl_tbl->first_tcam) {
/* All rows have been checked. Increment 'off' that
ice_acl_assign_act_mem_for_scen(struct ice_acl_tbl *tbl,
struct ice_acl_scen *scen,
struct ice_aqc_acl_scen *scen_buf,
- u8 current_tcam_idx,
- u8 target_tcam_idx)
+ u8 current_tcam_idx, u8 target_tcam_idx)
{
u8 i;
scen->num_entry = num_entries;
status = ice_acl_alloc_partition(hw, scen);
- if (status) {
- ice_free(hw, scen);
- return status;
- }
+ if (status)
+ goto out;
ice_memset(&scen_buf, 0, sizeof(scen_buf), ICE_NONDMA_MEM);
if (status) {
ice_debug(hw, ICE_DBG_ACL, "AQ allocation of ACL scenario failed. status: %d\n",
status);
- ice_free(hw, scen);
- return status;
+ goto out;
}
scen->id = *scen_id;
ice_acl_init_entry(scen);
LIST_ADD(&scen->list_entry, &hw->acl_tbl->scens);
+out:
+ if (status)
+ ice_free(hw, scen);
+
return status;
}
* ice_acl_add_entry - Add a flow entry to an ACL scenario
* @hw: pointer to the HW struct
* @scen: scenario to add the entry to
- * @prior: priority level of the entry being added
+ * @prio: priority level of the entry being added
* @keys: buffer of the value of the key to be programmed to the ACL entry
* @inverts: buffer of the value of the key inverts to be programmed
* @acts: pointer to a buffer containing formatted actions
*/
enum ice_status
ice_acl_add_entry(struct ice_hw *hw, struct ice_acl_scen *scen,
- enum ice_acl_entry_prior prior, u8 *keys, u8 *inverts,
+ enum ice_acl_entry_prio prio, u8 *keys, u8 *inverts,
struct ice_acl_act_entry *acts, u8 acts_cnt, u16 *entry_idx)
{
u8 i, entry_tcam, num_cscd, offset;
if (!scen)
return ICE_ERR_DOES_NOT_EXIST;
- *entry_idx = ice_acl_scen_assign_entry_idx(scen, prior);
+ *entry_idx = ice_acl_scen_assign_entry_idx(scen, prio);
if (*entry_idx >= scen->num_entry) {
*entry_idx = 0;
return ICE_ERR_MAX_LIMIT;