david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xilinx_timer: changed nr_timers to one_timer_only

Browse Source 
The configurable property for this IP in the Xilinx tools is a boolean switch
"one-timer-only" that flicks this timer from being dual channel to single.
Updated QEMU to work the same way for better match with the IP core and its TRM.

Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Peter A. G. Crosthwaite 2012-06-13 14:46:43 +10:00 committed by Edgar E. Iglesias
parent 8d4eb373f7
commit abe098e4f9
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/petalogix_ml605_mmu.c
View File

@ -123,7 +123,7 @@ petalogix_ml605_init(ram_addr_t ram_size,
irq[5], 115200, serial_hds[0], DEVICE_LITTLE_ENDIAN); irq[5], 115200, serial_hds[0], DEVICE_LITTLE_ENDIAN);
/* 2 timers at irq 2 @ 100 Mhz. */ /* 2 timers at irq 2 @ 100 Mhz. */
xilinx_timer_create(TIMER_BASEADDR, irq[2], 2, 100 * 1000000); xilinx_timer_create(TIMER_BASEADDR, irq[2], 0, 100 * 1000000);
/* axi ethernet and dma initialization. TODO: Dynamically connect them. */ /* axi ethernet and dma initialization. TODO: Dynamically connect them. */
{ {

2
hw/petalogix_s3adsp1800_mmu.c
View File

@ -106,7 +106,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[3]); sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[3]);
/* 2 timers at irq 2 @ 62 Mhz. */ /* 2 timers at irq 2 @ 62 Mhz. */
xilinx_timer_create(TIMER_BASEADDR, irq[0], 2, 62 * 1000000); xilinx_timer_create(TIMER_BASEADDR, irq[0], 0, 62 * 1000000);
xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0); xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0);
microblaze_load_kernel(cpu, ddr_base, ram_size, microblaze_load_kernel(cpu, ddr_base, ram_size,

2
hw/virtex_ml507.c
View File

@ -229,7 +229,7 @@ static void virtex_init(ram_addr_t ram_size,
serial_hds[0], DEVICE_LITTLE_ENDIAN); serial_hds[0], DEVICE_LITTLE_ENDIAN);
/* 2 timers at irq 2 @ 62 Mhz. */ /* 2 timers at irq 2 @ 62 Mhz. */
xilinx_timer_create(0x83c00000, irq[3], 2, 62 * 1000000); xilinx_timer_create(0x83c00000, irq[3], 0, 62 * 1000000);
if (kernel_filename) { if (kernel_filename) {
uint64_t entry, low, high; uint64_t entry, low, high;

4
hw/xilinx.h
View File

@ -16,12 +16,12 @@ xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr)
/* OPB Timer/Counter. */ /* OPB Timer/Counter. */
static inline DeviceState * static inline DeviceState *
xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int nr, int freq) xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq)
{ {
DeviceState *dev; DeviceState *dev;
dev = qdev_create(NULL, "xilinx,timer"); dev = qdev_create(NULL, "xilinx,timer");
qdev_prop_set_uint32(dev, "nr-timers", nr); qdev_prop_set_uint32(dev, "one-timer-only", oto);
qdev_prop_set_uint32(dev, "frequency", freq); qdev_prop_set_uint32(dev, "frequency", freq);
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);

17
hw/xilinx_timer.c
View File

@ -62,11 +62,16 @@ struct timerblock
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion mmio; MemoryRegion mmio;
qemu_irq irq; qemu_irq irq;
uint32_t nr_timers; uint8_t one_timer_only;
uint32_t freq_hz; uint32_t freq_hz;
struct xlx_timer *timers; struct xlx_timer *timers;
}; };
static inline unsigned int num_timers(struct timerblock *t)
{
return 2 - t->one_timer_only;
}
static inline unsigned int timer_from_addr(target_phys_addr_t addr) static inline unsigned int timer_from_addr(target_phys_addr_t addr)
{ {
/* Timers get a 4x32bit control reg area each. */ /* Timers get a 4x32bit control reg area each. */
@ -78,7 +83,7 @@ static void timer_update_irq(struct timerblock *t)
unsigned int i, irq = 0; unsigned int i, irq = 0;
uint32_t csr; uint32_t csr;
for (i = 0; i < t->nr_timers; i++) { for (i = 0; i < num_timers(t); i++) {
csr = t->timers[i].regs[R_TCSR]; csr = t->timers[i].regs[R_TCSR];
irq |= (csr & TCSR_TINT) && (csr & TCSR_ENIT); irq |= (csr & TCSR_TINT) && (csr & TCSR_ENIT);
} }
@ -202,8 +207,8 @@ static int xilinx_timer_init(SysBusDevice *dev)
sysbus_init_irq(dev, &t->irq); sysbus_init_irq(dev, &t->irq);
/* Init all the ptimers. */ /* Init all the ptimers. */
t->timers = g_malloc0(sizeof t->timers[0] * t->nr_timers); t->timers = g_malloc0(sizeof t->timers[0] * num_timers(t));
for (i = 0; i < t->nr_timers; i++) { for (i = 0; i < num_timers(t); i++) {
struct xlx_timer *xt = &t->timers[i]; struct xlx_timer *xt = &t->timers[i];
xt->parent = t; xt->parent = t;
@ -214,14 +219,14 @@ static int xilinx_timer_init(SysBusDevice *dev)
} }
memory_region_init_io(&t->mmio, &timer_ops, t, "xilinx-timer", memory_region_init_io(&t->mmio, &timer_ops, t, "xilinx-timer",
R_MAX * 4 * t->nr_timers); R_MAX * 4 * num_timers(t));
sysbus_init_mmio(dev, &t->mmio); sysbus_init_mmio(dev, &t->mmio);
return 0; return 0;
} }
static Property xilinx_timer_properties[] = { static Property xilinx_timer_properties[] = {
DEFINE_PROP_UINT32("frequency", struct timerblock, freq_hz, 62 * 1000000), DEFINE_PROP_UINT32("frequency", struct timerblock, freq_hz, 62 * 1000000),
DEFINE_PROP_UINT32("nr-timers", struct timerblock, nr_timers, 0), DEFINE_PROP_UINT8("one-timer-only", struct timerblock, one_timer_only, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };