@@ -1,6 +1,6 @@

-From 994ab9c2b1626c2ccf77fe01e2f4163cbbfac4ec Mon Sep 17 00:00:00 2001

+From afad9332031e9e48a81752f782d992dedf8e08ee Mon Sep 17 00:00:00 2001

 From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>

-Date: Tue, 10 Mar 2020 05:44:52 +0000

+Date: Wed, 3 Dec 2014 13:23:28 +0200

 Subject: [PATCH] OF: DT-Overlay configfs interface

 This is a port of Pantelis Antoniou's v3 port that makes use of the

@@ -47,10 +47,10 @@ Signed-off-by: Ajay Kaher <akaher@vmware.com>

 configfs: New of_overlay API

 ---

- .../devicetree/configfs-overlays.txt          |  31 ++

- drivers/of/Kconfig                            |   7 +

- drivers/of/Makefile                           |   1 +

- drivers/of/configfs.c                         | 310 ++++++++++++++++++

+ Documentation/devicetree/configfs-overlays.txt |  31 +++

+ drivers/of/Kconfig                             |   7 +

+ drivers/of/Makefile                            |   1 +

+ drivers/of/configfs.c                          | 310 +++++++++++++++++++++++++

  4 files changed, 349 insertions(+)

  create mode 100644 Documentation/devicetree/configfs-overlays.txt

  create mode 100644 drivers/of/configfs.c

@@ -93,7 +93,7 @@ index 0000000..5fa43e0

 +intended to be used by hardware managers in the kernel, while the copy interface

 +make sense for developers (since it avoids problems with namespaces).

 diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig

-index 5e13159..7c906e2 100644

+index d916186..f664362 100644

 --- a/drivers/of/Kconfig

 +++ b/drivers/of/Kconfig

 @@ -107,4 +107,11 @@ config OF_DMA_DEFAULT_COHERENT

@@ -437,5 +437,5 @@ index 0000000..178f062

 +}

 +late_initcall(of_cfs_init);

 -- 

-2.19.0

+2.7.4

@@ -1,4 +1,4 @@

-From d52d91b920d4b6ae17adc42375649f1ae190006b Mon Sep 17 00:00:00 2001

+From c6d9dc693051da8f33055c6d7512fb3f4fdd4c38 Mon Sep 17 00:00:00 2001

 From: Phil Elwell <phil@raspberrypi.org>

 Date: Thu, 14 Jun 2018 15:07:26 +0100

 Subject: [PATCH] of: configfs: Use of_overlay_fdt_apply API call

new file mode 100644

@@ -0,0 +1,43 @@

+From f5ba852479c7a135948de601c4caf857f795508f Mon Sep 17 00:00:00 2001

+From: Phil Elwell <phil@raspberrypi.com>

+Date: Thu, 6 Feb 2020 12:23:15 +0000

+Subject: [PATCH] of: overlay: Correct symbol path fixups

+

+When symbols from overlays are added to the live tree their paths must

+be rebased. The translated symbol is normally the result of joining

+the fragment-relative path (with a leading "/") to the target path

+(either copied directly from the "target-path" property or resolved

+from the phandle). This translation fails when the target is the root

+node (a common case for Raspberry Pi overlays) because the resulting

+path starts with a double slash. For example, if target-path is "/" and

+the fragment adds a node called "newnode", the label associated with

+that node will be assigned the path "//newnode", which can't be found

+in the tree.

+

+Fix the failure case by explicitly replacing a target path of "/" with

+an empty string.

+

+Fixes: d1651b03c2df ("of: overlay: add overlay symbols to live device tree")

+

+Signed-off-by: Phil Elwell <phil@raspberrypi.com>

+Signed-off-by: Ajay Kaher <akaher@vmware.com>

+---

+ drivers/of/overlay.c | 2 ++

+ 1 file changed, 2 insertions(+)

+

+diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c

+index 50bbe0e..7e585d2 100644

+--- a/drivers/of/overlay.c

+@@ -245,6 +245,8 @@ static struct property *dup_and_fixup_symbol_prop(

+ 	if (!target_path)

+ 		return NULL;

+ 	target_path_len = strlen(target_path);

++	if (!strcmp(target_path, "/"))

++		target_path_len = 0;

+ 

+ 	new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);

+ 	if (!new_prop)

+-- 

+2.7.4

+

@@ -1875,6 +1875,7 @@ CONFIG_OF_RESERVED_MEM=y

 CONFIG_OF_RESOLVE=y

 CONFIG_OF_OVERLAY=y

 CONFIG_OF_NUMA=y

+CONFIG_OF_CONFIGFS=y

 # CONFIG_PARPORT is not set

 CONFIG_PNP=y

 # CONFIG_PNP_DEBUG_MESSAGES is not set

@@ -13,7 +13,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        5.9.0

-Release:        8%{?kat_build:.kat}%{?dist}

+Release:        9%{?kat_build:.kat}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -85,6 +85,13 @@ Patch103:       perf-core-Fix-a-leak-in-perf-event-parse-addr-filter.patch

 #Fix for CVE-2020-8694

 Patch104:        powercap-restrict-energy-meter-to-root-access.patch

+%ifarch aarch64

+# Rpi of_configfs patches

+Patch201:        0001-OF-DT-Overlay-configfs-interface.patch

+Patch202:        0002-of-configfs-Use-of_overlay_fdt_apply-API-call.patch

+Patch203:        0003-of-overlay-Correct-symbol-path-fixups.patch

+%endif

+

 # Crypto:

 # Patch to add drbg_pr_ctr_aes256 test vectors to testmgr

 Patch500:       crypto-testmgr-Add-drbg_pr_ctr_aes256-test-vectors.patch

@@ -314,6 +321,13 @@ Python programming language to use the interface to manipulate perf events.

 %patch103 -p1

 %patch104 -p1

+%ifarch aarch64

+# Rpi of_configfs patches

+%patch201 -p1

+%patch202 -p1

+%patch203 -p1

+%endif

+

 # crypto

 %patch500 -p1

 %patch501 -p1

@@ -697,6 +711,8 @@ getent group sgx_prv >/dev/null || groupadd -r sgx_prv

 %{python3_sitelib}/*

 %changelog

+*   Wed Dec 09 2020 Ajay Kaher <akaher@vmware.com> 5.9.0-9

+-   To dynamic load Overlays adding of_configfs patches v5.9.y.

 *   Tue Dec 01 2020 Prashant S Chauhan <psinghchauha@vmware.com> 5.9.0-8

 -   Added ami for arm support in linux generic, added multiple drivers

 -   in aarch64 to support aws ami