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 <j...@jms.id.au>
Reviewed-by: Cédric Le Goater <c...@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;
>
