From: "Cédric Le Goater" <clg@kaod.org>
To: Joel Stanley <joel@jms.id.au>, Peter Maydell <peter.maydell@linaro.org>
Cc: Andrew Jeffery <andrew@aj.id.au>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] aspeed: sdmc: Implement AST2600 locking behaviour
Date: Wed, 6 May 2020 15:46:09 +0200 [thread overview]
Message-ID: <46a86f01-0e46-f96f-c1d7-d4ffc9f2974d@kaod.org> (raw)
In-Reply-To: <20200505090136.341426-1-joel@jms.id.au>
On 5/5/20 11:01 AM, Joel Stanley wrote:
> The AST2600 handles this differently with the extra 'hardlock' state, so
> move the testing to the soc specific class' write callback.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> ---
> hw/misc/aspeed_sdmc.c | 55 +++++++++++++++++++++++++++++++++++--------
> 1 file changed, 45 insertions(+), 10 deletions(-)
>
> diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c
> index 02940e7c2a76..7c688becf8c7 100644
> --- a/hw/misc/aspeed_sdmc.c
> +++ b/hw/misc/aspeed_sdmc.c
> @@ -23,7 +23,12 @@
>
> /* Protection Key Register */
> #define R_PROT (0x00 / 4)
> +#define PROT_UNLOCKED 0x01
> +#define PROT_HARDLOCKED 0x10 /* AST2600 */
> +#define PROT_SOFTLOCKED 0x00
> +
> #define PROT_KEY_UNLOCK 0xFC600309
> +#define PROT_KEY_HARDLOCK 0xDEADDEAD /* AST2600 */
>
> /* Configuration Register */
> #define R_CONF (0x04 / 4)
> @@ -130,16 +135,6 @@ static void aspeed_sdmc_write(void *opaque, hwaddr addr, uint64_t data,
> return;
> }
>
> - if (addr == R_PROT) {
> - s->regs[addr] = (data == PROT_KEY_UNLOCK) ? 1 : 0;
> - return;
> - }
> -
> - if (!s->regs[R_PROT]) {
> - qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
> - return;
> - }
> -
> asc->write(s, addr, data);
> }
>
> @@ -291,6 +286,16 @@ static uint32_t aspeed_2400_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data)
> static void aspeed_2400_sdmc_write(AspeedSDMCState *s, uint32_t reg,
> uint32_t data)
> {
> + if (reg == R_PROT) {
> + s->regs[reg] = (data == PROT_KEY_UNLOCK) ? PROT_UNLOCKED : PROT_SOFTLOCKED;
> + return;
> + }
> +
> + if (!s->regs[R_PROT]) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
> + return;
> + }
> +
> switch (reg) {
> case R_CONF:
> data = aspeed_2400_sdmc_compute_conf(s, data);
> @@ -339,6 +344,16 @@ static uint32_t aspeed_2500_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data)
> static void aspeed_2500_sdmc_write(AspeedSDMCState *s, uint32_t reg,
> uint32_t data)
> {
> + if (reg == R_PROT) {
> + s->regs[reg] = (data == PROT_KEY_UNLOCK) ? PROT_UNLOCKED : PROT_SOFTLOCKED;
> + return;
> + }
> +
> + if (!s->regs[R_PROT]) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
> + return;
> + }
> +
> switch (reg) {
> case R_CONF:
> data = aspeed_2500_sdmc_compute_conf(s, data);
> @@ -395,7 +410,27 @@ static uint32_t aspeed_2600_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data)
> static void aspeed_2600_sdmc_write(AspeedSDMCState *s, uint32_t reg,
> uint32_t data)
> {
> + if (s->regs[R_PROT] == PROT_HARDLOCKED) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked until system reset!\n",
> + __func__);
> + return;
> + }
> +
> + if (reg != R_PROT && s->regs[R_PROT] == PROT_SOFTLOCKED) {
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: SDMC is locked!\n", __func__);
> + return;
> + }
> +
> switch (reg) {
> + case R_PROT:
> + if (data == PROT_KEY_UNLOCK) {
> + data = PROT_UNLOCKED;
> + } else if (data == PROT_KEY_HARDLOCK) {
> + data = PROT_HARDLOCKED;
> + } else {
> + data = PROT_SOFTLOCKED;
> + }
> + break;
> case R_CONF:
> data = aspeed_2600_sdmc_compute_conf(s, data);
> break;
>
next prev parent reply other threads:[~2020-05-06 13:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 9:01 [PATCH] aspeed: sdmc: Implement AST2600 locking behaviour Joel Stanley
2020-05-05 9:10 ` no-reply
2020-05-06 13:46 ` Cédric Le Goater [this message]
2020-05-11 10:01 ` Peter Maydell
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=46a86f01-0e46-f96f-c1d7-d4ffc9f2974d@kaod.org \
--to=clg@kaod.org \
--cc=andrew@aj.id.au \
--cc=joel@jms.id.au \
--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).