From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 001EB370ACA; Sat, 12 Sep 2026 10:04:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789207451; cv=none; b=PTtzNQdsmlM5H/cNKSyAVIpm6GJKqCwdci/2M/dJLGkWjduoPWa8/X8e9RWfCS4lf0NkcHRe7LQ7K2CrFtGB9FFxz/jqL4HOORy/wXqCGFc4t+AmMwKNJFQZO+u5Y965rJqrTTa7sPN9WRUX18QCpQc5mZhN3rRpbHrEyXqds8o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789207451; c=relaxed/simple; bh=GdEYDLMeR6bfphBFqqz7bhcxsUP8pIvFTUWi0+AFxrM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eobQ8DLdhvi/2SVcgORsvNlyEqX++1QTONpsUvud2bwbs+MXsQEdi3Bz7Id7vS1Yk59t1XGervN3YiOY6kELX6NESxzNWebKeGtozoH9PBD9FurbKUHFqB6Qcq5lroUZLe2VudvHzpuqav00IS6T2bERe2UQ2uDYB/9MwwJ/rGE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ptiE2JPG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ptiE2JPG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 029491F000FF; Sat, 12 Sep 2026 10:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789207449; bh=mpw4sIy7pgFVtjZX5mn50/8jfxxA4vilVKGtGJoAUfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ptiE2JPGQ2zUyqqv/UxbyC+IYuDN21htIdBK88GNJWZ9mLBwUTPpprvUEKGTK9a4K oZ2HnQVHjsttMyarh3xzRXOPVYR9Fvf/zMHsWNUqnzStlKft3tZIAEUvU2Z0jP5nB/ 5MtIC/sbgn9yRdSmF5UCywjz474UdauVyYSYx43s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot@kernel.org, Alison Schofield , Dave Jiang , Sasha Levin Subject: [PATCH 6.18 0372/1518] cxl/pci: Honor -EPROBE_DEFER from component register setup Date: Sat, 12 Sep 2026 08:42:21 +0200 Message-ID: <20260912065631.881933713@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Jiang [ Upstream commit 430c502c80e542e77bcf97db13ec0e8cdf9addb0 ] cxl_pci_setup_regs() for CXL_REGLOC_RBI_COMPONENT can return -EPROBE_DEFER on a Restricted CXL Host (RCD) when the upstream port has not yet been enumerated and the Component Registers must be extracted from the RCRB. cxl_pci_probe() treats every non-zero return from that call as the benign "component registers not found" case, logs a warning, and continues. The rc is then immediately overwritten by the subsequent cxl_pci_type3_init_mailbox() call, so the deferral is silently swallowed. Return -EPROBE_DEFER instead of continuing so the probe is retried once the upstream port is available. Fixes: 733b57f262b0 ("cxl/pci: Early setup RCH dport component registers from RCRB") Reported-by: sashiko-bot@kernel.org Closes: https://lore.kernel.org/linux-cxl/ajzhsubot_PSYtHQ@MWDK4CY14F/T/#m063bbf76b1c9c293ade52ab311018ae6bba11a44 Assisted-by: Claude:claude-opus-4-8 Reviewed-by: Alison Schofield Link: https://lore.kernel.org/linux-cxl/ajzhsubot_PSYtHQ@MWDK4CY14F/T/#m063bbf76b1c9c293ade52ab311018ae6bba11a44 Link: https://patch.msgid.link/20260706224322.714934-1-dave.jiang@intel.com Signed-off-by: Dave Jiang Signed-off-by: Sasha Levin --- drivers/cxl/pci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 24fb1b230ca02..59c6d503437be 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -946,10 +946,13 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) */ rc = cxl_pci_setup_regs(pdev, CXL_REGLOC_RBI_COMPONENT, &cxlds->reg_map); - if (rc) + if (rc) { + if (rc == -EPROBE_DEFER) + return rc; dev_warn(&pdev->dev, "No component registers (%d)\n", rc); - else if (!cxlds->reg_map.component_map.ras.valid) + } else if (!cxlds->reg_map.component_map.ras.valid) { dev_dbg(&pdev->dev, "RAS registers not found\n"); + } rc = cxl_map_component_regs(&cxlds->reg_map, &cxlds->regs.component, BIT(CXL_CM_CAP_CAP_ID_RAS)); -- 2.53.0