From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9F77C4741F for ; Wed, 30 Sep 2020 22:15:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C131206F7 for ; Wed, 30 Sep 2020 22:15:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=intel-com.20150623.gappssmtp.com header.i=@intel-com.20150623.gappssmtp.com header.b="gJ/7u5pC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730957AbgI3WPl (ORCPT ); Wed, 30 Sep 2020 18:15:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730258AbgI3WPl (ORCPT ); Wed, 30 Sep 2020 18:15:41 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3726CC0613D0 for ; Wed, 30 Sep 2020 15:15:41 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id d13so2122145pgl.6 for ; Wed, 30 Sep 2020 15:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IWHKwPVIVcemGc90Z3hO6SXFiJGRIxohxqpgqu+BDQQ=; b=gJ/7u5pCaguTSJVI/m5PGfLSSeWSoVDx7vy1UpGyoQ7pwlTCtttUSj5HGR/+F8Cksc tOjyhH4jyVwNT70X005zV5RS4hDbW3FlcUHR+87Io5OqCzHxgYNRxOFqmX3+FkECICTW qzMMuaMqYak9bVgcWyLvkedlQPX04KF2jLp/zU5wHFwqovp/H8CsZHjgWRlvaPRV7sQ4 sj6TLlWek1h4wK4bKwKAmivgU6awM3NTSjTpUdvvCJH+4BDZiIMyg6MzgYrXlEntkHIe yWLT4AaXl1RSKWLcH0Dy68BYSktw2GPm2kTrUq1h5fpTwZimBNnEeprBLP++5sxHUT1E MeGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IWHKwPVIVcemGc90Z3hO6SXFiJGRIxohxqpgqu+BDQQ=; b=fIcOafnDQPyuqoMzgWVGx45NBoXxhYDDjR9nds2W2ejB9egAc+Ye6pFmF/ieUIKvaj C0tB9ezl1lSZrXUVPIloK2yU/xpoxI/oOprT2UhvxoQ3qGP1b5yzUgD5L4uyZmX73IhP hYgdcY5BoFCdslIYIxsnnI9qVW7mPhPg7GQahmEW/4Yohmltt8ipnPLteAoCTeBh4BdM d31Wv4J7aB6IhyRYtvEn8DLfr98/eYLrz4DBjowL4LFzpArVYT2CvR0o69XZU0nZc7FO MeFn0JZ1G7KcO5rnGQBlKr/zERMW7fHjC6SPo2EZRxdX+CG7dwn3oOHRONP9rpqHAkrE hKeg== X-Gm-Message-State: AOAM532cKnZCEfcGWUxRTMu9ienQQmBeSbZQq5DLXfOhlk/zLJIGriW/ XYoFnbO2an00CgCAEhFRTTlMfM4WQEfQLg== X-Google-Smtp-Source: ABdhPJyvRxRvtFTD0F5SDQByJMS5583bWfh8XuJnv06pKbHckMxby2B1VSunAcrin2ZooNsQBPvTXw== X-Received: by 2002:a17:902:70c9:b029:d2:950a:d82e with SMTP id l9-20020a17090270c9b02900d2950ad82emr4395419plt.26.1601504140590; Wed, 30 Sep 2020 15:15:40 -0700 (PDT) Received: from [10.212.76.164] (fmdmzpr04-ext.fm.intel.com. [192.55.55.39]) by smtp.gmail.com with ESMTPSA id c1sm3596523pfj.219.2020.09.30.15.15.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Sep 2020 15:15:39 -0700 (PDT) From: "Sean V Kelley" To: "Sean V Kelley" Cc: bhelgaas@google.com, Jonathan.Cameron@huawei.com, rafael.j.wysocki@intel.com, ashok.raj@intel.com, tony.luck@intel.com, sathyanarayanan.kuppuswamy@intel.com, qiuxu.zhuo@intel.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v7 03/13] PCI/RCEC: Cache RCEC capabilities in pci_init_capabilities() Date: Wed, 30 Sep 2020 15:15:36 -0700 X-Mailer: MailMate (1.13.2r5673) Message-ID: In-Reply-To: <20200930215820.1113353-4-seanvk.dev@oregontracks.org> References: <20200930215820.1113353-1-seanvk.dev@oregontracks.org> <20200930215820.1113353-4-seanvk.dev@oregontracks.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 30 Sep 2020, at 14:58, Sean V Kelley wrote: > From: Sean V Kelley > > Extend support for Root Complex Event Collectors by decoding and > caching the RCEC Endpoint Association Extended Capabilities when > enumerating. Use that cached information for later error source > reporting. See PCI Express Base Specification, version 5.0-1, > section 7.9.10. > > Suggested-by: Bjorn Helgaas > Co-developed-by: Qiuxu Zhuo > Signed-off-by: Qiuxu Zhuo > Signed-off-by: Sean V Kelley > --- > drivers/pci/pci.h | 17 +++++++++++ > drivers/pci/pcie/Makefile | 2 +- > drivers/pci/pcie/rcec.c | 59 > +++++++++++++++++++++++++++++++++++++++ > drivers/pci/probe.c | 2 ++ > include/linux/pci.h | 4 +++ > 5 files changed, 83 insertions(+), 1 deletion(-) > create mode 100644 drivers/pci/pcie/rcec.c > > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > index fa12f7cbc1a0..88e27a98def5 100644 > --- a/drivers/pci/pci.h > +++ b/drivers/pci/pci.h > @@ -449,6 +449,15 @@ int aer_get_device_error_info(struct pci_dev > *dev, struct aer_err_info *info); > void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); > #endif /* CONFIG_PCIEAER */ > > +#ifdef CONFIG_PCIEPORTBUS > +/* Cached RCEC Endpoint Association */ > +struct rcec_ea { > + u8 nextbusn; > + u8 lastbusn; > + u32 bitmap; > +}; > +#endif > + > #ifdef CONFIG_PCIE_DPC > void pci_save_dpc_state(struct pci_dev *dev); > void pci_restore_dpc_state(struct pci_dev *dev); > @@ -461,6 +470,14 @@ static inline void pci_restore_dpc_state(struct > pci_dev *dev) {} > static inline void pci_dpc_init(struct pci_dev *pdev) {} > #endif > > +#ifdef CONFIG_PCIEPORTBUS > +int pci_rcec_init(struct pci_dev *dev); > +void pci_rcec_exit(struct pci_dev *dev); > +#else > +static inline int pci_rcec_init(struct pci_dev *dev) {return 0;} Will fix the spacing here on the inline. That’s what I get for a last minute change of void to int for return… Sean > +static inline void pci_rcec_exit(struct pci_dev *dev) {} > +#endif > + > #ifdef CONFIG_PCI_ATS > /* Address Translation Service */ > void pci_ats_init(struct pci_dev *dev); > diff --git a/drivers/pci/pcie/Makefile b/drivers/pci/pcie/Makefile > index 68da9280ff11..d9697892fa3e 100644 > --- a/drivers/pci/pcie/Makefile > +++ b/drivers/pci/pcie/Makefile > @@ -2,7 +2,7 @@ > # > # Makefile for PCI Express features and port driver > > -pcieportdrv-y := portdrv_core.o portdrv_pci.o err.o > +pcieportdrv-y := portdrv_core.o portdrv_pci.o err.o rcec.o > > obj-$(CONFIG_PCIEPORTBUS) += pcieportdrv.o > > diff --git a/drivers/pci/pcie/rcec.c b/drivers/pci/pcie/rcec.c > new file mode 100644 > index 000000000000..da02b0af442d > --- /dev/null > +++ b/drivers/pci/pcie/rcec.c > @@ -0,0 +1,59 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Root Complex Event Collector Support > + * > + * Authors: > + * Sean V Kelley > + * Qiuxu Zhuo > + * > + * Copyright (C) 2020 Intel Corp. > + */ > + > +#include > +#include > +#include > + > +#include "../pci.h" > + > +int pci_rcec_init(struct pci_dev *dev) > +{ > + struct rcec_ea *rcec_ea; > + u32 rcec, hdr, busn; > + u8 ver; > + > + /* Only for Root Complex Event Collectors */ > + if (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC) > + return 0; > + > + rcec = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_RCEC); > + if (!rcec) > + return 0; > + > + rcec_ea = kzalloc(sizeof(*rcec_ea), GFP_KERNEL); > + if (!rcec_ea) > + return -ENOMEM; > + dev->rcec_ea = rcec_ea; > + > + pci_read_config_dword(dev, rcec + PCI_RCEC_RCIEP_BITMAP, > &rcec_ea->bitmap); > + > + /* Check whether RCEC BUSN register is present */ > + pci_read_config_dword(dev, rcec, &hdr); > + ver = PCI_EXT_CAP_VER(hdr); > + if (ver < PCI_RCEC_BUSN_REG_VER) { > + /* Avoid later ver check by setting nextbusn */ > + rcec_ea->nextbusn = 0xff; > + return 0; > + } > + > + pci_read_config_dword(dev, rcec + PCI_RCEC_BUSN, &busn); > + rcec_ea->nextbusn = PCI_RCEC_BUSN_NEXT(busn); > + rcec_ea->lastbusn = PCI_RCEC_BUSN_LAST(busn); > + > + return 0; > +} > + > +void pci_rcec_exit(struct pci_dev *dev) > +{ > + kfree(dev->rcec_ea); > + dev->rcec_ea = NULL; > +} > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 03d37128a24f..25f01f841f2d 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -2201,6 +2201,7 @@ static void pci_configure_device(struct pci_dev > *dev) > static void pci_release_capabilities(struct pci_dev *dev) > { > pci_aer_exit(dev); > + pci_rcec_exit(dev); > pci_vpd_release(dev); > pci_iov_release(dev); > pci_free_cap_save_buffers(dev); > @@ -2400,6 +2401,7 @@ static void pci_init_capabilities(struct pci_dev > *dev) > pci_ptm_init(dev); /* Precision Time Measurement */ > pci_aer_init(dev); /* Advanced Error Reporting */ > pci_dpc_init(dev); /* Downstream Port Containment */ > + pci_rcec_init(dev); /* Root Complex Event Collector */ > > pcie_report_downtraining(dev); > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 835530605c0d..2290439e8bc0 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -304,6 +304,7 @@ struct pcie_link_state; > struct pci_vpd; > struct pci_sriov; > struct pci_p2pdma; > +struct rcec_ea; > > /* The pci_dev structure describes PCI devices */ > struct pci_dev { > @@ -326,6 +327,9 @@ struct pci_dev { > #ifdef CONFIG_PCIEAER > u16 aer_cap; /* AER capability offset */ > struct aer_stats *aer_stats; /* AER stats for this device */ > +#endif > +#ifdef CONFIG_PCIEPORTBUS > + struct rcec_ea *rcec_ea; /* RCEC cached endpoint association */ > #endif > u8 pcie_cap; /* PCIe capability offset */ > u8 msi_cap; /* MSI capability offset */ > -- > 2.28.0