From patchwork Tue Feb 20 21:22:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 875707 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="sx2jk3+9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zmDVw584dz9ryd for ; Wed, 21 Feb 2018 08:38:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751416AbeBTVWM (ORCPT ); Tue, 20 Feb 2018 16:22:12 -0500 Received: from mail-bn3nam01on0070.outbound.protection.outlook.com ([104.47.33.70]:58004 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750799AbeBTVWK (ORCPT ); Tue, 20 Feb 2018 16:22:10 -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=q5ahOZ/NrdJSJLlCxp77igsNA1xBgpXMRFqvlB8Vl/M=; b=sx2jk3+9Py63X0LNSKJrsstSSCMeH+jecgiR3ZaZ/BqlCnX4Wwa9AWkctQDUKnHJ7/jWj5rlVRjrY+J0StCuKroQ/lWig7Nn3TEiUzyTJ5bIUqOXId86SFm39qyPp2zUjwVSHXAwKWhQObz2vd53JZrjCoHb1WLI3M21BuKMmpk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by DM5PR12MB1145.namprd12.prod.outlook.com (10.168.236.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.506.18; Tue, 20 Feb 2018 21:22:08 +0000 From: Tom Lendacky Subject: [PATCH net] amd-xgbe: Restore PCI interrupt enablement setting on resume To: netdev@vger.kernel.org Cc: David Miller Date: Tue, 20 Feb 2018 15:22:05 -0600 Message-ID: <20180220212156.25546.64989.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: BN6PR17CA0014.namprd17.prod.outlook.com (10.173.147.24) To DM5PR12MB1145.namprd12.prod.outlook.com (10.168.236.140) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2a6bea4a-c09f-4386-7191-08d578a7ffd6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR12MB1145; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 3:6M+eNlcoKnB9eshXr68wnUpfZVHI6YbWASDRC71581BvaCsPY9oLmirkmRrO4qAfr3HldHJiXBOF76Xn3VT9AFWS5iw9uolv7OceZxb7be7yC1+GuiZzZQvsdO16FJR1/U+CsWOgzQWpyqKlMMzVXl8z+2ApDuXfOD4LJ8PK3bn/LwNelecNHPlvZ3z+8uR4SZWjW0x9iPSWuyDoEqu/Ez1MuGLGd8kGkW/JGExus6VdVVhC9aT0tUwSmdQNTES/; 25:RvfefkQHxMooaJpSlvG27yffRBXkP3gZBlz7qhJjTLExBWRBObVA+KIVGfiZ86n4zd63XU7SzwPqqYIxuiT884Qz0sW/uiPQq9QKa0vTEoshtRusyJQY85vtsSil+k9NpbdBj3SSvB8Vm4LDexidMdpQhWYVrG5cuq73hf6AEskApRxQZ2Kwxc2QXxIu/8RGYV48/k0PgH/ABPVHHLtEmUM0Mq5CiD4rG2HhYV2lQ7lbZg8a2JFKVS4lt0zy1on7dLo+Z4gFMydy42bqOs2N5Phcc5q61pjpjGIPK/9OK9fv3zJuDiTRFphrnYn3VKp64Tco+NhST9sqfQYfmfjQzw==; 31:mjyYSKBx7AvmEZJsF6KxGl5hGcS1JpZasora059Wkl2GV2UQASL1nIZigZEANFLihMlnJZFxC1GX22qXl11MpgIP6S0/wFt+PCyRqzw7JFTkdSklUAmE2NwidEWE51E1gMoLadRzVN6XQt5CjRxuJPFBK5XC/DXQchav2LwD8S9TF8idfkgsPoRK4BV3d68/CW9gxmzfzttzh3Ay4o2yHDhzWWa2aicwL1v8/sd0zCU= X-MS-TrafficTypeDiagnostic: DM5PR12MB1145: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 20:poXtooXGsT57twSC8HnOXDhVq2bB2YZ9Ylaz+rKF0XB1kd1lgcZw24Y+RaqlfaGQRYMca5J6Jvr4MWA/aY43kJfU+iinMeshrJFB8jtffSNir8fFE29vULDLG56OF/meepbLnS6UAvTT36+LYcUjSyDYf+a7QzlT2e+ZFzLEtLd+jQ/MMKhn7i/s4K85NBw46ZZs+pEETGU68XEyZjWPy//qYhbKg4ylTOjkDhyUaYB9Skg4vSxkn9Zy9yK5u7d8moES7vJycGbeSwkHQC62XDpdQTBHJzIqsuOr126iLm2pxxByPdISA7pPTY4pgcJkJRpi7Uhw6bmL02kRPrKoQp1/YjbWEA8VvNBJMAL7LPGDVt68OcROv+QI3Vama6MAh6LiXW4wr85QdFBELqRw1NeCVyQkW9OpOoA+hyeFKq87czHm707MbFytjS80brv3zC67CrMFwNBKUYBonjYWX4y6UdwfnDKxoex1Lc0+46svFZX3pWLNlKGvhJs7vjKW; 4:Md8HOcD2tjjK0FWXVBKFuNEpaWWUYAxGjssi4sWKTPJbzVsw9jPkNiF1fVaaR8LBV9h5IwrPB35fCwsnfp7BNWBqXCg7EyiqhEzhudc60c5FI4IyktjMvmiju7DKdMPkdbR05+gZjW/rGMFUw9g01AGlct12GP/rVpk+FQXP22AC923JgecOKgEmk28UFNJp985WUxCaDEfQD6xjl6MVROeVbXzQ1uim37qXuZU/wDU6llgnxTnYJd9RtKChZtj1QFeBtd3e7lIjzM4W3lEcw1X9RNXokJq5IZVCBX3OzV0GPRvAxrYtp+oyokt9Wk25 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231101)(944501161)(10201501046)(6055026)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR12MB1145; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1145; X-Forefront-PRVS: 05891FB07F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(396003)(346002)(366004)(39860400002)(199004)(189003)(69596002)(66066001)(1076002)(72206003)(86362001)(2906002)(186003)(2486003)(52116002)(16526019)(23676004)(7696005)(53416004)(58126008)(97746001)(103116003)(316002)(2351001)(6116002)(68736007)(47776003)(3846002)(2361001)(50466002)(386003)(97736004)(6506007)(305945005)(106356001)(8936002)(8676002)(81166006)(7736002)(59450400001)(81156014)(230700001)(4326008)(478600001)(26005)(5660300001)(9686003)(6916009)(6666003)(55016002)(105586002)(25786009)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1145; 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?q?1=3BDM5PR12MB1145=3B23=3AuNwj?= =?utf-8?q?X6AHfH6bWZfqoC8uK3+Rq3VuNGc0HTN1rIvTDkj0TcPBQkOpYM9aYnZA?= =?utf-8?q?M7Q0V9p3X34VM/bjHaVpLUH+j7L7cb2d72l4YcwjbskNKE/EXGX8GxKf?= =?utf-8?q?F/xJAXnq8+f21e3HVxCyqy8Jk7fgmg93OAjDO61q1F8SgwEtcW8hCS1S?= =?utf-8?q?CdtDWQ8p2+fsQpMk62EymAbczJ+X9Fy9qkXMi2/hlDfQeXgoPA5A8mDP?= =?utf-8?q?m6AiHMlfulRccOKpx3WsNTQRQ6Z8rGaU2uDNrJbq5ZkXeHXPnyV34wes?= =?utf-8?q?G/2yFDN9OvRgSnkGoB9HwAWgrBYLuWv/qJnYaej5foyEE9kIBYaHD06n?= =?utf-8?q?KLEf67dR4MmIn/J4+1hZyeEU7o1dmDH66BzXeyH4CUF6cLQK9CTJN5xn?= =?utf-8?q?cA+Q/Ahm608cfiKgRoI3gbK9WL0JSw/pralkn75cMSyIID/K4Mm9ZOrb?= =?utf-8?q?hyFnlFNOc+f2KSHBnHwOE+xMi4sq+lhlBh0CvxRsy2ZCmGN7LHBqTwy1?= =?utf-8?q?bFlf4TzwODtMXWO6+5VC1HcxA+8xseGZS1qpIzDBn+BzSu+HFpBSOK64?= =?utf-8?q?02kKgiJiLM53+yr95hcWx9YALy3X0PJYqibHDvXafZ2m0MQYtUzlgEeK?= =?utf-8?q?QTmAbdbPLCyt2EZkWLZHUABdTdoZU6xBczFNZxt6IQRWd2yFEzrZyTRV?= =?utf-8?q?WH6GicUM4ZGj+nGh46KF7aXulaLp2k9g0c1gBWfuhwg0hmpAw02sGcqM?= =?utf-8?q?PUscFI5Lo07Z3nHwwWOzApLM4VwRWyrJjhg/PMxItHK4Z6JNnJWumD3N?= =?utf-8?q?OtdzASd4zYg/mvFYWG4b/I1pOJ5wN90Uuj6jkM/7EXz7FROR6RBZfu3Z?= =?utf-8?q?ApSMdzAlXXUXt8En/q7P0/BWtr626j22AgCKBHyHHCHGykLxzQhl50LM?= =?utf-8?q?9Dsopmk420/pyz8KiEvxWtNA9cFjn+VmJdWMaLfbB8hoF3u5Nhgk7gyg?= =?utf-8?q?oI9B+m6QUIdkz86r5/eH5vwPlASLeZ8SxO12y/bmpxlZ6qQqZODKfphq?= =?utf-8?q?Tr2GNMxjfhShvaq4hA4L0VWlaJe26qfti9mXUCdGmme2nbjr9J3msp/+?= =?utf-8?q?t/MaXMEqhCbvNfDukNetNE6JiOYC2wjRoCXu6scfE3olduL42QVyoYxZ?= =?utf-8?q?opD2YqD5NiZ4igk6KhDEED1LSJykSDj0Q8a0UScVjsymLCEUZHuUrrjQ?= =?utf-8?q?8kH0fw+KvAm3jMpGuonDvtf5Nde4vz5RaIuJrIq2Mbr33YW/VEqtVmsQ?= =?utf-8?q?hnd2pEg55nPjl/I5kfmgQyE=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 6:azMwrIIkj/hpTPKsBlQsLMgLulXLeGfTIm5gUB6fclNdv4us8+rnwi4MMMa5H7bpKi+pI9xbpYKvozHAFtHzTOmxXUrbICCedRqVZZSJ+czZ1p3awH1K5gJQwD7qCwijgiSn28wnMhtETA/d1U5tm3QITeDyhEPpiYDY1u5Pe3xUfG0jWbXttuoQKZRlOGvqnCx6L0ZBeZbOQ/hcTs+pB/AWgb2g53tp6ji5fq0on9Qbh6/I45AEWXxmr/0UUoS4xavCHieGpHBgqE+Txz5M7+ZiPiBPTkwYf1KZnl5b1sm3CijS4KzhvgjYU3dstULmEvPUNgCGu8EO8vZln/kfCjoyyifO2DGuMqBRM56esdU=; 5:3vdLhcUN5jTNP7ARM/IUKpX1S7uWVKtjDa3SWtBsbnSTRJ3SuQeJ43XWRklztemgqS3aeGssTMwn9LclAg38FIPIfpsSMWJ7zkv8kVZ/e631zxh6c0s2gmUWh54D81AXZlyfLxkYKjPtefonodqwDdCr9/7+taerYWiO3qSnZDI=; 24:0A2gglS/pIMXAIdoTse+jU5Jzr9ji7GC4Veef/URvlvED+2P6lw6UdH0rqzvMgwArVW6GljmDvNcIR/T7Hkk6R2V79pUaP4P0zr6fwqCVWg=; 7:Dpuc2ZayrNBjyPOFds5xepCtkB5jabca1wWWSjusbclB8JudtHskDmikAbQkt9uaVMLvW12vWEh7xm60XOdDMXZeRhUenw8T1ejLN+zUiYWc+/Qb766JcPjHdBSZvwiru+JFlBW4e9TuEr5ihnDzhZI5ojRUNibZLM8BZPXq6V2vHRNtPoQ0TRlO7OBNDkOe7s8nRub3u9hRrbQv/ZzortwDjeJXX94utx5f4wKblyH04A6AV/TZ10sBGKSayC+/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1145; 20:uZdznRDaCrEnnfFiYBJEOU19YOulaChyN0WCyAJ89Vh7xcCo6hwmOzCX4AZ6O7GwXe0W8ynuEtzsoHEyrDwH0h8Whkf1Xs7UgQfvnojkwyGdN3qeBTH7fQEaEp2Fg9YhXmVE68Tgffx6X9kCJfRfC5rBPo2zrzXjMEyLUDcSQ1EYyNzdnrzEcmkV2t3OKAcfbenNlo37y25Ydq2PjEOX48T3jjdhMyBS/hLfv5MazMiIh53aq1xr4tyn1cSjPRh7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2018 21:22:08.6158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a6bea4a-c09f-4386-7191-08d578a7ffd6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1145 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After resuming from suspend, the PCI device support must re-enable the interrupt setting so that interrupts are actually delivered. Signed-off-by: Tom Lendacky --- Please queue this patch up to stable releases 4.14 and above. drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c index 3e5833c..eb23f9b 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c @@ -426,6 +426,8 @@ static int xgbe_pci_resume(struct pci_dev *pdev) struct net_device *netdev = pdata->netdev; int ret = 0; + XP_IOWRITE(pdata, XP_INT_EN, 0x1fffff); + pdata->lpm_ctrl &= ~MDIO_CTRL1_LPOWER; XMDIO_WRITE(pdata, MDIO_MMD_PCS, MDIO_CTRL1, pdata->lpm_ctrl);