From patchwork Fri Jan 19 11:10:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oza Pawandeep X-Patchwork-Id: 10175069 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 7ACB360386 for ; Fri, 19 Jan 2018 11:11:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BCF62856E for ; Fri, 19 Jan 2018 11:11:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6032B28657; Fri, 19 Jan 2018 11:11:43 +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=ham 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 047582856E for ; Fri, 19 Jan 2018 11:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754910AbeASLLe (ORCPT ); Fri, 19 Jan 2018 06:11:34 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:60880 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755289AbeASLKh (ORCPT ); Fri, 19 Jan 2018 06:10:37 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2F05460A00; Fri, 19 Jan 2018 11:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516360237; bh=YatoEJUQJASO/DjdnE1oTekrrTFNjPORn9tfmKgGN0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IHfXcYS9/QuB03jqkTwLpd+0qZK8i16WXTAI296e6iHtNS6KuYJN6fZOYDLxp0SIp o6ZUl8YSnn/W8pJ6WQ1kjf2WxyrRYjZMHN1Tqnxkj0Vsb3tq9PLwa4QvCGfuSitdF6 qwH57DdvvEZzgaKTLrEpvdGn2FBwInM84lyaUfcA= 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 D348560A00; Fri, 19 Jan 2018 11:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516360236; bh=YatoEJUQJASO/DjdnE1oTekrrTFNjPORn9tfmKgGN0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HfJe2cqY6pOBWRGR1+3SM6xnnK5CJO4Lw+xMIE2YhYerW+H5oYi0tbN+NSYd0zjXs sKgioYbQo3xalyj/5+va8ooQ7vlBh8SNGQ3GTZzqOJ5kPB6IXYJaDFJOoxpWUfNHch /alCtwoUyZqg7c27oZwvu0KxuzQcJsWQMrIpp1i8= 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> 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 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 {