From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"QEMU Developers" <qemu-devel@nongnu.org>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Zoltán Baldaszti" <bztemail@gmail.com>,
"Laurent Bonnans" <laurent.bonnans@here.com>,
"Esteban Bosse" <estebanbosse@gmail.com>,
"Alistair Francis" <alistair@alistair23.me>,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
qemu-arm <qemu-arm@nongnu.org>,
"Clement Deschamps" <clement.deschamps@antfield.fr>,
"Cleber Rosa" <crosa@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Cheng Xiang" <ext-cheng.xiang@here.com>,
"Pekka Enberg" <penberg@iki.fi>,
"Guenter Roeck" <linux@roeck-us.net>,
"Eduardo Habkost" <ehabkost@redhat.com>
Subject: Re: [PATCH 12/19] hw/arm/bcm2835_peripherals: Add Clock/Power/Reset Manager blocks
Date: Mon, 7 Oct 2019 19:23:49 +0200 [thread overview]
Message-ID: <CAP+75-XdU6ZhE+Yivg=VT8EmtRPHmV7J5owifYCh-jut1rioNA@mail.gmail.com> (raw)
In-Reply-To: <9a814d3e-0ae0-08a4-9d43-1d157712029f@redhat.com>
On Tue, Oct 1, 2019 at 11:51 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
> On 9/26/19 7:34 PM, Philippe Mathieu-Daudé wrote:
> > Add basic support for BCM283x CPRMAN. Provide support for reading and
> > writing CPRMAN registers and initialize registers with sensible default
> > values. During runtime retain any written values.
> >
> > Basic CPRMAN support is necessary and sufficient to boot Linux on raspi2
> > and raspi3 systems.
> >
> > Based on:
> > https://github.com/raspberrypi/linux/blob/rpi-5.3.y/drivers/clk/bcm/clk-bcm2835.c
> > https://github.com/u-boot/u-boot/blob/v2019.07/include/dt-bindings/clock/bcm2835.h
> > https://github.com/arisena-com/rpi_src/blob/master/apps/i2s_test/src/i2s_test.c#L273
> >
> > Co-developed-by: Guenter Roeck <linux@roeck-us.net>
> > Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> > hw/arm/bcm2835_peripherals.c | 20 +-
> > hw/misc/Makefile.objs | 1 +
> > hw/misc/bcm2835_cprman.c | 383 +++++++++++++++++++++++++++
> > hw/misc/trace-events | 8 +
> > include/hw/arm/bcm2835_peripherals.h | 4 +-
> > include/hw/misc/bcm2835_cprman.h | 32 +++
> > 6 files changed, 444 insertions(+), 4 deletions(-)
> > create mode 100644 hw/misc/bcm2835_cprman.c
> > create mode 100644 include/hw/misc/bcm2835_cprman.h
> >
> > diff --git a/hw/misc/bcm2835_cprman.c b/hw/misc/bcm2835_cprman.c
> > new file mode 100644
> > index 0000000000..6c3b5b6837
> > --- /dev/null
> > +++ b/hw/misc/bcm2835_cprman.c
> > @@ -0,0 +1,383 @@
> > +/*
> > + * BCM2835 Clock/Power/Reset Manager subsystem (poor man's version)
> > + *
> > + * Copyright (C) 2018 Guenter Roeck <linux@roeck-us.net>
> > + * Copyright (C) 2018 Philippe Mathieu-Daudé <f4bug@amsat.org>
> > + *
> > + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> > + * See the COPYING file in the top-level directory.
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "qemu/log.h"
> > +#include "sysemu/runstate.h"
> > +#include "hw/registerfields.h"
> > +#include "hw/misc/bcm2835_cprman.h"
> > +#include "trace.h"
> > +
> > +#define CPRMAN_PASSWD 'Z'
> > +
> > +FIELD(CPRMAN, PASSWD, 24, 8)
> > +
[...]
> > +REG32(A2W_PLL_CTRL, 0x00)
> > +FIELD(A2W_PLL_CTRL, NDIV, 0, 12)
> > +FIELD(A2W_PLL_CTRL, PDIV, 12, 3)
> > +FIELD(A2W_PLL_CTRL, POWER_DOWN, 16, 1)
> > +FIELD(A2W_PLL_CTRL, POWER_RESET_DISABLE, 17, 1)
> > +
> > +REG32(A2W_PLL_ANA0, 0x10)
> > +
> > +FIELD(A2W_PLL_FRAC, DIV, 0, 20)
> > +
> > +FIELD(A2W_PLL_CHAN, DIV, 0, 8)
> > +FIELD(A2W_PLL_CHAN, DISABLE, 8, 1)
> > +
> > +static const char *a2w_name(hwaddr addr)
> > +{
> > + if (addr >= 0x300) {
> > + return "CHANx";
> > + }
> > + if (addr >= 0x200) {
> > + return "FRACx";
> > + }
> > + switch (addr & 0x1f) {
> > + case A_A2W_PLL_CTRL:
> > + return "CTRL";
> > + case A_A2W_PLL_ANA0:
> > + return "ANA0";
> > + default:
> > + return "UNKN";
> > + }
> > +}
> > +
> > +static const char *pll_name(int idx)
> > +{
> > + static const char *pll_names[8] = {
> > + [0] = "PLLA",
> > + [1] = "PLLC",
> > + [2] = "PLLD",
> > + [3] = "PLLH",
> > + [7] = "PLLB",
> > + };
> > + return pll_names[idx] ? pll_names[idx] : "UNKN";
> > +}
> > +
> > +static uint64_t bcm2835_cprman_a2w_read(void *opaque, hwaddr addr,
> > + unsigned size)
> > +{
> > + uint32_t res = 0;
> > +
> > + if (addr < 0x200) {
> > + /* Power */
> > + switch (addr & 0x1f) {
> > + case A_A2W_PLL_CTRL:
> > + res = R_A2W_PLL_CTRL_POWER_DOWN_MASK; /* On */
This should be R_A2W_PLL_CTRL_POWER_RESET_DISABLE_MASK.
> > + break;
> > + case A_A2W_PLL_ANA0:
> > + break;
> > + }
> > + } else {
> > + /* addr < 0x300 is FREQ, else CHANNEL */
> > + qemu_log_mask(LOG_UNIMP, "%s: bad offset 0x%" HWADDR_PRIx "\n",
> > + __func__, addr);
> > + }
> > + trace_bcm2835_cprman_read(size << 3, addr, "A2W", a2w_name(addr),
> > + pll_name((addr >> 5) & 7), res);
> > +
> > + return res;
> > +}
> > +
> > +static void bcm2835_cprman_a2w_write(void *opaque, hwaddr addr,
> > + uint64_t value, unsigned size)
> > +{
> > + if (FIELD_EX32(value, CPRMAN, PASSWD) != CPRMAN_PASSWD) {
> > + qemu_log_mask(LOG_GUEST_ERROR, "[CPRMAN]: password key error w%02d"
> > + " *0x%04"HWADDR_PRIx" = 0x%"PRIx64"\n",
> > + size << 3, addr, value);
> > + return;
> > + }
> > + value &= ~R_CPRMAN_PASSWD_MASK;
> > +
> > + trace_bcm2835_cprman_write_a2w(addr, a2w_name(addr),
> > + pll_name((addr >> 5) & 7), value);
> > +}
> > +
> > +static const MemoryRegionOps bcm2835_cprman_a2w_ops = {
> > + .read = bcm2835_cprman_a2w_read,
> > + .write = bcm2835_cprman_a2w_write,
> > + .impl.max_access_size = 4,
> > + .valid.min_access_size = 4,
> > + .endianness = DEVICE_NATIVE_ENDIAN,
> > +};
[...]
next prev parent reply other threads:[~2019-10-07 17:27 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 17:34 [PATCH 00/19] hw/arm/raspi: Improve Raspberry Pi 2/3 reliability Philippe Mathieu-Daudé
2019-09-26 17:34 ` [PATCH 01/19] hw/arm/raspi: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2019-09-27 21:36 ` Alistair Francis
2019-10-08 8:57 ` Alex Bennée
2019-10-09 0:26 ` Cleber Rosa
2019-09-26 17:34 ` [PATCH 02/19] hw/arm/bcm2835_peripherals: Improve logging Philippe Mathieu-Daudé
2019-09-27 21:37 ` Alistair Francis
2019-10-08 9:00 ` Alex Bennée
2019-10-09 1:28 ` Cleber Rosa
2019-09-26 17:34 ` [PATCH 03/19] hw/arm/bcm2835_peripherals: Name various address spaces Philippe Mathieu-Daudé
2019-09-27 21:38 ` Alistair Francis
2019-10-08 9:04 ` Alex Bennée
2019-10-09 1:48 ` Cleber Rosa
2019-09-26 17:34 ` [PATCH 04/19] hw/arm/bcm2835: Rename some definitions Philippe Mathieu-Daudé
2019-09-27 21:40 ` Alistair Francis
2019-10-08 10:40 ` Alex Bennée
2019-09-26 17:34 ` [PATCH 05/19] hw/arm/bcm2835: Add various unimplemented peripherals Philippe Mathieu-Daudé
2019-09-27 21:42 ` Alistair Francis
2019-10-08 9:43 ` Philippe Mathieu-Daudé
2019-10-11 21:55 ` Alistair Francis
2019-10-08 11:09 ` Alex Bennée
2019-09-26 17:34 ` [PATCH 06/19] hw/char/bcm2835_aux: Add trace events Philippe Mathieu-Daudé
2019-10-08 11:22 ` Alex Bennée
2019-10-14 15:36 ` Peter Maydell
2019-10-14 16:03 ` Philippe Mathieu-Daudé
2019-09-26 17:34 ` [PATCH 07/19] hw/misc/bcm2835_mbox: " Philippe Mathieu-Daudé
2019-10-08 11:32 ` Alex Bennée
2019-10-08 11:38 ` Philippe Mathieu-Daudé
2019-09-26 17:34 ` [PATCH 08/19] hw/misc/bcm2835_thermal: Add a dummy BCM2835 thermal sensor Philippe Mathieu-Daudé
2019-10-08 11:36 ` Alex Bennée
2019-10-08 11:42 ` Philippe Mathieu-Daudé
2019-10-14 15:37 ` Peter Maydell
2019-10-14 16:05 ` Philippe Mathieu-Daudé
2019-09-26 17:34 ` [PATCH 09/19] hw/arm/bcm2835_peripherals: Use the thermal sensor block Philippe Mathieu-Daudé
2019-09-27 21:51 ` Alistair Francis
2019-09-26 17:34 ` [PATCH 10/19] hw/timer/bcm2835: Add the BCM2835 SYS_timer Philippe Mathieu-Daudé
2019-10-08 14:52 ` Alex Bennée
2019-10-08 14:53 ` Philippe Mathieu-Daudé
2019-10-09 11:06 ` Philippe Mathieu-Daudé
2019-09-26 17:34 ` [PATCH 11/19] hw/arm/bcm2835_peripherals: Use the SYS_timer Philippe Mathieu-Daudé
2019-10-08 15:22 ` Alex Bennée
2019-10-09 7:39 ` Philippe Mathieu-Daudé
2019-09-26 17:34 ` [PATCH 12/19] hw/arm/bcm2835_peripherals: Add Clock/Power/Reset Manager blocks Philippe Mathieu-Daudé
2019-10-01 9:51 ` Philippe Mathieu-Daudé
2019-10-07 17:23 ` Philippe Mathieu-Daudé [this message]
2019-09-26 17:34 ` [PATCH 13/19] hw/arm/raspi: Define various blocks base addresses Philippe Mathieu-Daudé
2019-10-08 15:32 ` Alex Bennée
2019-09-26 17:34 ` [PATCH 14/19] python/qemu/machine: Allow to use other serial consoles than default Philippe Mathieu-Daudé
2019-09-27 12:54 ` bzt
2019-09-27 13:26 ` Guenter Roeck
2019-09-27 13:36 ` Peter Maydell
2019-09-27 14:44 ` Philippe Mathieu-Daudé
2019-10-09 15:28 ` Cleber Rosa
2019-09-26 17:34 ` [PATCH 15/19] tests/boot_linux_console: Extract the gunzip() helper Philippe Mathieu-Daudé
2019-10-08 15:33 ` Alex Bennée
2019-10-09 15:31 ` Cleber Rosa
2019-10-24 9:23 ` Esteban Bosse
2019-09-26 17:34 ` [PATCH 16/19] tests/boot_linux_console: Add a test for the Raspberry Pi 2 Philippe Mathieu-Daudé
2019-10-08 15:34 ` Alex Bennée
2019-10-09 15:43 ` Cleber Rosa
2019-10-09 15:43 ` Cleber Rosa
2019-09-26 17:34 ` [PATCH 17/19] tests/boot_linux_console: Test the raspi2 UART1 (16550 based) Philippe Mathieu-Daudé
2019-10-08 15:35 ` Alex Bennée
2019-10-09 15:54 ` Cleber Rosa
2019-09-26 17:34 ` [PATCH 18/19] tests/boot_linux_console: Boot Linux and run few commands on raspi3 Philippe Mathieu-Daudé
2019-10-09 16:12 ` Cleber Rosa
2019-10-09 16:21 ` Philippe Mathieu-Daudé
2019-09-26 17:34 ` [PATCH 19/19] tests/boot_linux_console: Test SDHCI and termal sensor " Philippe Mathieu-Daudé
2019-10-09 16:23 ` Cleber Rosa
2019-09-26 20:32 ` [PATCH 00/19] hw/arm/raspi: Improve Raspberry Pi 2/3 reliability BALATON Zoltan
2019-09-27 8:50 ` Philippe Mathieu-Daudé
2019-10-14 15:45 ` Peter Maydell
2019-10-14 16:07 ` Philippe Mathieu-Daudé
2019-10-16 9:57 ` Bonnans, Laurent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP+75-XdU6ZhE+Yivg=VT8EmtRPHmV7J5owifYCh-jut1rioNA@mail.gmail.com' \
--to=philmd@redhat.com \
--cc=Andrew.Baumann@microsoft.com \
--cc=alistair@alistair23.me \
--cc=bztemail@gmail.com \
--cc=clement.deschamps@antfield.fr \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=estebanbosse@gmail.com \
--cc=ext-cheng.xiang@here.com \
--cc=f4bug@amsat.org \
--cc=laurent.bonnans@here.com \
--cc=linux@roeck-us.net \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=penberg@iki.fi \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).