From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: ACJfBoust7DRtOZ/riVi9POvt64+j8w/7lHtppSwVn0CVpljxMIOP6T+SCzc3QFO4kLFQE4yd+sa ARC-Seal: i=1; a=rsa-sha256; t=1516360237; cv=none; d=google.com; s=arc-20160816; b=W8OaRo70zcxSj5z0jAyN5f3srxupTUXEUG4QK7DNmBv+uXJmDK+0+6FbWfdBBjLAg7 ipAdDxqywX/aS10DLgf8RIFKXqGJP37Ai+i6pqWsHRBYlQCoVtUYlNMYR6VET8phyWNt 1gaYxC2/acav3GyFXEId6cBt/bBujPUdnLV2uilm4UToyInM+8jHidJxXrMX35GEWRbH CtFSKl2FzgYSdHiH6Nibn3lXKfx1fadbI8HMxB44bi2qhTpokPY4SEyHCAswpGzgIhGg WhmVgM9ZQVOP761o+Vd7Q8gqiy1WnfuEUEE3ubRYaSDrN1juYv0xv4+QEyQ2iemwU8cC leyQ== 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=KVwdy7tIqEH721ke7gFF6QdF9qnT1PJplP7tXf4EDGI=; b=a7EyP3Rv3wlv1i65RQQ4epRT+ln4t7kCZR4uaTnwmizdyGkTl5/DkfNVdlwCR7UDfd nq47f6OWVahMR5EOdswDfpLjeGaVFJvMAMwwZAoHnO2rpeXDoZOP09Wq7ysX4vf/5FqO VG0tt7Y77DYxR/L1bc354AxYuKbgqfnsryhMgEX7nrOe1kcaNd5U9ygSiURoYyVfZQV3 EvNf+8JLsTpkvu/ZlA+7Pdnxhu0p0POSWcvDoqVP4L72Lgn8wfkOU0WLdoLMiLdhjgLn 0EfayQtDFVG0kcr/LNDV4xu+krB+X2bbRejmvzawNq4/gWdvUtzto9PBoHcOMsuyv1Ss e6Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=HfJe2cqY; dkim=pass header.i=@codeaurora.org header.s=default header.b=HfJe2cqY; 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=HfJe2cqY; dkim=pass header.i=@codeaurora.org header.s=default header.b=HfJe2cqY; 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 D348560A00 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 v6 5/7] PCI/AER: Unify aer error defines at single space Date: Fri, 19 Jan 2018 16:40:02 +0530 Message-Id: <1516360204-1586-6-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516360204-1586-1-git-send-email-poza@codeaurora.org> References: <1516360204-1586-1-git-send-email-poza@codeaurora.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590018952419392966?= X-GMAIL-MSGID: =?utf-8?q?1590018952419392966?= 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 repotting 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 6402f7f..216ee47 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 3b79593..2e19953 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 pci_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 54c4b69..cd3ad55 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -22,6 +22,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 { -- 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.