Commit aaea12f7 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-iproc' into next 

* pci/host-iproc:
  PCI: iproc: Allow allocation of multiple MSIs
parents 85a8cf8e fc54bae2

drivers/pci/host/pcie-iproc-msi.c

+12 −7
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct irq_chip iproc_msi_irq_chip = { 


static struct msi_domain_info iproc_msi_domain_info = {

	.flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |

		MSI_FLAG_PCI_MSIX,

		MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX,

	.chip = &iproc_msi_irq_chip,

};
@@ -237,7 +237,7 @@ static void iproc_msi_irq_compose_msi_msg(struct irq_data *data, 
	addr = msi->msi_addr + iproc_msi_addr_offset(msi, data->hwirq);

	msg->address_lo = lower_32_bits(addr);

	msg->address_hi = upper_32_bits(addr);

	msg->data = data->hwirq;

	msg->data = data->hwirq << 5;

}



static struct irq_chip iproc_msi_bottom_irq_chip = {
@@ -251,7 +251,7 @@ static int iproc_msi_irq_domain_alloc(struct irq_domain *domain, 
				      void *args)

{

	struct iproc_msi *msi = domain->host_data;

	int hwirq;

	int hwirq, i;



	mutex_lock(&msi->bitmap_lock);
@@ -267,10 +267,14 @@ static int iproc_msi_irq_domain_alloc(struct irq_domain *domain, 


	mutex_unlock(&msi->bitmap_lock);



	irq_domain_set_info(domain, virq, hwirq, &iproc_msi_bottom_irq_chip,

			    domain->host_data, handle_simple_irq, NULL, NULL);

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

		irq_domain_set_info(domain, virq + i, hwirq + i,

				    &iproc_msi_bottom_irq_chip,

				    domain->host_data, handle_simple_irq,

				    NULL, NULL);

	}



	return 0;

	return hwirq;

}



static void iproc_msi_irq_domain_free(struct irq_domain *domain,
@@ -302,7 +306,8 @@ static inline u32 decode_msi_hwirq(struct iproc_msi *msi, u32 eq, u32 head) 


	offs = iproc_msi_eq_offset(msi, eq) + head * sizeof(u32);

	msg = (u32 *)(msi->eq_cpu + offs);

	hwirq = *msg & IPROC_MSI_EQ_MASK;

	hwirq = readl(msg);

	hwirq = (hwirq >> 5) + (hwirq & 0x1f);



	/*

	 * Since we have multiple hwirq mapped to a single MSI vector,