jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
pmu: convert to use ADBBusState internal autopoll variables
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200623204936.24064-10-mark.cave-ayland@ilande.co.uk>
+15
-27
+15
-24
hw/misc/macio/pmu.c
+15
-24
hw/misc/macio/pmu.c
···
92
92
static void pmu_adb_poll(void *opaque)
93
93
{
94
94
PMUState *s = opaque;
95
+
ADBBusState *adb_bus = &s->adb_bus;
95
96
int olen;
96
97
97
98
if (!(s->intbits & PMU_INT_ADB)) {
98
-
olen = adb_poll(&s->adb_bus, s->adb_reply, s->adb_poll_mask);
99
+
olen = adb_poll(adb_bus, s->adb_reply, adb_bus->autopoll_mask);
99
100
trace_pmu_adb_poll(olen);
100
101
101
102
if (olen > 0) {
···
104
105
pmu_update_extirq(s);
105
106
}
106
107
}
107
-
108
-
timer_mod(s->adb_poll_timer,
109
-
qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->autopoll_rate_ms);
110
108
}
111
109
112
110
static void pmu_one_sec_timer(void *opaque)
···
173
171
174
172
static void pmu_cmd_set_adb_autopoll(PMUState *s, uint16_t mask)
175
173
{
174
+
ADBBusState *adb_bus = &s->adb_bus;
175
+
176
176
trace_pmu_cmd_set_adb_autopoll(mask);
177
177
178
-
if (s->adb_poll_mask == mask) {
179
-
return;
180
-
}
181
-
182
-
s->adb_poll_mask = mask;
183
178
if (mask) {
184
-
timer_mod(s->adb_poll_timer,
185
-
qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + s->autopoll_rate_ms);
179
+
adb_set_autopoll_mask(adb_bus, mask);
180
+
adb_set_autopoll_enabled(adb_bus, true);
186
181
} else {
187
-
timer_del(s->adb_poll_timer);
182
+
adb_set_autopoll_enabled(adb_bus, false);
188
183
}
189
184
}
190
185
···
267
262
const uint8_t *in_data, uint8_t in_len,
268
263
uint8_t *out_data, uint8_t *out_len)
269
264
{
265
+
ADBBusState *adb_bus = &s->adb_bus;
266
+
270
267
if (in_len != 0) {
271
268
qemu_log_mask(LOG_GUEST_ERROR,
272
269
"PMU: ADB POLL OFF command, invalid len: %d want: 0\n",
···
274
271
return;
275
272
}
276
273
277
-
if (s->has_adb && s->adb_poll_mask) {
278
-
timer_del(s->adb_poll_timer);
279
-
s->adb_poll_mask = 0;
274
+
if (s->has_adb) {
275
+
adb_set_autopoll_enabled(adb_bus, false);
280
276
}
281
277
}
282
278
···
684
680
685
681
static const VMStateDescription vmstate_pmu_adb = {
686
682
.name = "pmu/adb",
687
-
.version_id = 0,
688
-
.minimum_version_id = 0,
683
+
.version_id = 1,
684
+
.minimum_version_id = 1,
689
685
.needed = pmu_adb_state_needed,
690
686
.fields = (VMStateField[]) {
691
-
VMSTATE_UINT16(adb_poll_mask, PMUState),
692
-
VMSTATE_TIMER_PTR(adb_poll_timer, PMUState),
693
687
VMSTATE_UINT8(adb_reply_size, PMUState),
694
688
VMSTATE_BUFFER(adb_reply, PMUState),
695
689
VMSTATE_END_OF_LIST()
···
714
708
VMSTATE_BUFFER(cmd_rsp, PMUState),
715
709
VMSTATE_UINT8(intbits, PMUState),
716
710
VMSTATE_UINT8(intmask, PMUState),
717
-
VMSTATE_UINT8(autopoll_rate_ms, PMUState),
718
711
VMSTATE_UINT32(tick_offset, PMUState),
719
712
VMSTATE_TIMER_PTR(one_sec_timer, PMUState),
720
713
VMSTATE_INT64(one_sec_target, PMUState),
···
734
727
s->intbits = 0;
735
728
736
729
s->cmd_state = pmu_state_idle;
737
-
s->adb_poll_mask = 0;
738
730
}
739
731
740
732
static void pmu_realize(DeviceState *dev, Error **errp)
···
742
734
PMUState *s = VIA_PMU(dev);
743
735
Error *err = NULL;
744
736
SysBusDevice *sbd;
737
+
ADBBusState *adb_bus = &s->adb_bus;
745
738
struct tm tm;
746
739
747
740
sysbus_realize(SYS_BUS_DEVICE(&s->mos6522_pmu), &err);
···
763
756
if (s->has_adb) {
764
757
qbus_create_inplace(&s->adb_bus, sizeof(s->adb_bus), TYPE_ADB_BUS,
765
758
dev, "adb.0");
766
-
s->adb_poll_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, pmu_adb_poll, s);
767
-
s->adb_poll_mask = 0xffff;
768
-
s->autopoll_rate_ms = 20;
759
+
adb_register_autopoll_callback(adb_bus, pmu_adb_poll, s);
769
760
}
770
761
}
771
762