mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00

* kernel: bump 5.15 to 5.15.86 Removed upstreamed: pending-5.15/101-Use-stddefs.h-instead-of-compiler.h.patch[1] ipq60xx/patches-5.15/0171-arm64-dts-qcom-ipq6018-cp01-c1-use-BLSPI1-pins.patch ipq806x/patches-5.15/122-01-clk-qcom-clk-krait-fix-wrong-div2-functions.patch[2] ipq60xx/patches-5.15/0139-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch ipq60xx/patches-5.15/0005-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch ipq807x/patches-5.15/0004-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch bcm27xx/patches-5.15/950-0198-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch[3] Manually rebased: ramips/patches-5.15/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch[4] Added patch/backported: ramips/patches-5.15/107-PCI-mt7621-Add-sentinel-to-quirks-table.patch[5] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.86&id=c160505c9b574b346031fdf2c649d19e7939ca11 2. Cannot find in the stable tree but it is here:a051e10bfc
3.ec1727f89e
4. Quilt gave this output when I applied the patch to rebase it: % quilt push -f Applying patch platform/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch patching file arch/mips/ralink/Kconfig patching file drivers/pci/controller/Kconfig patching file drivers/pci/controller/Makefile patching file drivers/staging/Kconfig patching file drivers/staging/Makefile patching file drivers/staging/mt7621-pci/Kconfig patching file drivers/staging/mt7621-pci/Makefile patching file drivers/staging/mt7621-pci/TODO patching file drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt patching file drivers/staging/mt7621-pci/pci-mt7621.c Hunk #1 FAILED at 1. Not deleting file drivers/staging/mt7621-pci/pci-mt7621.c as content differs from patch 1 out of 1 hunk FAILED -- saving rejects to file drivers/staging/mt7621-pci/pci-mt7621.c.rej patching file drivers/pci/controller/pcie-mt7621.c Applied patch platform/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch (forced; needs refresh) Upon inspecting drivers/staging/mt7621-pci/pci-mt7621.c.rej, it seems that the original patch wants to delete drivers/staging/mt7621-pci/pci-mt7621.c but upstream's version was not an exact match. I opted to delete that file and need some feedback. Was that the correct course of action? 5. Suggestion by hauke:19098934f9
"This patch is in upstream kernel, but it was backported to the old staging driver in kernel 5.15." Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * oxnas: sata_oxnas: use ata_link_err Kernel 5.15.86 has backported ("ata: libata: move ata_{port,link,dev}_dbg to standard pr_XXX() macros") and this is now causing compilation errors for oxnas SATA driver due to usage of ata_link_printk(). Upstream has migrated to using the appropriate ata_link_{err, warn, notice, info} calls a while ago so its not affected. Lets do the same for oxnas SATA driver and use ata_link_err() instead of ata_link_printk(). Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com> Co-authored-by: John Audia <therealgraysky@proton.me> Co-authored-by: Robert Marko <robimarko@gmail.com>
156 lines
4.0 KiB
Diff
156 lines
4.0 KiB
Diff
From 84e13a5267e43bb0a6a1f764211fda7769dc9cbe Mon Sep 17 00:00:00 2001
|
|
From: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
|
|
Date: Sat, 30 Jan 2021 10:50:05 +0530
|
|
Subject: [PATCH 113/137] remoteproc: qcom: Add PRNG proxy clock
|
|
|
|
PRNG clock is needed by the secure PIL, support for the same
|
|
is added in subsequent patches.
|
|
|
|
Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
|
|
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
|
|
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
|
|
---
|
|
drivers/remoteproc/qcom_q6v5_wcss.c | 65 +++++++++++++++++++++--------
|
|
1 file changed, 47 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
@@ -91,19 +91,6 @@ enum {
|
|
WCSS_QCS404,
|
|
};
|
|
|
|
-struct wcss_data {
|
|
- const char *firmware_name;
|
|
- unsigned int crash_reason_smem;
|
|
- u32 version;
|
|
- bool aon_reset_required;
|
|
- bool wcss_q6_reset_required;
|
|
- const char *ssr_name;
|
|
- const char *sysmon_name;
|
|
- int ssctl_id;
|
|
- const struct rproc_ops *ops;
|
|
- bool requires_force_stop;
|
|
-};
|
|
-
|
|
struct q6v5_wcss {
|
|
struct device *dev;
|
|
|
|
@@ -128,6 +115,7 @@ struct q6v5_wcss {
|
|
struct clk *qdsp6ss_xo_cbcr;
|
|
struct clk *qdsp6ss_core_gfmux;
|
|
struct clk *lcc_bcr_sleep;
|
|
+ struct clk *prng_clk;
|
|
struct regulator *cx_supply;
|
|
struct qcom_sysmon *sysmon;
|
|
|
|
@@ -151,6 +139,21 @@ struct q6v5_wcss {
|
|
struct qcom_rproc_ssr ssr_subdev;
|
|
};
|
|
|
|
+struct wcss_data {
|
|
+ int (*init_clock)(struct q6v5_wcss *wcss);
|
|
+ int (*init_regulator)(struct q6v5_wcss *wcss);
|
|
+ const char *firmware_name;
|
|
+ unsigned int crash_reason_smem;
|
|
+ u32 version;
|
|
+ bool aon_reset_required;
|
|
+ bool wcss_q6_reset_required;
|
|
+ const char *ssr_name;
|
|
+ const char *sysmon_name;
|
|
+ int ssctl_id;
|
|
+ const struct rproc_ops *ops;
|
|
+ bool requires_force_stop;
|
|
+};
|
|
+
|
|
static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
|
|
{
|
|
int ret;
|
|
@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc
|
|
struct q6v5_wcss *wcss = rproc->priv;
|
|
int ret;
|
|
|
|
+ ret = clk_prepare_enable(wcss->prng_clk);
|
|
+ if (ret) {
|
|
+ dev_err(wcss->dev, "prng clock enable failed\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
qcom_q6v5_prepare(&wcss->q6v5);
|
|
|
|
/* Release Q6 and WCSS reset */
|
|
@@ -733,6 +742,7 @@ static int q6v5_wcss_stop(struct rproc *
|
|
return ret;
|
|
}
|
|
|
|
+ clk_disable_unprepare(wcss->prng_clk);
|
|
qcom_q6v5_unprepare(&wcss->q6v5);
|
|
|
|
return 0;
|
|
@@ -900,7 +910,21 @@ static int q6v5_alloc_memory_region(stru
|
|
return 0;
|
|
}
|
|
|
|
-static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
|
|
+static int ipq8074_init_clock(struct q6v5_wcss *wcss)
|
|
+{
|
|
+ int ret;
|
|
+
|
|
+ wcss->prng_clk = devm_clk_get(wcss->dev, "prng");
|
|
+ if (IS_ERR(wcss->prng_clk)) {
|
|
+ ret = PTR_ERR(wcss->prng_clk);
|
|
+ if (ret != -EPROBE_DEFER)
|
|
+ dev_err(wcss->dev, "Failed to get prng clock\n");
|
|
+ return ret;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int qcs404_init_clock(struct q6v5_wcss *wcss)
|
|
{
|
|
int ret;
|
|
|
|
@@ -990,7 +1014,7 @@ static int q6v5_wcss_init_clock(struct q
|
|
return 0;
|
|
}
|
|
|
|
-static int q6v5_wcss_init_regulator(struct q6v5_wcss *wcss)
|
|
+static int qcs404_init_regulator(struct q6v5_wcss *wcss)
|
|
{
|
|
wcss->cx_supply = devm_regulator_get(wcss->dev, "cx");
|
|
if (IS_ERR(wcss->cx_supply))
|
|
@@ -1034,12 +1058,14 @@ static int q6v5_wcss_probe(struct platfo
|
|
if (ret)
|
|
goto free_rproc;
|
|
|
|
- if (wcss->version == WCSS_QCS404) {
|
|
- ret = q6v5_wcss_init_clock(wcss);
|
|
+ if (desc->init_clock) {
|
|
+ ret = desc->init_clock(wcss);
|
|
if (ret)
|
|
goto free_rproc;
|
|
+ }
|
|
|
|
- ret = q6v5_wcss_init_regulator(wcss);
|
|
+ if (desc->init_regulator) {
|
|
+ ret = desc->init_regulator(wcss);
|
|
if (ret)
|
|
goto free_rproc;
|
|
}
|
|
@@ -1086,6 +1112,7 @@ static int q6v5_wcss_remove(struct platf
|
|
}
|
|
|
|
static const struct wcss_data wcss_ipq8074_res_init = {
|
|
+ .init_clock = ipq8074_init_clock,
|
|
.firmware_name = "IPQ8074/q6_fw.mdt",
|
|
.crash_reason_smem = WCSS_CRASH_REASON,
|
|
.aon_reset_required = true,
|
|
@@ -1095,6 +1122,8 @@ static const struct wcss_data wcss_ipq80
|
|
};
|
|
|
|
static const struct wcss_data wcss_qcs404_res_init = {
|
|
+ .init_clock = qcs404_init_clock,
|
|
+ .init_regulator = qcs404_init_regulator,
|
|
.crash_reason_smem = WCSS_CRASH_REASON,
|
|
.firmware_name = "wcnss.mdt",
|
|
.version = WCSS_QCS404,
|