Linux v5.2.9

7 files changed, 7 insertions, 299 deletions

diff --git a/0001-Revert-for-bz-1737046.patch b/0001-Revert-for-bz-1737046.patch
deleted file mode 100644
index 1e49ab425..000000000
--- a/0001-Revert-for-bz-1737046.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From d3d7658459c214edc622022b0e1f1cfcabda5763 Mon Sep 17 00:00:00 2001
-From: Fedora Kernel Team <kernel-team@fedoraproject.org>
-Date: Mon, 5 Aug 2019 07:51:10 -0500
-Subject: [PATCH] Revert for bz 1737046
-
----
- drivers/pci/pci.c               | 29 +++++----------
- drivers/pci/pci.h               |  1 -
- drivers/pci/pcie/portdrv_core.c | 66 ---------------------------------
- 3 files changed, 10 insertions(+), 86 deletions(-)
-
-diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 720da09..088fcdc 100644
---- a/drivers/pci/pci.c
-+++ b/drivers/pci/pci.c
-@@ -1004,10 +1004,15 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state)
- 	if (state == PCI_D0) {
- 		pci_platform_power_transition(dev, PCI_D0);
- 		/*
--		 * Mandatory power management transition delays are
--		 * handled in the PCIe portdrv resume hooks.
-+		 * Mandatory power management transition delays, see
-+		 * PCI Express Base Specification Revision 2.0 Section
-+		 * 6.6.1: Conventional Reset.  Do not delay for
-+		 * devices powered on/off by corresponding bridge,
-+		 * because have already delayed for the bridge.
- 		 */
- 		if (dev->runtime_d3cold) {
-+			if (dev->d3cold_delay && !dev->imm_ready)
-+				msleep(dev->d3cold_delay);
- 			/*
- 			 * When powering on a bridge from D3cold, the
- 			 * whole hierarchy may be powered on into
-@@ -4570,16 +4575,14 @@ static int pci_pm_reset(struct pci_dev *dev, int probe)
-
- 	return pci_dev_wait(dev, "PM D3->D0", PCIE_RESET_READY_POLL_MS);
- }
--
- /**
-- * pcie_wait_for_link_delay - Wait until link is active or inactive
-+ * pcie_wait_for_link - Wait until link is active or inactive
-  * @pdev: Bridge device
-  * @active: waiting for active or inactive?
-- * @delay: Delay to wait after link has become active (in ms)
-  *
-  * Use this to wait till link becomes active or inactive.
-  */
--bool pcie_wait_for_link_delay(struct pci_dev *pdev, bool active, int delay)
-+bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
- {
- 	int timeout = 1000;
- 	bool ret;
-@@ -4616,25 +4619,13 @@ bool pcie_wait_for_link_delay(struct pci_dev *pdev, bool active, int delay)
- 		timeout -= 10;
- 	}
- 	if (active && ret)
--		msleep(delay);
-+		msleep(100);
- 	else if (ret != active)
- 		pci_info(pdev, "Data Link Layer Link Active not %s in 1000 msec\n",
- 			active ? "set" : "cleared");
- 	return ret == active;
- }
-
--/**
-- * pcie_wait_for_link - Wait until link is active or inactive
-- * @pdev: Bridge device
-- * @active: waiting for active or inactive?
-- *
-- * Use this to wait till link becomes active or inactive.
-- */
--bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
--{
--	return pcie_wait_for_link_delay(pdev, active, 100);
--}
--
- void pci_reset_secondary_bus(struct pci_dev *dev)
- {
- 	u16 ctrl;
-diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index 59802b3..9cb9938 100644
---- a/drivers/pci/pci.h
-+++ b/drivers/pci/pci.h
-@@ -493,7 +493,6 @@ static inline int pci_dev_specific_disable_acs_redir(struct pci_dev *dev)
- void pcie_do_recovery(struct pci_dev *dev, enum pci_channel_state state,
- 		      u32 service);
-
--bool pcie_wait_for_link_delay(struct pci_dev *pdev, bool active, int delay);
- bool pcie_wait_for_link(struct pci_dev *pdev, bool active);
- #ifdef CONFIG_PCIEASPM
- void pcie_aspm_init_link_state(struct pci_dev *pdev);
-diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
-index 308c3e0..1b33012 100644
---- a/drivers/pci/pcie/portdrv_core.c
-+++ b/drivers/pci/pcie/portdrv_core.c
-@@ -9,7 +9,6 @@
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/kernel.h>
--#include <linux/delay.h>
- #include <linux/errno.h>
- #include <linux/pm.h>
- #include <linux/pm_runtime.h>
-@@ -379,67 +378,6 @@ static int pm_iter(struct device *dev, void *data)
- 	return 0;
- }
-
--static int get_downstream_delay(struct pci_bus *bus)
--{
--	struct pci_dev *pdev;
--	int min_delay = 100;
--	int max_delay = 0;
--
--	list_for_each_entry(pdev, &bus->devices, bus_list) {
--		if (!pdev->imm_ready)
--			min_delay = 0;
--		else if (pdev->d3cold_delay < min_delay)
--			min_delay = pdev->d3cold_delay;
--		if (pdev->d3cold_delay > max_delay)
--			max_delay = pdev->d3cold_delay;
--	}
--
--	return max(min_delay, max_delay);
--}
--
--/*
-- * wait_for_downstream_link - Wait for downstream link to establish
-- * @pdev: PCIe port whose downstream link is waited
-- *
-- * Handle delays according to PCIe 4.0 section 6.6.1 before configuration
-- * access to the downstream component is permitted.
-- *
-- * This blocks PCI core resume of the hierarchy below this port until the
-- * link is trained. Should be called before resuming port services to
-- * prevent pciehp from starting to tear-down the hierarchy too soon.
-- */
--static void wait_for_downstream_link(struct pci_dev *pdev)
--{
--	int delay;
--
--	if (pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT &&
--	    pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM)
--		return;
--
--	if (pci_dev_is_disconnected(pdev))
--		return;
--
--	if (!pdev->subordinate || list_empty(&pdev->subordinate->devices) ||
--	    !pdev->bridge_d3)
--		return;
--
--	delay = get_downstream_delay(pdev->subordinate);
--	if (!delay)
--		return;
--
--	dev_dbg(&pdev->dev, "waiting downstream link for %d ms\n", delay);
--
--	/*
--	 * If downstream port does not support speeds greater than 5 GT/s
--	 * need to wait 100ms. For higher speeds (gen3) we need to wait
--	 * first for the data link layer to become active.
--	 */
--	if (pcie_get_speed_cap(pdev) <= PCIE_SPEED_5_0GT)
--		msleep(delay);
--	else
--		pcie_wait_for_link_delay(pdev, true, delay);
--}
--
- /**
-  * pcie_port_device_suspend - suspend port services associated with a PCIe port
-  * @dev: PCI Express port to handle
-@@ -453,8 +391,6 @@ int pcie_port_device_suspend(struct device *dev)
- int pcie_port_device_resume_noirq(struct device *dev)
- {
- 	size_t off = offsetof(struct pcie_port_service_driver, resume_noirq);
--
--	wait_for_downstream_link(to_pci_dev(dev));
- 	return device_for_each_child(dev, &off, pm_iter);
- }
-
-@@ -485,8 +421,6 @@ int pcie_port_device_runtime_suspend(struct device *dev)
- int pcie_port_device_runtime_resume(struct device *dev)
- {
- 	size_t off = offsetof(struct pcie_port_service_driver, runtime_resume);
--
--	wait_for_downstream_link(to_pci_dev(dev));
- 	return device_for_each_child(dev, &off, pm_iter);
- }
- #endif /* PM */
--- 
-2.21.0
-
diff --git a/1-1-netfilter-nf_tables-fix-module-autoload-for-redir.patch b/1-1-netfilter-nf_tables-fix-module-autoload-for-redir.patch
deleted file mode 100644
index 23059794a..000000000
--- a/1-1-netfilter-nf_tables-fix-module-autoload-for-redir.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From patchwork Wed Jul 10 23:31:12 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Christian Hesse <mail@eworm.de>
-X-Patchwork-Id: 1130590
-X-Patchwork-Delegate: pablo@netfilter.org
-Return-Path: <netfilter-devel-owner@vger.kernel.org>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.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=netfilter-devel-owner@vger.kernel.org;
- receiver=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
- dmarc=none (p=none dis=none) header.from=eworm.de
-Authentication-Results: ozlabs.org; dkim=pass (1024-bit key;
- unprotected) header.d=eworm.de header.i=@eworm.de header.b="ZrrXhpkA";
- dkim-atps=neutral
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by ozlabs.org (Postfix) with ESMTP id 45kbHB1BVMz9s3l
- for <incoming@patchwork.ozlabs.org>;
- Thu, 11 Jul 2019 09:38:46 +1000 (AEST)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1727625AbfGJXip (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
- Wed, 10 Jul 2019 19:38:45 -0400
-Received: from mx.mylinuxtime.de ([195.201.174.144]:59434 "EHLO
- mx.mylinuxtime.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1727220AbfGJXio (ORCPT
- <rfc822;netfilter-devel@vger.kernel.org>);
- Wed, 10 Jul 2019 19:38:44 -0400
-X-Greylist: delayed 410 seconds by postgrey-1.27 at vger.kernel.org;
- Wed, 10 Jul 2019 19:38:44 EDT
-Received: from leda.eworm.de (p5b101f53.dip0.t-ipconnect.de [91.16.31.83])
- (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
- (No client certificate requested)
- by mx.mylinuxtime.de (Postfix) with ESMTPSA id 48C1215F924;
- Thu, 11 Jul 2019 01:31:53 +0200 (CEST)
-DKIM-Filter: OpenDKIM Filter v2.10.3 mx.mylinuxtime.de 48C1215F924
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eworm.de; s=mail;
- t=1562801513; bh=V/OQmi6tn1BXzNYfG/lvuYyRqgrfTgpxiaY1dc/jHR8=;
- h=From:To:Cc:Subject:Date;
- b=ZrrXhpkA5q/UgPfnVeFmkVHMQLy67G47i6vb94yetpG3Kg7TEDMQ6UrBuEENxQeLi
- 9obFbe/DKXCu3AQ1IWJ7yNrgdzm8nIOojUUVXus+Sv5+CDLS+AzKRrGhw9HHkiHld8
- TMQb8JpxgQPS/dG+Ggbf4W5NfRHLV2bXMPDDb01M=
-Received: by leda.eworm.de (Postfix, from userid 1000)
- id 0419D1206E7; Thu, 11 Jul 2019 01:31:23 +0200 (CEST)
-From: Christian Hesse <mail@eworm.de>
-To: netfilter-devel@vger.kernel.org
-Cc: Pablo Neira Ayuso <pablo@netfilter.org>, Christian Hesse <mail@eworm.de>
-Subject: [PATCH 1/1] netfilter: nf_tables: fix module autoload for redir
-Date: Thu, 11 Jul 2019 01:31:12 +0200
-Message-Id: <20190710233112.3652-1-mail@eworm.de>
-X-Mailer: git-send-email 2.22.0
-MIME-Version: 1.0
-X-Spam-Status: No, score=2.32
-X-Spamd-Bar: ++
-Authentication-Results: mx.mylinuxtime.de;
- auth=pass smtp.auth=smtp-only@eworm.de
- smtp.mailfrom=eworm@leda.eworm.de
-X-Rspamd-Server: mx
-X-Spam-Level: **
-X-Stat-Signature: bmrmj1jf3ik6r5raom9soxknjbc7ozdy
-X-Rspamd-Queue-Id: 48C1215F924
-X-Spamd-Result: default: False [2.32 / 15.00]; ARC_NA(0.00)[];
- RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[];
- RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[];
- TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain];
- R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[];
- MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-2.88)[-0.959,0];
- FORGED_SENDER(0.30)[mail@eworm.de,eworm@leda.eworm.de];
- RCVD_TLS_LAST(0.00)[];
- ASN(0.00)[asn:3320, ipnet:91.0.0.0/10, country:DE];
- FROM_NEQ_ENVFROM(0.00)[mail@eworm.de,eworm@leda.eworm.de];
- RCVD_COUNT_TWO(0.00)[2]
-Sender: netfilter-devel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <netfilter-devel.vger.kernel.org>
-X-Mailing-List: netfilter-devel@vger.kernel.org
-
-Fix expression for autoloading.
-
-Fixes: 5142967ab524 ("netfilter: nf_tables: fix module autoload with inet family")
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- net/netfilter/nft_redir.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/netfilter/nft_redir.c b/net/netfilter/nft_redir.c
-index 8487eeff5c0e..43eeb1f609f1 100644
---- a/net/netfilter/nft_redir.c
-+++ b/net/netfilter/nft_redir.c
-@@ -291,4 +291,4 @@ module_exit(nft_redir_module_exit);
- 
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Arturo Borrero Gonzalez <arturo@debian.org>");
--MODULE_ALIAS_NFT_EXPR("nat");
-+MODULE_ALIAS_NFT_EXPR("redir");
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ISCSI_IBFT b/configs/fedora/generic/arm/aarch64/CONFIG_ISCSI_IBFT
new file mode 100644
index 000000000..0ca6169ee
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ISCSI_IBFT
@@ -0,0 +1 @@
+# CONFIG_ISCSI_IBFT is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 296441360..f2eceb14a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2778,6 +2778,7 @@ CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_XMP_DECODER=m
 # CONFIG_ISA is not set
 CONFIG_ISCSI_BOOT_SYSFS=m
+# CONFIG_ISCSI_IBFT is not set
 CONFIG_ISCSI_TARGET_CXGB4=m
 CONFIG_ISCSI_TARGET=m
 CONFIG_ISCSI_TCP=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a7499ac15..d1dfe2cb6 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2762,6 +2762,7 @@ CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_XMP_DECODER=m
 # CONFIG_ISA is not set
 CONFIG_ISCSI_BOOT_SYSFS=m
+# CONFIG_ISCSI_IBFT is not set
 CONFIG_ISCSI_TARGET_CXGB4=m
 CONFIG_ISCSI_TARGET=m
 CONFIG_ISCSI_TCP=m
diff --git a/kernel.spec b/kernel.spec
index c3ef4ec10..7f9df00f8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 8
+%define stable_update 9
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -591,15 +591,9 @@ Patch532: 0001-dma-direct-correct-the-physical-addr-in-dma_direct_s.patch
 # These should make stable soon
 Patch533: for-v5.2-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
 
-# rhbz 1737046 temporary revert until issue is fixed upstream
-Patch535: 0001-Revert-for-bz-1737046.patch
-
 # rhbz 1730762
 Patch526: HID-input-fix-a4tech-horizontal-wheel-custom-usage.patch
 
-# rhbz 1737171
-Patch527: 1-1-netfilter-nf_tables-fix-module-autoload-for-redir.patch
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1838,6 +1832,9 @@ fi
 #
 #
 %changelog
+* Fri Aug 16 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.9-200
+- Linux v5.2.9
+
 * Sat Aug 10 2019 Justin M. Forbes <jforbes@redhat.com> - 5.2.8-200
 - Linux v5.2.8
 
diff --git a/sources b/sources
index 3f4026155..6829e2ef2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
-SHA512 (patch-5.2.8.xz) = 9f971b84ef83deb15f618c0d903806273fbe5b06ffbf47654c454b1da302132edc3159fd345b497f778062af5c47572ca77c0ea0580bd017d076db82ca897901