linux-postmarketos-rockchip: upgrade to 5.16.8 (MR 2923)
Dropped patches that are now present in stable linux. Forward ported the EFI IGNOREME patch to 5.16 Enabled a few very common pcie network adapters
This commit is contained in:
Martijn Braam
parent
1e5e22249c
commit
ff27c27bea
5 changed files with 235 additions and 197 deletions
|
|
@ -1,29 +0,0 @@
|
|||
From a8f3e4ffe533f952a468cb8f3d067865bd58144f Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Schramm <t.schramm@manjaro.org>
|
||||
Date: Sat, 6 Jun 2020 23:45:10 +0200
|
||||
Subject: [PATCH] arm64: dts: rockchip: setup USB type c port as dual data role
|
||||
|
||||
Some chargers try to put the charged device into device data role.
|
||||
Before this commit this condition caused the tcpm state machine to
|
||||
issue a hard reset due to a capability missmatch.
|
||||
|
||||
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
|
||||
index c505c88b5d9b..d77dca5524ff 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
|
||||
@@ -726,7 +726,7 @@ fusb0: fusb30x@22 {
|
||||
|
||||
connector {
|
||||
compatible = "usb-c-connector";
|
||||
- data-role = "host";
|
||||
+ data-role = "dual";
|
||||
label = "USB-C";
|
||||
op-sink-microwatt = <1000000>;
|
||||
power-role = "dual";
|
||||
--
|
||||
GitLab
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 0f09019241a0ea6eee0b9b596a70ec8a66b820ce Mon Sep 17 00:00:00 2001
|
||||
From 8d9406b97635ee7edad133c48f3de120de331d0e Mon Sep 17 00:00:00 2001
|
||||
From: SolidHal <hal@halemmerich.com>
|
||||
Date: Fri, 24 Aug 2018 11:04:43 -0500
|
||||
Subject: [PATCH] block: partitions: efi: Add support for IGNOREME GPT
|
||||
|
|
@ -24,15 +24,15 @@ and mountable.
|
|||
|
||||
Signed-off-by: SolidHal <hal@halemmerich.com>
|
||||
---
|
||||
block/partitions/efi.c | 31 ++++++++++++++++++++++---------
|
||||
block/partitions/efi.c | 33 +++++++++++++++++++++++----------
|
||||
block/partitions/efi.h | 3 ++-
|
||||
2 files changed, 24 insertions(+), 10 deletions(-)
|
||||
2 files changed, 25 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/block/partitions/efi.c b/block/partitions/efi.c
|
||||
index 39f70d9..aa08380 100644
|
||||
index 5e9be13a56a8..8cdfcc48558c 100644
|
||||
--- a/block/partitions/efi.c
|
||||
+++ b/block/partitions/efi.c
|
||||
@@ -344,23 +344,34 @@ static gpt_header *alloc_read_gpt_header(struct parsed_partitions *state,
|
||||
@@ -328,23 +328,34 @@ static gpt_header *alloc_read_gpt_header(struct parsed_partitions *state,
|
||||
* @lba: logical block address of the GPT header to test
|
||||
* @gpt: GPT header ptr, filled on return.
|
||||
* @ptes: PTEs ptr, filled on return.
|
||||
|
|
@ -69,7 +69,7 @@ index 39f70d9..aa08380 100644
|
|||
pr_debug("GUID Partition Table Header signature is wrong:"
|
||||
"%lld != %lld\n",
|
||||
(unsigned long long)le64_to_cpu((*gpt)->signature),
|
||||
@@ -597,7 +608,7 @@ compare_gpts(gpt_header *pgpt, gpt_header *agpt, u64 lastlba)
|
||||
@@ -581,7 +592,7 @@ compare_gpts(gpt_header *pgpt, gpt_header *agpt, u64 lastlba)
|
||||
static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
|
||||
gpt_entry **ptes)
|
||||
{
|
||||
|
|
@ -78,7 +78,7 @@ index 39f70d9..aa08380 100644
|
|||
gpt_header *pgpt = NULL, *agpt = NULL;
|
||||
gpt_entry *pptes = NULL, *aptes = NULL;
|
||||
legacy_mbr *legacymbr;
|
||||
@@ -627,19 +638,20 @@ static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
|
||||
@@ -613,13 +624,13 @@ static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
|
||||
}
|
||||
|
||||
good_pgpt = is_gpt_valid(state, GPT_PRIMARY_PARTITION_TABLE_LBA,
|
||||
|
|
@ -94,6 +94,16 @@ index 39f70d9..aa08380 100644
|
|||
+ if (!good_agpt && (force_gpt || pgpt_ignored))
|
||||
+ good_agpt = is_gpt_valid(state, lastlba, &agpt, &aptes, NULL);
|
||||
|
||||
if (!good_agpt && force_gpt && fops->alternative_gpt_sector) {
|
||||
sector_t agpt_sector;
|
||||
@@ -628,14 +639,15 @@ static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
|
||||
err = fops->alternative_gpt_sector(disk, &agpt_sector);
|
||||
if (!err)
|
||||
good_agpt = is_gpt_valid(state, agpt_sector,
|
||||
- &agpt, &aptes);
|
||||
+ &agpt, &aptes, NULL);
|
||||
}
|
||||
|
||||
/* The obviously unsuccessful case */
|
||||
if (!good_pgpt && !good_agpt)
|
||||
goto fail;
|
||||
|
|
@ -104,7 +114,7 @@ index 39f70d9..aa08380 100644
|
|||
|
||||
/* The good cases */
|
||||
if (good_pgpt) {
|
||||
@@ -656,7 +668,8 @@ static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
|
||||
@@ -652,7 +664,8 @@ static int find_valid_gpt(struct parsed_partitions *state, gpt_header **gpt,
|
||||
*ptes = aptes;
|
||||
kfree(pgpt);
|
||||
kfree(pptes);
|
||||
|
|
@ -115,10 +125,10 @@ index 39f70d9..aa08380 100644
|
|||
}
|
||||
|
||||
diff --git a/block/partitions/efi.h b/block/partitions/efi.h
|
||||
index abd0b19..36cddc8 100644
|
||||
index 8cc2b88d0aa8..fcf65ebbaa85 100644
|
||||
--- a/block/partitions/efi.h
|
||||
+++ b/block/partitions/efi.h
|
||||
@@ -41,7 +41,8 @@
|
||||
@@ -27,7 +27,8 @@
|
||||
#define GPT_MBR_PROTECTIVE 1
|
||||
#define GPT_MBR_HYBRID 2
|
||||
|
||||
|
|
@ -129,5 +139,5 @@ index abd0b19..36cddc8 100644
|
|||
#define GPT_PRIMARY_PARTITION_TABLE_LBA 1
|
||||
|
||||
--
|
||||
2.11.0
|
||||
2.34.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
From ad63cb5d37f9634fc097249ddda4240c10f041d7 Mon Sep 17 00:00:00 2001
|
||||
From: Martijn Braam <martijn@brixit.nl>
|
||||
Date: Tue, 7 Sep 2021 20:30:22 +0200
|
||||
Subject: [PATCH] Revert "net: stmmac: dwmac-rk: fix unbalanced
|
||||
pm_runtime_enable warnings"
|
||||
|
||||
Revert: 2d26f6e39afb88d32b8f39e76a51b542c3c51674
|
||||
|
||||
A fix in 5.14 caused a regression in the stmmac driver used for the
|
||||
ethernet PHY in the rockpro64. This reverts the revert that caused this
|
||||
regression making ethernet work again.
|
||||
|
||||
The upstream mailing list thread: https://lore.kernel.org/netdev/YS0v9UbzoHkiU9om@sashalap/T/
|
||||
---
|
||||
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||
index ed817011a94a..280ac0129572 100644
|
||||
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
#include <linux/regmap.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
|
||||
#include "stmmac_platform.h"
|
||||
|
||||
@@ -1528,6 +1529,9 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ pm_runtime_enable(dev);
|
||||
+ pm_runtime_get_sync(dev);
|
||||
+
|
||||
if (bsp_priv->integrated_phy)
|
||||
rk_gmac_integrated_phy_powerup(bsp_priv);
|
||||
|
||||
@@ -1536,9 +1540,14 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv)
|
||||
|
||||
static void rk_gmac_powerdown(struct rk_priv_data *gmac)
|
||||
{
|
||||
+ struct device *dev = &gmac->pdev->dev;
|
||||
+
|
||||
if (gmac->integrated_phy)
|
||||
rk_gmac_integrated_phy_powerdown(gmac);
|
||||
|
||||
+ pm_runtime_put_sync(dev);
|
||||
+ pm_runtime_disable(dev);
|
||||
+
|
||||
phy_power_on(gmac, false);
|
||||
gmac_clk_enable(gmac, false);
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
|
|
@ -10,8 +10,8 @@
|
|||
# boot failure
|
||||
|
||||
pkgname=linux-postmarketos-rockchip
|
||||
pkgver=5.14.9
|
||||
pkgrel=2
|
||||
pkgver=5.16.8
|
||||
pkgrel=0
|
||||
pkgdesc="Mainline kernel for rockchip devices"
|
||||
arch="aarch64 armv7"
|
||||
_flavor="${pkgname#linux-}"
|
||||
|
|
@ -56,12 +56,8 @@ source="
|
|||
https://cdn.kernel.org/pub/linux/kernel/v${_kernver%%.*}.x/linux-$_kernver.tar.xz
|
||||
0001-phy-rockchip-typec-Set-extcon-capabilities.patch
|
||||
0003-arm64-dts-rockchip-add-typec-extcon-hack.patch
|
||||
0004-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-data-role.patch
|
||||
0010-usb-typec-add-extcon-to-tcpm.patch
|
||||
0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
|
||||
0011-stmmac-revert-stmmac-fix.patch
|
||||
36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=36dfdf11af49d3c009c711fb16f5c6e7a274505d
|
||||
6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=6eea4ace62fa6414432692ee44f0c0a3d541d97a
|
||||
|
||||
config-$_flavor.aarch64
|
||||
config-$_flavor.armv7
|
||||
|
|
@ -101,15 +97,11 @@ package() {
|
|||
|
||||
|
||||
sha512sums="
|
||||
987ae9ceba83ba12e5e1962118831dbc47eaf26848cfd83b93db58f004dbc3c8d10d62a33cf449abddcfe996023dc705207c43a22aae665461eff9d7365bbc00 linux-5.14.9.tar.xz
|
||||
66a0874eed7b2367fc0b69bee8c40a945b9e58d1a820c3e7e741bcb28774c811dea251826b14e2452d9e1fdd7509554ac50229f942c8ba853c308affba94a39a linux-5.16.8.tar.xz
|
||||
10949558a6e3316ea57497f377fd120d6704f3b81725317556e49d10b570a40edb06643b06738116abbe3096be485761d436f1a0d1861bd34fc18ea45068b6b0 0001-phy-rockchip-typec-Set-extcon-capabilities.patch
|
||||
b7291eecfddc7ebe9393eea864e0ee28960e8cc2f87dfc42d09426b5619f46ded97c38fb8bf26f4eea1f26bfe21396094505b3efb8676691f8751e2ffabe50ec 0003-arm64-dts-rockchip-add-typec-extcon-hack.patch
|
||||
427b81472de2a473344269b2da06ac338af42e68620a281a9cb8543e545e6ed7f719acaf68c688e518b65d2132e0c66676ba5e30376ec980fd6eeaea05c2a8be 0004-arm64-dts-rockchip-setup-USB-type-c-port-as-dual-data-role.patch
|
||||
e5cc0852506ea1e73213672f0c3f9144c08156f6d5e8af841bf3f7bffc0e89028507aac4718353eee20edd9069e3f81665caa5ca25e416f25e7e0da10451b67e 0010-usb-typec-add-extcon-to-tcpm.patch
|
||||
000ddb9f10545b1231e2b78049d3fda7aed8e931c0c992f84cfe2783dd964443d137e5695775956c5db0fac30d00795adc34453acfb772155163297cc1227b8c 0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
|
||||
75a738070a42b03b248fd805f60ac506b3d22c775dc0b0365d7f9c15c28349d0e16dde9af301021d56d720d341075335e63a38be0ade89178346518c7b02de53 0011-stmmac-revert-stmmac-fix.patch
|
||||
59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1 36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch
|
||||
61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0 6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch
|
||||
c7a10a642996db8e0195aab709ac121266084e685ccf1a8f0c1cfd10e18e09008574b3af0b0dbf3e685c6102b3166caf2c3fb7a69292a9c6fe9beb170e31e2b8 config-postmarketos-rockchip.aarch64
|
||||
265b05bc542edb290ec15cd5f50132698a32e80d30ce28ce3ad7e990b7c07df92c4556122505b07a6aa582a919459872d1d874f4ed422d2aff2cdfb51889e720 0007-block-partitions-efi-Add-support-for-IGNOREME-GPT-si.patch
|
||||
5dc0ed5b947ca8153e3b3874cf380208b0736a0e5db25fbeddf4c9cbb8d121d20de130462c99f9f398f4d28a229eac8cf384d9170fff5d56a48e5aec1c1eea9e config-postmarketos-rockchip.aarch64
|
||||
62a05ed0d8f040981454216939b044cc48deb4aa566e952b6bca2881b21e28f7f68e9a5d399ec5a5ec545ac3898757cdf139b1f1554841d73bf8a841ae407e6f config-postmarketos-rockchip.armv7
|
||||
"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue