diff mbox

nvmem: sunxi-sid: add support for A64/H5's SID controller

Message ID 20170918154204.54427-1-icenowy@aosc.io (mailing list archive)
State New, archived
Headers show

Commit Message

Icenowy Zheng Sept. 18, 2017, 3:42 p.m. UTC
Allwinner A64/H5 SoCs come with a SID controller like the one in H3, but
without the silicon bug that makes the initial value at 0x200 wrong, so
the value at 0x200 can be directly read.

Add support for this kind of SID controller.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
---
 Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt | 1 +
 drivers/nvmem/sunxi_sid.c                                       | 6 ++++++
 2 files changed, 7 insertions(+)

Comments

Maxime Ripard Sept. 19, 2017, 8:20 a.m. UTC | #1
On Mon, Sep 18, 2017 at 11:42:04PM +0800, Icenowy Zheng wrote:
> Allwinner A64/H5 SoCs come with a SID controller like the one in H3, but
> without the silicon bug that makes the initial value at 0x200 wrong, so
> the value at 0x200 can be directly read.
> 
> Add support for this kind of SID controller.
> 
> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
> ---
>  Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt | 1 +
>  drivers/nvmem/sunxi_sid.c                                       | 6 ++++++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
> index ef06d061913c..6ea0836939ee 100644
> --- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
> +++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
> @@ -5,6 +5,7 @@ Required properties:
>    "allwinner,sun4i-a10-sid"
>    "allwinner,sun7i-a20-sid"
>    "allwinner,sun8i-h3-sid"
> +  "allwinner,sun50i-a64-sid"
>  
>  - reg: Should contain registers location and length
>  
> diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
> index 0d6648be93b8..3c9fd4fb9207 100644
> --- a/drivers/nvmem/sunxi_sid.c
> +++ b/drivers/nvmem/sunxi_sid.c
> @@ -199,10 +199,16 @@ static const struct sunxi_sid_cfg sun8i_h3_cfg = {
>  	.need_register_readout = true,
>  };
>  
> +static const struct sunxi_sid_cfg sun50i_a64_cfg = {
> +	.value_offset = 0x200,
> +	.size = 0x100,
> +};
> +

How did you get those values?

Also, it's reported that the SID can only be accessed in secure mode,
did you test it?

Maxime
Icenowy Zheng Sept. 19, 2017, 8:23 a.m. UTC | #2
于 2017年9月19日 GMT+08:00 下午4:20:19, Maxime Ripard <maxime.ripard@free-electrons.com> 写到:
>On Mon, Sep 18, 2017 at 11:42:04PM +0800, Icenowy Zheng wrote:
>> Allwinner A64/H5 SoCs come with a SID controller like the one in H3,
>but
>> without the silicon bug that makes the initial value at 0x200 wrong,
>so
>> the value at 0x200 can be directly read.
>> 
>> Add support for this kind of SID controller.
>> 
>> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
>> ---
>>  Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt | 1
>+
>>  drivers/nvmem/sunxi_sid.c                                       | 6
>++++++
>>  2 files changed, 7 insertions(+)
>> 
>> diff --git
>a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> index ef06d061913c..6ea0836939ee 100644
>> --- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> +++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> @@ -5,6 +5,7 @@ Required properties:
>>    "allwinner,sun4i-a10-sid"
>>    "allwinner,sun7i-a20-sid"
>>    "allwinner,sun8i-h3-sid"
>> +  "allwinner,sun50i-a64-sid"
>>  
>>  - reg: Should contain registers location and length
>>  
>> diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
>> index 0d6648be93b8..3c9fd4fb9207 100644
>> --- a/drivers/nvmem/sunxi_sid.c
>> +++ b/drivers/nvmem/sunxi_sid.c
>> @@ -199,10 +199,16 @@ static const struct sunxi_sid_cfg sun8i_h3_cfg
>= {
>>  	.need_register_readout = true,
>>  };
>>  
>> +static const struct sunxi_sid_cfg sun50i_a64_cfg = {
>> +	.value_offset = 0x200,
>> +	.size = 0x100,
>> +};
>> +
>
>How did you get those values?

In the BSP U-Boot headers.

>
>Also, it's reported that the SID can only be accessed in secure mode,
>did you test it?

Yes, however the secure is broken again, and this only
happen if Secure Boot bit is burned.

If it's really burned, we will have no clean way to access SID.

>
>Maxime
Maxime Ripard Sept. 19, 2017, 11:55 a.m. UTC | #3
On Tue, Sep 19, 2017 at 04:23:14PM +0800, Icenowy Zheng wrote:
> 
> 
> 于 2017年9月19日 GMT+08:00 下午4:20:19, Maxime Ripard <maxime.ripard@free-electrons.com> 写到:
> >On Mon, Sep 18, 2017 at 11:42:04PM +0800, Icenowy Zheng wrote:
> >> Allwinner A64/H5 SoCs come with a SID controller like the one in H3,
> >but
> >> without the silicon bug that makes the initial value at 0x200 wrong,
> >so
> >> the value at 0x200 can be directly read.
> >> 
> >> Add support for this kind of SID controller.
> >> 
> >> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
> >> ---
> >>  Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt | 1
> >+
> >>  drivers/nvmem/sunxi_sid.c                                       | 6
> >++++++
> >>  2 files changed, 7 insertions(+)
> >> 
> >> diff --git
> >a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
> >b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
> >> index ef06d061913c..6ea0836939ee 100644
> >> --- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
> >> +++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
> >> @@ -5,6 +5,7 @@ Required properties:
> >>    "allwinner,sun4i-a10-sid"
> >>    "allwinner,sun7i-a20-sid"
> >>    "allwinner,sun8i-h3-sid"
> >> +  "allwinner,sun50i-a64-sid"
> >>  
> >>  - reg: Should contain registers location and length
> >>  
> >> diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
> >> index 0d6648be93b8..3c9fd4fb9207 100644
> >> --- a/drivers/nvmem/sunxi_sid.c
> >> +++ b/drivers/nvmem/sunxi_sid.c
> >> @@ -199,10 +199,16 @@ static const struct sunxi_sid_cfg sun8i_h3_cfg
> >= {
> >>  	.need_register_readout = true,
> >>  };
> >>  
> >> +static const struct sunxi_sid_cfg sun50i_a64_cfg = {
> >> +	.value_offset = 0x200,
> >> +	.size = 0x100,
> >> +};
> >> +
> >
> >How did you get those values?
> 
> In the BSP U-Boot headers.

This should be mentionned in your commit log then.

> >Also, it's reported that the SID can only be accessed in secure
> >mode, did you test it?
> 
> Yes, however the secure is broken again, and this only
> happen if Secure Boot bit is burned.

Is broken again, meaning?

As far as I know, the only breakage we've had is on the A80 / A83T,
but we don't have anything like it on the A64, do we?

> If it's really burned, we will have no clean way to access SID.

Well, in such a case we shouldn't access it either, so..

Maxime
Icenowy Zheng Sept. 19, 2017, 12:19 p.m. UTC | #4
在 2017-09-19 19:55,Maxime Ripard 写道:
> On Tue, Sep 19, 2017 at 04:23:14PM +0800, Icenowy Zheng wrote:
>> 
>> 
>> 于 2017年9月19日 GMT+08:00 下午4:20:19, Maxime Ripard 
>> <maxime.ripard@free-electrons.com> 写到:
>> >On Mon, Sep 18, 2017 at 11:42:04PM +0800, Icenowy Zheng wrote:
>> >> Allwinner A64/H5 SoCs come with a SID controller like the one in H3,
>> >but
>> >> without the silicon bug that makes the initial value at 0x200 wrong,
>> >so
>> >> the value at 0x200 can be directly read.
>> >>
>> >> Add support for this kind of SID controller.
>> >>
>> >> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
>> >> ---
>> >>  Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt | 1
>> >+
>> >>  drivers/nvmem/sunxi_sid.c                                       | 6
>> >++++++
>> >>  2 files changed, 7 insertions(+)
>> >>
>> >> diff --git
>> >a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> >b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> >> index ef06d061913c..6ea0836939ee 100644
>> >> --- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> >> +++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> >> @@ -5,6 +5,7 @@ Required properties:
>> >>    "allwinner,sun4i-a10-sid"
>> >>    "allwinner,sun7i-a20-sid"
>> >>    "allwinner,sun8i-h3-sid"
>> >> +  "allwinner,sun50i-a64-sid"
>> >>
>> >>  - reg: Should contain registers location and length
>> >>
>> >> diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
>> >> index 0d6648be93b8..3c9fd4fb9207 100644
>> >> --- a/drivers/nvmem/sunxi_sid.c
>> >> +++ b/drivers/nvmem/sunxi_sid.c
>> >> @@ -199,10 +199,16 @@ static const struct sunxi_sid_cfg sun8i_h3_cfg
>> >= {
>> >>  	.need_register_readout = true,
>> >>  };
>> >>
>> >> +static const struct sunxi_sid_cfg sun50i_a64_cfg = {
>> >> +	.value_offset = 0x200,
>> >> +	.size = 0x100,
>> >> +};
>> >> +
>> >
>> >How did you get those values?
>> 
>> In the BSP U-Boot headers.
> 
> This should be mentionned in your commit log then.

P.S. the 0x200 offset is not in the header, but as a proven experience
on new generation SID controllers.

> 
>> >Also, it's reported that the SID can only be accessed in secure
>> >mode, did you test it?
>> 
>> Yes, however the secure is broken again, and this only
>> happen if Secure Boot bit is burned.
> 
> Is broken again, meaning?
> 
> As far as I know, the only breakage we've had is on the A80 / A83T,
> but we don't have anything like it on the A64, do we?

A80/A83T is not the *only* breakage, but the *most serious* breakage,
which affected correctly using SMP in non-secure.

Newer Allwinner SoCs doesn't have the GIC broken, but the TZPC still
doesn't work when not Secure Boot, which means that all peripherals
set to secure-only can still be accessed. Affected SoCs are at least
H3, H5, A64.

It seems that the registers marked as secure-only inside PRCM still
works -- however this still has no meaningful secure/non-secure
seperation, as the secure setting register in PRCM is not
secure-only at least on SoCs without SB enabled.

> 
>> If it's really burned, we will have no clean way to access SID.
> 
> Well, in such a case we shouldn't access it either, so..

We will need the THS calibration data.

Maybe a custom call to ATF can be created, but I consider it dirty.

> 
> Maxime
Rob Herring (Arm) Sept. 21, 2017, 11:12 p.m. UTC | #5
On Mon, Sep 18, 2017 at 11:42:04PM +0800, Icenowy Zheng wrote:
> Allwinner A64/H5 SoCs come with a SID controller like the one in H3, but
> without the silicon bug that makes the initial value at 0x200 wrong, so
> the value at 0x200 can be directly read.
> 
> Add support for this kind of SID controller.
> 
> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
> ---
>  Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt | 1 +
>  drivers/nvmem/sunxi_sid.c                                       | 6 ++++++
>  2 files changed, 7 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>
Srinivas Kandagatla Oct. 9, 2017, 12:20 p.m. UTC | #6
On 19/09/17 09:20, Maxime Ripard wrote:
> On Mon, Sep 18, 2017 at 11:42:04PM +0800, Icenowy Zheng wrote:
>> Allwinner A64/H5 SoCs come with a SID controller like the one in H3, but
>> without the silicon bug that makes the initial value at 0x200 wrong, so
>> the value at 0x200 can be directly read.
>>
>> Add support for this kind of SID controller.
>>
>> Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
>> ---
>>   Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt | 1 +
>>   drivers/nvmem/sunxi_sid.c                                       | 6 ++++++
>>   2 files changed, 7 insertions(+)


TBH, I don't fully understand the soc specifics here, but if you want me 
to queue this patch, I would need an ack from Maxime.


thanks,
srini



>>
>> diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> index ef06d061913c..6ea0836939ee 100644
>> --- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> +++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
>> @@ -5,6 +5,7 @@ Required properties:
>>     "allwinner,sun4i-a10-sid"
>>     "allwinner,sun7i-a20-sid"
>>     "allwinner,sun8i-h3-sid"
>> +  "allwinner,sun50i-a64-sid"
>>   
>>   - reg: Should contain registers location and length
>>   
>> diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
>> index 0d6648be93b8..3c9fd4fb9207 100644
>> --- a/drivers/nvmem/sunxi_sid.c
>> +++ b/drivers/nvmem/sunxi_sid.c
>> @@ -199,10 +199,16 @@ static const struct sunxi_sid_cfg sun8i_h3_cfg = {
>>   	.need_register_readout = true,
>>   };
>>   
>> +static const struct sunxi_sid_cfg sun50i_a64_cfg = {
>> +	.value_offset = 0x200,
>> +	.size = 0x100,
>> +};
>> +
> 
> How did you get those values?
> 
> Also, it's reported that the SID can only be accessed in secure mode,
> did you test it?
> 
> Maxime
>
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
index ef06d061913c..6ea0836939ee 100644
--- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
+++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
@@ -5,6 +5,7 @@  Required properties:
   "allwinner,sun4i-a10-sid"
   "allwinner,sun7i-a20-sid"
   "allwinner,sun8i-h3-sid"
+  "allwinner,sun50i-a64-sid"
 
 - reg: Should contain registers location and length
 
diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
index 0d6648be93b8..3c9fd4fb9207 100644
--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
@@ -199,10 +199,16 @@  static const struct sunxi_sid_cfg sun8i_h3_cfg = {
 	.need_register_readout = true,
 };
 
+static const struct sunxi_sid_cfg sun50i_a64_cfg = {
+	.value_offset = 0x200,
+	.size = 0x100,
+};
+
 static const struct of_device_id sunxi_sid_of_match[] = {
 	{ .compatible = "allwinner,sun4i-a10-sid", .data = &sun4i_a10_cfg },
 	{ .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg },
 	{ .compatible = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_cfg },
+	{ .compatible = "allwinner,sun50i-a64-sid", .data = &sun50i_a64_cfg },
 	{/* sentinel */},
 };
 MODULE_DEVICE_TABLE(of, sunxi_sid_of_match);