From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by dpdk.org (Postfix) with ESMTP id A1D2F159 for ; Tue, 8 Apr 2014 15:28:30 +0200 (CEST) Received: by mail-we0-f171.google.com with SMTP id t61so948436wes.16 for ; Tue, 08 Apr 2014 06:30:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=oVcmAcZL6ww9pPSXvWiaR42syfE+xfD58vA5A8+D3WM=; b=KiAFd59GBoeidUpkkqCaGelJq2bIH3lH2rjhFlnRKoB0QUuGKTeZoV/542PiGgTSd5 XLaRBpb0TtdO4nXaW0g4Sf+h+YxicgyFhUew2VOV9X0nvo3i3snA+ZUMGxaDgli08ENO JwJk6oEEcKppNRzjdhEUsdcwGRCN6wZTwvpENq+ImvK0XQ547GZZekmXnU+Z0q91lsto xA1yRaotzBqXrW/EdohHOyclLtNy3bTnpmOL6clz15q951RTRqEuyxKHQ0lTP5DPeSgq vlvl+1kYMI2u2n72Rr2f4HZoSLuV+j6YUtdIY5dv0ZJ8hr0PE6yc3SwZdBfeuT3XQaZR jpsw== X-Gm-Message-State: ALoCoQk7c34yLNyCe9ZNXQRXj9TFAYafwH1FgTw4pPCdVdLBFNEBuCwLJuSHYeq9Qey9Iyb5h3lk X-Received: by 10.194.190.42 with SMTP id gn10mr3917333wjc.9.1396963806890; Tue, 08 Apr 2014 06:30:06 -0700 (PDT) Received: from pala.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id gr2sm3286189wjc.12.2014.04.08.06.30.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Apr 2014 06:30:05 -0700 (PDT) From: Didier Pallard To: dev@dpdk.org Date: Tue, 8 Apr 2014 15:29:57 +0200 Message-Id: <1396963798-13123-1-git-send-email-didier.pallard@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <530DC788.8020706@6wind.com> References: <530DC788.8020706@6wind.com> Subject: [dpdk-dev] [PATCH v3 1/2] ixgbe: release software locked semaphores on initialization X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2014 13:28:30 -0000 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 --- 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