On Thu, Jan 4, 2018 at 4:02 AM, KONRAD Frederic <frederic.kon...@adacore.com
> wrote:
>
>
> On 01/03/2018 01:44 AM, Michael Clark wrote:
>
>> Simple model of the PRCI (Power, Reset, Clock, Interrupt) to emulate
>> register reads made by the SDK BSP.
>>
>> Signed-off-by: Michael Clark <m...@sifive.com>
>> ---
>> hw/riscv/sifive_prci.c | 107 ++++++++++++++++++++++++++++++
>> +++++++++++
>> include/hw/riscv/sifive_prci.h | 43 +++++++++++++++++
>> 2 files changed, 150 insertions(+)
>> create mode 100644 hw/riscv/sifive_prci.c
>> create mode 100644 include/hw/riscv/sifive_prci.h
>>
>> diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c
>> new file mode 100644
>> index 0000000..5c27696
>> --- /dev/null
>> +++ b/hw/riscv/sifive_prci.c
>> @@ -0,0 +1,107 @@
>> +/*
>> + * QEMU SiFive PRCI (Power, Reset, Clock, Interrupt)
>> + *
>> + * Copyright (c) 2017 SiFive, Inc.
>> + *
>> + * Simple model of the PRCI to emulate register reads made by the SDK BSP
>> + *
>> + * Permission is hereby granted, free of charge, to any person obtaining
>> a copy
>> + * of this software and associated documentation files (the "Software"),
>> to deal
>> + * in the Software without restriction, including without limitation the
>> rights
>> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or
>> sell
>> + * copies of the Software, and to permit persons to whom the Software is
>> + * furnished to do so, subject to the following conditions:
>> + *
>> + * The above copyright notice and this permission notice shall be
>> included in
>> + * all copies or substantial portions of the Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
>> SHALL
>> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
>> OTHER
>> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>> ARISING FROM,
>> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>> DEALINGS IN
>> + * THE SOFTWARE.
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +#include "hw/sysbus.h"
>> +#include "target/riscv/cpu.h"
>> +#include "hw/riscv/sifive_prci.h"
>> +
>> +/* currently implements enough to mock freedom-e-sdk BSP clock
>> programming */
>> +
>> +static uint64_t sifive_prci_read(void *opaque, hwaddr addr, unsigned int
>> size)
>> +{
>> + if (addr == 0 /* PRCI_HFROSCCFG */) {
>> + return 1 << 31; /* ROSC_RDY */
>> + }
>> + if (addr == 8 /* PRCI_PLLCFG */) {
>> + return 1 << 31; /* PLL_LOCK */
>> + }
>> + hw_error("%s: read: addr=0x%x\n", __func__, (int)addr);
>> + return 0;
>> +}
>> +
>> +static void sifive_prci_write(void *opaque, hwaddr addr,
>> + uint64_t val64, unsigned int size)
>> +{
>> + /* discard writes */
>> +}
>> +
>> +static const MemoryRegionOps sifive_prci_ops = {
>> + .read = sifive_prci_read,
>> + .write = sifive_prci_write,
>> + .endianness = DEVICE_NATIVE_ENDIAN,
>> + .valid = {
>> + .min_access_size = 4,
>> + .max_access_size = 4
>> + }
>> +};
>> +
>> +static Property sifive_prci_properties[] = {
>> + DEFINE_PROP_END_OF_LIST(),
>> +};
>>
>
> Is that needed?
At this point it is redundant.
I will remove it from the next spin of the patch set.
+
>> +static void sifive_prci_init(Object *obj)
>> +{
>> + SiFivePRCIState *s = SIFIVE_PRCI(obj);
>> +
>> + memory_region_init_io(&s->mmio, obj, &sifive_prci_ops, s,
>> + TYPE_SIFIVE_PRCI, 0x8000);
>> + sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
>> +}
>> +
>> +static void sifive_prci_class_init(ObjectClass *klass, void *data)
>> +{
>> + DeviceClass *dc = DEVICE_CLASS(klass);
>> +
>> + dc->props = sifive_prci_properties;
>> +}
>> +
>> +static const TypeInfo sifive_prci_info = {
>> + .name = TYPE_SIFIVE_PRCI,
>> + .parent = TYPE_SYS_BUS_DEVICE,
>> + .instance_size = sizeof(SiFivePRCIState),
>> + .instance_init = sifive_prci_init,
>> + .class_init = sifive_prci_class_init,
>> +};
>> +
>> +static void sifive_prci_register_types(void)
>> +{
>> + type_register_static(&sifive_prci_info);
>> +}
>> +
>> +type_init(sifive_prci_register_types)
>>
>
> That's what is missing in the previous patch.
>
> Fred
>
>
> +
>> +
>> +/*
>> + * Create PRCI device.
>> + */
>> +DeviceState *sifive_prci_create(hwaddr addr)
>> +{
>> + DeviceState *dev = qdev_create(NULL, TYPE_SIFIVE_PRCI);
>> + qdev_init_nofail(dev);
>> + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr);
>> + return dev;
>> +}
>> diff --git a/include/hw/riscv/sifive_prci.h
>> b/include/hw/riscv/sifive_prci.h
>> new file mode 100644
>> index 0000000..0e032e5
>> --- /dev/null
>> +++ b/include/hw/riscv/sifive_prci.h
>> @@ -0,0 +1,43 @@
>> +/*
>> + * QEMU SiFive PRCI (Power, Reset, Clock, Interrupt) interface
>> + *
>> + * Copyright (c) 2017 SiFive, Inc.
>> + *
>> + * Permission is hereby granted, free of charge, to any person obtaining
>> a copy
>> + * of this software and associated documentation files (the "Software"),
>> to deal
>> + * in the Software without restriction, including without limitation the
>> rights
>> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or
>> sell
>> + * copies of the Software, and to permit persons to whom the Software is
>> + * furnished to do so, subject to the following conditions:
>> + *
>> + * The above copyright notice and this permission notice shall be
>> included in
>> + * all copies or substantial portions of the Software.
>> + *
>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
>> EXPRESS OR
>> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>> MERCHANTABILITY,
>> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
>> SHALL
>> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
>> OTHER
>> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>> ARISING FROM,
>> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>> DEALINGS IN
>> + * THE SOFTWARE.
>> + */
>> +
>> +#ifndef HW_SIFIVE_PRCI_H
>> +#define HW_SIFIVE_PRCI_H
>> +
>> +#define TYPE_SIFIVE_PRCI "riscv.sifive.prci"
>> +
>> +#define SIFIVE_PRCI(obj) \
>> + OBJECT_CHECK(SiFivePRCIState, (obj), TYPE_SIFIVE_PRCI)
>> +
>> +typedef struct SiFivePRCIState {
>> + /*< private >*/
>> + SysBusDevice parent_obj;
>> +
>> + /*< public >*/
>> + MemoryRegion mmio;
>> +} SiFivePRCIState;
>> +
>> +DeviceState *sifive_prci_create(hwaddr addr);
>> +
>> +#endif
>>
>>
