[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 14/14] ICH9 LPC: configure PCI IRQs routing inter
From: |
Efimov Vasily |
Subject: |
[Qemu-block] [PATCH v2 14/14] ICH9 LPC: configure PCI IRQs routing internally |
Date: |
Wed, 22 Jun 2016 15:24:58 +0300 |
ICH9 LPC bridge is used to route PCI IRQs to GSI. The root PCI bus reference is
required to setup the routing. According to specification, the bridge is
connected to root bus. Hence, there is no reason to setup the routing
externally.
The patch moves the setup code to 'realize' method. Also several related
functions are made static because they are no needed outside the bridge
implementation any more.
Signed-off-by: Efimov Vasily <address@hidden>
---
hw/i386/pc_q35.c | 3 ---
hw/isa/lpc_ich9.c | 10 +++++++---
include/hw/i386/ich9.h | 3 ---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 0f04c13..eca33b3 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -195,9 +195,6 @@ static void pc_q35_init(MachineState *machine)
for (i = 0; i < GSI_NUM_PINS; i++) {
qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, gsi[i]);
}
- pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc,
- ICH9_LPC_NB_PIRQS);
- pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq);
isa_bus = ich9_lpc->isa_bus;
if (kvm_pic_in_kernel()) {
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index c351351..7a0a0b0 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -253,7 +253,7 @@ static void ich9_lpc_update_apic(ICH9LPCState *lpc, int gsi)
qemu_set_irq(lpc->gsi[gsi], level);
}
-void ich9_lpc_set_irq(void *opaque, int pirq, int level)
+static void ich9_lpc_set_irq(void *opaque, int pirq, int level)
{
ICH9LPCState *lpc = opaque;
int pic_irq, pic_dis;
@@ -269,7 +269,7 @@ void ich9_lpc_set_irq(void *opaque, int pirq, int level)
/* return the pirq number (PIRQ[A-H]:0-7) corresponding to
* a given device irq pin.
*/
-int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx)
+static int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx)
{
BusState *bus = qdev_get_parent_bus(&pci_dev->qdev);
PCIBus *pci_bus = PCI_BUS(bus);
@@ -280,7 +280,7 @@ int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx)
return lpc->irr[PCI_SLOT(pci_dev->devfn)][intx];
}
-PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin)
+static PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin)
{
ICH9LPCState *lpc = opaque;
PCIINTxRoute route;
@@ -630,6 +630,10 @@ static void ich9_lpc_realize(PCIDevice *d, Error **errp)
qdev_init_gpio_out_named(dev, lpc->gsi, ICH9_GPIO_GSI, GSI_NUM_PINS);
isa_bus_irqs(isa_bus, lpc->gsi);
+
+ pci_bus_irqs(lpc->d.bus, ich9_lpc_set_irq, ich9_lpc_map_irq, lpc,
+ ICH9_LPC_NB_PIRQS);
+ pci_bus_set_route_irq_fn(lpc->d.bus, ich9_route_intx_pin_to_irq);
}
static bool ich9_rst_cnt_needed(void *opaque)
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
index c14490b..cd96841 100644
--- a/include/hw/i386/ich9.h
+++ b/include/hw/i386/ich9.h
@@ -14,9 +14,6 @@
#include "hw/acpi/ich9.h"
#include "hw/pci/pci_bus.h"
-void ich9_lpc_set_irq(void *opaque, int irq_num, int level);
-int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);
-PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin);
void ich9_lpc_pm_init(PCIDevice *pci_lpc, bool smm_enabled);
I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
--
2.7.4
- [Qemu-block] [PATCH v2 00/14] Make Q35 devices closer to Qemu object model., Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 01/14] ide: move headers to include folder, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 03/14] vmport: identify vmport type by macro TYPE_VMPORT, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 02/14] pcspk: convert "pit" property type from ptr to link, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 04/14] pflash: make TYPE_CFI_PFLASH0{1, 2} macros public, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 11/14] ICH9 LPC: move call of isa_bus_irqs to 'realize' method, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 07/14] pckbd: handle A20 IRQ as GPIO, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 13/14] MC146818 RTC: add GPIO access to output IRQ, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 14/14] ICH9 LPC: configure PCI IRQs routing internally,
Efimov Vasily <=
- [Qemu-block] [PATCH v2 10/14] ICH9 LPC: handle GSI as qdev GPIO, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 09/14] ICH9 SMB: make TYPE_ICH9_SMB_DEVICE macro public, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 05/14] Q35: implement property interfece to several parameters, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 06/14] pc_q35: configure Q35 instance using properties, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 08/14] port92: handle A20 IRQ as GPIO, Efimov Vasily, 2016/06/22
- [Qemu-block] [PATCH v2 12/14] isa: introduce wrapper isa_connect_gpio_out, Efimov Vasily, 2016/06/22
- Re: [Qemu-block] [PATCH v2 00/14] Make Q35 devices closer to Qemu object model., Paolo Bonzini, 2016/06/22