From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.codeaurora.org ([198.145.29.96]:57762 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933069AbeBVQGZ (ORCPT ); Thu, 22 Feb 2018 11:06:25 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Date: Thu, 22 Feb 2018 21:36:23 +0530 From: poza@codeaurora.org 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 Subject: Re: [PATCH v10 5/7] PCI/AER: Unify aer error defines at single space In-Reply-To: <1519315332-26852-6-git-send-email-poza@codeaurora.org> References: <1519315332-26852-1-git-send-email-poza@codeaurora.org> <1519315332-26852-6-git-send-email-poza@codeaurora.org> Message-ID: <823d8b71a56656f87b6f0868a813db8c@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org List-ID: On 2018-02-22 21:32, Oza Pawandeep wrote: > 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 124f42e..b0e63b5 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 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 Hi Bjorn, Based on your earlier comment I have moved AER and DPC error defined in driver/pci/pci.h but I am not entirely comfortable with moving them there because file such as drivers/acpi/apei/ghes.c include/ras/ras_event.h they are outside of the scope of driver/pci/pci.h and they have to include the files #include "../../pci/pci.h" and #include "../../../drivers/pci/pci.h" respectively. hence my suggestion is to move error defines in include/linux/pci.h let me know your view. Regards, Oza.