asonix/sbc-deploys
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update to 6.3.9 kernel for pinetab

Browse source
This commit is contained in:
asonix 2023-06-28 13:37:29 -05:00
parent 727f6888ff
commit e9de301136
3 changed files with 26 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
flake.lock
View file

@ -43,11 +43,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1687709756,
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1686960236,
"narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"lastModified": 1687898314,
"narHash": "sha256-B4BHon3uMXQw8ZdbwxRK1BmxVOGBV4viipKpGaIlGwk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"rev": "e18dc963075ed115afb3e312b64643bf8fd4b474",
"type": "github"
},
"original": {
@ -90,11 +90,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686736559,
"narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=",
"lastModified": 1687829761,
"narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884",
"rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
"type": "github"
},
"original": {
@ -120,15 +120,16 @@
]
},
"locked": {
"lastModified": 1686593470,
"narHash": "sha256-FTQghUZb1jzXj0d/OoTWaB3cfRs9WAH33upOBPfDnEw=",
"lastModified": 1687974837,
"narHash": "sha256-TGkAg50PeoA98+bun94kcSRw5AYJWW7iUDotkx3fsYI=",
"owner": "asonix",
"repo": "nixos-rockchip",
"rev": "3178bfeab801013238f8aeab352d10c78001c2a9",
"rev": "ea23191b3dbc14be78bf5b62b4e32f32c812188a",
"type": "github"
},
"original": {
"owner": "asonix",
"ref": "asonix/pinetab2-linux-6.3.9",
"repo": "nixos-rockchip",
"type": "github"
}
@ -151,11 +152,11 @@
"rockchip": "rockchip"
},
"locked": {
"lastModified": 1686772695,
"narHash": "sha256-DKgmiqpbl6cqlp7wGKSH0tE8bJmKvR1VsNgygH/Yh0Y=",
"lastModified": 1687976803,
"narHash": "sha256-Gbo+uZ9sUg4XFinzGmZrkNX+WvEfo4ZUpVVaqnjHGn4=",
"ref": "asonix/nabam-sd-image",
"rev": "4b0392e7bd30cba03b14d91e31857a766875982b",
"revCount": 47,
"rev": "67f1f541476d9c4451133fa0f5b6404da11f7b86",
"revCount": 49,
"type": "git",
"url": "https://git.asonix.dog/asonix/sd-images"
},
@ -173,11 +174,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1687267549,
"narHash": "sha256-jpg5zwhEQlovGH/xrml9X5ciPKpIZr/3Z04+Fh3VtQY=",
"lastModified": 1687398569,
"narHash": "sha256-e/umuIKFcFtZtWeX369Hbdt9r+GQ48moDmlTcyHWL28=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "d299d0538295e71e194aa0dfa896ad399f4508e3",
"rev": "2ff6973350682f8d16371f8c071a304b8067f192",
"type": "github"
},
"original": {

13
flake.nix
View file

@ -748,7 +748,7 @@
selfIp = "192.168.20.23";
macAddress = "02:fe:30:d8:cf:64";
keyFile = "redtailKeyFile";
primaryIp = "192.168.20.24";
# primaryIp = "192.168.20.24";
};
redtail2 = makePostgresConfig system {
@ -756,7 +756,7 @@
selfIp = "192.168.20.24";
macAddress = "02:8a:70:2a:a8:5e";
keyFile = "redtailKeyFile";
# primaryIp = "192.168.20.23";
primaryIp = "192.168.20.23";
};
whitestorm1 = makePostgresConfig system {
@ -908,11 +908,6 @@
format = "binary";
sopsFile = ./secrets/pinetabWireguardKey.bin;
};
boot.kernelPatches = [{
name = "support-axe3000";
patch = ./support-axe3000.patch;
}];
})
({ config, ... }: wireguardModule {
address = "192.168.5.13/24";
@ -1045,6 +1040,10 @@
name = "redtail1";
ip = "192.168.20.23";
}
{
name = "redtail2";
ip = "192.168.20.24";
}
{
name = "whitestorm2";
ip = "192.168.20.27";

81
support-axe3000.patch
View file

@ -1,81 +0,0 @@
From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84FBE171A9
for <patches@lists.linux.dev>; Mon, 22 May 2023 19:42:45 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00F8FC433D2;
Mon, 22 May 2023 19:42:44 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
s=korg; t=1684784565;
bh=F5grBt5yyAVbdzZgMTIbqVhy0XTYwJT8GjYCAdJiQ+k=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=hapyeSKPgMw0+NESBwtk/+YgFdjWtQ1Lc9MU7dfiMneJikyPVNW8WXpj2CxgBBk7b
wiUxq1JyiPKsqbnQnPBVGSxNx05VDpEjMIIc8M2pqPmoO53uM+i2IFHkwRXx8XlxoK
1BBO1ZDmWg0b7sO3j0oH/O2e6w4+w2MPGtPo3sKQ=
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
patches@lists.linux.dev,
Reese Russell <git@qrsnap.io>,
Felix Fietkau <nbd@nbd.name>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 6.3 126/364] wifi: mt76: mt7921: add Netgear AXE3000 (A8000) support
Date: Mon, 22 May 2023 20:07:11 +0100
Message-Id: <20230522190415.950824770@linuxfoundation.org>
X-Mailer: git-send-email 2.40.1
In-Reply-To: <20230522190412.801391872@linuxfoundation.org>
References: <20230522190412.801391872@linuxfoundation.org>
User-Agent: quilt/0.67
Precedence: bulk
X-Mailing-List: patches@lists.linux.dev
List-Id: <patches.lists.linux.dev>
List-Subscribe: <mailto:patches+subscribe@lists.linux.dev>
List-Unsubscribe: <mailto:patches+unsubscribe@lists.linux.dev>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Reese Russell <git@qrsnap.io>
[ Upstream commit 03eb52dd78cab08f13925aeec8315fbdbcba3253 ]
Issue: Though the Netgear AXE3000 (A8000) is based on the mt7921
chipset because of the unique USB VID:PID combination this device
does not initialize/register. Thus making it not plug and play.
Fix: Adds support for the Netgear AXE3000 (A8000) based on the Mediatek
mt7921au chipset. The method of action is adding the USD VID/PID
pair to the mt7921u_device_table[] array.
Notes: A retail sample of the Netgear AXE3000 (A8000) yeilds the following
from lsusb D 0846:9060 NetGear, Inc. Wireless_Device. This pair
0846:9060 VID:PID has been reported by other users on Github.
Signed-off-by: Reese Russell <git@qrsnap.io>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
index 70c9bbdbf60e9..09ab9b83c2011 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
@@ -18,6 +18,9 @@ static const struct usb_device_id mt7921u_device_table[] = {
/* Comfast CF-952AX */
{ USB_DEVICE_AND_INTERFACE_INFO(0x3574, 0x6211, 0xff, 0xff, 0xff),
.driver_info = (kernel_ulong_t)MT7921_FIRMWARE_WM },
+ /* Netgear, Inc. [A8000,AXE3000] */
+ { USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9060, 0xff, 0xff, 0xff),
+ .driver_info = (kernel_ulong_t)MT7921_FIRMWARE_WM },
{ },
};
--
2.39.2