Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
On Wed, Feb 12, 2020 at 11:48 PM Philippe Mathieu-Daudé
wrote:
> )-.On Wed, Feb 12, 2020 at 10:31 PM Niek Linnenbank
> wrote:
> >
> > Hi Corey,
> >
> > On Thu, Feb 6, 2020 at 10:09 PM Niek Linnenbank <
> nieklinnenb...@gmail.com> wrote:
> >>
> >> Hi Corey,
> >>
> >> On Mon, Feb 3, 2020 at 2:10 PM Corey Minyard
> wrote:
> >>>
> >>> On Sun, Feb 02, 2020 at 10:27:49PM +0100, Niek Linnenbank wrote:
> >>> > Hi Corey,
> >>> >
> >>> > Thanks for reviewing!
> >>> >
> >>> > On Mon, Jan 20, 2020 at 6:59 PM Corey Minyard
> wrote:
> >>> >
> >>> > > On Sat, Jan 18, 2020 at 04:25:08PM +0100, Philippe Mathieu-Daudé
> wrote:
> >>> > > > Cc'ing Corey/David for good advices about using UUID.
> >>> > >
> >>> > > Is there any reason you didn't use the built-in qemu UUID for
> this? It
> >>> > > would simplify things in general.
> >>> > >
> >>> >
> >>> > Currently the Allwinner SID device is using the QemuUUID type from
> >>> > include/qemu/uuid.h.
> >>> > Is that the build-in UUID you are referring to or should I use
> something
> >>> > else?
> >>>
> >>> You are using the QemuUUID type, which is of course what you should do,
> >>> but you aren't using the UUID generated by qemu (at least that I can
> find).
> >>> That in include/sysemu/sysemu.h and is named qemu_uuid. Whether you
> >>> should use that or not depends on your needs. If you just need some
> >>> uuid, then that's what you should probably use. If you need something
> >>> the user can individually control for this device, for instance, then
> >>> that probably won't do.
> >>
> >>
> >> Ah I did not know about the qemu_uuid variable, thanks for pointing
> that out.
> >> Basically the SID identifier is a number that is unique for each board
> that comes
> >> out of the factory. It is currently used by U-Boot to as input to
> generate a MAC address.
> >>
> >> If I understand correctly, qemu_uuid is optional and by default zero.
> >> However the SID value should not be zero, as otherwise U-Boot can't
> pick a MAC address
> >> resulting in a non-working ethernet device.
> >>
> >> Currently the hw/arm/orangepi.c machine specifies a fixed SID to be
> used for the emulated board,
> >> also containing a prefix (8100c002) that indicates the H3 chipset. One
> thing that I am strugling with is that
>
> Suggestion while reading this, you might display a warning if the user
> provided UUID doesn't start with 8100c002.
>
Yeah sure, I can add a warning for it.
>
> >> I'm not able to override the property using '-global', if
> hw/arm/orangepi.c initializes the property with qdev_prop_set_string:
> >>
> >> $ qemu-system-arm -M orangepi-pc -kernel u-boot -nographic -nic user \
> >> -global allwinner-sid.identifier=8100c002-0001-0002-0003-44556688
> >>
> >> If I don't set the property in hw/arm/orangepi.c, I can set it with
> '-global'. Do you perhaps have a
> >> recommendation how to improve that? Basically what is needed is that
> the machine sets the default
> >> property including the chip prefix, and that the user can override it.
> Although it is not required for a
> >> working emulated board, it would be a nice-to-have that the user can
> set it.
> >
> >
> > FYI and possibly others who have a similar usecase, I figured out how to
> do this. In the machine init function,
> > after creating the new SoC object, simply check if the identifier has a
> value:
> >
> > +if (qemu_uuid_is_null(>h3->sid.identifier)) {
> > +qdev_prop_set_string(DEVICE(s->h3), "identifier",
> > + "8100c002-0001-0002-0003-44556677");
>
> Similarly, display a warning "No UUID provided, using default one..."
> (or generate one 8100c002-XXX)?
>
If its allright with you, I would prefer not to display a warning for the
default behavior.
The other boards are also not displaying such warnings and it keeps the
qemu output clean.
>
> > +}
> >
> > That way, if the user passed -global to override it, the machine will
> not overrule the user's value
> > and by default the machine sets an identifier containing the H3 specific
> chip prefix.
> >
> [...]
> >>> > > > > --- /dev/null
> >>> > > > > +++ b/hw/misc/allwinner-sid.c
> >>> > > > > @@ -0,0 +1,170 @@
> >>> > > > > +/*
> >>> > > > > + * Allwinner Security ID emulation
> >>> > > > > + *
> >>> > > > > + * Copyright (C) 2019 Niek Linnenbank <
> nieklinnenb...@gmail.com>
> >>> > > > > + *
> >>> > > > > + * This program is free software: you can redistribute it
> and/or
> >>> > > modify
> >>> > > > > + * it under the terms of the GNU General Public License as
> published
> >>> > > by
> >>> > > > > + * the Free Software Foundation, either version 2 of the
> License, or
> >>> > > > > + * (at your option) any later version.
> >>> > > > > + *
> >>> > > > > + * This program is distributed in the hope that it will be
> useful,
> >>> > > > > + * but WITHOUT ANY WARRANTY; without even the implied
> warranty of
> >>> > > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> the
> >>> > > > > + * GNU
Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
)-.On Wed, Feb 12, 2020 at 10:31 PM Niek Linnenbank
wrote:
>
> Hi Corey,
>
> On Thu, Feb 6, 2020 at 10:09 PM Niek Linnenbank
> wrote:
>>
>> Hi Corey,
>>
>> On Mon, Feb 3, 2020 at 2:10 PM Corey Minyard wrote:
>>>
>>> On Sun, Feb 02, 2020 at 10:27:49PM +0100, Niek Linnenbank wrote:
>>> > Hi Corey,
>>> >
>>> > Thanks for reviewing!
>>> >
>>> > On Mon, Jan 20, 2020 at 6:59 PM Corey Minyard wrote:
>>> >
>>> > > On Sat, Jan 18, 2020 at 04:25:08PM +0100, Philippe Mathieu-Daudé wrote:
>>> > > > Cc'ing Corey/David for good advices about using UUID.
>>> > >
>>> > > Is there any reason you didn't use the built-in qemu UUID for this? It
>>> > > would simplify things in general.
>>> > >
>>> >
>>> > Currently the Allwinner SID device is using the QemuUUID type from
>>> > include/qemu/uuid.h.
>>> > Is that the build-in UUID you are referring to or should I use something
>>> > else?
>>>
>>> You are using the QemuUUID type, which is of course what you should do,
>>> but you aren't using the UUID generated by qemu (at least that I can find).
>>> That in include/sysemu/sysemu.h and is named qemu_uuid. Whether you
>>> should use that or not depends on your needs. If you just need some
>>> uuid, then that's what you should probably use. If you need something
>>> the user can individually control for this device, for instance, then
>>> that probably won't do.
>>
>>
>> Ah I did not know about the qemu_uuid variable, thanks for pointing that out.
>> Basically the SID identifier is a number that is unique for each board that
>> comes
>> out of the factory. It is currently used by U-Boot to as input to generate a
>> MAC address.
>>
>> If I understand correctly, qemu_uuid is optional and by default zero.
>> However the SID value should not be zero, as otherwise U-Boot can't pick a
>> MAC address
>> resulting in a non-working ethernet device.
>>
>> Currently the hw/arm/orangepi.c machine specifies a fixed SID to be used for
>> the emulated board,
>> also containing a prefix (8100c002) that indicates the H3 chipset. One thing
>> that I am strugling with is that
Suggestion while reading this, you might display a warning if the user
provided UUID doesn't start with 8100c002.
>> I'm not able to override the property using '-global', if hw/arm/orangepi.c
>> initializes the property with qdev_prop_set_string:
>>
>> $ qemu-system-arm -M orangepi-pc -kernel u-boot -nographic -nic user \
>> -global allwinner-sid.identifier=8100c002-0001-0002-0003-44556688
>>
>> If I don't set the property in hw/arm/orangepi.c, I can set it with
>> '-global'. Do you perhaps have a
>> recommendation how to improve that? Basically what is needed is that the
>> machine sets the default
>> property including the chip prefix, and that the user can override it.
>> Although it is not required for a
>> working emulated board, it would be a nice-to-have that the user can set it.
>
>
> FYI and possibly others who have a similar usecase, I figured out how to do
> this. In the machine init function,
> after creating the new SoC object, simply check if the identifier has a value:
>
> +if (qemu_uuid_is_null(>h3->sid.identifier)) {
> +qdev_prop_set_string(DEVICE(s->h3), "identifier",
> + "8100c002-0001-0002-0003-44556677");
Similarly, display a warning "No UUID provided, using default one..."
(or generate one 8100c002-XXX)?
> +}
>
> That way, if the user passed -global to override it, the machine will not
> overrule the user's value
> and by default the machine sets an identifier containing the H3 specific chip
> prefix.
>
[...]
>>> > > > > --- /dev/null
>>> > > > > +++ b/hw/misc/allwinner-sid.c
>>> > > > > @@ -0,0 +1,170 @@
>>> > > > > +/*
>>> > > > > + * Allwinner Security ID emulation
>>> > > > > + *
>>> > > > > + * Copyright (C) 2019 Niek Linnenbank
>>> > > > > + *
>>> > > > > + * This program is free software: you can redistribute it and/or
>>> > > modify
>>> > > > > + * it under the terms of the GNU General Public License as
>>> > > > > published
>>> > > by
>>> > > > > + * the Free Software Foundation, either version 2 of the License,
>>> > > > > or
>>> > > > > + * (at your option) any later version.
>>> > > > > + *
>>> > > > > + * This program is distributed in the hope that it will be useful,
>>> > > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> > > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>>> > > > > + * GNU General Public License for more details.
>>> > > > > + *
>>> > > > > + * You should have received a copy of the GNU General Public
>>> > > > > License
>>> > > > > + * along with this program. If not, see <
>>> > > http://www.gnu.org/licenses/>.
>>> > > > > + */
>>> > > > > +
>>> > > > > +#include "qemu/osdep.h"
>>> > > > > +#include "qemu/units.h"
>>> > > > > +#include "hw/sysbus.h"
>>> > > > > +#include "migration/vmstate.h"
>>> > > > > +#include "qemu/log.h"
>>> > > > > +#include "qemu/module.h"
>>> > > > > +#include
Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
Hi Corey,
On Thu, Feb 6, 2020 at 10:09 PM Niek Linnenbank
wrote:
> Hi Corey,
>
> On Mon, Feb 3, 2020 at 2:10 PM Corey Minyard wrote:
>
>> On Sun, Feb 02, 2020 at 10:27:49PM +0100, Niek Linnenbank wrote:
>> > Hi Corey,
>> >
>> > Thanks for reviewing!
>> >
>> > On Mon, Jan 20, 2020 at 6:59 PM Corey Minyard
>> wrote:
>> >
>> > > On Sat, Jan 18, 2020 at 04:25:08PM +0100, Philippe Mathieu-Daudé
>> wrote:
>> > > > Cc'ing Corey/David for good advices about using UUID.
>> > >
>> > > Is there any reason you didn't use the built-in qemu UUID for this?
>> It
>> > > would simplify things in general.
>> > >
>> >
>> > Currently the Allwinner SID device is using the QemuUUID type from
>> > include/qemu/uuid.h.
>> > Is that the build-in UUID you are referring to or should I use something
>> > else?
>>
>> You are using the QemuUUID type, which is of course what you should do,
>> but you aren't using the UUID generated by qemu (at least that I can
>> find).
>> That in include/sysemu/sysemu.h and is named qemu_uuid. Whether you
>> should use that or not depends on your needs. If you just need some
>> uuid, then that's what you should probably use. If you need something
>> the user can individually control for this device, for instance, then
>> that probably won't do.
>>
>
> Ah I did not know about the qemu_uuid variable, thanks for pointing that
> out.
> Basically the SID identifier is a number that is unique for each board
> that comes
> out of the factory. It is currently used by U-Boot to as input to generate
> a MAC address.
>
> If I understand correctly, qemu_uuid is optional and by default zero.
> However the SID value should not be zero, as otherwise U-Boot can't pick a
> MAC address
> resulting in a non-working ethernet device.
>
> Currently the hw/arm/orangepi.c machine specifies a fixed SID to be used
> for the emulated board,
> also containing a prefix (8100c002) that indicates the H3 chipset. One
> thing that I am strugling with is that
> I'm not able to override the property using '-global', if
> hw/arm/orangepi.c initializes the property with qdev_prop_set_string:
>
> $ qemu-system-arm -M orangepi-pc -kernel u-boot -nographic -nic user \
> -global allwinner-sid.identifier=8100c002-0001-0002-0003-44556688
>
> If I don't set the property in hw/arm/orangepi.c, I can set it with
> '-global'. Do you perhaps have a
> recommendation how to improve that? Basically what is needed is that the
> machine sets the default
> property including the chip prefix, and that the user can override it.
> Although it is not required for a
> working emulated board, it would be a nice-to-have that the user can set
> it.
>
FYI and possibly others who have a similar usecase, I figured out how to do
this. In the machine init function,
after creating the new SoC object, simply check if the identifier has a
value:
+if (qemu_uuid_is_null(>h3->sid.identifier)) {
+qdev_prop_set_string(DEVICE(s->h3), "identifier",
+ "8100c002-0001-0002-0003-44556677");
+}
That way, if the user passed -global to override it, the machine will not
overrule the user's value
and by default the machine sets an identifier containing the H3 specific
chip prefix.
Regards,
Niek
>
>> >
>> >
>> > > Also, in case no one else say, you have tabs in your code that you
>> need
>> > > to get rid of.
>> > >
>> > >
>> > If there are any tabs in the code, it was not intended. I re-checked
>> this
>> > patch and others
>> > again but found no tabs in the code.
>> > Could you please point out where you found the extra tabs?
>>
>> My apologies, I saw 1-character misalignments, and that usually means
>> that there's a tab. But it looks like it has something to do with the
>> way it was forwarded. I didn't get the original email.
>>
>> Ah yes that is possible indeed. I'll add you to the CC list for the next
> version of this patch series.
>
> Regards,
> Niek
>
>
>> -corey
>>
>> >
>> > Regards,
>> > Niek
>> >
>> >
>> > > -corey
>> > >
>> > > >
>> > > > On 1/8/20 9:00 PM, Niek Linnenbank wrote:
>> > > > > The Security Identifier device found in various Allwinner System
>> on
>> > > Chip
>> > > > > designs gives applications a per-board unique identifier. This
>> commit
>> > > > > adds support for the Allwinner Security Identifier using a 128-bit
>> > > > > UUID value as input.
>> > > > >
>> > > > > Signed-off-by: Niek Linnenbank
>> > > > > ---
>> > > > > include/hw/arm/allwinner-h3.h | 3 +
>> > > > > include/hw/misc/allwinner-sid.h | 61
>> > > > > hw/arm/allwinner-h3.c | 11 ++-
>> > > > > hw/arm/orangepi.c | 4 +
>> > > > > hw/misc/allwinner-sid.c | 170
>> > >
>> > > > > hw/misc/Makefile.objs | 1 +
>> > > > > hw/misc/trace-events| 4 +
>> > > > > 7 files changed, 253 insertions(+), 1 deletion(-)
>> > > > > create mode 100644 include/hw/misc/allwinner-sid.h
>> > > > > create mode 100644
Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
Hi Corey,
On Mon, Feb 3, 2020 at 2:10 PM Corey Minyard wrote:
> On Sun, Feb 02, 2020 at 10:27:49PM +0100, Niek Linnenbank wrote:
> > Hi Corey,
> >
> > Thanks for reviewing!
> >
> > On Mon, Jan 20, 2020 at 6:59 PM Corey Minyard
> wrote:
> >
> > > On Sat, Jan 18, 2020 at 04:25:08PM +0100, Philippe Mathieu-Daudé wrote:
> > > > Cc'ing Corey/David for good advices about using UUID.
> > >
> > > Is there any reason you didn't use the built-in qemu UUID for this? It
> > > would simplify things in general.
> > >
> >
> > Currently the Allwinner SID device is using the QemuUUID type from
> > include/qemu/uuid.h.
> > Is that the build-in UUID you are referring to or should I use something
> > else?
>
> You are using the QemuUUID type, which is of course what you should do,
> but you aren't using the UUID generated by qemu (at least that I can find).
> That in include/sysemu/sysemu.h and is named qemu_uuid. Whether you
> should use that or not depends on your needs. If you just need some
> uuid, then that's what you should probably use. If you need something
> the user can individually control for this device, for instance, then
> that probably won't do.
>
Ah I did not know about the qemu_uuid variable, thanks for pointing that
out.
Basically the SID identifier is a number that is unique for each board that
comes
out of the factory. It is currently used by U-Boot to as input to generate
a MAC address.
If I understand correctly, qemu_uuid is optional and by default zero.
However the SID value should not be zero, as otherwise U-Boot can't pick a
MAC address
resulting in a non-working ethernet device.
Currently the hw/arm/orangepi.c machine specifies a fixed SID to be used
for the emulated board,
also containing a prefix (8100c002) that indicates the H3 chipset. One
thing that I am strugling with is that
I'm not able to override the property using '-global', if hw/arm/orangepi.c
initializes the property with qdev_prop_set_string:
$ qemu-system-arm -M orangepi-pc -kernel u-boot -nographic -nic user \
-global allwinner-sid.identifier=8100c002-0001-0002-0003-44556688
If I don't set the property in hw/arm/orangepi.c, I can set it with
'-global'. Do you perhaps have a
recommendation how to improve that? Basically what is needed is that the
machine sets the default
property including the chip prefix, and that the user can override it.
Although it is not required for a
working emulated board, it would be a nice-to-have that the user can set it.
> >
> >
> > > Also, in case no one else say, you have tabs in your code that you need
> > > to get rid of.
> > >
> > >
> > If there are any tabs in the code, it was not intended. I re-checked this
> > patch and others
> > again but found no tabs in the code.
> > Could you please point out where you found the extra tabs?
>
> My apologies, I saw 1-character misalignments, and that usually means
> that there's a tab. But it looks like it has something to do with the
> way it was forwarded. I didn't get the original email.
>
> Ah yes that is possible indeed. I'll add you to the CC list for the next
version of this patch series.
Regards,
Niek
> -corey
>
> >
> > Regards,
> > Niek
> >
> >
> > > -corey
> > >
> > > >
> > > > On 1/8/20 9:00 PM, Niek Linnenbank wrote:
> > > > > The Security Identifier device found in various Allwinner System on
> > > Chip
> > > > > designs gives applications a per-board unique identifier. This
> commit
> > > > > adds support for the Allwinner Security Identifier using a 128-bit
> > > > > UUID value as input.
> > > > >
> > > > > Signed-off-by: Niek Linnenbank
> > > > > ---
> > > > > include/hw/arm/allwinner-h3.h | 3 +
> > > > > include/hw/misc/allwinner-sid.h | 61
> > > > > hw/arm/allwinner-h3.c | 11 ++-
> > > > > hw/arm/orangepi.c | 4 +
> > > > > hw/misc/allwinner-sid.c | 170
> > >
> > > > > hw/misc/Makefile.objs | 1 +
> > > > > hw/misc/trace-events| 4 +
> > > > > 7 files changed, 253 insertions(+), 1 deletion(-)
> > > > > create mode 100644 include/hw/misc/allwinner-sid.h
> > > > > create mode 100644 hw/misc/allwinner-sid.c
> > > > >
> > > > > diff --git a/include/hw/arm/allwinner-h3.h
> > > b/include/hw/arm/allwinner-h3.h
> > > > > index 5a25a92eae..9ed365507c 100644
> > > > > --- a/include/hw/arm/allwinner-h3.h
> > > > > +++ b/include/hw/arm/allwinner-h3.h
> > > > > @@ -46,6 +46,7 @@
> > > > > #include "hw/misc/allwinner-h3-ccu.h"
> > > > > #include "hw/misc/allwinner-cpucfg.h"
> > > > > #include "hw/misc/allwinner-h3-sysctrl.h"
> > > > > +#include "hw/misc/allwinner-sid.h"
> > > > > #include "target/arm/cpu.h"
> > > > > /**
> > > > > @@ -63,6 +64,7 @@ enum {
> > > > > AW_H3_SRAM_A2,
> > > > > AW_H3_SRAM_C,
> > > > > AW_H3_SYSCTRL,
> > > > > +AW_H3_SID,
> > > > > AW_H3_EHCI0,
> > > > > AW_H3_OHCI0,
> > > > > AW_H3_EHCI1,
> > > > > @@ -115,6 +117,7 @@ typedef
Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
On Sun, Feb 02, 2020 at 10:27:49PM +0100, Niek Linnenbank wrote:
> Hi Corey,
>
> Thanks for reviewing!
>
> On Mon, Jan 20, 2020 at 6:59 PM Corey Minyard wrote:
>
> > On Sat, Jan 18, 2020 at 04:25:08PM +0100, Philippe Mathieu-Daudé wrote:
> > > Cc'ing Corey/David for good advices about using UUID.
> >
> > Is there any reason you didn't use the built-in qemu UUID for this? It
> > would simplify things in general.
> >
>
> Currently the Allwinner SID device is using the QemuUUID type from
> include/qemu/uuid.h.
> Is that the build-in UUID you are referring to or should I use something
> else?
You are using the QemuUUID type, which is of course what you should do,
but you aren't using the UUID generated by qemu (at least that I can find).
That in include/sysemu/sysemu.h and is named qemu_uuid. Whether you
should use that or not depends on your needs. If you just need some
uuid, then that's what you should probably use. If you need something
the user can individually control for this device, for instance, then
that probably won't do.
>
>
> > Also, in case no one else say, you have tabs in your code that you need
> > to get rid of.
> >
> >
> If there are any tabs in the code, it was not intended. I re-checked this
> patch and others
> again but found no tabs in the code.
> Could you please point out where you found the extra tabs?
My apologies, I saw 1-character misalignments, and that usually means
that there's a tab. But it looks like it has something to do with the
way it was forwarded. I didn't get the original email.
-corey
>
> Regards,
> Niek
>
>
> > -corey
> >
> > >
> > > On 1/8/20 9:00 PM, Niek Linnenbank wrote:
> > > > The Security Identifier device found in various Allwinner System on
> > Chip
> > > > designs gives applications a per-board unique identifier. This commit
> > > > adds support for the Allwinner Security Identifier using a 128-bit
> > > > UUID value as input.
> > > >
> > > > Signed-off-by: Niek Linnenbank
> > > > ---
> > > > include/hw/arm/allwinner-h3.h | 3 +
> > > > include/hw/misc/allwinner-sid.h | 61
> > > > hw/arm/allwinner-h3.c | 11 ++-
> > > > hw/arm/orangepi.c | 4 +
> > > > hw/misc/allwinner-sid.c | 170
> >
> > > > hw/misc/Makefile.objs | 1 +
> > > > hw/misc/trace-events| 4 +
> > > > 7 files changed, 253 insertions(+), 1 deletion(-)
> > > > create mode 100644 include/hw/misc/allwinner-sid.h
> > > > create mode 100644 hw/misc/allwinner-sid.c
> > > >
> > > > diff --git a/include/hw/arm/allwinner-h3.h
> > b/include/hw/arm/allwinner-h3.h
> > > > index 5a25a92eae..9ed365507c 100644
> > > > --- a/include/hw/arm/allwinner-h3.h
> > > > +++ b/include/hw/arm/allwinner-h3.h
> > > > @@ -46,6 +46,7 @@
> > > > #include "hw/misc/allwinner-h3-ccu.h"
> > > > #include "hw/misc/allwinner-cpucfg.h"
> > > > #include "hw/misc/allwinner-h3-sysctrl.h"
> > > > +#include "hw/misc/allwinner-sid.h"
> > > > #include "target/arm/cpu.h"
> > > > /**
> > > > @@ -63,6 +64,7 @@ enum {
> > > > AW_H3_SRAM_A2,
> > > > AW_H3_SRAM_C,
> > > > AW_H3_SYSCTRL,
> > > > +AW_H3_SID,
> > > > AW_H3_EHCI0,
> > > > AW_H3_OHCI0,
> > > > AW_H3_EHCI1,
> > > > @@ -115,6 +117,7 @@ typedef struct AwH3State {
> > > > AwH3ClockCtlState ccu;
> > > > AwCpuCfgState cpucfg;
> > > > AwH3SysCtrlState sysctrl;
> > > > +AwSidState sid;
> > > > GICState gic;
> > > > MemoryRegion sram_a1;
> > > > MemoryRegion sram_a2;
> > > > diff --git a/include/hw/misc/allwinner-sid.h
> > b/include/hw/misc/allwinner-sid.h
> > > > new file mode 100644
> > > > index 00..41189967e2
> > > > --- /dev/null
> > > > +++ b/include/hw/misc/allwinner-sid.h
> > > > @@ -0,0 +1,61 @@
> > > > +/*
> > > > + * Allwinner Security ID emulation
> > > > + *
> > > > + * Copyright (C) 2019 Niek Linnenbank
> > > > + *
> > > > + * This program is free software: you can redistribute it and/or
> > modify
> > > > + * it under the terms of the GNU General Public License as published
> > by
> > > > + * the Free Software Foundation, either version 2 of the License, or
> > > > + * (at your option) any later version.
> > > > + *
> > > > + * This program is distributed in the hope that it will be useful,
> > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > > + * GNU General Public License for more details.
> > > > + *
> > > > + * You should have received a copy of the GNU General Public License
> > > > + * along with this program. If not, see <
> > http://www.gnu.org/licenses/>.
> > > > + */
> > > > +
> > > > +#ifndef HW_MISC_ALLWINNER_SID_H
> > > > +#define HW_MISC_ALLWINNER_SID_H
> > > > +
> > > > +#include "qemu/osdep.h"
> > > > +#include "qom/object.h"
> > > > +#include "hw/sysbus.h"
> > > > +#include "qemu/uuid.h"
> > > > +
> > > > +/**
> > >
Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
Hi Corey,
Thanks for reviewing!
On Mon, Jan 20, 2020 at 6:59 PM Corey Minyard wrote:
> On Sat, Jan 18, 2020 at 04:25:08PM +0100, Philippe Mathieu-Daudé wrote:
> > Cc'ing Corey/David for good advices about using UUID.
>
> Is there any reason you didn't use the built-in qemu UUID for this? It
> would simplify things in general.
>
Currently the Allwinner SID device is using the QemuUUID type from
include/qemu/uuid.h.
Is that the build-in UUID you are referring to or should I use something
else?
> Also, in case no one else say, you have tabs in your code that you need
> to get rid of.
>
>
If there are any tabs in the code, it was not intended. I re-checked this
patch and others
again but found no tabs in the code.
Could you please point out where you found the extra tabs?
Regards,
Niek
> -corey
>
> >
> > On 1/8/20 9:00 PM, Niek Linnenbank wrote:
> > > The Security Identifier device found in various Allwinner System on
> Chip
> > > designs gives applications a per-board unique identifier. This commit
> > > adds support for the Allwinner Security Identifier using a 128-bit
> > > UUID value as input.
> > >
> > > Signed-off-by: Niek Linnenbank
> > > ---
> > > include/hw/arm/allwinner-h3.h | 3 +
> > > include/hw/misc/allwinner-sid.h | 61
> > > hw/arm/allwinner-h3.c | 11 ++-
> > > hw/arm/orangepi.c | 4 +
> > > hw/misc/allwinner-sid.c | 170
>
> > > hw/misc/Makefile.objs | 1 +
> > > hw/misc/trace-events| 4 +
> > > 7 files changed, 253 insertions(+), 1 deletion(-)
> > > create mode 100644 include/hw/misc/allwinner-sid.h
> > > create mode 100644 hw/misc/allwinner-sid.c
> > >
> > > diff --git a/include/hw/arm/allwinner-h3.h
> b/include/hw/arm/allwinner-h3.h
> > > index 5a25a92eae..9ed365507c 100644
> > > --- a/include/hw/arm/allwinner-h3.h
> > > +++ b/include/hw/arm/allwinner-h3.h
> > > @@ -46,6 +46,7 @@
> > > #include "hw/misc/allwinner-h3-ccu.h"
> > > #include "hw/misc/allwinner-cpucfg.h"
> > > #include "hw/misc/allwinner-h3-sysctrl.h"
> > > +#include "hw/misc/allwinner-sid.h"
> > > #include "target/arm/cpu.h"
> > > /**
> > > @@ -63,6 +64,7 @@ enum {
> > > AW_H3_SRAM_A2,
> > > AW_H3_SRAM_C,
> > > AW_H3_SYSCTRL,
> > > +AW_H3_SID,
> > > AW_H3_EHCI0,
> > > AW_H3_OHCI0,
> > > AW_H3_EHCI1,
> > > @@ -115,6 +117,7 @@ typedef struct AwH3State {
> > > AwH3ClockCtlState ccu;
> > > AwCpuCfgState cpucfg;
> > > AwH3SysCtrlState sysctrl;
> > > +AwSidState sid;
> > > GICState gic;
> > > MemoryRegion sram_a1;
> > > MemoryRegion sram_a2;
> > > diff --git a/include/hw/misc/allwinner-sid.h
> b/include/hw/misc/allwinner-sid.h
> > > new file mode 100644
> > > index 00..41189967e2
> > > --- /dev/null
> > > +++ b/include/hw/misc/allwinner-sid.h
> > > @@ -0,0 +1,61 @@
> > > +/*
> > > + * Allwinner Security ID emulation
> > > + *
> > > + * Copyright (C) 2019 Niek Linnenbank
> > > + *
> > > + * This program is free software: you can redistribute it and/or
> modify
> > > + * it under the terms of the GNU General Public License as published
> by
> > > + * the Free Software Foundation, either version 2 of the License, or
> > > + * (at your option) any later version.
> > > + *
> > > + * This program is distributed in the hope that it will be useful,
> > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > + * GNU General Public License for more details.
> > > + *
> > > + * You should have received a copy of the GNU General Public License
> > > + * along with this program. If not, see <
> http://www.gnu.org/licenses/>.
> > > + */
> > > +
> > > +#ifndef HW_MISC_ALLWINNER_SID_H
> > > +#define HW_MISC_ALLWINNER_SID_H
> > > +
> > > +#include "qemu/osdep.h"
> > > +#include "qom/object.h"
> > > +#include "hw/sysbus.h"
> > > +#include "qemu/uuid.h"
> > > +
> > > +/**
> > > + * Object model
> > > + * @{
> > > + */
> > > +
> > > +#define TYPE_AW_SID"allwinner-sid"
> > > +#define AW_SID(obj) \
> > > +OBJECT_CHECK(AwSidState, (obj), TYPE_AW_SID)
> > > +
> > > +/** @} */
> > > +
> > > +/**
> > > + * Allwinner Security ID object instance state
> > > + */
> > > +typedef struct AwSidState {
> > > +/*< private >*/
> > > +SysBusDevice parent_obj;
> > > +/*< public >*/
> > > +
> > > +/** Maps I/O registers in physical memory */
> > > +MemoryRegion iomem;
> > > +
> > > +/** Control register defines how and what to read */
> > > +uint32_t control;
> > > +
> > > +/** RdKey register contains the data retrieved by the device */
> > > +uint32_t rdkey;
> > > +
> > > +/** Stores the emulated device identifier */
> > > +QemuUUID identifier;
> > > +
> > > +} AwSidState;
> > > +
> > > +#endif /* HW_MISC_ALLWINNER_SID_H */
> > > diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c
> > >
Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
On Sat, Jan 18, 2020 at 04:25:08PM +0100, Philippe Mathieu-Daudé wrote:
> Cc'ing Corey/David for good advices about using UUID.
Is there any reason you didn't use the built-in qemu UUID for this? It
would simplify things in general.
Also, in case no one else say, you have tabs in your code that you need
to get rid of.
-corey
>
> On 1/8/20 9:00 PM, Niek Linnenbank wrote:
> > The Security Identifier device found in various Allwinner System on Chip
> > designs gives applications a per-board unique identifier. This commit
> > adds support for the Allwinner Security Identifier using a 128-bit
> > UUID value as input.
> >
> > Signed-off-by: Niek Linnenbank
> > ---
> > include/hw/arm/allwinner-h3.h | 3 +
> > include/hw/misc/allwinner-sid.h | 61
> > hw/arm/allwinner-h3.c | 11 ++-
> > hw/arm/orangepi.c | 4 +
> > hw/misc/allwinner-sid.c | 170
> > hw/misc/Makefile.objs | 1 +
> > hw/misc/trace-events| 4 +
> > 7 files changed, 253 insertions(+), 1 deletion(-)
> > create mode 100644 include/hw/misc/allwinner-sid.h
> > create mode 100644 hw/misc/allwinner-sid.c
> >
> > diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h
> > index 5a25a92eae..9ed365507c 100644
> > --- a/include/hw/arm/allwinner-h3.h
> > +++ b/include/hw/arm/allwinner-h3.h
> > @@ -46,6 +46,7 @@
> > #include "hw/misc/allwinner-h3-ccu.h"
> > #include "hw/misc/allwinner-cpucfg.h"
> > #include "hw/misc/allwinner-h3-sysctrl.h"
> > +#include "hw/misc/allwinner-sid.h"
> > #include "target/arm/cpu.h"
> > /**
> > @@ -63,6 +64,7 @@ enum {
> > AW_H3_SRAM_A2,
> > AW_H3_SRAM_C,
> > AW_H3_SYSCTRL,
> > +AW_H3_SID,
> > AW_H3_EHCI0,
> > AW_H3_OHCI0,
> > AW_H3_EHCI1,
> > @@ -115,6 +117,7 @@ typedef struct AwH3State {
> > AwH3ClockCtlState ccu;
> > AwCpuCfgState cpucfg;
> > AwH3SysCtrlState sysctrl;
> > +AwSidState sid;
> > GICState gic;
> > MemoryRegion sram_a1;
> > MemoryRegion sram_a2;
> > diff --git a/include/hw/misc/allwinner-sid.h
> > b/include/hw/misc/allwinner-sid.h
> > new file mode 100644
> > index 00..41189967e2
> > --- /dev/null
> > +++ b/include/hw/misc/allwinner-sid.h
> > @@ -0,0 +1,61 @@
> > +/*
> > + * Allwinner Security ID emulation
> > + *
> > + * Copyright (C) 2019 Niek Linnenbank
> > + *
> > + * This program is free software: you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation, either version 2 of the License, or
> > + * (at your option) any later version.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program. If not, see
Re: [PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
Cc'ing Corey/David for good advices about using UUID.
On 1/8/20 9:00 PM, Niek Linnenbank wrote:
The Security Identifier device found in various Allwinner System on Chip
designs gives applications a per-board unique identifier. This commit
adds support for the Allwinner Security Identifier using a 128-bit
UUID value as input.
Signed-off-by: Niek Linnenbank
---
include/hw/arm/allwinner-h3.h | 3 +
include/hw/misc/allwinner-sid.h | 61
hw/arm/allwinner-h3.c | 11 ++-
hw/arm/orangepi.c | 4 +
hw/misc/allwinner-sid.c | 170
hw/misc/Makefile.objs | 1 +
hw/misc/trace-events| 4 +
7 files changed, 253 insertions(+), 1 deletion(-)
create mode 100644 include/hw/misc/allwinner-sid.h
create mode 100644 hw/misc/allwinner-sid.c
diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h
index 5a25a92eae..9ed365507c 100644
--- a/include/hw/arm/allwinner-h3.h
+++ b/include/hw/arm/allwinner-h3.h
@@ -46,6 +46,7 @@
#include "hw/misc/allwinner-h3-ccu.h"
#include "hw/misc/allwinner-cpucfg.h"
#include "hw/misc/allwinner-h3-sysctrl.h"
+#include "hw/misc/allwinner-sid.h"
#include "target/arm/cpu.h"
/**
@@ -63,6 +64,7 @@ enum {
AW_H3_SRAM_A2,
AW_H3_SRAM_C,
AW_H3_SYSCTRL,
+AW_H3_SID,
AW_H3_EHCI0,
AW_H3_OHCI0,
AW_H3_EHCI1,
@@ -115,6 +117,7 @@ typedef struct AwH3State {
AwH3ClockCtlState ccu;
AwCpuCfgState cpucfg;
AwH3SysCtrlState sysctrl;
+AwSidState sid;
GICState gic;
MemoryRegion sram_a1;
MemoryRegion sram_a2;
diff --git a/include/hw/misc/allwinner-sid.h b/include/hw/misc/allwinner-sid.h
new file mode 100644
index 00..41189967e2
--- /dev/null
+++ b/include/hw/misc/allwinner-sid.h
@@ -0,0 +1,61 @@
+/*
+ * Allwinner Security ID emulation
+ *
+ * Copyright (C) 2019 Niek Linnenbank
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
[PATCH v3 07/17] hw/arm/allwinner: add Security Identifier device
The Security Identifier device found in various Allwinner System on Chip
designs gives applications a per-board unique identifier. This commit
adds support for the Allwinner Security Identifier using a 128-bit
UUID value as input.
Signed-off-by: Niek Linnenbank
---
include/hw/arm/allwinner-h3.h | 3 +
include/hw/misc/allwinner-sid.h | 61
hw/arm/allwinner-h3.c | 11 ++-
hw/arm/orangepi.c | 4 +
hw/misc/allwinner-sid.c | 170
hw/misc/Makefile.objs | 1 +
hw/misc/trace-events| 4 +
7 files changed, 253 insertions(+), 1 deletion(-)
create mode 100644 include/hw/misc/allwinner-sid.h
create mode 100644 hw/misc/allwinner-sid.c
diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h
index 5a25a92eae..9ed365507c 100644
--- a/include/hw/arm/allwinner-h3.h
+++ b/include/hw/arm/allwinner-h3.h
@@ -46,6 +46,7 @@
#include "hw/misc/allwinner-h3-ccu.h"
#include "hw/misc/allwinner-cpucfg.h"
#include "hw/misc/allwinner-h3-sysctrl.h"
+#include "hw/misc/allwinner-sid.h"
#include "target/arm/cpu.h"
/**
@@ -63,6 +64,7 @@ enum {
AW_H3_SRAM_A2,
AW_H3_SRAM_C,
AW_H3_SYSCTRL,
+AW_H3_SID,
AW_H3_EHCI0,
AW_H3_OHCI0,
AW_H3_EHCI1,
@@ -115,6 +117,7 @@ typedef struct AwH3State {
AwH3ClockCtlState ccu;
AwCpuCfgState cpucfg;
AwH3SysCtrlState sysctrl;
+AwSidState sid;
GICState gic;
MemoryRegion sram_a1;
MemoryRegion sram_a2;
diff --git a/include/hw/misc/allwinner-sid.h b/include/hw/misc/allwinner-sid.h
new file mode 100644
index 00..41189967e2
--- /dev/null
+++ b/include/hw/misc/allwinner-sid.h
@@ -0,0 +1,61 @@
+/*
+ * Allwinner Security ID emulation
+ *
+ * Copyright (C) 2019 Niek Linnenbank
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
