5.15-stable patches

added patches:
	net-ipa-fix-a-build-dependency.patch
	soc-qcom-aoss-fix-missing-put_device-call-in-qmp_get.patch

diff --git a/queue-5.15/net-ipa-fix-a-build-dependency.patch b/queue-5.15/net-ipa-fix-a-build-dependency.patch
new file mode 100644 (file)
index 0000000..06aa19a
--- /dev/null
+++ b/queue-5.15/net-ipa-fix-a-build-dependency.patch
@@ -0,0 +1,42 @@
+From caef14b7530c065fb85d54492768fa48fdb5093e Mon Sep 17 00:00:00 2001
+From: Alex Elder <elder@linaro.org>
+Date: Fri, 25 Feb 2022 14:15:30 -0600
+Subject: net: ipa: fix a build dependency
+
+From: Alex Elder <elder@linaro.org>
+
+commit caef14b7530c065fb85d54492768fa48fdb5093e upstream.
+
+An IPA build problem arose in the linux-next tree the other day.
+The problem is that a recent commit adds a new dependency on some
+code, and the Kconfig file for IPA doesn't reflect that dependency.
+As a result, some configurations can fail to build (particularly
+when COMPILE_TEST is enabled).
+
+The recent patch adds calls to qmp_get(), qmp_put(), and qmp_send(),
+and those are built based on the QCOM_AOSS_QMP config option.  If
+that symbol is not defined, stubs are defined, so we just need to
+ensure QCOM_AOSS_QMP is compatible with QCOM_IPA, or it's not
+defined.
+
+Reported-by: Randy Dunlap <rdunlap@infradead.org>
+Fixes: 34a081761e4e3 ("net: ipa: request IPA register values be retained")
+Signed-off-by: Alex Elder <elder@linaro.org>
+Tested-by: Randy Dunlap <rdunlap@infradead.org>
+Acked-by: Randy Dunlap <rdunlap@infradead.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ipa/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/ipa/Kconfig
++++ b/drivers/net/ipa/Kconfig
+@@ -4,6 +4,7 @@ config QCOM_IPA
+       depends on ARCH_QCOM || COMPILE_TEST
+       depends on INTERCONNECT
+       depends on QCOM_RPROC_COMMON || (QCOM_RPROC_COMMON=n && COMPILE_TEST)
++      depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
+       select QCOM_MDT_LOADER if ARCH_QCOM
+       select QCOM_SCM
+       select QCOM_QMI_HELPERS

diff --git a/queue-5.15/series b/queue-5.15/series
index 58573e41bedbc17e344d7d0c333ef6a1d005db3f..55c7228739802c7adb634a4eb6aa101efc5b1515 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -176,3 +176,5 @@ timers-fix-warning-condition-in-__run_timers.patch
 dma-direct-avoid-redundant-memory-sync-for-swiotlb.patch
 drm-i915-sunset-igpu-legacy-mmap-support-based-on-graphics_ver_full.patch
 cpu-hotplug-remove-the-cpu-member-of-cpuhp_cpu_state.patch
+soc-qcom-aoss-fix-missing-put_device-call-in-qmp_get.patch
+net-ipa-fix-a-build-dependency.patch

diff --git a/queue-5.15/soc-qcom-aoss-fix-missing-put_device-call-in-qmp_get.patch b/queue-5.15/soc-qcom-aoss-fix-missing-put_device-call-in-qmp_get.patch
new file mode 100644 (file)
index 0000000..ca6237c
--- /dev/null
+++ b/queue-5.15/soc-qcom-aoss-fix-missing-put_device-call-in-qmp_get.patch
@@ -0,0 +1,38 @@
+From 4b41a9d0fe3db5f91078a380f62f0572c3ecf2dd Mon Sep 17 00:00:00 2001
+From: Miaoqian Lin <linmq006@gmail.com>
+Date: Sat, 8 Jan 2022 09:59:31 +0000
+Subject: soc: qcom: aoss: Fix missing put_device call in qmp_get
+
+From: Miaoqian Lin <linmq006@gmail.com>
+
+commit 4b41a9d0fe3db5f91078a380f62f0572c3ecf2dd upstream.
+
+The reference taken by 'of_find_device_by_node()' must be released when
+not needed anymore.
+Add the corresponding 'put_device()' in the error handling paths.
+
+Fixes: 8c75d585b931 ("soc: qcom: aoss: Expose send for generic usecase")
+Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
+Reviewed-by: Stephen Boyd <swboyd@chromium.org>
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Link: https://lore.kernel.org/r/20220108095931.21527-1-linmq006@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/soc/qcom/qcom_aoss.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/soc/qcom/qcom_aoss.c
++++ b/drivers/soc/qcom/qcom_aoss.c
+@@ -551,7 +551,11 @@ struct qmp *qmp_get(struct device *dev)
+ 
+       qmp = platform_get_drvdata(pdev);
+ 
+-      return qmp ? qmp : ERR_PTR(-EPROBE_DEFER);
++      if (!qmp) {
++              put_device(&pdev->dev);
++              return ERR_PTR(-EPROBE_DEFER);
++      }
++      return qmp;
+ }
+ EXPORT_SYMBOL(qmp_get);
+