From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226pc8d8sO+mvUo0b08nNNOwjWspLbuwAN8jELsIfb4ymaBeFjhYngR//oORheouT6SdrOch ARC-Seal: i=1; a=rsa-sha256; t=1519374275; cv=none; d=google.com; s=arc-20160816; b=gL/tx/N11leA2IpaqP8MxQxQBWSwQi71GReY2+8olVwJjkg4wxlREzlRZC3muIfsw+ z5XJ6w6+3GdEgeqtyi18np7O2zAEfTq9qZL7Rn+l/y2F33vdhTANfynGNdov3NYbDW5A bb7e0zaBpHTlPJlf9+IrxEbdsBovOw7Jm/QAJMY8X+edwzWNeISHxguBfGr0PCTDQL33 /EHYzanQ7SAzUucM0q5M3h9b0FCqu1Ph5bvvxfgg1FTPHGooDZ7jpDU5hRhb/vtGx5TQ 0tYT9wZqvJExhKjdDryRYr/LArkxW1l+cvtuXuZvk/ktOJ83bFXA1yg+ftkSAymo/odb WboQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature :arc-authentication-results; bh=83annxy3qgpzbsrKdNiBDso567/F9qNrFPAe2MC/p/s=; b=xUmTKq7z3xXeSgzcMscM8d6ew/h7SwIwNdU1TD4pWgoKf203oBUYmVUQMHWGqN9guo 2nCuBPVpSUG1bz8C+2r07ahq/flquuoXWURmgM+QFBuhhuwPCj2mbSMv83/iEyiVg7tp F2uKd4IyfBEirPbCcLqqInMWubIUZ8liuajzHPlFTv/R/HgDnUxsCF30fb4emdOPkENp Z5iwCoFyHRpa9plc6O8bithc7inSkMwXoaC83rza7qCzQiyIEfbjrOYeQymaT+st7BR6 STFRj7SqtzIovFlD/fQNwcoIm8VjgM7HYHdjlRvJSY1harPukr5BPXteVCnz9b1/fUHs Byfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=oEqyvvXb; dkim=pass header.i=@codeaurora.org header.s=default header.b=oEqyvvXb; spf=pass (google.com: domain of poza@codeaurora.org designates 198.145.29.96 as permitted sender) smtp.mailfrom=poza@codeaurora.org Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=oEqyvvXb; dkim=pass header.i=@codeaurora.org header.s=default header.b=oEqyvvXb; spf=pass (google.com: domain of poza@codeaurora.org designates 198.145.29.96 as permitted sender) smtp.mailfrom=poza@codeaurora.org DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8E315607C6 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=poza@codeaurora.org From: Oza Pawandeep To: Bjorn Helgaas , Philippe Ombredanne , Thomas Gleixner , Greg Kroah-Hartman , Kate Stewart , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Dongdong Liu , Keith Busch , Wei Zhang , Sinan Kaya , Timur Tabi Cc: Oza Pawandeep Subject: [PATCH v11 5/7] PCI/AER: Unify aer error defines at single space Date: Fri, 23 Feb 2018 13:54:02 +0530 Message-Id: <1519374244-20539-6-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519374244-20539-1-git-send-email-poza@codeaurora.org> References: <1519374244-20539-1-git-send-email-poza@codeaurora.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1593179400685279370?= X-GMAIL-MSGID: =?utf-8?q?1593179400685279370?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: This patch moves AER error defines to drivers/pci/pci.h. So that it unifies the error repoting codes at single place along with dpc Signed-off-by: Oza Pawandeep diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 1efefe9..7ae9bb3 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -56,6 +56,7 @@ #include #include "apei-internal.h" +#include "../../pci/pci.h" #define GHES_PFX "GHES: " diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index f8575da..c8394ec 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -343,7 +343,11 @@ static inline resource_size_t pci_resource_alignment(struct pci_dev *dev, void pci_enable_acs(struct pci_dev *dev); /* PCI error reporting and recovery */ -#define DPC_FATAL 4 +#define AER_NONFATAL 0 +#define AER_FATAL 1 +#define AER_CORRECTABLE 2 + +#define DPC_FATAL 4 void pcie_do_recovery(struct pci_dev *dev, int severity); diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 6a352e6..4c59f37 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -19,6 +19,7 @@ #include #include "aerdrv.h" +#include "../../pci.h" #include #define AER_AGENT_RECEIVER 0 diff --git a/include/linux/aer.h b/include/linux/aer.h index 8f87bbe..3eac8ed 100644 --- a/include/linux/aer.h +++ b/include/linux/aer.h @@ -11,10 +11,6 @@ #include #include -#define AER_NONFATAL 0 -#define AER_FATAL 1 -#define AER_CORRECTABLE 2 - struct pci_dev; struct aer_header_log_regs { diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h index 9c68986..d75c75b 100644 --- a/include/ras/ras_event.h +++ b/include/ras/ras_event.h @@ -13,6 +13,7 @@ #include #include #include +#include "../../../drivers/pci/pci.h" /* * MCE Extended Error Log trace event -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc., a Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.