Commit 0321da85 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host/dwc' 

- Restore MSI Receiver mask during resume (Jisheng Zhang)

* pci/host/dwc:
  PCI: dwc: Restore MSI Receiver mask during resume
parents 7ec9ff94 815953dc

drivers/pci/controller/dwc/pcie-designware-host.c

+6 −1
Original line number Diff line number Diff line
@@ -362,6 +362,12 @@ int dw_pcie_host_init(struct pcie_port *pp) 
			if (ret < 0)

				return ret;

		} else if (pp->has_msi_ctrl) {

			u32 ctrl, num_ctrls;



			num_ctrls = pp->num_vectors / MAX_MSI_IRQS_PER_CTRL;

			for (ctrl = 0; ctrl < num_ctrls; ctrl++)

				pp->irq_mask[ctrl] = ~0;



			if (!pp->msi_irq) {

				pp->msi_irq = platform_get_irq_byname_optional(pdev, "msi");

				if (pp->msi_irq < 0) {
@@ -541,7 +547,6 @@ void dw_pcie_setup_rc(struct pcie_port *pp) 


		/* Initialize IRQ Status array */

		for (ctrl = 0; ctrl < num_ctrls; ctrl++) {

			pp->irq_mask[ctrl] = ~0;

			dw_pcie_writel_dbi(pci, PCIE_MSI_INTR0_MASK +

					    (ctrl * MSI_REG_CTRL_BLOCK_SIZE),

					    pp->irq_mask[ctrl]);