5.10-stable patches

added patches:
	of-unittest-fix-build-on-architectures-without-config_of_address.patch
	revert-arm64-dts-amlogic-add-missing-ethernet-reset-id.patch

diff --git a/queue-5.10/iommu-vt-d-fix-status-code-for-allocate-free-pasid-c.patch b/queue-5.10/iommu-vt-d-fix-status-code-for-allocate-free-pasid-c.patch
index 31f18baad83c3f0f6e484c24fb05fca32a45fcac..e20685b21c58cd2232aac479c216b55bf25a53ba 100644 (file)
--- a/queue-5.10/iommu-vt-d-fix-status-code-for-allocate-free-pasid-c.patch
+++ b/queue-5.10/iommu-vt-d-fix-status-code-for-allocate-free-pasid-c.patch
@@ -22,11 +22,9 @@ Link: https://lore.kernel.org/r/20210227073909.432-1-yuzenghui@huawei.com
 Signed-off-by: Joerg Roedel <jroedel@suse.de>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/iommu/intel/pasid.h | 4 ++--
+ drivers/iommu/intel/pasid.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/iommu/intel/pasid.h b/drivers/iommu/intel/pasid.h
-index 97dfcffbf495..444c0bec221a 100644
 --- a/drivers/iommu/intel/pasid.h
 +++ b/drivers/iommu/intel/pasid.h
 @@ -30,8 +30,8 @@
@@ -40,6 +38,3 @@ index 97dfcffbf495..444c0bec221a 100644
  #define VCMD_VRSP_RESULT_PASID(e)     (((e) >> 8) & 0xfffff)
  #define VCMD_CMD_OPERAND(e)           ((e) << 8)
  /*
--- 
-2.30.1
-

diff --git a/queue-5.10/of-unittest-fix-build-on-architectures-without-config_of_address.patch b/queue-5.10/of-unittest-fix-build-on-architectures-without-config_of_address.patch
new file mode 100644 (file)
index 0000000..b7efde1
--- /dev/null
+++ b/queue-5.10/of-unittest-fix-build-on-architectures-without-config_of_address.patch
@@ -0,0 +1,33 @@
+From aed5041ef9a3f594ed9dc0bb5ee7e1bbccfd3366 Mon Sep 17 00:00:00 2001
+From: Catalin Marinas <catalin.marinas@arm.com>
+Date: Tue, 1 Dec 2020 12:47:25 +0000
+Subject: of: unittest: Fix build on architectures without CONFIG_OF_ADDRESS
+
+From: Catalin Marinas <catalin.marinas@arm.com>
+
+commit aed5041ef9a3f594ed9dc0bb5ee7e1bbccfd3366 upstream.
+
+of_dma_get_max_cpu_address() is not defined if !CONFIG_OF_ADDRESS, so
+return early in of_unittest_dma_get_max_cpu_address().
+
+Fixes: 07d13a1d6120 ("of: unittest: Add test for of_dma_get_max_cpu_address()")
+Reported-by: kernel test robot <lkp@intel.com>
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Cc: Jing Xiangfeng <jingxiangfeng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/of/unittest.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/of/unittest.c
++++ b/drivers/of/unittest.c
+@@ -874,6 +874,9 @@ static void __init of_unittest_dma_get_m
+       struct device_node *np;
+       phys_addr_t cpu_addr;
+ 
++      if (!IS_ENABLED(CONFIG_OF_ADDRESS))
++              return;
++
+       np = of_find_node_by_path("/testcase-data/address-tests");
+       if (!np) {
+               pr_err("missing testcase data\n");

diff --git a/queue-5.10/revert-arm64-dts-amlogic-add-missing-ethernet-reset-id.patch b/queue-5.10/revert-arm64-dts-amlogic-add-missing-ethernet-reset-id.patch
new file mode 100644 (file)
index 0000000..e2a81ea
--- /dev/null
+++ b/queue-5.10/revert-arm64-dts-amlogic-add-missing-ethernet-reset-id.patch
@@ -0,0 +1,74 @@
+From 19f6fe976a61f9afc289b062b7ef67f99b72e7b9 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Tue, 26 Jan 2021 09:09:51 +0100
+Subject: Revert "arm64: dts: amlogic: add missing ethernet reset ID"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Neil Armstrong <narmstrong@baylibre.com>
+
+commit 19f6fe976a61f9afc289b062b7ef67f99b72e7b9 upstream.
+
+It has been reported on IRC and in KernelCI boot tests, this change breaks
+internal PHY support on the Amlogic G12A/SM1 Based boards.
+
+We suspect the added signal to reset more than the Ethernet MAC but also
+the MDIO/(RG)MII mux used to redirect the MAC signals to the internal PHY.
+
+This reverts commit f3362f0c18174a1f334a419ab7d567a36bd1b3f3 while we find
+and acceptable solution to cleanly reset the Ethernet MAC.
+
+Reported-by: Corentin Labbe <clabbe@baylibre.com>
+Acked-by: Jérôme Brunet <jbrunet@baylibre.com>
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+Signed-off-by: Kevin Hilman <khilman@baylibre.com>
+Link: https://lore.kernel.org/r/20210126080951.2383740-1-narmstrong@baylibre.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi        |    2 --
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi |    2 --
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi         |    3 ---
+ 3 files changed, 7 deletions(-)
+
+--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+@@ -227,8 +227,6 @@
+                                     "timing-adjustment";
+                       rx-fifo-depth = <4096>;
+                       tx-fifo-depth = <2048>;
+-                      resets = <&reset RESET_ETHERNET>;
+-                      reset-names = "stmmaceth";
+                       status = "disabled";
+               };
+ 
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -224,8 +224,6 @@
+                                     "timing-adjustment";
+                       rx-fifo-depth = <4096>;
+                       tx-fifo-depth = <2048>;
+-                      resets = <&reset RESET_ETHERNET>;
+-                      reset-names = "stmmaceth";
+                       status = "disabled";
+ 
+                       mdio0: mdio {
+--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+@@ -13,7 +13,6 @@
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/power/meson-gxbb-power.h>
+-#include <dt-bindings/reset/amlogic,meson-gxbb-reset.h>
+ #include <dt-bindings/thermal/thermal.h>
+ 
+ / {
+@@ -576,8 +575,6 @@
+                       interrupt-names = "macirq";
+                       rx-fifo-depth = <4096>;
+                       tx-fifo-depth = <2048>;
+-                      resets = <&reset RESET_ETHERNET>;
+-                      reset-names = "stmmaceth";
+                       power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
+                       status = "disabled";
+               };

diff --git a/queue-5.10/series b/queue-5.10/series
index f3ba0522da8e944d296b1b4bf47f5baf00cd9825..01659cc9ea4392bb9ab381ece360237ee8aab259 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -36,3 +36,5 @@ alsa-hda-intel-nhlt-verify-config-type.patch
 ftrace-have-recordmcount-use-w8-to-read-relp-r_info-.patch
 rsxx-return-efault-if-copy_to_user-fails.patch
 iommu-vt-d-fix-status-code-for-allocate-free-pasid-c.patch
+revert-arm64-dts-amlogic-add-missing-ethernet-reset-id.patch
+of-unittest-fix-build-on-architectures-without-config_of_address.patch