From patchwork Sat Jan 20 06:35:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oza Pawandeep X-Patchwork-Id: 863932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="A5i6YBZU"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="RHwVZXa1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zNnyt4prBz9t1t for ; Sat, 20 Jan 2018 17:36:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754892AbeATGgJ (ORCPT ); Sat, 20 Jan 2018 01:36:09 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:45848 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754548AbeATGfu (ORCPT ); Sat, 20 Jan 2018 01:35:50 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 08232608CB; Sat, 20 Jan 2018 06:35:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516430150; bh=bA7CuJ6OASJUsqTbD2D7MYdTlGVs2Tn1NQU8dHeN/F4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A5i6YBZUbimHXOJOC5niy+ndJsiRFX0On8FA8qQZh1z1WYBTdLHHtsx5a5QysqhHy rIhA6OAFFSw5gb4fbmsv9172bpupUoOFSNuuRI/eaU95BBAcvmXX7gAkxUOanXuz8D cgkhlXX92qJy2DpdTq53nib0DdAQNwt9zf4qoIjU= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 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 CF057608CB; Sat, 20 Jan 2018 06:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516430149; bh=bA7CuJ6OASJUsqTbD2D7MYdTlGVs2Tn1NQU8dHeN/F4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RHwVZXa1lbKD8yz8bOfK9Dq/4XMRtSwLVC9eryjtM8WxN/XhBZ/ytI/YlpuDuRj4O 7eubfpp4AhXQvukR5ArEsSTTvfPmPFMIMy5mUN6fmc9UDKVHmWbA/cn4IKjRJj7hxH mDvdSVen8G2V2gcySGSGFIHk9udDAVW0DhpfDeTA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org CF057608CB 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 v7 5/7] PCI/AER: Unify aer error defines at single space Date: Sat, 20 Jan 2018 12:05:17 +0530 Message-Id: <1516430119-3825-6-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516430119-3825-1-git-send-email-poza@codeaurora.org> References: <1516430119-3825-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 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 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 {