From patchwork Thu Sep 29 18:29:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Thompson X-Patchwork-Id: 1684616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=XZxqRZW0; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mdhj63KSgz20Vm for ; Fri, 30 Sep 2022 04:29:29 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1odyHg-0005Lz-20; Thu, 29 Sep 2022 18:29:20 +0000 Received: from mail-co1nam11on2052.outbound.protection.outlook.com ([40.107.220.52] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1odyHd-0005KX-KA for kernel-team@lists.ubuntu.com; Thu, 29 Sep 2022 18:29:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rl+ddNtmIhtsfJ/1Io3guEZpoH5fRa/nFKcIVmh+HHoLKYWQ1kIRXpZPcPzhfCp+h9WYbN0KHDW99qM0lY8nSdsO61msB++awiR/UolQTaXqQeOg8fjUGtm1kQos5fLHUmvEHL5yD6+jYDDzskSKvRjh/jHhMZumpv+sCa4/vmzRbrFQgHt+opaxgiIxdleU7XarlSFgC9H3WD9r6VxHpnZCoLrAbl+e6uutqZ2udLFs2+LPAXHl2MoQPVY6Mpj2c2PsRW9b9foPPgET+D4edEyzlALY1OWEb2B4PPY8XLcR71mcw0AESDrMqYeVKkZL+dXf0cfBXOp4sdJ0eDA5hA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iRMxC/cKss7EOUbxAMKbXg/xGXfnxF+jLMWlS2wKd6k=; b=OuZMv5Fv/yfVbqciBxjBWEhk6EGU9kOsNv99ercmD3rUNHIbiReUr1pjAPJcqQx0NQSMvvLzN5UF9vHCqjK1YQjNGps8/e+wWMooQF7+6GdJGvnvOEWxhMyYtNXBf9V1nzR9YlErhkrye+kaXcLUke++16zyFWSGK3tVgRsjOwsDQQACfcMfAO3peuI5iBOeJ/LT5AUGLzC3JWq6s5ayGtpqOvYSpDjmKFlqXY2b5Lu0M0jcmFQtTGUWXoRW5M6hNFwNDU3328kEi47ZQ8yBFnvaPBxDex9t9jBjymX3EW81W4Ff7Fn0pY0aJErd2L6WeYX85ncaKV0rhY5Bx1Fc/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=iRMxC/cKss7EOUbxAMKbXg/xGXfnxF+jLMWlS2wKd6k=; b=XZxqRZW0vgcZitXzhX49drbffPZR6OHkAsH038c0uvv//+bIjjFCWwG1nC8KwatgweJOFqGkxRLlDTsQpf+GGbvaATxarstnUEh8BHo7k/I3ZS57TCFWwbg406rd09w8rPyTyBidNSJV/rV7K+p94Kpi3LvJfPq12q6KGoSFts4Kwa3FqjqpleUwfizZR/4i6XpXZJ8dAyoMejh3/SM7HrPkolmLa6XQ7NV3aqvciCvKq9M3YHNtFbZrU3jlvdr5cjR/LTtRu5kyyAl5ZVeRcCu6JmgF2JZnVNaSLxz3WsPzqcsSPhztFkgUJnYkm1eQyxWlm+N++8OcS3fUf2Dxjg== Received: from DM6PR01CA0026.prod.exchangelabs.com (2603:10b6:5:296::31) by CH2PR12MB4922.namprd12.prod.outlook.com (2603:10b6:610:65::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.20; Thu, 29 Sep 2022 18:29:14 +0000 Received: from DM6NAM11FT096.eop-nam11.prod.protection.outlook.com (2603:10b6:5:296:cafe::50) by DM6PR01CA0026.outlook.office365.com (2603:10b6:5:296::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17 via Frontend Transport; Thu, 29 Sep 2022 18:29:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by DM6NAM11FT096.mail.protection.outlook.com (10.13.173.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17 via Frontend Transport; Thu, 29 Sep 2022 18:29:14 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Thu, 29 Sep 2022 11:29:07 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Thu, 29 Sep 2022 11:29:07 -0700 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Thu, 29 Sep 2022 11:29:07 -0700 From: David Thompson To: Subject: [SRU][J:linux-bluefield][PATCH v3 1/2] UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: mlxbf_gige: clear MDIO gateway lock after read" Date: Thu, 29 Sep 2022 14:29:04 -0400 Message-ID: X-Mailer: git-send-email 2.30.1 In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT096:EE_|CH2PR12MB4922:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f0a471f-d584-4e79-56ca-08daa24882f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nozdGuf+HFk4uIONJ3aMwN9AZFlkFG0TQe00FGYQiCOUSiQOURHJpvm1KyC/Qk1vrvn8JDzHwWeBZ3TJJBW02HCkSbT/B6rASgPDQBZA4yXhma7ljP430Se9Q9vb6Y1QzPAG9WYU8TZsv+v13JDYirOM38H478z2/AWZiZa1tD7Mq1/R7KDpX70+lKA+dtjq63lO6ofsoKQJ+1J//Q7GezP+YVE44XFsWf0pZyA2TqKFNgpAdBpXSYFFL2btKn8atTjsAtMnbVLJUqrUHMWi1Y2IuNAYk3tn4rwg8cdr13zBL+AW13MOkwJSEeidxzVyN6aNfZnyQDwwUL/k4utQH/gRc0oX/jHEWNaUZbyRx4JMUkbcHQ0O8PuDSKCZAOuSPvTBzpxTaw7xgOWKF6/bUClgsi9Aj/AaGFvcma/UeliNqCp2tcGr2lEmILVT+IcdHsW6ctAETicAKLCYNRpLi66GPkVFPx9aI/YQdZStZuEDUyhecPr8/EVDkntF6xwzG3pGVhn5A1gB32LI6ZdCvb8H7Y47gJAQgQvIThl93UDyWkrabnthZI/t5+fEtOEvzn+6Q29d1tps3UxP+yX4PASCh9E560bMhPxh04PiIm3KM6UMxJXzzHA9f3GbVEufEC1SQ3cfS3ad+TtWtZN6u9RzlwH0SJgS7WrnETM6sSmd6aJH6cc3tD1I0Ysc8HHVKIMjByVZKXLBFtftoIOGU3i/AjCQgjI4+aob/Y4fDPDBQE4VBLgjyPU9OAgprfTx/mHECjAButfDudBVwoJ7n/b9P/gT7XAzOtNVVu386YA= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(396003)(136003)(39860400002)(451199015)(40470700004)(46966006)(36840700001)(70586007)(70206006)(316002)(2616005)(478600001)(5660300002)(7696005)(36756003)(26005)(8936002)(2906002)(40460700003)(6666004)(41300700001)(82740400003)(82310400005)(7636003)(356005)(36860700001)(47076005)(8676002)(186003)(336012)(86362001)(40480700001)(426003)(83380400001)(6916009)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 18:29:14.3205 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4f0a471f-d584-4e79-56ca-08daa24882f2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT096.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4922 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This reverts commit 8d2dbbd437a1edb4cf3055ed83186761680764cd. BugLink: https://bugs.launchpad.net/bugs/1991151 Signed-off-by: David Thompson --- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c index 4aeb927c3715..85155cd9405c 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c @@ -179,9 +179,6 @@ static int mlxbf_gige_mdio_read(struct mii_bus *bus, int phy_add, int phy_reg) /* Only return ad bits of the gw register */ ret &= MLXBF_GIGE_MDIO_GW_AD_MASK; - /* The MDIO lock is set on read. To release it, clear gw register */ - writel(0, priv->mdio_io + MLXBF_GIGE_MDIO_GW_OFFSET); - return ret; } @@ -206,9 +203,6 @@ static int mlxbf_gige_mdio_write(struct mii_bus *bus, int phy_add, temp, !(temp & MLXBF_GIGE_MDIO_GW_BUSY_MASK), 5, 1000000); - /* The MDIO lock is set on read. To release it, clear gw register */ - writel(0, priv->mdio_io + MLXBF_GIGE_MDIO_GW_OFFSET); - return ret; }