Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 397ee434 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/dpc' into next 

* pci/dpc:
  PCI/DPC: Fix control register setting
  PCI/DPC: Skip DPC event if device is not present
parents 2ea659a9 69a3025d

drivers/pci/pcie/pcie-dpc.c

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static irqreturn_t dpc_irq(int irq, void *context) 
	pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_STATUS, &status);

	pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_SOURCE_ID,

			     &source);

	if (!status)

	if (!status || status == (u16)(~0))

		return IRQ_NONE;



	dev_info(&dpc->dev->device, "DPC containment event, status:%#06x source:%#06x\n",
@@ -144,7 +144,7 @@ static int dpc_probe(struct pcie_device *dev) 


	dpc->rp = (cap & PCI_EXP_DPC_CAP_RP_EXT);



	ctl |= PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN;

	ctl = (ctl & 0xfff4) | PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN;

	pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, ctl);



	dev_info(&dev->device, "DPC error containment capabilities: Int Msg #%d, RPExt%c PoisonedTLP%c SwTrigger%c RP PIO Log %d, DL_ActiveErr%c\n",