summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO30
-rw-r--r--0001-ALSA-hda-realtek-gu604.patch42
-rw-r--r--0038-mediatek-pci-reset.patch110
-rw-r--r--PKGBUILD29
4 files changed, 146 insertions, 65 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 763d27094e0d..633751216e1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-g14
pkgdesc = Linux
- pkgver = 6.3.6.arch1
+ pkgver = 6.3.8.arch1
pkgrel = 1
url = https://gitlab.com/dragonn/linux-g14.git
arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = linux-g14
makedepends = xz
makedepends = python
options = !strip
- source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v6.3.6-arch1
+ source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v6.3.8-arch1
source = config
source = choose-gcc-optimization.sh
source = sys-kernel_arch-sources-g14_files-0004-5.17+--more-uarches-for-kernel.patch::https://raw.githubusercontent.com/graysky2/kernel_compiler_patch/master/more-uarches-for-kernel-5.17+.patch
@@ -31,7 +31,6 @@ pkgbase = linux-g14
source = 0035-Add_quirk_for_polling_the_KBD_port.patch
source = 0036-Block_a_rogue_device_on_ASUS_TUF_A16.patch
source = 0001-ACPI-resource-Skip-IRQ-override-on-ASUS-TUF-Gaming-A.patch
- source = 0001-ALSA-hda-realtek-gu604.patch
source = 0001-HID-amd_sfh-Add-support-for-tablet-mode-switch-senso.patch
source = 0002-ACPI-resource-Skip-IRQ-override-on-ASUS-TUF-Gaming-A.patch
source = 0003-HID-asus-Add-support-for-ASUS-ROG-Z13-keyboard.patch
@@ -43,6 +42,7 @@ pkgbase = linux-g14
source = 0009-platform-x86-asus-wmi-support-middle-fan-custom-curv.patch
source = 0010-platform-x86-asus-wmi-add-WMI-method-to-show-if-egpu.patch
source = 0011-platform-x86-asus-wmi-support-setting-mini-LED-mode.patch
+ source = 0038-mediatek-pci-reset.patch
source = sys-kernel_arch-sources-g14_files-0047-asus-nb-wmi-Add-tablet_mode_sw-lid-flip.patch
source = sys-kernel_arch-sources-g14_files-0048-asus-nb-wmi-fix-tablet_mode_sw_int.patch
source = sys-kernel_arch-sources-g14_files-0049-ALSA-hda-realtek-Add-quirk-for-ASUS-M16-GU603H.patch
@@ -55,22 +55,28 @@ pkgbase = linux-g14
sha256sums = bc8b5f303e3507c01d8543fb4352ed7dcdb9ed4eb2854788d39510f88d67f454
sha256sums = 81ad663925a0aa5b5332a69bae7227393664bb81ee2e57a283e7f16e9ff75efe
sha256sums = 0a7ea482fe20c403788d290826cec42fe395e5a6eab07b88845f8b9a9829998d
- sha256sums = d45e2ae1d21b1dc8e0de94a4fa58e9a53d72306843f87d3cc49f5f641399d8e3
sha256sums = 172dbc88d0a3cda78387f3c907fa4953c71cb1cb162f0b34f78b8b78924bc3d4
sha256sums = a691e7b22633fe0c458d140167d6d381b66149e05de3cb926b30a19fd43e78ce
sha256sums = 7b16fce20b03babc9e149030f43e283534835bbd8835ba0a794fd0205fea1708
sha256sums = efbf65b17fb48fd22f199b6fddd05f159f8ea31faad5543f2c07fddf45eb9f12
sha256sums = d4f8e606eaad9a1fe302f04b9023a3980eb2305108c0d8c90654d23e53ff8bef
- sha256sums = 8614c92567822e38ac7a0893e93776f39bbb6d373797f4b713cef5b3c060c8f1
sha256sums = cdbcec3031878cdb7ffab32034e4ee31bbd0ec214088f95dc446a13320985631
- sha256sums = ec3cced4d3d5de4827e07430a77fcba755d84b9cfded09dc0b6be46e28427f22
sha256sums = a8e1e11a4ab1995cc4975c9b134a43ddfe7054ef0c965e52a7d8f9223e15c3e0
- sha256sums = 14f695b481e1afc4ac8c79ef48f0613267c86d1862f3293d889f6f68e1b84188
- sha256sums = 93b7ad2dd6b172d487d5e37847027f5854cae0c7291bc643d890045692903bab
- sha256sums = 04167065497211326a3a6f83519111e2f81273c848143d300e7e3e91062c061b
- sha256sums = 185ccdbfa7d4a0a3c55412082d87c5965221a73442f076d396f1e8cc0aabece1
- sha256sums = e20f3d11077c9abe8cc41c61378abd6b3fbd5059497a01baa881a810f1c91eb0
- sha256sums = 22ae0fb68016064ce32d5a32235d463b6e65eff2af83fe70be976cf39b1a9623
+ sha256sums = 315d1839630b37894a626bbc2aea012618b2e1ccb6f9d8aa27c0a3ce5e90e99c
+ sha256sums = 1740589bbf5eb2c292904e508270ed221e1382f78bcb7cf1c72f1dc12f767e69
+ sha256sums = a00b952d53df9d3617d93e8fba4146a4d6169ebe79f029b3a55cca68f738d8ea
+ sha256sums = 829e09c0ac6f21ca68114e406754c7645921df189d38a0ba34c93784303e1c23
+ sha256sums = 4912b1319e46ddd6670147f5e878b4aca8bcfbd7b5c852fe11e434e424666365
+ sha256sums = 655a7650a21ce4f725caf6fa248295edefa25a248aeaecf3d65a058503ae2530
+ sha256sums = 7ce4b001a81b15b5b5275620fc0cee3d251d753698ae3db4593619a2121e1f2e
+ sha256sums = c7d44e1eb82b4711b4cc86016a1886a573f1abc893dbdd201d4a6d0326859b85
+ sha256sums = 66ee16ec4e39973905905d66eb043a55fdeaae470902be6adf893ce1a4ac4cbe
+ sha256sums = 2c6b2efef195cc54d641374cad669884dede99a8b934e2b2b168c6ae35554f2c
+ sha256sums = 73db9582e8d5fa41a1a7ed38bd0a012cd28573d1d2eda44152ce13477bdd7999
+ sha256sums = c7430e0ad27f9a1cd1677da1a7471dcf63088cb21cd943427454889c69e7f829
+ sha256sums = 976abe70d2a1604ce2335a7d7ce5d9722db93e389413a0b6a7f3ea72f795b65b
+ sha256sums = 8a0ee3fbb3c95cd4d5cedd62517384374462d5157f3104013e5cbe6d91317e95
+ sha256sums = a768687d858b608c01e22664817a80602e8c17911487fac71430f70b0c52b9f9
sha256sums = 15e912a66e4bbce1cf0450f1dc6610653df29df8dd6d5426f9c1b039490436c8
sha256sums = 444f2d86de8c2177655b01596f939f99c2e7abfa8efad8a509e0a334f42dfa85
sha256sums = 982a31e47d3d586789e1b3cdda25f75e3b71d810e7494202089b8f2cef7c0ef9
diff --git a/0001-ALSA-hda-realtek-gu604.patch b/0001-ALSA-hda-realtek-gu604.patch
deleted file mode 100644
index cee95e3b5eb0..000000000000
--- a/0001-ALSA-hda-realtek-gu604.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/sound/pci/hda/patch_realtek.c 2023-04-20 20:40:17.786527496 +0300
-+++ b/sound/pci/hda/patch_realtek.c 2023-04-20 20:25:02.524458831 +0300
-@@ -7061,6 +7061,8 @@
- ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
- ALC295_FIXUP_DISABLE_DAC3,
- ALC285_FIXUP_SPEAKER2_TO_DAC1,
-+ ALC285_FIXUP_ASUS_HEADSET_MIC,
-+ ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1,
- ALC280_FIXUP_HP_HEADSET_MIC,
- ALC221_FIXUP_HP_FRONT_MIC,
- ALC292_FIXUP_TPT460,
-@@ -8008,6 +8010,22 @@
- .chained = true,
- .chain_id = ALC269_FIXUP_THINKPAD_ACPI
- },
-+ [ALC285_FIXUP_ASUS_HEADSET_MIC] = {
-+ .type = HDA_FIXUP_PINS,
-+ .v.pins = (const struct hda_pintbl[]) {
-+ { 0x19, 0x03a11050 },
-+ { 0x1b, 0x03a11c30 },
-+ { }
-+ },
-+ .chained = true,
-+ .chain_id = ALC245_FIXUP_CS35L41_SPI_2
-+ },
-+ [ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1] = {
-+ .type = HDA_FIXUP_FUNC,
-+ .v.func = alc285_fixup_speaker2_to_dac1,
-+ .chained = true,
-+ .chain_id = ALC285_FIXUP_ASUS_HEADSET_MIC
-+ },
- [ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {
- .type = HDA_FIXUP_PINS,
- .v.pins = (const struct hda_pintbl[]) {
-@@ -9512,6 +9530,7 @@
- SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
- SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
- SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101),
-+ SND_PCI_QUIRK(0x1043, 0x1473, "ASUS GU604", ALC285_FIXUP_ASUS_SPEAKER2_TO_DAC1),
- SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
- SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
- SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
diff --git a/0038-mediatek-pci-reset.patch b/0038-mediatek-pci-reset.patch
new file mode 100644
index 000000000000..6661136d2b5c
--- /dev/null
+++ b/0038-mediatek-pci-reset.patch
@@ -0,0 +1,110 @@
+From mboxrd@z Thu Jan 1 00:00:00 1970
+Return-Path: <linux-kernel-owner@vger.kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+ aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
+ by smtp.lore.kernel.org (Postfix) with ESMTP id C716EEB64DB
+ for <linux-kernel@archiver.kernel.org>; Wed, 14 Jun 2023 06:35:43 +0000 (UTC)
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+ id S243138AbjFNGfm (ORCPT <rfc822;linux-kernel@archiver.kernel.org>);
+ Wed, 14 Jun 2023 02:35:42 -0400
+Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43986 "EHLO
+ lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+ with ESMTP id S243281AbjFNGfH (ORCPT
+ <rfc822;linux-kernel@vger.kernel.org>);
+ Wed, 14 Jun 2023 02:35:07 -0400
+Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121])
+ by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A75971709;
+ Tue, 13 Jun 2023 23:33:48 -0700 (PDT)
+Received: from localhost.localdomain (unknown [10.101.196.174])
+ (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
+ key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
+ (No client certificate requested)
+ by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id ECD893FE8F;
+ Wed, 14 Jun 2023 06:33:41 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;
+ s=20210705; t=1686724426;
+ bh=+hqis1W8nQ4EkQUmco7jTscaaZbuSwY0XCyi+/U9QfM=;
+ h=From:To:Cc:Subject:Date:Message-Id:MIME-Version;
+ b=wIVM1sNd+ojHp6usjuvn93Ejfp9bdZeFSaG46lVPT9zOIp8wytXooK36JiMTSSn0l
+ 2eDxchP16vkMHZh9WMeLMOU2uMYGl2IC72DT9wEtoCN8kE1SKDZyKISm6VclhVjH/K
+ pM7P3JTy9iTfu8Met2cxNQk3SUybNSvxw4H3B5ZkrdBYvUX6a3HdEqTVRdIWGKE4bN
+ cGy0m6IQJBwBfD+iG9SDVbKk8b6BQnCCFks9n+yETD6WkkbiY/dOe28fNPPKk/AY1w
+ t7LdI6MxufhU+CLvZ7/233P6hdL4RZwqhDqF6cvYqn1aXRlc7irfxVq2mCg44OOzkJ
+ Wu9959Z93e1Kg==
+From: Kai-Heng Feng <kai.heng.feng@canonical.com>
+To: nbd@nbd.name, lorenzo@kernel.org, ryder.lee@mediatek.com
+Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>,
+ Shayne Chen <shayne.chen@mediatek.com>,
+ Sean Wang <sean.wang@mediatek.com>,
+ Kalle Valo <kvalo@kernel.org>,
+ Matthias Brugger <matthias.bgg@gmail.com>,
+ AngeloGioacchino Del Regno
+ <angelogioacchino.delregno@collabora.com>,
+ Deren Wu <deren.wu@mediatek.com>,
+ Leon Yen <Leon.Yen@mediatek.com>,
+ linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
+ linux-arm-kernel@lists.infradead.org,
+ linux-mediatek@lists.infradead.org
+Subject: [PATCH] wifi: mt76: mt7921e: Perform FLR to recovery the device
+Date: Wed, 14 Jun 2023 14:32:50 +0800
+Message-Id: <20230614063252.1650824-1-kai.heng.feng@canonical.com>
+X-Mailer: git-send-email 2.34.1
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+
+When "Pre-boot WiFi" is enabled in BIOS, the mt7921e device may not
+work:
+mt7921e 0000:02:00.0: ASIC revision: 79220010
+mt7921e 0000:02:00.0: Message 00000010 (seq 1) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 2) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 3) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 4) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 5) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 6) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 7) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 8) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 9) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: Message 00000010 (seq 10) timeout
+mt7921e 0000:02:00.0: Failed to get patch semaphore
+mt7921e 0000:02:00.0: hardware init failed
+
+After some trials and errors, it shows that PCI function level reset can
+recover the device back to a functional state.
+
+So perform FLR at probe routine to workaround the issue.
+
+Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
+---
+ drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+index ddb1fa4ee01d..9671fbe35a8e 100644
+--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
++++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+@@ -262,6 +262,10 @@ static int mt7921_pci_probe(struct pci_dev *pdev,
+ int ret;
+ u16 cmd;
+
++ ret = pci_reset_function_locked(pdev);
++ if (ret)
++ pci_info(pdev, "Unable to perform FLR\n");
++
+ ret = pcim_enable_device(pdev);
+ if (ret)
+ return ret;
+--
+2.34.1
diff --git a/PKGBUILD b/PKGBUILD
index ececdbbca88d..edd82c11ad08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-g14
-pkgver=6.3.6.arch1
+pkgver=6.3.8.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -51,7 +51,6 @@ source=(
0036-Block_a_rogue_device_on_ASUS_TUF_A16.patch
0001-ACPI-resource-Skip-IRQ-override-on-ASUS-TUF-Gaming-A.patch
- 0001-ALSA-hda-realtek-gu604.patch
0001-HID-amd_sfh-Add-support-for-tablet-mode-switch-senso.patch
0002-ACPI-resource-Skip-IRQ-override-on-ASUS-TUF-Gaming-A.patch
0003-HID-asus-Add-support-for-ASUS-ROG-Z13-keyboard.patch
@@ -63,6 +62,8 @@ source=(
0009-platform-x86-asus-wmi-support-middle-fan-custom-curv.patch
0010-platform-x86-asus-wmi-add-WMI-method-to-show-if-egpu.patch
0011-platform-x86-asus-wmi-support-setting-mini-LED-mode.patch
+
+ 0038-mediatek-pci-reset.patch
"sys-kernel_arch-sources-g14_files-0047-asus-nb-wmi-Add-tablet_mode_sw-lid-flip.patch"
"sys-kernel_arch-sources-g14_files-0048-asus-nb-wmi-fix-tablet_mode_sw_int.patch"
@@ -81,22 +82,28 @@ sha256sums=('SKIP'
'bc8b5f303e3507c01d8543fb4352ed7dcdb9ed4eb2854788d39510f88d67f454'
'81ad663925a0aa5b5332a69bae7227393664bb81ee2e57a283e7f16e9ff75efe'
'0a7ea482fe20c403788d290826cec42fe395e5a6eab07b88845f8b9a9829998d'
- 'd45e2ae1d21b1dc8e0de94a4fa58e9a53d72306843f87d3cc49f5f641399d8e3'
'172dbc88d0a3cda78387f3c907fa4953c71cb1cb162f0b34f78b8b78924bc3d4'
'a691e7b22633fe0c458d140167d6d381b66149e05de3cb926b30a19fd43e78ce'
'7b16fce20b03babc9e149030f43e283534835bbd8835ba0a794fd0205fea1708'
'efbf65b17fb48fd22f199b6fddd05f159f8ea31faad5543f2c07fddf45eb9f12'
'd4f8e606eaad9a1fe302f04b9023a3980eb2305108c0d8c90654d23e53ff8bef'
- '8614c92567822e38ac7a0893e93776f39bbb6d373797f4b713cef5b3c060c8f1'
'cdbcec3031878cdb7ffab32034e4ee31bbd0ec214088f95dc446a13320985631'
- 'ec3cced4d3d5de4827e07430a77fcba755d84b9cfded09dc0b6be46e28427f22'
'a8e1e11a4ab1995cc4975c9b134a43ddfe7054ef0c965e52a7d8f9223e15c3e0'
- '14f695b481e1afc4ac8c79ef48f0613267c86d1862f3293d889f6f68e1b84188'
- '93b7ad2dd6b172d487d5e37847027f5854cae0c7291bc643d890045692903bab'
- '04167065497211326a3a6f83519111e2f81273c848143d300e7e3e91062c061b'
- '185ccdbfa7d4a0a3c55412082d87c5965221a73442f076d396f1e8cc0aabece1'
- 'e20f3d11077c9abe8cc41c61378abd6b3fbd5059497a01baa881a810f1c91eb0'
- '22ae0fb68016064ce32d5a32235d463b6e65eff2af83fe70be976cf39b1a9623'
+ '315d1839630b37894a626bbc2aea012618b2e1ccb6f9d8aa27c0a3ce5e90e99c'
+ '1740589bbf5eb2c292904e508270ed221e1382f78bcb7cf1c72f1dc12f767e69'
+ 'a00b952d53df9d3617d93e8fba4146a4d6169ebe79f029b3a55cca68f738d8ea'
+ '829e09c0ac6f21ca68114e406754c7645921df189d38a0ba34c93784303e1c23'
+ '4912b1319e46ddd6670147f5e878b4aca8bcfbd7b5c852fe11e434e424666365'
+ '655a7650a21ce4f725caf6fa248295edefa25a248aeaecf3d65a058503ae2530'
+ '7ce4b001a81b15b5b5275620fc0cee3d251d753698ae3db4593619a2121e1f2e'
+ 'c7d44e1eb82b4711b4cc86016a1886a573f1abc893dbdd201d4a6d0326859b85'
+ '66ee16ec4e39973905905d66eb043a55fdeaae470902be6adf893ce1a4ac4cbe'
+ '2c6b2efef195cc54d641374cad669884dede99a8b934e2b2b168c6ae35554f2c'
+ '73db9582e8d5fa41a1a7ed38bd0a012cd28573d1d2eda44152ce13477bdd7999'
+ 'c7430e0ad27f9a1cd1677da1a7471dcf63088cb21cd943427454889c69e7f829'
+ '976abe70d2a1604ce2335a7d7ce5d9722db93e389413a0b6a7f3ea72f795b65b'
+ '8a0ee3fbb3c95cd4d5cedd62517384374462d5157f3104013e5cbe6d91317e95'
+ 'a768687d858b608c01e22664817a80602e8c17911487fac71430f70b0c52b9f9'
'15e912a66e4bbce1cf0450f1dc6610653df29df8dd6d5426f9c1b039490436c8'
'444f2d86de8c2177655b01596f939f99c2e7abfa8efad8a509e0a334f42dfa85'
'982a31e47d3d586789e1b3cdda25f75e3b71d810e7494202089b8f2cef7c0ef9')