diff mbox series

[edk2,edk2-platforms,1/2] Silicon/SynQuacer: add optional OP-TEE DT node

Message ID 1533207158-18652-1-git-send-email-sumit.garg@linaro.org
State New
Headers show
Series [edk2,edk2-platforms,1/2] Silicon/SynQuacer: add optional OP-TEE DT node | expand

Commit Message

Sumit Garg Aug. 2, 2018, 10:52 a.m. UTC 
OP-TEE is optional on Developerbox controlled via SCP firmware. To check
if we need to enable OP-TEE DT node, we use "IsOpteePresent" OpteeLib api.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>

---
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc   |  1 +
 .../Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi  |  8 +++++++
 .../SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c  | 28 ++++++++++++++++++++++
 .../SynQuacerDtbLoaderLib.inf                      |  2 ++
 4 files changed, 39 insertions(+)

-- 
2.7.4

Comments

Ard Biesheuvel Aug. 2, 2018, 7:22 p.m. UTC | #1 
On 2 August 2018 at 12:52, Sumit Garg <sumit.garg@linaro.org> wrote:
> OP-TEE is optional on Developerbox controlled via SCP firmware. To check

> if we need to enable OP-TEE DT node, we use "IsOpteePresent" OpteeLib api.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Sumit Garg <sumit.garg@linaro.org>


Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Pushed as 9dae9a0c7996..02daa58c21f8

However, I noticed only just now that you did not cc the edk2 mailing
list on these patches

Could you please resend them with my reviewed-by added and cc
edk2-devel@lists.01.org and leif.lindholm@Linaro.org?

And please add a cover letter if you are sending more than one patch.


> ---

>  Platform/Socionext/DeveloperBox/DeveloperBox.dsc   |  1 +

>  .../Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi  |  8 +++++++

>  .../SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c  | 28 ++++++++++++++++++++++

>  .../SynQuacerDtbLoaderLib.inf                      |  2 ++

>  4 files changed, 39 insertions(+)

>

> diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc

> index fc498eb65217..4ff5df978e8e 100644

> --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc

> +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc

> @@ -76,6 +76,7 @@ [LibraryClasses.common]

>    ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf

>    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

>    ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf

> +  OpteeLib|ArmPkg/Library/OpteeLib/OpteeLib.inf

>

>    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

>    BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf

> diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi

> index 37d642e4b237..d6a5f013e58c 100644

> --- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi

> +++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi

> @@ -574,6 +574,14 @@

>          #address-cells = <1>;

>          #size-cells = <0>;

>      };

> +

> +    firmware {

> +        optee {

> +            compatible = "linaro,optee-tz";

> +            method = "smc";

> +            status = "disabled";

> +        };

> +    };

>  };

>

>  #include "SynQuacerCaches.dtsi"

> diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c

> index 897d06743708..77db30c204fe 100644

> --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c

> +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c

> @@ -19,6 +19,7 @@

>  #include <Library/DebugLib.h>

>  #include <Library/DxeServicesLib.h>

>  #include <Library/MemoryAllocationLib.h>

> +#include <Library/OpteeLib.h>

>  #include <Platform/VarStore.h>

>

>  // add enough space for three instances of 'status = "disabled"'

> @@ -47,6 +48,29 @@ DisableDtNode (

>    }

>  }

>

> +STATIC

> +VOID

> +EnableDtNode (

> +  IN  VOID                        *Dtb,

> +  IN  CONST CHAR8                 *NodePath

> +  )

> +{

> +  INT32                           Node;

> +  INT32                           Rc;

> +

> +  Node = fdt_path_offset (Dtb, NodePath);

> +  if (Node < 0) {

> +    DEBUG ((DEBUG_ERROR, "%a: failed to locate DT path '%a': %a\n",

> +      __FUNCTION__, NodePath, fdt_strerror (Node)));

> +    return;

> +  }

> +  Rc = fdt_setprop_string (Dtb, Node, "status", "okay");

> +  if (Rc < 0) {

> +    DEBUG ((DEBUG_ERROR, "%a: failed to set status to 'disabled' on '%a': %a\n",

> +      __FUNCTION__, NodePath, fdt_strerror (Rc)));

> +  }

> +}

> +

>  /**

>    Return a pool allocated copy of the DTB image that is appropriate for

>    booting the current platform via DT.

> @@ -107,6 +131,10 @@ DtPlatformLoadDtb (

>      DisableDtNode (CopyDtb, "/sdhci@52300000");

>    }

>

> +  if (IsOpteePresent()) {

> +    EnableDtNode (CopyDtb, "/firmware/optee");

> +  }

> +

>    *Dtb = CopyDtb;

>    *DtbSize = CopyDtbSize;

>

> diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf

> index 548d62fd5c0a..fd21f7c376ce 100644

> --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf

> +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf

> @@ -24,6 +24,7 @@ [Sources]

>    SynQuacerDtbLoaderLib.c

>

>  [Packages]

> +  ArmPkg/ArmPkg.dec

>    MdePkg/MdePkg.dec

>    EmbeddedPkg/EmbeddedPkg.dec

>    Silicon/Socionext/SynQuacer/SynQuacer.dec

> @@ -34,6 +35,7 @@ [LibraryClasses]

>    DxeServicesLib

>    FdtLib

>    MemoryAllocationLib

> +  OpteeLib

>

>  [Pcd]

>    gSynQuacerTokenSpaceGuid.PcdPcieEnableMask

> --

> 2.7.4

>
Sumit Garg Aug. 3, 2018, 5:17 a.m. UTC | #2 
On Fri, 3 Aug 2018 at 00:52, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>

> On 2 August 2018 at 12:52, Sumit Garg <sumit.garg@linaro.org> wrote:

> > OP-TEE is optional on Developerbox controlled via SCP firmware. To check

> > if we need to enable OP-TEE DT node, we use "IsOpteePresent" OpteeLib api.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Sumit Garg <sumit.garg@linaro.org>

>

> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>

> Pushed as 9dae9a0c7996..02daa58c21f8

>


Thanks for your review and merge.

> However, I noticed only just now that you did not cc the edk2 mailing

> list on these patches


Actually I have sent these patches from internal review perspective as
I think I am relatively new to edk2 upstreaming.

>

> Could you please resend them with my reviewed-by added and cc

> edk2-devel@lists.01.org and leif.lindholm@Linaro.org?

>

> And please add a cover letter if you are sending more than one patch.

>


Sure I will post these patches on edk2 list with your reviewed-by and
Leif in cc. Also will create cover letter for this patch-set.

-Sumit

>

> > ---

> >  Platform/Socionext/DeveloperBox/DeveloperBox.dsc   |  1 +

> >  .../Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi  |  8 +++++++

> >  .../SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c  | 28 ++++++++++++++++++++++

> >  .../SynQuacerDtbLoaderLib.inf                      |  2 ++

> >  4 files changed, 39 insertions(+)

> >

> > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc

> > index fc498eb65217..4ff5df978e8e 100644

> > --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc

> > +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc

> > @@ -76,6 +76,7 @@ [LibraryClasses.common]

> >    ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf

> >    ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

> >    ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf

> > +  OpteeLib|ArmPkg/Library/OpteeLib/OpteeLib.inf

> >

> >    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

> >    BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf

> > diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi

> > index 37d642e4b237..d6a5f013e58c 100644

> > --- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi

> > +++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi

> > @@ -574,6 +574,14 @@

> >          #address-cells = <1>;

> >          #size-cells = <0>;

> >      };

> > +

> > +    firmware {

> > +        optee {

> > +            compatible = "linaro,optee-tz";

> > +            method = "smc";

> > +            status = "disabled";

> > +        };

> > +    };

> >  };

> >

> >  #include "SynQuacerCaches.dtsi"

> > diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c

> > index 897d06743708..77db30c204fe 100644

> > --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c

> > +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c

> > @@ -19,6 +19,7 @@

> >  #include <Library/DebugLib.h>

> >  #include <Library/DxeServicesLib.h>

> >  #include <Library/MemoryAllocationLib.h>

> > +#include <Library/OpteeLib.h>

> >  #include <Platform/VarStore.h>

> >

> >  // add enough space for three instances of 'status = "disabled"'

> > @@ -47,6 +48,29 @@ DisableDtNode (

> >    }

> >  }

> >

> > +STATIC

> > +VOID

> > +EnableDtNode (

> > +  IN  VOID                        *Dtb,

> > +  IN  CONST CHAR8                 *NodePath

> > +  )

> > +{

> > +  INT32                           Node;

> > +  INT32                           Rc;

> > +

> > +  Node = fdt_path_offset (Dtb, NodePath);

> > +  if (Node < 0) {

> > +    DEBUG ((DEBUG_ERROR, "%a: failed to locate DT path '%a': %a\n",

> > +      __FUNCTION__, NodePath, fdt_strerror (Node)));

> > +    return;

> > +  }

> > +  Rc = fdt_setprop_string (Dtb, Node, "status", "okay");

> > +  if (Rc < 0) {

> > +    DEBUG ((DEBUG_ERROR, "%a: failed to set status to 'disabled' on '%a': %a\n",

> > +      __FUNCTION__, NodePath, fdt_strerror (Rc)));

> > +  }

> > +}

> > +

> >  /**

> >    Return a pool allocated copy of the DTB image that is appropriate for

> >    booting the current platform via DT.

> > @@ -107,6 +131,10 @@ DtPlatformLoadDtb (

> >      DisableDtNode (CopyDtb, "/sdhci@52300000");

> >    }

> >

> > +  if (IsOpteePresent()) {

> > +    EnableDtNode (CopyDtb, "/firmware/optee");

> > +  }

> > +

> >    *Dtb = CopyDtb;

> >    *DtbSize = CopyDtbSize;

> >

> > diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf

> > index 548d62fd5c0a..fd21f7c376ce 100644

> > --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf

> > +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf

> > @@ -24,6 +24,7 @@ [Sources]

> >    SynQuacerDtbLoaderLib.c

> >

> >  [Packages]

> > +  ArmPkg/ArmPkg.dec

> >    MdePkg/MdePkg.dec

> >    EmbeddedPkg/EmbeddedPkg.dec

> >    Silicon/Socionext/SynQuacer/SynQuacer.dec

> > @@ -34,6 +35,7 @@ [LibraryClasses]

> >    DxeServicesLib

> >    FdtLib

> >    MemoryAllocationLib

> > +  OpteeLib

> >

> >  [Pcd]

> >    gSynQuacerTokenSpaceGuid.PcdPcieEnableMask

> > --

> > 2.7.4

> >
diff mbox series

Patch

diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index fc498eb65217..4ff5df978e8e 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -76,6 +76,7 @@  [LibraryClasses.common]
   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
+  OpteeLib|ArmPkg/Library/OpteeLib/OpteeLib.inf
 
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
diff --git a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi
index 37d642e4b237..d6a5f013e58c 100644
--- a/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi
+++ b/Silicon/Socionext/SynQuacer/DeviceTree/SynQuacer.dtsi
@@ -574,6 +574,14 @@ 
         #address-cells = <1>;
         #size-cells = <0>;
     };
+
+    firmware {
+        optee {
+            compatible = "linaro,optee-tz";
+            method = "smc";
+            status = "disabled";
+        };
+    };
 };
 
 #include "SynQuacerCaches.dtsi"
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c
index 897d06743708..77db30c204fe 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c
@@ -19,6 +19,7 @@ 
 #include <Library/DebugLib.h>
 #include <Library/DxeServicesLib.h>
 #include <Library/MemoryAllocationLib.h>
+#include <Library/OpteeLib.h>
 #include <Platform/VarStore.h>
 
 // add enough space for three instances of 'status = "disabled"'
@@ -47,6 +48,29 @@  DisableDtNode (
   }
 }
 
+STATIC
+VOID
+EnableDtNode (
+  IN  VOID                        *Dtb,
+  IN  CONST CHAR8                 *NodePath
+  )
+{
+  INT32                           Node;
+  INT32                           Rc;
+
+  Node = fdt_path_offset (Dtb, NodePath);
+  if (Node < 0) {
+    DEBUG ((DEBUG_ERROR, "%a: failed to locate DT path '%a': %a\n",
+      __FUNCTION__, NodePath, fdt_strerror (Node)));
+    return;
+  }
+  Rc = fdt_setprop_string (Dtb, Node, "status", "okay");
+  if (Rc < 0) {
+    DEBUG ((DEBUG_ERROR, "%a: failed to set status to 'disabled' on '%a': %a\n",
+      __FUNCTION__, NodePath, fdt_strerror (Rc)));
+  }
+}
+
 /**
   Return a pool allocated copy of the DTB image that is appropriate for
   booting the current platform via DT.
@@ -107,6 +131,10 @@  DtPlatformLoadDtb (
     DisableDtNode (CopyDtb, "/sdhci@52300000");
   }
 
+  if (IsOpteePresent()) {
+    EnableDtNode (CopyDtb, "/firmware/optee");
+  }
+
   *Dtb = CopyDtb;
   *DtbSize = CopyDtbSize;
 
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf
index 548d62fd5c0a..fd21f7c376ce 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf
@@ -24,6 +24,7 @@  [Sources]
   SynQuacerDtbLoaderLib.c
 
 [Packages]
+  ArmPkg/ArmPkg.dec
   MdePkg/MdePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   Silicon/Socionext/SynQuacer/SynQuacer.dec
@@ -34,6 +35,7 @@  [LibraryClasses]
   DxeServicesLib
   FdtLib
   MemoryAllocationLib
+  OpteeLib
 
 [Pcd]
   gSynQuacerTokenSpaceGuid.PcdPcieEnableMask