| Message ID | 20200310213203.18730-8-nieklinnenbank@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add Allwinner H3 SoC and Orange Pi PC Machine | expand |
Niek Linnenbank <nieklinnenbank@gmail.com> writes: > 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 <nieklinnenbank@gmail.com> > --- > include/hw/arm/allwinner-h3.h | 3 + > include/hw/misc/allwinner-sid.h | 60 ++++++++++++ > hw/arm/allwinner-h3.c | 11 ++- > hw/arm/orangepi.c | 9 ++ > hw/misc/allwinner-sid.c | 168 ++++++++++++++++++++++++++++++++ > hw/misc/Makefile.objs | 1 + > hw/misc/trace-events | 4 + > 7 files changed, 255 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 dc729176ab..85416d9d64 100644 > --- a/include/hw/arm/allwinner-h3.h > +++ b/include/hw/arm/allwinner-h3.h > @@ -42,6 +42,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" > > /** > @@ -59,6 +60,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, > @@ -114,6 +116,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 0000000000..4c1fa4762b > --- /dev/null > +++ b/include/hw/misc/allwinner-sid.h > @@ -0,0 +1,60 @@ > +/* > + * Allwinner Security ID emulation > + * > + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@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 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 "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 > index b9a5597f2a..deeea63f5f 100644 > --- a/hw/arm/allwinner-h3.c > +++ b/hw/arm/allwinner-h3.c > @@ -38,6 +38,7 @@ const hwaddr allwinner_h3_memmap[] = { > [AW_H3_SRAM_A2] = 0x00044000, > [AW_H3_SRAM_C] = 0x00010000, > [AW_H3_SYSCTRL] = 0x01c00000, > + [AW_H3_SID] = 0x01c14000, > [AW_H3_EHCI0] = 0x01c1a000, > [AW_H3_OHCI0] = 0x01c1a400, > [AW_H3_EHCI1] = 0x01c1b000, > @@ -78,7 +79,6 @@ struct AwH3Unimplemented { > { "mmc0", 0x01c0f000, 4 * KiB }, > { "mmc1", 0x01c10000, 4 * KiB }, > { "mmc2", 0x01c11000, 4 * KiB }, > - { "sid", 0x01c14000, 1 * KiB }, > { "crypto", 0x01c15000, 4 * KiB }, > { "msgbox", 0x01c17000, 4 * KiB }, > { "spinlock", 0x01c18000, 4 * KiB }, > @@ -198,6 +198,11 @@ static void allwinner_h3_init(Object *obj) > > sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, sizeof(s->cpucfg), > TYPE_AW_CPUCFG); > + > + sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid), > + TYPE_AW_SID); > + object_property_add_alias(obj, "identifier", OBJECT(&s->sid), > + "identifier", &error_abort); > } > > static void allwinner_h3_realize(DeviceState *dev, Error **errp) > @@ -315,6 +320,10 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) > qdev_init_nofail(DEVICE(&s->cpucfg)); > sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, s->memmap[AW_H3_CPUCFG]); > > + /* Security Identifier */ > + qdev_init_nofail(DEVICE(&s->sid)); > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]); > + > /* Universal Serial Bus */ > sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], > qdev_get_gpio_in(DEVICE(&s->gic), > diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c > index 3fcec1944e..c92fab3eac 100644 > --- a/hw/arm/orangepi.c > +++ b/hw/arm/orangepi.c > @@ -65,6 +65,15 @@ static void orangepi_init(MachineState *machine) > object_property_set_int(OBJECT(h3), 24 * 1000 * 1000, "clk1-freq", > &error_abort); > > + /* Setup SID properties. Currently using a default fixed SID identifier. */ > + if (qemu_uuid_is_null(&h3->sid.identifier)) { > + qdev_prop_set_string(DEVICE(h3), "identifier", > + "02c00081-1111-2222-3333-000044556677"); > + } else if (ldl_be_p(&h3->sid.identifier.data[0]) != 0x02c00081) { > + fprintf(stderr, "WARNING: Security Identifier value does " > + "not include H3 prefix\n"); > + } > + Should this be a LOG_GUEST_ERROR? Otherwise: Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
On Wed, Mar 11, 2020 at 2:53 PM Alex Bennée <alex.bennee@linaro.org> wrote: > > Niek Linnenbank <nieklinnenbank@gmail.com> writes: > > > 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 <nieklinnenbank@gmail.com> > > --- > > include/hw/arm/allwinner-h3.h | 3 + > > include/hw/misc/allwinner-sid.h | 60 ++++++++++++ > > hw/arm/allwinner-h3.c | 11 ++- > > hw/arm/orangepi.c | 9 ++ > > hw/misc/allwinner-sid.c | 168 ++++++++++++++++++++++++++++++++ > > hw/misc/Makefile.objs | 1 + > > hw/misc/trace-events | 4 + > > 7 files changed, 255 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 dc729176ab..85416d9d64 100644 > > --- a/include/hw/arm/allwinner-h3.h > > +++ b/include/hw/arm/allwinner-h3.h > > @@ -42,6 +42,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" > > > > /** > > @@ -59,6 +60,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, > > @@ -114,6 +116,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 0000000000..4c1fa4762b > > --- /dev/null > > +++ b/include/hw/misc/allwinner-sid.h > > @@ -0,0 +1,60 @@ > > +/* > > + * Allwinner Security ID emulation > > + * > > + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@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 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 "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 > > index b9a5597f2a..deeea63f5f 100644 > > --- a/hw/arm/allwinner-h3.c > > +++ b/hw/arm/allwinner-h3.c > > @@ -38,6 +38,7 @@ const hwaddr allwinner_h3_memmap[] = { > > [AW_H3_SRAM_A2] = 0x00044000, > > [AW_H3_SRAM_C] = 0x00010000, > > [AW_H3_SYSCTRL] = 0x01c00000, > > + [AW_H3_SID] = 0x01c14000, > > [AW_H3_EHCI0] = 0x01c1a000, > > [AW_H3_OHCI0] = 0x01c1a400, > > [AW_H3_EHCI1] = 0x01c1b000, > > @@ -78,7 +79,6 @@ struct AwH3Unimplemented { > > { "mmc0", 0x01c0f000, 4 * KiB }, > > { "mmc1", 0x01c10000, 4 * KiB }, > > { "mmc2", 0x01c11000, 4 * KiB }, > > - { "sid", 0x01c14000, 1 * KiB }, > > { "crypto", 0x01c15000, 4 * KiB }, > > { "msgbox", 0x01c17000, 4 * KiB }, > > { "spinlock", 0x01c18000, 4 * KiB }, > > @@ -198,6 +198,11 @@ static void allwinner_h3_init(Object *obj) > > > > sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, sizeof(s->cpucfg), > > TYPE_AW_CPUCFG); > > + > > + sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid), > > + TYPE_AW_SID); > > + object_property_add_alias(obj, "identifier", OBJECT(&s->sid), > > + "identifier", &error_abort); > > } > > > > static void allwinner_h3_realize(DeviceState *dev, Error **errp) > > @@ -315,6 +320,10 @@ static void allwinner_h3_realize(DeviceState *dev, > Error **errp) > > qdev_init_nofail(DEVICE(&s->cpucfg)); > > sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, > s->memmap[AW_H3_CPUCFG]); > > > > + /* Security Identifier */ > > + qdev_init_nofail(DEVICE(&s->sid)); > > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]); > > + > > /* Universal Serial Bus */ > > sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], > > qdev_get_gpio_in(DEVICE(&s->gic), > > diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c > > index 3fcec1944e..c92fab3eac 100644 > > --- a/hw/arm/orangepi.c > > +++ b/hw/arm/orangepi.c > > @@ -65,6 +65,15 @@ static void orangepi_init(MachineState *machine) > > object_property_set_int(OBJECT(h3), 24 * 1000 * 1000, "clk1-freq", > > &error_abort); > > > > + /* Setup SID properties. Currently using a default fixed SID > identifier. */ > > + if (qemu_uuid_is_null(&h3->sid.identifier)) { > > + qdev_prop_set_string(DEVICE(h3), "identifier", > > + "02c00081-1111-2222-3333-000044556677"); > > + } else if (ldl_be_p(&h3->sid.identifier.data[0]) != 0x02c00081) { > > + fprintf(stderr, "WARNING: Security Identifier value does " > > + "not include H3 prefix\n"); > > + } > > + > > Should this be a LOG_GUEST_ERROR? > Hi Alex, This warning is basically to inform the user when overriding the SID identifier manually with -global, that the identifier specified by the user does not contain the H3 SoC prefix. Real hardware always has that particular prefix in its identifier value, and it might be so that software running on the emulated hardware depends on it. So its basically a proactive warning to inform the user, and not an error of wrong behavior caused by the guest software. > > Otherwise: > > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Assuming the above explanation is sufficient, I'll add your review tag, thanks! > > -- > Alex Bennée >
Niek Linnenbank <nieklinnenbank@gmail.com> writes: > On Wed, Mar 11, 2020 at 2:53 PM Alex Bennée <alex.bennee@linaro.org> wrote: > >> >> Niek Linnenbank <nieklinnenbank@gmail.com> writes: >> >> > 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 <nieklinnenbank@gmail.com> >> > --- >> > include/hw/arm/allwinner-h3.h | 3 + >> > include/hw/misc/allwinner-sid.h | 60 ++++++++++++ >> > hw/arm/allwinner-h3.c | 11 ++- >> > hw/arm/orangepi.c | 9 ++ >> > hw/misc/allwinner-sid.c | 168 ++++++++++++++++++++++++++++++++ >> > hw/misc/Makefile.objs | 1 + >> > hw/misc/trace-events | 4 + >> > 7 files changed, 255 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 dc729176ab..85416d9d64 100644 >> > --- a/include/hw/arm/allwinner-h3.h >> > +++ b/include/hw/arm/allwinner-h3.h >> > @@ -42,6 +42,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" >> > >> > /** >> > @@ -59,6 +60,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, >> > @@ -114,6 +116,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 0000000000..4c1fa4762b >> > --- /dev/null >> > +++ b/include/hw/misc/allwinner-sid.h >> > @@ -0,0 +1,60 @@ >> > +/* >> > + * Allwinner Security ID emulation >> > + * >> > + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@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 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 "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 >> > index b9a5597f2a..deeea63f5f 100644 >> > --- a/hw/arm/allwinner-h3.c >> > +++ b/hw/arm/allwinner-h3.c >> > @@ -38,6 +38,7 @@ const hwaddr allwinner_h3_memmap[] = { >> > [AW_H3_SRAM_A2] = 0x00044000, >> > [AW_H3_SRAM_C] = 0x00010000, >> > [AW_H3_SYSCTRL] = 0x01c00000, >> > + [AW_H3_SID] = 0x01c14000, >> > [AW_H3_EHCI0] = 0x01c1a000, >> > [AW_H3_OHCI0] = 0x01c1a400, >> > [AW_H3_EHCI1] = 0x01c1b000, >> > @@ -78,7 +79,6 @@ struct AwH3Unimplemented { >> > { "mmc0", 0x01c0f000, 4 * KiB }, >> > { "mmc1", 0x01c10000, 4 * KiB }, >> > { "mmc2", 0x01c11000, 4 * KiB }, >> > - { "sid", 0x01c14000, 1 * KiB }, >> > { "crypto", 0x01c15000, 4 * KiB }, >> > { "msgbox", 0x01c17000, 4 * KiB }, >> > { "spinlock", 0x01c18000, 4 * KiB }, >> > @@ -198,6 +198,11 @@ static void allwinner_h3_init(Object *obj) >> > >> > sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, sizeof(s->cpucfg), >> > TYPE_AW_CPUCFG); >> > + >> > + sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid), >> > + TYPE_AW_SID); >> > + object_property_add_alias(obj, "identifier", OBJECT(&s->sid), >> > + "identifier", &error_abort); >> > } >> > >> > static void allwinner_h3_realize(DeviceState *dev, Error **errp) >> > @@ -315,6 +320,10 @@ static void allwinner_h3_realize(DeviceState *dev, >> Error **errp) >> > qdev_init_nofail(DEVICE(&s->cpucfg)); >> > sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, >> s->memmap[AW_H3_CPUCFG]); >> > >> > + /* Security Identifier */ >> > + qdev_init_nofail(DEVICE(&s->sid)); >> > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]); >> > + >> > /* Universal Serial Bus */ >> > sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], >> > qdev_get_gpio_in(DEVICE(&s->gic), >> > diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c >> > index 3fcec1944e..c92fab3eac 100644 >> > --- a/hw/arm/orangepi.c >> > +++ b/hw/arm/orangepi.c >> > @@ -65,6 +65,15 @@ static void orangepi_init(MachineState *machine) >> > object_property_set_int(OBJECT(h3), 24 * 1000 * 1000, "clk1-freq", >> > &error_abort); >> > >> > + /* Setup SID properties. Currently using a default fixed SID >> identifier. */ >> > + if (qemu_uuid_is_null(&h3->sid.identifier)) { >> > + qdev_prop_set_string(DEVICE(h3), "identifier", >> > + "02c00081-1111-2222-3333-000044556677"); >> > + } else if (ldl_be_p(&h3->sid.identifier.data[0]) != 0x02c00081) { >> > + fprintf(stderr, "WARNING: Security Identifier value does " >> > + "not include H3 prefix\n"); >> > + } >> > + >> >> Should this be a LOG_GUEST_ERROR? >> > > Hi Alex, > > This warning is basically to inform the user when overriding the SID > identifier manually with -global, > that the identifier specified by the user does not contain the H3 SoC > prefix. Real hardware always has > that particular prefix in its identifier value, and it might be so that > software running on the emulated hardware > depends on it. So its basically a proactive warning to inform the user, and > not an error of wrong behavior caused by the guest software. Ahh in that case I would suggest warn_report instead of a plain printf. That should come out in all the right places but won't error out like error_report. > > >> >> Otherwise: >> >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >> > > Assuming the above explanation is sufficient, I'll add your review tag, > thanks! Using warn_report instead will be fine.
On Wed, Mar 11, 2020 at 9:04 PM Alex Bennée <alex.bennee@linaro.org> wrote: > > Niek Linnenbank <nieklinnenbank@gmail.com> writes: > > > On Wed, Mar 11, 2020 at 2:53 PM Alex Bennée <alex.bennee@linaro.org> > wrote: > > > >> > >> Niek Linnenbank <nieklinnenbank@gmail.com> writes: > >> > >> > 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 <nieklinnenbank@gmail.com> > >> > --- > >> > include/hw/arm/allwinner-h3.h | 3 + > >> > include/hw/misc/allwinner-sid.h | 60 ++++++++++++ > >> > hw/arm/allwinner-h3.c | 11 ++- > >> > hw/arm/orangepi.c | 9 ++ > >> > hw/misc/allwinner-sid.c | 168 > ++++++++++++++++++++++++++++++++ > >> > hw/misc/Makefile.objs | 1 + > >> > hw/misc/trace-events | 4 + > >> > 7 files changed, 255 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 dc729176ab..85416d9d64 100644 > >> > --- a/include/hw/arm/allwinner-h3.h > >> > +++ b/include/hw/arm/allwinner-h3.h > >> > @@ -42,6 +42,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" > >> > > >> > /** > >> > @@ -59,6 +60,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, > >> > @@ -114,6 +116,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 0000000000..4c1fa4762b > >> > --- /dev/null > >> > +++ b/include/hw/misc/allwinner-sid.h > >> > @@ -0,0 +1,60 @@ > >> > +/* > >> > + * Allwinner Security ID emulation > >> > + * > >> > + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@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 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 "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 > >> > index b9a5597f2a..deeea63f5f 100644 > >> > --- a/hw/arm/allwinner-h3.c > >> > +++ b/hw/arm/allwinner-h3.c > >> > @@ -38,6 +38,7 @@ const hwaddr allwinner_h3_memmap[] = { > >> > [AW_H3_SRAM_A2] = 0x00044000, > >> > [AW_H3_SRAM_C] = 0x00010000, > >> > [AW_H3_SYSCTRL] = 0x01c00000, > >> > + [AW_H3_SID] = 0x01c14000, > >> > [AW_H3_EHCI0] = 0x01c1a000, > >> > [AW_H3_OHCI0] = 0x01c1a400, > >> > [AW_H3_EHCI1] = 0x01c1b000, > >> > @@ -78,7 +79,6 @@ struct AwH3Unimplemented { > >> > { "mmc0", 0x01c0f000, 4 * KiB }, > >> > { "mmc1", 0x01c10000, 4 * KiB }, > >> > { "mmc2", 0x01c11000, 4 * KiB }, > >> > - { "sid", 0x01c14000, 1 * KiB }, > >> > { "crypto", 0x01c15000, 4 * KiB }, > >> > { "msgbox", 0x01c17000, 4 * KiB }, > >> > { "spinlock", 0x01c18000, 4 * KiB }, > >> > @@ -198,6 +198,11 @@ static void allwinner_h3_init(Object *obj) > >> > > >> > sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, > sizeof(s->cpucfg), > >> > TYPE_AW_CPUCFG); > >> > + > >> > + sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid), > >> > + TYPE_AW_SID); > >> > + object_property_add_alias(obj, "identifier", OBJECT(&s->sid), > >> > + "identifier", &error_abort); > >> > } > >> > > >> > static void allwinner_h3_realize(DeviceState *dev, Error **errp) > >> > @@ -315,6 +320,10 @@ static void allwinner_h3_realize(DeviceState > *dev, > >> Error **errp) > >> > qdev_init_nofail(DEVICE(&s->cpucfg)); > >> > sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, > >> s->memmap[AW_H3_CPUCFG]); > >> > > >> > + /* Security Identifier */ > >> > + qdev_init_nofail(DEVICE(&s->sid)); > >> > + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, > s->memmap[AW_H3_SID]); > >> > + > >> > /* Universal Serial Bus */ > >> > sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], > >> > qdev_get_gpio_in(DEVICE(&s->gic), > >> > diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c > >> > index 3fcec1944e..c92fab3eac 100644 > >> > --- a/hw/arm/orangepi.c > >> > +++ b/hw/arm/orangepi.c > >> > @@ -65,6 +65,15 @@ static void orangepi_init(MachineState *machine) > >> > object_property_set_int(OBJECT(h3), 24 * 1000 * 1000, > "clk1-freq", > >> > &error_abort); > >> > > >> > + /* Setup SID properties. Currently using a default fixed SID > >> identifier. */ > >> > + if (qemu_uuid_is_null(&h3->sid.identifier)) { > >> > + qdev_prop_set_string(DEVICE(h3), "identifier", > >> > + "02c00081-1111-2222-3333-000044556677"); > >> > + } else if (ldl_be_p(&h3->sid.identifier.data[0]) != 0x02c00081) { > >> > + fprintf(stderr, "WARNING: Security Identifier value does " > >> > + "not include H3 prefix\n"); > >> > + } > >> > + > >> > >> Should this be a LOG_GUEST_ERROR? > >> > > > > Hi Alex, > > > > This warning is basically to inform the user when overriding the SID > > identifier manually with -global, > > that the identifier specified by the user does not contain the H3 SoC > > prefix. Real hardware always has > > that particular prefix in its identifier value, and it might be so that > > software running on the emulated hardware > > depends on it. So its basically a proactive warning to inform the user, > and > > not an error of wrong behavior caused by the guest software. > > Ahh in that case I would suggest warn_report instead of a plain printf. > That should come out in all the right places but won't error out like > error_report. > OK, that makes sense. I wasnt' aware of warn_report. Sure, I'll change it to use warn_report instead. Regards, Niek > > > > > >> > >> Otherwise: > >> > >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > >> > > > > Assuming the above explanation is sufficient, I'll add your review tag, > > thanks! > > Using warn_report instead will be fine. > > -- > Alex Bennée >
diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index dc729176ab..85416d9d64 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -42,6 +42,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" /** @@ -59,6 +60,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, @@ -114,6 +116,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 0000000000..4c1fa4762b --- /dev/null +++ b/include/hw/misc/allwinner-sid.h @@ -0,0 +1,60 @@ +/* + * Allwinner Security ID emulation + * + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@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 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 "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 index b9a5597f2a..deeea63f5f 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -38,6 +38,7 @@ const hwaddr allwinner_h3_memmap[] = { [AW_H3_SRAM_A2] = 0x00044000, [AW_H3_SRAM_C] = 0x00010000, [AW_H3_SYSCTRL] = 0x01c00000, + [AW_H3_SID] = 0x01c14000, [AW_H3_EHCI0] = 0x01c1a000, [AW_H3_OHCI0] = 0x01c1a400, [AW_H3_EHCI1] = 0x01c1b000, @@ -78,7 +79,6 @@ struct AwH3Unimplemented { { "mmc0", 0x01c0f000, 4 * KiB }, { "mmc1", 0x01c10000, 4 * KiB }, { "mmc2", 0x01c11000, 4 * KiB }, - { "sid", 0x01c14000, 1 * KiB }, { "crypto", 0x01c15000, 4 * KiB }, { "msgbox", 0x01c17000, 4 * KiB }, { "spinlock", 0x01c18000, 4 * KiB }, @@ -198,6 +198,11 @@ static void allwinner_h3_init(Object *obj) sysbus_init_child_obj(obj, "cpucfg", &s->cpucfg, sizeof(s->cpucfg), TYPE_AW_CPUCFG); + + sysbus_init_child_obj(obj, "sid", &s->sid, sizeof(s->sid), + TYPE_AW_SID); + object_property_add_alias(obj, "identifier", OBJECT(&s->sid), + "identifier", &error_abort); } static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -315,6 +320,10 @@ static void allwinner_h3_realize(DeviceState *dev, Error **errp) qdev_init_nofail(DEVICE(&s->cpucfg)); sysbus_mmio_map(SYS_BUS_DEVICE(&s->cpucfg), 0, s->memmap[AW_H3_CPUCFG]); + /* Security Identifier */ + qdev_init_nofail(DEVICE(&s->sid)); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->sid), 0, s->memmap[AW_H3_SID]); + /* Universal Serial Bus */ sysbus_create_simple(TYPE_AW_H3_EHCI, s->memmap[AW_H3_EHCI0], qdev_get_gpio_in(DEVICE(&s->gic), diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 3fcec1944e..c92fab3eac 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -65,6 +65,15 @@ static void orangepi_init(MachineState *machine) object_property_set_int(OBJECT(h3), 24 * 1000 * 1000, "clk1-freq", &error_abort); + /* Setup SID properties. Currently using a default fixed SID identifier. */ + if (qemu_uuid_is_null(&h3->sid.identifier)) { + qdev_prop_set_string(DEVICE(h3), "identifier", + "02c00081-1111-2222-3333-000044556677"); + } else if (ldl_be_p(&h3->sid.identifier.data[0]) != 0x02c00081) { + fprintf(stderr, "WARNING: Security Identifier value does " + "not include H3 prefix\n"); + } + /* Mark H3 object realized */ object_property_set_bool(OBJECT(h3), true, "realized", &error_abort); diff --git a/hw/misc/allwinner-sid.c b/hw/misc/allwinner-sid.c new file mode 100644 index 0000000000..196380c33a --- /dev/null +++ b/hw/misc/allwinner-sid.c @@ -0,0 +1,168 @@ +/* + * Allwinner Security ID emulation + * + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@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 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 "qemu/guest-random.h" +#include "qapi/error.h" +#include "hw/qdev-properties.h" +#include "hw/misc/allwinner-sid.h" +#include "trace.h" + +/* SID register offsets */ +enum { + REG_PRCTL = 0x40, /* Control */ + REG_RDKEY = 0x60, /* Read Key */ +}; + +/* SID register flags */ +enum { + REG_PRCTL_WRITE = 0x0002, /* Unknown write flag */ + REG_PRCTL_OP_LOCK = 0xAC00, /* Lock operation */ +}; + +static uint64_t allwinner_sid_read(void *opaque, hwaddr offset, + unsigned size) +{ + const AwSidState *s = AW_SID(opaque); + uint64_t val = 0; + + switch (offset) { + case REG_PRCTL: /* Control */ + val = s->control; + break; + case REG_RDKEY: /* Read Key */ + val = s->rdkey; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + trace_allwinner_sid_read(offset, val, size); + + return val; +} + +static void allwinner_sid_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwSidState *s = AW_SID(opaque); + + trace_allwinner_sid_write(offset, val, size); + + switch (offset) { + case REG_PRCTL: /* Control */ + s->control = val; + + if ((s->control & REG_PRCTL_OP_LOCK) && + (s->control & REG_PRCTL_WRITE)) { + uint32_t id = s->control >> 16; + + if (id <= sizeof(QemuUUID) - sizeof(s->rdkey)) { + s->rdkey = ldl_be_p(&s->identifier.data[id]); + } + } + s->control &= ~REG_PRCTL_WRITE; + break; + case REG_RDKEY: /* Read Key */ + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + break; + } +} + +static const MemoryRegionOps allwinner_sid_ops = { + .read = allwinner_sid_read, + .write = allwinner_sid_write, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, + .impl.min_access_size = 4, +}; + +static void allwinner_sid_reset(DeviceState *dev) +{ + AwSidState *s = AW_SID(dev); + + /* Set default values for registers */ + s->control = 0; + s->rdkey = 0; +} + +static void allwinner_sid_init(Object *obj) +{ + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); + AwSidState *s = AW_SID(obj); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_sid_ops, s, + TYPE_AW_SID, 1 * KiB); + sysbus_init_mmio(sbd, &s->iomem); +} + +static Property allwinner_sid_properties[] = { + DEFINE_PROP_UUID_NODEFAULT("identifier", AwSidState, identifier), + DEFINE_PROP_END_OF_LIST() +}; + +static const VMStateDescription allwinner_sid_vmstate = { + .name = "allwinner-sid", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32(control, AwSidState), + VMSTATE_UINT32(rdkey, AwSidState), + VMSTATE_UINT8_ARRAY_V(identifier.data, AwSidState, sizeof(QemuUUID), 1), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_sid_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->reset = allwinner_sid_reset; + dc->vmsd = &allwinner_sid_vmstate; + device_class_set_props(dc, allwinner_sid_properties); +} + +static const TypeInfo allwinner_sid_info = { + .name = TYPE_AW_SID, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_init = allwinner_sid_init, + .instance_size = sizeof(AwSidState), + .class_init = allwinner_sid_class_init, +}; + +static void allwinner_sid_register(void) +{ + type_register_static(&allwinner_sid_info); +} + +type_init(allwinner_sid_register) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index f3788a5903..daa734036e 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -31,6 +31,7 @@ common-obj-$(CONFIG_IVSHMEM_DEVICE) += ivshmem.o common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-ccu.o obj-$(CONFIG_ALLWINNER_H3) += allwinner-cpucfg.o common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3-sysctrl.o +common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-sid.o common-obj-$(CONFIG_REALVIEW) += arm_sysctl.o common-obj-$(CONFIG_NSERIES) += cbus.o common-obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o diff --git a/hw/misc/trace-events b/hw/misc/trace-events index ede1650672..4f38328d9c 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -5,6 +5,10 @@ allwinner_cpucfg_cpu_reset(uint8_t cpu_id, uint32_t reset_addr) "id %u, reset_ad allwinner_cpucfg_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 allwinner_cpucfg_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +# allwinner-sid.c +allwinner_sid_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 +allwinner_sid_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %" PRIu32 + # eccmemctl.c ecc_mem_writel_mer(uint32_t val) "Write memory enable 0x%08x" ecc_mem_writel_mdr(uint32_t val) "Write memory delay 0x%08x"
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 <nieklinnenbank@gmail.com> --- include/hw/arm/allwinner-h3.h | 3 + include/hw/misc/allwinner-sid.h | 60 ++++++++++++ hw/arm/allwinner-h3.c | 11 ++- hw/arm/orangepi.c | 9 ++ hw/misc/allwinner-sid.c | 168 ++++++++++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/trace-events | 4 + 7 files changed, 255 insertions(+), 1 deletion(-) create mode 100644 include/hw/misc/allwinner-sid.h create mode 100644 hw/misc/allwinner-sid.c