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 495D4415F16; Tue, 21 Jul 2026 20:16:24 +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=1784664985; cv=none; b=u+EWzQAAg9kUHMAP2kvlqAwpHEEqMrGr3IfmazuWbK3AyhOkyV+FZkUJSgo4xJZWS1a2OD8+lP4riwyu3OOLVe8jCgABBZVqnl6GmMf3egG9akq7n3tedRoyGTHhMp7l1HINlQ/yz0hSy6CHNzjIT41D5D0mjZQo5vJlwvaeLmc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664985; c=relaxed/simple; bh=tcQe6cUN9cmDDu1MUGASHKV6t+8HK3ATe5yDyDxk9mA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uzRZ3c8ZLR2MM47yMLhHzVF+6pufa5ElO7Pnm980D+WowCVQdezrRKgTFs3Kd0BCODPOVarg2O1gIV2ts061/l1ej3iwui70owGQ0dlXfWmqXx545dytBtIJOdOUFkQA4a/o0BL4fzroHlt+7GfnF9RayE/kg94GT/KQL5xTj0Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OEIeoePi; 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="OEIeoePi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE1F01F000E9; Tue, 21 Jul 2026 20:16:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784664984; bh=cLkuzCoXJnk/SpQ4kll7C4xlKu1LSdQi7VRe3ldVjr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OEIeoePiGLh3zHbaNhOJKdcPq/3tDaqLLoYdwuoePROAHsZF0zPlA42Y6e/kGfQCz NDScZkXJOCdk9kIjovsFykZNWc9oLKMfDGrRwjfDm9LZX793vyqqDXKpGIpvYe8YPA emgRn0J/40o1Pd/XS8LokiYN0GYKZIeKD8KrwAOU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ratheesh Kannoth , Manivannan Sadhasivam , Bjorn Helgaas , Vidya Sagar Subject: [PATCH 6.6 0131/1266] PCI: host-common: Request bus reassignment when not probe-only Date: Tue, 21 Jul 2026 17:09:28 +0200 Message-ID: <20260721152444.736996594@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152441.786066624@linuxfoundation.org> References: <20260721152441.786066624@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ratheesh Kannoth commit fda8749ba73638f5bbca3ffb39bc6861eb3b23fa upstream. pci_host_common_init() is used by several generic ECAM host drivers. After PCI core changes around pci_flags and preserve_config, these hosts no longer opted into full bus number reassignment the way they did before, which broke enumeration of devices on a Marvell CN106XX board. When PCI_PROBE_ONLY is not set, add PCI_REASSIGN_ALL_BUS so pci_scan_bridge_extend() takes the reassignment path: bus numbers can be assigned from firmware EA data (e.g. pci_ea_fixed_busnrs()). Skip the flag in probe-only mode so existing assignments are not overridden. Fixes: 7246a4520b4b ("PCI: Use preserve_config in place of pci_flags") Closes: https://lore.kernel.org/all/abkqm_LCd9zAM8cW@rkannoth-OptiPlex-7090/ Signed-off-by: Ratheesh Kannoth [mani: added stable tag] Signed-off-by: Manivannan Sadhasivam [bhelgaas: add problem report link] Signed-off-by: Bjorn Helgaas Cc: stable@vger.kernel.org Cc: Vidya Sagar Link: https://patch.msgid.link/20260414081730.3864372-1-rkannoth@marvell.com Signed-off-by: Greg Kroah-Hartman --- drivers/pci/controller/pci-host-common.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c @@ -77,6 +77,10 @@ int pci_host_common_probe(struct platfor if (!pci_has_flag(PCI_PROBE_ONLY)) pci_add_flags(PCI_REASSIGN_ALL_BUS); + /* Do not reassign bus numbers if probe only */ + if (!pci_has_flag(PCI_PROBE_ONLY)) + pci_add_flags(PCI_REASSIGN_ALL_BUS); + bridge->sysdata = cfg; bridge->ops = (struct pci_ops *)&ops->pci_ops; bridge->msi_domain = true;