From patchwork Tue Feb 28 21:03:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 733947 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vXwH16491z9s7r for ; Wed, 1 Mar 2017 10:47:25 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="jB5I5GJS"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829AbdB1Xps (ORCPT ); Tue, 28 Feb 2017 18:45:48 -0500 Received: from mail-sn1nam02on0086.outbound.protection.outlook.com ([104.47.36.86]:1680 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751534AbdB1Xob (ORCPT ); Tue, 28 Feb 2017 18:44:31 -0500 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; bh=g/ctDqIU9OrAwbAZthCco4eXNNr1RmbMQbniaD6C1nM=; b=jB5I5GJSO7M0EKUwJsMc8wovn4e+NTLYnca8DGBkdHePsU1wHelikS4aFtw/T0HPOK4PkEgXDKNxBDky9DOQ+ybqsgJPXv3NGqD6o9ApPd0+VU9NNlpazx0UhX2y2dvjDqOajl9ZGNMm1QHV8WIu8lau0SxOEoADPV2hzY/AEG4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by CY4PR12MB1141.namprd12.prod.outlook.com (10.168.163.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Tue, 28 Feb 2017 21:03:13 +0000 From: Tom Lendacky Subject: [PATCH net v1 3/3] amd-xgbe: Don't overwrite SFP PHY mod_absent settings To: CC: David Miller Date: Tue, 28 Feb 2017 15:03:10 -0600 Message-ID: <20170228210310.32166.14230.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170228210242.32166.30038.stgit@tlendack-t1.amdoffice.net> References: <20170228210242.32166.30038.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: BN6PR17CA0022.namprd17.prod.outlook.com (10.173.147.32) To CY4PR12MB1141.namprd12.prod.outlook.com (10.168.163.149) X-MS-Office365-Filtering-Correlation-Id: d1a56f37-4e4c-49a0-78c6-08d4601d35ba X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR12MB1141; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 3:GasKJOw3G76E+Dt7xdLGopvFJUFgPk8sPXHrz26StvNuJnJLBqWH0mBu+37zNEUhi+l30z0fcck9qJbb57fbwDDdVhyGc2BkE5slwP4uKDrIoclIMpjKxjsLG5FC2rdJdlSe/tMsIFV4V5Um+u42JEOuvWxX9D241G6DHjYuiNoeGz0+vDUPlaGzPSHsX9SFrsuu1IoRLD+61VGIdoTRGvGLc/N3klhSyHLZfUZR1TWuetbpwA5UA0fUscyA2vFOM265gs6/9hCZHi70fg9phnnLNwpIDeTd2H1w/cnfX80=; 25:V6qviAR02Ollm4yljL4ehfI0IuphGCu328dczuauFSY6r5Trs0Pa0ilCe6z8vfM3gIsjQE6Eb3i/kCXjT9NAvAmaqdJqz4PCRSphr9qvyi6BBDa0MkZ+upmEZPzSN8E5gIaJCmJmyzshELrJzvT8GlBqm/b+FAW3yhJPlnaonVDiFVGrFmp0RxI4yHugw3M8knDjCsiTKGZ0l4PsGanL80OFpvL+ekkAA+pH0YolUOReRzYqnJhyov8ligUEjAz/6OD73u0oZSSXCJJGKSxs0fxOwfruMul3iRYpptZ/1WYZLPe3HvpqCLBV+Rcu5POf6xadShkjWE7MvUjolG0GlGLXgLwkT9UhfK/hH3FUgzAec0ShwTtueguaWSMdnNpdmyHNr7qNYYC23/zr++GBOUknMlwNKrHGEfyeJ89S8T/CWOSP5Gf4ZhrVtdNjNFTlRbqc64tMcuEUsFdpanO72Q== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 31:gBrlVP6jln5+cYwrBf6UQ1yE4vsW9Wie6Dp2B1Q33ts4cp8148+tMAx6BN3n0PSzF5p+1xERGSEmF3gLsRbtLHZ+z36K6Mb1Wx5KSCijA/ija8a8m+zY6obDDaBdofHiQBjEbUp1kDdRhQkIaITxUgBCeLOXw9Pr9bcdz4SZuUlV5h92d9pSVHnCosaWoSQTDnnaZ7oJS4QioLt/I+GvDlOxKbxesCkN3HcP3KohzWk=; 20:MKXlxg1Hm2O8NUzYFOvsEepireOXODElYy2UcW9YlrDfnWPoMW8375VYSExbZChd3GUkTKIYU37QiC9o9K5pBtPmRVtUGC2F2IBDtvHIgnuTB+SzoAOc9JDpJCbZbNxt3/ewRvjUxIlB9DxLxFlSuO3Y+MqrEwLBUexTGXnsu41mDHgbNZJIUBT6PTu1obQr53sAh7DTIvxi5CZ5QKZmKNHnU9wxvYKog9si4THsbnmqlEuuFEZUiseZURIljgj/ZTvlEOI1txAjzSHZ1rIc7B7izo8YBnQ8MdueoQiB0R2e7MAanpbRWpwuGrQhoIEviPVAXS4BVwckSgWoufzkntKTGxxPOH+FfUtkj6m0fz27/apIpdwWAL5/mAaLhPwP4HAnPXZteCsdTvfdmw02JL+HPJ2/qp1+CpJ5IL6dSbpmIVj8KZfKgddniJael/6oXN7fDphh3SiP4GTO+vmBthWsmPrnrO2sZ9T1Vd3sRfIoC78M3eg7gZsqI0k6028z X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:CY4PR12MB1141; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1141; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 4:rYbJ9fc9QUD8pb/lf3Pk9QCkR5n0dYJgvrMkdwi8VR+qlPIlS+RDIi+WXKWIlnWhCzjAT8TYV0ARoqOzuhH+d9r9SXm+s2cVMsjeyqv0J2W11T/rQyXSDSduztKytziCTrfZSZASdj8pONPzAS4OK0Q9mKEX9Xqhacb0rLyGRdFAplBvcms5yqH9sugaRpDmkiyuRrVYwZo8zG/acMkHvSfgmRXxcrZjV3HTf9O1cTfX5n4PXTF9/S2wng8g1ICvaIq5DdGjQPReNNNC97/A55QL3F1JCVor+89HmkRKELOKFSeTkOJCxvGCmBix/ufnhJmYk7lafiWlm/nDS8E8mae5K+eFniXP6Xk9Vme6Ip0Wvw/ZyJBuEhDy34rXogg0a56mRooOJHnAkHKZpJHkYtAoejnTJMvyEJk5+b6It1AHb+l5hyLjipSFu2CBXr1JMj3PjyCfCTteMfcONowLfga0F84P7sXJnlKnYih5NTTuorI71mefAUj77Ot4NQj+L/2bIExVg8IGkJdBH3UroiEIVJcsalkfMknBNyqLPyc5aBJHy3Bz/rjs1YuzRKKjCixqKBBU98FxsGlZNLRoZUjAZayTZkFgTniT/TzytRutv2H4cYrMWLjbPnhjYa101UgPC582u3o6CXePBSCFndX0lyDfWkKZBp154B+Fj68= X-Forefront-PRVS: 0232B30BBC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39850400002)(39410400002)(39860400002)(39450400003)(39840400002)(199003)(189002)(38730400002)(86362001)(55016002)(23676002)(110136004)(81166006)(8676002)(81156014)(5660300001)(25786008)(69596002)(97746001)(47776003)(305945005)(53936002)(7736002)(6916009)(83506001)(2950100002)(33646002)(6506006)(230700001)(3846002)(6116002)(2906002)(92566002)(54356999)(76176999)(9686003)(106356001)(105586002)(101416001)(53416004)(68736007)(4001350100001)(2351001)(66066001)(97736004)(103116003)(189998001)(50986999)(50466002)(1076002)(4326008)(42186005)(71626007)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1141; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQxOzIzOkk2VTg4eml5VDRVNllGK3dnbWZXYVc4U2RF?= =?utf-8?B?Qnp5TEhTa2tROFhuY0R1d1phTTJWTzJoWmtlQ1BrM2xCSjhLVVgvdkE0UjVE?= =?utf-8?B?VGc1OWhTcWU0cXY0UHRzekxDM1lRd0s3NkFaTWpFYWpuVmdrbmF3cTZQL2NV?= =?utf-8?B?Mmo3MkVwWmt3TWVROXltak53VS9pWTFYK0pwclYweGZES1ZvUElmbEUxNDhZ?= =?utf-8?B?c05DV1BNMkNhbW82eWJDMy9FTW9tK3pvRUh2eTRaQk1RS2UxMnRKTGRsYWdv?= =?utf-8?B?eWtseXhzcmdscndRNjRjNmZVODZpSU1NdEhDQVBTR1lCWURlQm1XVkU3V3dY?= =?utf-8?B?MFg1RlhRMER0YXZTNHMyYjhsamdMT3FPemJmSTRwOW1vQURWOHprV2M2cHBo?= =?utf-8?B?MitDcTcwUG5WUG9ZZzI5cG1Kb1J2U29YNkxHdmVCaEh4YUtpTC9VMlNJa3JR?= =?utf-8?B?UkUyOFpSTkVoOU9tdWVPc0RNWGtGUndrOC9LT1hHRXlac0RpOENTam1uMmdo?= =?utf-8?B?NitOQ0p2ZTcvUkR4dEJOUE9JTVdKTFdHVC9aSzkxMmIxNnRLQlBMdTdWMnI1?= =?utf-8?B?L0lxcm85aW5DeTV1Sk0zSEx4YTllcWIrYVJGcW1PWVpZektrMEp0UW8zTlVX?= =?utf-8?B?NG9OWWwyeFFmV2JyNjhOQmp3ZmlYTmZrY3c5dTBEOUJuU0lMT1BHVzJiZzVu?= =?utf-8?B?d3BJR0Ywcml5dFRFdVpJalB6U0pxc3hCYUNETm9BSFNGSEFGRHpQM3hUVWVp?= =?utf-8?B?NlhMb3JVQnpia1dqQjRkSGtHbU5BSk9oaFBUN0pxOWxFZ0dRUmVlWGpXRXlw?= =?utf-8?B?WWZJUk96VmdmSkxSR1ZaZU8rbDlCSGdrc3ZnNkorU2JDTlJJc25YbGgzRDZQ?= =?utf-8?B?bHJxaWxsMDhBQUJrMHRQQ3dpRHNWOW5sOUhRODZvNmtCd2pnS25VTmlNdlBD?= =?utf-8?B?dEpMdkMzYnhzaVljdUoxQW9NWTlTYm5oVlpkZk4vNHNUR0h4eGttY2NReW81?= =?utf-8?B?NVViYWxWTDBzVk1xU3RuNHRkTnNYRDZ2c3NGdFhKNHl1RFlvZGI5Ylk2eVlF?= =?utf-8?B?N0FYZWswQTh4NXM3czJGK2dBd1VjVlBRWGJDUGw5MjVCaW0venR3OTVlU243?= =?utf-8?B?THZ3T0Z2WjlBZEZWRUxqeWxEeDlHWktZL1dnazd5MGRMbXpFUDBoWFN5eW95?= =?utf-8?B?RDIxSnZJNjVQL08vV1VGeGpxK0ExTE1ISWFVUmxrMzZyL0ZMZE9tYlpYdUVv?= =?utf-8?B?N1lDbWFmbGV6UlkwdUp5K0RGblBNQm8yTjVtQk1GMDJPeS95M01LOHlhNWsy?= =?utf-8?B?ODY1OVJDRytvdUZnOFZIMXZNZGJObnR4Wko0Mlo3cjBKMVkvLzZ6b2Q5dVpo?= =?utf-8?B?RG1VWkF4YXZiTkI4YnVmUzVCM2F3YmNmazFCMWVQTGczVm9XYlhNeDVnVkh1?= =?utf-8?B?TUVFOXhSMDVPVWtTejhzMWVUT3dUWFdGSVYyaUQxMzZ1WHlyUC93ZGQ1SFRo?= =?utf-8?B?aEhXemo0eFpNR2x4N3ZiNndqREVLWkpNT0VGSHZiQmdJbW1YUTZQSHZvZ1hs?= =?utf-8?B?UG1mYVo3RzBseWZTUGtZQnZnM1ozK25OSUhnbWlIc0JwUCtzN0JyWW13QktE?= =?utf-8?B?UlFoRzFCYXZUS3ZwWGdMRGVPcDR4RW5JbytKc0VORml5OEhCSmxhZFQ4VjB0?= =?utf-8?B?d21xbWZaZC9kWlBRdERUZzN1MkVNVEhBejFkbjJoOUtVK2d0YmNxdUpKM0F0?= =?utf-8?B?QlNrTFhBU1pGck1uZnhKRTNxVDREL3VsRklXanhzYmlqRXhXRFZtQVlWNTkz?= =?utf-8?B?dFo4dC9EWVc0Qm52VXlsMm1vTmN2UEc2VzlpSGVLS3VzRWk3Nm1IWUE3RGVR?= =?utf-8?Q?EHBjVQhkYVw=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 6:tXWfLOzXKcD37i5zyS/rcWv2Z2e1di1QMUO6r6trukr7ux1uzAQUC6WpZV7VDr/BVPUq2fmaF8oMuo1raweWJD0ZPLWSMuG0mirF9Pfklnsfj7K9Tp+vljF9A1agGI1UNUCCtaCSFbKdTMqXgJHEFFrMyXS7OQReY45MxFDgP67iyzvgF41NUPPUndMEX28NqtkGNRnIWILurc/mpZL8Ui4dJaZvI/Vt5F6Uk3qyb+6o8nUqKuTucti1kouXyEaQ2/8lLOQDkZABE6DXVVnGMl32bSRQjd0zt1ATSvlu3lhy3mmHWB94GD8cdawovPSQFG1/nTqVunmAPrJFab8RPCkz+PM7j69LUNeKgFBV8WClwMiwZE2Ss00DWFSP2DfLcYwfOqHiy3dOwZk4u84Hp/ETARO8buR23+qc1RvPOCo=; 5:b9QDp7l8F+glOhYKp5j8K6M71pAS+fNeSp6Gf6ouAmfThK7VG8Q4w1FKunZhn/y1yr5YZAwsEtDSE7Uz5zwYW1pzKYFciCrXwM8jmKljHdUH4Az2nFz2iSr9VS+pWKIKUPZQZt9xpbcu6NWi0G0lOw==; 24:7+kXg9O32Bo0HL8pZLQqushkEAhFHJnUMcXzmOIaAgA25ISxHy8PG886MPLB7O0BPRaZXvcnJGWurpzE/tpnf9J948QAcyFYWMzOD2e7RcU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 7:N8FQW2nhNuL3UJMDkOXuZlZcZ3W//iL9S4AcReQ9+aC3KOCZI7OwbJeUu1NqEvxbjrir7UPkm03JCLaTe+o9XJHfJxfQGzAFMLeZcefrwvqsGg5vWFl7TVtxZUknL6ZdD5VkjJwZZH+ug5NzqdB5+viUYgiBurt9YaK3AEE3d/Nd+G5egzg7IT5rWVHujNHIUJ7neYFe4ltTsmxVaMq++3iX2wVW08665QgLRYSv+xTNFPswBfKxckAk+z0EpAvo71a9wA/xSrtHtFt4f3MCe2ZAEj4oxRBOppW9w5fzFzUf7g9UNJ1kV3krJPH7tcbl73FxFFkkI/TpARupHkMgzA==; 20:DTd2tShAZ3mCWeIpwvv3cch/YwkVMXYaVFkqSXN0DnSI4t78qOZtKHkEwCB9kTElrBIYWq01gfssYRt2hU0fWike0cwGntG+bYMWOSmJr0Zw+QrjQ8lXKlEamLfMpEu9w5UHW/feGu9fVI3yY8aLG5kbwOL0Mt+rRzcTMkw9/19fZJIk3QJ6VfLUA8AxaOmi/f2ljzQjYcKQwQFnGxsoyAhwSy9SmRHoj+/ToibXBYmsGOaovb41JNK1JjYVFxiz X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2017 21:03:13.2989 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1141 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If an SFP module is not present, xgbe_phy_sfp_phy_settings() should return after applying the default settings. Currently there is no return statement and the default settings are overwritten. Signed-off-by: Tom Lendacky --- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c index 04804cb..e707c49 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c @@ -716,6 +716,8 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata) pdata->phy.duplex = DUPLEX_UNKNOWN; pdata->phy.autoneg = AUTONEG_ENABLE; pdata->phy.advertising = pdata->phy.supported; + + return; } pdata->phy.advertising &= ~ADVERTISED_Autoneg;