From: Sasha Levin Date: Sun, 24 Mar 2024 21:31:09 +0000 (-0400) Subject: Drop coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch from older trees X-Git-Tag: v6.8.2~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=daeb37044e0963dbdc930548af67f431c57f4f07;p=thirdparty%2Fkernel%2Fstable-queue.git Drop coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch from older trees --- diff --git a/queue-5.15/coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch b/queue-5.15/coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch deleted file mode 100644 index ec306ee1599..00000000000 --- a/queue-5.15/coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ebc9a2386bb629dca0894b07d6ba27761b648d95 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 02:54:19 -0800 -Subject: coresight: etm4x: Set skip_power_up in etm4_init_arch_data function - -From: Mao Jinlong - -[ Upstream commit 1bbe0a247e5d72f723daeecf41596bfa99e199f1 ] - -skip_power_up is used in etm4_init_arch_data when set lpoverride. So -need to set the value of it before calling using it. - -Fixes: 5214b563588e ("coresight: etm4x: Add support for sysreg only devices") -Signed-off-by: Mao Jinlong -Signed-off-by: Suzuki K Poulose -Link: https://lore.kernel.org/r/20240131105423.9519-1-quic_jinlmao@quicinc.com -Signed-off-by: Sasha Levin ---- - drivers/hwtracing/coresight/coresight-etm4x-core.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index 26d0d4485ae99..35c19c2542cf1 100644 ---- a/drivers/hwtracing/coresight/coresight-etm4x-core.c -+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c -@@ -1022,6 +1022,7 @@ static void etm4_init_arch_data(void *info) - struct etm4_init_arg *init_arg = info; - struct etmv4_drvdata *drvdata; - struct csdev_access *csa; -+ struct device *dev = init_arg->dev; - int i; - - drvdata = init_arg->drvdata; -@@ -1035,6 +1036,10 @@ static void etm4_init_arch_data(void *info) - if (!etm4_init_csdev_access(drvdata, csa)) - return; - -+ if (!csa->io_mem || -+ fwnode_property_present(dev_fwnode(dev), "qcom,skip-power-up")) -+ drvdata->skip_power_up = true; -+ - /* Detect the support for OS Lock before we actually use it */ - etm_detect_os_lock(drvdata, csa); - -@@ -1921,11 +1926,6 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid) - if (!drvdata->arch) - return -EINVAL; - -- /* TRCPDCR is not accessible with system instructions. */ -- if (!desc.access.io_mem || -- fwnode_property_present(dev_fwnode(dev), "qcom,skip-power-up")) -- drvdata->skip_power_up = true; -- - major = ETM_ARCH_MAJOR_VERSION(drvdata->arch); - minor = ETM_ARCH_MINOR_VERSION(drvdata->arch); - --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index aeb4abb93b6..83a02501395 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -279,7 +279,6 @@ tty-vt-fix-20-vs-0x20-typo-in-escsiignore.patch serial-max310x-fix-syntax-error-in-irq-error-message.patch tty-serial-samsung-fix-tx_empty-to-return-tiocser_te.patch arm64-dts-broadcom-bcmbca-bcm4908-drop-invalid-switc.patch -coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch kconfig-fix-infinite-loop-when-expanding-a-macro-at-.patch rtc-mt6397-select-irq_domain-instead-of-depending-on.patch serial-8250_exar-don-t-remove-gpio-device-on-suspend.patch diff --git a/queue-6.1/coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch b/queue-6.1/coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch deleted file mode 100644 index 9f592f30bbf..00000000000 --- a/queue-6.1/coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 2469efbf4f844d21bdba68ea4a8216e69975eacb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jan 2024 02:54:19 -0800 -Subject: coresight: etm4x: Set skip_power_up in etm4_init_arch_data function - -From: Mao Jinlong - -[ Upstream commit 1bbe0a247e5d72f723daeecf41596bfa99e199f1 ] - -skip_power_up is used in etm4_init_arch_data when set lpoverride. So -need to set the value of it before calling using it. - -Fixes: 5214b563588e ("coresight: etm4x: Add support for sysreg only devices") -Signed-off-by: Mao Jinlong -Signed-off-by: Suzuki K Poulose -Link: https://lore.kernel.org/r/20240131105423.9519-1-quic_jinlmao@quicinc.com -Signed-off-by: Sasha Levin ---- - drivers/hwtracing/coresight/coresight-etm4x-core.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index fda48a0afc1a5..5b1362aef14ae 100644 ---- a/drivers/hwtracing/coresight/coresight-etm4x-core.c -+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c -@@ -1081,6 +1081,7 @@ static void etm4_init_arch_data(void *info) - struct etm4_init_arg *init_arg = info; - struct etmv4_drvdata *drvdata; - struct csdev_access *csa; -+ struct device *dev = init_arg->dev; - int i; - - drvdata = init_arg->drvdata; -@@ -1094,6 +1095,10 @@ static void etm4_init_arch_data(void *info) - if (!etm4_init_csdev_access(drvdata, csa)) - return; - -+ if (!csa->io_mem || -+ fwnode_property_present(dev_fwnode(dev), "qcom,skip-power-up")) -+ drvdata->skip_power_up = true; -+ - /* Detect the support for OS Lock before we actually use it */ - etm_detect_os_lock(drvdata, csa); - -@@ -1952,11 +1957,6 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid) - if (!drvdata->arch) - return -EINVAL; - -- /* TRCPDCR is not accessible with system instructions. */ -- if (!desc.access.io_mem || -- fwnode_property_present(dev_fwnode(dev), "qcom,skip-power-up")) -- drvdata->skip_power_up = true; -- - major = ETM_ARCH_MAJOR_VERSION(drvdata->arch); - minor = ETM_ARCH_MINOR_VERSION(drvdata->arch); - --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index efb788af8df..773bde5b22e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -391,7 +391,6 @@ tty-vt-fix-20-vs-0x20-typo-in-escsiignore.patch serial-max310x-fix-syntax-error-in-irq-error-message.patch tty-serial-samsung-fix-tx_empty-to-return-tiocser_te.patch arm64-dts-broadcom-bcmbca-bcm4908-drop-invalid-switc.patch -coresight-etm4x-set-skip_power_up-in-etm4_init_arch_.patch kconfig-fix-infinite-loop-when-expanding-a-macro-at-.patch hwtracing-hisi_ptt-move-type-check-to-the-beginning-.patch rtc-mt6397-select-irq_domain-instead-of-depending-on.patch