From nobody Sat Apr 26 12:06:40 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1615226111; cv=none;
d=zohomail.com; s=zohoarc;
b=YRBphFWFjxStSO7w5l7X4dw3El5RKFcCUfbhTSut+FSa620lmFDV+pwFy7ZEThIyakfQjA/PLi+fGiljzM49sspRfcFhLEbp2LgAdkAB52j7fvs+8MeXEeFFrmbcdGIEfJfPNuOpVjEkkXYmlXrjUMwzF6FqpPydG1qBpQaWoVM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1615226111;
h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=orpnEDUBvIyjL138nq/Gczh7tKouG2/4vpMrG+zXm7g=;
b=J7B4YWd/dQfCqALd9SIJB9aBwTzu8NyNDDwd8LZQ3dCl5WGJTNdS0g6AIMYAX4fHqA9dPcQB+1ItgYUN72V5E8Rr8oblUhDqec3eFkstC8s0+CyFd/5Tuuy+j2y5ph5PTTOn9sj/3f0V0v7ESGrVoVlkkF/IGqalMvj+k9ZgrTo=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1615226111404411.21701771032906;
Mon, 8 Mar 2021 09:55:11 -0800 (PST)
Received: from localhost ([::1]:44438 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1lJK62-0006k3-04
for importer@patchew.org; Mon, 08 Mar 2021 12:55:10 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:53580)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1lJJko-0006aX-SV
for qemu-devel@nongnu.org; Mon, 08 Mar 2021 12:33:14 -0500
Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:34697)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1lJJkY-00073X-R3
for qemu-devel@nongnu.org; Mon, 08 Mar 2021 12:33:14 -0500
Received: by mail-wr1-x436.google.com with SMTP id u16so12325516wrt.1
for <qemu-devel@nongnu.org>; Mon, 08 Mar 2021 09:32:57 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id i10sm18628217wrs.11.2021.03.08.09.32.55
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 08 Mar 2021 09:32:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=orpnEDUBvIyjL138nq/Gczh7tKouG2/4vpMrG+zXm7g=;
b=qewr51PQx5CzDBu7KIin6NVHuEMWwVmmbFTYShy7b1q38YrGcz4Bi1bPX/6K5kJN08
eemGjxrft9xpmQfu/jIea0IZfZxcn/aVnOF7wI68FMx0YSCZqMvGITPIv9c6E7UeV3aw
JBm9cyrT9rwixRPdJItzs/ehOtItZS2TG2iDc8J9VIKO/+PEGnt+YuYRPIciJiRqlBKf
iRUxfObF4bJBYzE/HuJePDJ57wwlKG4mVNWt/jdIgRF9uIcb2DmUE+2OwEUDjTYCPdUg
EVG0AlFSyh8mcpfNAFzuwhMbSbhF0Y8T8DHOnPaUE9fUo8VKoJokx44vNLwEAqgmmGLq
xIhw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=orpnEDUBvIyjL138nq/Gczh7tKouG2/4vpMrG+zXm7g=;
b=aJKgeQoD4o+T35bb5K0imWzgog/C5Q0xj8V5VqJpbxNGfPS+azY2RtluI4xvFkmXdK
+9oYF13Nyf4he7Bdu5i6542jM9q0Jd3kP1/NjENp3o7k4aSB+vyubAT3A/MPHS59PbH7
IsBxN4a8+DRONpFs7DL1HJ1EZrCsgwD1BES5Wesh9nQ5D7l1b1W2QbR+3vgg4cvjdysI
Rccb97YyO6tS6EV4nVSZXO1kWwKboWUYlzU31gQ1yDm2+5gykpTp+qLbfN7DCYxY0ESz
jGVoknn1JEM0+ieiiyuYy5GlPyzoAnNKJsVSoZfa5bYGrRMlctSz8fZrY4qG0cCsadSw
kmYA==
X-Gm-Message-State: AOAM532jQstHuH4LTJam67yoYK+mDZsMvi3MEufYF019YCsC0AkLs9Qt
VGSSFwGKQeRZREUX8EU0Q9BJrbzva/HPXA==
X-Google-Smtp-Source:
ABdhPJw8hxksLv2eSXljkX2DlCJSn0nP93QBuEp6E9xgA/lTOLcQzSwwSrAKWnNEy1mhMD0YM2NNUQ==
X-Received: by 2002:a5d:4592:: with SMTP id
p18mr25655861wrq.244.1615224776563;
Mon, 08 Mar 2021 09:32:56 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 13/54] hw/misc/iotkit-sysctl: Add SSE-300 cases which match
SSE-200 behaviour
Date: Mon, 8 Mar 2021 17:32:03 +0000
Message-Id: <20210308173244.20710-14-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210308173244.20710-1-peter.maydell@linaro.org>
References: <20210308173244.20710-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::436;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
The SSE-300's iokit-sysctl device is similar to the SSE-200, but
some registers have moved address or have different behaviours.
In this commit we add case statements for the registers where
the SSE-300 and SSE-200 have the same behaviour. Some registers
are the same on all SSE versions and so need no code change at all.
Putting both of these categories together covers:
0x0 SECDBGSTAT
0x4 SECDBGSET
0x8 SECDBGCLR
0xc SCSECCTRL
0x10 CLK_CFG0 -- this is like SSE-200 FCLK_DIV but with a
different set of clocks being controlled; our implementation
is a dummy reads-as-written anyway
0x14 CLK_CFG1 -- similar to SSE-200 SYSCLK_DIV; our implementation
is a dummy
0x18 CLK_FORCE -- similar to SSE-200 but different bit allocations;
we have a dummy implementation
0x100 RESET_SYNDROME -- bit allocation differs from SSE-200 but our
implementation is a dummy
0x104 RESET_MASK -- bit allocation differs from SSE-200 but our
implementation is a dummy
0x108 SWRESET
0x10c GRETREG
0x200 PDCM_PD_SYS_SENSE -- some bit allocations differ, but our
implementation is a dummy
We also need to migrate the state of these registers which are shared
between the SSE-200 and SSE-300, so update the vmstate 'needed'
function to do this.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210219144617.4782-14-peter.maydell@linaro.org
---
hw/misc/iotkit-sysctl.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c
index c67f5b320ab..7f8608c814c 100644
--- a/hw/misc/iotkit-sysctl.c
+++ b/hw/misc/iotkit-sysctl.c
@@ -105,6 +105,7 @@ static uint64_t iotkit_sysctl_read(void *opaque, hwaddr=
offset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
r =3D s->scsecctrl;
break;
default:
@@ -116,6 +117,7 @@ static uint64_t iotkit_sysctl_read(void *opaque, hwaddr=
offset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
r =3D s->fclk_div;
break;
default:
@@ -127,6 +129,7 @@ static uint64_t iotkit_sysctl_read(void *opaque, hwaddr=
offset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
r =3D s->sysclk_div;
break;
default:
@@ -138,6 +141,7 @@ static uint64_t iotkit_sysctl_read(void *opaque, hwaddr=
offset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
r =3D s->clock_force;
break;
default:
@@ -202,6 +206,7 @@ static uint64_t iotkit_sysctl_read(void *opaque, hwaddr=
offset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
r =3D s->pdcm_pd_sys_sense;
break;
default:
@@ -348,6 +353,7 @@ static void iotkit_sysctl_write(void *opaque, hwaddr of=
fset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl SCSECCTRL unimplemente=
d\n");
s->scsecctrl =3D value;
break;
@@ -360,6 +366,7 @@ static void iotkit_sysctl_write(void *opaque, hwaddr of=
fset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl FCLK_DIV unimplemented=
\n");
s->fclk_div =3D value;
break;
@@ -372,6 +379,7 @@ static void iotkit_sysctl_write(void *opaque, hwaddr of=
fset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl SYSCLK_DIV unimplement=
ed\n");
s->sysclk_div =3D value;
break;
@@ -384,6 +392,7 @@ static void iotkit_sysctl_write(void *opaque, hwaddr of=
fset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl CLOCK_FORCE unimplemen=
ted\n");
s->clock_force =3D value;
break;
@@ -420,6 +429,7 @@ static void iotkit_sysctl_write(void *opaque, hwaddr of=
fset,
case ARMSSE_IOTKIT:
goto bad_offset;
case ARMSSE_SSE200:
+ case ARMSSE_SSE300:
qemu_log_mask(LOG_UNIMP,
"IoTKit SysCtl PDCM_PD_SYS_SENSE unimplemented\n=
");
s->pdcm_pd_sys_sense =3D value;
@@ -569,7 +579,7 @@ static bool sse200_needed(void *opaque)
{
IoTKitSysCtl *s =3D IOTKIT_SYSCTL(opaque);
=20
- return s->sse_version =3D=3D ARMSSE_SSE200;
+ return s->sse_version !=3D ARMSSE_IOTKIT;
}
=20
static const VMStateDescription iotkit_sysctl_sse200_vmstate =3D {
--=20
2.20.1