2021-11-20 22:05:02 +00:00
|
|
|
--- a/drivers/firmware/qcom_scm.c
|
|
|
|
|
+++ b/drivers/firmware/qcom_scm.c
|
kernel: bump 5.15 to 5.15.145
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145
No patches needed a rebase.
23.05 backport:
Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
mt7622: fix memory node warning check") in version v5.15.143 and we
jumped over from v5.15.139 directly to v5.15.145.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
23.05 backport:
Stijn:
Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).
Petr:
Compile-tested: ipq807x, mvebu/cortexa9
Run-tested: turris-omnia, prpl-haze
Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6d5c25e48566d0203f159287ac7f3fe)
2023-12-23 11:52:06 +00:00
|
|
|
@@ -411,6 +411,20 @@ static int __qcom_scm_set_dload_mode(str
|
2021-11-20 22:05:02 +00:00
|
|
|
return qcom_scm_call_atomic(__scm->dev, &desc, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+static int __qcom_scm_disable_sdi(struct device *dev)
|
|
|
|
|
+{
|
|
|
|
|
+ struct qcom_scm_desc desc = {
|
|
|
|
|
+ .svc = QCOM_SCM_SVC_BOOT,
|
|
|
|
|
+ .cmd = QCOM_SCM_BOOT_CONFIG_SDI,
|
|
|
|
|
+ .arginfo = QCOM_SCM_ARGS(2),
|
|
|
|
|
+ .args[0] = 1 /* 1: disable watchdog debug */,
|
|
|
|
|
+ .args[1] = 0 /* 0: disable SDI */,
|
|
|
|
|
+ .owner = ARM_SMCCC_OWNER_SIP,
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ return qcom_scm_call(__scm->dev, &desc, NULL);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
static void qcom_scm_set_download_mode(bool enable)
|
|
|
|
|
{
|
|
|
|
|
bool avail;
|
kernel: bump 5.15 to 5.15.145
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.145
No patches needed a rebase.
23.05 backport:
Rebased patch mediatek/100-dts-update-mt7622-rfb1.patch due to
changes introduced in commit e37aa926447f ("arm64: dts: mediatek:
mt7622: fix memory node warning check") in version v5.15.143 and we
jumped over from v5.15.139 directly to v5.15.145.
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
23.05 backport:
Stijn:
Compile-tested: ath79/generic, ipq40xx/generic, mvebu/cortexa72, ramips/mt{7621,7620,76x8}, realtek/rtl{838x,930x}, 86/64.
Run-tested: cortexa72 (RB5009UG+S+IN), mt7621 (EAP615-Wall v1), rtl838x (GS1900-10HP, GS1900-8HP, GS108T v3).
Petr:
Compile-tested: ipq807x, mvebu/cortexa9
Run-tested: turris-omnia, prpl-haze
Tested-by: Stijn Segers <foss@volatilesystems.org> [23.05 testing]
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Petr Štetiar <ynezz@true.cz> [23.05 refresh]
(cherry picked from commit 8de4cc77a6d5c25e48566d0203f159287ac7f3fe)
2023-12-23 11:52:06 +00:00
|
|
|
@@ -1321,6 +1335,13 @@ static int qcom_scm_probe(struct platfor
|
2021-11-20 22:05:02 +00:00
|
|
|
if (download_mode)
|
|
|
|
|
qcom_scm_set_download_mode(true);
|
|
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
|
+ * Factory firmware leaves SDI (a debug interface), which prevents
|
|
|
|
|
+ * clean reboot.
|
|
|
|
|
+ */
|
|
|
|
|
+ if (of_machine_is_compatible("google,wifi"))
|
|
|
|
|
+ __qcom_scm_disable_sdi(__scm->dev);
|
|
|
|
|
+
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
--- a/drivers/firmware/qcom_scm.h
|
|
|
|
|
+++ b/drivers/firmware/qcom_scm.h
|
|
|
|
|
@@ -77,6 +77,7 @@ extern int scm_legacy_call(struct device
|
|
|
|
|
#define QCOM_SCM_SVC_BOOT 0x01
|
|
|
|
|
#define QCOM_SCM_BOOT_SET_ADDR 0x01
|
|
|
|
|
#define QCOM_SCM_BOOT_TERMINATE_PC 0x02
|
|
|
|
|
+#define QCOM_SCM_BOOT_CONFIG_SDI 0x09
|
|
|
|
|
#define QCOM_SCM_BOOT_SET_DLOAD_MODE 0x10
|
|
|
|
|
#define QCOM_SCM_BOOT_SET_REMOTE_STATE 0x0a
|
|
|
|
|
#define QCOM_SCM_FLUSH_FLAG_MASK 0x3
|
