Skip to contentSkip to conversation

sPAPR: implement route_intx_to_irq to get gsi of pci device.

PATCH In review Liu Ping Fan 3 participants 5 messages Sep 22, 2013 – Sep 23, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sPAPR: implement route_intx_to_irq to get gsi of pci device.

This is useful when pci assignment happens on sPAPR.

---
This patch will apply on patches which enable xics in kernel.

---
 hw/intc/xics.c        |  5 +++++
 hw/ppc/spapr_pci.c    | 14 ++++++++++++++
 include/hw/ppc/xics.h |  1 +
 3 files changed, 20 insertions(+)
hw/intc/xics.c +5 -0
index bb018d1..02cdab8 100644
@@ -442,6 +442,11 @@ void xics_set_irq_type(XICSState *icp, int irq, bool lsi)
     icp->ics->islsi[irq - icp->ics->offset] = lsi;
 }
 
+int xics_get_irq_offset(XICSState *icp)
+{
+    return icp->ics->offset;
+}
+
 /*
  * Guest interfaces
  */
hw/ppc/spapr_pci.c +14 -0
index 9b6ee32..6d3657a 100644
@@ -432,6 +432,19 @@ static void pci_spapr_set_irq(void *opaque, int irq_num, int level)
     qemu_set_irq(spapr_phb_lsi_qirq(phb, irq_num), level);
 }
 
+static PCIINTxRoute spapr_phb_route_intx_to_irq(void *opaque, int pirq_pin)
+{
+    int gsi;
+    PCIINTxRoute route;
+    sPAPRPHBState *phb = opaque;
+
+    gsi = phb->lsi_table[pirq_pin].irq;
+    gsi += xics_get_irq_offset(spapr->icp);
+    route.mode = PCI_INTX_ENABLED;
+    route.irq = gsi;
+    return route;
+}
+
 /*
  * MSI/MSIX memory region implementation.
  * The handler handles both MSI and MSIX.
@@ -595,6 +608,7 @@ static int spapr_phb_init(SysBusDevice *s)
                            pci_spapr_set_irq, pci_spapr_map_irq, sphb,
                            &sphb->memspace, &sphb->iospace,
                            PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
+    pci_bus_set_route_irq_fn(bus, spapr_phb_route_intx_to_irq);
     phb->bus = bus;
 
     sphb->dma_window_start = 0;
include/hw/ppc/xics.h +1 -0
index 66364c5..6ed1f4d 100644
@@ -97,6 +97,7 @@ struct ICSIRQState {
 
 qemu_irq xics_get_qirq(XICSState *icp, int irq);
 void xics_set_irq_type(XICSState *icp, int irq, bool lsi);
+int xics_get_irq_offset(XICSState *icp);
 
 void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
 
Signature · 1 line
1.8.1.4
#1 lore raw

Am 22.09.2013 um 13:47 schrieb Liu Ping Fan <[email protected]>:

Quoted 1 line

This is useful when pci assignment happens on sPAPR.

This patch doesn't sound useful on its own to me, thus probably belongs in a greater patch set.

And without even a clear commit message that explains why exactly this is going to be "useful" eventually I don't see any reason to apply this patch.

Alex

#2 lore raw
Quoted 7 lines · Alexander Graf

Am 22.09.2013 um 13:47 schrieb Liu Ping Fan <[email protected]>:

Quoted 1 line

This is useful when pci assignment happens on sPAPR.

This patch doesn't sound useful on its own to me, thus probably belongs in a greater patch set.

Yes, I think, it will be applied after Alexey Kardashevskiy's patch-set, "[PATCH v4 00/12] xics: reworks and in-kernel support" CCing Alexey Kardashevskiy

Quoted 2 lines

And without even a clear commit message that explains why exactly this is going to be "useful" eventually I don't see any reason to apply this patch.

Pci assignment adopts irqfd in kernel, which need gsi as input param, right?

Thanks,
Pingfan

#3 lore raw
In reply to Liu Ping Fan
Quoted 1 line · Liu Ping Fan

This is useful when pci assignment happens on sPAPR.

I have almost the same patch in my queue already, it will enable irqfd for both INTX and MSI, I am just waiting till in-kernel XICS patchset gets in upstream and then I'll post it.

Quoted 31 lines

---
This patch will apply on patches which enable xics in kernel.

---
 hw/intc/xics.c        |  5 +++++
 hw/ppc/spapr_pci.c    | 14 ++++++++++++++
 include/hw/ppc/xics.h |  1 +
 3 files changed, 20 insertions(+)
hw/intc/xics.c +5 -0
index bb018d1..02cdab8 100644
@@ -442,6 +442,11 @@ void xics_set_irq_type(XICSState *icp, int irq, bool lsi)
     icp->ics->islsi[irq - icp->ics->offset] = lsi;
 }
 
+int xics_get_irq_offset(XICSState *icp)
+{
+    return icp->ics->offset;
+}
+
 /*
  * Guest interfaces
  */
hw/ppc/spapr_pci.c +0 -0
index 9b6ee32..6d3657a 100644
@@ -432,6 +432,19 @@ static void pci_spapr_set_irq(void *opaque, int irq_num, int level)
     qemu_set_irq(spapr_phb_lsi_qirq(phb, irq_num), level);

hw/ppc/spapr_pci.c static void pci_spapr_set_irq(void *opaque, int irq_num, int level) · line 442

Quoted 10 lines
hw/ppc/spapr_pci.c +8 -0
 }
 
+static PCIINTxRoute spapr_phb_route_intx_to_irq(void *opaque, int pirq_pin)
+{
+    int gsi;
+    PCIINTxRoute route;
+    sPAPRPHBState *phb = opaque;
+
+    gsi = phb->lsi_table[pirq_pin].irq;
+    gsi += xics_get_irq_offset(spapr->icp);

Why do you need this? lsi_table[].irq is received from spapr_allocate_lsi() which already adds this offset.

Quoted 29 lines
hw/ppc/spapr_pci.c +6 -0
+    route.mode = PCI_INTX_ENABLED;
+    route.irq = gsi;
+    return route;
+}
+
 /*
  * MSI/MSIX memory region implementation.
  * The handler handles both MSI and MSIX.
@@ -595,6 +608,7 @@ static int spapr_phb_init(SysBusDevice *s)
                            pci_spapr_set_irq, pci_spapr_map_irq, sphb,
                            &sphb->memspace, &sphb->iospace,
                            PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
+    pci_bus_set_route_irq_fn(bus, spapr_phb_route_intx_to_irq);
     phb->bus = bus;
 
     sphb->dma_window_start = 0;
include/hw/ppc/xics.h +1 -0
index 66364c5..6ed1f4d 100644
@@ -97,6 +97,7 @@ struct ICSIRQState {
 
 qemu_irq xics_get_qirq(XICSState *icp, int irq);
 void xics_set_irq_type(XICSState *icp, int irq, bool lsi);
+int xics_get_irq_offset(XICSState *icp);
 
 void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
 
Signature · 1 line
Alexey
#4 lore raw
Quoted 8 lines · Alexey Kardashevskiy
Quoted 1 line · Liu Ping Fan

This is useful when pci assignment happens on sPAPR.

I have almost the same patch in my queue already, it will enable irqfd for both INTX and MSI, I am just waiting till in-kernel XICS patchset gets in upstream and then I'll post it.

Ok,

Quoted 34 lines
Quoted 34 lines

---
This patch will apply on patches which enable xics in kernel.

---
 hw/intc/xics.c        |  5 +++++
 hw/ppc/spapr_pci.c    | 14 ++++++++++++++
 include/hw/ppc/xics.h |  1 +
 3 files changed, 20 insertions(+)
hw/intc/xics.c +5 -0
index bb018d1..02cdab8 100644
@@ -442,6 +442,11 @@ void xics_set_irq_type(XICSState *icp, int irq, bool lsi)
     icp->ics->islsi[irq - icp->ics->offset] = lsi;
 }
 
+int xics_get_irq_offset(XICSState *icp)
+{
+    return icp->ics->offset;
+}
+
 /*
  * Guest interfaces
  */
hw/ppc/spapr_pci.c +0 -0
index 9b6ee32..6d3657a 100644
@@ -432,6 +432,19 @@ static void pci_spapr_set_irq(void *opaque, int irq_num, int level)
     qemu_set_irq(spapr_phb_lsi_qirq(phb, irq_num), level);
 }
 
Quoted 13 lines

hw/ppc/spapr_pci.c static void pci_spapr_set_irq(void *opaque, int irq_num, int level) · line 442

Quoted 8 lines
hw/ppc/spapr_pci.c +8 -0
+static PCIINTxRoute spapr_phb_route_intx_to_irq(void *opaque, int pirq_pin)
+{
+    int gsi;
+    PCIINTxRoute route;
+    sPAPRPHBState *phb = opaque;
+
+    gsi = phb->lsi_table[pirq_pin].irq;
+    gsi += xics_get_irq_offset(spapr->icp);

Why do you need this? lsi_table[].irq is received from spapr_allocate_lsi() which already adds this offset.

Oh, you are right, next_irq begin at XICS_IRQ_BASE

Thx,
Pingfan

Quoted 35 lines
Quoted 24 lines
hw/ppc/spapr_pci.c +6 -0
+    route.mode = PCI_INTX_ENABLED;
+    route.irq = gsi;
+    return route;
+}
+
 /*
  * MSI/MSIX memory region implementation.
  * The handler handles both MSI and MSIX.
@@ -595,6 +608,7 @@ static int spapr_phb_init(SysBusDevice *s)
                            pci_spapr_set_irq, pci_spapr_map_irq, sphb,
                            &sphb->memspace, &sphb->iospace,
                            PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
+    pci_bus_set_route_irq_fn(bus, spapr_phb_route_intx_to_irq);
     phb->bus = bus;
 
     sphb->dma_window_start = 0;
include/hw/ppc/xics.h +0 -0
index 66364c5..6ed1f4d 100644

include/hw/ppc/xics.h struct ICSIRQState { · line 103

Quoted 7 lines
include/hw/ppc/xics.h +1 -0
@@ -97,6 +97,7 @@ struct ICSIRQState {
 
 qemu_irq xics_get_qirq(XICSState *icp, int irq);
 void xics_set_irq_type(XICSState *icp, int irq, bool lsi);
+int xics_get_irq_offset(XICSState *icp);
 
 void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
 

--
Alexey