Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

realtek: 5.15: Improve error handling in rtl838x_pie_rule_write()

Browse Source 
In target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/rtl838x.c,
make rtl838x_pie_rule_write() return non-zero value case of error.

Signed-off-by: Pascal Ernster <git@hardfalcon.net>
This commit is contained in:
Pascal Ernster 2023-01-05 06:56:38 +01:00 committed by Sander Vanheule
parent a188536ef6
commit 720b243171
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/rtl838x.c
View File

@ -1335,7 +1335,7 @@ static int rtl838x_pie_rule_write(struct rtl838x_switch_priv *priv, int idx, str
/* Access IACL table (1) via register 0 */ /* Access IACL table (1) via register 0 */
struct table_reg *q = rtl_table_get(RTL8380_TBL_0, 1); struct table_reg *q = rtl_table_get(RTL8380_TBL_0, 1);
u32 r[18]; u32 r[18];
int err = 0; int err;
int block = idx / PIE_BLOCK_SIZE; int block = idx / PIE_BLOCK_SIZE;
u32 t_select = sw_r32(RTL838X_ACL_BLK_TMPLTE_CTRL(block)); u32 t_select = sw_r32(RTL838X_ACL_BLK_TMPLTE_CTRL(block));
@ -1344,17 +1344,21 @@ static int rtl838x_pie_rule_write(struct rtl838x_switch_priv *priv, int idx, str
for (int i = 0; i < 18; i++) for (int i = 0; i < 18; i++)
r[i] = 0; r[i] = 0;
if (!pr->valid) if (!pr->valid) {
goto err_out; err = -EINVAL;
pr_err("Rule invalid\n");
goto errout;
}
rtl838x_write_pie_fixed_fields(r, pr); rtl838x_write_pie_fixed_fields(r, pr);
pr_debug("%s: template %d\n", __func__, (t_select >> (pr->tid * 3)) & 0x7); pr_debug("%s: template %d\n", __func__, (t_select >> (pr->tid * 3)) & 0x7);
rtl838x_write_pie_templated(r, pr, fixed_templates[(t_select >> (pr->tid * 3)) & 0x7]); rtl838x_write_pie_templated(r, pr, fixed_templates[(t_select >> (pr->tid * 3)) & 0x7]);
if (rtl838x_write_pie_action(r, pr)) { err = rtl838x_write_pie_action(r, pr);
if (err) {
pr_err("Rule actions too complex\n"); pr_err("Rule actions too complex\n");
goto err_out; goto errout;
} }
/* rtl838x_pie_rule_dump_raw(r); */ /* rtl838x_pie_rule_dump_raw(r); */
@ -1362,7 +1366,7 @@ static int rtl838x_pie_rule_write(struct rtl838x_switch_priv *priv, int idx, str
for (int i = 0; i < 18; i++) for (int i = 0; i < 18; i++)
sw_w32(r[i], rtl_table_data(q, i)); sw_w32(r[i], rtl_table_data(q, i));
err_out: errout:
rtl_table_write(q, idx); rtl_table_write(q, idx);
rtl_table_release(q); rtl_table_release(q);