mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 14:50:15 +04:00
d62ecd6c07
Refresh patches 6.12 for airoha and econet Fixes:122135b964("airoha: an7581: add support for kernel 6.12") Fixes:73d0f92460("kernel: Add new platform EcoNet MIPS") Signed-off-by: Leo Barsky <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20073 Signed-off-by: Robert Marko <robimarko@gmail.com>
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From c98bee18d0a094e37100c85effe5e161418f8644 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 8 Jan 2025 10:50:44 +0100
|
|
Subject: [PATCH 5/6] PCI: mediatek-gen3: Rely on msleep() in
|
|
mtk_pcie_en7581_power_up()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Since mtk_pcie_en7581_power_up() runs in non-atomic context, rely on
|
|
msleep() routine instead of mdelay().
|
|
|
|
Link: https://lore.kernel.org/r/20250108-pcie-en7581-fixes-v6-5-21ac939a3b9b@kernel.org
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
|
---
|
|
drivers/pci/controller/pcie-mediatek-gen3.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/pcie-mediatek-gen3.c
|
|
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
|
|
@@ -878,7 +878,7 @@ static int mtk_pcie_en7581_power_up(stru
|
|
reset_control_assert(pcie->mac_reset);
|
|
|
|
/* Wait for the time needed to complete the reset lines assert. */
|
|
- mdelay(PCIE_EN7581_RESET_TIME_MS);
|
|
+ msleep(PCIE_EN7581_RESET_TIME_MS);
|
|
|
|
/*
|
|
* Unlike the other MediaTek Gen3 controllers, the Airoha EN7581
|
|
@@ -906,7 +906,7 @@ static int mtk_pcie_en7581_power_up(stru
|
|
* Wait for the time needed to complete the bulk de-assert above.
|
|
* This time is specific for EN7581 SoC.
|
|
*/
|
|
- mdelay(PCIE_EN7581_RESET_TIME_MS);
|
|
+ msleep(PCIE_EN7581_RESET_TIME_MS);
|
|
|
|
pm_runtime_enable(dev);
|
|
pm_runtime_get_sync(dev);
|