]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ice: Fix recipe read procedure
authorWojciech Drewek <wojciech.drewek@intel.com>
Mon, 1 Jul 2024 09:05:46 +0000 (11:05 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Aug 2024 07:01:02 +0000 (09:01 +0200)
[ Upstream commit 19abb9c2b900bad59e0a9818d6c83bb4cc875437 ]

When ice driver reads recipes from firmware information about
need_pass_l2 and allow_pass_l2 flags is not stored correctly.
Those flags are stored as one bit each in ice_sw_recipe structure.
Because of that, the result of checking a flag has to be casted to bool.
Note that the need_pass_l2 flag currently works correctly, because
it's stored in the first bit.

Fixes: bccd9bce29e0 ("ice: Add guard rule when creating FDB in switchdev")
Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/intel/ice/ice_switch.c

index 1191031b2a43d15d5cded3c16cfaa8d4baf63220..ffd6c42bda1ed478fa9e54561299a680fdf15729 100644 (file)
@@ -2413,10 +2413,10 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid,
                /* Propagate some data to the recipe database */
                recps[idx].is_root = !!is_root;
                recps[idx].priority = root_bufs.content.act_ctrl_fwd_priority;
-               recps[idx].need_pass_l2 = root_bufs.content.act_ctrl &
-                                         ICE_AQ_RECIPE_ACT_NEED_PASS_L2;
-               recps[idx].allow_pass_l2 = root_bufs.content.act_ctrl &
-                                          ICE_AQ_RECIPE_ACT_ALLOW_PASS_L2;
+               recps[idx].need_pass_l2 = !!(root_bufs.content.act_ctrl &
+                                            ICE_AQ_RECIPE_ACT_NEED_PASS_L2);
+               recps[idx].allow_pass_l2 = !!(root_bufs.content.act_ctrl &
+                                             ICE_AQ_RECIPE_ACT_ALLOW_PASS_L2);
                bitmap_zero(recps[idx].res_idxs, ICE_MAX_FV_WORDS);
                if (root_bufs.content.result_indx & ICE_AQ_RECIPE_RESULT_EN) {
                        recps[idx].chain_idx = root_bufs.content.result_indx &