[01/19] hdata: add secure and trusted boot ntuple to SPIRA-H/S

Message ID 1510421322-27237-2-git-send-email-cclaudio@linux.vnet.ibm.com
State Superseded
Headers show
Series
  • libstb: add support for secure and trusted boot in P9
Related show

Commit Message

Claudio Carvalho Nov. 11, 2017, 5:28 p.m.
This adds to spira-h/s the overall tpmrel structure, which defines
secure and trusted boot related data. The internal data structures are
added in subsequent patches.

Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com>
---
 hdata/spira.c | 1 +
 hdata/spira.h | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Oliver Nov. 21, 2017, 4:10 a.m. | #1
On Sun, Nov 12, 2017 at 4:28 AM, Claudio Carvalho
<cclaudio@linux.vnet.ibm.com> wrote:
> This adds to spira-h/s the overall tpmrel structure, which defines
> secure and trusted boot related data. The internal data structures are
> added in subsequent patches.
>
> Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com>
> ---
>  hdata/spira.c | 1 +
>  hdata/spira.h | 7 ++++---
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hdata/spira.c b/hdata/spira.c
> index 11d3ade..936fadc 100644
> --- a/hdata/spira.c
> +++ b/hdata/spira.c
> @@ -1551,6 +1551,7 @@ static void fixup_spira(void)
>         spira.ntuples.proc_chip = spiras->ntuples.proc_chip;
>         spira.ntuples.hs_data = spiras->ntuples.hs_data;
>         spira.ntuples.ipmi_sensor = spiras->ntuples.ipmi_sensor;
> +       spira.ntuples.node_stb_data = spiras->ntuples.node_stb_data;
>  }
>
>  int parse_hdat(bool is_opal)
> diff --git a/hdata/spira.h b/hdata/spira.h
> index 49acf5c..190afad 100644
> --- a/hdata/spira.h
> +++ b/hdata/spira.h
> @@ -40,7 +40,7 @@ struct spira_ntuple {
>         __be64          padding;
>  } __packed;
>
> -#define SPIRA_NTUPLES_COUNT    0x18
> +#define SPIRA_NTUPLES_COUNT    0x19
>
>  struct spira_ntuples {
>         struct HDIF_array_hdr   array_hdr;
> @@ -69,6 +69,7 @@ struct spira_ntuples {
>         struct spira_ntuple     proc_chip;              /* 0x300 */
>         struct spira_ntuple     hs_data;                /* 0x320 */
>         struct spira_ntuple     ipmi_sensor;            /* 0x360 */
> +       struct spira_ntuple     node_stb_data;          /* 0x380 */
>  };
>
>  struct spira {
> @@ -82,7 +83,7 @@ struct spira {
>          *
>          * According to FSP engineers, this is an okay thing to do.
>          */
> -       u8                      reserved[0xa0];
> +       u8                      reserved[0x80];
>  } __packed __align(0x100);
>
>  extern struct spira spira;
> @@ -146,7 +147,7 @@ struct spiras_ntuples {
>         struct spira_ntuple     hs_data;                /* 0x200 */
>         struct spira_ntuple     hbrt_data;              /* 0x220 */
>         struct spira_ntuple     ipmi_sensor;            /* 0x240 */
> -       struct spira_ntuple     node_data;              /* 0x260 */
> +       struct spira_ntuple     node_stb_data;          /* 0x260 */
>  };
>
>  struct spiras {
> --
> 2.7.4
>

Reviewed-by: Oliver O'Halloran <oohall@gmail.com>
Vasant Hegde Nov. 28, 2017, 6:27 a.m. | #2
On 11/11/2017 10:58 PM, Claudio Carvalho wrote:
> This adds to spira-h/s the overall tpmrel structure, which defines
> secure and trusted boot related data. The internal data structures are
> added in subsequent patches.
>
> Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com>

Looks good to me.


Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>

-Vasant

Patch

diff --git a/hdata/spira.c b/hdata/spira.c
index 11d3ade..936fadc 100644
--- a/hdata/spira.c
+++ b/hdata/spira.c
@@ -1551,6 +1551,7 @@  static void fixup_spira(void)
 	spira.ntuples.proc_chip = spiras->ntuples.proc_chip;
 	spira.ntuples.hs_data = spiras->ntuples.hs_data;
 	spira.ntuples.ipmi_sensor = spiras->ntuples.ipmi_sensor;
+	spira.ntuples.node_stb_data = spiras->ntuples.node_stb_data;
 }
 
 int parse_hdat(bool is_opal)
diff --git a/hdata/spira.h b/hdata/spira.h
index 49acf5c..190afad 100644
--- a/hdata/spira.h
+++ b/hdata/spira.h
@@ -40,7 +40,7 @@  struct spira_ntuple {
 	__be64		padding;
 } __packed;
 
-#define SPIRA_NTUPLES_COUNT	0x18
+#define SPIRA_NTUPLES_COUNT	0x19
 
 struct spira_ntuples {
 	struct HDIF_array_hdr	array_hdr;
@@ -69,6 +69,7 @@  struct spira_ntuples {
 	struct spira_ntuple	proc_chip;		/* 0x300 */
 	struct spira_ntuple	hs_data;		/* 0x320 */
 	struct spira_ntuple	ipmi_sensor;		/* 0x360 */
+	struct spira_ntuple	node_stb_data;		/* 0x380 */
 };
 
 struct spira {
@@ -82,7 +83,7 @@  struct spira {
 	 *
 	 * According to FSP engineers, this is an okay thing to do.
 	 */
-	u8			reserved[0xa0];
+	u8			reserved[0x80];
 } __packed __align(0x100);
 
 extern struct spira spira;
@@ -146,7 +147,7 @@  struct spiras_ntuples {
 	struct spira_ntuple	hs_data;		/* 0x200 */
 	struct spira_ntuple	hbrt_data;		/* 0x220 */
 	struct spira_ntuple	ipmi_sensor;		/* 0x240 */
-	struct spira_ntuple	node_data;		/* 0x260 */
+	struct spira_ntuple	node_stb_data;		/* 0x260 */
 };
 
 struct spiras {