Updated to 5.4.10.a

3 files changed, 231 insertions, 3 deletions

diff --git a/0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
new file mode 100644
index 0000000..5cf14e3
--- /dev/null
+++ b/0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
@@ -0,0 +1,48 @@
+From 78fe4d666ff244609c7d02bea07a22ce87e56326 Mon Sep 17 00:00:00 2001
+From: Mehmet Akif Tasova <makiftasova@gmail.com>
+Date: Mon, 30 Dec 2019 15:48:16 +0200
+Subject: 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)
+-- 
+cgit v1.2.1-1-g437b
+
diff --git a/0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
new file mode 100644
index 0000000..52e42b2
--- /dev/null
+++ b/0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
@@ -0,0 +1,174 @@
+From 195bb1762da1aa1c1beffe402353afd619ea7338 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: 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 @@ link_up:
+ 
+ 	/* 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) {
+-- 
+cgit v1.2.1-1-g437b
+
diff --git a/PKGBUILD b/PKGBUILD
index 6befcec..58a8343 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ _pkgbase=linux-hardened
 pkgbase=linux-libre-hardened
 _supver=5
 _majver=4
-_minver=8
+_minver=10
 _hardenedver=a
 _gccpatchver='20190822'
   if [ "$_minver" == "0" ]; then
@@ -58,6 +58,8 @@ source=(
   0011-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch
   0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
   0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch
+  0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+  0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
   https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.patch{,.sig}
   graysky_bdver2-hotfix.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
@@ -71,7 +73,7 @@ validpgpkeys=(
 )
 sha256sums=('d56d4db5a539058382b500c9d8ebec1f76964647220eb3ed107f49c9dabecbab'
             'SKIP'
-            '0707ad336d99cdbcba61101ca22d290ce75c6d3b5178e1aa2aee26e2c950c478'
+            '47f29ee08459bcb50f5e16f2d73142e6d4cb5ab9de66ab576a2b8a3f44ac84ad'
             'SKIP'
             'f04a451706241e85f49d85c7d9bd892495b2e9d4eb0a353de333e375ed3b3d14'
             '15dcdeec72aa042ceb272326225d22dd5f934cd7fa0746924eced3eb4f77703e'
@@ -85,7 +87,9 @@ sha256sums=('d56d4db5a539058382b500c9d8ebec1f76964647220eb3ed107f49c9dabecbab'
             '5257159e20a5fcb102a3b3ee6de33882a9e132e7f1d4345b8730effdd0240bb6'
             '03cb03ababc0365f14b7acce5c659438a78cc65a5be0c2349d449361fd54d267'
             '33ec2170ace6b4f7dbc1cc751110d325d8619202d0f312587adbc4bef7a045ce'
-            '08f37a33ab9bca30f6fea22fce1273cd6a169be81f8660d55c256bc13a793c19'
+            '54104b9118d9151379589f0b95bce38aaea5d7068e80e7ab5dbdad0b73d7b1b7'
+            'f9464bc1980e54f6d090f20658907318456c2d86654c8681fd518083c2596be7'
+            '03eb363cfb3e040b6ad54bd134b99cc58f45a7a4ae1faa6fb1d64ee450184f8c'
             'SKIP'
             'c5405139aa0a90a6f68f6a13e066a2bd0600c970f9f525cd3aa114b044a7f73b'
             '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
@@ -121,6 +125,8 @@ prepare() {
   patch -p1 -i ../0011-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch
   patch -p1 -i ../0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
   patch -p1 -i ../0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch
+  patch -p1 -i ../0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+  patch -p1 -i ../0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
 
 
   # linux hardened patch