[dpdk-dev] [PATCH v3 1/2] ixgbe: release software locked semaphores on initialization

Didier Pallard didier.pallard at 6wind.com
Tue Apr 8 15:29:57 CEST 2014


It may happen that DPDK application gets killed while having
acquired locks on the ethernet hardware, causing these locks to
be never released. On next restart of the application, DPDK
skip those ports because it can not acquire the lock,
this may cause some ports (or even complete board if SMBI is locked)
to be inaccessible from DPDK application until reboot of the
hardware.

This patch release locks that are supposed to be locked due to
an improper exit of the application.

Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
---

v3: Move code outside from base driver

 lib/librte_pmd_ixgbe/ixgbe_ethdev.c |   41 ++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index fdf6c1d..637fa88 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -587,6 +587,38 @@ ixgbe_dcb_init(struct ixgbe_hw *hw,struct ixgbe_dcb_config *dcb_config)
 } 
 
 /*
+ * Ensure that all locks are released before first NVM or PHY access
+ */
+static void
+ixgbe_swfw_lock_reset(struct ixgbe_hw *hw) {
+	uint16_t mask;
+
+	/*
+	* Phy lock should not fail in this early stage. If this is the case,
+	* it is due to an improper exit of the application.
+	* So force the release of the faulty lock. Release of common lock
+	* is done automatically by swfw_sync function.
+	*/
+	mask = IXGBE_GSSR_PHY0_SM << hw->bus.func;
+	if (ixgbe_acquire_swfw_semaphore(hw, mask) < 0) {
+		   DEBUGOUT1("SWFW phy%d lock released", hw->bus.func);
+	}
+	ixgbe_release_swfw_semaphore(hw, mask);
+
+	/*
+	* Those one are more tricky since they are common to all ports; but
+	* swfw_sync retries last long enough (1s) to be almost sure that if
+	* lock can not be taken it is due to an improper lock of the
+	* semaphore.
+	*/
+	mask = IXGBE_GSSR_EEP_SM | IXGBE_GSSR_MAC_CSR_SM | IXGBE_GSSR_SW_MNG_SM;
+	if (ixgbe_acquire_swfw_semaphore(hw, mask) < 0) {
+		   DEBUGOUT("SWFW common locks released");
+	}
+	ixgbe_release_swfw_semaphore(hw, mask);
+}
+
+/*
  * This function is based on code in ixgbe_attach() in ixgbe/ixgbe.c.
  * It returns 0 on success.
  */
@@ -643,6 +675,12 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
 		return -EIO;
 	}
 
+	/* pick up the PCI bus settings for reporting later */
+	ixgbe_get_bus_info(hw);
+
+	/* Unlock any pending hardware semaphore */
+	ixgbe_swfw_lock_reset(hw);
+
 	/* Initialize DCB configuration*/
 	memset(dcb_config, 0, sizeof(struct ixgbe_dcb_config));
 	ixgbe_dcb_init(hw,dcb_config);
@@ -700,9 +738,6 @@ eth_ixgbe_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
 	/* disable interrupt */
 	ixgbe_disable_intr(hw);
 
-	/* pick up the PCI bus settings for reporting later */
-	ixgbe_get_bus_info(hw);
-
 	/* reset mappings for queue statistics hw counters*/
 	ixgbe_reset_qstat_mappings(hw);
 
-- 
1.7.10.4



More information about the dev mailing list