Received: by 10.223.185.116 with SMTP id b49csp4590388wrg; Mon, 26 Feb 2018 22:13:07 -0800 (PST) X-Google-Smtp-Source: AH8x227pzF8sc1hdXN+M4NUW7YyfAyowDyWrJ3WxRFWiepg518UuFPVqMaGXJdVzSKiZUFCPyVKx X-Received: by 10.98.32.28 with SMTP id g28mr13164041pfg.182.1519711986901; Mon, 26 Feb 2018 22:13:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519711986; cv=none; d=google.com; s=arc-20160816; b=hfTm26t7mQ1dqL1MWlUMx/ucm1QJFKmH9CEYzP+svTJMr4fHA1z0egvoMPKmKuLRHw zDbcCH6Mk4n+k1eDxeikryMCMMHScySph1ik8vhbDFmeavN8N2p9qXtSBRbPoEB6YRPV Uw0ccojRmYfRCroJM2IHbj5Dusf5hpHWiu3mnu1VxxkSBIUbMBIoy2OIYW9edDlD5Lzy cyExkUJzsPvfrt+1ptgRCYfCreAmxH/rIcRIPB0CwNBo3iZ8c72tDMxjU9xFTMYSHSmV hWbbGlPkNBx0CtpHuP1H3yRV5EgB0/NT2vzFFuywFww7zXORLwaEvtDAbqkUiFFGAYiS 4vQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:message-id:references :in-reply-to:subject:cc:to:from:date:content-transfer-encoding :mime-version:dkim-signature:dkim-signature :arc-authentication-results; bh=Al6iaoBpwKRxDZXL/VEao1feiFgVFFOfngPwWUOa2V8=; b=mVskc/KgbX07xcrV2E/nsp7Achb4aSuxH0cSZC2L90w3IdfkXDNG7vbV/cc5tpOCK3 kP/1nzhqg8N7qjTsEPvsxE0qBbJqOaE7R9Go9WyAjxN3ZvI/FOD4i9WRo3ZonNWh46r+ xSxuOKWxVfptwFqh3qAYsx3/36r4uqqG3FxWEdVPV+ePUYZkzvwFEv+Si6Vj1OcO2/xv JED1uPi/rv6u60ljGTs+QwxC3bQPi90T/1BSzHysFzHbA3ds+K88x6kFsrxVAGoOMi96 dWyytbcxlaacamV6B7IGExYZOppe22qFxddpfJnkYXjro/9oC9OC+UGOXuhRKlYgMUZd gtSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=NMt4d1aF; dkim=pass header.i=@codeaurora.org header.s=default header.b=eld/jDOV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b89-v6si8004485plb.809.2018.02.26.22.12.52; Mon, 26 Feb 2018 22:13:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=NMt4d1aF; dkim=pass header.i=@codeaurora.org header.s=default header.b=eld/jDOV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751814AbeB0GML (ORCPT + 99 others); Tue, 27 Feb 2018 01:12:11 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:55394 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750981AbeB0GMK (ORCPT ); Tue, 27 Feb 2018 01:12:10 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B24D660854; Tue, 27 Feb 2018 06:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519711929; bh=Z17zEb1k9xgBZEjfcXdITcy/i0IbxZllc0km4Jml4/c=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=NMt4d1aFYx0YvZGXuMg15f9dWUjc/4Q11yiUIangSrEH4ELtmRfThkil3GfLbQBvO ji7b1SQfH6ofpkjtWVL5lNnlyP7F98ie9d0BFeKwXjU6MHYvuoRMHESMBKQdoT/58H bzBfyCgiwBWsItYg/FNEeIjndcdEgryawk2Ao+k0= 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 mail.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 9E20B602BA; Tue, 27 Feb 2018 06:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1519711928; bh=Z17zEb1k9xgBZEjfcXdITcy/i0IbxZllc0km4Jml4/c=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=eld/jDOVQ829HVXlOEh3P/q11z+RzBbi6yTpCG9ViMNS7/IeuHClgKY7NPtDMEIhA QDWhbAOMeB2MhkxjwIf0D53atVWvRyGyUQfra5xIFc62700RLSE0yjCSaRpq6TmTea w2pxDLZAFhufzvnOZeoyvq8TCr2IYAZ5r1DTHlHA= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 27 Feb 2018 11:42:08 +0530 From: poza@codeaurora.org To: Bjorn Helgaas Cc: 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 v11 5/7] PCI/AER: Unify aer error defines at single space In-Reply-To: <20180224153621.GS14632@bhelgaas-glaptop.roam.corp.google.com> References: <1519374244-20539-1-git-send-email-poza@codeaurora.org> <1519374244-20539-6-git-send-email-poza@codeaurora.org> <20180224153621.GS14632@bhelgaas-glaptop.roam.corp.google.com> Message-ID: <72ebd20432dacac5d494eae3006bc575@codeaurora.org> X-Sender: poza@codeaurora.org User-Agent: Roundcube Webmail/1.2.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> >> 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" > > 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 >> >> #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 >> -- >> 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. >>