Commit 2a4d6af5 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland
Browse files

apb: use gpios to wire up the apb device to the SPARC CPU IRQs 



Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarArtyom Tarasenko <atar4qemu@gmail.com>
parent 588978c0

hw/pci-host/apb.c

+2 −4
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ do { printf("IOMMU: " fmt , ## __VA_ARGS__); } while (0) 
#define RESET_WCMASK 0x98000000

#define RESET_WMASK  0x60000000



#define MAX_IVEC 0x40

#define NO_IRQ_REQUEST (MAX_IVEC + 1)



static inline void pbm_set_request(APBState *s, unsigned int irq_num)
@@ -614,7 +613,7 @@ static void apb_pci_bridge_realize(PCIDevice *dev, Error **errp) 


APBState *pci_apb_init(hwaddr special_base,

                       hwaddr mem_base,

                       qemu_irq *ivec_irqs, PCIBus **busA, PCIBus **busB)

                       PCIBus **busA, PCIBus **busB)

{

    DeviceState *dev;

    SysBusDevice *s;
@@ -645,8 +644,6 @@ APBState *pci_apb_init(hwaddr special_base, 
    memory_region_init(&d->pci_mmio, OBJECT(s), "pci-mmio", 0x100000000ULL);

    memory_region_add_subregion(get_system_memory(), mem_base, &d->pci_mmio);



    d->ivec_irqs = ivec_irqs;



    pci_create_simple(phb->bus, 0, "pbm-pci");



    /* APB IOMMU */
@@ -721,6 +718,7 @@ static int pci_pbm_init_device(DeviceState *dev) 
        s->obio_irq_map[i] = ((0x1f << 6) | 0x20) + i;

    }

    s->pbm_irqs = qemu_allocate_irqs(pci_apb_set_irq, s, MAX_IVEC);

    qdev_init_gpio_out_named(DEVICE(s), s->ivec_irqs, "ivec-irq", MAX_IVEC);

    s->irq_request = NO_IRQ_REQUEST;

    s->pci_irq_in = 0ULL;

hw/sparc64/sparc64.c

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ SPARCCPU *sparc64_cpu_devinit(const char *cpu_type, uint64_t prom_addr) 
    uint32_t hstick_frequency = 100 * 1000000;



    cpu = SPARC_CPU(cpu_create(cpu_type));

    qdev_init_gpio_in_named(DEVICE(cpu), sparc64_cpu_set_ivec_irq,

                            "ivec-irq", IVEC_MAX);

    env = &cpu->env;



    env->tick = cpu_timer_create("tick", cpu, tick_irq,

hw/sparc64/sun4u.c

+8 −4
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem, 
    PCIBus *pci_bus, *pci_busA, *pci_busB;

    PCIDevice *ebus, *pci_dev;

    SysBusDevice *s;

    qemu_irq *ivec_irqs;

    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];

    DeviceState *dev;

    FWCfgState *fw_cfg;
@@ -502,9 +501,14 @@ static void sun4uv_init(MemoryRegion *address_space_mem, 


    prom_init(hwdef->prom_addr, bios_name);



    ivec_irqs = qemu_allocate_irqs(sparc64_cpu_set_ivec_irq, cpu, IVEC_MAX);

    apb = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_busA,

                       &pci_busB);

    apb = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, &pci_busA, &pci_busB);



    /* Wire up PCI interrupts to CPU */

    for (i = 0; i < IVEC_MAX; i++) {

        qdev_connect_gpio_out_named(DEVICE(apb), "ivec-irq", i,

            qdev_get_gpio_in_named(DEVICE(cpu), "ivec-irq", i));

    }



    pci_bus = PCI_HOST_BRIDGE(apb)->bus;



    /* Only in-built Simba PBMs can exist on the root bus, slot 0 on busA is

include/hw/pci-host/apb.h

+4 −2
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ typedef struct IOMMUState { 
    uint64_t regs[IOMMU_NREGS];

} IOMMUState;



#define MAX_IVEC 0x40



#define TYPE_APB "pbm"



#define APB_DEVICE(obj) \
@@ -71,7 +73,7 @@ typedef struct APBState { 
    uint32_t pci_err_irq_map[4];

    uint32_t obio_irq_map[32];

    qemu_irq *pbm_irqs;

    qemu_irq *ivec_irqs;

    qemu_irq ivec_irqs[MAX_IVEC];

    unsigned int irq_request;

    uint32_t reset_control;

    unsigned int nr_resets;
@@ -91,5 +93,5 @@ typedef struct PBMPCIBridge { 


APBState *pci_apb_init(hwaddr special_base,

                       hwaddr mem_base,

                       qemu_irq *ivec_irqs, PCIBus **bus2, PCIBus **bus3);

                       PCIBus **bus2, PCIBus **bus3);

#endif

include/hw/sparc/sparc64.h

+2 −0
Original line number Diff line number Diff line 


#define IVEC_MAX             0x40



SPARCCPU *sparc64_cpu_devinit(const char *cpu_type, uint64_t prom_addr);



void sparc64_cpu_set_ivec_irq(void *opaque, int irq, int level);