| Message ID | 20231208023145.1385775-34-sergey.kambalin@auriga.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Raspberry Pi 4B machine | expand |
On Fri, 8 Dec 2023 at 02:34, Sergey Kambalin <serg.oker@gmail.com> wrote: > > Signed-off-by: Sergey Kambalin <sergey.kambalin@auriga.com> > --- > hw/arm/bcm2838.c | 19 +++++++++++++++++++ > include/hw/arm/bcm2838_peripherals.h | 2 ++ > 2 files changed, 21 insertions(+) > > diff --git a/hw/arm/bcm2838.c b/hw/arm/bcm2838.c > index 89cd9d5d8c..83f84b22ad 100644 > --- a/hw/arm/bcm2838.c > +++ b/hw/arm/bcm2838.c > @@ -210,6 +210,10 @@ static void bcm2838_realize(DeviceState *dev, Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&ps_base->dwc2), 0, > qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_DWC2)); > > + /* Connect RNG200 to the interrupt controller */ > + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->rng200), 0, > + qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_RNG200)); > + > /* Connect DMA 0-6 to the interrupt controller */ > for (int_n = GIC_SPI_INTERRUPT_DMA_0; int_n <= GIC_SPI_INTERRUPT_DMA_6; > int_n++) { > @@ -232,6 +236,21 @@ static void bcm2838_realize(DeviceState *dev, Error **errp) > qdev_connect_gpio_out(dma_9_10_irq_orgate, 0, > qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_DMA_9_10)); > > + /* Connect PCIe host bridge to the interrupt controller */ > + for (n = 0; n < BCM2838_PCIE_NUM_IRQS; n++) { > + int_n = GIC_SPI_INTERRUPT_PCI_INT_A + n; > + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->pcie_host), n, > + qdev_get_gpio_in(gicdev, int_n)); > + bcm2838_pcie_host_set_irq_num(BCM2838_PCIE_HOST(&ps->pcie_host), n, > + int_n); > + } > + > + /* Connect Gigabit Ethernet controller to the interrupt controller */ > + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->genet), 0, > + qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_GENET_A)); > + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->genet), 1, > + qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_GENET_B)); > + > /* Pass through inbound GPIO lines to the GIC */ > qdev_init_gpio_in(dev, bcm2838_gic_set_irq, GIC_NUM_IRQS); These lines of code that wire up the interrupt lines for the RNG200, PCIE controller, and ethernet controller, should instead go in the various patches that add those devices to the SoC. > diff --git a/include/hw/arm/bcm2838_peripherals.h b/include/hw/arm/bcm2838_peripherals.h > index 1cfcf5dcce..cdeb892f04 100644 > --- a/include/hw/arm/bcm2838_peripherals.h > +++ b/include/hw/arm/bcm2838_peripherals.h > @@ -17,6 +17,8 @@ > #include "hw/sd/sdhci.h" > #include "hw/gpio/bcm2838_gpio.h" > > +#define GENET_OFFSET 0x1580000 This isn't used in this patch -- presumably it should be in some other patch. > + > /* SPI */ > #define GIC_SPI_INTERRUPT_MBOX 33 > #define GIC_SPI_INTERRUPT_MPHI 40 > -- thanks -- PMM
diff --git a/hw/arm/bcm2838.c b/hw/arm/bcm2838.c index 89cd9d5d8c..83f84b22ad 100644 --- a/hw/arm/bcm2838.c +++ b/hw/arm/bcm2838.c @@ -210,6 +210,10 @@ static void bcm2838_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&ps_base->dwc2), 0, qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_DWC2)); + /* Connect RNG200 to the interrupt controller */ + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->rng200), 0, + qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_RNG200)); + /* Connect DMA 0-6 to the interrupt controller */ for (int_n = GIC_SPI_INTERRUPT_DMA_0; int_n <= GIC_SPI_INTERRUPT_DMA_6; int_n++) { @@ -232,6 +236,21 @@ static void bcm2838_realize(DeviceState *dev, Error **errp) qdev_connect_gpio_out(dma_9_10_irq_orgate, 0, qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_DMA_9_10)); + /* Connect PCIe host bridge to the interrupt controller */ + for (n = 0; n < BCM2838_PCIE_NUM_IRQS; n++) { + int_n = GIC_SPI_INTERRUPT_PCI_INT_A + n; + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->pcie_host), n, + qdev_get_gpio_in(gicdev, int_n)); + bcm2838_pcie_host_set_irq_num(BCM2838_PCIE_HOST(&ps->pcie_host), n, + int_n); + } + + /* Connect Gigabit Ethernet controller to the interrupt controller */ + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->genet), 0, + qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_GENET_A)); + sysbus_connect_irq(SYS_BUS_DEVICE(&ps->genet), 1, + qdev_get_gpio_in(gicdev, GIC_SPI_INTERRUPT_GENET_B)); + /* Pass through inbound GPIO lines to the GIC */ qdev_init_gpio_in(dev, bcm2838_gic_set_irq, GIC_NUM_IRQS); diff --git a/include/hw/arm/bcm2838_peripherals.h b/include/hw/arm/bcm2838_peripherals.h index 1cfcf5dcce..cdeb892f04 100644 --- a/include/hw/arm/bcm2838_peripherals.h +++ b/include/hw/arm/bcm2838_peripherals.h @@ -17,6 +17,8 @@ #include "hw/sd/sdhci.h" #include "hw/gpio/bcm2838_gpio.h" +#define GENET_OFFSET 0x1580000 + /* SPI */ #define GIC_SPI_INTERRUPT_MBOX 33 #define GIC_SPI_INTERRUPT_MPHI 40
Signed-off-by: Sergey Kambalin <sergey.kambalin@auriga.com> --- hw/arm/bcm2838.c | 19 +++++++++++++++++++ include/hw/arm/bcm2838_peripherals.h | 2 ++ 2 files changed, 21 insertions(+)