* [U-Boot] [PATCH] fsl_sfp : Modify macros as per changes in SFP v3.4
@ 2016-08-31 12:55 Sumit Garg
2016-08-31 15:33 ` [U-Boot] [u-boot-release] " york sun
0 siblings, 1 reply; 4+ messages in thread
From: Sumit Garg @ 2016-08-31 12:55 UTC (permalink / raw)
To: u-boot
In SFP v3.4 support for 8 keys in SRK table has been added which leads
to corresponding changes in OSPR key revocation field. So modify
OSPR_KEY_REVOC_XXX macros accordingly.
Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
---
include/fsl_sfp.h | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
index 2976a2c..42ff942 100644
--- a/include/fsl_sfp.h
+++ b/include/fsl_sfp.h
@@ -32,7 +32,7 @@
/* Number of SRKH registers */
#define NUM_SRKH_REGS 8
-#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
+#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
defined(CONFIG_SYS_FSL_SFP_VER_3_4)
struct ccsr_sfp_regs {
u32 ospr; /* 0x200 */
@@ -57,7 +57,7 @@ struct ccsr_sfp_regs {
u32 srk_hash[NUM_SRKH_REGS]; /* 0x23c Super Root Key Hash */
u32 oem_uid; /* 0x9c OEM Unique ID */
u8 reserved2[0x04];
- u32 ovpr; /* 0xA4 Intent To Secure */
+ u32 ovpr; /* 0xA4 Intent To Secure */
u8 reserved4[0x08];
u32 fsl_uid; /* 0xB0 FSL Unique ID */
u8 reserved5[0x04];
@@ -68,19 +68,26 @@ struct ccsr_sfp_regs {
#else
struct ccsr_sfp_regs {
u8 reserved0[0x40];
- u32 ospr; /* 0x40 OEM Security Policy Register */
+ u32 ospr; /* 0x40 OEM Security Policy Register */
u8 reserved2[0x38];
u32 srk_hash[8]; /* 0x7c Super Root Key Hash */
- u32 oem_uid; /* 0x9c OEM Unique ID */
+ u32 oem_uid; /* 0x9c OEM Unique ID */
u8 reserved4[0x4];
- u32 ovpr; /* 0xA4 OEM Validation Policy Register */
+ u32 ovpr; /* 0xA4 OEM Validation Policy Register */
u8 reserved8[0x8];
- u32 fsl_uid; /* 0xB0 FSL Unique ID */
+ u32 fsl_uid; /* 0xB0 FSL Unique ID */
};
#endif
+
#define ITS_MASK 0x00000004
#define ITS_BIT 2
-#define OSPR_KEY_REVOC_SHIFT 13
-#define OSPR_KEY_REVOC_MASK 0x0000e000
+
+#if defined(CONFIG_SYS_FSL_SFP_VER_3_4)
+#define OSPR_KEY_REVOC_SHIFT 9
+#define OSPR_KEY_REVOC_MASK 0x0000fe00
+#else
+#define OSPR_KEY_REVOC_SHIFT 13
+#define OSPR_KEY_REVOC_MASK 0x0000e000
+#endif /* CONFIG_SYS_FSL_SFP_VER_3_4 */
#endif
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [U-Boot] [u-boot-release] [PATCH] fsl_sfp : Modify macros as per changes in SFP v3.4
2016-08-31 12:55 [U-Boot] [PATCH] fsl_sfp : Modify macros as per changes in SFP v3.4 Sumit Garg
@ 2016-08-31 15:33 ` york sun
2016-09-01 5:14 ` Sumit Garg
0 siblings, 1 reply; 4+ messages in thread
From: york sun @ 2016-08-31 15:33 UTC (permalink / raw)
To: u-boot
On 08/30/2016 11:34 PM, Sumit Garg wrote:
> In SFP v3.4 support for 8 keys in SRK table has been added which leads
I guess you mean "SFP v3.4 supports 8 keys ...".
> to corresponding changes in OSPR key revocation field. So modify
> OSPR_KEY_REVOC_XXX macros accordingly.
>
> Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
> ---
> include/fsl_sfp.h | 23 +++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
> index 2976a2c..42ff942 100644
> --- a/include/fsl_sfp.h
> +++ b/include/fsl_sfp.h
> @@ -32,7 +32,7 @@
> /* Number of SRKH registers */
> #define NUM_SRKH_REGS 8
>
> -#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
> +#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
> defined(CONFIG_SYS_FSL_SFP_VER_3_4)
> struct ccsr_sfp_regs {
> u32 ospr; /* 0x200 */
> @@ -57,7 +57,7 @@ struct ccsr_sfp_regs {
> u32 srk_hash[NUM_SRKH_REGS]; /* 0x23c Super Root Key Hash */
> u32 oem_uid; /* 0x9c OEM Unique ID */
> u8 reserved2[0x04];
> - u32 ovpr; /* 0xA4 Intent To Secure */
> + u32 ovpr; /* 0xA4 Intent To Secure */
Please don't mix whitespace change in this patch.
York
^ permalink raw reply [flat|nested] 4+ messages in thread* [U-Boot] [u-boot-release] [PATCH] fsl_sfp : Modify macros as per changes in SFP v3.4
2016-08-31 15:33 ` [U-Boot] [u-boot-release] " york sun
@ 2016-09-01 5:14 ` Sumit Garg
2016-09-01 16:29 ` york sun
0 siblings, 1 reply; 4+ messages in thread
From: Sumit Garg @ 2016-09-01 5:14 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: york sun
> Sent: Wednesday, August 31, 2016 9:04 PM
> To: Sumit Garg <sumit.garg@nxp.com>; u-boot at lists.denx.de
> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; Ruchika Gupta
> <ruchika.gupta@nxp.com>
> Subject: Re: [u-boot-release] [PATCH] fsl_sfp : Modify macros as per changes
> in SFP v3.4
>
> On 08/30/2016 11:34 PM, Sumit Garg wrote:
> > In SFP v3.4 support for 8 keys in SRK table has been added which leads
>
> I guess you mean "SFP v3.4 supports 8 keys ...".
>
I will correct this.
> > to corresponding changes in OSPR key revocation field. So modify
> > OSPR_KEY_REVOC_XXX macros accordingly.
> >
> > Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
> > ---
> > include/fsl_sfp.h | 23 +++++++++++++++--------
> > 1 file changed, 15 insertions(+), 8 deletions(-)
> >
> > diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h index
> > 2976a2c..42ff942 100644
> > --- a/include/fsl_sfp.h
> > +++ b/include/fsl_sfp.h
> > @@ -32,7 +32,7 @@
> > /* Number of SRKH registers */
> > #define NUM_SRKH_REGS 8
> >
> > -#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
> > +#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
> > defined(CONFIG_SYS_FSL_SFP_VER_3_4)
> > struct ccsr_sfp_regs {
> > u32 ospr; /* 0x200 */
> > @@ -57,7 +57,7 @@ struct ccsr_sfp_regs {
> > u32 srk_hash[NUM_SRKH_REGS]; /* 0x23c Super Root Key Hash
> */
> > u32 oem_uid; /* 0x9c OEM Unique ID */
> > u8 reserved2[0x04];
> > - u32 ovpr; /* 0xA4 Intent To Secure */
> > + u32 ovpr; /* 0xA4 Intent To Secure */
>
> Please don't mix whitespace change in this patch.
>
> York
Should I split this patch and make a separate patch for the cleanup?
-Sumit
^ permalink raw reply [flat|nested] 4+ messages in thread* [U-Boot] [u-boot-release] [PATCH] fsl_sfp : Modify macros as per changes in SFP v3.4
2016-09-01 5:14 ` Sumit Garg
@ 2016-09-01 16:29 ` york sun
0 siblings, 0 replies; 4+ messages in thread
From: york sun @ 2016-09-01 16:29 UTC (permalink / raw)
To: u-boot
On 08/31/2016 10:14 PM, Sumit Garg wrote:
>> -----Original Message-----
>> From: york sun
>> Sent: Wednesday, August 31, 2016 9:04 PM
>> To: Sumit Garg <sumit.garg@nxp.com>; u-boot at lists.denx.de
>> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; Ruchika Gupta
>> <ruchika.gupta@nxp.com>
>> Subject: Re: [u-boot-release] [PATCH] fsl_sfp : Modify macros as per changes
>> in SFP v3.4
>>
>> On 08/30/2016 11:34 PM, Sumit Garg wrote:
>>> In SFP v3.4 support for 8 keys in SRK table has been added which leads
>>
>> I guess you mean "SFP v3.4 supports 8 keys ...".
>>
> I will correct this.
>
>>> to corresponding changes in OSPR key revocation field. So modify
>>> OSPR_KEY_REVOC_XXX macros accordingly.
>>>
>>> Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
>>> ---
>>> include/fsl_sfp.h | 23 +++++++++++++++--------
>>> 1 file changed, 15 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h index
>>> 2976a2c..42ff942 100644
>>> --- a/include/fsl_sfp.h
>>> +++ b/include/fsl_sfp.h
>>> @@ -32,7 +32,7 @@
>>> /* Number of SRKH registers */
>>> #define NUM_SRKH_REGS 8
>>>
>>> -#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
>>> +#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \
>>> defined(CONFIG_SYS_FSL_SFP_VER_3_4)
>>> struct ccsr_sfp_regs {
>>> u32 ospr; /* 0x200 */
>>> @@ -57,7 +57,7 @@ struct ccsr_sfp_regs {
>>> u32 srk_hash[NUM_SRKH_REGS]; /* 0x23c Super Root Key Hash
>> */
>>> u32 oem_uid; /* 0x9c OEM Unique ID */
>>> u8 reserved2[0x04];
>>> - u32 ovpr; /* 0xA4 Intent To Secure */
>>> + u32 ovpr; /* 0xA4 Intent To Secure */
>>
>> Please don't mix whitespace change in this patch.
>>
>> York
>
> Should I split this patch and make a separate patch for the cleanup?
A cleanup is welcomed. If needed, it should be in a separated patch.
York
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-01 16:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-31 12:55 [U-Boot] [PATCH] fsl_sfp : Modify macros as per changes in SFP v3.4 Sumit Garg
2016-08-31 15:33 ` [U-Boot] [u-boot-release] " york sun
2016-09-01 5:14 ` Sumit Garg
2016-09-01 16:29 ` york sun
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.