From patchwork Thu Feb 22 07:46:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oza Pawandeep X-Patchwork-Id: 10234851 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 223A860209 for ; Thu, 22 Feb 2018 07:48:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CAC4285ED for ; Thu, 22 Feb 2018 07:48:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 114FD285F0; Thu, 22 Feb 2018 07:48:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16AD9285EE for ; Thu, 22 Feb 2018 07:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751681AbeBVHqo (ORCPT ); Thu, 22 Feb 2018 02:46:44 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:38188 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752816AbeBVHqm (ORCPT ); Thu, 22 Feb 2018 02:46:42 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id BB3BB607E5; Thu, 22 Feb 2018 07:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519285601; bh=x5iAzmT9Kuj+ammB/EKTLCY4geuJ8j4OGGdaUkcpF0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4f54il7wD0tO7+C2I+QefCx0zTTRyaOQvx965fVRQBN2KFa+G2CJdufV4bv2vn05 tiLyNOb8lcrdC4dMhhux0ObAKaFWnkf+KR+3qFCJWxFK5h976IpuDZ4sKDc95yRo2q Z76N5Dw0H21MWjXRGhvoYJW/eN8HkRe+C1f2B0ms= Received: from blr-ubuntu-poza.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: poza@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id ABCA3609EF; Thu, 22 Feb 2018 07:46:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519285601; bh=x5iAzmT9Kuj+ammB/EKTLCY4geuJ8j4OGGdaUkcpF0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4f54il7wD0tO7+C2I+QefCx0zTTRyaOQvx965fVRQBN2KFa+G2CJdufV4bv2vn05 tiLyNOb8lcrdC4dMhhux0ObAKaFWnkf+KR+3qFCJWxFK5h976IpuDZ4sKDc95yRo2q Z76N5Dw0H21MWjXRGhvoYJW/eN8HkRe+C1f2B0ms= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org ABCA3609EF 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 v9 5/7] PCI/AER: Unify aer error defines at single space Date: Thu, 22 Feb 2018 13:16:09 +0530 Message-Id: <1519285571-5634-6-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519285571-5634-1-git-send-email-poza@codeaurora.org> References: <1519285571-5634-1-git-send-email-poza@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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