Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1483383pxk; Fri, 18 Sep 2020 13:52:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx49jPL8Omtjxzjhz+E1eYbwENT84tpVDYfbffPs6lXaUGKyfJQ4PRfYwGqEsGAyo8nL9eu X-Received: by 2002:a17:906:4093:: with SMTP id u19mr38460765ejj.520.1600462372816; Fri, 18 Sep 2020 13:52:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600462372; cv=none; d=google.com; s=arc-20160816; b=gwLziy2N3ZFn3K6qYf5qWtJ00KL4s6bhGbl5ku2K0R9NpaNh0A22VowsrkJRdftDH3 et9hEm+IrNtrm+EJe38E49WEpP40oLE/VDiBAHuWolxnU/4jQzctn1UrUocrwUrtH7vw BMjM9jrqfahVZ/Sl6d64WCCwYhGbNm+3nIQ/IQT1PRKQx9EY+1X1yqodfCi1U9GWQNGs 7ZJvrdLsF3Oa07Txc8NE8r6kUU+aZLUA2OdrlnRd5WtgMamimE23fo0OKUu+7n+sTaFi z5sV1WsYgh/+k+/ApIaCalVA2MXKDMklTC25437i/d9HhsNqt2/5kxv3iyqsE+6CrhC2 Dd2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=j24aNdWHhE/SuhzUJqqEFEwquqKUkDcUQLHHbTRPC5Y=; b=L7KjuaZjg4EP49ZMkA191INrZHGIMd3ZX0jDQjFIRECES7rIbYs9V0QHBm3HBeT9jU msk287kCHflYjTOLflCkW1HVr39pcp0PPS9ZXHIMJUK6wkfdDN32rve3gEW9tqcWTbps RuEk7drchtksEDXEkYTl34U2YMG64Tb1FbEhqrIOJMLSn/WhG0vAR2gK/cJ6zDY8gWAg RRyKh6Wz5Wc0OWfut7ChH83zxeEOkwR/7cbZ7sGtMzI9vfGFuOsoOxBd2ucrbHFGlyC8 Mgn8chOyE7koFXXnWHhDmyfxTd+9F25wATbMwS7QQJmKU4OAH/HJcKISnA8y3JXwpYis E/yA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h4si2948929edv.181.2020.09.18.13.52.29; Fri, 18 Sep 2020 13:52:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726483AbgIRUv3 (ORCPT + 99 others); Fri, 18 Sep 2020 16:51:29 -0400 Received: from mga01.intel.com ([192.55.52.88]:61896 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgIRUv3 (ORCPT ); Fri, 18 Sep 2020 16:51:29 -0400 IronPort-SDR: 4g3aussO1ZalyB7XXNWmF1kjIYAz2laGTNqHIZJluWgDnCHH9ZqE/n4yeB/GbfakABxOMo6cf9 cS+ejq+Hqk7A== X-IronPort-AV: E=McAfee;i="6000,8403,9748"; a="178120886" X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="178120886" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 13:46:29 -0700 IronPort-SDR: yD79aAUkhO3JyBscrbBfJM5n0e9C/DKS0LLR1y+a8ceYrpWgYaC/5rb2Y5mZKrqHPtOzfwouly eXwmD/aQuYew== X-IronPort-AV: E=Sophos;i="5.77,274,1596524400"; d="scan'208";a="484366832" Received: from xsunzhou-mobl.amr.corp.intel.com (HELO arch-ashland-svkelley.intel.com) ([10.251.153.106]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2020 13:46:29 -0700 From: Sean V Kelley To: 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 Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Sean V Kelley Subject: [PATCH v5 06/10] PCI/RCEC: Add pcie_link_rcec() to associate RCiEPs Date: Fri, 18 Sep 2020 13:45:59 -0700 Message-Id: <20200918204603.62100-7-sean.v.kelley@intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200918204603.62100-1-sean.v.kelley@intel.com> References: <20200918204603.62100-1-sean.v.kelley@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A Root Complex Event Collector provides support for terminating error and PME messages from associated RCiEPs. Make use of the RCEC Endpoint Association Extended Capability to identify associated RCiEPs. Link the associated RCiEPs as the RCECs are enumerated. Co-developed-by: Qiuxu Zhuo Signed-off-by: Qiuxu Zhuo Signed-off-by: Sean V Kelley --- drivers/pci/pci.h | 2 + drivers/pci/pcie/portdrv_pci.c | 3 ++ drivers/pci/pcie/rcec.c | 96 ++++++++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 4 files changed, 102 insertions(+) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 7b547fc3679a..ddb5872466fb 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -474,9 +474,11 @@ static inline void pci_dpc_init(struct pci_dev *pdev) {} #ifdef CONFIG_PCIEPORTBUS void pci_rcec_init(struct pci_dev *dev); void pci_rcec_exit(struct pci_dev *dev); +void pcie_link_rcec(struct pci_dev *rcec); #else static inline void pci_rcec_init(struct pci_dev *dev) {} static inline void pci_rcec_exit(struct pci_dev *dev) {} +static inline void pcie_link_rcec(struct pci_dev *rcec) {} #endif #ifdef CONFIG_PCI_ATS diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 4d880679b9b1..dbeb0155c2c3 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c @@ -110,6 +110,9 @@ static int pcie_portdrv_probe(struct pci_dev *dev, (pci_pcie_type(dev) != PCI_EXP_TYPE_RC_EC))) return -ENODEV; + if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC) + pcie_link_rcec(dev); + status = pcie_port_device_register(dev); if (status) return status; diff --git a/drivers/pci/pcie/rcec.c b/drivers/pci/pcie/rcec.c index 519ae086ff41..5630480a6659 100644 --- a/drivers/pci/pcie/rcec.c +++ b/drivers/pci/pcie/rcec.c @@ -17,6 +17,102 @@ #include "../pci.h" +struct walk_rcec_data { + struct pci_dev *rcec; + int (*user_callback)(struct pci_dev *dev, void *data); + void *user_data; +}; + +static bool rcec_assoc_rciep(struct pci_dev *rcec, struct pci_dev *rciep) +{ + unsigned long bitmap = rcec->rcec_ext->bitmap; + unsigned int devn; + + /* An RCiEP found on bus in range */ + if (rcec->bus->number != rciep->bus->number) + return true; + + /* Same bus, so check bitmap */ + for_each_set_bit(devn, &bitmap, 32) + if (devn == rciep->devfn) + return true; + + return false; +} + +static int link_rcec_helper(struct pci_dev *dev, void *data) +{ + struct walk_rcec_data *rcec_data = data; + struct pci_dev *rcec = rcec_data->rcec; + + if ((pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) && rcec_assoc_rciep(rcec, dev)) { + dev->rcec = rcec; + pci_dbg(dev, "PME & error events reported via %s\n", pci_name(rcec)); + } + + return 0; +} + +void walk_rcec(int (*cb)(struct pci_dev *dev, void *data), void *userdata) +{ + struct walk_rcec_data *rcec_data = userdata; + struct pci_dev *rcec = rcec_data->rcec; + u8 nextbusn, lastbusn; + struct pci_bus *bus; + unsigned int bnr; + + if (!rcec->rcec_cap) + return; + + /* Walk own bus for bitmap based association */ + pci_walk_bus(rcec->bus, cb, rcec_data); + + /* Check whether RCEC BUSN register is present */ + if (rcec->rcec_ext->ver < PCI_RCEC_BUSN_REG_VER) + return; + + nextbusn = rcec->rcec_ext->nextbusn; + lastbusn = rcec->rcec_ext->lastbusn; + + /* All RCiEP devices are on the same bus as the RCEC */ + if (nextbusn == 0xff && lastbusn == 0x00) + return; + + for (bnr = nextbusn; bnr <= lastbusn; bnr++) { + /* No association indicated (PCIe 5.0-1, 7.9.10.3) */ + if (bnr == rcec->bus->number) + continue; + + bus = pci_find_bus(pci_domain_nr(rcec->bus), bnr); + if (!bus) + continue; + + /* Find RCiEP devices on the given bus ranges */ + pci_walk_bus(bus, cb, rcec_data); + } +} + +/** + * pcie_link_rcec - Link RCiEP devices associating with RCEC. + * @rcec RCEC whose RCiEP devices should be linked. + * + * Link the given RCEC to each RCiEP device found. + * + */ +void pcie_link_rcec(struct pci_dev *rcec) +{ + struct walk_rcec_data rcec_data; + + if (!rcec->rcec_cap) + return; + + rcec_data.rcec = rcec; + rcec_data.user_callback = NULL; + rcec_data.user_data = NULL; + + walk_rcec(link_rcec_helper, &rcec_data); +} + void pci_rcec_init(struct pci_dev *dev) { u32 rcec, hdr, busn; diff --git a/include/linux/pci.h b/include/linux/pci.h index 5c5c4eb642b6..ad382a9484ea 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -330,6 +330,7 @@ struct pci_dev { #ifdef CONFIG_PCIEPORTBUS u16 rcec_cap; /* RCEC capability offset */ struct rcec_ext *rcec_ext; /* RCEC cached assoc. endpoint extended capabilities */ + struct pci_dev *rcec; /* Associated RCEC device */ #endif u8 pcie_cap; /* PCIe capability offset */ u8 msi_cap; /* MSI capability offset */ -- 2.28.0