From patchwork Sun Mar 23 09:31:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Ming X-Patchwork-Id: 14026473 Received: from sender4-pp-o94.zoho.com (sender4-pp-o94.zoho.com [136.143.188.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EBFF44C7C; Sun, 23 Mar 2025 09:34:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.94 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742722445; cv=pass; b=RpHlULlR1AmMJPOoZEHHkSLBqcoX25nQIF1UbngW5Tib+Wr1CXLFLGnml1BRnJzDDAAqAEBv7tOnB79xDoUBrG7NWlrbkhqf1tEkGRBxg/hhXuCy58r4nsTuq8sC1TBOUg2EXXtVofSAfg7DzcRaRQcuF1SwQwAjTXwN5qBG11s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742722445; c=relaxed/simple; bh=tiwSqqhU97+P/pZXJ5bsuvt5+gojkBlYhAQQZZeUjEc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TPuqWeYjvz7X2JKH9UUujD9HTi07/T3JZ+eSYm/uc5sz5dareObo6ToI28V0/KXGR8RJJa8wsf3NJmtRHF7gT1U9DF+lXlalR5YDXw/HrWlJNM9sMyddcT35XWZAsNtkp04G2YGHkd6WyZiw0QDvvecPS6uKi7kGQJQU/LydQj8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com; spf=pass smtp.mailfrom=zohomail.com; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b=Il/SzoQw; arc=pass smtp.client-ip=136.143.188.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zohomail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b="Il/SzoQw" ARC-Seal: i=1; a=rsa-sha256; t=1742722301; cv=none; d=zohomail.com; s=zohoarc; b=cN+KGQ4g+TTxm4AP8ttD2DOhN3tx9OI8IPVSikJeUBrl5VjIPssloL8DWQnG5YlR6TZl3eg6JZgkis25w9EEBmSSe4kE5W64OOdZqawLlvfhNc6kOrRpLRWBcN+2BTjCX6EZ9hMZHYaCSZv7z/ExangTNX30Mha4zAg/49S9kew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742722301; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=o9601PbxCzI05wBpWnhCTayb7tVKJyyt4KV5MPhpKH8=; b=B1O74MZ2kBLHyH32FcRvSiikc+XVfVsw3Axk2QwO5z6eQEuoOXv+AcBY0DQmnURtxL1mWHK2ravNej+iJ83TNpkZSqHnMqeGKfw28BheDXHQ3M1peGsapTK1LVVOGO1VpVfisyAduHVw/VPV+r+zM2osVgzCYA1px16Kgj5K8+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zohomail.com; spf=pass smtp.mailfrom=ming.li@zohomail.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1742722301; s=zm2022; d=zohomail.com; i=ming.li@zohomail.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID:Reply-To; bh=o9601PbxCzI05wBpWnhCTayb7tVKJyyt4KV5MPhpKH8=; b=Il/SzoQwzJAhhlETvik4CYXZW5yg0FZgpopcCXjsCdWdKNCngaIUHBk9OYlfpQju VS6u3yfuaHg5+B7+BBH/UKCm+fKEf5YOE6beDTwokKqhTwt1QTpkoIafw8XC0khZ8bJ KXtJ4QEEHhG6LqW47VW0iP6u39RX5Psnmedx8QC8= Received: by mx.zohomail.com with SMTPS id 1742722299718726.7777804781059; Sun, 23 Mar 2025 02:31:39 -0700 (PDT) From: Li Ming To: dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com Cc: linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Li Ming , Jonathan Cameron Subject: [PATCH v2 1/3] cxl/core: Fix caching dport GPF DVSEC issue Date: Sun, 23 Mar 2025 17:31:08 +0800 Message-Id: <20250323093110.233040-2-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250323093110.233040-1-ming.li@zohomail.com> References: <20250323093110.233040-1-ming.li@zohomail.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Feedback-ID: rr0801122703d781f4e69c7554d54b01780000e24019ae35fd6d907faa59a108f52f8692472a50c22d5dd5d2:zu0801122729b53c49b6a1ca58f36afa72000038ce6b46a57f20ab8c612e4b897ae0d1645c6348acf3c9faa3:rf0801122de5d741d6409889408286d8bc0000464c6c384d9e9363ee361fa3eca2360c6cc3dcca85bba997b793e61c457fe2:ZohoMail X-ZohoMailClient: External Per Table 8-2 in CXL r3.2 section 8.1.1 and CXL r3.2 section 8.1.6, only CXL Downstream switch ports and CXL root ports have GPF DVSEC for CXL Port(DVSEC ID 04h). CXL subsystem has a gpf_dvsec in struct cxl_port which is used to cache the offset of a GPF DVSEC in PCIe configuration space. It will be updated during the first EP attaching to the cxl_port, so the gpf_dvsec can only cache the GPF DVSEC offset of the dport which the first EP is under. Will not have chance to update it during other EPs attaching. That means CXL subsystem will use the same GPF DVSEC offset for all dports under the port, it will be a problem if the GPF DVSEC offset cached in cxl_port is not the right offset for a dport. Moving gpf_dvsec from struct cxl_port to struct cxl_dport, make every cxl dport has their own GPF DVSEC offset caching, and each cxl dport uses its own GPF DVSEC offset for GPF DVSEC accessing. Fixes: a52b6a2c1c99 ("cxl/pci: Support Global Persistent Flush (GPF)") Signed-off-by: Li Ming Reviewed-by: Davidlohr Bueso Reviewed-by: Jonathan Cameron Reviewed-by: Dan Williams Tested-by: Davidlohr Bueso --- drivers/cxl/core/core.h | 2 +- drivers/cxl/core/pci.c | 16 ++++++++-------- drivers/cxl/core/port.c | 2 +- drivers/cxl/cxl.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 15699299dc11..17b692eb3257 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -119,7 +119,7 @@ int cxl_port_get_switch_dport_bandwidth(struct cxl_port *port, int cxl_ras_init(void); void cxl_ras_exit(void); -int cxl_gpf_port_setup(struct device *dport_dev, struct cxl_port *port); +int cxl_gpf_port_setup(struct cxl_dport *dport); int cxl_acpi_get_extended_linear_cache_size(struct resource *backing_res, int nid, resource_size_t *size); diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index 96fecb799cbc..aab0a505d527 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -1128,26 +1128,26 @@ static int update_gpf_port_dvsec(struct pci_dev *pdev, int dvsec, int phase) return rc; } -int cxl_gpf_port_setup(struct device *dport_dev, struct cxl_port *port) +int cxl_gpf_port_setup(struct cxl_dport *dport) { struct pci_dev *pdev; - if (!port) + if (!dport) return -EINVAL; - if (!port->gpf_dvsec) { + if (!dport->gpf_dvsec) { int dvsec; - dvsec = cxl_gpf_get_dvsec(dport_dev, true); + dvsec = cxl_gpf_get_dvsec(dport->dport_dev, true); if (!dvsec) return -EINVAL; - port->gpf_dvsec = dvsec; + dport->gpf_dvsec = dvsec; } - pdev = to_pci_dev(dport_dev); - update_gpf_port_dvsec(pdev, port->gpf_dvsec, 1); - update_gpf_port_dvsec(pdev, port->gpf_dvsec, 2); + pdev = to_pci_dev(dport->dport_dev); + update_gpf_port_dvsec(pdev, dport->gpf_dvsec, 1); + update_gpf_port_dvsec(pdev, dport->gpf_dvsec, 2); return 0; } diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 0fd6646c1a2e..726bd4a7de27 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1678,7 +1678,7 @@ int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd) if (rc && rc != -EBUSY) return rc; - cxl_gpf_port_setup(dport_dev, port); + cxl_gpf_port_setup(dport); /* Any more ports to add between this one and the root? */ if (!dev_is_cxl_root_child(&port->dev)) diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index be8a7dc77719..2d81ccd83916 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -592,7 +592,6 @@ struct cxl_dax_region { * @cdat: Cached CDAT data * @cdat_available: Should a CDAT attribute be available in sysfs * @pci_latency: Upstream latency in picoseconds - * @gpf_dvsec: Cached GPF port DVSEC */ struct cxl_port { struct device dev; @@ -616,7 +615,6 @@ struct cxl_port { } cdat; bool cdat_available; long pci_latency; - int gpf_dvsec; }; /** @@ -664,6 +662,7 @@ struct cxl_rcrb_info { * @regs: Dport parsed register blocks * @coord: access coordinates (bandwidth and latency performance attributes) * @link_latency: calculated PCIe downstream latency + * @gpf_dvsec: Cached GPF port DVSEC */ struct cxl_dport { struct device *dport_dev; @@ -675,6 +674,7 @@ struct cxl_dport { struct cxl_regs regs; struct access_coordinate coord[ACCESS_COORDINATE_MAX]; long link_latency; + int gpf_dvsec; }; /** From patchwork Sun Mar 23 09:31:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Ming X-Patchwork-Id: 14026474 Received: from sender4-pp-o94.zoho.com (sender4-pp-o94.zoho.com [136.143.188.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32F4E20010A; Sun, 23 Mar 2025 09:34:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.94 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742722460; cv=pass; b=q3sO3OtaCPBPFW1PLfPXHMiH/XRDVaJcOfD90hs9/DUl03frnYn8cILw8of1U6xTo20uw0AHomv2zXFBiXTfmVlLyESgloj19sMkfsszdiKX3yBbmryT5NkvUzJOaeyAWNIY6s+oLWcTbz4v/M0nrX+kPVqm/3+MD5liqKWzrjw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742722460; c=relaxed/simple; bh=ShRA8ZBoRFnVe0Wl7B/SZm4cKibBbHPKuwpH1fR39Mo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pEN5Rz6X+/A5BClXjuvUy8WXKbt0p/eM7jTJadNJBwOkWc05NfwIA99VDQyy26pKZyHypTESSPIiIiMaLI16B8Ix/WV8BxAbriZOYn5tZqkbMgOy7LZr2I3eAJJztme87zWu+jQ9qmTT0QthJK3PO4d7MX+18WwcZt5JPo4tDm0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com; spf=pass smtp.mailfrom=zohomail.com; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b=VsPSyc/z; arc=pass smtp.client-ip=136.143.188.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zohomail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b="VsPSyc/z" ARC-Seal: i=1; a=rsa-sha256; t=1742722309; cv=none; d=zohomail.com; s=zohoarc; b=cbNvGfxBKw3j6fDb6u44jRtg2QyJaTnamxrQWs2J9OCvNxjwL0ueXQ5vKpEeTvVhEMYP+BRw5PtJAZpkCH24sifI2hLdzFiEX7VGl8BjW+vzNrVk6Y4LHmTzzld9vYANHl3azyhsgLshnfomLokKHa09qAvJlRgQC8JwU5ADWEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742722309; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZLARjwAi2392p8qFoWGnePnOKEDFNhB7tQ3qGWk+kKE=; b=Y/R9Rxzg3pX52JY4+BEGy9Ph+0ul4MlqVmRd6oICOCpNeD34PzGuGSLZIvNCgHbiEwqjtdPBjP5kW6jbXLsCtdL9YWYpSd7TUvvJVJDmTo4cRaGcWRx7NKJXzd6/OoOhsrLlA2Ik4U2RAQEOU0tFfOK1676KRwYVXhPLHHNAOoM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zohomail.com; spf=pass smtp.mailfrom=ming.li@zohomail.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1742722309; s=zm2022; d=zohomail.com; i=ming.li@zohomail.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID:Reply-To; bh=ZLARjwAi2392p8qFoWGnePnOKEDFNhB7tQ3qGWk+kKE=; b=VsPSyc/zZFU7Fpaj3JLnE2wD3mxqU3JnUwUEn43/lxlu0gtbkEP0pbR/gvyAzwd/ jxfvPw3G3T6FHeAm2YHpCYY8htSV+iA9WvV2502O9sNCNztlAof28hZVPWnem1Ta37C CsW1fXioG6I6PJks5An7dBmguVy0sTfHIwO24fvU= Received: by mx.zohomail.com with SMTPS id 1742722308773820.132550490878; Sun, 23 Mar 2025 02:31:48 -0700 (PDT) From: Li Ming To: dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com Cc: linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Li Ming , Jonathan Cameron Subject: [PATCH v2 2/3] cxl/pci: Update Port GPF timeout only when the first EP attaching Date: Sun, 23 Mar 2025 17:31:09 +0800 Message-Id: <20250323093110.233040-3-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250323093110.233040-1-ming.li@zohomail.com> References: <20250323093110.233040-1-ming.li@zohomail.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Feedback-ID: rr080112272c91780d6c5df78b68f6195f00000d8cc653897a034d35ae8cb727c3355149c8eb984fcbc587e5:zu0801122770b2788d9b14d8742fed872f0000ea9ade01511b63d93c673046a85b8c558303d8404a7772c6c4:rf0801122dc6eafe463c03ceba032e5d93000090526bea9f4fe57b589f3d522acae1d80418a58ff590f9b44663410d5f2f21:ZohoMail X-ZohoMailClient: External update_gpf_port_dvsec() is used to update GPF Phase timeout, if a CXL switch is under a CXL root port, update_gpf_port_dvsec() will be invoked on the CXL root port when each cxl memory device under the CXL switch is attaching. It is enough to be invoked once, others are redundant. When the first EP attaching, it always triggers its ancestor dports to locate their own Port GPF DVSEC. The change is that invoking update_gpf_port_dvsec() on these ancestor dports after ancestor dport locating a Port GPF DVSEC. It guarantees that update_gpf_port_dvsec() is invoked on a dport only happens during the first EP attaching. Signed-off-by: Li Ming Reviewed-by: Davidlohr Bueso Reviewed-by: Jonathan Cameron Reviewed-by: Dan Williams Tested-by: Davidlohr Bueso --- drivers/cxl/core/pci.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index aab0a505d527..edbdaf1681e8 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -1130,12 +1130,11 @@ static int update_gpf_port_dvsec(struct pci_dev *pdev, int dvsec, int phase) int cxl_gpf_port_setup(struct cxl_dport *dport) { - struct pci_dev *pdev; - if (!dport) return -EINVAL; if (!dport->gpf_dvsec) { + struct pci_dev *pdev; int dvsec; dvsec = cxl_gpf_get_dvsec(dport->dport_dev, true); @@ -1143,11 +1142,10 @@ int cxl_gpf_port_setup(struct cxl_dport *dport) return -EINVAL; dport->gpf_dvsec = dvsec; + pdev = to_pci_dev(dport->dport_dev); + update_gpf_port_dvsec(pdev, dport->gpf_dvsec, 1); + update_gpf_port_dvsec(pdev, dport->gpf_dvsec, 2); } - pdev = to_pci_dev(dport->dport_dev); - update_gpf_port_dvsec(pdev, dport->gpf_dvsec, 1); - update_gpf_port_dvsec(pdev, dport->gpf_dvsec, 2); - return 0; } From patchwork Sun Mar 23 09:31:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Ming X-Patchwork-Id: 14026475 Received: from sender4-pp-o94.zoho.com (sender4-pp-o94.zoho.com [136.143.188.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F766201006; Sun, 23 Mar 2025 09:34:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.94 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742722474; cv=pass; b=ScrPxWK3X6BeNuer70dYSYFC0/GgomvnL7u5J9fUWR78FSlUDzT206AOUBA7Ecy9uaYW08+ht3DsTKs4csGgQRXHlaIBATFvknv3P3rMVubWW2fn0FKyKGz/pAJzL+NhRr4VhYww7eb1fJpjxxgNHTvorm/opABJMbS/IrVfeFk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742722474; c=relaxed/simple; bh=3MTYhQELhhmoAHr2itXBrGDEDVYaZP97mblWMNS7zPg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AKgrY/Fa4hLqwS6/MAmkifWg0oazN5/KZMYLEsp3IzbTX500hhOfq7GmvnMqWnRMDTzC9LpT+09iUchY4jOHuCkfzCINY+8cbPDZxvgTR0PAKH7LK480Wqf+NCi7exUfhqB6rTVpxVUyd4nmU6QgjbtduKyzNOOViv+qU2vfgV8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com; spf=pass smtp.mailfrom=zohomail.com; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b=F8LcahXK; arc=pass smtp.client-ip=136.143.188.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zohomail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b="F8LcahXK" ARC-Seal: i=1; a=rsa-sha256; t=1742722319; cv=none; d=zohomail.com; s=zohoarc; b=a8QfsJuyFZcgRtuAuuGMwEzoZMYkq9k7xjJvNignIvulGwR3T5w8WxeUjSgHdD/D0XLllMY0cd5AWVBXf8vzG2H5YA8ix/O9/4AojV6BR1NVLGtxtzHxwn/9+hZ7AmNm750/4JyVDucmqWSlwD9VNZlBqGiLk6yZ7ruMY1OXDkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742722319; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=uYKpGB1btXham6jc3sUGgsKSa89IKrQ8n0M2pm4m9A4=; b=n8jCbMqR9M/vylpBsr0JZgOwe/0h1UMgwNUPdHz87QL4aTmeWqye3LW48ZYPANdBJCKEt3NJkDG/tZbm7o5ZegvgQuoPjbMr1MaBm8bO6VrVezkZBons72/zpDVufnHpc71bdHruo9RIFdbgXQURtp8qAir/YjO3WSRB4Z5fdjE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zohomail.com; spf=pass smtp.mailfrom=ming.li@zohomail.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1742722319; s=zm2022; d=zohomail.com; i=ming.li@zohomail.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID:Reply-To; bh=uYKpGB1btXham6jc3sUGgsKSa89IKrQ8n0M2pm4m9A4=; b=F8LcahXKKlinpMnD40o2pEhUWMR1uAplXSvmq0tC4kLXOfxpnxFZosZwYDjOFCjB M33LYqGzyzrC4JC4RLGz+qBn8qLMooR9geMNa976QpinZLL1u2t9ejsHvGdb3Galmce ETi+3L+38tTTyXHl3olKSixfXzG/DvqVD4aDWqrc= Received: by mx.zohomail.com with SMTPS id 1742722317848132.1813064848485; Sun, 23 Mar 2025 02:31:57 -0700 (PDT) From: Li Ming To: dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com Cc: linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Li Ming , Jonathan Cameron Subject: [PATCH v2 3/3] cxl/pci: Drop the parameter is_port of cxl_gpf_get_dvsec() Date: Sun, 23 Mar 2025 17:31:10 +0800 Message-Id: <20250323093110.233040-4-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250323093110.233040-1-ming.li@zohomail.com> References: <20250323093110.233040-1-ming.li@zohomail.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Feedback-ID: rr08011227d9758ba022786c95310414780000b5abe8c267f9b74a4c09fef03e4bd902e5986ac2f5c3ad5261:zu0801122731e06d6555dbd7671af0ea8a00009be04fed6129c7ea4828dbf6c32c9468ea7f10710a36a5e727:rf0801122de4eb419cef64a976b494f4b000005880f0732d085e7595e45ffb44e5993faf2edc1741558a31419133dfbcc936:ZohoMail X-ZohoMailClient: External The first parameter of cxl_gpf_get_dvsec() is a struct device, can be used to distinguish if the device is a cxl dport or a cxl pci device by checking the PCIe type of it, so the parameter is_port is unnecessary to cxl_gpf_get_dvsec(), using parameter struct device is enough. Signed-off-by: Li Ming Reviewed-by: Davidlohr Bueso Reviewed-by: Jonathan Cameron Reviewed-by: Dan Williams Tested-by: Davidlohr Bueso --- drivers/cxl/core/pci.c | 12 +++++++++--- drivers/cxl/cxl.h | 2 +- drivers/cxl/pmem.c | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index edbdaf1681e8..3b80e9a76ba8 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -1072,14 +1072,20 @@ int cxl_pci_get_bandwidth(struct pci_dev *pdev, struct access_coordinate *c) #define GPF_TIMEOUT_BASE_MAX 2 #define GPF_TIMEOUT_SCALE_MAX 7 /* 10 seconds */ -u16 cxl_gpf_get_dvsec(struct device *dev, bool is_port) +u16 cxl_gpf_get_dvsec(struct device *dev) { + struct pci_dev *pdev; + bool is_port = true; u16 dvsec; if (!dev_is_pci(dev)) return 0; - dvsec = pci_find_dvsec_capability(to_pci_dev(dev), PCI_VENDOR_ID_CXL, + pdev = to_pci_dev(dev); + if (pci_pcie_type(pdev) == PCI_EXP_TYPE_ENDPOINT) + is_port = false; + + dvsec = pci_find_dvsec_capability(pdev, PCI_VENDOR_ID_CXL, is_port ? CXL_DVSEC_PORT_GPF : CXL_DVSEC_DEVICE_GPF); if (!dvsec) dev_warn(dev, "%s GPF DVSEC not present\n", @@ -1137,7 +1143,7 @@ int cxl_gpf_port_setup(struct cxl_dport *dport) struct pci_dev *pdev; int dvsec; - dvsec = cxl_gpf_get_dvsec(dport->dport_dev, true); + dvsec = cxl_gpf_get_dvsec(dport->dport_dev); if (!dvsec) return -EINVAL; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 2d81ccd83916..a9ab46eb0610 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -910,6 +910,6 @@ bool cxl_endpoint_decoder_reset_detected(struct cxl_port *port); #define __mock static #endif -u16 cxl_gpf_get_dvsec(struct device *dev, bool is_port); +u16 cxl_gpf_get_dvsec(struct device *dev); #endif /* __CXL_H__ */ diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index d061fe3d2b86..e197883690ef 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -108,7 +108,7 @@ static void cxl_nvdimm_arm_dirty_shutdown_tracking(struct cxl_nvdimm *cxl_nvd) return; } - if (!cxl_gpf_get_dvsec(cxlds->dev, false)) + if (!cxl_gpf_get_dvsec(cxlds->dev)) return; if (cxl_get_dirty_count(mds, &count)) {