From patchwork Mon May 21 21:58:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 917890 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="WKCqXgBu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qXk42ZPtz9s1w for ; Tue, 22 May 2018 07:59:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754623AbeEUV7I (ORCPT ); Mon, 21 May 2018 17:59:08 -0400 Received: from mail-by2nam01on0041.outbound.protection.outlook.com ([104.47.34.41]:63979 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754384AbeEUV7B (ORCPT ); Mon, 21 May 2018 17:59:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KQiL6dui/xUr7tVZKkgPp+Q7fKRb9/lIJ0GfrHY93s0=; b=WKCqXgBud4rbTOGe1GY8flylfdkA2nkYgzzbkopv3HTgRJIgxFmEeEbYD0/AfLUxOsFb1lWVIYw+UCRLDQcG1JTRzOvHKrjL0JRLHDXGj5BDzU0YoqdE839qrd37kuRwSzwN3UZbWNP3XXsSJlqofr5pnOdysc9x69jM2VD3B9Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by SN1PR12MB0175.namprd12.prod.outlook.com (2a01:111:e400:5143::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Mon, 21 May 2018 21:58:57 +0000 From: Tom Lendacky Subject: [PATCH net-next 04/12] amd-xgbe: Remove field that indicates SFP diagnostic support To: netdev@vger.kernel.org Cc: David Miller Date: Mon, 21 May 2018 16:58:54 -0500 Message-ID: <20180521215853.8135.67266.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20180521215818.8135.83100.stgit@tlendack-t1.amdoffice.net> References: <20180521215818.8135.83100.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0601CA0007.namprd06.prod.outlook.com (2603:10b6:803:2f::17) To SN1PR12MB0175.namprd12.prod.outlook.com (2a01:111:e400:5143::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB0175; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0175; 3:UZ0XgxCad2jXMQ6CZ4KiM6dlurQt4ZbPki+hHr5tJMgFsoNQRoN/t3v+9NzMwx0fQDTW0GziCMPdvezvWV8xaXuyJ/MgWwMi38wkr1UAwb2VdKmNd/CBExtPa3JB/tgQyeQp62/LsZ+GXOLYpogyBay2nho2//llwT9WgYSrts1ixz3gQwDLblAgUV8Fs9HFrT8BW4fUSdnZHH+mgkbx/3jXmW/z7vwtPuS7UKh0czvyR0ouheQoPPWpNVCutuBr; 25:a3qGG+rjQHpLp5u/nfKRFFIVTFKFu9+10xD157FCjp3OW2u/ce43UT2OXBoOvO80dtp7JqwD732iWhvExoNGaZua2dK/zg5GQblo0S+V/6P0PcNCLY5baXWnbekP4bB/AUriZVITQuWY3Qyc73PPem7AsuN2+7QKFL2hC5Qag0LHoTtWh3Xooc2Rm43WRT6xGTz1D1UCOVljqHR2IIQWoRd6RxjfpvePlmFfEVh1AsoQIuZ/k/zq1rLVn8IANWqDb80Hs+2H5Hy+cypw69Kht1Ezc57+k8fcwvjZjngQTV8oftWCiCG8FEgVFFXE30Ng3FeED16R+YZJxPmyUkOdCQ==; 31:l7/mXkSx7v6LyXLpna1G6Rgu2Eybn5BnptnkrOcVeEIeGoM7PZ34kQ206+S4xQZ/aY0TE4+RUmYSJSVR5cOp6AsJi9u7jtNHi+Vq5ge/r46Kf48ncd9H2O3LPAcWsZZm6qZyT0bvBONVItZaQPESOjyDecF2I/qv6qtzUbn98K9RnA19wCCNbbepsdywqjtVIANyPvUCmMnGUC0JBq1g3Z9pgj7h7XrrsfOlSmXHLTw= X-MS-TrafficTypeDiagnostic: SN1PR12MB0175: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0175; 20:sLbZNrHaHNCAH2A8hper960SbID4lmYKcAijcp/kny1qE5zX9l7/jZAbDxq77bPuO2XJIGTt/uW8Gwk+de86ZxJKs4GWypR99b3FX4ur4mUiwZ8jioScX7mNkrUS+Oed33bPI+93msdchmWTaKZ0v6RfkIGeUyFMQr3++VSNx7v/3p1NesgeGIj9HxmYjJTvgVXPqPXCHxhY9xRdqeAY5VplOMeOG9gYmQQ2N3LK9z8hm3F5zu1qZNX6U1eM/HUmfDySHWiGjl+Ti7Xovq7Vj6gKP9yjD4fW+rw4jo8L5BkvXZpygPo3jfMToSrU/K9ahiobYOjHoDOlPSV+5uRYbrIbe3jqzSmoEAyAJes1zVsD5CYH8LdynmNZz6xRuAKhVzTvwbJ7ebYY2SiUXZIUrWzjAwtHyJQdgTsBTegwZn58K3MmbniLFwFMckKXSy2SPAwEzU6l7X0YyDTv1BcCRBPp5zF+N7+mYtaj/mjL7ZmzAAbeulRT8+jhTnzyTZCJ; 4:2+p01WRFI5wZX91KIVieMqYvnGsw49dQBih2ZOLE9jpMMqGkyp88SpIpYcozUsEiAvzdRB5bW4C/hwgAF0v5DQNR87Mv0hKwDZ/ZP/mO8UUbJsp+fVb54q69N3QsqG5l0a8jMd7HkRISXBuTTZ97XBdTTIrFSNqSvRyjC+yO3NtlykajIj3vMyGt1rELr62P3rvPrd2GBY2sTv3afLXJrZ13YbPzWXQgB9O8VObMkh8qgX0poN7fm6Ev1OtsdpnMzl+IFNd4Xdy1ddpdpUKF/SkaIuLn4SWaEnDQiAlwjYgkV/a8hDry13wyze1FjmoG X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:SN1PR12MB0175; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0175; X-Forefront-PRVS: 06793E740F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(39380400002)(39860400002)(366004)(189003)(199004)(16526019)(186003)(476003)(11346002)(55016002)(486006)(68736007)(76176011)(2486003)(53416004)(7696005)(23676004)(52116002)(26005)(386003)(6506007)(105586002)(8936002)(86362001)(58126008)(230700001)(2906002)(106356001)(8676002)(81166006)(316002)(956004)(69596002)(446003)(81156014)(9686003)(50466002)(97746001)(4326008)(97736004)(305945005)(478600001)(72206003)(3846002)(6116002)(1076002)(103116003)(2351001)(66066001)(2361001)(6916009)(47776003)(53936002)(5660300001)(6666003)(7736002)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0175; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BSN1PR12MB0175=3B23=3Atkes?= =?utf-8?q?sSpMmPILI3G8bPiBdwXrd0xYbhp7Mu2VF/5Uowuf9sU+P1RMZnsuWWnp?= =?utf-8?q?9T1SzZ3lctDppDZosVEICsga8ITidMpk1eWaG7a9PSfcY1W4k5nhfMlk?= =?utf-8?q?yn73u6QYlQpZeZGaqIjhd5IyOGj59Bcyx7oroGJ9iXHQsUSwGSN+QUbT?= =?utf-8?q?ZUovV2kHNpwizYzYTyqUkscNAVSTDJloGoTOujnUJWWoFBit3cnBv3Tf?= =?utf-8?q?Pwipeq769YZdAmtopuSkrArtYD5EFD6LZKNK6da1a34iFcroc8Ka3fLl?= =?utf-8?q?9AcCzyKsuk29QIi9v0g+zWxzZCb23+MKgRo1i1Lt+EAhXEOOkW8f2ERw?= =?utf-8?q?51y0pUkwRmxjNuCWjq/FUUxKb7GXPAVXES8CD1P4R7Yc1kzyUSETGH9T?= =?utf-8?q?Vjq4sotEmECNa8Qp5J3ZRdq/0RZVadQhGg/U9dj077SlbXbLU6zYI5e6?= =?utf-8?q?eHJG4x3yAOcFR3LYRoS7e2W20nP1YkmTqF6AQQdl7Xx24DGO5KUMgGJI?= =?utf-8?q?8TNtF5jIXV1S4kxBWakD4EIVhuuRZdiZhVx8nCEJVK1HqyfuTdHStdH0?= =?utf-8?q?Etg7IxSWIdwChXTxtMi7v0SoKB47TcTUfdzfzcJKM8b8ZlMJ/+z7n7H/?= =?utf-8?q?FM6z7iMRukMCOzoHIPxopAENtXFrhS2G4WyGaGO+/Wibu/qHEMl+gFiB?= =?utf-8?q?aD9I4Cg3bwzgshw7pXr9YcHyGttaieMzqPvzQ+9qfCtFqDrou+BqnHxi?= =?utf-8?q?xBDLsv0YPcHQ/sqj5bL6xeGKBz/ey1MQadtjKol3ay/wAK403sunxyLc?= =?utf-8?q?oqbCkZMsOMl3bhIG8sXAXXy88qDYNrMtQGNf9WUKI3gp1ESOqgZq/dY3?= =?utf-8?q?Ir1HNlbSYfvKP7ibUFGLA7OI5BHcQqMaK46/27lRAOKyXceoMLinPMVz?= =?utf-8?q?QXr0pmSpHd+o5rICziTPfHZriEQnQOFt/7Pgqxv07BoqLKRtGL3rRpUG?= =?utf-8?q?NQ+a87deRj0PNFP9v6ZbPJ59qOJz1OE+st41H8eB17tq9NiWv8Xworod?= =?utf-8?q?6ORgy9ztXHn/NXYVD18aTFmjx91wsyNWTd9Wy//ErGW4ODMS5lfw9yCy?= =?utf-8?q?jwvEPUFx4bS2ozNxYPjcZDpULQNU/RvecBD+riwX7ZzWyKXIkUHyl+zC?= =?utf-8?q?03gr7xZybk/169mUcv3eysuaV4TgGWp8aNzA71wvCmlxlyQ8GYtMqAOE?= =?utf-8?q?XikiwGXNMSCpQp+ZH6PBBVtIpS0m1C2kdLt7iz+eZ/j5WyBoCIIRAF1R?= =?utf-8?q?jQfxUwcvqNrPh3El3sb5TpLdWn9b1D52sZ7z5D1y00RYGO9DQGcHz6i1?= =?utf-8?q?Z0OQrH9BFL4hAxDl5bu0HZTutskiOgQ=3D?= X-Microsoft-Antispam-Message-Info: zVEnADz4uo2NSbmeKe5FvXyV399mRY/Wk63qJWw9Q68efLOcE74ZFGYM/jR4jmSakyEU4k4LB/yZjt2KRMqOyMvKEDDWBCu1UTuELXiqtF7VAhGGLUHjUepVKFrnnCtC9mlj1DuKHvkSDZ3M8YDVkpVv0DV9CZIB3wVIHB6s9Q94WCfMgJLe8cd6RWU6cScL X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0175; 6:VWFgjkHITTfbOsjAYtXbUAkJ6UXMFeNzhwzp4X6YKqhgRfSmYvYZKELL/7NVsnwXX+Iy/PWgBsAtUvXGBEeeYxv+Umujb3EaSIjeGuesu+XHkjLqS7Ml0xvSJH0ZhWPj3vCvZDIhLEAdJ/jno66VzKT1Ols+RFxCtBwbhEfT2s4nLtPUN+EaqQr22XlnoHe91wKyiynSY8r3QBOkfwhasvFP8r9jcUrhYit81Lnu1SAMnkfqOiANGEBniNGjZwtUG6yFAl6brnEfqlK2ao1btWaI9uAcniE9TP0mYukX3vlLH+0Q2tX692k6hnAdkVw46wF2+2nnAcqMsEnfD3HtAov0Ie9oGaxta9C3mCXC/Qdh66BGJkmc7DZodrNAXfmb4bPKjxtQnOLuuQ2Q/MIlGpzvoYOL0rEmwSQ2JwY9ZRpxe00cnqopfzV0p3JBktzsFNfW4PuRIeL6ycgx0p9RVQ==; 5:CBnVLb8tIOxPNd1YlV56tsOTLW/gvMyIAxukk3+iCzDBe3XfDGiDJOeZwdiM/x1km+cmJSBKo/ynWrZEP39kIAHeK2VTOnb/NlE/9F7CsITK1LB9Nr/IKfEDH9O7bURmCOk64WDzrePEBnwP6grjYjY1NUeWGveORsS+rRykqBo=; 24:6954bM8+hTo0OKjXsEJO3WlcfF8CxP1XthXbddsPl+ZQOoSoHiPNls+lhdg9IhYlKJiyvjpqFJ0/Ny6UHwjsmbCwAxSzkGpaA1BuF9mb1sQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0175; 7:GWx4MecF5kIehlY6DjcCGP3N953lSIbkKcY8z74mTeMhOcBMoWDptL17sCuYqoZjas1tm76jeW8JFpl9ApQFRoj9ghdPkUrlxXrkuZPMmPoGT2jekUu6j3E+SFqnfPW7GQml89GfhmF0ODwpNo9wu6vF2GkVGw0+AkLJukCP2kX32MGr5N7i6upVS8scS1DdJNyZ3d0xSDDlkW0+Fh4cErOl6fM4EGPhLbv3OFHao92og4r2t126B2gRFkH0BWvu; 20:DTmjmyp1v0yTjh+43BwtPBwjuyPJRGnW7scl0T30UtddxprMu34q3Fnzio703ZDUcbxlQuvenKsIgK//vAx7cJqgUFENpwt3dlcQOomGcdDLz7RZ+t8S0HOZoWpGm1cemdVWyoqvtlZ8PVCuF4wEvZoIZoJ9QA47YGQheZGlQU0jd2LrM4z5trWTgVXNFAdXvMMu9U2Zws9U88YTI+MqxkqK/Sfwvu9pA2bi5OI9zMPmfrwfNNdHey6uzhQ4RILX X-MS-Office365-Filtering-Correlation-Id: 2e223704-4a1f-458f-fc24-08d5bf660d49 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 May 2018 21:58:57.2065 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2e223704-4a1f-458f-fc24-08d5bf660d49 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0175 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver currently sets an indication of whether the SFP supports, and that the driver can obtain, diagnostics data. This isn't currently used by the driver and the logic to set this indicator is flawed because the field is cleared each time the SFP is checked and only set when a new SFP is detected. Remove this field and the logic supporting it. Signed-off-by: Tom Lendacky --- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c index 05003be..cb15caf 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c @@ -343,7 +343,6 @@ struct xgbe_phy_data { unsigned int sfp_rx_los; unsigned int sfp_tx_fault; unsigned int sfp_mod_absent; - unsigned int sfp_diags; unsigned int sfp_changed; unsigned int sfp_phy_avail; unsigned int sfp_cable_len; @@ -1211,13 +1210,6 @@ static int xgbe_phy_sfp_read_eeprom(struct xgbe_prv_data *pdata) memcpy(&phy_data->sfp_eeprom, &sfp_eeprom, sizeof(sfp_eeprom)); - if (sfp_eeprom.extd[XGBE_SFP_EXTD_SFF_8472]) { - u8 diag_type = sfp_eeprom.extd[XGBE_SFP_EXTD_DIAG]; - - if (!(diag_type & XGBE_SFP_EXTD_DIAG_ADDR_CHANGE)) - phy_data->sfp_diags = 1; - } - xgbe_phy_free_phy_device(pdata); } else { phy_data->sfp_changed = 0; @@ -1267,7 +1259,6 @@ static void xgbe_phy_sfp_reset(struct xgbe_phy_data *phy_data) phy_data->sfp_rx_los = 0; phy_data->sfp_tx_fault = 0; phy_data->sfp_mod_absent = 1; - phy_data->sfp_diags = 0; phy_data->sfp_base = XGBE_SFP_BASE_UNKNOWN; phy_data->sfp_cable = XGBE_SFP_CABLE_UNKNOWN; phy_data->sfp_speed = XGBE_SFP_SPEED_UNKNOWN;