From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH S37 05/15] ice: Remove ice_dev_onetime_setup()
Date: Wed, 22 Jan 2020 07:20:31 -0800 [thread overview]
Message-ID: <20200122152041.41498-5-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20200122152041.41498-1-anthony.l.nguyen@intel.com>
From: Brett Creeley <brett.creeley@intel.com>
ice_dev_onetime_setup contains driver workarounds needed for
firmware limitations. These issues have now been resolved in newer
NVMs so remove the function.
Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_common.c | 16 ----------------
drivers/net/ethernet/intel/ice/ice_common.h | 2 --
drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 1 -
drivers/net/ethernet/intel/ice/ice_lib.c | 1 -
4 files changed, 20 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index d900bad55f24..2d418c84d6a5 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -24,20 +24,6 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)
return 0;
}
-/**
- * ice_dev_onetime_setup - Temporary HW/FW workarounds
- * @hw: pointer to the HW structure
- *
- * This function provides temporary workarounds for certain issues
- * that are expected to be fixed in the HW/FW.
- */
-void ice_dev_onetime_setup(struct ice_hw *hw)
-{
-#define MBX_PF_VT_PFALLOC 0x00231E80
- /* set VFs per PF */
- wr32(hw, MBX_PF_VT_PFALLOC, rd32(hw, PF_VT_PFALLOC_HIF));
-}
-
/**
* ice_clear_pf_cfg - Clear PF configuration
* @hw: pointer to the hardware structure
@@ -763,8 +749,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw)
if (status)
goto err_unroll_sched;
- ice_dev_onetime_setup(hw);
-
/* Get MAC information */
/* A single port can report up to two (LAN and WoL) addresses */
mac_buf = devm_kcalloc(ice_hw_to_dev(hw), 2,
diff --git a/drivers/net/ethernet/intel/ice/ice_common.h b/drivers/net/ethernet/intel/ice/ice_common.h
index dfec1105fd06..21b31cd33c41 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.h
+++ b/drivers/net/ethernet/intel/ice/ice_common.h
@@ -54,8 +54,6 @@ enum ice_status ice_get_caps(struct ice_hw *hw);
void ice_set_safe_mode_caps(struct ice_hw *hw);
-void ice_dev_onetime_setup(struct ice_hw *hw);
-
enum ice_status
ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,
u32 rxq_index);
diff --git a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
index b2502c7fd6ed..30f50b06173e 100644
--- a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
+++ b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
@@ -332,7 +332,6 @@
#define GLV_TEPC(_VSI) (0x00312000 + ((_VSI) * 4))
#define GLV_UPRCL(_i) (0x003B2000 + ((_i) * 8))
#define GLV_UPTCL(_i) (0x0030A000 + ((_i) * 8))
-#define PF_VT_PFALLOC_HIF 0x0009DD80
#define VSIQF_HKEY_MAX_INDEX 12
#define VSIQF_HLUT_MAX_INDEX 15
#define VFINT_DYN_CTLN(_i) (0x00003800 + ((_i) * 4))
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 75159b658098..90efa0e718b4 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -2736,7 +2736,6 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi)
ice_vsi_put_qs(vsi);
ice_vsi_clear_rings(vsi);
ice_vsi_free_arrays(vsi);
- ice_dev_onetime_setup(&pf->hw);
if (vsi->type == ICE_VSI_VF)
ice_vsi_set_num_qs(vsi, vf->vf_id);
else
--
2.20.1
next prev parent reply other threads:[~2020-01-22 15:20 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 15:20 [Intel-wired-lan] [PATCH S37 01/15] ice: Fix DCB rebuild after reset Tony Nguyen
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 02/15] ice: Fix switch between FW and SW LLDP Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 03/15] ice: display supported and advertised link modes Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 04/15] ice: Don't allow same value for Rx tail to be written twice Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` Tony Nguyen [this message]
2020-01-24 23:17 ` [Intel-wired-lan] [PATCH S37 05/15] ice: Remove ice_dev_onetime_setup() Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 06/15] ice: Remove CONFIG_PCI_IOV wrap in ice_set_pf_caps Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 07/15] ice: Modify link message logging Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 08/15] ice: fix and consolidate logging of NVM/firmware version information Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 09/15] ice: update Unit Load Status bitmask to check after reset Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 10/15] ice: Remove possible null dereference Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 11/15] ice: Use ice_pf_to_dev Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 12/15] ice: Make print statements more compact Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 13/15] ice: Cleanup ice_vsi_alloc_q_vectors Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 14/15] ice: Use correct netif error function Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-22 15:20 ` [Intel-wired-lan] [PATCH S37 15/15] ice: Trivial fixes Tony Nguyen
2020-01-24 23:17 ` Bowers, AndrewX
2020-01-24 23:17 ` [Intel-wired-lan] [PATCH S37 01/15] ice: Fix DCB rebuild after reset Bowers, AndrewX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200122152041.41498-5-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=intel-wired-lan@osuosl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox