hw/riscv: Move sifive_u_prci model to hw/misc

This is an effort to clean up the hw/riscv directory. Ideally it
should only contain the RISC-V SoC / machine codes plus generic
codes. Let's move sifive_u_prci model to hw/misc directory.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <1599129623-68957-3-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>

3 files changed, 1 insertions, 170 deletions

diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index 5855e99aaa..109364b814 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -24,6 +24,7 @@ config SIFIVE_U
     select HART
     select SIFIVE
     select SIFIVE_PDMA
+    select SIFIVE_U_PRCI
     select UNIMP
 
 config SPIKE
diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
index 003994d1ea..3462cb5a28 100644
--- a/hw/riscv/meson.build
+++ b/hw/riscv/meson.build
@@ -12,7 +12,6 @@ riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_uart.c'))
 riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c'))
 riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c'))
 riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_otp.c'))
-riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u_prci.c'))
 riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('riscv_htif.c'))
 riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('spike.c'))
 riscv_ss.add(when: 'CONFIG_MICROCHIP_PFSOC', if_true: files('microchip_pfsoc.c'))
diff --git a/hw/riscv/sifive_u_prci.c b/hw/riscv/sifive_u_prci.c
deleted file mode 100644
index 4fa590c064..0000000000
--- a/hw/riscv/sifive_u_prci.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * QEMU SiFive U PRCI (Power, Reset, Clock, Interrupt)
- *
- * Copyright (c) 2019 Bin Meng <bmeng.cn@gmail.com>
- *
- * Simple model of the PRCI to emulate register reads made by the SDK BSP
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2 or later, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope 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 "hw/sysbus.h"
-#include "qemu/log.h"
-#include "qemu/module.h"
-#include "hw/riscv/sifive_u_prci.h"
-
-static uint64_t sifive_u_prci_read(void *opaque, hwaddr addr, unsigned int size)
-{
-    SiFiveUPRCIState *s = opaque;
-
-    switch (addr) {
-    case SIFIVE_U_PRCI_HFXOSCCFG:
-        return s->hfxosccfg;
-    case SIFIVE_U_PRCI_COREPLLCFG0:
-        return s->corepllcfg0;
-    case SIFIVE_U_PRCI_DDRPLLCFG0:
-        return s->ddrpllcfg0;
-    case SIFIVE_U_PRCI_DDRPLLCFG1:
-        return s->ddrpllcfg1;
-    case SIFIVE_U_PRCI_GEMGXLPLLCFG0:
-        return s->gemgxlpllcfg0;
-    case SIFIVE_U_PRCI_GEMGXLPLLCFG1:
-        return s->gemgxlpllcfg1;
-    case SIFIVE_U_PRCI_CORECLKSEL:
-        return s->coreclksel;
-    case SIFIVE_U_PRCI_DEVICESRESET:
-        return s->devicesreset;
-    case SIFIVE_U_PRCI_CLKMUXSTATUS:
-        return s->clkmuxstatus;
-    }
-
-    qemu_log_mask(LOG_GUEST_ERROR, "%s: read: addr=0x%" HWADDR_PRIx "\n",
-                  __func__, addr);
-
-    return 0;
-}
-
-static void sifive_u_prci_write(void *opaque, hwaddr addr,
-                                uint64_t val64, unsigned int size)
-{
-    SiFiveUPRCIState *s = opaque;
-    uint32_t val32 = (uint32_t)val64;
-
-    switch (addr) {
-    case SIFIVE_U_PRCI_HFXOSCCFG:
-        s->hfxosccfg = val32;
-        /* OSC stays ready */
-        s->hfxosccfg |= SIFIVE_U_PRCI_HFXOSCCFG_RDY;
-        break;
-    case SIFIVE_U_PRCI_COREPLLCFG0:
-        s->corepllcfg0 = val32;
-        /* internal feedback */
-        s->corepllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_FSE;
-        /* PLL stays locked */
-        s->corepllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_LOCK;
-        break;
-    case SIFIVE_U_PRCI_DDRPLLCFG0:
-        s->ddrpllcfg0 = val32;
-        /* internal feedback */
-        s->ddrpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_FSE;
-        /* PLL stays locked */
-        s->ddrpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_LOCK;
-        break;
-    case SIFIVE_U_PRCI_DDRPLLCFG1:
-        s->ddrpllcfg1 = val32;
-        break;
-    case SIFIVE_U_PRCI_GEMGXLPLLCFG0:
-        s->gemgxlpllcfg0 = val32;
-        /* internal feedback */
-        s->gemgxlpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_FSE;
-        /* PLL stays locked */
-        s->gemgxlpllcfg0 |= SIFIVE_U_PRCI_PLLCFG0_LOCK;
-        break;
-    case SIFIVE_U_PRCI_GEMGXLPLLCFG1:
-        s->gemgxlpllcfg1 = val32;
-        break;
-    case SIFIVE_U_PRCI_CORECLKSEL:
-        s->coreclksel = val32;
-        break;
-    case SIFIVE_U_PRCI_DEVICESRESET:
-        s->devicesreset = val32;
-        break;
-    case SIFIVE_U_PRCI_CLKMUXSTATUS:
-        s->clkmuxstatus = val32;
-        break;
-    default:
-        qemu_log_mask(LOG_GUEST_ERROR, "%s: bad write: addr=0x%" HWADDR_PRIx
-                      " v=0x%x\n", __func__, addr, val32);
-    }
-}
-
-static const MemoryRegionOps sifive_u_prci_ops = {
-    .read = sifive_u_prci_read,
-    .write = sifive_u_prci_write,
-    .endianness = DEVICE_NATIVE_ENDIAN,
-    .valid = {
-        .min_access_size = 4,
-        .max_access_size = 4
-    }
-};
-
-static void sifive_u_prci_realize(DeviceState *dev, Error **errp)
-{
-    SiFiveUPRCIState *s = SIFIVE_U_PRCI(dev);
-
-    memory_region_init_io(&s->mmio, OBJECT(dev), &sifive_u_prci_ops, s,
-                          TYPE_SIFIVE_U_PRCI, SIFIVE_U_PRCI_REG_SIZE);
-    sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mmio);
-}
-
-static void sifive_u_prci_reset(DeviceState *dev)
-{
-    SiFiveUPRCIState *s = SIFIVE_U_PRCI(dev);
-
-    /* Initialize register to power-on-reset values */
-    s->hfxosccfg = SIFIVE_U_PRCI_HFXOSCCFG_RDY | SIFIVE_U_PRCI_HFXOSCCFG_EN;
-    s->corepllcfg0 = SIFIVE_U_PRCI_PLLCFG0_DIVR | SIFIVE_U_PRCI_PLLCFG0_DIVF |
-                     SIFIVE_U_PRCI_PLLCFG0_DIVQ | SIFIVE_U_PRCI_PLLCFG0_FSE |
-                     SIFIVE_U_PRCI_PLLCFG0_LOCK;
-    s->ddrpllcfg0 = SIFIVE_U_PRCI_PLLCFG0_DIVR | SIFIVE_U_PRCI_PLLCFG0_DIVF |
-                    SIFIVE_U_PRCI_PLLCFG0_DIVQ | SIFIVE_U_PRCI_PLLCFG0_FSE |
-                    SIFIVE_U_PRCI_PLLCFG0_LOCK;
-    s->gemgxlpllcfg0 = SIFIVE_U_PRCI_PLLCFG0_DIVR | SIFIVE_U_PRCI_PLLCFG0_DIVF |
-                       SIFIVE_U_PRCI_PLLCFG0_DIVQ | SIFIVE_U_PRCI_PLLCFG0_FSE |
-                       SIFIVE_U_PRCI_PLLCFG0_LOCK;
-    s->coreclksel = SIFIVE_U_PRCI_CORECLKSEL_HFCLK;
-}
-
-static void sifive_u_prci_class_init(ObjectClass *klass, void *data)
-{
-    DeviceClass *dc = DEVICE_CLASS(klass);
-
-    dc->realize = sifive_u_prci_realize;
-    dc->reset = sifive_u_prci_reset;
-}
-
-static const TypeInfo sifive_u_prci_info = {
-    .name          = TYPE_SIFIVE_U_PRCI,
-    .parent        = TYPE_SYS_BUS_DEVICE,
-    .instance_size = sizeof(SiFiveUPRCIState),
-    .class_init    = sifive_u_prci_class_init,
-};
-
-static void sifive_u_prci_register_types(void)
-{
-    type_register_static(&sifive_u_prci_info);
-}
-
-type_init(sifive_u_prci_register_types)