* [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374)
@ 2015-12-29 8:04 Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 01/17] i82374: device only existed as ISA device, so simplify device Hervé Poussineau
` (17 more replies)
0 siblings, 18 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Hi,
This patchset is a cleanup of the i8257/i82374 ISA DMA controllers.
Global DMA_* functions will be obsoleted and then deleted, and ISA devices will not
be tied anymore to i8257 DMA device implementation.
This paves the way to fix support for floppy DMA operations on sparc/sparc64/MIPS Magnum
platforms (which don't use i8257 DMA controller), and to support multiple ISA buses on
the same machine.
Patch 1 cleans up the i82374 DMA controller, by removing device inheritance.
Patches 2 to 7 change i8257 to current standards (structures and functions renaming, QOM)
Patches 8 to 16 create and use a IsaDma interface, to separate devices from i8257
device implementation.
Patch 17 removes now unused DMA_* functions.
Hervé
Hervé Poussineau (17):
i82374: device only existed as ISA device, so simplify device
i8257: pass ISA bus to DMA_init() function
i8257: rename struct dma_cont to I8257State
i8257: rename functions to start with i8257_ prefix
i8257: make the DMA running method per controller
i8257: add missing const
i8257: QOM'ify
isa: add an ISA DMA interface, and store it within the ISA bus
i8257: implement the IsaDma interface
magnum: disable floppy DMA for now
sparc: disable floppy DMA
sparc64: disable floppy DMA
fdc: use IsaDma interface instead of global DMA_* functions
cs4231a: use IsaDma interface instead of global DMA_* functions
gus: use IsaDma interface instead of global DMA_* functions
sb16: use IsaDma interface instead of global DMA_* functions
dma: remove now useless DMA_* functions
hw/audio/cs4231a.c | 23 +--
hw/audio/gus.c | 20 ++-
hw/audio/sb16.c | 23 ++-
hw/block/fdc.c | 70 ++++++---
hw/dma/i82374.c | 58 +++-----
hw/dma/i8257.c | 366 +++++++++++++++++++++++++++++-------------------
hw/i386/pc.c | 2 +-
hw/isa/isa-bus.c | 21 +++
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_jazz.c | 5 +-
hw/mips/mips_malta.c | 2 +-
hw/sparc/sun4m.c | 24 +---
hw/sparc64/sun4u.c | 37 ++---
include/hw/block/fdc.h | 2 +-
include/hw/isa/isa.h | 51 +++++--
include/qemu/typedefs.h | 1 +
16 files changed, 418 insertions(+), 289 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 01/17] i82374: device only existed as ISA device, so simplify device
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 02/17] i8257: pass ISA bus to DMA_init() function Hervé Poussineau
` (16 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Merge ISAi82374State fields into parent structure I82374State.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i82374.c | 58 +++++++++++++++++++--------------------------------------
1 file changed, 19 insertions(+), 39 deletions(-)
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index f630971..daa8042 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -24,6 +24,9 @@
#include "hw/isa/isa.h"
+#define TYPE_I82374 "i82374"
+#define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_I82374)
+
//#define DEBUG_I82374
#ifdef DEBUG_I82374
@@ -37,6 +40,9 @@ do {} while (0)
do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARGS__); } while (0)
typedef struct I82374State {
+ ISADevice parent_obj;
+
+ uint32_t iobase;
uint8_t commands[8];
PortioList port_list;
} I82374State;
@@ -98,32 +104,6 @@ static uint32_t i82374_read_descriptor(void *opaque, uint32_t nport)
return val;
}
-static void i82374_realize(I82374State *s, Error **errp)
-{
- DMA_init(1);
- memset(s->commands, 0, sizeof(s->commands));
-}
-
-#define TYPE_I82374 "i82374"
-#define I82374(obj) OBJECT_CHECK(ISAi82374State, (obj), TYPE_I82374)
-
-typedef struct ISAi82374State {
- ISADevice parent_obj;
-
- uint32_t iobase;
- I82374State state;
-} ISAi82374State;
-
-static const VMStateDescription vmstate_isa_i82374 = {
- .name = "isa-i82374",
- .version_id = 0,
- .minimum_version_id = 0,
- .fields = (VMStateField[]) {
- VMSTATE_STRUCT(state, ISAi82374State, 0, vmstate_i82374, I82374State),
- VMSTATE_END_OF_LIST()
- },
-};
-
static const MemoryRegionPortio i82374_portio_list[] = {
{ 0x0A, 1, 1, .read = i82374_read_isr, },
{ 0x10, 8, 1, .write = i82374_write_command, },
@@ -133,21 +113,21 @@ static const MemoryRegionPortio i82374_portio_list[] = {
PORTIO_END_OF_LIST(),
};
-static void i82374_isa_realize(DeviceState *dev, Error **errp)
+static void i82374_realize(DeviceState *dev, Error **errp)
{
- ISAi82374State *isa = I82374(dev);
- I82374State *s = &isa->state;
+ I82374State *s = I82374(dev);
- portio_list_init(&s->port_list, OBJECT(isa), i82374_portio_list, s,
+ portio_list_init(&s->port_list, OBJECT(s), i82374_portio_list, s,
"i82374");
- portio_list_add(&s->port_list, isa_address_space_io(&isa->parent_obj),
- isa->iobase);
+ portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),
+ s->iobase);
- i82374_realize(s, errp);
+ DMA_init(1);
+ memset(s->commands, 0, sizeof(s->commands));
}
static Property i82374_properties[] = {
- DEFINE_PROP_UINT32("iobase", ISAi82374State, iobase, 0x400),
+ DEFINE_PROP_UINT32("iobase", I82374State, iobase, 0x400),
DEFINE_PROP_END_OF_LIST()
};
@@ -155,21 +135,21 @@ static void i82374_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- dc->realize = i82374_isa_realize;
- dc->vmsd = &vmstate_isa_i82374;
+ dc->realize = i82374_realize;
+ dc->vmsd = &vmstate_i82374;
dc->props = i82374_properties;
}
-static const TypeInfo i82374_isa_info = {
+static const TypeInfo i82374_info = {
.name = TYPE_I82374,
.parent = TYPE_ISA_DEVICE,
- .instance_size = sizeof(ISAi82374State),
+ .instance_size = sizeof(I82374State),
.class_init = i82374_class_init,
};
static void i82374_register_types(void)
{
- type_register_static(&i82374_isa_info);
+ type_register_static(&i82374_info);
}
type_init(i82374_register_types)
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 02/17] i8257: pass ISA bus to DMA_init() function
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 01/17] i82374: device only existed as ISA device, so simplify device Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State Hervé Poussineau
` (15 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Michael S. Tsirkin, Mark Cave-Ayland,
Blue Swirl, Hervé Poussineau, Paolo Bonzini, Leon Alrae,
Aurelien Jarno, Richard Henderson
i8257 DMA controller exists on one ISA bus, so let's specify it at initialization.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i82374.c | 2 +-
hw/dma/i8257.c | 2 +-
hw/i386/pc.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_jazz.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/sparc/sun4m.c | 2 +-
hw/sparc64/sun4u.c | 2 +-
include/hw/isa/isa.h | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index daa8042..96a7a48 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -122,7 +122,7 @@ static void i82374_realize(DeviceState *dev, Error **errp)
portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),
s->iobase);
- DMA_init(1);
+ DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1);
memset(s->commands, 0, sizeof(s->commands));
}
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 1398424..4d0b49d 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -588,7 +588,7 @@ static const VMStateDescription vmstate_dma = {
}
};
-void DMA_init(int high_page_enable)
+void DMA_init(ISABus *bus, int high_page_enable)
{
dma_init2(&dma_controllers[0], 0x00, 0, 0x80, high_page_enable ? 0x480 : -1);
dma_init2(&dma_controllers[1], 0xc0, 1, 0x88, high_page_enable ? 0x488 : -1);
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 459260b..130d0c5 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1543,7 +1543,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
port92 = isa_create_simple(isa_bus, "port92");
port92_init(port92, &a20_line[1]);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
for(i = 0; i < MAX_FD; i++) {
fd[i] = drive_get(IF_FLOPPY, 0, i);
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 5988a88..ea59a61 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -365,7 +365,7 @@ static void mips_fulong2e_init(MachineState *machine)
/* init other devices */
pit = pit_init(isa_bus, 0x40, 0, NULL);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
/* Super I/O */
isa_create_simple(isa_bus, "i8042");
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 1ab885b..64a0de2 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -224,7 +224,7 @@ static void mips_jazz_init(MachineState *machine,
/* ISA devices */
i8259 = i8259_init(isa_bus, env->irq[4]);
isa_bus_irqs(isa_bus, i8259);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
pit = pit_init(isa_bus, 0x40, 0, NULL);
pcspk_init(isa_bus, pit);
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 91c36ba..2acca4d 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1165,7 +1165,7 @@ void mips_malta_init(MachineState *machine)
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
g_free(smbus_eeprom_buf);
pit = pit_init(isa_bus, 0x40, 0, NULL);
- DMA_init(0);
+ DMA_init(isa_bus, 0);
/* Super I/O */
isa_create_simple(isa_bus, "i8042");
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 230dac9..bf6a7da 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -111,7 +111,7 @@ void DMA_hold_DREQ (int nchan) {}
void DMA_release_DREQ (int nchan) {}
void DMA_schedule(void) {}
-void DMA_init(int high_page_enable)
+void DMA_init(ISABus *bus, int high_page_enable)
{
}
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index d6b929c..df98b3b 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -114,7 +114,7 @@ void DMA_hold_DREQ (int nchan) {}
void DMA_release_DREQ (int nchan) {}
void DMA_schedule(void) {}
-void DMA_init(int high_page_enable)
+void DMA_init(ISABus *bus, int high_page_enable)
{
}
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index d758b39..d84852b 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -113,7 +113,7 @@ int DMA_write_memory (int nchan, void *buf, int pos, int size);
void DMA_hold_DREQ (int nchan);
void DMA_release_DREQ (int nchan);
void DMA_schedule(void);
-void DMA_init(int high_page_enable);
+void DMA_init(ISABus *bus, int high_page_enable);
void DMA_register_channel (int nchan,
DMA_transfer_handler transfer_handler,
void *opaque);
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 01/17] i82374: device only existed as ISA device, so simplify device Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 02/17] i8257: pass ISA bus to DMA_init() function Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 04/17] i8257: rename functions to start with i8257_ prefix Hervé Poussineau
` (14 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 4d0b49d..f4fcf39 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -52,7 +52,7 @@ struct dma_regs {
#define ADDR 0
#define COUNT 1
-static struct dma_cont {
+typedef struct I8257State {
uint8_t status;
uint8_t command;
uint8_t mask;
@@ -61,7 +61,9 @@ static struct dma_cont {
struct dma_regs regs[4];
MemoryRegion channel_io;
MemoryRegion cont_io;
-} dma_controllers[2];
+} I8257State;
+
+static I8257State dma_controllers[2];
enum {
CMD_MEMORY_TO_MEMORY = 0x01,
@@ -84,7 +86,7 @@ static int channels[8] = {-1, 2, 3, 1, -1, -1, -1, 0};
static void write_page (void *opaque, uint32_t nport, uint32_t data)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -97,7 +99,7 @@ static void write_page (void *opaque, uint32_t nport, uint32_t data)
static void write_pageh (void *opaque, uint32_t nport, uint32_t data)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -110,7 +112,7 @@ static void write_pageh (void *opaque, uint32_t nport, uint32_t data)
static uint32_t read_page (void *opaque, uint32_t nport)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -123,7 +125,7 @@ static uint32_t read_page (void *opaque, uint32_t nport)
static uint32_t read_pageh (void *opaque, uint32_t nport)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -134,7 +136,7 @@ static uint32_t read_pageh (void *opaque, uint32_t nport)
return d->regs[ichan].pageh;
}
-static inline void init_chan (struct dma_cont *d, int ichan)
+static inline void init_chan(I8257State *d, int ichan)
{
struct dma_regs *r;
@@ -143,7 +145,7 @@ static inline void init_chan (struct dma_cont *d, int ichan)
r->now[COUNT] = 0;
}
-static inline int getff (struct dma_cont *d)
+static inline int getff(I8257State *d)
{
int ff;
@@ -154,7 +156,7 @@ static inline int getff (struct dma_cont *d)
static uint64_t read_chan(void *opaque, hwaddr nport, unsigned size)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan, nreg, iport, ff, val, dir;
struct dma_regs *r;
@@ -177,7 +179,7 @@ static uint64_t read_chan(void *opaque, hwaddr nport, unsigned size)
static void write_chan(void *opaque, hwaddr nport, uint64_t data,
unsigned size)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int iport, ichan, nreg;
struct dma_regs *r;
@@ -196,7 +198,7 @@ static void write_chan(void *opaque, hwaddr nport, uint64_t data,
static void write_cont(void *opaque, hwaddr nport, uint64_t data,
unsigned size)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int iport, ichan = 0;
iport = (nport >> d->dshift) & 0x0f;
@@ -284,7 +286,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
static uint64_t read_cont(void *opaque, hwaddr nport, unsigned size)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int iport, val;
iport = (nport >> d->dshift) & 0x0f;
@@ -361,7 +363,7 @@ static bool dma_bh_scheduled;
static void DMA_run (void)
{
- struct dma_cont *d;
+ I8257State *d;
int icont, ichan;
int rearm = 0;
static int running = 0;
@@ -473,7 +475,7 @@ void DMA_schedule(void)
static void dma_reset(void *opaque)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
write_cont(d, (0x05 << d->dshift), 0, 1);
}
@@ -519,7 +521,7 @@ static const MemoryRegionOps cont_io_ops = {
};
/* dshift = 0: 8 bit DMA, 1 = 16 bit DMA */
-static void dma_init2(struct dma_cont *d, int base, int dshift,
+static void dma_init2(I8257State *d, int base, int dshift,
int page_base, int pageh_base)
{
int i;
@@ -579,11 +581,12 @@ static const VMStateDescription vmstate_dma = {
.minimum_version_id = 1,
.post_load = dma_post_load,
.fields = (VMStateField[]) {
- VMSTATE_UINT8(command, struct dma_cont),
- VMSTATE_UINT8(mask, struct dma_cont),
- VMSTATE_UINT8(flip_flop, struct dma_cont),
- VMSTATE_INT32(dshift, struct dma_cont),
- VMSTATE_STRUCT_ARRAY(regs, struct dma_cont, 4, 1, vmstate_dma_regs, struct dma_regs),
+ VMSTATE_UINT8(command, I8257State),
+ VMSTATE_UINT8(mask, I8257State),
+ VMSTATE_UINT8(flip_flop, I8257State),
+ VMSTATE_INT32(dshift, I8257State),
+ VMSTATE_STRUCT_ARRAY(regs, I8257State, 4, 1, vmstate_dma_regs,
+ struct dma_regs),
VMSTATE_END_OF_LIST()
}
};
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 04/17] i8257: rename functions to start with i8257_ prefix
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (2 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 05/17] i8257: make the DMA running method per controller Hervé Poussineau
` (13 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 91 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 46 insertions(+), 45 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index f4fcf39..aba4295 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -80,11 +80,11 @@ enum {
};
-static void DMA_run (void);
+static void i8257_dma_run(void);
static int channels[8] = {-1, 2, 3, 1, -1, -1, -1, 0};
-static void write_page (void *opaque, uint32_t nport, uint32_t data)
+static void i8257_write_page(void *opaque, uint32_t nport, uint32_t data)
{
I8257State *d = opaque;
int ichan;
@@ -97,7 +97,7 @@ static void write_page (void *opaque, uint32_t nport, uint32_t data)
d->regs[ichan].page = data;
}
-static void write_pageh (void *opaque, uint32_t nport, uint32_t data)
+static void i8257_write_pageh(void *opaque, uint32_t nport, uint32_t data)
{
I8257State *d = opaque;
int ichan;
@@ -110,7 +110,7 @@ static void write_pageh (void *opaque, uint32_t nport, uint32_t data)
d->regs[ichan].pageh = data;
}
-static uint32_t read_page (void *opaque, uint32_t nport)
+static uint32_t i8257_read_page(void *opaque, uint32_t nport)
{
I8257State *d = opaque;
int ichan;
@@ -123,7 +123,7 @@ static uint32_t read_page (void *opaque, uint32_t nport)
return d->regs[ichan].page;
}
-static uint32_t read_pageh (void *opaque, uint32_t nport)
+static uint32_t i8257_read_pageh(void *opaque, uint32_t nport)
{
I8257State *d = opaque;
int ichan;
@@ -136,7 +136,7 @@ static uint32_t read_pageh (void *opaque, uint32_t nport)
return d->regs[ichan].pageh;
}
-static inline void init_chan(I8257State *d, int ichan)
+static inline void i8257_init_chan(I8257State *d, int ichan)
{
struct dma_regs *r;
@@ -145,7 +145,7 @@ static inline void init_chan(I8257State *d, int ichan)
r->now[COUNT] = 0;
}
-static inline int getff(I8257State *d)
+static inline int i8257_getff(I8257State *d)
{
int ff;
@@ -154,7 +154,7 @@ static inline int getff(I8257State *d)
return ff;
}
-static uint64_t read_chan(void *opaque, hwaddr nport, unsigned size)
+static uint64_t i8257_read_chan(void *opaque, hwaddr nport, unsigned size)
{
I8257State *d = opaque;
int ichan, nreg, iport, ff, val, dir;
@@ -166,7 +166,7 @@ static uint64_t read_chan(void *opaque, hwaddr nport, unsigned size)
r = d->regs + ichan;
dir = ((r->mode >> 5) & 1) ? -1 : 1;
- ff = getff (d);
+ ff = i8257_getff(d);
if (nreg)
val = (r->base[COUNT] << d->dshift) - r->now[COUNT];
else
@@ -176,8 +176,8 @@ static uint64_t read_chan(void *opaque, hwaddr nport, unsigned size)
return (val >> (d->dshift + (ff << 3))) & 0xff;
}
-static void write_chan(void *opaque, hwaddr nport, uint64_t data,
- unsigned size)
+static void i8257_write_chan(void *opaque, hwaddr nport, uint64_t data,
+ unsigned int size)
{
I8257State *d = opaque;
int iport, ichan, nreg;
@@ -187,16 +187,16 @@ static void write_chan(void *opaque, hwaddr nport, uint64_t data,
ichan = iport >> 1;
nreg = iport & 1;
r = d->regs + ichan;
- if (getff (d)) {
+ if (i8257_getff(d)) {
r->base[nreg] = (r->base[nreg] & 0xff) | ((data << 8) & 0xff00);
- init_chan (d, ichan);
+ i8257_init_chan(d, ichan);
} else {
r->base[nreg] = (r->base[nreg] & 0xff00) | (data & 0xff);
}
}
-static void write_cont(void *opaque, hwaddr nport, uint64_t data,
- unsigned size)
+static void i8257_write_cont(void *opaque, hwaddr nport, uint64_t data,
+ unsigned int size)
{
I8257State *d = opaque;
int iport, ichan = 0;
@@ -220,7 +220,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
d->status &= ~(1 << (ichan + 4));
}
d->status &= ~(1 << ichan);
- DMA_run();
+ i8257_dma_run();
break;
case 0x02: /* single mask */
@@ -228,7 +228,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
d->mask |= 1 << (data & 3);
else
d->mask &= ~(1 << (data & 3));
- DMA_run();
+ i8257_dma_run();
break;
case 0x03: /* mode */
@@ -263,12 +263,12 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
case 0x06: /* clear mask for all channels */
d->mask = 0;
- DMA_run();
+ i8257_dma_run();
break;
case 0x07: /* write mask for all channels */
d->mask = data;
- DMA_run();
+ i8257_dma_run();
break;
default:
@@ -284,7 +284,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t data,
#endif
}
-static uint64_t read_cont(void *opaque, hwaddr nport, unsigned size)
+static uint64_t i8257_read_cont(void *opaque, hwaddr nport, unsigned size)
{
I8257State *d = opaque;
int iport, val;
@@ -320,7 +320,7 @@ void DMA_hold_DREQ (int nchan)
ichan = nchan & 3;
linfo ("held cont=%d chan=%d\n", ncont, ichan);
dma_controllers[ncont].status |= 1 << (ichan + 4);
- DMA_run();
+ i8257_dma_run();
}
void DMA_release_DREQ (int nchan)
@@ -331,10 +331,10 @@ void DMA_release_DREQ (int nchan)
ichan = nchan & 3;
linfo ("released cont=%d chan=%d\n", ncont, ichan);
dma_controllers[ncont].status &= ~(1 << (ichan + 4));
- DMA_run();
+ i8257_dma_run();
}
-static void channel_run (int ncont, int ichan)
+static void i8257_channel_run(int ncont, int ichan)
{
int n;
struct dma_regs *r = &dma_controllers[ncont].regs[ichan];
@@ -361,7 +361,7 @@ static void channel_run (int ncont, int ichan)
static QEMUBH *dma_bh;
static bool dma_bh_scheduled;
-static void DMA_run (void)
+static void i8257_dma_run(void)
{
I8257State *d;
int icont, ichan;
@@ -384,7 +384,7 @@ static void DMA_run (void)
mask = 1 << ichan;
if ((0 == (d->mask & mask)) && (0 != (d->status & (mask << 4)))) {
- channel_run (icont, ichan);
+ i8257_channel_run(icont, ichan);
rearm = 1;
}
}
@@ -398,10 +398,10 @@ out:
}
}
-static void DMA_run_bh(void *unused)
+static void i8257_dma_run_bh(void *unused)
{
dma_bh_scheduled = false;
- DMA_run();
+ i8257_dma_run();
}
void DMA_register_channel (int nchan,
@@ -473,13 +473,14 @@ void DMA_schedule(void)
}
}
-static void dma_reset(void *opaque)
+static void i8257_reset(void *opaque)
{
I8257State *d = opaque;
- write_cont(d, (0x05 << d->dshift), 0, 1);
+ i8257_write_cont(d, (0x05 << d->dshift), 0, 1);
}
-static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
+static int i8257_phony_handler(void *opaque, int nchan, int dma_pos,
+ int dma_len)
{
trace_i8257_unregistered_dma(nchan, dma_pos, dma_len);
return dma_pos;
@@ -487,8 +488,8 @@ static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
static const MemoryRegionOps channel_io_ops = {
- .read = read_chan,
- .write = write_chan,
+ .read = i8257_read_chan,
+ .write = i8257_write_chan,
.endianness = DEVICE_NATIVE_ENDIAN,
.impl = {
.min_access_size = 1,
@@ -498,21 +499,21 @@ static const MemoryRegionOps channel_io_ops = {
/* IOport from page_base */
static const MemoryRegionPortio page_portio_list[] = {
- { 0x01, 3, 1, .write = write_page, .read = read_page, },
- { 0x07, 1, 1, .write = write_page, .read = read_page, },
+ { 0x01, 3, 1, .write = i8257_write_page, .read = i8257_read_page, },
+ { 0x07, 1, 1, .write = i8257_write_page, .read = i8257_read_page, },
PORTIO_END_OF_LIST(),
};
/* IOport from pageh_base */
static const MemoryRegionPortio pageh_portio_list[] = {
- { 0x01, 3, 1, .write = write_pageh, .read = read_pageh, },
- { 0x07, 3, 1, .write = write_pageh, .read = read_pageh, },
+ { 0x01, 3, 1, .write = i8257_write_pageh, .read = i8257_read_pageh, },
+ { 0x07, 3, 1, .write = i8257_write_pageh, .read = i8257_read_pageh, },
PORTIO_END_OF_LIST(),
};
static const MemoryRegionOps cont_io_ops = {
- .read = read_cont,
- .write = write_cont,
+ .read = i8257_read_cont,
+ .write = i8257_write_cont,
.endianness = DEVICE_NATIVE_ENDIAN,
.impl = {
.min_access_size = 1,
@@ -545,10 +546,10 @@ static void dma_init2(I8257State *d, int base, int dshift,
memory_region_add_subregion(isa_address_space_io(NULL),
base + (8 << d->dshift), &d->cont_io);
- qemu_register_reset(dma_reset, d);
- dma_reset(d);
+ qemu_register_reset(i8257_reset, d);
+ i8257_reset(d);
for (i = 0; i < ARRAY_SIZE (d->regs); ++i) {
- d->regs[i].transfer_handler = dma_phony_handler;
+ d->regs[i].transfer_handler = i8257_phony_handler;
}
}
@@ -568,9 +569,9 @@ static const VMStateDescription vmstate_dma_regs = {
}
};
-static int dma_post_load(void *opaque, int version_id)
+static int i8257_post_load(void *opaque, int version_id)
{
- DMA_run();
+ i8257_dma_run();
return 0;
}
@@ -579,7 +580,7 @@ static const VMStateDescription vmstate_dma = {
.name = "dma",
.version_id = 1,
.minimum_version_id = 1,
- .post_load = dma_post_load,
+ .post_load = i8257_post_load,
.fields = (VMStateField[]) {
VMSTATE_UINT8(command, I8257State),
VMSTATE_UINT8(mask, I8257State),
@@ -598,5 +599,5 @@ void DMA_init(ISABus *bus, int high_page_enable)
vmstate_register (NULL, 0, &vmstate_dma, &dma_controllers[0]);
vmstate_register (NULL, 1, &vmstate_dma, &dma_controllers[1]);
- dma_bh = qemu_bh_new(DMA_run_bh, NULL);
+ dma_bh = qemu_bh_new(i8257_dma_run_bh, NULL);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 05/17] i8257: make the DMA running method per controller
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (3 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 04/17] i8257: rename functions to start with i8257_ prefix Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 06/17] i8257: add missing const Hervé Poussineau
` (12 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
This removes some static/global variables, and we're now running only the
required controller (master or slave)
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 75 ++++++++++++++++++++++++++--------------------------------
1 file changed, 34 insertions(+), 41 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index aba4295..a3227a1 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -61,6 +61,10 @@ typedef struct I8257State {
struct dma_regs regs[4];
MemoryRegion channel_io;
MemoryRegion cont_io;
+
+ QEMUBH *dma_bh;
+ bool dma_bh_scheduled;
+ int running;
} I8257State;
static I8257State dma_controllers[2];
@@ -80,7 +84,7 @@ enum {
};
-static void i8257_dma_run(void);
+static void i8257_dma_run(void *opaque);
static int channels[8] = {-1, 2, 3, 1, -1, -1, -1, 0};
@@ -220,7 +224,7 @@ static void i8257_write_cont(void *opaque, hwaddr nport, uint64_t data,
d->status &= ~(1 << (ichan + 4));
}
d->status &= ~(1 << ichan);
- i8257_dma_run();
+ i8257_dma_run(d);
break;
case 0x02: /* single mask */
@@ -228,7 +232,7 @@ static void i8257_write_cont(void *opaque, hwaddr nport, uint64_t data,
d->mask |= 1 << (data & 3);
else
d->mask &= ~(1 << (data & 3));
- i8257_dma_run();
+ i8257_dma_run(d);
break;
case 0x03: /* mode */
@@ -263,12 +267,12 @@ static void i8257_write_cont(void *opaque, hwaddr nport, uint64_t data,
case 0x06: /* clear mask for all channels */
d->mask = 0;
- i8257_dma_run();
+ i8257_dma_run(d);
break;
case 0x07: /* write mask for all channels */
d->mask = data;
- i8257_dma_run();
+ i8257_dma_run(d);
break;
default:
@@ -320,7 +324,7 @@ void DMA_hold_DREQ (int nchan)
ichan = nchan & 3;
linfo ("held cont=%d chan=%d\n", ncont, ichan);
dma_controllers[ncont].status |= 1 << (ichan + 4);
- i8257_dma_run();
+ i8257_dma_run(&dma_controllers[ncont]);
}
void DMA_release_DREQ (int nchan)
@@ -331,13 +335,14 @@ void DMA_release_DREQ (int nchan)
ichan = nchan & 3;
linfo ("released cont=%d chan=%d\n", ncont, ichan);
dma_controllers[ncont].status &= ~(1 << (ichan + 4));
- i8257_dma_run();
+ i8257_dma_run(&dma_controllers[ncont]);
}
-static void i8257_channel_run(int ncont, int ichan)
+static void i8257_channel_run(I8257State *d, int ichan)
{
+ int ncont = d->dshift;
int n;
- struct dma_regs *r = &dma_controllers[ncont].regs[ichan];
+ struct dma_regs *r = &d->regs[ichan];
#ifdef DEBUG_DMA
int dir, opmode;
@@ -358,52 +363,38 @@ static void i8257_channel_run(int ncont, int ichan)
ldebug ("dma_pos %d size %d\n", n, (r->base[COUNT] + 1) << ncont);
}
-static QEMUBH *dma_bh;
-static bool dma_bh_scheduled;
-
-static void i8257_dma_run(void)
+static void i8257_dma_run(void *opaque)
{
- I8257State *d;
- int icont, ichan;
+ I8257State *d = opaque;
+ int ichan;
int rearm = 0;
- static int running = 0;
- if (running) {
+ if (d->running) {
rearm = 1;
goto out;
} else {
- running = 1;
+ d->running = 1;
}
- d = dma_controllers;
-
- for (icont = 0; icont < 2; icont++, d++) {
- for (ichan = 0; ichan < 4; ichan++) {
- int mask;
+ for (ichan = 0; ichan < 4; ichan++) {
+ int mask;
- mask = 1 << ichan;
+ mask = 1 << ichan;
- if ((0 == (d->mask & mask)) && (0 != (d->status & (mask << 4)))) {
- i8257_channel_run(icont, ichan);
- rearm = 1;
- }
+ if ((0 == (d->mask & mask)) && (0 != (d->status & (mask << 4)))) {
+ i8257_channel_run(d, ichan);
+ rearm = 1;
}
}
- running = 0;
+ d->running = 0;
out:
if (rearm) {
- qemu_bh_schedule_idle(dma_bh);
- dma_bh_scheduled = true;
+ qemu_bh_schedule_idle(d->dma_bh);
+ d->dma_bh_scheduled = true;
}
}
-static void i8257_dma_run_bh(void *unused)
-{
- dma_bh_scheduled = false;
- i8257_dma_run();
-}
-
void DMA_register_channel (int nchan,
DMA_transfer_handler transfer_handler,
void *opaque)
@@ -468,7 +459,8 @@ int DMA_write_memory (int nchan, void *buf, int pos, int len)
*/
void DMA_schedule(void)
{
- if (dma_bh_scheduled) {
+ if (dma_controllers[0].dma_bh_scheduled ||
+ dma_controllers[1].dma_bh_scheduled) {
qemu_notify_event();
}
}
@@ -551,6 +543,8 @@ static void dma_init2(I8257State *d, int base, int dshift,
for (i = 0; i < ARRAY_SIZE (d->regs); ++i) {
d->regs[i].transfer_handler = i8257_phony_handler;
}
+
+ d->dma_bh = qemu_bh_new(i8257_dma_run, d);
}
static const VMStateDescription vmstate_dma_regs = {
@@ -571,7 +565,8 @@ static const VMStateDescription vmstate_dma_regs = {
static int i8257_post_load(void *opaque, int version_id)
{
- i8257_dma_run();
+ I8257State *d = opaque;
+ i8257_dma_run(d);
return 0;
}
@@ -598,6 +593,4 @@ void DMA_init(ISABus *bus, int high_page_enable)
dma_init2(&dma_controllers[1], 0xc0, 1, 0x88, high_page_enable ? 0x488 : -1);
vmstate_register (NULL, 0, &vmstate_dma, &dma_controllers[0]);
vmstate_register (NULL, 1, &vmstate_dma, &dma_controllers[1]);
-
- dma_bh = qemu_bh_new(i8257_dma_run_bh, NULL);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 06/17] i8257: add missing const
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (4 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 05/17] i8257: make the DMA running method per controller Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 07/17] i8257: QOM'ify Hervé Poussineau
` (11 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index a3227a1..03d27de 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -86,7 +86,7 @@ enum {
static void i8257_dma_run(void *opaque);
-static int channels[8] = {-1, 2, 3, 1, -1, -1, -1, 0};
+static const int channels[8] = {-1, 2, 3, 1, -1, -1, -1, 0};
static void i8257_write_page(void *opaque, uint32_t nport, uint32_t data)
{
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 07/17] i8257: QOM'ify
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (5 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 06/17] i8257: add missing const Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus Hervé Poussineau
` (10 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 160 ++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 107 insertions(+), 53 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 03d27de..20231d6 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -26,6 +26,10 @@
#include "qemu/main-loop.h"
#include "trace.h"
+#define TYPE_I8257 "i8257"
+#define I8257(obj) \
+ OBJECT_CHECK(I8257State, (obj), TYPE_I8257)
+
/* #define DEBUG_DMA */
#define dolog(...) fprintf (stderr, "dma: " __VA_ARGS__)
@@ -53,11 +57,17 @@ struct dma_regs {
#define COUNT 1
typedef struct I8257State {
+ ISADevice parent_obj;
+
+ int32_t base;
+ int32_t page_base;
+ int32_t pageh_base;
+ int32_t dshift;
+
uint8_t status;
uint8_t command;
uint8_t mask;
uint8_t flip_flop;
- int dshift;
struct dma_regs regs[4];
MemoryRegion channel_io;
MemoryRegion cont_io;
@@ -67,7 +77,7 @@ typedef struct I8257State {
int running;
} I8257State;
-static I8257State dma_controllers[2];
+static I8257State *dma_controllers[2];
enum {
CMD_MEMORY_TO_MEMORY = 0x01,
@@ -313,7 +323,7 @@ static uint64_t i8257_read_cont(void *opaque, hwaddr nport, unsigned size)
int DMA_get_channel_mode (int nchan)
{
- return dma_controllers[nchan > 3].regs[nchan & 3].mode;
+ return dma_controllers[nchan > 3]->regs[nchan & 3].mode;
}
void DMA_hold_DREQ (int nchan)
@@ -323,8 +333,8 @@ void DMA_hold_DREQ (int nchan)
ncont = nchan > 3;
ichan = nchan & 3;
linfo ("held cont=%d chan=%d\n", ncont, ichan);
- dma_controllers[ncont].status |= 1 << (ichan + 4);
- i8257_dma_run(&dma_controllers[ncont]);
+ dma_controllers[ncont]->status |= 1 << (ichan + 4);
+ i8257_dma_run(dma_controllers[ncont]);
}
void DMA_release_DREQ (int nchan)
@@ -334,8 +344,8 @@ void DMA_release_DREQ (int nchan)
ncont = nchan > 3;
ichan = nchan & 3;
linfo ("released cont=%d chan=%d\n", ncont, ichan);
- dma_controllers[ncont].status &= ~(1 << (ichan + 4));
- i8257_dma_run(&dma_controllers[ncont]);
+ dma_controllers[ncont]->status &= ~(1 << (ichan + 4));
+ i8257_dma_run(dma_controllers[ncont]);
}
static void i8257_channel_run(I8257State *d, int ichan)
@@ -405,14 +415,14 @@ void DMA_register_channel (int nchan,
ncont = nchan > 3;
ichan = nchan & 3;
- r = dma_controllers[ncont].regs + ichan;
+ r = dma_controllers[ncont]->regs + ichan;
r->transfer_handler = transfer_handler;
r->opaque = opaque;
}
int DMA_read_memory (int nchan, void *buf, int pos, int len)
{
- struct dma_regs *r = &dma_controllers[nchan > 3].regs[nchan & 3];
+ struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
if (r->mode & 0x20) {
@@ -434,7 +444,7 @@ int DMA_read_memory (int nchan, void *buf, int pos, int len)
int DMA_write_memory (int nchan, void *buf, int pos, int len)
{
- struct dma_regs *r = &dma_controllers[nchan > 3].regs[nchan & 3];
+ struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
if (r->mode & 0x20) {
@@ -459,15 +469,15 @@ int DMA_write_memory (int nchan, void *buf, int pos, int len)
*/
void DMA_schedule(void)
{
- if (dma_controllers[0].dma_bh_scheduled ||
- dma_controllers[1].dma_bh_scheduled) {
+ if (dma_controllers[0]->dma_bh_scheduled ||
+ dma_controllers[1]->dma_bh_scheduled) {
qemu_notify_event();
}
}
-static void i8257_reset(void *opaque)
+static void i8257_reset(DeviceState *dev)
{
- I8257State *d = opaque;
+ I8257State *d = I8257(dev);
i8257_write_cont(d, (0x05 << d->dshift), 0, 1);
}
@@ -513,40 +523,6 @@ static const MemoryRegionOps cont_io_ops = {
},
};
-/* dshift = 0: 8 bit DMA, 1 = 16 bit DMA */
-static void dma_init2(I8257State *d, int base, int dshift,
- int page_base, int pageh_base)
-{
- int i;
-
- d->dshift = dshift;
-
- memory_region_init_io(&d->channel_io, NULL, &channel_io_ops, d,
- "dma-chan", 8 << d->dshift);
- memory_region_add_subregion(isa_address_space_io(NULL),
- base, &d->channel_io);
-
- isa_register_portio_list(NULL, page_base, page_portio_list, d,
- "dma-page");
- if (pageh_base >= 0) {
- isa_register_portio_list(NULL, pageh_base, pageh_portio_list, d,
- "dma-pageh");
- }
-
- memory_region_init_io(&d->cont_io, NULL, &cont_io_ops, d, "dma-cont",
- 8 << d->dshift);
- memory_region_add_subregion(isa_address_space_io(NULL),
- base + (8 << d->dshift), &d->cont_io);
-
- qemu_register_reset(i8257_reset, d);
- i8257_reset(d);
- for (i = 0; i < ARRAY_SIZE (d->regs); ++i) {
- d->regs[i].transfer_handler = i8257_phony_handler;
- }
-
- d->dma_bh = qemu_bh_new(i8257_dma_run, d);
-}
-
static const VMStateDescription vmstate_dma_regs = {
.name = "dma_regs",
.version_id = 1,
@@ -571,7 +547,7 @@ static int i8257_post_load(void *opaque, int version_id)
return 0;
}
-static const VMStateDescription vmstate_dma = {
+static const VMStateDescription vmstate_i8257 = {
.name = "dma",
.version_id = 1,
.minimum_version_id = 1,
@@ -587,10 +563,88 @@ static const VMStateDescription vmstate_dma = {
}
};
+static void i8257_realize(DeviceState *dev, Error **errp)
+{
+ ISADevice *isa = ISA_DEVICE(dev);
+ I8257State *d = I8257(dev);
+ int i;
+
+ memory_region_init_io(&d->channel_io, NULL, &channel_io_ops, d,
+ "dma-chan", 8 << d->dshift);
+ memory_region_add_subregion(isa_address_space_io(isa),
+ d->base, &d->channel_io);
+
+ isa_register_portio_list(isa, d->page_base, page_portio_list, d,
+ "dma-page");
+ if (d->pageh_base >= 0) {
+ isa_register_portio_list(isa, d->pageh_base, pageh_portio_list, d,
+ "dma-pageh");
+ }
+
+ memory_region_init_io(&d->cont_io, OBJECT(isa), &cont_io_ops, d,
+ "dma-cont", 8 << d->dshift);
+ memory_region_add_subregion(isa_address_space_io(isa),
+ d->base + (8 << d->dshift), &d->cont_io);
+
+ for (i = 0; i < ARRAY_SIZE(d->regs); ++i) {
+ d->regs[i].transfer_handler = i8257_phony_handler;
+ }
+
+ d->dma_bh = qemu_bh_new(i8257_dma_run, d);
+}
+
+static Property i8257_properties[] = {
+ DEFINE_PROP_INT32("base", I8257State, base, 0x00),
+ DEFINE_PROP_INT32("page-base", I8257State, page_base, 0x80),
+ DEFINE_PROP_INT32("pageh-base", I8257State, pageh_base, 0x480),
+ DEFINE_PROP_INT32("dshift", I8257State, dshift, 0),
+ DEFINE_PROP_END_OF_LIST()
+};
+
+static void i8257_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->realize = i8257_realize;
+ dc->reset = i8257_reset;
+ dc->vmsd = &vmstate_i8257;
+ dc->props = i8257_properties;
+}
+
+static const TypeInfo i8257_info = {
+ .name = TYPE_I8257,
+ .parent = TYPE_ISA_DEVICE,
+ .instance_size = sizeof(I8257State),
+ .class_init = i8257_class_init,
+};
+
+static void i8257_register_types(void)
+{
+ type_register_static(&i8257_info);
+}
+
+type_init(i8257_register_types)
+
void DMA_init(ISABus *bus, int high_page_enable)
{
- dma_init2(&dma_controllers[0], 0x00, 0, 0x80, high_page_enable ? 0x480 : -1);
- dma_init2(&dma_controllers[1], 0xc0, 1, 0x88, high_page_enable ? 0x488 : -1);
- vmstate_register (NULL, 0, &vmstate_dma, &dma_controllers[0]);
- vmstate_register (NULL, 1, &vmstate_dma, &dma_controllers[1]);
+ ISADevice *isa1, *isa2;
+ DeviceState *d;
+
+ isa1 = isa_create(bus, TYPE_I8257);
+ d = DEVICE(isa1);
+ qdev_prop_set_int32(d, "base", 0x00);
+ qdev_prop_set_int32(d, "page-base", 0x80);
+ qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x480 : -1);
+ qdev_prop_set_int32(d, "dshift", 0);
+ qdev_init_nofail(d);
+ dma_controllers[0] = I8257(d);
+
+ isa2 = isa_create(bus, TYPE_I8257);
+ d = DEVICE(isa2);
+ qdev_prop_set_int32(d, "base", 0xc0);
+ qdev_prop_set_int32(d, "page-base", 0x88);
+ qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x488 : -1);
+ qdev_prop_set_int32(d, "dshift", 1);
+ qdev_init_nofail(d);
+ dma_controllers[1] = I8257(d);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (6 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 07/17] i8257: QOM'ify Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2016-01-05 23:49 ` John Snow
2015-12-29 8:04 ` [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface Hervé Poussineau
` (9 subsequent siblings)
17 siblings, 1 reply; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
This will permit to deprecate global DMA_*() functions.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/isa/isa-bus.c | 21 +++++++++++++++++++++
include/hw/isa/isa.h | 38 ++++++++++++++++++++++++++++++++++++++
include/qemu/typedefs.h | 1 +
3 files changed, 60 insertions(+)
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 43e0cd8..8887433 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -36,6 +36,12 @@ static void isa_bus_class_init(ObjectClass *klass, void *data)
k->get_fw_dev_path = isabus_get_fw_dev_path;
}
+static const TypeInfo isa_dma_info = {
+ .name = TYPE_ISADMA,
+ .parent = TYPE_INTERFACE,
+ .class_size = sizeof(IsaDmaClass),
+};
+
static const TypeInfo isa_bus_info = {
.name = TYPE_ISA_BUS,
.parent = TYPE_BUS,
@@ -92,6 +98,20 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
dev->nirqs++;
}
+void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16)
+{
+ assert(bus && dma8 && dma16);
+ assert(!bus->dma[0] && !bus->dma[1]);
+ bus->dma[0] = dma8;
+ bus->dma[1] = dma16;
+}
+
+IsaDma *isa_get_dma(ISABus *bus, int nchan)
+{
+ assert(bus);
+ return bus->dma[nchan > 3 ? 1 : 0];
+}
+
static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport)
{
if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) {
@@ -233,6 +253,7 @@ static const TypeInfo isa_device_type_info = {
static void isabus_register_types(void)
{
+ type_register_static(&isa_dma_info);
type_register_static(&isa_bus_info);
type_register_static(&isabus_bridge_info);
type_register_static(&isa_device_type_info);
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index d84852b..193ceb2 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -34,6 +34,41 @@ static inline uint16_t applesmc_port(void)
return 0;
}
+#define TYPE_ISADMA "isa-dma"
+
+#define ISADMA_CLASS(klass) \
+ OBJECT_CLASS_CHECK(IsaDmaClass, (klass), TYPE_ISADMA)
+#define ISADMA_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(IsaDmaClass, (obj), TYPE_ISADMA)
+#define ISADMA(obj) \
+ INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA)
+
+typedef struct IsaDma {
+ Object parent;
+} IsaDma;
+
+typedef enum {
+ ISADMA_TRANSFER_VERIFY,
+ ISADMA_TRANSFER_READ,
+ ISADMA_TRANSFER_WRITE,
+ ISADMA_TRANSFER_ILLEGAL,
+} IsaDmaTransferMode;
+
+typedef struct IsaDmaClass {
+ InterfaceClass parent;
+
+ IsaDmaTransferMode (*get_transfer_mode)(IsaDma *obj, int nchan);
+ bool (*has_autoinitialization)(IsaDma *obj, int nchan);
+ int (*read_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);
+ int (*write_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);
+ void (*hold_DREQ)(IsaDma *obj, int nchan);
+ void (*release_DREQ)(IsaDma *obj, int nchan);
+ void (*schedule)(IsaDma *obj);
+ void (*register_channel)(IsaDma *obj, int nchan,
+ DMA_transfer_handler transfer_handler,
+ void *opaque);
+} IsaDmaClass;
+
typedef struct ISADeviceClass {
DeviceClass parent_class;
} ISADeviceClass;
@@ -46,6 +81,7 @@ struct ISABus {
MemoryRegion *address_space;
MemoryRegion *address_space_io;
qemu_irq *irqs;
+ IsaDma *dma[2];
};
struct ISADevice {
@@ -63,6 +99,8 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space,
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs);
qemu_irq isa_get_irq(ISADevice *dev, int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
+void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16);
+IsaDma *isa_get_dma(ISABus *bus, int nchan);
MemoryRegion *isa_address_space(ISADevice *dev);
MemoryRegion *isa_address_space_io(ISADevice *dev);
ISADevice *isa_create(ISABus *bus, const char *name);
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 78fe6e8..6ed91b4 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -33,6 +33,7 @@ typedef struct I2CBus I2CBus;
typedef struct I2SCodec I2SCodec;
typedef struct ISABus ISABus;
typedef struct ISADevice ISADevice;
+typedef struct IsaDma IsaDma;
typedef struct LoadStateEntry LoadStateEntry;
typedef struct MACAddr MACAddr;
typedef struct MachineClass MachineClass;
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (7 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2016-01-05 21:59 ` John Snow
2015-12-29 8:04 ` [Qemu-devel] [PATCH 09/17] i8257: register " Hervé Poussineau
` (8 subsequent siblings)
17 siblings, 1 reply; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Rewrite the global DMA_*() functions to use the IsaDma interface.
Note that these functions will be deleted in a few commits.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 117 insertions(+), 31 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 20231d6..cf4b0a7 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -77,8 +77,6 @@ typedef struct I8257State {
int running;
} I8257State;
-static I8257State *dma_controllers[2];
-
enum {
CMD_MEMORY_TO_MEMORY = 0x01,
CMD_FIXED_ADDRESS = 0x02,
@@ -321,31 +319,36 @@ static uint64_t i8257_read_cont(void *opaque, hwaddr nport, unsigned size)
return val;
}
-int DMA_get_channel_mode (int nchan)
+static IsaDmaTransferMode i8257_dma_get_transfer_mode(IsaDma *obj, int nchan)
+{
+ I8257State *d = I8257(obj);
+ return (d->regs[nchan & 3].mode >> 2) & 3;
+}
+
+static bool i8257_dma_has_autoinitialization(IsaDma *obj, int nchan)
{
- return dma_controllers[nchan > 3]->regs[nchan & 3].mode;
+ I8257State *d = I8257(obj);
+ return (d->regs[nchan & 3].mode >> 4) & 1;
}
-void DMA_hold_DREQ (int nchan)
+static void i8257_dma_hold_DREQ(IsaDma *obj, int nchan)
{
- int ncont, ichan;
+ I8257State *d = I8257(obj);
+ int ichan;
- ncont = nchan > 3;
ichan = nchan & 3;
- linfo ("held cont=%d chan=%d\n", ncont, ichan);
- dma_controllers[ncont]->status |= 1 << (ichan + 4);
- i8257_dma_run(dma_controllers[ncont]);
+ d->status |= 1 << (ichan + 4);
+ i8257_dma_run(d);
}
-void DMA_release_DREQ (int nchan)
+static void i8257_dma_release_DREQ(IsaDma *obj, int nchan)
{
- int ncont, ichan;
+ I8257State *d = I8257(obj);
+ int ichan;
- ncont = nchan > 3;
ichan = nchan & 3;
- linfo ("released cont=%d chan=%d\n", ncont, ichan);
- dma_controllers[ncont]->status &= ~(1 << (ichan + 4));
- i8257_dma_run(dma_controllers[ncont]);
+ d->status &= ~(1 << (ichan + 4));
+ i8257_dma_run(d);
}
static void i8257_channel_run(I8257State *d, int ichan)
@@ -405,24 +408,26 @@ out:
}
}
-void DMA_register_channel (int nchan,
- DMA_transfer_handler transfer_handler,
- void *opaque)
+static void i8257_dma_register_channel(IsaDma *obj, int nchan,
+ DMA_transfer_handler transfer_handler,
+ void *opaque)
{
+ I8257State *d = I8257(obj);
struct dma_regs *r;
- int ichan, ncont;
+ int ichan;
- ncont = nchan > 3;
ichan = nchan & 3;
- r = dma_controllers[ncont]->regs + ichan;
+ r = d->regs + ichan;
r->transfer_handler = transfer_handler;
r->opaque = opaque;
}
-int DMA_read_memory (int nchan, void *buf, int pos, int len)
+static int i8257_dma_read_memory(IsaDma *obj, int nchan, void *buf, int pos,
+ int len)
{
- struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
+ I8257State *d = I8257(obj);
+ struct dma_regs *r = &d->regs[nchan & 3];
hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
if (r->mode & 0x20) {
@@ -442,9 +447,11 @@ int DMA_read_memory (int nchan, void *buf, int pos, int len)
return len;
}
-int DMA_write_memory (int nchan, void *buf, int pos, int len)
+static int i8257_dma_write_memory(IsaDma *obj, int nchan, void *buf, int pos,
+ int len)
{
- struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
+ I8257State *s = I8257(obj);
+ struct dma_regs *r = &s->regs[nchan & 3];
hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
if (r->mode & 0x20) {
@@ -467,10 +474,10 @@ int DMA_write_memory (int nchan, void *buf, int pos, int len)
/* request the emulator to transfer a new DMA memory block ASAP (even
* if the idle bottom half would not have exited the iothread yet).
*/
-void DMA_schedule(void)
+static void i8257_dma_schedule(IsaDma *obj)
{
- if (dma_controllers[0]->dma_bh_scheduled ||
- dma_controllers[1]->dma_bh_scheduled) {
+ I8257State *d = I8257(obj);
+ if (d->dma_bh_scheduled) {
qemu_notify_event();
}
}
@@ -604,11 +611,85 @@ static Property i8257_properties[] = {
static void i8257_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ IsaDmaClass *idc = ISADMA_CLASS(klass);
dc->realize = i8257_realize;
dc->reset = i8257_reset;
dc->vmsd = &vmstate_i8257;
dc->props = i8257_properties;
+
+ idc->get_transfer_mode = i8257_dma_get_transfer_mode;
+ idc->has_autoinitialization = i8257_dma_has_autoinitialization;
+ idc->read_memory = i8257_dma_read_memory;
+ idc->write_memory = i8257_dma_write_memory;
+ idc->hold_DREQ = i8257_dma_hold_DREQ;
+ idc->release_DREQ = i8257_dma_release_DREQ;
+ idc->schedule = i8257_dma_schedule;
+ idc->register_channel = i8257_dma_register_channel;
+}
+
+static ISABus *i8257_bus;
+
+int DMA_get_channel_mode(int nchan)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ uint8_t res = 0;
+
+ res |= k->has_autoinitialization(dma, nchan) ? 0 : 0x10;
+ res |= k->get_transfer_mode(dma, nchan) << 2;
+
+ return res;
+}
+
+int DMA_read_memory(int nchan, void *buf, int pos, int size)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ return k->read_memory(dma, nchan, buf, pos, size);
+}
+
+int DMA_write_memory(int nchan, void *buf, int pos, int size)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ return k->write_memory(dma, nchan, buf, pos, size);
+}
+
+void DMA_hold_DREQ(int nchan)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ k->hold_DREQ(dma, nchan);
+}
+
+void DMA_release_DREQ(int nchan)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ k->release_DREQ(dma, nchan);
+}
+
+void DMA_schedule(void)
+{
+ IsaDma *dma;
+ IsaDmaClass *k;
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ dma = isa_get_dma(i8257_bus, i << 2);
+ k = ISADMA_GET_CLASS(dma);
+ k->schedule(dma);
+ }
+}
+
+void DMA_register_channel(int nchan,
+ DMA_transfer_handler transfer_handler,
+ void *opaque)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ k->register_channel(dma, nchan, transfer_handler, opaque);
}
static const TypeInfo i8257_info = {
@@ -616,6 +697,10 @@ static const TypeInfo i8257_info = {
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(I8257State),
.class_init = i8257_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ISADMA },
+ { }
+ }
};
static void i8257_register_types(void)
@@ -637,7 +722,6 @@ void DMA_init(ISABus *bus, int high_page_enable)
qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x480 : -1);
qdev_prop_set_int32(d, "dshift", 0);
qdev_init_nofail(d);
- dma_controllers[0] = I8257(d);
isa2 = isa_create(bus, TYPE_I8257);
d = DEVICE(isa2);
@@ -646,5 +730,7 @@ void DMA_init(ISABus *bus, int high_page_enable)
qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x488 : -1);
qdev_prop_set_int32(d, "dshift", 1);
qdev_init_nofail(d);
- dma_controllers[1] = I8257(d);
+
+ isa_bus_dma(bus, ISADMA(isa1), ISADMA(isa2));
+ i8257_bus = bus;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 09/17] i8257: register the IsaDma interface
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (8 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now Hervé Poussineau
` (7 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Hervé Poussineau, Michael S. Tsirkin
Rewrite the global DMA_*() functions to use the IsaDma interface.
Note that they will be deleted in a few commits.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 117 insertions(+), 31 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 20231d6..cf4b0a7 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -77,8 +77,6 @@ typedef struct I8257State {
int running;
} I8257State;
-static I8257State *dma_controllers[2];
-
enum {
CMD_MEMORY_TO_MEMORY = 0x01,
CMD_FIXED_ADDRESS = 0x02,
@@ -321,31 +319,36 @@ static uint64_t i8257_read_cont(void *opaque, hwaddr nport, unsigned size)
return val;
}
-int DMA_get_channel_mode (int nchan)
+static IsaDmaTransferMode i8257_dma_get_transfer_mode(IsaDma *obj, int nchan)
+{
+ I8257State *d = I8257(obj);
+ return (d->regs[nchan & 3].mode >> 2) & 3;
+}
+
+static bool i8257_dma_has_autoinitialization(IsaDma *obj, int nchan)
{
- return dma_controllers[nchan > 3]->regs[nchan & 3].mode;
+ I8257State *d = I8257(obj);
+ return (d->regs[nchan & 3].mode >> 4) & 1;
}
-void DMA_hold_DREQ (int nchan)
+static void i8257_dma_hold_DREQ(IsaDma *obj, int nchan)
{
- int ncont, ichan;
+ I8257State *d = I8257(obj);
+ int ichan;
- ncont = nchan > 3;
ichan = nchan & 3;
- linfo ("held cont=%d chan=%d\n", ncont, ichan);
- dma_controllers[ncont]->status |= 1 << (ichan + 4);
- i8257_dma_run(dma_controllers[ncont]);
+ d->status |= 1 << (ichan + 4);
+ i8257_dma_run(d);
}
-void DMA_release_DREQ (int nchan)
+static void i8257_dma_release_DREQ(IsaDma *obj, int nchan)
{
- int ncont, ichan;
+ I8257State *d = I8257(obj);
+ int ichan;
- ncont = nchan > 3;
ichan = nchan & 3;
- linfo ("released cont=%d chan=%d\n", ncont, ichan);
- dma_controllers[ncont]->status &= ~(1 << (ichan + 4));
- i8257_dma_run(dma_controllers[ncont]);
+ d->status &= ~(1 << (ichan + 4));
+ i8257_dma_run(d);
}
static void i8257_channel_run(I8257State *d, int ichan)
@@ -405,24 +408,26 @@ out:
}
}
-void DMA_register_channel (int nchan,
- DMA_transfer_handler transfer_handler,
- void *opaque)
+static void i8257_dma_register_channel(IsaDma *obj, int nchan,
+ DMA_transfer_handler transfer_handler,
+ void *opaque)
{
+ I8257State *d = I8257(obj);
struct dma_regs *r;
- int ichan, ncont;
+ int ichan;
- ncont = nchan > 3;
ichan = nchan & 3;
- r = dma_controllers[ncont]->regs + ichan;
+ r = d->regs + ichan;
r->transfer_handler = transfer_handler;
r->opaque = opaque;
}
-int DMA_read_memory (int nchan, void *buf, int pos, int len)
+static int i8257_dma_read_memory(IsaDma *obj, int nchan, void *buf, int pos,
+ int len)
{
- struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
+ I8257State *d = I8257(obj);
+ struct dma_regs *r = &d->regs[nchan & 3];
hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
if (r->mode & 0x20) {
@@ -442,9 +447,11 @@ int DMA_read_memory (int nchan, void *buf, int pos, int len)
return len;
}
-int DMA_write_memory (int nchan, void *buf, int pos, int len)
+static int i8257_dma_write_memory(IsaDma *obj, int nchan, void *buf, int pos,
+ int len)
{
- struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
+ I8257State *s = I8257(obj);
+ struct dma_regs *r = &s->regs[nchan & 3];
hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
if (r->mode & 0x20) {
@@ -467,10 +474,10 @@ int DMA_write_memory (int nchan, void *buf, int pos, int len)
/* request the emulator to transfer a new DMA memory block ASAP (even
* if the idle bottom half would not have exited the iothread yet).
*/
-void DMA_schedule(void)
+static void i8257_dma_schedule(IsaDma *obj)
{
- if (dma_controllers[0]->dma_bh_scheduled ||
- dma_controllers[1]->dma_bh_scheduled) {
+ I8257State *d = I8257(obj);
+ if (d->dma_bh_scheduled) {
qemu_notify_event();
}
}
@@ -604,11 +611,85 @@ static Property i8257_properties[] = {
static void i8257_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
+ IsaDmaClass *idc = ISADMA_CLASS(klass);
dc->realize = i8257_realize;
dc->reset = i8257_reset;
dc->vmsd = &vmstate_i8257;
dc->props = i8257_properties;
+
+ idc->get_transfer_mode = i8257_dma_get_transfer_mode;
+ idc->has_autoinitialization = i8257_dma_has_autoinitialization;
+ idc->read_memory = i8257_dma_read_memory;
+ idc->write_memory = i8257_dma_write_memory;
+ idc->hold_DREQ = i8257_dma_hold_DREQ;
+ idc->release_DREQ = i8257_dma_release_DREQ;
+ idc->schedule = i8257_dma_schedule;
+ idc->register_channel = i8257_dma_register_channel;
+}
+
+static ISABus *i8257_bus;
+
+int DMA_get_channel_mode(int nchan)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ uint8_t res = 0;
+
+ res |= k->has_autoinitialization(dma, nchan) ? 0 : 0x10;
+ res |= k->get_transfer_mode(dma, nchan) << 2;
+
+ return res;
+}
+
+int DMA_read_memory(int nchan, void *buf, int pos, int size)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ return k->read_memory(dma, nchan, buf, pos, size);
+}
+
+int DMA_write_memory(int nchan, void *buf, int pos, int size)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ return k->write_memory(dma, nchan, buf, pos, size);
+}
+
+void DMA_hold_DREQ(int nchan)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ k->hold_DREQ(dma, nchan);
+}
+
+void DMA_release_DREQ(int nchan)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ k->release_DREQ(dma, nchan);
+}
+
+void DMA_schedule(void)
+{
+ IsaDma *dma;
+ IsaDmaClass *k;
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ dma = isa_get_dma(i8257_bus, i << 2);
+ k = ISADMA_GET_CLASS(dma);
+ k->schedule(dma);
+ }
+}
+
+void DMA_register_channel(int nchan,
+ DMA_transfer_handler transfer_handler,
+ void *opaque)
+{
+ IsaDma *dma = isa_get_dma(i8257_bus, nchan);
+ IsaDmaClass *k = ISADMA_GET_CLASS(dma);
+ k->register_channel(dma, nchan, transfer_handler, opaque);
}
static const TypeInfo i8257_info = {
@@ -616,6 +697,10 @@ static const TypeInfo i8257_info = {
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(I8257State),
.class_init = i8257_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_ISADMA },
+ { }
+ }
};
static void i8257_register_types(void)
@@ -637,7 +722,6 @@ void DMA_init(ISABus *bus, int high_page_enable)
qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x480 : -1);
qdev_prop_set_int32(d, "dshift", 0);
qdev_init_nofail(d);
- dma_controllers[0] = I8257(d);
isa2 = isa_create(bus, TYPE_I8257);
d = DEVICE(isa2);
@@ -646,5 +730,7 @@ void DMA_init(ISABus *bus, int high_page_enable)
qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x488 : -1);
qdev_prop_set_int32(d, "dshift", 1);
qdev_init_nofail(d);
- dma_controllers[1] = I8257(d);
+
+ isa_bus_dma(bus, ISADMA(isa1), ISADMA(isa2));
+ i8257_bus = bus;
}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (9 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 09/17] i8257: register " Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2016-01-05 22:02 ` John Snow
2015-12-29 8:04 ` [Qemu-devel] [PATCH 11/17] sparc: disable floppy DMA Hervé Poussineau
` (6 subsequent siblings)
17 siblings, 1 reply; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, open list:Floppy, Michael S. Tsirkin, Leon Alrae,
Hervé Poussineau, Paolo Bonzini, John Snow, Aurelien Jarno
Floppy uses the DMA controller in rc4030 chipset, and not the i8259 from the ISA bus.
It's better to disable DMA than to call the wrong DMA controller.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/block/fdc.c | 5 +++--
hw/mips/mips_jazz.c | 3 ++-
include/hw/block/fdc.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 4292ece..cfdd625 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -2255,7 +2255,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds)
return isadev;
}
-void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
+void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, IsaDma *dma,
hwaddr mmio_base, DriveInfo **fds)
{
FDCtrl *fdctrl;
@@ -2266,7 +2266,8 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
dev = qdev_create(NULL, "sysbus-fdc");
sys = SYSBUS_FDC(dev);
fdctrl = &sys->state;
- fdctrl->dma_chann = dma_chann; /* FIXME */
+ fdctrl->dma = dma;
+ fdctrl->dma_chann = dma ? dma_chann : -1;
if (fds[0]) {
qdev_prop_set_drive_nofail(dev, "driveA", blk_by_legacy_dinfo(fds[0]));
}
diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 64a0de2..300c199 100644
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -296,7 +296,8 @@ static void mips_jazz_init(MachineState *machine,
for (n = 0; n < MAX_FD; n++) {
fds[n] = drive_get(IF_FLOPPY, 0, n);
}
- fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0, 0x80003000, fds);
+ /* FIXME: we should enable DMA with a custom IsaDma device */
+ fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0, NULL, 0x80003000, fds);
/* Real time clock */
rtc_init(isa_bus, 1980, NULL);
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index d48b2f8..f92e44f 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -16,7 +16,7 @@ typedef enum FDriveType {
#define TYPE_ISA_FDC "isa-fdc"
ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds);
-void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
+void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, IsaDma *dma,
hwaddr mmio_base, DriveInfo **fds);
void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
DriveInfo **fds, qemu_irq *fdc_tc);
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 11/17] sparc: disable floppy DMA
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (10 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 12/17] sparc64: " Hervé Poussineau
` (5 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, open list:Floppy, Michael S. Tsirkin,
Hervé Poussineau, Paolo Bonzini, John Snow
All functions relative to DMA (DMA_*() functions) are stubs on sparc platform.
Disable the DMA in the floppy controller, instead of calling these stubs.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/block/fdc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index cfdd625..14891c1 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -2376,6 +2376,8 @@ static void sun4m_fdc_initfn(Object *obj)
FDCtrlSysBus *sys = SYSBUS_FDC(obj);
FDCtrl *fdctrl = &sys->state;
+ fdctrl->dma_chann = -1;
+
memory_region_init_io(&fdctrl->iomem, obj, &fdctrl_mem_strict_ops,
fdctrl, "fdctrl", 0x08);
sysbus_init_mmio(sbd, &fdctrl->iomem);
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 12/17] sparc64: disable floppy DMA
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (11 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 11/17] sparc: disable floppy DMA Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 13/17] fdc: use IsaDma interface instead of global DMA_* functions Hervé Poussineau
` (4 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Blue Swirl, Paolo Bonzini, Mark Cave-Ayland,
Hervé Poussineau, Michael S. Tsirkin
All functions relative to DMA (DMA_*() functions) are stubs on sparc64 platform.
Disable the DMA of the floppy controller, instead of calling these stubs.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/sparc64/sun4u.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index df98b3b..6fc3104 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -829,6 +829,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
qemu_irq *ivec_irqs, *pbm_irqs;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
DriveInfo *fd[MAX_FD];
+ DeviceState *dev;
FWCfgState *fw_cfg;
/* init CPUs */
@@ -865,10 +866,20 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
pci_cmd646_ide_init(pci_bus, hd, 1);
isa_create_simple(isa_bus, "i8042");
+
+ /* Floppy */
for(i = 0; i < MAX_FD; i++) {
fd[i] = drive_get(IF_FLOPPY, 0, i);
}
- fdctrl_init_isa(isa_bus, fd);
+ dev = DEVICE(isa_create(isa_bus, TYPE_ISA_FDC));
+ if (fd[0]) {
+ qdev_prop_set_drive_nofail(dev, "driveA", blk_by_legacy_dinfo(fd[0]));
+ }
+ if (fd[1]) {
+ qdev_prop_set_drive_nofail(dev, "driveB", blk_by_legacy_dinfo(fd[1]));
+ }
+ qdev_prop_set_uint32(dev, "dma", -1);
+ qdev_init_nofail(dev);
/* Map NVRAM into I/O (ebus) space */
nvram = m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59);
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 13/17] fdc: use IsaDma interface instead of global DMA_* functions
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (12 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 12/17] sparc64: " Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 14/17] cs4231a: " Hervé Poussineau
` (3 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, open list:Floppy, Michael S. Tsirkin,
Hervé Poussineau, Paolo Bonzini, John Snow
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/block/fdc.c | 63 ++++++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 46 insertions(+), 17 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 14891c1..3c3d046 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -534,6 +534,7 @@ struct FDCtrl {
QEMUTimer *result_timer;
int dma_chann;
uint8_t phase;
+ IsaDma *dma;
/* Controller's identification */
uint8_t version;
/* HW */
@@ -1313,7 +1314,8 @@ static void fdctrl_stop_transfer(FDCtrl *fdctrl, uint8_t status0,
fdctrl->fifo[6] = FD_SECTOR_SC;
fdctrl->data_dir = FD_DIR_READ;
if (!(fdctrl->msr & FD_MSR_NONDMA)) {
- DMA_release_DREQ(fdctrl->dma_chann);
+ IsaDmaClass *k = ISADMA_GET_CLASS(fdctrl->dma);
+ k->release_DREQ(fdctrl->dma, fdctrl->dma_chann);
}
fdctrl->msr |= FD_MSR_RQM | FD_MSR_DIO;
fdctrl->msr &= ~FD_MSR_NONDMA;
@@ -1399,27 +1401,43 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
}
fdctrl->eot = fdctrl->fifo[6];
if (fdctrl->dor & FD_DOR_DMAEN) {
- int dma_mode;
+ IsaDmaTransferMode dma_mode;
+ IsaDmaClass *k = ISADMA_GET_CLASS(fdctrl->dma);
+ bool dma_mode_ok;
/* DMA transfer are enabled. Check if DMA channel is well programmed */
- dma_mode = DMA_get_channel_mode(fdctrl->dma_chann);
- dma_mode = (dma_mode >> 2) & 3;
+ dma_mode = k->get_transfer_mode(fdctrl->dma, fdctrl->dma_chann);
FLOPPY_DPRINTF("dma_mode=%d direction=%d (%d - %d)\n",
dma_mode, direction,
(128 << fdctrl->fifo[5]) *
(cur_drv->last_sect - ks + 1), fdctrl->data_len);
- if (((direction == FD_DIR_SCANE || direction == FD_DIR_SCANL ||
- direction == FD_DIR_SCANH) && dma_mode == 0) ||
- (direction == FD_DIR_WRITE && dma_mode == 2) ||
- (direction == FD_DIR_READ && dma_mode == 1) ||
- (direction == FD_DIR_VERIFY)) {
+ switch (direction) {
+ case FD_DIR_SCANE:
+ case FD_DIR_SCANL:
+ case FD_DIR_SCANH:
+ dma_mode_ok = (dma_mode == ISADMA_TRANSFER_VERIFY);
+ break;
+ case FD_DIR_WRITE:
+ dma_mode_ok = (dma_mode == ISADMA_TRANSFER_WRITE);
+ break;
+ case FD_DIR_READ:
+ dma_mode_ok = (dma_mode == ISADMA_TRANSFER_READ);
+ break;
+ case FD_DIR_VERIFY:
+ dma_mode_ok = true;
+ break;
+ default:
+ dma_mode_ok = false;
+ break;
+ }
+ if (dma_mode_ok) {
/* No access is allowed until DMA transfer has completed */
fdctrl->msr &= ~FD_MSR_RQM;
if (direction != FD_DIR_VERIFY) {
/* Now, we just have to wait for the DMA controller to
* recall us...
*/
- DMA_hold_DREQ(fdctrl->dma_chann);
- DMA_schedule();
+ k->hold_DREQ(fdctrl->dma, fdctrl->dma_chann);
+ k->schedule(fdctrl->dma);
} else {
/* Start transfer */
fdctrl_transfer_handler(fdctrl, fdctrl->dma_chann, 0,
@@ -1458,12 +1476,14 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
FDrive *cur_drv;
int len, start_pos, rel_pos;
uint8_t status0 = 0x00, status1 = 0x00, status2 = 0x00;
+ IsaDmaClass *k;
fdctrl = opaque;
if (fdctrl->msr & FD_MSR_RQM) {
FLOPPY_DPRINTF("Not in DMA transfer mode !\n");
return 0;
}
+ k = ISADMA_GET_CLASS(fdctrl->dma);
cur_drv = get_cur_drv(fdctrl);
if (fdctrl->data_dir == FD_DIR_SCANE || fdctrl->data_dir == FD_DIR_SCANL ||
fdctrl->data_dir == FD_DIR_SCANH)
@@ -1502,8 +1522,8 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
switch (fdctrl->data_dir) {
case FD_DIR_READ:
/* READ commands */
- DMA_write_memory (nchan, fdctrl->fifo + rel_pos,
- fdctrl->data_pos, len);
+ k->write_memory(fdctrl->dma, nchan, fdctrl->fifo + rel_pos,
+ fdctrl->data_pos, len);
break;
case FD_DIR_WRITE:
/* WRITE commands */
@@ -1517,8 +1537,8 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
goto transfer_error;
}
- DMA_read_memory (nchan, fdctrl->fifo + rel_pos,
- fdctrl->data_pos, len);
+ k->read_memory(fdctrl->dma, nchan, fdctrl->fifo + rel_pos,
+ fdctrl->data_pos, len);
if (blk_write(cur_drv->blk, fd_sector(cur_drv),
fdctrl->fifo, 1) < 0) {
FLOPPY_DPRINTF("error writing sector %d\n",
@@ -1535,7 +1555,8 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
{
uint8_t tmpbuf[FD_SECTOR_LEN];
int ret;
- DMA_read_memory (nchan, tmpbuf, fdctrl->data_pos, len);
+ k->read_memory(fdctrl->dma, nchan, tmpbuf, fdctrl->data_pos,
+ len);
ret = memcmp(tmpbuf, fdctrl->fifo + rel_pos, len);
if (ret == 0) {
status2 = FD_SR2_SEH;
@@ -2325,7 +2346,11 @@ static void fdctrl_realize_common(FDCtrl *fdctrl, Error **errp)
fdctrl->num_floppies = MAX_FD;
if (fdctrl->dma_chann != -1) {
- DMA_register_channel(fdctrl->dma_chann, &fdctrl_transfer_handler, fdctrl);
+ IsaDmaClass *k;
+ assert(fdctrl->dma);
+ k = ISADMA_GET_CLASS(fdctrl->dma);
+ k->register_channel(fdctrl->dma, fdctrl->dma_chann,
+ &fdctrl_transfer_handler, fdctrl);
}
fdctrl_connect_drives(fdctrl, errp);
}
@@ -2348,6 +2373,10 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp)
isa_init_irq(isadev, &fdctrl->irq, isa->irq);
fdctrl->dma_chann = isa->dma;
+ if (fdctrl->dma_chann != -1) {
+ fdctrl->dma = isa_get_dma(isa_bus_from_device(isadev), isa->dma);
+ assert(fdctrl->dma);
+ }
qdev_set_legacy_instance_id(dev, isa->iobase, 2);
fdctrl_realize_common(fdctrl, &err);
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 14/17] cs4231a: use IsaDma interface instead of global DMA_* functions
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (13 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 13/17] fdc: use IsaDma interface instead of global DMA_* functions Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 15/17] gus: " Hervé Poussineau
` (2 subsequent siblings)
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Hervé Poussineau, Gerd Hoffmann, Michael S. Tsirkin
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/audio/cs4231a.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index f96f561..d84f83f 100644
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -69,6 +69,7 @@ typedef struct CSState {
uint32_t irq;
uint32_t dma;
uint32_t port;
+ IsaDma *isa_dma;
int shift;
int dma_running;
int audio_free;
@@ -264,6 +265,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
{
int xtal;
struct audsettings as;
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
#ifdef DEBUG_XLAW
if (val == 0 || val == 32)
@@ -327,7 +329,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
if (s->dregs[Interface_Configuration] & PEN) {
if (!s->dma_running) {
- DMA_hold_DREQ (s->dma);
+ k->hold_DREQ(s->isa_dma, s->dma);
AUD_set_active_out (s->voice, 1);
s->transferred = 0;
}
@@ -335,7 +337,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
}
else {
if (s->dma_running) {
- DMA_release_DREQ (s->dma);
+ k->release_DREQ(s->isa_dma, s->dma);
AUD_set_active_out (s->voice, 0);
}
s->dma_running = 0;
@@ -344,7 +346,7 @@ static void cs_reset_voices (CSState *s, uint32_t val)
error:
if (s->dma_running) {
- DMA_release_DREQ (s->dma);
+ k->release_DREQ(s->isa_dma, s->dma);
AUD_set_active_out (s->voice, 0);
}
}
@@ -452,7 +454,8 @@ static void cs_write (void *opaque, hwaddr addr,
}
else {
if (s->dma_running) {
- DMA_release_DREQ (s->dma);
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
+ k->release_DREQ(s->isa_dma, s->dma);
AUD_set_active_out (s->voice, 0);
s->dma_running = 0;
}
@@ -517,6 +520,7 @@ static int cs_write_audio (CSState *s, int nchan, int dma_pos,
{
int temp, net;
uint8_t tmpbuf[4096];
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
temp = len;
net = 0;
@@ -531,7 +535,7 @@ static int cs_write_audio (CSState *s, int nchan, int dma_pos,
to_copy = sizeof (tmpbuf);
}
- copied = DMA_read_memory (nchan, tmpbuf, dma_pos, to_copy);
+ copied = k->read_memory(s->isa_dma, nchan, tmpbuf, dma_pos, to_copy);
if (s->tab) {
int i;
int16_t linbuf[4096];
@@ -599,7 +603,8 @@ static int cs4231a_pre_load (void *opaque)
CSState *s = opaque;
if (s->dma_running) {
- DMA_release_DREQ (s->dma);
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
+ k->release_DREQ(s->isa_dma, s->dma);
AUD_set_active_out (s->voice, 0);
}
s->dma_running = 0;
@@ -655,13 +660,15 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp)
{
ISADevice *d = ISA_DEVICE (dev);
CSState *s = CS4231A (dev);
+ IsaDmaClass *k;
isa_init_irq (d, &s->pic, s->irq);
+ s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->dma);
+ k = ISADMA_GET_CLASS(s->isa_dma);
+ k->register_channel(s->isa_dma, s->dma, cs_dma_read, s);
isa_register_ioport (d, &s->ioports, s->port);
- DMA_register_channel (s->dma, cs_dma_read, s);
-
AUD_register_card ("cs4231a", &s->card);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 15/17] gus: use IsaDma interface instead of global DMA_* functions
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (14 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 14/17] cs4231a: " Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 16/17] sb16: " Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 17/17] dma: remove now useless " Hervé Poussineau
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Hervé Poussineau, Gerd Hoffmann, Michael S. Tsirkin
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/audio/gus.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index e0c8a4e..b027eb5 100644
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -57,6 +57,7 @@ typedef struct GUSState {
SWVoiceOut *voice;
int64_t last_ticks;
qemu_irq pic;
+ IsaDma *isa_dma;
} GUSState;
static uint32_t gus_readb(void *opaque, uint32_t nport)
@@ -167,34 +168,36 @@ void GUS_irqclear (GUSEmuState *emu, int hwirq)
#endif
}
-void GUS_dmarequest (GUSEmuState *der)
+void GUS_dmarequest (GUSEmuState *emu)
{
- /* GUSState *s = (GUSState *) der; */
+ GUSState *s = emu->opaque;
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
ldebug ("dma request %d\n", der->gusdma);
- DMA_hold_DREQ (der->gusdma);
+ k->hold_DREQ(s->isa_dma, s->emu.gusdma);
}
static int GUS_read_DMA (void *opaque, int nchan, int dma_pos, int dma_len)
{
GUSState *s = opaque;
+ IsaDmaClass *k = ISADMA_GET_CLASS(s->isa_dma);
char tmpbuf[4096];
int pos = dma_pos, mode, left = dma_len - dma_pos;
ldebug ("read DMA %#x %d\n", dma_pos, dma_len);
- mode = DMA_get_channel_mode (s->emu.gusdma);
+ mode = k->has_autoinitialization(s->isa_dma, s->emu.gusdma);
while (left) {
int to_copy = audio_MIN ((size_t) left, sizeof (tmpbuf));
int copied;
ldebug ("left=%d to_copy=%d pos=%d\n", left, to_copy, pos);
- copied = DMA_read_memory (nchan, tmpbuf, pos, to_copy);
+ copied = k->read_memory(s->isa_dma, nchan, tmpbuf, pos, to_copy);
gus_dma_transferdata (&s->emu, tmpbuf, copied, left == copied);
left -= copied;
pos += copied;
}
if (((mode >> 4) & 1) == 0) {
- DMA_release_DREQ (s->emu.gusdma);
+ k->release_DREQ(s->isa_dma, s->emu.gusdma);
}
return dma_len;
}
@@ -231,6 +234,7 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
{
ISADevice *d = ISA_DEVICE(dev);
GUSState *s = GUS (dev);
+ IsaDmaClass *k;
struct audsettings as;
AUD_register_card ("gus", &s->card);
@@ -263,7 +267,9 @@ static void gus_realizefn (DeviceState *dev, Error **errp)
isa_register_portio_list (d, (s->port + 0x100) & 0xf00,
gus_portio_list2, s, "gus");
- DMA_register_channel (s->emu.gusdma, GUS_read_DMA, s);
+ s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->emu.gusdma);
+ k = ISADMA_GET_CLASS(s->isa_dma);
+ k->register_channel(s->isa_dma, s->emu.gusdma, GUS_read_DMA, s);
s->emu.himemaddr = s->himem;
s->emu.gusdatapos = s->emu.himemaddr + 1024 * 1024 + 32;
s->emu.opaque = s;
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 16/17] sb16: use IsaDma interface instead of global DMA_* functions
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (15 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 15/17] gus: " Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 17/17] dma: remove now useless " Hervé Poussineau
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Hervé Poussineau, Gerd Hoffmann, Michael S. Tsirkin
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/audio/sb16.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 995435f..9973e77 100644
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -55,6 +55,8 @@ typedef struct SB16State {
uint32_t hdma;
uint32_t port;
uint32_t ver;
+ IsaDma *isa_dma;
+ IsaDma *isa_hdma;
int in_index;
int out_data_len;
@@ -165,16 +167,18 @@ static void speaker (SB16State *s, int on)
static void control (SB16State *s, int hold)
{
int dma = s->use_hdma ? s->hdma : s->dma;
+ IsaDma *isa_dma = s->use_hdma ? s->isa_hdma : s->isa_dma;
+ IsaDmaClass *k = ISADMA_GET_CLASS(isa_dma);
s->dma_running = hold;
ldebug ("hold %d high %d dma %d\n", hold, s->use_hdma, dma);
if (hold) {
- DMA_hold_DREQ (dma);
+ k->hold_DREQ(isa_dma, dma);
AUD_set_active_out (s->voice, 1);
}
else {
- DMA_release_DREQ (dma);
+ k->release_DREQ(isa_dma, dma);
AUD_set_active_out (s->voice, 0);
}
}
@@ -1136,6 +1140,8 @@ static uint32_t mixer_read(void *opaque, uint32_t nport)
static int write_audio (SB16State *s, int nchan, int dma_pos,
int dma_len, int len)
{
+ IsaDma *isa_dma = nchan == s->dma ? s->isa_dma : s->isa_hdma;
+ IsaDmaClass *k = ISADMA_GET_CLASS(isa_dma);
int temp, net;
uint8_t tmpbuf[4096];
@@ -1152,7 +1158,7 @@ static int write_audio (SB16State *s, int nchan, int dma_pos,
to_copy = sizeof (tmpbuf);
}
- copied = DMA_read_memory (nchan, tmpbuf, dma_pos, to_copy);
+ copied = k->read_memory(isa_dma, nchan, tmpbuf, dma_pos, to_copy);
copied = AUD_write (s->voice, tmpbuf, copied);
temp -= copied;
@@ -1354,6 +1360,7 @@ static void sb16_realizefn (DeviceState *dev, Error **errp)
{
ISADevice *isadev = ISA_DEVICE (dev);
SB16State *s = SB16 (dev);
+ IsaDmaClass *k;
isa_init_irq (isadev, &s->pic, s->irq);
@@ -1372,8 +1379,14 @@ static void sb16_realizefn (DeviceState *dev, Error **errp)
isa_register_portio_list (isadev, s->port, sb16_ioport_list, s, "sb16");
- DMA_register_channel (s->hdma, SB_read_DMA, s);
- DMA_register_channel (s->dma, SB_read_DMA, s);
+ s->isa_hdma = isa_get_dma(isa_bus_from_device(isadev), s->hdma);
+ k = ISADMA_GET_CLASS(s->isa_hdma);
+ k->register_channel(s->isa_hdma, s->hdma, SB_read_DMA, s);
+
+ s->isa_dma = isa_get_dma(isa_bus_from_device(isadev), s->dma);
+ k = ISADMA_GET_CLASS(s->isa_dma);
+ k->register_channel(s->isa_dma, s->dma, SB_read_DMA, s);
+
s->can_write = 1;
AUD_register_card ("sb16", &s->card);
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Qemu-devel] [PATCH 17/17] dma: remove now useless DMA_* functions
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
` (16 preceding siblings ...)
2015-12-29 8:04 ` [Qemu-devel] [PATCH 16/17] sb16: " Hervé Poussineau
@ 2015-12-29 8:04 ` Hervé Poussineau
17 siblings, 0 replies; 22+ messages in thread
From: Hervé Poussineau @ 2015-12-29 8:04 UTC (permalink / raw)
To: qemu-devel
Cc: Blue Swirl, Paolo Bonzini, Mark Cave-Ayland,
Hervé Poussineau, Michael S. Tsirkin
Keep only DMA_init function as a wrapper around DMA controllers creation.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/dma/i8257.c | 65 ----------------------------------------------------
hw/sparc/sun4m.c | 22 ------------------
hw/sparc64/sun4u.c | 22 ------------------
include/hw/isa/isa.h | 11 +--------
4 files changed, 1 insertion(+), 119 deletions(-)
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index cf4b0a7..fc8aeb1 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -628,70 +628,6 @@ static void i8257_class_init(ObjectClass *klass, void *data)
idc->register_channel = i8257_dma_register_channel;
}
-static ISABus *i8257_bus;
-
-int DMA_get_channel_mode(int nchan)
-{
- IsaDma *dma = isa_get_dma(i8257_bus, nchan);
- IsaDmaClass *k = ISADMA_GET_CLASS(dma);
- uint8_t res = 0;
-
- res |= k->has_autoinitialization(dma, nchan) ? 0 : 0x10;
- res |= k->get_transfer_mode(dma, nchan) << 2;
-
- return res;
-}
-
-int DMA_read_memory(int nchan, void *buf, int pos, int size)
-{
- IsaDma *dma = isa_get_dma(i8257_bus, nchan);
- IsaDmaClass *k = ISADMA_GET_CLASS(dma);
- return k->read_memory(dma, nchan, buf, pos, size);
-}
-
-int DMA_write_memory(int nchan, void *buf, int pos, int size)
-{
- IsaDma *dma = isa_get_dma(i8257_bus, nchan);
- IsaDmaClass *k = ISADMA_GET_CLASS(dma);
- return k->write_memory(dma, nchan, buf, pos, size);
-}
-
-void DMA_hold_DREQ(int nchan)
-{
- IsaDma *dma = isa_get_dma(i8257_bus, nchan);
- IsaDmaClass *k = ISADMA_GET_CLASS(dma);
- k->hold_DREQ(dma, nchan);
-}
-
-void DMA_release_DREQ(int nchan)
-{
- IsaDma *dma = isa_get_dma(i8257_bus, nchan);
- IsaDmaClass *k = ISADMA_GET_CLASS(dma);
- k->release_DREQ(dma, nchan);
-}
-
-void DMA_schedule(void)
-{
- IsaDma *dma;
- IsaDmaClass *k;
- int i;
-
- for (i = 0; i < 2; i++) {
- dma = isa_get_dma(i8257_bus, i << 2);
- k = ISADMA_GET_CLASS(dma);
- k->schedule(dma);
- }
-}
-
-void DMA_register_channel(int nchan,
- DMA_transfer_handler transfer_handler,
- void *opaque)
-{
- IsaDma *dma = isa_get_dma(i8257_bus, nchan);
- IsaDmaClass *k = ISADMA_GET_CLASS(dma);
- k->register_channel(dma, nchan, transfer_handler, opaque);
-}
-
static const TypeInfo i8257_info = {
.name = TYPE_I8257,
.parent = TYPE_ISA_DEVICE,
@@ -732,5 +668,4 @@ void DMA_init(ISABus *bus, int high_page_enable)
qdev_init_nofail(d);
isa_bus_dma(bus, ISADMA(isa1), ISADMA(isa2));
- i8257_bus = bus;
}
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index bf6a7da..420d26b 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -95,32 +95,10 @@ struct sun4m_hwdef {
uint8_t nvram_machine_id;
};
-int DMA_get_channel_mode (int nchan)
-{
- return 0;
-}
-int DMA_read_memory (int nchan, void *buf, int pos, int size)
-{
- return 0;
-}
-int DMA_write_memory (int nchan, void *buf, int pos, int size)
-{
- return 0;
-}
-void DMA_hold_DREQ (int nchan) {}
-void DMA_release_DREQ (int nchan) {}
-void DMA_schedule(void) {}
-
void DMA_init(ISABus *bus, int high_page_enable)
{
}
-void DMA_register_channel (int nchan,
- DMA_transfer_handler transfer_handler,
- void *opaque)
-{
-}
-
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
Error **errp)
{
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 6fc3104..e5b51a2 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -98,32 +98,10 @@ typedef struct EbusState {
MemoryRegion bar1;
} EbusState;
-int DMA_get_channel_mode (int nchan)
-{
- return 0;
-}
-int DMA_read_memory (int nchan, void *buf, int pos, int size)
-{
- return 0;
-}
-int DMA_write_memory (int nchan, void *buf, int pos, int size)
-{
- return 0;
-}
-void DMA_hold_DREQ (int nchan) {}
-void DMA_release_DREQ (int nchan) {}
-void DMA_schedule(void) {}
-
void DMA_init(ISABus *bus, int high_page_enable)
{
}
-void DMA_register_channel (int nchan,
- DMA_transfer_handler transfer_handler,
- void *opaque)
-{
-}
-
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
Error **errp)
{
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 193ceb2..dd224df 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -144,15 +144,6 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)
return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
}
-/* dma.c */
-int DMA_get_channel_mode (int nchan);
-int DMA_read_memory (int nchan, void *buf, int pos, int size);
-int DMA_write_memory (int nchan, void *buf, int pos, int size);
-void DMA_hold_DREQ (int nchan);
-void DMA_release_DREQ (int nchan);
-void DMA_schedule(void);
+/* i8257.c */
void DMA_init(ISABus *bus, int high_page_enable);
-void DMA_register_channel (int nchan,
- DMA_transfer_handler transfer_handler,
- void *opaque);
#endif
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface
2015-12-29 8:04 ` [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface Hervé Poussineau
@ 2016-01-05 21:59 ` John Snow
0 siblings, 0 replies; 22+ messages in thread
From: John Snow @ 2016-01-05 21:59 UTC (permalink / raw)
To: Hervé Poussineau, qemu-devel; +Cc: Paolo Bonzini, Michael S. Tsirkin
Accidental duplicate send of patch #09 with minor differences in the
commit message... Assuming this one is the "correct" one and just
discarding the other.
On 12/29/2015 03:04 AM, Hervé Poussineau wrote:
> Rewrite the global DMA_*() functions to use the IsaDma interface.
> Note that these functions will be deleted in a few commits.
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
> hw/dma/i8257.c | 148 +++++++++++++++++++++++++++++++++++++++++++++------------
> 1 file changed, 117 insertions(+), 31 deletions(-)
>
> diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
> index 20231d6..cf4b0a7 100644
> --- a/hw/dma/i8257.c
> +++ b/hw/dma/i8257.c
> @@ -77,8 +77,6 @@ typedef struct I8257State {
> int running;
> } I8257State;
>
> -static I8257State *dma_controllers[2];
> -
> enum {
> CMD_MEMORY_TO_MEMORY = 0x01,
> CMD_FIXED_ADDRESS = 0x02,
> @@ -321,31 +319,36 @@ static uint64_t i8257_read_cont(void *opaque, hwaddr nport, unsigned size)
> return val;
> }
>
> -int DMA_get_channel_mode (int nchan)
> +static IsaDmaTransferMode i8257_dma_get_transfer_mode(IsaDma *obj, int nchan)
> +{
> + I8257State *d = I8257(obj);
> + return (d->regs[nchan & 3].mode >> 2) & 3;
> +}
> +
> +static bool i8257_dma_has_autoinitialization(IsaDma *obj, int nchan)
> {
> - return dma_controllers[nchan > 3]->regs[nchan & 3].mode;
> + I8257State *d = I8257(obj);
> + return (d->regs[nchan & 3].mode >> 4) & 1;
> }
>
> -void DMA_hold_DREQ (int nchan)
> +static void i8257_dma_hold_DREQ(IsaDma *obj, int nchan)
> {
> - int ncont, ichan;
> + I8257State *d = I8257(obj);
> + int ichan;
>
> - ncont = nchan > 3;
> ichan = nchan & 3;
> - linfo ("held cont=%d chan=%d\n", ncont, ichan);
> - dma_controllers[ncont]->status |= 1 << (ichan + 4);
> - i8257_dma_run(dma_controllers[ncont]);
> + d->status |= 1 << (ichan + 4);
> + i8257_dma_run(d);
> }
>
> -void DMA_release_DREQ (int nchan)
> +static void i8257_dma_release_DREQ(IsaDma *obj, int nchan)
> {
> - int ncont, ichan;
> + I8257State *d = I8257(obj);
> + int ichan;
>
> - ncont = nchan > 3;
> ichan = nchan & 3;
> - linfo ("released cont=%d chan=%d\n", ncont, ichan);
> - dma_controllers[ncont]->status &= ~(1 << (ichan + 4));
> - i8257_dma_run(dma_controllers[ncont]);
> + d->status &= ~(1 << (ichan + 4));
> + i8257_dma_run(d);
> }
>
> static void i8257_channel_run(I8257State *d, int ichan)
> @@ -405,24 +408,26 @@ out:
> }
> }
>
> -void DMA_register_channel (int nchan,
> - DMA_transfer_handler transfer_handler,
> - void *opaque)
> +static void i8257_dma_register_channel(IsaDma *obj, int nchan,
> + DMA_transfer_handler transfer_handler,
> + void *opaque)
> {
> + I8257State *d = I8257(obj);
> struct dma_regs *r;
> - int ichan, ncont;
> + int ichan;
>
> - ncont = nchan > 3;
> ichan = nchan & 3;
>
> - r = dma_controllers[ncont]->regs + ichan;
> + r = d->regs + ichan;
> r->transfer_handler = transfer_handler;
> r->opaque = opaque;
> }
>
> -int DMA_read_memory (int nchan, void *buf, int pos, int len)
> +static int i8257_dma_read_memory(IsaDma *obj, int nchan, void *buf, int pos,
> + int len)
> {
> - struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
> + I8257State *d = I8257(obj);
> + struct dma_regs *r = &d->regs[nchan & 3];
> hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
>
> if (r->mode & 0x20) {
> @@ -442,9 +447,11 @@ int DMA_read_memory (int nchan, void *buf, int pos, int len)
> return len;
> }
>
> -int DMA_write_memory (int nchan, void *buf, int pos, int len)
> +static int i8257_dma_write_memory(IsaDma *obj, int nchan, void *buf, int pos,
> + int len)
> {
> - struct dma_regs *r = &dma_controllers[nchan > 3]->regs[nchan & 3];
> + I8257State *s = I8257(obj);
> + struct dma_regs *r = &s->regs[nchan & 3];
> hwaddr addr = ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[ADDR];
>
> if (r->mode & 0x20) {
> @@ -467,10 +474,10 @@ int DMA_write_memory (int nchan, void *buf, int pos, int len)
> /* request the emulator to transfer a new DMA memory block ASAP (even
> * if the idle bottom half would not have exited the iothread yet).
> */
> -void DMA_schedule(void)
> +static void i8257_dma_schedule(IsaDma *obj)
> {
> - if (dma_controllers[0]->dma_bh_scheduled ||
> - dma_controllers[1]->dma_bh_scheduled) {
> + I8257State *d = I8257(obj);
> + if (d->dma_bh_scheduled) {
> qemu_notify_event();
> }
> }
> @@ -604,11 +611,85 @@ static Property i8257_properties[] = {
> static void i8257_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> + IsaDmaClass *idc = ISADMA_CLASS(klass);
>
> dc->realize = i8257_realize;
> dc->reset = i8257_reset;
> dc->vmsd = &vmstate_i8257;
> dc->props = i8257_properties;
> +
> + idc->get_transfer_mode = i8257_dma_get_transfer_mode;
> + idc->has_autoinitialization = i8257_dma_has_autoinitialization;
> + idc->read_memory = i8257_dma_read_memory;
> + idc->write_memory = i8257_dma_write_memory;
> + idc->hold_DREQ = i8257_dma_hold_DREQ;
> + idc->release_DREQ = i8257_dma_release_DREQ;
> + idc->schedule = i8257_dma_schedule;
> + idc->register_channel = i8257_dma_register_channel;
> +}
> +
> +static ISABus *i8257_bus;
> +
> +int DMA_get_channel_mode(int nchan)
> +{
> + IsaDma *dma = isa_get_dma(i8257_bus, nchan);
> + IsaDmaClass *k = ISADMA_GET_CLASS(dma);
> + uint8_t res = 0;
> +
> + res |= k->has_autoinitialization(dma, nchan) ? 0 : 0x10;
> + res |= k->get_transfer_mode(dma, nchan) << 2;
> +
> + return res;
> +}
> +
> +int DMA_read_memory(int nchan, void *buf, int pos, int size)
> +{
> + IsaDma *dma = isa_get_dma(i8257_bus, nchan);
> + IsaDmaClass *k = ISADMA_GET_CLASS(dma);
> + return k->read_memory(dma, nchan, buf, pos, size);
> +}
> +
> +int DMA_write_memory(int nchan, void *buf, int pos, int size)
> +{
> + IsaDma *dma = isa_get_dma(i8257_bus, nchan);
> + IsaDmaClass *k = ISADMA_GET_CLASS(dma);
> + return k->write_memory(dma, nchan, buf, pos, size);
> +}
> +
> +void DMA_hold_DREQ(int nchan)
> +{
> + IsaDma *dma = isa_get_dma(i8257_bus, nchan);
> + IsaDmaClass *k = ISADMA_GET_CLASS(dma);
> + k->hold_DREQ(dma, nchan);
> +}
> +
> +void DMA_release_DREQ(int nchan)
> +{
> + IsaDma *dma = isa_get_dma(i8257_bus, nchan);
> + IsaDmaClass *k = ISADMA_GET_CLASS(dma);
> + k->release_DREQ(dma, nchan);
> +}
> +
> +void DMA_schedule(void)
> +{
> + IsaDma *dma;
> + IsaDmaClass *k;
> + int i;
> +
> + for (i = 0; i < 2; i++) {
> + dma = isa_get_dma(i8257_bus, i << 2);
> + k = ISADMA_GET_CLASS(dma);
> + k->schedule(dma);
> + }
> +}
> +
> +void DMA_register_channel(int nchan,
> + DMA_transfer_handler transfer_handler,
> + void *opaque)
> +{
> + IsaDma *dma = isa_get_dma(i8257_bus, nchan);
> + IsaDmaClass *k = ISADMA_GET_CLASS(dma);
> + k->register_channel(dma, nchan, transfer_handler, opaque);
> }
>
> static const TypeInfo i8257_info = {
> @@ -616,6 +697,10 @@ static const TypeInfo i8257_info = {
> .parent = TYPE_ISA_DEVICE,
> .instance_size = sizeof(I8257State),
> .class_init = i8257_class_init,
> + .interfaces = (InterfaceInfo[]) {
> + { TYPE_ISADMA },
> + { }
> + }
> };
>
> static void i8257_register_types(void)
> @@ -637,7 +722,6 @@ void DMA_init(ISABus *bus, int high_page_enable)
> qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x480 : -1);
> qdev_prop_set_int32(d, "dshift", 0);
> qdev_init_nofail(d);
> - dma_controllers[0] = I8257(d);
>
> isa2 = isa_create(bus, TYPE_I8257);
> d = DEVICE(isa2);
> @@ -646,5 +730,7 @@ void DMA_init(ISABus *bus, int high_page_enable)
> qdev_prop_set_int32(d, "pageh-base", high_page_enable ? 0x488 : -1);
> qdev_prop_set_int32(d, "dshift", 1);
> qdev_init_nofail(d);
> - dma_controllers[1] = I8257(d);
> +
> + isa_bus_dma(bus, ISADMA(isa1), ISADMA(isa2));
> + i8257_bus = bus;
> }
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now
2015-12-29 8:04 ` [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now Hervé Poussineau
@ 2016-01-05 22:02 ` John Snow
0 siblings, 0 replies; 22+ messages in thread
From: John Snow @ 2016-01-05 22:02 UTC (permalink / raw)
To: Hervé Poussineau, qemu-devel
Cc: Kevin Wolf, open list:Floppy, Michael S. Tsirkin, Paolo Bonzini,
Leon Alrae, Aurelien Jarno
On 12/29/2015 03:04 AM, Hervé Poussineau wrote:
> Floppy uses the DMA controller in rc4030 chipset, and not the i8259 from the ISA bus.
> It's better to disable DMA than to call the wrong DMA controller.
>
I'll trust that these platforms' FDCs are already terribly broken and
unusable, I've not tested them personally.
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
> hw/block/fdc.c | 5 +++--
> hw/mips/mips_jazz.c | 3 ++-
> include/hw/block/fdc.h | 2 +-
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/block/fdc.c b/hw/block/fdc.c
> index 4292ece..cfdd625 100644
> --- a/hw/block/fdc.c
> +++ b/hw/block/fdc.c
> @@ -2255,7 +2255,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds)
> return isadev;
> }
>
> -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
> +void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, IsaDma *dma,
> hwaddr mmio_base, DriveInfo **fds)
> {
> FDCtrl *fdctrl;
> @@ -2266,7 +2266,8 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
> dev = qdev_create(NULL, "sysbus-fdc");
> sys = SYSBUS_FDC(dev);
> fdctrl = &sys->state;
> - fdctrl->dma_chann = dma_chann; /* FIXME */
> + fdctrl->dma = dma;
You haven't added this field yet; so this breaks the bisect.
> + fdctrl->dma_chann = dma ? dma_chann : -1;
> if (fds[0]) {
> qdev_prop_set_drive_nofail(dev, "driveA", blk_by_legacy_dinfo(fds[0]));
> }
> diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
> index 64a0de2..300c199 100644
> --- a/hw/mips/mips_jazz.c
> +++ b/hw/mips/mips_jazz.c
> @@ -296,7 +296,8 @@ static void mips_jazz_init(MachineState *machine,
> for (n = 0; n < MAX_FD; n++) {
> fds[n] = drive_get(IF_FLOPPY, 0, n);
> }
> - fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0, 0x80003000, fds);
> + /* FIXME: we should enable DMA with a custom IsaDma device */
> + fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), 0, NULL, 0x80003000, fds);
>
> /* Real time clock */
> rtc_init(isa_bus, 1980, NULL);
> diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
> index d48b2f8..f92e44f 100644
> --- a/include/hw/block/fdc.h
> +++ b/include/hw/block/fdc.h
> @@ -16,7 +16,7 @@ typedef enum FDriveType {
> #define TYPE_ISA_FDC "isa-fdc"
>
> ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds);
> -void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
> +void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, IsaDma *dma,
> hwaddr mmio_base, DriveInfo **fds);
> void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
> DriveInfo **fds, qemu_irq *fdc_tc);
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus
2015-12-29 8:04 ` [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus Hervé Poussineau
@ 2016-01-05 23:49 ` John Snow
0 siblings, 0 replies; 22+ messages in thread
From: John Snow @ 2016-01-05 23:49 UTC (permalink / raw)
To: Hervé Poussineau, qemu-devel; +Cc: Paolo Bonzini, Michael S. Tsirkin
On 12/29/2015 03:04 AM, Hervé Poussineau wrote:
> This will permit to deprecate global DMA_*() functions.
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
> hw/isa/isa-bus.c | 21 +++++++++++++++++++++
> include/hw/isa/isa.h | 38 ++++++++++++++++++++++++++++++++++++++
> include/qemu/typedefs.h | 1 +
> 3 files changed, 60 insertions(+)
>
> diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
> index 43e0cd8..8887433 100644
> --- a/hw/isa/isa-bus.c
> +++ b/hw/isa/isa-bus.c
> @@ -36,6 +36,12 @@ static void isa_bus_class_init(ObjectClass *klass, void *data)
> k->get_fw_dev_path = isabus_get_fw_dev_path;
> }
>
> +static const TypeInfo isa_dma_info = {
> + .name = TYPE_ISADMA,
> + .parent = TYPE_INTERFACE,
> + .class_size = sizeof(IsaDmaClass),
> +};
> +
> static const TypeInfo isa_bus_info = {
> .name = TYPE_ISA_BUS,
> .parent = TYPE_BUS,
> @@ -92,6 +98,20 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
> dev->nirqs++;
> }
>
> +void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16)
> +{
> + assert(bus && dma8 && dma16);
> + assert(!bus->dma[0] && !bus->dma[1]);
> + bus->dma[0] = dma8;
> + bus->dma[1] = dma16;
> +}
> +
> +IsaDma *isa_get_dma(ISABus *bus, int nchan)
> +{
> + assert(bus);
> + return bus->dma[nchan > 3 ? 1 : 0];
> +}
> +
> static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport)
> {
> if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) {
> @@ -233,6 +253,7 @@ static const TypeInfo isa_device_type_info = {
>
> static void isabus_register_types(void)
> {
> + type_register_static(&isa_dma_info);
> type_register_static(&isa_bus_info);
> type_register_static(&isabus_bridge_info);
> type_register_static(&isa_device_type_info);
> diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
> index d84852b..193ceb2 100644
> --- a/include/hw/isa/isa.h
> +++ b/include/hw/isa/isa.h
> @@ -34,6 +34,41 @@ static inline uint16_t applesmc_port(void)
> return 0;
> }
>
> +#define TYPE_ISADMA "isa-dma"
> +
> +#define ISADMA_CLASS(klass) \
> + OBJECT_CLASS_CHECK(IsaDmaClass, (klass), TYPE_ISADMA)
> +#define ISADMA_GET_CLASS(obj) \
> + OBJECT_GET_CLASS(IsaDmaClass, (obj), TYPE_ISADMA)
> +#define ISADMA(obj) \
> + INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA)
> +
> +typedef struct IsaDma {
> + Object parent;
> +} IsaDma;
> +
You define IsaDma here, and
> +typedef enum {
> + ISADMA_TRANSFER_VERIFY,
> + ISADMA_TRANSFER_READ,
> + ISADMA_TRANSFER_WRITE,
> + ISADMA_TRANSFER_ILLEGAL,
> +} IsaDmaTransferMode;
> +
> +typedef struct IsaDmaClass {
> + InterfaceClass parent;
> +
> + IsaDmaTransferMode (*get_transfer_mode)(IsaDma *obj, int nchan);
> + bool (*has_autoinitialization)(IsaDma *obj, int nchan);
> + int (*read_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);
> + int (*write_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);
> + void (*hold_DREQ)(IsaDma *obj, int nchan);
> + void (*release_DREQ)(IsaDma *obj, int nchan);
> + void (*schedule)(IsaDma *obj);
> + void (*register_channel)(IsaDma *obj, int nchan,
> + DMA_transfer_handler transfer_handler,
> + void *opaque);
> +} IsaDmaClass;
> +
> typedef struct ISADeviceClass {
> DeviceClass parent_class;
> } ISADeviceClass;
> @@ -46,6 +81,7 @@ struct ISABus {
> MemoryRegion *address_space;
> MemoryRegion *address_space_io;
> qemu_irq *irqs;
> + IsaDma *dma[2];
> };
>
> struct ISADevice {
> @@ -63,6 +99,8 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space,
> void isa_bus_irqs(ISABus *bus, qemu_irq *irqs);
> qemu_irq isa_get_irq(ISADevice *dev, int isairq);
> void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
> +void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16);
> +IsaDma *isa_get_dma(ISABus *bus, int nchan);
> MemoryRegion *isa_address_space(ISADevice *dev);
> MemoryRegion *isa_address_space_io(ISADevice *dev);
> ISADevice *isa_create(ISABus *bus, const char *name);
> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> index 78fe6e8..6ed91b4 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -33,6 +33,7 @@ typedef struct I2CBus I2CBus;
> typedef struct I2SCodec I2SCodec;
> typedef struct ISABus ISABus;
> typedef struct ISADevice ISADevice;
> +typedef struct IsaDma IsaDma;
again here. Clang gets a little whiny about that.
> typedef struct LoadStateEntry LoadStateEntry;
> typedef struct MACAddr MACAddr;
> typedef struct MachineClass MachineClass;
>
--
—js
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2016-01-05 23:50 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-29 8:04 [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374) Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 01/17] i82374: device only existed as ISA device, so simplify device Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 02/17] i8257: pass ISA bus to DMA_init() function Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 04/17] i8257: rename functions to start with i8257_ prefix Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 05/17] i8257: make the DMA running method per controller Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 06/17] i8257: add missing const Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 07/17] i8257: QOM'ify Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus Hervé Poussineau
2016-01-05 23:49 ` John Snow
2015-12-29 8:04 ` [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface Hervé Poussineau
2016-01-05 21:59 ` John Snow
2015-12-29 8:04 ` [Qemu-devel] [PATCH 09/17] i8257: register " Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now Hervé Poussineau
2016-01-05 22:02 ` John Snow
2015-12-29 8:04 ` [Qemu-devel] [PATCH 11/17] sparc: disable floppy DMA Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 12/17] sparc64: " Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 13/17] fdc: use IsaDma interface instead of global DMA_* functions Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 14/17] cs4231a: " Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 15/17] gus: " Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 16/17] sb16: " Hervé Poussineau
2015-12-29 8:04 ` [Qemu-devel] [PATCH 17/17] dma: remove now useless " Hervé Poussineau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.