Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1a8ca11 authored by Mauro S. M. Rodrigues's avatar Mauro S. M. Rodrigues Committed by Jeff Kirsher
Browse files

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.

v2:
 - Fixed reverse xmas tree code style issue as suggested by Jakub Kicinski

Signed-off-by: default avatar"Mauro S. M. Rodrigues" <maurosr@linux.vnet.ibm.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 00c09166

drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c

+11 −10
Original line number Diff line number Diff line 
// 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,16 +973,16 @@ 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,

					u8 **object_base,

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)

{

	struct i40e_hmc_info *hmc_info = &hw->hmc;

	u32 obj_offset_in_sd, obj_offset_in_pd;

	i40e_status ret_code = 0;

	struct i40e_hmc_sd_entry *sd_entry;

	struct i40e_hmc_pd_entry *pd_entry;

	u32 pd_idx, pd_lmt, rel_pd_idx;

	i40e_status ret_code = 0;

	u64 obj_offset_in_fpm;

	u32 sd_idx, sd_lmt;
@@ -1047,7 +1048,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 +1069,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 +1089,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 +1110,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;