From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CCA09A00C2 for ; Thu, 3 Nov 2022 10:28:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C3C5E41614; Thu, 3 Nov 2022 10:28:45 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id C4A1D40693 for ; Thu, 3 Nov 2022 10:28:43 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id bs21so1726076wrb.4 for ; Thu, 03 Nov 2022 02:28:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ec/gWibjPk8gIUkQOHzpMvDxeLUiysMIdSZ0w3RGeLI=; b=Mp+6Mfk8SDqULsxyMvSu8cfvQ/PVNBCunIPUgzjJCCbvpQniMRl7jktRHPBCidFZsy Em+M2K2OFcqGYgReB1QD/CZUJiBlor891PBKI0LMcjPswJ9q0jvrmiyuKYv1u/5wGHYj cP4DOl7w6b6sAtAM0S+FnRWFrZP9zS8pJp070SdA//jvZJEmodEHdzZWIf7vQhDBYi0T pthgxhpyTHl4z9etMH+DbgACSrWG4O+/99LTLTREa3jc0v4vmISC1iXz3Yl1CNVYWxXG 6Ggnbs1qZlMC0Mv8DmbWEBS86jMCXFTjk2aZ9PHmK+k5tL2iP44+8nyVPOB2FA9BouxJ Lvgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ec/gWibjPk8gIUkQOHzpMvDxeLUiysMIdSZ0w3RGeLI=; b=xLEYqngTt+jMB5m4OTcx1zTHB5erqQBCh04bqHoHzYlFHfeEGfKVje2vRxrjvR4FI5 TLL2hCXPDNNQiExUDf3FYBZvlZRc/V6m1pUWryk6f14niSeLObCnNkQXAiIDCi8OOct7 /aLlMV0Zg8ZPcmzOP3wErvzvvKi/7YdPFkymGiJcc2528bIt/zPJwTzkHq6m3Ci8xuxr tMQhIx6PCq8XztzAwFUDFdkIvK82sfoMhDZuBQ71r14qG7dCU2E1DfJQxmlws6mIlNhi 27sezHHjYJuti0Trw3LU/pbT5+kPhMRADaRP/TkkOpWwChnD2eKiBqvyO9kBaQtfuGN5 jm6g== X-Gm-Message-State: ACrzQf3rqCek3Mg+COJ0V60p1M3Iw5xhjxnG5L6WJGEfNsf8x9Ct4h85 fCi0SltgMoHehlI20ic0fFOMhtMQRV4y4Q== X-Google-Smtp-Source: AMsMyM5d2hfYVDTAjOcXBU7DnZ2Mk/WrdtwGPYlswOSr+jzeZoq2uR12/jjoW1OfioV23bhSnMSejQ== X-Received: by 2002:a5d:694e:0:b0:236:65a0:e7ed with SMTP id r14-20020a5d694e000000b0023665a0e7edmr17787552wrw.233.1667467723528; Thu, 03 Nov 2022 02:28:43 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id j19-20020a05600c1c1300b003a8434530bbsm5154645wms.13.2022.11.03.02.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: remove semaphore between SW/FW' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:31 +0000 Message-Id: <20221103092758.1099402-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e0b3fa222e2ed9888e8ccfb38ce8d83199bcde9a Thanks. Luca Boccassi --- >From e0b3fa222e2ed9888e8ccfb38ce8d83199bcde9a Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 2 Sep 2022 11:00:05 +0800 Subject: [PATCH] net/txgbe: remove semaphore between SW/FW [ upstream commit 61b7a046e260897329a648b1c0e72032b5fbe685 ] Since firmware does not use the semaphore between software and firmware. Remove useless unilateral semaphore setting. Fixes: 35c90ecccfd4 ("net/txgbe: add EEPROM functions") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_eeprom.c | 32 --------------------------- 1 file changed, 32 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_eeprom.c b/drivers/net/txgbe/base/txgbe_eeprom.c index 6ff0f23f18..9e14f2f219 100644 --- a/drivers/net/txgbe/base/txgbe_eeprom.c +++ b/drivers/net/txgbe/base/txgbe_eeprom.c @@ -110,37 +110,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw) status = 0; } - /* Now get the semaphore between SW/FW through the SWESMBI bit */ - if (status == 0) { - for (i = 0; i < timeout; i++) { - /* Set the SW EEPROM semaphore bit to request access */ - wr32m(hw, TXGBE_MNGSWSYNC, - TXGBE_MNGSWSYNC_REQ, TXGBE_MNGSWSYNC_REQ); - - /* - * If we set the bit successfully then we got the - * semaphore. - */ - swsm = rd32(hw, TXGBE_MNGSWSYNC); - if (swsm & TXGBE_MNGSWSYNC_REQ) - break; - - usec_delay(50); - } - - /* - * Release semaphores and return error if SW EEPROM semaphore - * was not granted because we don't have access to the EEPROM - */ - if (i >= timeout) { - DEBUGOUT("SWESMBI Software EEPROM semaphore not granted."); - txgbe_release_eeprom_semaphore(hw); - status = TXGBE_ERR_EEPROM; - } - } else { - DEBUGOUT("Software semaphore SMBI between device drivers not granted."); - } - return status; } @@ -152,7 +121,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw) **/ void txgbe_release_eeprom_semaphore(struct txgbe_hw *hw) { - wr32m(hw, TXGBE_MNGSWSYNC, TXGBE_MNGSWSYNC_REQ, 0); wr32m(hw, TXGBE_SWSEM, TXGBE_SWSEM_PF, 0); txgbe_flush(hw); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:26.274266127 +0000 +++ 0013-net-txgbe-remove-semaphore-between-SW-FW.patch 2022-11-03 09:27:25.309421202 +0000 @@ -1 +1 @@ -From 61b7a046e260897329a648b1c0e72032b5fbe685 Mon Sep 17 00:00:00 2001 +From e0b3fa222e2ed9888e8ccfb38ce8d83199bcde9a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 61b7a046e260897329a648b1c0e72032b5fbe685 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 4ed6bd6728..aeeae06dfc 100644 +index 6ff0f23f18..9e14f2f219 100644 @@ -21 +22 @@ -@@ -111,37 +111,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw) +@@ -110,37 +110,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw) @@ -59 +60 @@ -@@ -153,7 +122,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw) +@@ -152,7 +121,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw)