summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-QuZ-detection.patch60
-rw-r--r--0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch (renamed from 0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch)0
-rw-r--r--0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch (renamed from 0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch)0
-rw-r--r--0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch (renamed from 0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch)0
-rw-r--r--0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch (renamed from 0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch)0
-rw-r--r--0011-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch (renamed from 0012-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch)0
-rw-r--r--0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch (renamed from 0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch)0
-rw-r--r--0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch34
-rw-r--r--PKGBUILD72
9 files changed, 70 insertions, 96 deletions
diff --git a/0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-QuZ-detection.patch b/0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-QuZ-detection.patch
deleted file mode 100644
index 5278317..0000000
--- a/0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-QuZ-detection.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5cedf4aa8f59ed7c8fa1cf129731fbe86205cbea Mon Sep 17 00:00:00 2001
-From: Anders Kaseorg <andersk@mit.edu>
-Date: Mon, 2 Dec 2019 17:09:20 -0500
-Subject: Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection"
-
-This reverts commit 968dcfb4905245dc64d65312c0d17692fa087b99.
-
-Both that commit and commit 809805a820c6445f7a701ded24fdc6bbc841d1e4
-attempted to fix the same bug (dead assignments to the local variable
-cfg), but they did so in incompatible ways. When they were both merged,
-independently of each other, the combination actually caused the bug to
-reappear, leading to a firmware crash on boot for some cards.
-
-https://bugzilla.kernel.org/show_bug.cgi?id=205719
-
-Signed-off-by: Anders Kaseorg <andersk@mit.edu>
-Acked-by: Luca Coelho <luciano.coelho@intel.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-index 040cec17d3ad..b0b7eca1754e 100644
---- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
-@@ -1111,18 +1111,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-
- /* same thing for QuZ... */
- if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
-- if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)
-- iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;
-- else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
-- iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;
-- else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
-- iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
-- else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
-- iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
-- else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
-- iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
-- else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
-- iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
-+ if (cfg == &iwl_ax101_cfg_qu_hr)
-+ cfg = &iwl_ax101_cfg_quz_hr;
-+ else if (cfg == &iwl_ax201_cfg_qu_hr)
-+ cfg = &iwl_ax201_cfg_quz_hr;
-+ else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
-+ cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
-+ else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
-+ cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
-+ else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
-+ cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
-+ else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
-+ cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
- }
-
- #endif
---
-cgit v1.2.1-1-g437b
-
diff --git a/0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 7611c7a..7611c7a 100644
--- a/0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
diff --git a/0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch b/0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
index 6cb930a..6cb930a 100644
--- a/0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
+++ b/0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
diff --git a/0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch b/0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch
index 6ea75b6..6ea75b6 100644
--- a/0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch
+++ b/0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch
diff --git a/0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch b/0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch
index 7c46dbe..7c46dbe 100644
--- a/0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch
+++ b/0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch
diff --git a/0012-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch b/0011-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch
index 8d5b9ae..8d5b9ae 100644
--- a/0012-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch
+++ b/0011-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch
diff --git a/0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch b/0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
index 5ee3f39..5ee3f39 100644
--- a/0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+++ b/0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
diff --git a/0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch b/0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch
new file mode 100644
index 0000000..64afce3
--- /dev/null
+++ b/0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-register-offset.patch
@@ -0,0 +1,34 @@
+From adb810e1819b859aec1f8eb4c5611bc6ebe82137 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: 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), \
+--
+cgit v1.2.1-1-g437b
+
diff --git a/PKGBUILD b/PKGBUILD
index d1b6b0c..16337b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@
pkgbase=linux-ck
_supver=5
_majver=4
-_minver=7
+_minver=8
_gccpatchver='20190822'
_ckpatchversion=ck1
if [ "$_minver" == "0" ]; then
@@ -45,13 +45,13 @@ source=(
0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
- 0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-QuZ-detection.patch
- 0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
- 0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
- 0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch
- 0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch
- 0012-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch
- 0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+ 0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ 0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
+ 0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch
+ 0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch
+ 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
linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}.xz::http://ck.kolivas.org/patches/${_supver}.0/${_supver}.${_majver}/${_supver}.${_majver}-${_ckpatchversion}/patch-${_supver}.${_majver}-${_ckpatchversion}.xz
graysky_bdver2-hotfix.patch
kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
@@ -64,27 +64,27 @@ validpgpkeys=(
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
# https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256sums=('abc9b21d9146d95853dac35f4c4489a0199aff53ee6eee4b0563d1b37079fcc9'
- 'SKIP'
- '89db33f4292df124d7048329b113d57d928059ecf94abc7840983aeecaf747bd'
- 'f04a451706241e85f49d85c7d9bd892495b2e9d4eb0a353de333e375ed3b3d14'
- '15dcdeec72aa042ceb272326225d22dd5f934cd7fa0746924eced3eb4f77703e'
- '2d3afe3896644896510cd7a4694a94692a7ca8173006ce8eaa37c87abf2830c8'
- '4b3c1cab1ec9258e7632cbdf9bb289186b66d702ada3e5672275297b76f3b226'
- 'bd333d79a0f0a21f9da070e27f55786a0355036021b72e91757517daf6412a6d'
- '582999d7189c165bf2d6be2edde2aad4091f787ef16ca1d8bc3736c6871fe2f5'
- '2516be40fe063f7a448c69f170d628dbf549c3e084c2c7eb6910fd4782a6e73f'
- '1bcec07561c785e22ca43a140b07b586bc7717ea3c08e7549ec7a3bdfa39b7e2'
- 'e2084feabc3abeed37579ff515c367014356a652b85794b1612fea4daabe85d3'
- '988ffbb96d85564a9d96145e5973339a8f78ae95d919efb2ee7bb50f7a8e8fc9'
- '5257159e20a5fcb102a3b3ee6de33882a9e132e7f1d4345b8730effdd0240bb6'
- '03cb03ababc0365f14b7acce5c659438a78cc65a5be0c2349d449361fd54d267'
- 'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c'
- 'c5405139aa0a90a6f68f6a13e066a2bd0600c970f9f525cd3aa114b044a7f73b'
- '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
- 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
- '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
- '665bbc2099d7617e485dc597c56bd91a653e8c90acac0281396f8f1bd558370a')
+b2sums=('5b3c3bc7e2c866c3c30bb64ba503b96e1f65415a610c1426c5075c49bce0c1f42a47eafbd64b2314360850a8cb8d8e08430d2154349a145aee3d622d59a18036'
+ 'SKIP'
+ '8e25246725016ac6a1452592b092616aacba744ee6d1f87355b141011e31d91b2faca01494930a8bb4b816f92f86929098cc60bf786bdc68513e7bc572b06226'
+ '0e4e01200c6250c6d251d2cb38889e9f488e07b1014ea8c8f81182457cf057ce444b14e21afc786671115ec0b100e3ce9b32a5785c2b0b07b11d956887f477d3'
+ 'd3b62df935c6f5379b4c11f455a7231ffbab58857bdd650256499a702e54aaa729348054beb7742b90f145893622538aa4345c117238d46687ef6d07d62655da'
+ 'f2d71e3652594d7c23c87a952c40a3c2d394f6a621dce6a19a0463108695c55f5505d9526abb5283b74e3f84ae51283aeaf0e76a78e8e0133b0b07828def1d1d'
+ 'bf786a19dd0cc8572880f8339711fa173219b2cb9f44b2a4e48591671770c075706ea6db673ddd2cd49d42bdb2723e0161a704f77c761df5fdf31b033f45b6a0'
+ '8083144de9dcf8750a502589625d6d16c2316dfb01dddf6b502dbcf5d1632822ed1cee05e5eb0ecf58cd88726cda84b0ea493c1ab6df3a862886756aa78d540a'
+ '7a9081dee4774f8b2f51dcd980bfcd085ead77fb07915026044792bdf1c8831626173471a2c2cac0e1420fe7f23954b9101eab4884c78c33115f096cd5f560e9'
+ 'c5e15240574b97ab7beaba5b4ba50bdc6f618f8e1c7be0ad5a13b8ab7e36ab5ae52e71ec055e49cbed53ae54f92eb772de528f19c1d20f5a98914b4dae411f42'
+ 'f28183f6fd07ba0e6787e935d56dd683435e0bdd6e04cba717aa5b0da093d40a79a422f3398b813e41d70411cbd664045518050fd9b61a0350e75e36e747c345'
+ '7fc476dc0fef4d0a11c3f04c33a0350eae87115dcafcfb96a453112041ba88e1cf5a3535c95069568c849f04c356e2bde0686c8e5ba25be7a781b775f808a43c'
+ '9d1ad2023e9ffc92a4ccb6194a858267fbb6286c13784b8b8a2af3d5814abd0e4229409489f8a6bea5157193324dba58553ba03229169809bec73a8cc59c26ba'
+ 'da61a317ad2994f3c0cfe320cfd2d731eaa2aafe0a0fb52d3118e50a2a4299842e94b478a49bfb629a82571f50bcb6c52174808311711e3d3ee05df205881ab2'
+ '782f41ae6352cfc1c47ed54eddcded54969c7d43a326dc2d6593b373b4dc4672bc82a6d938090635dc02ef3b3b74e133a2170c7f9c6fd614641c7cb3b013ff2e'
+ '8faff0d2b95eda0b96e8042367634c45c1e823238e99793daeda5614efdc448dfe28172bf13f0d988cf4d5cbb4892089893e0183cd8825de7f54942283f2b5a0'
+ '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e'
+ '0b11c09e01a7480466d5237a8792c941c9af3e8d6584ffd84285cd9569f5355c10879566ce5846ef9263535020c53e1aa6c58100a571b537ccb7f2431baf7996'
+ '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
+ 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
+ 'd7a69e201352f7e8a1e311a03873f87478ef01fece82c040caec7043b9575f79b551274dc50a36b92870dcf74609b82b729a459a91f152e56d2284690de6d0a9')
#export KBUILD_BUILD_HOST=arc4linux
export KBUILD_BUILD_USER=$pkgbase
@@ -108,13 +108,13 @@ prepare() {
patch -p1 -i ../0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
patch -p1 -i ../0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
patch -p1 -i ../0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
- patch -p1 -i ../0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-QuZ-detection.patch
- patch -p1 -i ../0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
- patch -p1 -i ../0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
- patch -p1 -i ../0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch
- patch -p1 -i ../0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch
- patch -p1 -i ../0012-drm-i915-extend-audio-CDCLK-2BCLK-constraint-to-more-platforms.patch
- patch -p1 -i ../0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+ patch -p1 -i ../0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ patch -p1 -i ../0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
+ patch -p1 -i ../0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-suspend.patch
+ patch -p1 -i ../0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-display.patch
+ 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
# fix naming schema in EXTRAVERSION of ck patch set
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}"