linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Oza Pawandeep <poza@codeaurora.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Philippe Ombredanne <pombredanne@nexb.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Kate Stewart <kstewart@linuxfoundation.org>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Dongdong Liu <liudongdong3@huawei.com>,
	Keith Busch <keith.busch@intel.com>, Wei Zhang <wzhang@fb.com>,
	Sinan Kaya <okaya@codeaurora.org>,
	Timur Tabi <timur@codeaurora.org>
Cc: Oza Pawandeep <poza@codeaurora.org>
Subject: [PATCH v16 9/9] PCI/DPC: Disable ERR_NONFATAL and enable ERR_FATAL for DPC
Date: Fri, 11 May 2018 06:43:28 -0400	[thread overview]
Message-ID: <1526035408-31328-10-git-send-email-poza@codeaurora.org> (raw)
In-Reply-To: <1526035408-31328-1-git-send-email-poza@codeaurora.org>

This patch disables ERR_NONFATAL trigger for DPC, so now DPC
handles only ERR_FATAL.

Signed-off-by: Oza Pawandeep <poza@codeaurora.org>

diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
index 5680c13..358b4324 100644
--- a/drivers/pci/pcie/dpc.c
+++ b/drivers/pci/pcie/dpc.c
@@ -273,7 +273,7 @@ static int dpc_probe(struct pcie_device *dev)
 		}
 	}
 
-	ctl = (ctl & 0xfff4) | PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN;
+	ctl = (ctl & 0xfff4) | PCI_EXP_DPC_CTL_EN_FATAL | PCI_EXP_DPC_CTL_INT_EN;
 	pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, ctl);
 
 	dev_info(device, "DPC error containment capabilities: Int Msg #%d, RPExt%c PoisonedTLP%c SwTrigger%c RP PIO Log %d, DL_ActiveErr%c\n",
@@ -291,7 +291,7 @@ static void dpc_remove(struct pcie_device *dev)
 	u16 ctl;
 
 	pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, &ctl);
-	ctl &= ~(PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN);
+	ctl &= ~(PCI_EXP_DPC_CTL_EN_FATAL | PCI_EXP_DPC_CTL_INT_EN);
 	pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, ctl);
 }
 
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 103ba79..5182e0d 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -981,6 +981,7 @@
 #define  PCI_EXP_DPC_CAP_DL_ACTIVE	0x1000	/* ERR_COR signal on DL_Active supported */
 
 #define PCI_EXP_DPC_CTL			6	/* DPC control */
+#define  PCI_EXP_DPC_CTL_EN_FATAL 	0x0001	/* Enable trigger on ERR_FATAL message */
 #define  PCI_EXP_DPC_CTL_EN_NONFATAL 	0x0002	/* Enable trigger on ERR_NONFATAL message */
 #define  PCI_EXP_DPC_CTL_INT_EN 	0x0008	/* DPC Interrupt Enable */
 
-- 
2.7.4

  parent reply	other threads:[~2018-05-11 10:43 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-11 10:43 [PATCH v16 0/9] Address error and recovery for AER and DPC Oza Pawandeep
2018-05-11 10:43 ` [PATCH v16 1/9] PCI: Unify wait for link active into generic PCI Oza Pawandeep
2018-05-11 10:43 ` [PATCH v16 2/9] pci-error-recovery: Add AER_FATAL handling Oza Pawandeep
2018-05-11 10:43 ` [PATCH v16 3/9] PCI/AER: Handle ERR_FATAL with removal and re-enumeration of devices Oza Pawandeep
2018-05-15 23:59   ` Bjorn Helgaas
2018-05-16  5:49     ` poza
2018-05-11 10:43 ` [PATCH v16 4/9] PCI/AER: Rename error recovery to generic PCI naming Oza Pawandeep
2018-05-11 10:43 ` [PATCH v16 5/9] PCI/AER: Factor out error reporting from AER Oza Pawandeep
2018-05-11 12:58   ` Lukas Wunner
2018-05-11 15:34     ` poza
2018-05-11 15:54       ` Lukas Wunner
2018-05-11 16:11         ` poza
2018-05-16  0:06   ` Bjorn Helgaas
2018-05-11 10:43 ` [PATCH v16 6/9] PCI/PORTDRV: Implement generic find service Oza Pawandeep
2018-05-11 10:43 ` [PATCH v16 7/9] PCI/PORTDRV: Implement generic find device Oza Pawandeep
2018-05-11 10:43 ` [PATCH v16 8/9] PCI/DPC: Unify and plumb error handling into DPC Oza Pawandeep
2018-05-11 11:52   ` poza
2018-05-15 23:56     ` Bjorn Helgaas
2018-05-16  8:16       ` poza
2018-05-16 10:52         ` Bjorn Helgaas
2018-05-16 12:15           ` poza
2018-05-16 13:04             ` Bjorn Helgaas
2018-05-16 13:58               ` poza
2018-05-16 14:58               ` poza
2018-05-16 20:02                 ` Bjorn Helgaas
2018-05-16 12:51           ` poza
2018-05-16 13:09             ` Bjorn Helgaas
2018-05-11 10:43 ` Oza Pawandeep [this message]
2018-05-16  0:09 ` [PATCH v16 0/9] Address error and recovery for AER and DPC Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1526035408-31328-10-git-send-email-poza@codeaurora.org \
    --to=poza@codeaurora.org \
    --cc=bhelgaas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=keith.busch@intel.com \
    --cc=kstewart@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=liudongdong3@huawei.com \
    --cc=okaya@codeaurora.org \
    --cc=pombredanne@nexb.com \
    --cc=tglx@linutronix.de \
    --cc=timur@codeaurora.org \
    --cc=wzhang@fb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).