Commit 5f750b2e authored by Blue Swirl's avatar Blue Swirl
Browse files

Sparc32: convert iommu to qdev


Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent fa28ec52
......@@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "hw.h"
#include "sun4m.h"
#include "sysbus.h"
/* debug iommu */
//#define DEBUG_IOMMU
......@@ -127,6 +128,7 @@
#define IOMMU_PAGE_MASK ~(IOMMU_PAGE_SIZE - 1)
typedef struct IOMMUState {
SysBusDevice busdev;
uint32_t regs[IOMMU_NREGS];
target_phys_addr_t iostart;
uint32_t version;
......@@ -366,20 +368,52 @@ static void iommu_reset(void *opaque)
void *iommu_init(target_phys_addr_t addr, uint32_t version, qemu_irq irq)
{
IOMMUState *s;
int iommu_io_memory;
DeviceState *dev;
SysBusDevice *s;
IOMMUState *d;
dev = qdev_create(NULL, "iommu");
qdev_set_prop_int(dev, "version", version);
qdev_init(dev);
s = sysbus_from_qdev(dev);
sysbus_connect_irq(s, 0, irq);
sysbus_mmio_map(s, 0, addr);
d = FROM_SYSBUS(IOMMUState, s);
return d;
}
static void iommu_init1(SysBusDevice *dev)
{
IOMMUState *s = FROM_SYSBUS(IOMMUState, dev);
int io;
s = qemu_mallocz(sizeof(IOMMUState));
sysbus_init_irq(dev, &s->irq);
s->version = version;
s->irq = irq;
s->version = qdev_get_prop_int(&dev->qdev, "version", 0);
iommu_io_memory = cpu_register_io_memory(iommu_mem_read,
iommu_mem_write, s);
cpu_register_physical_memory(addr, IOMMU_NREGS * 4, iommu_io_memory);
io = cpu_register_io_memory(iommu_mem_read, iommu_mem_write, s);
sysbus_init_mmio(dev, IOMMU_NREGS * sizeof(uint32_t), io);
register_savevm("iommu", addr, 2, iommu_save, iommu_load, s);
register_savevm("iommu", -1, 2, iommu_save, iommu_load, s);
qemu_register_reset(iommu_reset, s);
iommu_reset(s);
return s;
}
static SysBusDeviceInfo iommu_info = {
.init = iommu_init1,
.qdev.name = "iommu",
.qdev.size = sizeof(IOMMUState),
.qdev.props = (DevicePropList[]) {
{.name = "version", .type = PROP_TYPE_INT},
{.name = NULL}
}
};
static void iommu_register_devices(void)
{
sysbus_register_withprop(&iommu_info);
}
device_init(iommu_register_devices)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment