From patchwork Tue Sep 25 09:13:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 10613749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 04B85913 for ; Tue, 25 Sep 2018 09:13:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECA582990F for ; Tue, 25 Sep 2018 09:13:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFF6F29A1A; Tue, 25 Sep 2018 09:13:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCA5D2990F for ; Tue, 25 Sep 2018 09:13:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726208AbeIYPUG (ORCPT ); Tue, 25 Sep 2018 11:20:06 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:52384 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726201AbeIYPUG (ORCPT ); Tue, 25 Sep 2018 11:20:06 -0400 Received: from 91-156-4-241.elisa-laajakaista.fi ([91.156.4.241] helo=redipa.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.91) (envelope-from ) id 1g4jPL-0002px-Pc; Tue, 25 Sep 2018 12:13:28 +0300 From: Luca Coelho To: backports@vger.kernel.org Cc: Luca Coelho Date: Tue, 25 Sep 2018 12:13:22 +0300 Message-Id: <20180925091322.17832-1-luca@coelho.fi> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [PATCH] backports: fix iwlwifi pci device removal patch Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Luca Coelho Accidentally, the patch to remove the device removal code from earlier kernels was sent from an intermediate version of the code, so the patch doesn't apply properly. Fix it by updating it to the version that was actually upstreamed. Signed-off-by: Luca Coelho --- patches/0085-iwlwifi-pci-device-removal.patch | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch index c72cd09f4634..6e1f1fff2591 100644 --- a/patches/0085-iwlwifi-pci-device-removal.patch +++ b/patches/0085-iwlwifi-pci-device-removal.patch @@ -1,24 +1,22 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c -index 7229991ae70d..d77d0aa3bf7b 100644 +index cc8c53dc0ab6..68296b65a680 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c -@@ -1946,6 +1946,11 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) +@@ -1922,6 +1922,9 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) struct iwl_trans_pcie_removal *removal = container_of(wk, struct iwl_trans_pcie_removal, work); struct pci_dev *pdev = removal->pdev; +#if LINUX_VERSION_IS_LESS(3,14,0) -+ dev_err(&rescan->pdev->dev, -+ "Device disconnected - can't rescan on old kernels.\n"); -+ pci_dev_put(pdev); ++ dev_err(&pdev->dev, "Device gone - can't remove on old kernels.\n"); +#else char *prop[] = {"EVENT=INACCESSIBLE", NULL}; dev_err(&pdev->dev, "Device gone - attempting removal\n"); -@@ -1957,6 +1962,7 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) +@@ -1930,6 +1933,7 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk) + pci_dev_put(pdev); + pci_stop_and_remove_bus_device(pdev); + pci_unlock_rescan_remove(); ++#endif /* LINUX_VERSION_IS_LESS(3,14,0) */ kfree(removal); module_put(THIS_MODULE); -+#endif /* LINUX_VERSION_IS_LESS(3,14,0) */ - } - - static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans,