1
A surprisingly short target-arm queue, but no point in holding
1
Arm queue; bugfixes only.
2
onto these waiting for more code to arrive :-)
3
2
4
thanks
3
thanks
5
-- PMM
4
-- PMM
6
5
7
The following changes since commit 3d0bf8dfdfebd7f2ae41b6f220444b8047d6b1ee:
6
The following changes since commit 48aa8f0ac536db3550a35c295ff7de94e4c33739:
8
7
9
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170710a' into staging (2017-07-10 18:13:03 +0100)
8
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-11-16' into staging (2020-11-17 11:07:00 +0000)
10
9
11
are available in the git repository at:
10
are available in the Git repository at:
12
11
13
git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20170711
12
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20201117
14
13
15
for you to fetch changes up to 792dac309c8660306557ba058b8b5a6a75ab3c1f:
14
for you to fetch changes up to ab135622cf478585bdfcb68b85e4a817d74a0c42:
16
15
17
target-arm: v7M: ignore writes to CONTROL.SPSEL from Thread mode (2017-07-11 11:21:26 +0100)
16
tmp105: Correct handling of temperature limit checks (2020-11-17 12:56:33 +0000)
18
17
19
----------------------------------------------------------------
18
----------------------------------------------------------------
20
target-arm queue:
19
target-arm queue:
21
* v7M: ignore writes to CONTROL.SPSEL from Thread mode
20
* hw/arm/virt: ARM_VIRT must select ARM_GIC
22
* KVM: Enable in-kernel timers with user space gic
21
* exynos: Fix bad printf format specifiers
23
* aspeed: Register all watchdogs
22
* hw/input/ps2.c: Remove remnants of printf debug
24
* hw/misc: Add Exynos4210 Pseudo Random Number Generator
23
* target/openrisc: Remove dead code attempting to check "is timer disabled"
24
* register: Remove unnecessary NULL check
25
* util/cutils: Fix Coverity array overrun in freq_to_str()
26
* configure: Make "does libgio work" test pull in some actual functions
27
* tmp105: reset the T_low and T_High registers
28
* tmp105: Correct handling of temperature limit checks
25
29
26
----------------------------------------------------------------
30
----------------------------------------------------------------
27
Alexander Graf (1):
31
Alex Chen (1):
28
ARM: KVM: Enable in-kernel timers with user space gic
32
exynos: Fix bad printf format specifiers
29
33
30
Joel Stanley (1):
34
Alistair Francis (1):
31
aspeed: Register all watchdogs
35
register: Remove unnecessary NULL check
32
36
33
Krzysztof Kozlowski (1):
37
Andrew Jones (1):
34
hw/misc: Add Exynos4210 Pseudo Random Number Generator
38
hw/arm/virt: ARM_VIRT must select ARM_GIC
35
39
36
Peter Maydell (1):
40
Peter Maydell (5):
37
target-arm: v7M: ignore writes to CONTROL.SPSEL from Thread mode
41
hw/input/ps2.c: Remove remnants of printf debug
42
target/openrisc: Remove dead code attempting to check "is timer disabled"
43
configure: Make "does libgio work" test pull in some actual functions
44
hw/misc/tmp105: reset the T_low and T_High registers
45
tmp105: Correct handling of temperature limit checks
38
46
39
hw/misc/Makefile.objs | 2 +-
47
Philippe Mathieu-Daudé (1):
40
include/hw/arm/aspeed_soc.h | 4 +-
48
util/cutils: Fix Coverity array overrun in freq_to_str()
41
include/sysemu/kvm.h | 11 ++
42
target/arm/cpu.h | 3 +
43
accel/kvm/kvm-all.c | 5 +
44
accel/stubs/kvm-stub.c | 5 +
45
hw/arm/aspeed_soc.c | 25 ++--
46
hw/arm/exynos4210.c | 4 +
47
hw/intc/arm_gic.c | 7 ++
48
hw/misc/exynos4210_rng.c | 277 ++++++++++++++++++++++++++++++++++++++++++++
49
target/arm/helper.c | 13 ++-
50
target/arm/kvm.c | 51 ++++++++
51
12 files changed, 394 insertions(+), 13 deletions(-)
52
create mode 100644 hw/misc/exynos4210_rng.c
53
49
50
configure | 11 +++++--
51
hw/misc/tmp105.h | 7 +++++
52
hw/core/register.c | 4 ---
53
hw/input/ps2.c | 9 ------
54
hw/misc/tmp105.c | 73 ++++++++++++++++++++++++++++++++++++++------
55
hw/timer/exynos4210_mct.c | 4 +--
56
hw/timer/exynos4210_pwm.c | 8 ++---
57
target/openrisc/sys_helper.c | 3 --
58
util/cutils.c | 3 +-
59
hw/arm/Kconfig | 1 +
60
10 files changed, 89 insertions(+), 34 deletions(-)
61
diff view generated by jsdifflib
New patch
1
From: Andrew Jones <drjones@redhat.com>
1
2
3
The removal of the selection of A15MPCORE from ARM_VIRT also
4
removed what A15MPCORE selects, ARM_GIC. We still need ARM_GIC.
5
6
Fixes: bec3c97e0cf9 ("hw/arm/virt: Remove dependency on Cortex-A15 MPCore peripherals")
7
Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
8
Signed-off-by: Andrew Jones <drjones@redhat.com>
9
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
10
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
11
Message-id: 20201111143440.112763-1-drjones@redhat.com
12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
13
---
14
hw/arm/Kconfig | 1 +
15
1 file changed, 1 insertion(+)
16
17
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
18
index XXXXXXX..XXXXXXX 100644
19
--- a/hw/arm/Kconfig
20
+++ b/hw/arm/Kconfig
21
@@ -XXX,XX +XXX,XX @@ config ARM_VIRT
22
imply VFIO_PLATFORM
23
imply VFIO_XGMAC
24
imply TPM_TIS_SYSBUS
25
+ select ARM_GIC
26
select ACPI
27
select ARM_SMMUV3
28
select GPIO_KEY
29
--
30
2.20.1
31
32
diff view generated by jsdifflib
1
From: Alexander Graf <agraf@suse.de>
1
From: Alex Chen <alex.chen@huawei.com>
2
2
3
When running with KVM enabled, you can choose between emulating the
3
We should use printf format specifier "%u" instead of "%d" for
4
gic in kernel or user space. If the kernel supports in-kernel virtualization
4
argument of type "unsigned int".
5
of the interrupt controller, it will default to that. If not, if will
6
default to user space emulation.
7
5
8
Unfortunately when running in user mode gic emulation, we miss out on
6
Reported-by: Euler Robot <euler.robot@huawei.com>
9
interrupt events which are only available from kernel space, such as the timer.
7
Signed-off-by: Alex Chen <alex.chen@huawei.com>
10
This patch leverages the new kernel/user space pending line synchronization for
8
Message-id: 20201111073651.72804-1-alex.chen@huawei.com
11
timer events. It does not handle PMU events yet.
9
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
12
13
Signed-off-by: Alexander Graf <agraf@suse.de>
14
Reviewed-by: Andrew Jones <drjones@redhat.com>
15
Message-id: 1498577737-130264-1-git-send-email-agraf@suse.de
16
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
10
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
17
---
11
---
18
include/sysemu/kvm.h | 11 +++++++++++
12
hw/timer/exynos4210_mct.c | 4 ++--
19
target/arm/cpu.h | 3 +++
13
hw/timer/exynos4210_pwm.c | 8 ++++----
20
accel/kvm/kvm-all.c | 5 +++++
14
2 files changed, 6 insertions(+), 6 deletions(-)
21
accel/stubs/kvm-stub.c | 5 +++++
22
hw/intc/arm_gic.c | 7 +++++++
23
target/arm/kvm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
24
6 files changed, 82 insertions(+)
25
15
26
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
16
diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
27
index XXXXXXX..XXXXXXX 100644
17
index XXXXXXX..XXXXXXX 100644
28
--- a/include/sysemu/kvm.h
18
--- a/hw/timer/exynos4210_mct.c
29
+++ b/include/sysemu/kvm.h
19
+++ b/hw/timer/exynos4210_mct.c
30
@@ -XXX,XX +XXX,XX @@ int kvm_init_vcpu(CPUState *cpu);
20
@@ -XXX,XX +XXX,XX @@ static void exynos4210_gcomp_raise_irq(void *opaque, uint32_t id)
31
int kvm_cpu_exec(CPUState *cpu);
21
/* If CSTAT is pending and IRQ is enabled */
32
int kvm_destroy_vcpu(CPUState *cpu);
22
if ((s->reg.int_cstat & G_INT_CSTAT_COMP(id)) &&
33
23
(s->reg.int_enb & G_INT_ENABLE(id))) {
34
+/**
24
- DPRINTF("gcmp timer[%d] IRQ\n", id);
35
+ * kvm_arm_supports_user_irq
25
+ DPRINTF("gcmp timer[%u] IRQ\n", id);
36
+ *
26
qemu_irq_raise(s->irq[id]);
37
+ * Not all KVM implementations support notifications for kernel generated
27
}
38
+ * interrupt events to user space. This function indicates whether the current
28
}
39
+ * KVM implementation does support them.
29
@@ -XXX,XX +XXX,XX @@ static void exynos4210_mct_update_freq(Exynos4210MCTState *s)
40
+ *
30
MCT_CFG_GET_DIVIDER(s->reg_mct_cfg));
41
+ * Returns: true if KVM supports using kernel generated IRQs from user space
31
42
+ */
32
if (freq != s->freq) {
43
+bool kvm_arm_supports_user_irq(void);
33
- DPRINTF("freq=%dHz\n", s->freq);
44
+
34
+ DPRINTF("freq=%uHz\n", s->freq);
45
#ifdef NEED_CPU_H
35
46
#include "cpu.h"
36
/* global timer */
47
37
tx_ptimer_set_freq(s->g_timer.ptimer_frc, s->freq);
48
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
38
diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
49
index XXXXXXX..XXXXXXX 100644
39
index XXXXXXX..XXXXXXX 100644
50
--- a/target/arm/cpu.h
40
--- a/hw/timer/exynos4210_pwm.c
51
+++ b/target/arm/cpu.h
41
+++ b/hw/timer/exynos4210_pwm.c
52
@@ -XXX,XX +XXX,XX @@ struct ARMCPU {
42
@@ -XXX,XX +XXX,XX @@ static void exynos4210_pwm_update_freq(Exynos4210PWMState *s, uint32_t id)
53
void *el_change_hook_opaque;
43
54
44
if (freq != s->timer[id].freq) {
55
int32_t node_id; /* NUMA node this CPU belongs to */
45
ptimer_set_freq(s->timer[id].ptimer, s->timer[id].freq);
56
+
46
- DPRINTF("freq=%dHz\n", s->timer[id].freq);
57
+ /* Used to synchronize KVM and QEMU in-kernel device levels */
47
+ DPRINTF("freq=%uHz\n", s->timer[id].freq);
58
+ uint8_t device_irq_level;
48
}
59
};
60
61
static inline ARMCPU *arm_env_get_cpu(CPUARMState *env)
62
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
63
index XXXXXXX..XXXXXXX 100644
64
--- a/accel/kvm/kvm-all.c
65
+++ b/accel/kvm/kvm-all.c
66
@@ -XXX,XX +XXX,XX @@ int kvm_has_intx_set_mask(void)
67
return kvm_state->intx_set_mask;
68
}
49
}
69
50
70
+bool kvm_arm_supports_user_irq(void)
51
@@ -XXX,XX +XXX,XX @@ static void exynos4210_pwm_tick(void *opaque)
71
+{
52
uint32_t id = s->id;
72
+ return kvm_check_extension(kvm_state, KVM_CAP_ARM_USER_IRQ);
53
bool cmp;
73
+}
54
74
+
55
- DPRINTF("timer %d tick\n", id);
75
#ifdef KVM_CAP_SET_GUEST_DEBUG
56
+ DPRINTF("timer %u tick\n", id);
76
struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu,
57
77
target_ulong pc)
58
/* set irq status */
78
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
59
p->reg_tint_cstat |= TINT_CSTAT_STATUS(id);
79
index XXXXXXX..XXXXXXX 100644
60
80
--- a/accel/stubs/kvm-stub.c
61
/* raise IRQ */
81
+++ b/accel/stubs/kvm-stub.c
62
if (p->reg_tint_cstat & TINT_CSTAT_ENABLE(id)) {
82
@@ -XXX,XX +XXX,XX @@ void kvm_init_cpu_signals(CPUState *cpu)
63
- DPRINTF("timer %d IRQ\n", id);
83
{
64
+ DPRINTF("timer %u IRQ\n", id);
84
abort();
65
qemu_irq_raise(p->timer[id].irq);
85
}
86
+
87
+bool kvm_arm_supports_user_irq(void)
88
+{
89
+ return false;
90
+}
91
#endif
92
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
93
index XXXXXXX..XXXXXXX 100644
94
--- a/hw/intc/arm_gic.c
95
+++ b/hw/intc/arm_gic.c
96
@@ -XXX,XX +XXX,XX @@
97
#include "qom/cpu.h"
98
#include "qemu/log.h"
99
#include "trace.h"
100
+#include "sysemu/kvm.h"
101
102
/* #define DEBUG_GIC */
103
104
@@ -XXX,XX +XXX,XX @@ static void arm_gic_realize(DeviceState *dev, Error **errp)
105
return;
106
}
66
}
107
67
108
+ if (kvm_enabled() && !kvm_arm_supports_user_irq()) {
68
@@ -XXX,XX +XXX,XX @@ static void exynos4210_pwm_tick(void *opaque)
109
+ error_setg(errp, "KVM with user space irqchip only works when the "
69
}
110
+ "host kernel supports KVM_CAP_ARM_USER_IRQ");
70
111
+ return;
71
if (cmp) {
112
+ }
72
- DPRINTF("auto reload timer %d count to %x\n", id,
113
+
73
+ DPRINTF("auto reload timer %u count to %x\n", id,
114
/* This creates distributor and main CPU interface (s->cpuiomem[0]) */
74
p->timer[id].reg_tcntb);
115
gic_init_irqs_and_mmio(s, gic_set_irq, gic_ops);
75
ptimer_set_count(p->timer[id].ptimer, p->timer[id].reg_tcntb);
116
76
ptimer_run(p->timer[id].ptimer, 1);
117
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
118
index XXXXXXX..XXXXXXX 100644
119
--- a/target/arm/kvm.c
120
+++ b/target/arm/kvm.c
121
@@ -XXX,XX +XXX,XX @@ int kvm_arch_init(MachineState *ms, KVMState *s)
122
*/
123
kvm_async_interrupts_allowed = true;
124
125
+ /*
126
+ * PSCI wakes up secondary cores, so we always need to
127
+ * have vCPUs waiting in kernel space
128
+ */
129
+ kvm_halt_in_kernel_allowed = true;
130
+
131
cap_has_mp_state = kvm_check_extension(s, KVM_CAP_MP_STATE);
132
133
type_register_static(&host_arm_cpu_type_info);
134
@@ -XXX,XX +XXX,XX @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run)
135
136
MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run)
137
{
138
+ ARMCPU *cpu;
139
+ uint32_t switched_level;
140
+
141
+ if (kvm_irqchip_in_kernel()) {
142
+ /*
143
+ * We only need to sync timer states with user-space interrupt
144
+ * controllers, so return early and save cycles if we don't.
145
+ */
146
+ return MEMTXATTRS_UNSPECIFIED;
147
+ }
148
+
149
+ cpu = ARM_CPU(cs);
150
+
151
+ /* Synchronize our shadowed in-kernel device irq lines with the kvm ones */
152
+ if (run->s.regs.device_irq_level != cpu->device_irq_level) {
153
+ switched_level = cpu->device_irq_level ^ run->s.regs.device_irq_level;
154
+
155
+ qemu_mutex_lock_iothread();
156
+
157
+ if (switched_level & KVM_ARM_DEV_EL1_VTIMER) {
158
+ qemu_set_irq(cpu->gt_timer_outputs[GTIMER_VIRT],
159
+ !!(run->s.regs.device_irq_level &
160
+ KVM_ARM_DEV_EL1_VTIMER));
161
+ switched_level &= ~KVM_ARM_DEV_EL1_VTIMER;
162
+ }
163
+
164
+ if (switched_level & KVM_ARM_DEV_EL1_PTIMER) {
165
+ qemu_set_irq(cpu->gt_timer_outputs[GTIMER_PHYS],
166
+ !!(run->s.regs.device_irq_level &
167
+ KVM_ARM_DEV_EL1_PTIMER));
168
+ switched_level &= ~KVM_ARM_DEV_EL1_PTIMER;
169
+ }
170
+
171
+ /* XXX PMU IRQ is missing */
172
+
173
+ if (switched_level) {
174
+ qemu_log_mask(LOG_UNIMP, "%s: unhandled in-kernel device IRQ %x\n",
175
+ __func__, switched_level);
176
+ }
177
+
178
+ /* We also mark unknown levels as processed to not waste cycles */
179
+ cpu->device_irq_level = run->s.regs.device_irq_level;
180
+ qemu_mutex_unlock_iothread();
181
+ }
182
+
183
return MEMTXATTRS_UNSPECIFIED;
184
}
185
186
--
77
--
187
2.7.4
78
2.20.1
188
79
189
80
diff view generated by jsdifflib
New patch
1
In commit 5edab03d4040 we added tracepoints to the ps2 keyboard
2
and mouse emulation. However we didn't remove all the debug-by-printf
3
support. In fact there is only one printf() remaining, and it is
4
redundant with the trace_ps2_write_mouse() event next to it.
5
Remove the printf() and the now-unused DEBUG* macros.
1
6
7
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
9
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
10
Message-id: 20201101133258.4240-1-peter.maydell@linaro.org
11
---
12
hw/input/ps2.c | 9 ---------
13
1 file changed, 9 deletions(-)
14
15
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
16
index XXXXXXX..XXXXXXX 100644
17
--- a/hw/input/ps2.c
18
+++ b/hw/input/ps2.c
19
@@ -XXX,XX +XXX,XX @@
20
21
#include "trace.h"
22
23
-/* debug PC keyboard */
24
-//#define DEBUG_KBD
25
-
26
-/* debug PC keyboard : only mouse */
27
-//#define DEBUG_MOUSE
28
-
29
/* Keyboard Commands */
30
#define KBD_CMD_SET_LEDS    0xED    /* Set keyboard leds */
31
#define KBD_CMD_ECHO     0xEE
32
@@ -XXX,XX +XXX,XX @@ void ps2_write_mouse(void *opaque, int val)
33
PS2MouseState *s = (PS2MouseState *)opaque;
34
35
trace_ps2_write_mouse(opaque, val);
36
-#ifdef DEBUG_MOUSE
37
- printf("kbd: write mouse 0x%02x\n", val);
38
-#endif
39
switch(s->common.write_cmd) {
40
default:
41
case -1:
42
--
43
2.20.1
44
45
diff view generated by jsdifflib
New patch
1
In the mtspr helper we attempt to check for "is the timer disabled"
2
with "if (env->ttmr & TIMER_NONE)". This is wrong because TIMER_NONE
3
is zero and the condition is always false (Coverity complains about
4
the dead code.)
1
5
6
The correct check would be to test whether the TTMR_M field in the
7
register is equal to TIMER_NONE instead. However, the
8
cpu_openrisc_timer_update() function checks whether the timer is
9
enabled (it looks at cpu->env.is_counting, which is set to 0 via
10
cpu_openrisc_count_stop() when the TTMR_M field is set to
11
TIMER_NONE), so there's no need to check for "timer disabled" in the
12
target/openrisc code. Instead, simply remove the dead code.
13
14
Fixes: Coverity CID 1005812
15
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
16
Acked-by: Stafford Horne <shorne@gmail.com>
17
Message-id: 20201103114654.18540-1-peter.maydell@linaro.org
18
---
19
target/openrisc/sys_helper.c | 3 ---
20
1 file changed, 3 deletions(-)
21
22
diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c
23
index XXXXXXX..XXXXXXX 100644
24
--- a/target/openrisc/sys_helper.c
25
+++ b/target/openrisc/sys_helper.c
26
@@ -XXX,XX +XXX,XX @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)
27
28
case TO_SPR(10, 1): /* TTCR */
29
cpu_openrisc_count_set(cpu, rb);
30
- if (env->ttmr & TIMER_NONE) {
31
- return;
32
- }
33
cpu_openrisc_timer_update(cpu);
34
break;
35
#endif
36
--
37
2.20.1
38
39
diff view generated by jsdifflib
New patch
1
From: Alistair Francis <alistair.francis@wdc.com>
1
2
3
This patch fixes CID 1432800 by removing an unnecessary check.
4
5
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
6
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
7
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
8
---
9
hw/core/register.c | 4 ----
10
1 file changed, 4 deletions(-)
11
12
diff --git a/hw/core/register.c b/hw/core/register.c
13
index XXXXXXX..XXXXXXX 100644
14
--- a/hw/core/register.c
15
+++ b/hw/core/register.c
16
@@ -XXX,XX +XXX,XX @@ static RegisterInfoArray *register_init_block(DeviceState *owner,
17
int index = rae[i].addr / data_size;
18
RegisterInfo *r = &ri[index];
19
20
- if (data + data_size * index == 0 || !&rae[i]) {
21
- continue;
22
- }
23
-
24
/* Init the register, this will zero it. */
25
object_initialize((void *)r, sizeof(*r), TYPE_REGISTER);
26
27
--
28
2.20.1
29
30
diff view generated by jsdifflib
1
From: Joel Stanley <joel@jms.id.au>
1
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
2
2
3
The ast2400 contains two and the ast2500 contains three watchdogs.
3
Fix Coverity CID 1435957: Memory - illegal accesses (OVERRUN):
4
Add this information to the AspeedSoCInfo and realise the correct number
5
of watchdogs for that each SoC type.
6
4
7
Signed-off-by: Joel Stanley <joel@jms.id.au>
5
>>> Overrunning array "suffixes" of 7 8-byte elements at element
8
Reviewed-by: Cédric Le Goater <clg@kaod.org>
6
index 7 (byte offset 63) using index "idx" (which evaluates to 7).
9
Tested-by: Cédric Le Goater <clg@kaod.org>
7
8
Note, the biggest input value freq_to_str() can accept is UINT64_MAX,
9
which is ~18.446 EHz, less than 1000 EHz.
10
11
Reported-by: Eduardo Habkost <ehabkost@redhat.com>
12
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
13
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
14
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
15
Reviewed-by: Luc Michel <luc@lmichel.fr>
16
Message-id: 20201101215755.2021421-1-f4bug@amsat.org
17
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
18
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
10
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
19
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
11
---
20
---
12
include/hw/arm/aspeed_soc.h | 4 +++-
21
util/cutils.c | 3 ++-
13
hw/arm/aspeed_soc.c | 25 +++++++++++++++++--------
22
1 file changed, 2 insertions(+), 1 deletion(-)
14
2 files changed, 20 insertions(+), 9 deletions(-)
15
23
16
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
24
diff --git a/util/cutils.c b/util/cutils.c
17
index XXXXXXX..XXXXXXX 100644
25
index XXXXXXX..XXXXXXX 100644
18
--- a/include/hw/arm/aspeed_soc.h
26
--- a/util/cutils.c
19
+++ b/include/hw/arm/aspeed_soc.h
27
+++ b/util/cutils.c
20
@@ -XXX,XX +XXX,XX @@
28
@@ -XXX,XX +XXX,XX @@ char *freq_to_str(uint64_t freq_hz)
21
#include "hw/net/ftgmac100.h"
29
double freq = freq_hz;
22
30
size_t idx = 0;
23
#define ASPEED_SPIS_NUM 2
31
24
+#define ASPEED_WDTS_NUM 3
32
- while (freq >= 1000.0 && idx < ARRAY_SIZE(suffixes)) {
25
33
+ while (freq >= 1000.0) {
26
typedef struct AspeedSoCState {
34
freq /= 1000.0;
27
/*< private >*/
35
idx++;
28
@@ -XXX,XX +XXX,XX @@ typedef struct AspeedSoCState {
29
AspeedSMCState fmc;
30
AspeedSMCState spi[ASPEED_SPIS_NUM];
31
AspeedSDMCState sdmc;
32
- AspeedWDTState wdt;
33
+ AspeedWDTState wdt[ASPEED_WDTS_NUM];
34
FTGMAC100State ftgmac100;
35
} AspeedSoCState;
36
37
@@ -XXX,XX +XXX,XX @@ typedef struct AspeedSoCInfo {
38
const hwaddr *spi_bases;
39
const char *fmc_typename;
40
const char **spi_typename;
41
+ int wdts_num;
42
} AspeedSoCInfo;
43
44
typedef struct AspeedSoCClass {
45
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
46
index XXXXXXX..XXXXXXX 100644
47
--- a/hw/arm/aspeed_soc.c
48
+++ b/hw/arm/aspeed_soc.c
49
@@ -XXX,XX +XXX,XX @@ static const AspeedSoCInfo aspeed_socs[] = {
50
.spi_bases = aspeed_soc_ast2400_spi_bases,
51
.fmc_typename = "aspeed.smc.fmc",
52
.spi_typename = aspeed_soc_ast2400_typenames,
53
+ .wdts_num = 2,
54
}, {
55
.name = "ast2400-a1",
56
.cpu_model = "arm926",
57
@@ -XXX,XX +XXX,XX @@ static const AspeedSoCInfo aspeed_socs[] = {
58
.spi_bases = aspeed_soc_ast2400_spi_bases,
59
.fmc_typename = "aspeed.smc.fmc",
60
.spi_typename = aspeed_soc_ast2400_typenames,
61
+ .wdts_num = 2,
62
}, {
63
.name = "ast2400",
64
.cpu_model = "arm926",
65
@@ -XXX,XX +XXX,XX @@ static const AspeedSoCInfo aspeed_socs[] = {
66
.spi_bases = aspeed_soc_ast2400_spi_bases,
67
.fmc_typename = "aspeed.smc.fmc",
68
.spi_typename = aspeed_soc_ast2400_typenames,
69
+ .wdts_num = 2,
70
}, {
71
.name = "ast2500-a1",
72
.cpu_model = "arm1176",
73
@@ -XXX,XX +XXX,XX @@ static const AspeedSoCInfo aspeed_socs[] = {
74
.spi_bases = aspeed_soc_ast2500_spi_bases,
75
.fmc_typename = "aspeed.smc.ast2500-fmc",
76
.spi_typename = aspeed_soc_ast2500_typenames,
77
+ .wdts_num = 3,
78
},
79
};
80
81
@@ -XXX,XX +XXX,XX @@ static void aspeed_soc_init(Object *obj)
82
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
83
"ram-size", &error_abort);
84
85
- object_initialize(&s->wdt, sizeof(s->wdt), TYPE_ASPEED_WDT);
86
- object_property_add_child(obj, "wdt", OBJECT(&s->wdt), NULL);
87
- qdev_set_parent_bus(DEVICE(&s->wdt), sysbus_get_default());
88
+ for (i = 0; i < sc->info->wdts_num; i++) {
89
+ object_initialize(&s->wdt[i], sizeof(s->wdt[i]), TYPE_ASPEED_WDT);
90
+ object_property_add_child(obj, "wdt[*]", OBJECT(&s->wdt[i]), NULL);
91
+ qdev_set_parent_bus(DEVICE(&s->wdt[i]), sysbus_get_default());
92
+ }
93
94
object_initialize(&s->ftgmac100, sizeof(s->ftgmac100), TYPE_FTGMAC100);
95
object_property_add_child(obj, "ftgmac100", OBJECT(&s->ftgmac100), NULL);
96
@@ -XXX,XX +XXX,XX @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
97
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, ASPEED_SOC_SDMC_BASE);
98
99
/* Watch dog */
100
- object_property_set_bool(OBJECT(&s->wdt), true, "realized", &err);
101
- if (err) {
102
- error_propagate(errp, err);
103
- return;
104
+ for (i = 0; i < sc->info->wdts_num; i++) {
105
+ object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", &err);
106
+ if (err) {
107
+ error_propagate(errp, err);
108
+ return;
109
+ }
110
+ sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0,
111
+ ASPEED_SOC_WDT_BASE + i * 0x20);
112
}
36
}
113
- sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, ASPEED_SOC_WDT_BASE);
37
+ assert(idx < ARRAY_SIZE(suffixes));
114
38
115
/* Net */
39
return g_strdup_printf("%0.3g %sHz", freq, suffixes[idx]);
116
qdev_set_nic_properties(DEVICE(&s->ftgmac100), &nd_table[0]);
40
}
117
--
41
--
118
2.7.4
42
2.20.1
119
43
120
44
diff view generated by jsdifflib
New patch
1
In commit 76346b6264a9b01979 we tried to add a configure check that
2
the libgio pkg-config data was correct, which builds an executable
3
linked against it. Unfortunately this doesn't catch the problem
4
(missing static library dependency info), because a "do nothing" test
5
source file doesn't have any symbol references that cause the linker
6
to pull in .o files from libgio.a, and so we don't see the "missing
7
symbols from libmount" error that a full QEMU link triggers.
1
8
9
(The ineffective test went unnoticed because of a typo that
10
effectively disabled libgio unconditionally, but after commit
11
3569a5dfc11f2 fixed that, a static link of the system emulator on
12
Ubuntu stopped working again.)
13
14
Improve the gio test by having the test source fragment reference a
15
g_dbus function (which is what is indirectly causing us to end up
16
wanting functions from libmount).
17
18
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
19
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
20
Message-id: 20201116104617.18333-1-peter.maydell@linaro.org
21
---
22
configure | 11 +++++++++--
23
1 file changed, 9 insertions(+), 2 deletions(-)
24
25
diff --git a/configure b/configure
26
index XXXXXXX..XXXXXXX 100755
27
--- a/configure
28
+++ b/configure
29
@@ -XXX,XX +XXX,XX @@ if $pkg_config --atleast-version=$glib_req_ver gio-2.0; then
30
# Check that the libraries actually work -- Ubuntu 18.04 ships
31
# with pkg-config --static --libs data for gio-2.0 that is missing
32
# -lblkid and will give a link error.
33
- write_c_skeleton
34
- if compile_prog "" "$gio_libs" ; then
35
+ cat > $TMPC <<EOF
36
+#include <gio/gio.h>
37
+int main(void)
38
+{
39
+ g_dbus_proxy_new_sync(0, 0, 0, 0, 0, 0, 0, 0);
40
+ return 0;
41
+}
42
+EOF
43
+ if compile_prog "$gio_cflags" "$gio_libs" ; then
44
gio=yes
45
else
46
gio=no
47
--
48
2.20.1
49
50
diff view generated by jsdifflib
1
For v7M, writes to the CONTROL register are only permitted for
1
The TMP105 datasheet (https://www.ti.com/lit/gpn/tmp105) says that the
2
privileged code. However even if the code is privileged, the
2
power-up reset values for the T_low and T_high registers are 80 degrees C
3
write must not affect the SPSEL bit in the CONTROL register
3
and 75 degrees C, which are 0x500 and 0x4B0 hex according to table 5. These
4
if the CPU is in Thread mode (as documented in the pseudocode
4
values are then shifted right by four bits to give the register reset
5
for the MSR instruction). Implement this, instead of permitting
5
values, since both registers store the 12 bits of temperature data in bits
6
SPSEL to be written in all cases.
6
[15..4] of a 16 bit register.
7
7
8
This was causing mbed applications not to run, because the
8
We were resetting these registers to zero, which is problematic for Linux
9
RTX RTOS they use relies on this behaviour.
9
guests which enable the alert interrupt and then immediately take an
10
unexpected overtemperature alert because the current temperature is above
11
freezing...
10
12
11
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
13
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
12
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
14
Reviewed-by: Cédric Le Goater <clg@kaod.org>
13
Message-id: 1498820791-8130-1-git-send-email-peter.maydell@linaro.org
15
Message-id: 20201110150023.25533-2-peter.maydell@linaro.org
14
---
16
---
15
target/arm/helper.c | 13 ++++++++++---
17
hw/misc/tmp105.c | 3 +++
16
1 file changed, 10 insertions(+), 3 deletions(-)
18
1 file changed, 3 insertions(+)
17
19
18
diff --git a/target/arm/helper.c b/target/arm/helper.c
20
diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
19
index XXXXXXX..XXXXXXX 100644
21
index XXXXXXX..XXXXXXX 100644
20
--- a/target/arm/helper.c
22
--- a/hw/misc/tmp105.c
21
+++ b/target/arm/helper.c
23
+++ b/hw/misc/tmp105.c
22
@@ -XXX,XX +XXX,XX @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val)
24
@@ -XXX,XX +XXX,XX @@ static void tmp105_reset(I2CSlave *i2c)
23
}
25
s->faults = tmp105_faultq[(s->config >> 3) & 3];
24
break;
26
s->alarm = 0;
25
case 20: /* CONTROL */
27
26
- switch_v7m_sp(env, (val & R_V7M_CONTROL_SPSEL_MASK) != 0);
28
+ s->limit[0] = 0x4b00; /* T_LOW, 75 degrees C */
27
- env->v7m.control = val & (R_V7M_CONTROL_SPSEL_MASK |
29
+ s->limit[1] = 0x5000; /* T_HIGH, 80 degrees C */
28
- R_V7M_CONTROL_NPRIV_MASK);
30
+
29
+ /* Writing to the SPSEL bit only has an effect if we are in
31
tmp105_interrupt_update(s);
30
+ * thread mode; other bits can be updated by any privileged code.
32
}
31
+ * switch_v7m_sp() deals with updating the SPSEL bit in
33
32
+ * env->v7m.control, so we only need update the others.
33
+ */
34
+ if (env->v7m.exception == 0) {
35
+ switch_v7m_sp(env, (val & R_V7M_CONTROL_SPSEL_MASK) != 0);
36
+ }
37
+ env->v7m.control &= ~R_V7M_CONTROL_NPRIV_MASK;
38
+ env->v7m.control |= val & R_V7M_CONTROL_NPRIV_MASK;
39
break;
40
default:
41
qemu_log_mask(LOG_GUEST_ERROR, "Attempt to write unknown special"
42
--
34
--
43
2.7.4
35
2.20.1
44
36
45
37
diff view generated by jsdifflib
1
From: Krzysztof Kozlowski <krzk@kernel.org>
1
The TMP105 datasheet says that in Interrupt Mode (when TM==1) the device
2
signals an alert when the temperature equals or exceeds the T_high value and
3
then remains high until a device register is read or the device responds to
4
the SMBUS Alert Response address, or the device is put into Shutdown Mode.
5
Thereafter the Alert pin will only be re-signalled when temperature falls
6
below T_low; alert can then be cleared in the same set of ways, and the
7
device returns to its initial "alert when temperature goes above T_high"
8
mode. (If this textual description is confusing, see figure 3 in the
9
TI datasheet at https://www.ti.com/lit/gpn/tmp105 .)
2
10
3
Add emulation for Exynos4210 Pseudo Random Number Generator which could
11
We were misimplementing this as a simple "always alert if temperature is
4
work on fixed seeds or with seeds provided by True Random Number
12
above T_high or below T_low" condition, which gives a spurious alert on
5
Generator block inside the SoC.
13
startup if using the "T_high = 80 degrees C, T_low = 75 degrees C" reset
14
limit values.
6
15
7
Implement only the fixed seeds part of it in polling mode (no
16
Implement the correct (hysteresis) behaviour by tracking whether we
8
interrupts).
17
are currently looking for the temperature to rise over T_high or
18
for it to fall below T_low. Our implementation of the comparator
19
mode (TM==0) wasn't wrong, but rephrase it to match the way that
20
interrupt mode is now handled for clarity.
9
21
10
Emulation tested with two independent Linux kernel exynos-rng drivers:
22
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
11
1. New kcapi-rng interface (targeting Linux v4.12),
23
Reviewed-by: Cédric Le Goater <clg@kaod.org>
12
2. Old hwrng inteface
24
Message-id: 20201110150023.25533-3-peter.maydell@linaro.org
13
# echo "exynos" > /sys/class/misc/hw_random/rng_current
25
---
14
# dd if=/dev/hwrng of=/dev/null bs=1 count=16
26
hw/misc/tmp105.h | 7 +++++
27
hw/misc/tmp105.c | 70 +++++++++++++++++++++++++++++++++++++++++-------
28
2 files changed, 68 insertions(+), 9 deletions(-)
15
29
16
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
30
diff --git a/hw/misc/tmp105.h b/hw/misc/tmp105.h
17
Message-id: 20170425180609.11004-1-krzk@kernel.org
18
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
19
[PMM: wrapped a few overlong lines; more efficient implementation
20
of exynos4210_rng_seed_ready()]
21
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
22
---
23
hw/misc/Makefile.objs | 2 +-
24
hw/arm/exynos4210.c | 4 +
25
hw/misc/exynos4210_rng.c | 277 +++++++++++++++++++++++++++++++++++++++++++++++
26
3 files changed, 282 insertions(+), 1 deletion(-)
27
create mode 100644 hw/misc/exynos4210_rng.c
28
29
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
30
index XXXXXXX..XXXXXXX 100644
31
index XXXXXXX..XXXXXXX 100644
31
--- a/hw/misc/Makefile.objs
32
--- a/hw/misc/tmp105.h
32
+++ b/hw/misc/Makefile.objs
33
+++ b/hw/misc/tmp105.h
33
@@ -XXX,XX +XXX,XX @@ obj-$(CONFIG_IVSHMEM) += ivshmem.o
34
@@ -XXX,XX +XXX,XX @@ struct TMP105State {
34
obj-$(CONFIG_REALVIEW) += arm_sysctl.o
35
int16_t limit[2];
35
obj-$(CONFIG_NSERIES) += cbus.o
36
int faults;
36
obj-$(CONFIG_ECCMEMCTL) += eccmemctl.o
37
uint8_t alarm;
37
-obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o exynos4210_clk.o
38
+ /*
38
+obj-$(CONFIG_EXYNOS4) += exynos4210_pmu.o exynos4210_clk.o exynos4210_rng.o
39
+ * The TMP105 initially looks for a temperature rising above T_high;
39
obj-$(CONFIG_IMX) += imx_ccm.o
40
+ * once this is detected, the condition it looks for next is the
40
obj-$(CONFIG_IMX) += imx31_ccm.o
41
+ * temperature falling below T_low. This flag is false when initially
41
obj-$(CONFIG_IMX) += imx25_ccm.o
42
+ * looking for T_high, true when looking for T_low.
42
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
43
+ */
44
+ bool detect_falling;
45
};
46
47
#endif
48
diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
43
index XXXXXXX..XXXXXXX 100644
49
index XXXXXXX..XXXXXXX 100644
44
--- a/hw/arm/exynos4210.c
50
--- a/hw/misc/tmp105.c
45
+++ b/hw/arm/exynos4210.c
51
+++ b/hw/misc/tmp105.c
46
@@ -XXX,XX +XXX,XX @@
52
@@ -XXX,XX +XXX,XX @@ static void tmp105_alarm_update(TMP105State *s)
47
/* Clock controller SFR base address */
53
return;
48
#define EXYNOS4210_CLK_BASE_ADDR 0x10030000
54
}
49
55
50
+/* PRNG/HASH SFR base address */
56
- if ((s->config >> 1) & 1) {                    /* TM */
51
+#define EXYNOS4210_RNG_BASE_ADDR 0x10830400
57
- if (s->temperature >= s->limit[1])
58
- s->alarm = 1;
59
- else if (s->temperature < s->limit[0])
60
- s->alarm = 1;
61
+ if (s->config >> 1 & 1) {
62
+ /*
63
+ * TM == 1 : Interrupt mode. We signal Alert when the
64
+ * temperature rises above T_high, and expect the guest to clear
65
+ * it (eg by reading a device register).
66
+ */
67
+ if (s->detect_falling) {
68
+ if (s->temperature < s->limit[0]) {
69
+ s->alarm = 1;
70
+ s->detect_falling = false;
71
+ }
72
+ } else {
73
+ if (s->temperature >= s->limit[1]) {
74
+ s->alarm = 1;
75
+ s->detect_falling = true;
76
+ }
77
+ }
78
} else {
79
- if (s->temperature >= s->limit[1])
80
- s->alarm = 1;
81
- else if (s->temperature < s->limit[0])
82
- s->alarm = 0;
83
+ /*
84
+ * TM == 0 : Comparator mode. We signal Alert when the temperature
85
+ * rises above T_high, and stop signalling it when the temperature
86
+ * falls below T_low.
87
+ */
88
+ if (s->detect_falling) {
89
+ if (s->temperature < s->limit[0]) {
90
+ s->alarm = 0;
91
+ s->detect_falling = false;
92
+ }
93
+ } else {
94
+ if (s->temperature >= s->limit[1]) {
95
+ s->alarm = 1;
96
+ s->detect_falling = true;
97
+ }
98
+ }
99
}
100
101
tmp105_interrupt_update(s);
102
@@ -XXX,XX +XXX,XX @@ static int tmp105_post_load(void *opaque, int version_id)
103
return 0;
104
}
105
106
+static bool detect_falling_needed(void *opaque)
107
+{
108
+ TMP105State *s = opaque;
52
+
109
+
53
/* Display controllers (FIMD) */
110
+ /*
54
#define EXYNOS4210_FIMD0_BASE_ADDR 0x11C00000
111
+ * We only need to migrate the detect_falling bool if it's set;
55
112
+ * for migration from older machines we assume that it is false
56
@@ -XXX,XX +XXX,XX @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem)
113
+ * (ie temperature is not out of range).
57
sysbus_create_simple("exynos4210.pmu", EXYNOS4210_PMU_BASE_ADDR, NULL);
114
+ */
58
115
+ return s->detect_falling;
59
sysbus_create_simple("exynos4210.clk", EXYNOS4210_CLK_BASE_ADDR, NULL);
60
+ sysbus_create_simple("exynos4210.rng", EXYNOS4210_RNG_BASE_ADDR, NULL);
61
62
/* PWM */
63
sysbus_create_varargs("exynos4210.pwm", EXYNOS4210_PWM_BASE_ADDR,
64
diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c
65
new file mode 100644
66
index XXXXXXX..XXXXXXX
67
--- /dev/null
68
+++ b/hw/misc/exynos4210_rng.c
69
@@ -XXX,XX +XXX,XX @@
70
+/*
71
+ * Exynos4210 Pseudo Random Nubmer Generator Emulation
72
+ *
73
+ * Copyright (c) 2017 Krzysztof Kozlowski <krzk@kernel.org>
74
+ *
75
+ * This program is free software; you can redistribute it and/or modify it
76
+ * under the terms of the GNU General Public License as published by the
77
+ * Free Software Foundation; either version 2 of the License, or
78
+ * (at your option) any later version.
79
+ *
80
+ * This program is distributed in the hope that it will be useful, but WITHOUT
81
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
82
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
83
+ * for more details.
84
+ *
85
+ * You should have received a copy of the GNU General Public License along
86
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
87
+ */
88
+
89
+#include "qemu/osdep.h"
90
+#include "crypto/random.h"
91
+#include "hw/sysbus.h"
92
+#include "qemu/log.h"
93
+
94
+#define DEBUG_EXYNOS_RNG 0
95
+
96
+#define DPRINTF(fmt, ...) \
97
+ do { \
98
+ if (DEBUG_EXYNOS_RNG) { \
99
+ printf("exynos4210_rng: " fmt, ## __VA_ARGS__); \
100
+ } \
101
+ } while (0)
102
+
103
+#define TYPE_EXYNOS4210_RNG "exynos4210.rng"
104
+#define EXYNOS4210_RNG(obj) \
105
+ OBJECT_CHECK(Exynos4210RngState, (obj), TYPE_EXYNOS4210_RNG)
106
+
107
+/*
108
+ * Exynos4220, PRNG, only polling mode is supported.
109
+ */
110
+
111
+/* RNG_CONTROL_1 register bitfields, reset value: 0x0 */
112
+#define EXYNOS4210_RNG_CONTROL_1_PRNG 0x8
113
+#define EXYNOS4210_RNG_CONTROL_1_START_INIT BIT(4)
114
+/* RNG_STATUS register bitfields, reset value: 0x1 */
115
+#define EXYNOS4210_RNG_STATUS_PRNG_ERROR BIT(7)
116
+#define EXYNOS4210_RNG_STATUS_PRNG_DONE BIT(5)
117
+#define EXYNOS4210_RNG_STATUS_MSG_DONE BIT(4)
118
+#define EXYNOS4210_RNG_STATUS_PARTIAL_DONE BIT(3)
119
+#define EXYNOS4210_RNG_STATUS_PRNG_BUSY BIT(2)
120
+#define EXYNOS4210_RNG_STATUS_SEED_SETTING_DONE BIT(1)
121
+#define EXYNOS4210_RNG_STATUS_BUFFER_READY BIT(0)
122
+#define EXYNOS4210_RNG_STATUS_WRITE_MASK (EXYNOS4210_RNG_STATUS_PRNG_DONE \
123
+ | EXYNOS4210_RNG_STATUS_MSG_DONE \
124
+ | EXYNOS4210_RNG_STATUS_PARTIAL_DONE)
125
+
126
+#define EXYNOS4210_RNG_CONTROL_1 0x0
127
+#define EXYNOS4210_RNG_STATUS 0x10
128
+#define EXYNOS4210_RNG_SEED_IN 0x140
129
+#define EXYNOS4210_RNG_SEED_IN_OFFSET(n) (EXYNOS4210_RNG_SEED_IN + (n * 0x4))
130
+#define EXYNOS4210_RNG_PRNG 0x160
131
+#define EXYNOS4210_RNG_PRNG_OFFSET(n) (EXYNOS4210_RNG_PRNG + (n * 0x4))
132
+
133
+#define EXYNOS4210_RNG_PRNG_NUM 5
134
+
135
+#define EXYNOS4210_RNG_REGS_MEM_SIZE 0x200
136
+
137
+typedef struct Exynos4210RngState {
138
+ SysBusDevice parent_obj;
139
+ MemoryRegion iomem;
140
+
141
+ int32_t randr_value[EXYNOS4210_RNG_PRNG_NUM];
142
+ /* bits from 0 to EXYNOS4210_RNG_PRNG_NUM if given seed register was set */
143
+ uint32_t seed_set;
144
+
145
+ /* Register values */
146
+ uint32_t reg_control;
147
+ uint32_t reg_status;
148
+} Exynos4210RngState;
149
+
150
+static bool exynos4210_rng_seed_ready(const Exynos4210RngState *s)
151
+{
152
+ uint32_t mask = MAKE_64BIT_MASK(0, EXYNOS4210_RNG_PRNG_NUM);
153
+
154
+ /* Return true if all the seed-set bits are set. */
155
+ return (s->seed_set & mask) == mask;
156
+}
116
+}
157
+
117
+
158
+static void exynos4210_rng_set_seed(Exynos4210RngState *s, unsigned int i,
118
+static const VMStateDescription vmstate_tmp105_detect_falling = {
159
+ uint64_t val)
119
+ .name = "TMP105/detect-falling",
160
+{
161
+ /*
162
+ * We actually ignore the seed and always generate true random numbers.
163
+ * Theoretically this should not match the device as Exynos has
164
+ * a Pseudo Random Number Generator but testing shown that it always
165
+ * generates random numbers regardless of the seed value.
166
+ */
167
+ s->seed_set |= BIT(i);
168
+
169
+ /* If all seeds were written, update the status to reflect it */
170
+ if (exynos4210_rng_seed_ready(s)) {
171
+ s->reg_status |= EXYNOS4210_RNG_STATUS_SEED_SETTING_DONE;
172
+ } else {
173
+ s->reg_status &= ~EXYNOS4210_RNG_STATUS_SEED_SETTING_DONE;
174
+ }
175
+}
176
+
177
+static void exynos4210_rng_run_engine(Exynos4210RngState *s)
178
+{
179
+ Error *err = NULL;
180
+ int ret;
181
+
182
+ /* Seed set? */
183
+ if ((s->reg_status & EXYNOS4210_RNG_STATUS_SEED_SETTING_DONE) == 0) {
184
+ goto out;
185
+ }
186
+
187
+ /* PRNG engine chosen? */
188
+ if ((s->reg_control & EXYNOS4210_RNG_CONTROL_1_PRNG) == 0) {
189
+ goto out;
190
+ }
191
+
192
+ /* PRNG engine started? */
193
+ if ((s->reg_control & EXYNOS4210_RNG_CONTROL_1_START_INIT) == 0) {
194
+ goto out;
195
+ }
196
+
197
+ /* Get randoms */
198
+ ret = qcrypto_random_bytes((uint8_t *)s->randr_value,
199
+ sizeof(s->randr_value), &err);
200
+ if (!ret) {
201
+ /* Notify that PRNG is ready */
202
+ s->reg_status |= EXYNOS4210_RNG_STATUS_PRNG_DONE;
203
+ } else {
204
+ error_report_err(err);
205
+ }
206
+
207
+out:
208
+ /* Always clear start engine bit */
209
+ s->reg_control &= ~EXYNOS4210_RNG_CONTROL_1_START_INIT;
210
+}
211
+
212
+static uint64_t exynos4210_rng_read(void *opaque, hwaddr offset,
213
+ unsigned size)
214
+{
215
+ Exynos4210RngState *s = (Exynos4210RngState *)opaque;
216
+ uint32_t val = 0;
217
+
218
+ assert(size == 4);
219
+
220
+ switch (offset) {
221
+ case EXYNOS4210_RNG_CONTROL_1:
222
+ val = s->reg_control;
223
+ break;
224
+
225
+ case EXYNOS4210_RNG_STATUS:
226
+ val = s->reg_status;
227
+ break;
228
+
229
+ case EXYNOS4210_RNG_PRNG_OFFSET(0):
230
+ case EXYNOS4210_RNG_PRNG_OFFSET(1):
231
+ case EXYNOS4210_RNG_PRNG_OFFSET(2):
232
+ case EXYNOS4210_RNG_PRNG_OFFSET(3):
233
+ case EXYNOS4210_RNG_PRNG_OFFSET(4):
234
+ val = s->randr_value[(offset - EXYNOS4210_RNG_PRNG_OFFSET(0)) / 4];
235
+ DPRINTF("returning random @0x%" HWADDR_PRIx ": 0x%" PRIx32 "\n",
236
+ offset, val);
237
+ break;
238
+
239
+ default:
240
+ qemu_log_mask(LOG_GUEST_ERROR,
241
+ "%s: bad read offset 0x%" HWADDR_PRIx "\n",
242
+ __func__, offset);
243
+ }
244
+
245
+ return val;
246
+}
247
+
248
+static void exynos4210_rng_write(void *opaque, hwaddr offset,
249
+ uint64_t val, unsigned size)
250
+{
251
+ Exynos4210RngState *s = (Exynos4210RngState *)opaque;
252
+
253
+ assert(size == 4);
254
+
255
+ switch (offset) {
256
+ case EXYNOS4210_RNG_CONTROL_1:
257
+ DPRINTF("RNG_CONTROL_1 = 0x%" PRIx64 "\n", val);
258
+ s->reg_control = val;
259
+ exynos4210_rng_run_engine(s);
260
+ break;
261
+
262
+ case EXYNOS4210_RNG_STATUS:
263
+ /* For clearing status fields */
264
+ s->reg_status &= ~EXYNOS4210_RNG_STATUS_WRITE_MASK;
265
+ s->reg_status |= val & EXYNOS4210_RNG_STATUS_WRITE_MASK;
266
+ break;
267
+
268
+ case EXYNOS4210_RNG_SEED_IN_OFFSET(0):
269
+ case EXYNOS4210_RNG_SEED_IN_OFFSET(1):
270
+ case EXYNOS4210_RNG_SEED_IN_OFFSET(2):
271
+ case EXYNOS4210_RNG_SEED_IN_OFFSET(3):
272
+ case EXYNOS4210_RNG_SEED_IN_OFFSET(4):
273
+ exynos4210_rng_set_seed(s,
274
+ (offset - EXYNOS4210_RNG_SEED_IN_OFFSET(0)) / 4,
275
+ val);
276
+ break;
277
+
278
+ default:
279
+ qemu_log_mask(LOG_GUEST_ERROR,
280
+ "%s: bad write offset 0x%" HWADDR_PRIx "\n",
281
+ __func__, offset);
282
+ }
283
+}
284
+
285
+static const MemoryRegionOps exynos4210_rng_ops = {
286
+ .read = exynos4210_rng_read,
287
+ .write = exynos4210_rng_write,
288
+ .endianness = DEVICE_NATIVE_ENDIAN,
289
+};
290
+
291
+static void exynos4210_rng_reset(DeviceState *dev)
292
+{
293
+ Exynos4210RngState *s = EXYNOS4210_RNG(dev);
294
+
295
+ s->reg_control = 0;
296
+ s->reg_status = EXYNOS4210_RNG_STATUS_BUFFER_READY;
297
+ memset(s->randr_value, 0, sizeof(s->randr_value));
298
+ s->seed_set = 0;
299
+}
300
+
301
+static void exynos4210_rng_init(Object *obj)
302
+{
303
+ Exynos4210RngState *s = EXYNOS4210_RNG(obj);
304
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
305
+
306
+ memory_region_init_io(&s->iomem, obj, &exynos4210_rng_ops, s,
307
+ TYPE_EXYNOS4210_RNG, EXYNOS4210_RNG_REGS_MEM_SIZE);
308
+ sysbus_init_mmio(dev, &s->iomem);
309
+}
310
+
311
+static const VMStateDescription exynos4210_rng_vmstate = {
312
+ .name = TYPE_EXYNOS4210_RNG,
313
+ .version_id = 1,
120
+ .version_id = 1,
314
+ .minimum_version_id = 1,
121
+ .minimum_version_id = 1,
122
+ .needed = detect_falling_needed,
315
+ .fields = (VMStateField[]) {
123
+ .fields = (VMStateField[]) {
316
+ VMSTATE_INT32_ARRAY(randr_value, Exynos4210RngState,
124
+ VMSTATE_BOOL(detect_falling, TMP105State),
317
+ EXYNOS4210_RNG_PRNG_NUM),
318
+ VMSTATE_UINT32(seed_set, Exynos4210RngState),
319
+ VMSTATE_UINT32(reg_status, Exynos4210RngState),
320
+ VMSTATE_UINT32(reg_control, Exynos4210RngState),
321
+ VMSTATE_END_OF_LIST()
125
+ VMSTATE_END_OF_LIST()
322
+ }
126
+ }
323
+};
127
+};
324
+
128
+
325
+static void exynos4210_rng_class_init(ObjectClass *klass, void *data)
129
static const VMStateDescription vmstate_tmp105 = {
326
+{
130
.name = "TMP105",
327
+ DeviceClass *dc = DEVICE_CLASS(klass);
131
.version_id = 0,
328
+
132
@@ -XXX,XX +XXX,XX @@ static const VMStateDescription vmstate_tmp105 = {
329
+ dc->reset = exynos4210_rng_reset;
133
VMSTATE_UINT8(alarm, TMP105State),
330
+ dc->vmsd = &exynos4210_rng_vmstate;
134
VMSTATE_I2C_SLAVE(i2c, TMP105State),
331
+}
135
VMSTATE_END_OF_LIST()
332
+
136
+ },
333
+static const TypeInfo exynos4210_rng_info = {
137
+ .subsections = (const VMStateDescription*[]) {
334
+ .name = TYPE_EXYNOS4210_RNG,
138
+ &vmstate_tmp105_detect_falling,
335
+ .parent = TYPE_SYS_BUS_DEVICE,
139
+ NULL
336
+ .instance_size = sizeof(Exynos4210RngState),
140
}
337
+ .instance_init = exynos4210_rng_init,
141
};
338
+ .class_init = exynos4210_rng_class_init,
142
339
+};
143
@@ -XXX,XX +XXX,XX @@ static void tmp105_reset(I2CSlave *i2c)
340
+
144
s->config = 0;
341
+static void exynos4210_rng_register(void)
145
s->faults = tmp105_faultq[(s->config >> 3) & 3];
342
+{
146
s->alarm = 0;
343
+ type_register_static(&exynos4210_rng_info);
147
+ s->detect_falling = false;
344
+}
148
345
+
149
s->limit[0] = 0x4b00; /* T_LOW, 75 degrees C */
346
+type_init(exynos4210_rng_register)
150
s->limit[1] = 0x5000; /* T_HIGH, 80 degrees C */
347
--
151
--
348
2.7.4
152
2.20.1
349
153
350
154
diff view generated by jsdifflib