i40e: fix hw_dbg usage in i40e_hmc_get_object_va
Subsystems (2)
PATCH 1/2 i40e: fix hw_dbg usage in i40e_hmc_get_object_va
The mentioned function references a i40e_hw attribute, as parameter for hw_dbg, but it doesn't exist in the function scope.
Fixes it by changing parameters from i40e_hmc_info to i40e_hw which can retrieve the necessary i40e_hmc_info.
--- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c +8 -6
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2018 Intel Corporation. */ +#include "i40e.h" #include "i40e_osdep.h" #include "i40e_register.h" #include "i40e_type.h"
@@ -963,7 +964,7 @@ static i40e_status i40e_set_hmc_context(u8 *context_bytes,/** * i40e_hmc_get_object_va - retrieves an object's virtual address -* @hmc_info: pointer to i40e_hmc_info struct +* @hw: the hardware struct, from which we obtain the i40e_hmc_info pointer * @object_base: pointer to u64 to get the va * @rsrc_type: the hmc resource type * @obj_idx: hmc object index
@@ -972,7 +973,7 @@ static i40e_status i40e_set_hmc_context(u8 *context_bytes,* base pointer. This function is used for LAN Queue contexts. **/ static -i40e_status i40e_hmc_get_object_va (struct i40e_hmc_info *hmc_info, +i40e_status i40e_hmc_get_object_va (struct i40e_hw *hw,u8 **object_base,enum i40e_hmc_lan_rsrc_type rsrc_type,u32 obj_idx)
@@ -982,6 +983,7 @@ i40e_status i40e_hmc_get_object_va(struct i40e_hmc_info *hmc_info,struct i40e_hmc_sd_entry *sd_entry;struct i40e_hmc_pd_entry *pd_entry;u32 pd_idx, pd_lmt, rel_pd_idx; +struct i40e_hmc_info *hmc_info = &hw->hmc;u64 obj_offset_in_fpm;u32 sd_idx, sd_lmt;
@@ -1047,7 +1049,7 @@ i40e_status i40e_clear_lan_tx_queue_context(struct i40e_hw *hw,i40e_status err;u8 *context_bytes; - err =i40e_hmc_get_object_va (&hw->hmc, &context_bytes, + err =i40e_hmc_get_object_va (hw, &context_bytes,I40E_HMC_LAN_TX , queue);if (err <0 )return err;
@@ -1068,7 +1070,7 @@ i40e_status i40e_set_lan_tx_queue_context(struct i40e_hw *hw,i40e_status err;u8 *context_bytes; - err =i40e_hmc_get_object_va (&hw->hmc, &context_bytes, + err =i40e_hmc_get_object_va (hw, &context_bytes,I40E_HMC_LAN_TX , queue);if (err <0 )return err;
@@ -1088,7 +1090,7 @@ i40e_status i40e_clear_lan_rx_queue_context(struct i40e_hw *hw,i40e_status err;u8 *context_bytes; - err =i40e_hmc_get_object_va (&hw->hmc, &context_bytes, + err =i40e_hmc_get_object_va (hw, &context_bytes,I40E_HMC_LAN_RX , queue);if (err <0 )return err;
@@ -1109,7 +1111,7 @@ i40e_status i40e_set_lan_rx_queue_context(struct i40e_hw *hw,i40e_status err;u8 *context_bytes; - err =i40e_hmc_get_object_va (&hw->hmc, &context_bytes, + err =i40e_hmc_get_object_va (hw, &context_bytes,I40E_HMC_LAN_RX , queue);if (err <0 )return err;
Signature · 1 line
2.21.0
PATCH 2/2 i40e: Implement debug macro hw_dbg using pr_debug
There are several uses of hw_dbg in the code, producing no output. This patch implments it using pr_debug.
Initially the intention was to implement it using netdev_dbg, analogously to what is done in ixgbe for instance. That approach was avoided due to some early usages of hw_dbg, like i40e_pf_reset, before the vsi structure initialization causing NULL pointer dereference during the driver probe if the dbg messages were turned on as soon as the module is probed.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 1 + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 1 + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2018 Intel Corporation. */ +#include "i40e.h" #include "i40e_type.h" #include "i40e_adminq.h" #include "i40e_prototype.h"
drivers/net/ethernet/intel/i40e/i40e_hmc.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2013 - 2018 Intel Corporation. */ +#include "i40e.h" #include "i40e_osdep.h" #include "i40e_register.h" #include "i40e_status.h"
drivers/net/ethernet/intel/i40e/i40e_osdep.h +6 -1
@@ -18,7 +18,12 @@* actual OS primitives */ -#define hw_dbg(hw, S, A...) do {} while (0) +#define hw_dbg(hw, S, A...) \ +do { \ + int domain = pci_domain_nr(((struct i40e_pf *)(hw)->back)->pdev->bus); \ + pr_debug("i40e %04x:%02x:%02x.%x " S, domain, (hw)->bus.bus_id, \ + (hw)->bus.device, (hw)->bus.func, ## A); \ +} while (0)#define wr32 (a, reg, value) writel((value), ((a)->hw_addr + (reg)))#define rd32 (a, reg) readl((a)->hw_addr + (reg))
Signature · 1 line
2.21.0
Bowers
PATCH 2/2 i40e: Implement debug macro hw_dbg using pr_debug
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Mauro S. M. Rodrigues
Sent: Tuesday, August 6, 2019 6:34 AM
To: intel-wired-lan at lists.osuosl.org; Kirsher, Jeffrey T <[email protected]>
Subject: [Intel-wired-lan] [PATCH 2/2] i40e: Implement debug macrohw_dbgusingpr_debugThere are several uses of
hw_dbgin the code, producing no output. This patch implments it usingpr_debug.Initially the intention was to implement it using
netdev_dbg, analogously to what is done in ixgbe for instance. That approach was avoided due to some early usages ofhw_dbg, likei40e_pf_reset, before the vsi structure initialization causing NULL pointer dereference during the driver probe if the dbg messages were turned on as soon as the module is probed.
Quoted 6 lines
Signed-off-by Mauro S. M. Rodrigues <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_common.c | 1 + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 1 + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-)
Bowers
PATCH 1/2 i40e: fix hw_dbg usage in i40e_hmc_get_object_va
In reply to Mauro S. M. RodriguesQuoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Mauro S. M. Rodrigues
Sent: Tuesday, August 6, 2019 6:34 AM
To: intel-wired-lan at lists.osuosl.org; Kirsher, Jeffrey T <[email protected]>
Subject: [Intel-wired-lan] [PATCH 1/2] i40e: fixhw_dbgusage ini40e_hmc_get_object_vaThe mentioned function references a
i40e_hwattribute, as parameter forhw_dbg, but it doesn't exist in the function scope.
Fixes it by changing parameters fromi40e_hmc_infotoi40e_hwwhich can retrieve the necessaryi40e_hmc_info.
Quoted 4 lines
Signed-off-by Mauro S. M. Rodrigues <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)