| Message ID | 20161103132936.3437.85364.stgit@tlendack-t1.amdoffice.net |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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 3t8mRn6cfwz9vDV for <patchwork-incoming@ozlabs.org>; Fri, 4 Nov 2016 00:44:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b=QclbeR5f; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757500AbcKCNot (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 3 Nov 2016 09:44:49 -0400 Received: from mail-by2nam01on0084.outbound.protection.outlook.com ([104.47.34.84]:21644 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756507AbcKCNor (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 3 Nov 2016 09:44:47 -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; bh=+HMHpTI2YijkQ9ndF4C/WAqlP21b63jll7bEgN1zymE=; b=QclbeR5fHReAqJ2j0SR+0E/8tyXyPJYyOhDnfv4ZBMgxJPfPLEVLF2ey2ZHhyLb5IH++5wcvKDHB1Fk8So2RkzrHzmIbcoB0XfQOWdMFAviW18l0wdQxhjLWZCVOrxp1DOyXGMBbYi7sYgxf+tZgRBRB+kM0y/4s6hbXggh83g0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by CY4PR12MB1143.namprd12.prod.outlook.com (10.168.164.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.693.12; Thu, 3 Nov 2016 13:29:41 +0000 From: Tom Lendacky <thomas.lendacky@amd.com> Subject: [PATCH net-next v1 11/21] amd-xgbe: Guard against incorrectly generated interrupts To: <netdev@vger.kernel.org> CC: Florian Fainelli <f.fainelli@gmail.com>, David Miller <davem@davemloft.net> Date: Thu, 3 Nov 2016 08:29:36 -0500 Message-ID: <20161103132936.3437.85364.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20161103132744.3437.27332.stgit@tlendack-t1.amdoffice.net> References: <20161103132744.3437.27332.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR15CA0001.namprd15.prod.outlook.com (10.172.204.139) To CY4PR12MB1143.namprd12.prod.outlook.com (10.168.164.135) X-MS-Office365-Filtering-Correlation-Id: 1e681608-2e92-4ee9-25ae-08d403ed780d X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 2:hgZtWr1Fjr2tlwmIKKTRWPY7wuGinW5sKzBQ0VDHi14QKUGL5kEII2iNSHq0RtkFIKsj4SUUGHoUCl4dj34jUP5uGmjDyGZd/hjDpYmJMNAjW7dWnH0GF/hY3v6y9VUhMFlbyui5aXyV8JD8Zeg/3A474BcLphkdjy0/MP2tnAeA5a97eoCjTp/FnBsqOj2RLgF9WWJrhiOOsl7vua0XDQ==; 3:TDKrPtX+mfUZI35KtOXUknue6GLUiqWRsUvPY9Wry1BX7qwrG1oMdzW7N3ZaTgI00aZlca+q8xsEJFn/SW7QXZHq0yWV3Wl1W+W/W9gVj1hivKS8axvgsFvHDCVR6hplKDfVkulsAiheG+EXi3sXbA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1143; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 25:OI/sqBaT/9CkUia4S8CEo/qpip/8zBItrq8tVCIs5GgGuRyyANFKcRYOM/SzOqEczS1kXNwBM3UGBO1qHiI5k8xR19xvxPlMjlTpN0yesq7EgFwGaM6QSlrWyJIylEqMc4Pw9+8MW+q3Mu4o3FuBwe6X2hWCuEmx6DOhImESdHkLxpgtLZU9Vrh8H2Rx6nIv6u8ZxvvAJZY/rt0rKqK8uFEp8ZxIUZsqKJRWn2nWF/Oph7LpMmi1Y+h/ihM444oFpyBcRa3y8XvTNGXpAcIa3cyh/8u2wSH3OY8oiVik9xfUoi1iZ/zA8uVYqx6ry2eM35mf0Gl1/e89PBR6VbrcevXzC+21mFRtER7OsHFRs2L+D3Y1N6Vk+siMwghYZcXjcVkshZX3c51OvZFY7kV4AXJ8lnSGXXnxpifqvZtU9q/3rb7gHT8DrqGETXKB4sXjWbirGoInA1vmIOvOXahUW9jUMUqo4IHNZUfrTpPS4Bs+PoiJDoVbXEond22R1+Wa9Cqp3dnmmMjTJOr4gehBGhEk0c9ic3jtv52YtXSQOTzf6mVdinV38fbQ4r1R48BJw7bbKrdfc+aMncCSTUyLYB74RBOuuSPGzXR5lIOo1yR12m0pQxkPg885Sg8rCxHumnfjtJvLhdriR2PIKJQmB+9fL+57YrzohTofp+XbMwt7ZmdcpSuCJTYnzitpsjfuRDCiwbNrcEACGyrZSKAklEks2gVNWlJY8IYCc6Df0NU= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 31:kXk+KWyvIFg3KfR202LJsgRnKb5k6uiR8s77hzQbYY1bUqWGddvhnTNMzFblfRwCoaFK7WzZkXF/K8fKplNP8VksbaPKLEGcrILBPNya+Jcs31nQXCXhAP2bm9yi3iYYrNb2tKSZtFXJb5c+W8Eame/8K8WNQe/pRbhScDMJMU8b89EAv4795Xh6kDTZrPr2VJIrzmfs38OTnu5UDkY9PtDAMGIVbGmMGihsXwjSs2FEoiWJhhSjEmTbtgAS16UU5RTnFDAxgQbc3u1ggA3UJQ==; 20:OMhouYaTvMQCD1LLF3kYSjyoC39qlhWEYF9HaYdhGNiYhKmTaYeAJkO12+liONMc2xJbcB27Jn/ciGa6ikpQOtDVKCh6OBtD3FUt959W5oGkx+4fCkbFlDgmUKHuKtArQ59L2f88FKHt0WP1xg7vvw1vGB8HjvwsuMkqSJnKVuAIDbvmyaawt6t33f7qYe8U6zSUsbi1QiXOZyCVZ7S/rB54VoJufz2hKNK2yrAfnp0m0kSpQir+kNmXJ1JBIDtAoSorS4tANC13F97P5Kk5VNUJhs3ogEtWG2ica3sNpmeV6pghkjzwb7XRXTbnpSOV+qLtaqz+0WOEbHlJ7Y1VjhcjRtrwShiwIbNjVw94ikERxET13TgU+aesKe5bXpDzq2yrAdL2fMtfTxjZwDaLjUglOGA84yrMPgJfZslRUw8nfKmvJ/tTd7FyYK7D6ng/Z69vDBmc6CfJAgRIbVU81dW3rAVcxqsRZh7STl4DxqLtlEDbmwsVJgqXbj1qKtOs X-Microsoft-Antispam-PRVS: <CY4PR12MB1143C8F5CD65CCA83603DA59ECA30@CY4PR12MB1143.namprd12.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:CY4PR12MB1143; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1143; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 4:Y2AJGsgJT4oo6hwCcihj7DV2v2DYAJYJP/uOLfWcm05GKzeQI8Vj0P43Mlmg6ekrv3j6m0CslIN9fA79+T2VGYa+ldCPM+v7vOCu3JladvvmxIDb45p/Zq7qLGJgA6W9he6aJ1kgdyWU48nCGo78beGEsJkz4KSCjRSXS22liBhNoLWSVzKuARhW/sBm0wxj8CduhOZh3FXlxxI6/vafK0PVdoQZl2dn72ko6yuOfaPEo8CGOjZRNAKqRzCz4NSDG2bIJQYL70yg22FAJA4LmHaX0yNAecYWo3do2mibgwOv3jI8nWxASMNKB7E58xXtaYD2B5EgJG6zgrxpuq/tdBWFgvY3ACvkHPHGx5gNA3CIxKOxamEhLmRJcUnz+dQZ/AqEWCacQO5f0/jwWYUKcKRjShes9VOjWRzw2ia6oN8XxWKYCFX7LeefSDlcCY+edLcvNTaSQMMqg9oapgOQgQ== X-Forefront-PRVS: 011579F31F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(199003)(189002)(3846002)(2950100002)(106356001)(6916009)(103116003)(4326007)(1076002)(5660300001)(81166006)(101416001)(8676002)(229853001)(76176999)(50986999)(54356999)(105586002)(81156014)(110136003)(586003)(50466002)(53416004)(42186005)(2351001)(9686002)(77096005)(6116002)(97736004)(47776003)(69596002)(86362001)(189998001)(19580405001)(19580395003)(68736007)(4001350100001)(92566002)(97746001)(33646002)(305945005)(230700001)(6666003)(83506001)(23676002)(7736002)(7846002)(2906002)(66066001)(71626007); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1143; 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?MTtDWTRQUjEyTUIxMTQzOzIzOktqTyt1MkxJY0xvMHpZUi8xMHlYMG9NQ0pX?= =?utf-8?B?UVBnRitSRWpEaVJsYzRIYnc2UkgyWE03TTdDNUVrM2VhKzM1RjFqV1RORHk4?= =?utf-8?B?ZisrbnE4ZWlUWlVTUVZKU3NYc3VzTUtJMjZTdUJ0bWZ5N3h5QzVvZTFnSlhs?= =?utf-8?B?dGFxNG9GVjNWd3UzdVozQXFhcERvSlI3b3J2eGVkQko1VDdYZHY5MGtOU09K?= =?utf-8?B?UXhUSWlKUVVEOFdPQ1JHdDVMQWdDaXVTNzB6cStJNzFXZDFjTWtOVCtUTG1T?= =?utf-8?B?Y25QRWlQNVpod2hVMmxYdVRCR0FpNVc4R3UvZ0dhVDJPR0VpRk5uV0x5STVS?= =?utf-8?B?OUxXMXVlbCtFckttdnRGNmpDaFpFR1BxVVJCdVFKRStBclhTTlVUY01sUm5P?= =?utf-8?B?ZWxpbzFxSitrd013amRmaE5jd0RPYmt2YkhmYXlCdFVvcFFtVHVIdFpJNUlJ?= =?utf-8?B?UDUxNUpZZjBjbTBHcUVzUnZLYkFOWmdFVk9tRFR2bnByYXJqbjhTRDM5SFJ2?= =?utf-8?B?emxPUHNyaXhRTmFQbFl0ZXJRTzlqdC9RTnBiaHhvME56cTBUc3ZLWGxWbFFG?= =?utf-8?B?b2VpRWp1eE0vNmtVNEZ2WndYN2pEV3E2ZERLeHJ0ZVVqTWt6MVUzVC9rZkQv?= =?utf-8?B?TUJsMkxqckFkd0txN1hMeXA1c3A5T2QwTFBzR044cFpqM3VDNEJtOVBydzQ4?= =?utf-8?B?OTQvaFhEZlFhK2pVL1djSFVVSGg1bkt2cnhiRVZtWGlSUTVFbDQ1cmJST05l?= =?utf-8?B?SDE1cklXOFgxS1RudDNiT1I2eUo1UkFGeFZNMzdab0lpenZ3dFU5Wk1mcWht?= =?utf-8?B?Q1BmeUFBVk1wVnh4clBjRVlMSEJ1dGtyODR1Q2tGc3A1UlVHQ29vYkRxT2Nr?= =?utf-8?B?QmpWdTBOZ1l1OVVnWmJGMUthVGp1YVNwS2h4RjQzbUs1QTRtMkh5M1JmSEEr?= =?utf-8?B?TDNzRk9Db1J6TUJOT1NoR3BtSHRtaUFRSHZvVkRYc0hOamNId0tjWWNSL0sr?= =?utf-8?B?dU56Sm5FTzRLL1ZwWG1Bd2VmQkdmenE5Z1JoeFAxQUZsV2ROWm1RcXduOHFH?= =?utf-8?B?ZjIyRHFpeUNHT0lSM0ZCZEk5Mys2QkphQmxudzhvOTlkVU5iWkc2MWZCTFdS?= =?utf-8?B?c3NBME5QQ1FCcmRlb0NDaVpDb1V0NzlkSHVEQXAzbU1aUHZ0Q3ZLcmpSNFph?= =?utf-8?B?c3BMNjZOb1I5MlFDdVE4dW9VV2JrTW9xdXYzWitJbGN1b2FkUkVwdXV1Szdj?= =?utf-8?B?OXFwdnRIVlF2cDArVm5KNTdXejBDbzNNeWQ3VGlURnlFOCtBQnU2Ky8vT09R?= =?utf-8?B?VmNMcG90OWYxYUd2TzRvZWRqSTR2MGgwMkUzeXZkZGdBcHFnVXdzYlZYUkt0?= =?utf-8?B?bU93MndXekRMTXR1SThQd0JNbm85eVpINEd6dUhhcTJ0eFF6NlpOMUVDdTNj?= =?utf-8?B?Wk5YbFB4cktoazhjQVRPLzh5MFhRNS96UGhWVGd1azhiVm9wSWQvQytyK2FM?= =?utf-8?B?MW56aGphNWtUOGFCUDByZHpZQ0hzZW1QM1VsOG15ZlpET1QyT1lqVWNVQk5D?= =?utf-8?B?MU5nVEVUcHFFMkY0aU9FbGlDNkdxS0taT25CNE1RdVZ3V2RIT0lheHpXTTBk?= =?utf-8?B?TnZKVlFEWWlTSUI4NmZWNC9ZUG96TmtnZWtUSXJzR05nRDJEcFN0YkwyVGlw?= =?utf-8?B?dkhlSnQrYjRSYitvMmltenBhcUZYWWlFUVAzK2ZxTXBxLzJJTWk0K1B6QTZx?= =?utf-8?B?Z0Nqam5ZSXduVkxlVSs0Zz09?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 6:cE2MqjtnCrT93DQAL8XqJS5AGl+HCPJh4eLj6ZThVecTuLExTfxwS3sGW3xOgtFMJpt7JR/sv7Bh2nmGU1S9zKfq7C0j/o5d3DR/PsGTN/roPL3enzZ2GpzfFCm/TZcpmVt28MeYAsaTlZFoOtxNU4UY2hGISFoRLMl2ZKUmfsUbh4UlkXBOSuG3/eIFrYGAS9SDUiKRJ5ZLlDbH+Eg3sLUeOKum7jIQswTKnC+qv4YkNPfzWGqTJw0h44+1p1ttP558A++sB2cU/qRp2t7Ag/+weboLHPAlYZcjUPJlO97+C7uznIuWAsafPDazWxim1lUpBb11sPazNwQrmk7Igw==; 5:rxSHT3f//CkMB0WbXaayBLAa6v81NdvraT9YM0QYxOSyFkaoueV3FdyV8MEw6905OSju712iAfJD2Zwm6EsIZDZVdUWiaQVhTGN6dgPv989q5vlM88aLngztPDc2p+jIm89/w45422KFITw+ZMm58ReVPePjIzz9VQfDah8Zf/U=; 24:ImMLz9DOYxsGJp6Fu7HEKN4KTXU8k0kF7hWvUEheiHBZ9aYqhhvYx46FvbLAHdBlN7T7qVrbECQeRGyQJ2IOs9gaSd9LsToejtI/nb1Ckkg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1143; 7:cVD4Hck4DpHMrABNa8nV2cUNMvrcmXsCWqA2ETRz3n7ljJOV9opvY5kFZ9KSXZbgEo4Axeaijz+6QFeeNulJPBdA6uUL4izjHHmCGGH2q8Ijt6iyKNcLZYpS2y13OM04/LXC2UVqTQH1xd0kbDXn95CyvnpQVnejUcm5zSt2PiSk8qLhCY/0TVMoINd4WaMJOXaq666u1Bc1/20SsEq52sH/zvijRGGvaAe/+Q/F6EaWJ9QLlCJiaP9vsltgPTeaIJHzQlT/aJEdi+ve5Lx+NwfDc5EF68tfl/Id1/a5fotMPcPD8JxFvGtU8NRVEIumZjbVwWIqgBFmm+aLuLklZVVrl4gEFc3WsKzA7N9zpb4=; 20:O7jBojbsg6knl8oJChhMeUEamMJcBGcILsd7qxAsl5d2Wt60CQf+YciwMR+tbf9O14MSygDQ8tsp/oZWqDX00Wjl5UsMi6FfeaZY9LlAZKZa6s2gIfTybvfLWUGFm1GY22AVepTAtCH1pSZinRjtfjjs268G7UtE9iOsyQXWz7XlbJUWMDamu4y56jBuJ7rrzvEaxqsOudK/ZSj4pHp0f25Ni4fpGj7mIt4kppnCE+tz+AU4vz6ELmXcV17YLoiN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2016 13:29:41.6527 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1143 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c index 9d86112..698712b 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c @@ -1897,7 +1897,7 @@ static int xgbe_disable_int(struct xgbe_channel *channel, return 0; } -static int xgbe_exit(struct xgbe_prv_data *pdata) +static int __xgbe_exit(struct xgbe_prv_data *pdata) { unsigned int count = 2000; @@ -1919,6 +1919,20 @@ static int xgbe_exit(struct xgbe_prv_data *pdata) return 0; } +static int xgbe_exit(struct xgbe_prv_data *pdata) +{ + int ret; + + /* To guard against possible incorrectly generated interrupts, + * issue the software reset twice. + */ + ret = __xgbe_exit(pdata); + if (ret) + return ret; + + return __xgbe_exit(pdata); +} + static int xgbe_flush_tx_queues(struct xgbe_prv_data *pdata) { unsigned int i, count;
Due to a hardware issue, it is possible for interrupt events to be incorrectly generated when performing a soft reset. To guard against this, perform the soft reset twice. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> --- drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)