updpkg: kernels/linux-libre-xtreme 5.4.18-1

Signed-off-by: David P <megver83@parabola.nu>

4 files changed, 6 insertions, 266 deletions

diff --git a/kernels/linux-libre-xtreme/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch b/kernels/linux-libre-xtreme/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
deleted file mode 100644
index 8b8560a26..000000000
--- a/kernels/linux-libre-xtreme/0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a8b102fd92427e5151d0c61f632fbe19dbe950b6 Mon Sep 17 00:00:00 2001
-From: Boyan Ding <boyan.j.ding@gmail.com>
-Date: Wed, 1 Jan 2020 11:44:49 -0800
-Subject: [PATCH 11/14] pinctrl: sunrisepoint: Add missing Interrupt Status
- register offset
-
-Commit 179e5a6114cc ("pinctrl: intel: Remove default Interrupt Status
-offset") removes default interrupt status offset of GPIO controllers,
-with previous commits explicitly providing the previously default
-offsets. However, the is_offset value in SPTH_COMMUNITY is missing,
-preventing related irq from being properly detected and handled.
-
-Fixes: f702e0b93cdb ("pinctrl: sunrisepoint: Provide Interrupt Status register offset")
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=205745
-Cc: stable@vger.kernel.org
-Signed-off-by: Boyan Ding <boyan.j.ding@gmail.com>
----
- drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
-index 44d7f50bbc82..d936e7aa74c4 100644
---- a/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
-+++ b/drivers/pinctrl/intel/pinctrl-sunrisepoint.c
-@@ -49,6 +49,7 @@
- 		.padown_offset = SPT_PAD_OWN,		\
- 		.padcfglock_offset = SPT_PADCFGLOCK,	\
- 		.hostown_offset = SPT_HOSTSW_OWN,	\
-+		.is_offset = SPT_GPI_IS,		\
- 		.ie_offset = SPT_GPI_IE,		\
- 		.pin_base = (s),			\
- 		.npins = ((e) - (s) + 1),		\
--- 
-2.25.0
-
diff --git a/kernels/linux-libre-xtreme/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/kernels/linux-libre-xtreme/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
deleted file mode 100644
index 30dba72e9..000000000
--- a/kernels/linux-libre-xtreme/0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a5962f62a4174023fa53d6c74e64fa83032dca56 Mon Sep 17 00:00:00 2001
-From: Mehmet Akif Tasova <makiftasova@gmail.com>
-Date: Mon, 30 Dec 2019 15:48:16 +0200
-Subject: [PATCH 12/14] Revert "iwlwifi: mvm: fix scan config command size"
-
-Since v5.4-rc1 was released, iwlwifi started throwing errors when scan
-commands were sent to the firmware with certain devices (depending on
-the OTP burned in the device, which contains the list of available
-channels).  For instance:
-
-iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD
-
-This bug was reported in the ArchLinux bug tracker:
-https://bugs.archlinux.org/task/64703
-
-And also in a specific case in bugzilla, when the lar_disabled option
-was set: https://bugzilla.kernel.org/show_bug.cgi?id=205193
-
-Revert the commit that introduced this error, by using the number of
-channels from the OTP instead of the number of channels that is
-specified in the FW TLV that tells us how many channels it supports.
-
-This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b.
-
-Cc: stable@vger.kernel.org # v5.4+
-Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com>
-[ Luca: reworded the commit message a bit. ]
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
----
- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
-index fcafa22ec6ce..8aa567d7912c 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
-@@ -1220,7 +1220,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
- 		cmd_size = sizeof(struct iwl_scan_config_v2);
- 	else
- 		cmd_size = sizeof(struct iwl_scan_config_v1);
--	cmd_size += num_channels;
-+	cmd_size += mvm->fw->ucode_capa.n_scan_channels;
- 
- 	cfg = kzalloc(cmd_size, GFP_KERNEL);
- 	if (!cfg)
--- 
-2.25.0
-
diff --git a/kernels/linux-libre-xtreme/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/kernels/linux-libre-xtreme/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
deleted file mode 100644
index 677f38398..000000000
--- a/kernels/linux-libre-xtreme/0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From abfe541c371e84c6db50fd907c6a9941ee0a7da6 Mon Sep 17 00:00:00 2001
-From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-Date: Sat, 4 Jan 2020 23:29:22 -0800
-Subject: [PATCH 13/14] e1000e: Revert "e1000e: Make watchdog use delayed work"
-
-This reverts commit 59653e6497d16f7ac1d9db088f3959f57ee8c3db.
-
-This is due to this commit causing driver crashes and connections to
-reset unexpectedly.
-
-Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
----
- drivers/net/ethernet/intel/e1000e/e1000.h  |  5 +-
- drivers/net/ethernet/intel/e1000e/netdev.c | 54 ++++++++++------------
- 2 files changed, 27 insertions(+), 32 deletions(-)
-
-diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
-index 6c51b1bad8c4..37a2314d3e6b 100644
---- a/drivers/net/ethernet/intel/e1000e/e1000.h
-+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
-@@ -185,13 +185,12 @@ struct e1000_phy_regs {
- 
- /* board specific private data structure */
- struct e1000_adapter {
-+	struct timer_list watchdog_timer;
- 	struct timer_list phy_info_timer;
- 	struct timer_list blink_timer;
- 
- 	struct work_struct reset_task;
--	struct delayed_work watchdog_task;
--
--	struct workqueue_struct *e1000_workqueue;
-+	struct work_struct watchdog_task;
- 
- 	const struct e1000_info *ei;
- 
-diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
-index d7d56e42a6aa..060daf66bf63 100644
---- a/drivers/net/ethernet/intel/e1000e/netdev.c
-+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -1780,8 +1780,7 @@ static irqreturn_t e1000_intr_msi(int __always_unused irq, void *data)
- 		}
- 		/* guard against interrupt when we're going down */
- 		if (!test_bit(__E1000_DOWN, &adapter->state))
--			mod_delayed_work(adapter->e1000_workqueue,
--					 &adapter->watchdog_task, HZ);
-+			mod_timer(&adapter->watchdog_timer, jiffies + 1);
- 	}
- 
- 	/* Reset on uncorrectable ECC error */
-@@ -1861,8 +1860,7 @@ static irqreturn_t e1000_intr(int __always_unused irq, void *data)
- 		}
- 		/* guard against interrupt when we're going down */
- 		if (!test_bit(__E1000_DOWN, &adapter->state))
--			mod_delayed_work(adapter->e1000_workqueue,
--					 &adapter->watchdog_task, HZ);
-+			mod_timer(&adapter->watchdog_timer, jiffies + 1);
- 	}
- 
- 	/* Reset on uncorrectable ECC error */
-@@ -1907,8 +1905,7 @@ static irqreturn_t e1000_msix_other(int __always_unused irq, void *data)
- 		hw->mac.get_link_status = true;
- 		/* guard against interrupt when we're going down */
- 		if (!test_bit(__E1000_DOWN, &adapter->state))
--			mod_delayed_work(adapter->e1000_workqueue,
--					 &adapter->watchdog_task, HZ);
-+			mod_timer(&adapter->watchdog_timer, jiffies + 1);
- 	}
- 
- 	if (!test_bit(__E1000_DOWN, &adapter->state))
-@@ -4281,6 +4278,7 @@ void e1000e_down(struct e1000_adapter *adapter, bool reset)
- 
- 	napi_synchronize(&adapter->napi);
- 
-+	del_timer_sync(&adapter->watchdog_timer);
- 	del_timer_sync(&adapter->phy_info_timer);
- 
- 	spin_lock(&adapter->stats64_lock);
-@@ -5152,11 +5150,25 @@ static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
- 	}
- }
- 
-+/**
-+ * e1000_watchdog - Timer Call-back
-+ * @data: pointer to adapter cast into an unsigned long
-+ **/
-+static void e1000_watchdog(struct timer_list *t)
-+{
-+	struct e1000_adapter *adapter = from_timer(adapter, t, watchdog_timer);
-+
-+	/* Do the rest outside of interrupt context */
-+	schedule_work(&adapter->watchdog_task);
-+
-+	/* TODO: make this use queue_delayed_work() */
-+}
-+
- static void e1000_watchdog_task(struct work_struct *work)
- {
- 	struct e1000_adapter *adapter = container_of(work,
- 						     struct e1000_adapter,
--						     watchdog_task.work);
-+						     watchdog_task);
- 	struct net_device *netdev = adapter->netdev;
- 	struct e1000_mac_info *mac = &adapter->hw.mac;
- 	struct e1000_phy_info *phy = &adapter->hw.phy;
-@@ -5404,9 +5416,8 @@ static void e1000_watchdog_task(struct work_struct *work)
- 
- 	/* Reset the timer */
- 	if (!test_bit(__E1000_DOWN, &adapter->state))
--		queue_delayed_work(adapter->e1000_workqueue,
--				   &adapter->watchdog_task,
--				   round_jiffies(2 * HZ));
-+		mod_timer(&adapter->watchdog_timer,
-+			  round_jiffies(jiffies + 2 * HZ));
- }
- 
- #define E1000_TX_FLAGS_CSUM		0x00000001
-@@ -7259,21 +7270,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- 		goto err_eeprom;
- 	}
- 
--	adapter->e1000_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
--						   e1000e_driver_name);
--
--	if (!adapter->e1000_workqueue) {
--		err = -ENOMEM;
--		goto err_workqueue;
--	}
--
--	INIT_DELAYED_WORK(&adapter->watchdog_task, e1000_watchdog_task);
--	queue_delayed_work(adapter->e1000_workqueue, &adapter->watchdog_task,
--			   0);
--
-+	timer_setup(&adapter->watchdog_timer, e1000_watchdog, 0);
- 	timer_setup(&adapter->phy_info_timer, e1000_update_phy_info, 0);
- 
- 	INIT_WORK(&adapter->reset_task, e1000_reset_task);
-+	INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
- 	INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround);
- 	INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task);
- 	INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang);
-@@ -7367,9 +7368,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- 	return 0;
- 
- err_register:
--	flush_workqueue(adapter->e1000_workqueue);
--	destroy_workqueue(adapter->e1000_workqueue);
--err_workqueue:
- 	if (!(adapter->flags & FLAG_HAS_AMT))
- 		e1000e_release_hw_control(adapter);
- err_eeprom:
-@@ -7416,17 +7414,15 @@ static void e1000_remove(struct pci_dev *pdev)
- 	 */
- 	if (!down)
- 		set_bit(__E1000_DOWN, &adapter->state);
-+	del_timer_sync(&adapter->watchdog_timer);
- 	del_timer_sync(&adapter->phy_info_timer);
- 
- 	cancel_work_sync(&adapter->reset_task);
-+	cancel_work_sync(&adapter->watchdog_task);
- 	cancel_work_sync(&adapter->downshift_task);
- 	cancel_work_sync(&adapter->update_phy_task);
- 	cancel_work_sync(&adapter->print_hang_task);
- 
--	cancel_delayed_work(&adapter->watchdog_task);
--	flush_workqueue(adapter->e1000_workqueue);
--	destroy_workqueue(adapter->e1000_workqueue);
--
- 	if (adapter->flags & FLAG_HAS_HW_TIMESTAMP) {
- 		cancel_work_sync(&adapter->tx_hwtstamp_work);
- 		if (adapter->tx_hwtstamp_skb) {
--- 
-2.25.0
-
diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD
index 2619d3b39..a5db3028b 100644
--- a/kernels/linux-libre-xtreme/PKGBUILD
+++ b/kernels/linux-libre-xtreme/PKGBUILD
@@ -7,7 +7,7 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre-xtreme
-pkgver=5.4.13
+pkgver=5.4.18
 _hrdedrel=a
 pkgrel=1
 pkgdesc='Security-Hardened Linux-libre (with Apparmor by default)'
@@ -47,9 +47,9 @@ source=(
   0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
   0009-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
   0010-drm-i915-Limit-audio-CDCLK-2-BCLK-constraint-back-to.patch
-  0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
-  0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
-  0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
+  #0011-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+  #0012-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+  #0013-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
   0014-drm-amdgpu-Add-DC-feature-mask-to-disable-fractional.patch
 )
 source_armv7h=(
@@ -75,7 +75,7 @@ validpgpkeys=(
 )
 sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc701cd50af49c403ef0325adfcb07e354d5e46c1be3dcdd719a7a55c963f37'
             'SKIP'
-            '42d6dce820e801297bc05fbe23296e44d803c31bf023e9a30c57a39e8f1b2506d1c54f403494b05ed711ca54c90abe1731c1e2cfd7b7f54e4c9c253fc06bdab6'
+            'b05dfcf2ea677838c4442753478ef385860943842edd527deb7849b0db9b9663833ff1f360aae6d7bafab64e645268137204535fe8f575f50620b9c7a21182f2'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -99,11 +99,8 @@ sha512sums=('0d0915133864eb031adfc6700066147dcf3e768a50a31c39754950c95ef4fd322dc
             '74fa48f77088cffb3d9c442db2828ca5fa6534c144231e7ba07085c168f24206cc30b642ea2417fe7965cbf9f7f38445283637b3abf5d02150efd5752a073848'
             'cd04bdac9f0347a2fffda160e149b24b57d75e7b563700f576a32871b0b52ac7c04e1dcaf7ddabf4c5e886db9c7f09d32bbeb391384d3d5056da211b043dec9b'
             'd75549345dc622feb20beecabd06871d95037a7b8475427c2ad01f10c87ee01bc7d2a026262c4ba9efc053e5c58c099bb05cf6072afded8314acf795025da85f'
-            'ed3bfc8ca3bd23e17962ee4ad0943277b9451ffb6ccc467ac5c7ba86c85a220da7fbe2ab0b0887411089303210565ec66e141df0ca61e8566079a4312d519ee6'
-            '8e7bf1c70ae91ca3de031b0e12ea555028c94c2c9de35b72890a5f9d354b557d049fd3aeefa71ac29d466d8b679d70351eddda5cd5882992f2159d1c9ad00ad5'
-            '3bd1f7971fc4cea850115cabc429fa430ff20bc310030c7dd421e3c12b2ae2896047581da8371d4be14b9f201cb10fecb61425d73a04e7d4acc51bbc14d2e429'
             'f35ae1e4215f3dd5ce1680962e157f02807ed8151d98dc9c34570926ba713f3747957c199db65efa72691ac4ca1aaaa40dea69f35ec24be20a0f93f9156aaee7')
-sha512sums_x86_64=('3b689d27d4453d32a4f42a6095028be4fe034fc8ff23fb0a290a42dc85c48f83b604f04207abff444ad05c42559e38d518c40a79597b968200e5d9c8c2075833'
+sha512sums_x86_64=('20fadadaf284447286f62595f34eb9cac718dbab911b34848e5c1cdf88eb761eb821551c940f1501c40444199968bf6594b7f2d85d17ace5ffc8440ba587a142'
                    'SKIP')
 sha512sums_armv7h=('6d1e07ed008522faa61ad61491ba90bfd5aed97817825dc1f140ce3d099e091fbff2398936e7d6bbf7d04d5250dc73f622022f1dba9af1052c936cf72e4e934a'
                    'SKIP'