diff mbox

[v11,5/7] PCI/AER: Unify aer error defines at single space

Message ID 1519374244-20539-6-git-send-email-poza@codeaurora.org (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Oza Pawandeep Feb. 23, 2018, 8:24 a.m. UTC 
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 <poza@codeaurora.org>

Comments

Bjorn Helgaas Feb. 24, 2018, 3:36 p.m. UTC | #1 
On Fri, Feb 23, 2018 at 01:54:02PM +0530, 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

s/repoting/reporting/
s/dpc/DPC/ (in English text)

> Signed-off-by: Oza Pawandeep <poza@codeaurora.org>
> 
> 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 <ras/ras_event.h>
>  
>  #include "apei-internal.h"
> +#include "../../pci/pci.h"

You're right, it's ugly to use this sort of path to a private PCI
header file from outside drivers/pci.

Could you just add DPC_FATAL to include/linux/aer.h?  Maybe we
discarded that for some reason?  Having pcie-dpc.c include linux/aer.h
seems like it would be better than having this ACPI code 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 <linux/cper.h>
>  
>  #include "aerdrv.h"
> +#include "../../pci.h"
>  #include <ras/ras_event.h>
>  
>  #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 <linux/errno.h>
>  #include <linux/types.h>
>  
> -#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 <linux/aer.h>
>  #include <linux/cper.h>
>  #include <linux/mm.h>
> +#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.
>
Oza Pawandeep Feb. 27, 2018, 6:12 a.m. UTC | #2 
On 2018-02-24 21:06, Bjorn Helgaas wrote:
> On Fri, Feb 23, 2018 at 01:54:02PM +0530, 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
> 
> s/repoting/reporting/
> s/dpc/DPC/ (in English text)
> 
>> Signed-off-by: Oza Pawandeep <poza@codeaurora.org>
>> 
>> 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 <ras/ras_event.h>
>> 
>>  #include "apei-internal.h"
>> +#include "../../pci/pci.h"
> 
> You're right, it's ugly to use this sort of path to a private PCI
> header file from outside drivers/pci.
> 
> Could you just add DPC_FATAL to include/linux/aer.h?  Maybe we
> discarded that for some reason?  Having pcie-dpc.c include linux/aer.h
> seems like it would be better than having this ACPI code include
> "../../pci/pci.h"

pcie-dpc already includes #include "aer/aerdrv.h", which in turn 
includes aer.h
so aer.h is the place where DPC_FATAL should go.

> 
>>  #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 <linux/cper.h>
>> 
>>  #include "aerdrv.h"
>> +#include "../../pci.h"
>>  #include <ras/ras_event.h>
>> 
>>  #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 <linux/errno.h>
>>  #include <linux/types.h>
>> 
>> -#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 <linux/aer.h>
>>  #include <linux/cper.h>
>>  #include <linux/mm.h>
>> +#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.
>>
diff mbox

Patch

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 <ras/ras_event.h>
 
 #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 <linux/cper.h>
 
 #include "aerdrv.h"
+#include "../../pci.h"
 #include <ras/ras_event.h>
 
 #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 <linux/errno.h>
 #include <linux/types.h>
 
-#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 <linux/aer.h>
 #include <linux/cper.h>
 #include <linux/mm.h>
+#include "../../../drivers/pci/pci.h"
 
 /*
  * MCE Extended Error Log trace event