From patchwork Thu Nov 17 14:43:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 696226 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 3tKSWx4XPRz9t1C for ; Fri, 18 Nov 2016 04:18:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="eo74mgNd"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941569AbcKQRSW (ORCPT ); Thu, 17 Nov 2016 12:18:22 -0500 Received: from mail-by2nam01on0070.outbound.protection.outlook.com ([104.47.34.70]:7088 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S941119AbcKQRSN (ORCPT ); Thu, 17 Nov 2016 12:18:13 -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=cOLzapV3HEXXCLYuMuC00UJPGDNcPHWWPeAy+dlBuSI=; b=eo74mgNdmhA97vbD6X3VtnqI0QpOtU3bHbLDWx6Gldp2l6j1mGRyXe8Zzd51uroGqljMBh4E90EIo3HXsc3NGc9CS2KUyTMiUqL4winxwSvCmg1MyPJlLEX+p9XEGdL5+dzvRQA1DBP1YvjcvkCL8fvrM5KHcStElYaxDyfhD4w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by DM5PR12MB1148.namprd12.prod.outlook.com (10.168.236.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8; Thu, 17 Nov 2016 14:43:42 +0000 From: Tom Lendacky Subject: [PATCH net-next] amd-xgbe: Update connection validation for backplane mode To: CC: David Miller Date: Thu, 17 Nov 2016 08:43:37 -0600 Message-ID: <20161117144337.5714.57761.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: YQXPR01CA0068.CANPRD01.PROD.OUTLOOK.COM (10.165.103.36) To DM5PR12MB1148.namprd12.prod.outlook.com (10.168.236.143) X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1148; 2:CzgSVqEGtJq5CgTmVqKu4TNdAflRCs4NcK2gghWJnqxqJ4Ey9TMYZRJM8Mdw1g6gQU3L/roR8HkGbVgYr2HjA4MmriSqwAjkGyyWiLBo6WT8FmtET1JKjDVefzMDeHv8vD2NTWewUc/jLR9xfYMd8l0y+au1lk4qxhTKh7iHy4s=; 3:IMxa02Kti9WpGesL9MR6hXvW5IbKhlLFywPBDaexca5WzYH3sQxyTShUO0/9r2q2SL2CoGFijIj52qnkocdn7f/Wh009x6Ec6LySMuDL4ODSya+3BG/du8hT01C3S+L1zrljyKCeQICbnLUmJ6s3ztfOJ0Nq6f1FLRZxRdqgPCE= X-MS-Office365-Filtering-Correlation-Id: 9f1e07c3-5fd6-42af-d6f7-08d40ef82075 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR12MB1148; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1148; 25:Bqd9XF7NVqnT9Fxx9si4sg+9gHZDNz/xdRPFw/yxl0VxjgAQQE0BF2Hms75nwklYYE4u8UH0g6SqiOR7MQxrfRuavNv0X1Pp+hDxcz6Q6+J7w48Xnl/lrgcWCybybDvdAyaaQBVVAsYv8xG4x7hrpR4kJKDU5JpmvBo9RNFc/eyzgCTq9CI14q6awP4Syv1tfpEsxPgvH1KwqxE4jHgcefus/+gmXzQsXrQ+uakAeqddz7/3QJgT/GmPtZiMom1GKFyEvVrD1AWNGAXH+BOsbIbm7rXohRtkXdUivgk6eajSVG007W2WadSv0rNgRmp52GPSihHbL4vBfeYkRI0/bDkXgl5H9NtVDfb+Ta9/2dYrsANA41aS7mF0Xl0Ue5Ca0A+4kKllZAMjq03gXRubdrtfWhg+8Ymh+TrBZeH5cfbg7kyEUifK14Krsdu+qDbN1D53xhOAD3I48WWwdBkBlSCm+gDqS/5ZWYJUwq2uHgMWiR7QvRX/GWV8tOKdYgTl1Odxa8STEFZq8cNXyw/1OnsK+acx7eLVYnrsW+Ha9DmsxQ2AlVypzLzhdHYFEq6Mup+jpAiHmmiCMd0Krmyg9RYiWXypOHoDy701cK1/gUxfhQgjl58Vmm/5PrRJXwr2yjyo/YuuvO2b5+SgpujFBdsNr/dJKpY0GxBcg+QX9ZxqZH2P2IAENtk3NEgv5gEMf8KTxiUcZgAN7u6Zs6WrbKEaf5xV76U57+lgvFWODIGap1POtNWqiAA/CoHYVT87ZxFa0gLxhRl05XDNPrwXsA== X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1148; 31:wJwo1O3HGwtR8AmcHd+SnTD4kb0wAfR0BYGRCQb1tSPegD87I3IRo7Co11BDF606hyUzMpWZ0omutD8CKuWk2XvkLTbZkbUcjCljdjU8L7i+qLmeJsPXLjVSGyDnhn7kcNYi8fYTuLrFCaYRYAEFobUBAiEuk9P+VhlRbzkTn/ALb4UkQkHkgtI+n+n/2rrJH41y46BSxvBIy9HW5xMS1YV0Xzb9j48f18PJyXi0/lI9yZMl/siC17g6WbTJcksZ; 20:P+oQFoAWDECqPuOYmkeo5G39dlJAXALTnGlrtn1x5KHDt31P67uKxVb4OZ3JjJbajcVQOQMae4pKLHWDdCbNwaJSH9uAqJc3hh0n+CnA06DEbDRkNRKcitZUYL/xh7UCK6AFsLCBSnDffHiLIJU8oHFqgdnKZybHI5/m6+N2bjEi6fDNLtxfQrDPtn6ZAt3bHZutWddwKjAi1QIpd7mI344l2P8RIzA1lYZjf1f7cnvDFGQAwhRlHeLBuOpSeKrGHMvUfWZuBPZnZkGbyg7ZecmggckdlwJcQ9HduaTisFWL5oKQNZ5PAQ1oWneMXFywFVFcPfpIo+hSQ5d32JoZLrpbHIaFDYtxb33zhFcKb8SSvmSGDxJpLoPfYCW4gS8Wf7RqM4lz7OO8fvocscZHOJZKwaH/7epF7nfHSbBk7futigh2OitcmQq8MDm5Qat3wGGie2AQLhsr1pmH/J9rHBo5GB5JUqUgo8+tg0uVfBchy/Ajn1dG0VN0h1pvaP8O X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6060326)(6040281)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026)(6041223)(6061324)(6072148); SRVR:DM5PR12MB1148; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1148; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1148; 4:Y7ceE+yFjTYgHumlb5kNkrb2vvdgoZAiFUeJQTRONg7s9KYn6nwCbl1hjHGjRGcTYchv4VYe4CW2hmA+Kk1CBiAC5lGILR7vpim50n/Z6pvFwLFr4argsPkA0rumlw3MWFyD1VkbkoVe4NMspeVqFr/5vxYq7KSFu1fF115OjeWnLo11+DMq8bD6nn3EZUFN8AZ1ybEdxuRAwcWPKmb0U0I2zChX8yMaUi3uLY6kjleHOKtkKALQPehcZhVUi9ucATVAWku7CVR+yKZWwTU+5eSJwGL+X/j8qegQ+gRWB8EQ7kLR6A9fqfg36wl3hBBOBYblGmXgczKyWaX3EgXPEhuoLaZR+JBHBmtmp93zQPbdhV/PIx1coUHn/sVH4ZLie5IrdqoFFa+YJcY2m6BKZlxHMtFPvRrXHR7qsM4o9wkaoz+7BvgW34/Gm0dG9PbEPUy/t9nWezLXuCMoQHYWeAksmMQyri7ju96/hTkGszN3KO7Kr6bWApz8lyEodgfIx9CewL6Bf0cRNSwgxM5+1xvDv2xYxlGWqP7MG1KW2LA= X-Forefront-PRVS: 01294F875B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(189002)(199003)(105586002)(7846002)(305945005)(7736002)(81166006)(15650500001)(4326007)(9686002)(42186005)(54356999)(50986999)(2906002)(83506001)(53416004)(81156014)(92566002)(50466002)(5660300001)(77096005)(68736007)(33646002)(2351001)(47776003)(97746001)(103116003)(23676002)(4001350100001)(86362001)(101416001)(66066001)(106356001)(6916009)(110136003)(230700001)(3846002)(6116002)(6666003)(8676002)(1076002)(97736004)(189998001)(69596002)(71626007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1148; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtETTVQUjEyTUIxMTQ4OzIzOlJsM2FpL1VvaytmRmpDQUg5V0ZTMmorcVlG?= =?utf-8?B?YW5PeStFajN2MHRqeTVTc3pyZGc0S2ZFTFdyNEJDSzRnQzE4VjFLMXBubSto?= =?utf-8?B?dGNOQ09rY3crRFJOa3VjRWtlZVZmc2VFM1o1cWZjOWJ6MjA1bjUwdVRXeGpF?= =?utf-8?B?KzVibXZDY2FKWkJtZWJkMm81U004a29jSE5ZQ0J6SDdNazR2WktLbFVOM2lN?= =?utf-8?B?MUpvc3lnc051RDdSd3JncEpPaEJ3ZXB1b0JxSWViTDFBaDMvVmxHd1RoWEZX?= =?utf-8?B?elhmUGZLOXJrZXdkNkQ1UkV3cHArKzRMazBidCsrdjh4OFJHekZjbEd0R3o1?= =?utf-8?B?M3dOL2l3ejR3SXMzQnk0cndmVVdsMG9YazJUdmZTZlV2NmlLNVpubExvQU1z?= =?utf-8?B?Q05HMG1ydkVDS3Fhck5xQmhZQkVvdXpsT0gzVGFIejd3R2pXZ2NUNnRQc1Yy?= =?utf-8?B?VVlCaHl5YzdHZVBETXJIM2NSR1RFVzNUaC9lRm9pL0NTVG9EeXA5VWVFRGJY?= =?utf-8?B?RWFGVlFYSUQrREExdGp2bjRGM1hQUkdIYm1SMDhYdHI3VFVRWkpOR1lVNmh1?= =?utf-8?B?MmxyZk5keUw3aHZIN0FGZjhERG1vTTJydDdoVnpqaWxVd0UzRUdOTmYvUUVt?= =?utf-8?B?YTlSSFFmR2hFYm51VC93QkhabThNYmZpSzRTQy9UTVNUWFYrOFBtcWRLeXNs?= =?utf-8?B?TDl0cnBiVnRlWVBCaS93T09xUHdLVVpVQmpLQzhSL0trOWdSNXQ1ZjlSaGt4?= =?utf-8?B?b09pVU9uSGs2MjBYOGNxZVZKamdOQUpHdHNwQVNFVXZXWlFFQUZ2bG03Y1lH?= =?utf-8?B?RFlNb2k2UGxyZklFWjNTQlRQODJaengwcSs4TFVmSlJvUUdqZFJ5a29RVk1w?= =?utf-8?B?YzloQlV4UTdpRmRXUHJ3bGpDbWVUNWRKTExGb1U1aUplZUVBSWV4bTZydWl2?= =?utf-8?B?aFZ4WjQ2ekJqckV0N0NWOWxtWVgxZFFmWU5LWHJsWERjMDJUb0VZWW1WVzJj?= =?utf-8?B?dTB5MTZVbk5sWFk2UmRiOExTRVRXRkcrYkk2T3F4RzMvS0thSkkxT25WUklq?= =?utf-8?B?NGpVaEFuS3lGVXdpKzlVS2NqbGJkdGcxYjJxNHVUV1d1RlF2cGlXaGxmb0Yy?= =?utf-8?B?ckNLNE5iSExWWjhOdFV3ei9kS0I3V0pDT2JWZnNpK3hJREtjMDJ6WnUrOTNM?= =?utf-8?B?OStJQWl3MHlubnhLMDYzU0JkdFRHNUVnVXIrcmFPSk13c0ZuN3hYaWRvVXZy?= =?utf-8?B?V21VeldUTjNnMzN0VldtWVBkTDZSZlBOSzRXRWFVL3o2Sk5zVEVVTkpxSmdB?= =?utf-8?B?Ui9YNmthMzBOdVcyNk9vRTB2Y044QnltYWF0Sk9xTGtmMFlmV2xRNEVmWVd0?= =?utf-8?B?S1drdHdlZHVFQ01OVk9OUC9iREsrbGxoNDhKZ0UwbGtzZUs3VVAvOStBSXlN?= =?utf-8?B?THR5S1VEaUViUkpVdWZscjEyelNyKzZERDd1SVluOUZOdmtnUDFMMVFpL09Y?= =?utf-8?B?bGRJY1BZMS9wUU44elJmdEU0Uk1UbHliTzJiaEJ0aE1NaUx1aHQ1V3NNa1ZM?= =?utf-8?Q?RWhE7Gbiio2nRz5mId+Iz6rnpeJsgZYdoAMY81Wcb2ww=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1148; 6:P0Fja4Mch9Jn8jkpVcFrxpc+hm0JP3CYOYlNFeyHgmlEDPbsUg0SgriHRhUxOICNKh7QBYOV6F6EqiWX8deHnA/w0fZ77xHAkIhmlcFn8zvSlZq5qjDGXOCG908ZY/A/VCPFD/8YkMaIgsJQ7qmLLeLm9oI5D/KJhxPiQNtVFEjidRL3JsZXzh/cr+pUw23L3guzxLYNp8T0VXm5nP9jZyIktakT9hhN8DwLS1ADZDuwxTb3V8GJAfQzYuSRgnP7V1hA6K7VV/pNLLHeW53XvGBG8nJ9pHiKBoAW3vXLvqcy6a0SiG2NLPbD9LdnWZ4whyndaEl4ftbaKosLYRzTrBzXHF25Q0MzOPqXoiiBJTzVQUIjupessNfNg2yZy9v7; 5:UlX2kYlkW7DWE3fGDLMK3n344rKVVpR6GvVbenH4v10CC7nAWMIWlvsckaCRV8+VVJxg4ZTqYS/ndfhyELfr6OFAGVBijY17txBEaH7r1+JWv9JLym7Zm9HAUXaEx4Rf5u+JJB46K3CzppnFad//1A==; 24:v4Wbi8TO6u5jWESTdqaRYd/PiHtRxHE4to25ZVHDEPMqeHnEO9Iq8CuirHqTDLmA4MakNqk11dMba1wj1D6GDCfz0pmwhqded4p8ttW4jSc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1148; 7:dy0sdqApXzOC27AfdxXCYH04zEwcTWRDFAp86TLoc4bzi7cSkfLrUyLp/mO5PBVEVJFywCDmI/d9YGs/svwdzpv1rc/+UBueAOEsc74A6AlcC4/U5ZnNYst0KfcIko33GXTeHpkYZdiKScEOJZRrzyjkifo4qqA/kHMckiW1koJprpdrMFwAeihSnH2DZTVpAtNIywPRk3IQbvG1+ZwYEfmfyP74MBR6itilXbdREgmbyqjKpNlYO2e6eKqmlw6mLXQ/KDL5RuxDVHT/zPNOQ2Ztqq0wHgD4dZ5Xlh/L8iR+CKH6PTr1M+4zIWFyDTyLP/LUMsj/zEDZnFQ9Elf/+HbtSSIOtNAGopVs1Kv/8R4=; 20:fwykfcwWZvhEEYkriu2umRE5WVybNsCRWJc9zXaMNemnGo5wYy0/ds31vTOMdArAX98yzUWPs3RSvfWawZt8du91dSTioYOzxO6Gvvx8jXPLIrvBIjHF6fhepMPJT8jzo6tKnUmsbHjCyo2adI5Z6wcErRD1TEeEscGU9SHwu9L8/2gqROD15zKgrJ9uwVvUcd3I9qaQnPZHYLuO+uZy5Bv3v2XtdaOO1VYAmxgoh9Cr28rnI2c//79ZkMohnUw9 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2016 14:43:42.0640 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1148 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update the connection type enumeration for backplane mode and return an error when there is a mismatch between the mode and the connection type. 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 348cc8c..9d8c9530 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c @@ -164,6 +164,7 @@ enum xgbe_conn_type { XGBE_CONN_TYPE_NONE = 0, XGBE_CONN_TYPE_SFP, XGBE_CONN_TYPE_MDIO, + XGBE_CONN_TYPE_RSVD1, XGBE_CONN_TYPE_BACKPLANE, XGBE_CONN_TYPE_MAX, }; @@ -2831,6 +2832,7 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata) if (xgbe_phy_conn_type_mismatch(pdata)) { dev_err(pdata->dev, "phy mode/connection mismatch (%#x/%#x)\n", phy_data->port_mode, phy_data->conn_type); + return -EINVAL; } /* Validate the mode requested */