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 0E2DBA0A0E for ; Mon, 10 May 2021 18:06:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0798E410E3; Mon, 10 May 2021 18:06:05 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2071.outbound.protection.outlook.com [40.107.237.71]) by mails.dpdk.org (Postfix) with ESMTP id 0F151406A3 for ; Mon, 10 May 2021 18:06:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=COqhbIBNRZpPu+xfUWApkhAA2J2OMkEGjS8iibMUR3yc0BT24Icr12tpIYfNQeJ0YSf6QECxcpBKIENY0UXAK6r5WosZ1dh8ukCJ+nPQ3FGF2xTkE+v5eT3HZXJvyoiN1+myr2oRXNaF76rTVA0LEoKsDWq7+7feju53bY1ST/N5gb7P19DCbJqx8yLq2GBEDLIy5Bw5DBLIVfgvRsE9/DLp+ClpCVbL6Ud7MdzrXco4rS1pJ3lSH/M57qDEsVR/N2EDOOAcOQ7l2mHjbG6iEVjtVRnMrJLX8eAMXtedrR+IO20LJFW4BjQkbqzjDDkvrxVFKi7rWb+UMki6MK5qiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3DMkZNVp2aUBPNfeo9ug/Oa+8xIBx5xQIi8beGXr4KU=; b=j7/Ib1UTb8oZNohd6UAAK9aNbIApIHRT9wIsMruHC6Xe3r26Sdsmpe/p6WCHlT0kjWmwx3G67MiOF8U00dK3BgH91ny8y/kVgapwPJGxwE1/I8kUc8WF7DihQqj9oSxp/9XHljTRmDdKl74hldmlZUlQmc6sC6OIaGo4JFPc77Q9t9pxkrUxEvaeMB3LHhQmqYg2iv7WpjQdZeji14+hEYqKLqUnzZCUwDbEqb/PnRyJkwIC4GeAryAHr2ghHuSDNywlTTbWh4oY2nC5wNvejoM5i7iPDoZILJWohbzDE/XtADUECrmAx22eIFR+nV+nK8/CKo8BKGeXS0ELmrERSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3DMkZNVp2aUBPNfeo9ug/Oa+8xIBx5xQIi8beGXr4KU=; b=GYY95ZW38eAKdBw/tsJg8CN354YtHdYuGfO0PztaKYAaYBLIM1TcrWJJLgzgL+GEjm74IZpVaumtbi4D0LvZJr6at+gp+f1STlg5BAdmLYCN7qpIddg5xwMgyYNyDoNu1HDSKXeIqNUKxfwYH0ZtLCIpiWK1MaM5M8jHtktrmDBmb4FjQEo8gv6My+SIRZ+jQdVo7lZFTAUHll10KTtQhG/DS5vSaenk79hc8TPx1hmwPuDYWhTJihuhoze+wJzt1uS43+bZV6e9Uu4tj7hFVWFkeBaQNbYmJ+SnPkAOnR17/G3f4NZSzjR7Rv/2R6LbvsC9fxgmCM8iG94GtyoOEQ== Received: from BN9PR03CA0484.namprd03.prod.outlook.com (2603:10b6:408:130::9) by BYAPR12MB2710.namprd12.prod.outlook.com (2603:10b6:a03:68::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:06:01 +0000 Received: from BN8NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:408:130:cafe::bf) by BN9PR03CA0484.outlook.office365.com (2603:10b6:408:130::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:06:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT027.mail.protection.outlook.com (10.13.177.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:06:01 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:05:59 +0000 From: Xueming Li To: Jiawen Wu CC: Luca Boccassi , dpdk stable Date: Mon, 10 May 2021 23:59:39 +0800 Message-ID: <20210510160258.30982-30-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 053fd149-a264-42fa-50b8-08d913cd81af X-MS-TrafficTypeDiagnostic: BYAPR12MB2710: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qYCrDjPJyDPRRAUpAdXZ2MhweqgE97W3Tmqz2UknkTen2lRmLVBXLyA85j1/Z9y1VxrlnediF0FFdm/xf2updUEZmiu7PmFiQ0AAu8lUtqr4jcptA0mIUlVyaSSRFjIObfFSI0bBqTj+Wp+bBOa4Qzyi115Jk76hDFlffLtyIbKsienrZsPjQsK07FZdeRwTTUVNPWXNS2bTDxwpRw3TSzDU90qcaDUqCPlDCPWE+yFHEgBzMQIY1SXRuWRyaFlP/uSMygHomizpcmBPAHXDpwfNbUtcK0WMD1nzgAqFPBEP/4l8/jhhG5IG/tLFQDOed+VZqUE1QSsbDE0OhXfEE70AlQBVN51JvsxFcwrQLBMYgTFYE0LrJyHGgEYdlnjyWMwh0CgLdP6agzjdeTEZCy/58OJVcbdM7UjXXTDGsXuOLWFYIixTRJF4SiiCR8t9y++65Qj22O6vc5g7i/BmMLmzoUIgm5Zv6M7u84LVrLCs/kikA2a8ISIkSMqn8yjdclCdhIa+u1N60fz6ICONmaxqc9zXFANO6j0CShORtz4eEAqHTJA35I3hUYvp+OQmkt1k0UPHoRhxvwGLBYtnYsBLuzPIiLVbdrRHK3g/S7sQVuwIS3KmSichEdEczZ8oN7ogmhZnawBJhp7YFyDwy4tXDl1B8bOwCqSJ7Jxqaum/OVNk3VPfb0l0zoRMeedH6SuiPZOpT2Y5RyHnle9WuifuXxcg5GUUj2wqnrVesEMl6WbHxpiQWdWElb+zuX+Dal9vP/4hp+UJs+mN8UOZqA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(376002)(136003)(396003)(346002)(46966006)(36840700001)(16526019)(186003)(1076003)(2906002)(54906003)(7636003)(47076005)(426003)(8676002)(70586007)(70206006)(55016002)(86362001)(36906005)(316002)(6286002)(5660300002)(83380400001)(4326008)(336012)(8936002)(53546011)(36756003)(356005)(2616005)(6916009)(966005)(82310400003)(478600001)(7696005)(36860700001)(6666004)(26005)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:06:01.2910 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 053fd149-a264-42fa-50b8-08d913cd81af X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2710 Subject: [dpdk-stable] patch 'net/txgbe: remove unused functions' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/991c44b257506f3dbd66e180cfa7ba32f1efaf67 Thanks. Xueming Li --- >From 991c44b257506f3dbd66e180cfa7ba32f1efaf67 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 5 Mar 2021 10:14:35 +0800 Subject: [PATCH] net/txgbe: remove unused functions Cc: Luca Boccassi [ upstream commit 9f1b1fbbdd483836f30004ce5db3b99080ebf718 ] Remove unused functions for EEPROM read and write. Fixes: 35c90ecccfd4 ("net/txgbe: add EEPROM functions") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_eeprom.c | 76 +-------------------------- drivers/net/txgbe/base/txgbe_eeprom.h | 2 - 2 files changed, 2 insertions(+), 76 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_eeprom.c b/drivers/net/txgbe/base/txgbe_eeprom.c index 72cd3ff307..bcbf3503c8 100644 --- a/drivers/net/txgbe/base/txgbe_eeprom.c +++ b/drivers/net/txgbe/base/txgbe_eeprom.c @@ -193,7 +193,7 @@ s32 txgbe_ee_read16(struct txgbe_hw *hw, u32 offset, } /** - * txgbe_ee_read_buffer- Read EEPROM word(s) using hostif + * txgbe_ee_readw_buffer- Read EEPROM word(s) using hostif * @hw: pointer to hardware structure * @offset: offset of word in the EEPROM to read * @words: number of words @@ -274,42 +274,6 @@ s32 txgbe_ee_read32(struct txgbe_hw *hw, u32 addr, u32 *data) return err; } -/** - * txgbe_ee_read_buffer - Read EEPROM byte(s) using hostif - * @hw: pointer to hardware structure - * @addr: offset of bytes in the EEPROM to read - * @len: number of bytes - * @data: byte(s) read from the EEPROM - * - * Reads a 8 bit byte(s) from the EEPROM using the hostif. - **/ -s32 txgbe_ee_read_buffer(struct txgbe_hw *hw, - u32 addr, u32 len, void *data) -{ - const u32 mask = TXGBE_MNGSEM_SWMBX | TXGBE_MNGSEM_SWFLASH; - u8 *buf = (u8 *)data; - int err; - - err = hw->mac.acquire_swfw_sync(hw, mask); - if (err) - return err; - - while (len) { - u32 seg = (len <= TXGBE_PMMBX_DATA_SIZE - ? len : TXGBE_PMMBX_DATA_SIZE); - - err = txgbe_hic_sr_read(hw, addr, buf, seg); - if (err) - break; - - len -= seg; - buf += seg; - } - - hw->mac.release_swfw_sync(hw, mask); - return err; -} - /** * txgbe_ee_write - Write EEPROM word using hostif * @hw: pointer to hardware structure @@ -339,7 +303,7 @@ s32 txgbe_ee_write16(struct txgbe_hw *hw, u32 offset, } /** - * txgbe_ee_write_buffer - Write EEPROM word(s) using hostif + * txgbe_ee_writew_buffer - Write EEPROM word(s) using hostif * @hw: pointer to hardware structure * @offset: offset of word in the EEPROM to write * @words: number of words @@ -420,42 +384,6 @@ s32 txgbe_ee_write32(struct txgbe_hw *hw, u32 addr, u32 data) return err; } -/** - * txgbe_ee_write_buffer - Write EEPROM byte(s) using hostif - * @hw: pointer to hardware structure - * @addr: offset of bytes in the EEPROM to write - * @len: number of bytes - * @data: word(s) write to the EEPROM - * - * Write a 8 bit byte(s) to the EEPROM using the hostif. - **/ -s32 txgbe_ee_write_buffer(struct txgbe_hw *hw, - u32 addr, u32 len, void *data) -{ - const u32 mask = TXGBE_MNGSEM_SWMBX | TXGBE_MNGSEM_SWFLASH; - u8 *buf = (u8 *)data; - int err; - - err = hw->mac.acquire_swfw_sync(hw, mask); - if (err) - return err; - - while (len) { - u32 seg = (len <= TXGBE_PMMBX_DATA_SIZE - ? len : TXGBE_PMMBX_DATA_SIZE); - - err = txgbe_hic_sr_write(hw, addr, buf, seg); - if (err) - break; - - len -= seg; - buf += seg; - } - - hw->mac.release_swfw_sync(hw, mask); - return err; -} - /** * txgbe_calc_eeprom_checksum - Calculates and returns the checksum * @hw: pointer to hardware structure diff --git a/drivers/net/txgbe/base/txgbe_eeprom.h b/drivers/net/txgbe/base/txgbe_eeprom.h index d0e142dba5..78b8af978b 100644 --- a/drivers/net/txgbe/base/txgbe_eeprom.h +++ b/drivers/net/txgbe/base/txgbe_eeprom.h @@ -51,14 +51,12 @@ s32 txgbe_ee_readw_sw(struct txgbe_hw *hw, u32 offset, u16 *data); s32 txgbe_ee_readw_buffer(struct txgbe_hw *hw, u32 offset, u32 words, void *data); s32 txgbe_ee_read32(struct txgbe_hw *hw, u32 addr, u32 *data); -s32 txgbe_ee_read_buffer(struct txgbe_hw *hw, u32 addr, u32 len, void *data); s32 txgbe_ee_write16(struct txgbe_hw *hw, u32 offset, u16 data); s32 txgbe_ee_writew_sw(struct txgbe_hw *hw, u32 offset, u16 data); s32 txgbe_ee_writew_buffer(struct txgbe_hw *hw, u32 offset, u32 words, void *data); s32 txgbe_ee_write32(struct txgbe_hw *hw, u32 addr, u32 data); -s32 txgbe_ee_write_buffer(struct txgbe_hw *hw, u32 addr, u32 len, void *data); #endif /* _TXGBE_EEPROM_H_ */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.480772900 +0800 +++ 0031-net-txgbe-remove-unused-functions.patch 2021-05-10 23:59:26.360000000 +0800 @@ -1 +1 @@ -From 9f1b1fbbdd483836f30004ce5db3b99080ebf718 Mon Sep 17 00:00:00 2001 +From 991c44b257506f3dbd66e180cfa7ba32f1efaf67 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 9f1b1fbbdd483836f30004ce5db3b99080ebf718 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org