[arch-commits] Commit in linux-hardened/trunk (6 files)

2018-08-17 Thread Levente Polyak via arch-commits 
Date: Friday, August 17, 2018 @ 16:35:52
  Author: anthraxx
Revision: 332101

upgpkg: linux-hardened 4.18.1.a-1

Added:
  linux-hardened/trunk/increase-timeout-in-lspcon_wait_mode.patch
Modified:
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config.x86_64
Deleted:
  
linux-hardened/trunk/ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch
  
linux-hardened/trunk/Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
  
linux-hardened/trunk/mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch

+
 ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch |  129 
 PKGBUILD   |   19 
 Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch |  242 -
 config.x86_64  |  284 +++
 increase-timeout-in-lspcon_wait_mode.patch |   23 
 mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch |   43 -
 6 files changed, 217 insertions(+), 523 deletions(-)

Deleted: ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch
===
--- ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch  2018-08-17 
16:26:30 UTC (rev 332100)
+++ ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch  2018-08-17 
16:35:52 UTC (rev 332101)
@@ -1,129 +0,0 @@
-From a0a37862a4e1844793d39aca9ccb8fecbdcb8659 Mon Sep 17 00:00:00 2001
-From: Mika Westerberg 
-Date: Tue, 22 May 2018 14:16:50 +0300
-Subject: [PATCH 3/3] ACPI / watchdog: Prefer iTCO_wdt always when WDAT table
- uses RTC SRAM
-
-After we added quirk for Lenovo Z50-70 it turns out there are at least
-two more systems where WDAT table includes instructions accessing RTC
-SRAM. Instead of quirking each system separately, look for such
-instructions in the table and automatically prefer iTCO_wdt if found.
-
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033
-Reported-by: Arnold Guy 
-Reported-by: Alois Nespor 
-Reported-by: Yury Pakin 
-Reported-by: Ihor Chyhin 
-Signed-off-by: Mika Westerberg 
-Acked-by: Guenter Roeck 

- drivers/acpi/acpi_watchdog.c | 72 ++--
- 1 file changed, 45 insertions(+), 27 deletions(-)
-
-diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
-index 4bde16fb97d8..95600309ce42 100644
 a/drivers/acpi/acpi_watchdog.c
-+++ b/drivers/acpi/acpi_watchdog.c
-@@ -12,54 +12,72 @@
- #define pr_fmt(fmt) "ACPI: watchdog: " fmt
- 
- #include 
--#include 
- #include 
- #include 
- 
- #include "internal.h"
- 
--static const struct dmi_system_id acpi_watchdog_skip[] = {
--  {
--  /*
--   * On Lenovo Z50-70 there are two issues with the WDAT
--   * table. First some of the instructions use RTC SRAM
--   * to store persistent information. This does not work well
--   * with Linux RTC driver. Second, more important thing is
--   * that the instructions do not actually reset the system.
--   *
--   * On this particular system iTCO_wdt seems to work just
--   * fine so we prefer that over WDAT for now.
--   *
--   * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033.
--   */
--  .ident = "Lenovo Z50-70",
--  .matches = {
--  DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--  DMI_MATCH(DMI_PRODUCT_NAME, "20354"),
--  DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Z50-70"),
--  },
--  },
--  {}
--};
-+#ifdef CONFIG_RTC_MC146818_LIB
-+#include 
-+
-+/*
-+ * There are several systems where the WDAT table is accessing RTC SRAM to
-+ * store persistent information. This does not work well with the Linux RTC
-+ * driver so on those systems we skip WDAT driver and prefer iTCO_wdt
-+ * instead.
-+ *
-+ * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033.
-+ */
-+static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat)
-+{
-+  const struct acpi_wdat_entry *entries;
-+  int i;
-+
-+  entries = (struct acpi_wdat_entry *)(wdat + 1);
-+  for (i = 0; i < wdat->entries; i++) {
-+  const struct acpi_generic_address *gas;
-+
-+  gas = [i].register_region;
-+  if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
-+  switch (gas->address) {
-+  case RTC_PORT(0):
-+  case RTC_PORT(1):
-+  case RTC_PORT(2):
-+  case RTC_PORT(3):
-+  return true;
-+  }
-+  }
-+  }
-+
-+  return false;
-+}
-+#else
-+static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat)
-+{
-+  return false;
-+}
-+#endif
- 
- static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void)
-

[arch-commits] Commit in linux-hardened/trunk (6 files)

2017-12-13 Thread Levente Polyak via arch-commits 
Date: Wednesday, December 13, 2017 @ 09:46:19
  Author: anthraxx
Revision: 274191

upgpkg: linux-hardened 4.14.5.a-1

Added:
  linux-hardened/trunk/60-linux.hook
Modified:
  linux-hardened/trunk/90-linux.hook
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config.x86_64
  linux-hardened/trunk/linux.install
Deleted:
  
linux-hardened/trunk/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch

-+
 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch |   38 
 60-linux.hook   |   12 
 90-linux.hook   |2 
 PKGBUILD|   90 +-
 config.x86_64   |  449 
--
 linux.install   |   16 
 6 files changed, 433 insertions(+), 174 deletions(-)

Deleted: 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
===
--- 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch 
2017-12-13 09:45:59 UTC (rev 274190)
+++ 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch 
2017-12-13 09:46:19 UTC (rev 274191)
@@ -1,38 +0,0 @@
-From 34bc85a1577be5f2f6ccd2c17fc5870c83ab510b Mon Sep 17 00:00:00 2001
-Message-Id: 
<34bc85a1577be5f2f6ccd2c17fc5870c83ab510b.1510965801.git.jan.steff...@gmail.com>
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= 
-Date: Fri, 3 Nov 2017 03:01:53 +0100
-Subject: [PATCH] platform/x86: hp-wmi: Fix tablet mode detection for
- convertibles
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet
-state fetchers") consolidated the methods for docking and laptop mode
-detection, but omitted to apply the correct mask for the laptop mode
-(it always uses the constant for docking).
-
-Fixes: f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet state 
fetchers")
-Signed-off-by: Stefan Brüns 
-Signed-off-by: Andy Shevchenko 

- drivers/platform/x86/hp-wmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
-index b4ed3dc983d5229c..b4224389febebe46 100644
 a/drivers/platform/x86/hp-wmi.c
-+++ b/drivers/platform/x86/hp-wmi.c
-@@ -297,7 +297,7 @@ static int hp_wmi_hw_state(int mask)
-   if (state < 0)
-   return state;
- 
--  return state & 0x1;
-+  return !!(state & mask);
- }
- 
- static int __init hp_wmi_bios_2008_later(void)
--- 
-2.15.0
-

Added: 60-linux.hook
===
--- 60-linux.hook   (rev 0)
+++ 60-linux.hook   2017-12-13 09:46:19 UTC (rev 274191)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/modules/%KERNVER%/*
+Target = usr/lib/modules/%EXTRAMODULES%/*
+
+[Action]
+Description = Updating %PKGBASE% module dependencies...
+When = PostTransaction
+Exec = /usr/bin/depmod %KERNVER%

Modified: 90-linux.hook
===
--- 90-linux.hook   2017-12-13 09:45:59 UTC (rev 274190)
+++ 90-linux.hook   2017-12-13 09:46:19 UTC (rev 274191)
@@ -6,6 +6,6 @@
 Target = usr/lib/initcpio/*
 
 [Action]
-Description = Updating %PKGBASE% initcpios
+Description = Updating %PKGBASE% initcpios...
 When = PostTransaction
 Exec = /usr/bin/mkinitcpio -p %PKGBASE%

Modified: PKGBUILD
===
--- PKGBUILD2017-12-13 09:45:59 UTC (rev 274190)
+++ PKGBUILD2017-12-13 09:46:19 UTC (rev 274191)
@@ -5,7 +5,7 @@
 
 pkgbase=linux-hardened
 _srcname=linux-4.14
-_pkgver=4.14.3
+_pkgver=4.14.5
 pkgver=${_pkgver}.a
 pkgrel=1
 url='https://github.com/copperhead/linux-hardened'
@@ -18,31 +18,27 @@
 https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.xz
 https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.sign
 
https://github.com/thestinger/${pkgbase}/releases/download/${pkgver}/${pkgbase}-${pkgver}.patch{,.sig}
-# the main kernel config files
-config.x86_64
-# pacman hook for initramfs regeneration
-90-linux.hook
-# standard config files for mkinitcpio ramdisk
-linux.preset
-0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch)
+config.x86_64  # the main kernel config files
+60-linux.hook  # pacman hook for depmod
+90-linux.hook  # pacman hook for initramfs regeneration
+linux.preset   # standard config files for mkinitcpio ramdisk
+)
 replaces=('linux-grsec')
-