Verified Commit 5e87e6f3 authored by Dan Johansen's avatar Dan Johansen
Browse files

add patch to hopefully fix ethernet on rk3399


Signed-off-by: Dan Johansen's avatarDan Johansen <strit@manjaro.org>
parent d74f23fb
Pipeline #4680 passed with stage
in 101 minutes and 9 seconds
From ad63cb5d37f9634fc097249ddda4240c10f041d7 Mon Sep 17 00:00:00 2001
From: Dan Johansen <strit@manjaro.org>
Date: Tue, 7 Sep 2021 16:26:09 +0200
Subject: [PATCH] Revert "net: stmmac: dwmac-rk: fix unbalanced
pm_runtime_enable warnings"
This reverts commit 2d26f6e39afb88d32b8f39e76a51b542c3c51674.
---
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
......@@ -7,7 +7,7 @@ _srcname=linux-5.14
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform"
pkgver=5.14.1
pkgrel=1
pkgrel=2
arch=('aarch64')
url="http://www.kernel.org/"
license=('GPL2')
......@@ -37,6 +37,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
'0020-add-ugoos-device.patch'
'0021-drm-panfrost-Handle-failure-in-panfrost_job_hw_submit.patch'
'0022-arm64-dts-rockchip-Add-pcie-bus-scan-delay-to-rockpr.patch'
'0023-Revert-net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime.patch'
'0001-Bluetooth-Add-new-quirk-for-broken-local-ext-features.patch'
'0002-Bluetooth-btrtl-add-support-for-the-RTL8723CS.patch'
'0003-arm64-allwinner-a64-enable-Bluetooth-On-Pinebook.patch'
......@@ -85,6 +86,7 @@ md5sums=('a082ef5748b813abca0649dab8be5f52'
'1b92d7617e60d3c525a4b18ab4351185'
'a90a366662357233db7022f8a1e7ac46'
'6bb2d84857359016b5e0878cf2fc50cc'
'4d1c5ad859cf3f22c0c9f7903d6d761c'
'cf64831f27bb47da29e708b7243bb340'
'e3f53e07612939729afaa4dd7ef7f7ce'
'9510821113c122f91f47b9d0f7ca7264'
......@@ -139,6 +141,7 @@ prepare() {
patch -Np1 -i "${srcdir}/0020-add-ugoos-device.patch" #Ugoos
patch -Np1 -i "${srcdir}/0021-drm-panfrost-Handle-failure-in-panfrost_job_hw_submit.patch" #AMLogic
patch -Np1 -i "${srcdir}/0022-arm64-dts-rockchip-Add-pcie-bus-scan-delay-to-rockpr.patch" #RockPro64
patch -Np1 -i "${srcdir}/0023-Revert-net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime.patch" #Fix ethernet on RK3399
# Pinebook Pro patches
patch -Np1 -i "${srcdir}/0016-arm64-dts-rockchip-add-typec-extcon-hack.patch" #DP Alt mode
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment