forked from JeremyStarTM/aur-linux-clear
5.4.18-1 (clr 5.4.17-901) wireguard-20200205, drop revert e1000e patch
This commit is contained in:
Josip Ponjavic
parent
0644815d3b
commit
d2af57e20f
3 changed files with 12 additions and 171 deletions
14
.SRCINFO
14
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = linux-clear
|
||||
pkgdesc = Clear Linux
|
||||
pkgver = 5.4.17
|
||||
pkgver = 5.4.18
|
||||
pkgrel = 1
|
||||
url = https://github.com/clearlinux-pkgs/linux
|
||||
arch = x86_64
|
||||
|
|
@ -14,24 +14,22 @@ pkgbase = linux-clear
|
|||
options = !strip
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.17.xz
|
||||
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.15-899
|
||||
source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-0.0.20200128.tar.xz
|
||||
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.18.xz
|
||||
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.4.17-901
|
||||
source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-0.0.20200205.tar.xz
|
||||
source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
|
||||
source = pci-enable-overrides-for-missing-acs-capabilities.patch
|
||||
source = futex-wait-multiple-5.2.1.patch::https://aur.archlinux.org/cgit/aur.git/plain/futex-wait-multiple-5.2.1.patch?h=linux-fsync
|
||||
source = Revert-e1000e-5.4.patch
|
||||
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
|
||||
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
|
||||
sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
|
||||
sha256sums = SKIP
|
||||
sha256sums = 8f7c4628793d6ff225fc5b7d622b8a2ee90ccbaea8eb0dd917821be460a053fe
|
||||
sha256sums = 88a35b9b03bf4ffe5b043baccc9655a80c24e67a64f2dcd7f9bb29c8faa37f3f
|
||||
sha256sums = SKIP
|
||||
sha256sums = 8610c6d8712cfd885f50b1a8c572518edf318c094d68491ea218bb50566a9a8a
|
||||
sha256sums = 9669e165fc7252cab7f908ba57f160f6d57539b7cc81180f260cb675d2fd362b
|
||||
sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
|
||||
sha256sums = 4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0
|
||||
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
|
||||
sha256sums = f774eb33e8457d2f64852200654cc8c9e0f7ebe1264771c0b6dbc221ec3b9a3f
|
||||
|
||||
pkgname = linux-clear
|
||||
pkgdesc = The Clear Linux kernel and modules
|
||||
|
|
|
|||
14
PKGBUILD
14
PKGBUILD
|
|
@ -66,9 +66,9 @@ _use_current=
|
|||
### IMPORTANT: Do no edit below this line unless you know what you're doing
|
||||
|
||||
_major=5.4
|
||||
_minor=17
|
||||
_minor=18
|
||||
_srcname=linux-${_major}
|
||||
_clr=${_major}.15-899
|
||||
_clr=${_major}.17-901
|
||||
pkgbase=linux-clear
|
||||
pkgver=${_major}.${_minor}
|
||||
pkgrel=1
|
||||
|
|
@ -78,7 +78,7 @@ url="https://github.com/clearlinux-pkgs/linux"
|
|||
license=('GPL2')
|
||||
makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto')
|
||||
options=('!strip')
|
||||
_wrg_snap='0.0.20200128'
|
||||
_wrg_snap='0.0.20200205'
|
||||
_gcc_more_v='20190822'
|
||||
source=(
|
||||
"https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
|
||||
|
|
@ -89,7 +89,6 @@ source=(
|
|||
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
|
||||
'pci-enable-overrides-for-missing-acs-capabilities.patch'
|
||||
'futex-wait-multiple-5.2.1.patch::https://aur.archlinux.org/cgit/aur.git/plain/futex-wait-multiple-5.2.1.patch?h=linux-fsync'
|
||||
'Revert-e1000e-5.4.patch'
|
||||
)
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
|
|
@ -359,13 +358,12 @@ done
|
|||
|
||||
sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
|
||||
'SKIP'
|
||||
'8f7c4628793d6ff225fc5b7d622b8a2ee90ccbaea8eb0dd917821be460a053fe'
|
||||
'88a35b9b03bf4ffe5b043baccc9655a80c24e67a64f2dcd7f9bb29c8faa37f3f'
|
||||
'SKIP'
|
||||
'8610c6d8712cfd885f50b1a8c572518edf318c094d68491ea218bb50566a9a8a'
|
||||
'9669e165fc7252cab7f908ba57f160f6d57539b7cc81180f260cb675d2fd362b'
|
||||
'8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
|
||||
'4127910703ed934224941114c2a4e0bcc5b4841f46d04063ed7b20870a51baa0'
|
||||
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942'
|
||||
'f774eb33e8457d2f64852200654cc8c9e0f7ebe1264771c0b6dbc221ec3b9a3f')
|
||||
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
|
||||
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
|
|
|
|||
|
|
@ -1,155 +0,0 @@
|
|||
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) {
|
||||
Loading…
Reference in a new issue