diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 6 | ||||
| -rw-r--r-- | 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch | 10 | ||||
| -rw-r--r-- | 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch | 132 | ||||
| -rw-r--r-- | PKGBUILD | 27 |
5 files changed, 172 insertions, 27 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-gc - pkgver = 4.17 - pkgrel = 2 + pkgver = 4.17.1 + pkgrel = 1 url = http://cchalpha.blogspot.co.uk/ arch = x86_64 license = GPL2 @@ -11,26 +11,32 @@ pkgbase = linux-gc options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.1.sign source = config source = 60-linux.hook source = 90-linux.hook source = linux.preset source = enable_additional_cpu_optimizations-20180509.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180509.tar.gz - source = v4.17_pds098q.patch::https://bitbucket.org/alfredchen/linux-gc/downloads/v4.17_pds098q.patch + source = v4.17_pds098r.patch::https://raw.githubusercontent.com/cchalpha/PDS-mq/master/4.17/v4.17_pds098r.patch source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + source = 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13 sha256sums = SKIP + sha256sums = 31f2f5309d99db632160538d43cf737166ae8b24c1b8091522ca1f9a804c25a1 + sha256sums = SKIP sha256sums = 1da121e11032e99124e24ab42f5b97bf5c1883f468b40ce78a2144a2ebdc91bf sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d - sha256sums = 03c458dacd99dab4d8ea8fbbe449fd280184a25fc3cb200103eb40deb4b9e55a - sha256sums = 0b77e6bef12735bc91e3f0e8232512e973688466f2e8a2c3a93502cb2d4b4eed - sha256sums = 92615acad59cbef9fd43b2710f5a77ffea45a86543ccff1b12eb676a9c8058cc + sha256sums = 4f95570ecf6da52f150b9721684cd172b3b551b17ecc70020e07f0db16b6f0cd + sha256sums = e3c08f9b91611186e5ec579187ecea2a0143e5c2dc7ffc30ac6ea6e2b6d130fd + sha256sums = 5403dead9161344b2c01027526146a250147680f4a2d32a54d40c55fc1becc8a + sha256sums = d55e7de60b12bca26ded4c1bb8eb5860a9092374914a201a0f6a0ed2849d099f pkgname = linux-gc pkgdesc = The Linux-gc kernel and modules with the PDS-mq CPU scheduler @@ -40,12 +46,12 @@ pkgname = linux-gc depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = linux-gc=4.17 + provides = linux-gc=4.17.1 backup = etc/mkinitcpio.d/linux-gc.preset pkgname = linux-gc-headers pkgdesc = Header files and scripts for building modules for Linux-gc kernel depends = linux-gc - provides = linux-gc-headers=4.17 - provides = linux-headers=4.17 + provides = linux-gc-headers=4.17.1 + provides = linux-headers=4.17.1 diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 3db4ddd66983..ef2a8aa685c8 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,8 @@ -From b7e3d341f20581dcd72d3640fa8f6f99fd766d21 Mon Sep 17 00:00:00 2001 -Message-Id: <b7e3d341f20581dcd72d3640fa8f6f99fd766d21.1528140572.git.jan.steffens@gmail.com> +From 9a5adbc45b1c7d43fe4b27936f2a6939660617a1 Mon Sep 17 00:00:00 2001 +Message-Id: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by +Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> diff --git a/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch index 83ac849027ed..8d44c5532a8b 100644 --- a/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch +++ b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -1,10 +1,10 @@ -From 997fbfe5508bc7d29fdf0a7a103f3864d4db380a Mon Sep 17 00:00:00 2001 -Message-Id: <997fbfe5508bc7d29fdf0a7a103f3864d4db380a.1528140572.git.jan.steffens@gmail.com> -In-Reply-To: <b7e3d341f20581dcd72d3640fa8f6f99fd766d21.1528140572.git.jan.steffens@gmail.com> -References: <b7e3d341f20581dcd72d3640fa8f6f99fd766d21.1528140572.git.jan.steffens@gmail.com> +From 6cc33158e691a70111672a6105c7a37e66e6d3c3 Mon Sep 17 00:00:00 2001 +Message-Id: <6cc33158e691a70111672a6105c7a37e66e6d3c3.1528777685.git.jan.steffens@gmail.com> +In-Reply-To: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> +References: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> From: Jani Nikula <jani.nikula@intel.com> Date: Wed, 16 May 2018 11:01:10 +0300 -Subject: [PATCH 2/2] Revert "drm/i915/edp: Allow alternate fixed mode for eDP +Subject: [PATCH 2/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP if available." This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e. diff --git a/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch b/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch new file mode 100644 index 000000000000..b4db2ad36a1e --- /dev/null +++ b/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch @@ -0,0 +1,132 @@ +From 1e45a10dbea00f3a9ead21a9b3d25ad00021261d Mon Sep 17 00:00:00 2001 +Message-Id: <1e45a10dbea00f3a9ead21a9b3d25ad00021261d.1528777685.git.jan.steffens@gmail.com> +In-Reply-To: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> +References: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> +From: Mika Westerberg <mika.westerberg@linux.intel.com> +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 <aurnoldg@gmail.com> +Reported-by: Alois Nespor <nespor@fssp.cz> +Reported-by: Yury Pakin <zxwarior@gmail.com> +Reported-by: Ihor Chyhin <ihorchyhin@ukr.net> +Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> +Acked-by: Guenter Roeck <linux@roeck-us.net> +--- + 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 <linux/acpi.h> +-#include <linux/dmi.h> + #include <linux/ioport.h> + #include <linux/platform_device.h> + + #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 <linux/mc146818rtc.h> ++ ++/* ++ * 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 = &entries[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) + { + const struct acpi_table_wdat *wdat = NULL; + acpi_status status; + + if (acpi_disabled) + return NULL; + +- if (dmi_check_system(acpi_watchdog_skip)) +- return NULL; +- + status = acpi_get_table(ACPI_SIG_WDAT, 0, + (struct acpi_table_header **)&wdat); + if (ACPI_FAILURE(status)) { + /* It is fine if there is no WDAT */ + return NULL; + } + ++ if (acpi_watchdog_uses_rtc(wdat)) { ++ pr_info("Skipping WDAT on this system because it uses RTC SRAM\n"); ++ return NULL; ++ } ++ + return wdat; + } + +-- +2.17.1 + @@ -32,27 +32,28 @@ _localmodcfg= pkgbase=linux-gc _srcname=linux-4.17 -pkgver=4.17 -pkgrel=2 -_pdsversion=098q +pkgver=4.17.1 +pkgrel=1 +_pdsversion=098r arch=('x86_64') url="http://cchalpha.blogspot.co.uk/" license=('GPL2') makedepends=('kmod' 'inetutils' 'bc' 'libelf') options=('!strip') -_psd_patch="v${pkgver}_pds${_pdsversion}.patch" +_psd_patch="v${_srcname#*-}_pds${_pdsversion}.patch" _gcc_more_v='20180509' source=( https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign} - #https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign} + https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign} config # the main kernel config file 60-linux.hook # pacman hook for depmod 90-linux.hook # pacman hook for initramfs regeneration linux.preset # standard config files for mkinitcpio ramdisk "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz" # enable_additional_cpu_optimizations_for_gcc - "$_psd_patch::https://bitbucket.org/alfredchen/linux-gc/downloads/${_psd_patch}" + "$_psd_patch::https://raw.githubusercontent.com/cchalpha/PDS-mq/master/${_srcname#*-}/${_psd_patch}" 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -60,14 +61,17 @@ validpgpkeys=( ) sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13' 'SKIP' + '31f2f5309d99db632160538d43cf737166ae8b24c1b8091522ca1f9a804c25a1' + 'SKIP' '1da121e11032e99124e24ab42f5b97bf5c1883f468b40ce78a2144a2ebdc91bf' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' - '03c458dacd99dab4d8ea8fbbe449fd280184a25fc3cb200103eb40deb4b9e55a' - '0b77e6bef12735bc91e3f0e8232512e973688466f2e8a2c3a93502cb2d4b4eed' - '92615acad59cbef9fd43b2710f5a77ffea45a86543ccff1b12eb676a9c8058cc') + '4f95570ecf6da52f150b9721684cd172b3b551b17ecc70020e07f0db16b6f0cd' + 'e3c08f9b91611186e5ec579187ecea2a0143e5c2dc7ffc30ac6ea6e2b6d130fd' + '5403dead9161344b2c01027526146a250147680f4a2d32a54d40c55fc1becc8a' + 'd55e7de60b12bca26ded4c1bb8eb5860a9092374914a201a0f6a0ed2849d099f') _kernelname=${pkgbase#linux} @@ -75,7 +79,7 @@ prepare() { cd ${_srcname} # add upstream patch - #patch -p1 -i ../patch-${pkgver} + patch -p1 -i ../patch-${pkgver} # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -86,6 +90,9 @@ prepare() { # https://bugs.archlinux.org/task/56711 patch -Np1 -i ../0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch + # https://bugs.archlinux.org/task/56780 + patch -Np1 -i ../0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch + # Patch source with PDS scheduler patch -Np1 -i "../${_psd_patch}" |