From nobody Sat Feb 7 07:11:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770201479; cv=none; d=zohomail.com; s=zohoarc; b=BjbyWbvhZO+EwKzJ9eEfaeULJi2kBiveENXHiaJYk+5EJ5YCG4rAhVgvtOypX7rzblVlOy0QwE2xqmFm5yzniKver240UITPCaqBPAsVqEe5Q9XrADsQWP0q/apkX3YSulC3+2GI6a+TSvvtZH7Ga7SEwAL9YJ7sshnZgM3A3qU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770201479; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MquVSRVZfbbDT3uJLAMkLNQfrRxztkav4yYJm+5pL+o=; b=Tm2PvclvyDQeny+U2QqJULcQjzqg+im8tmL0SoEjlhn/brwwGqHbQ2kRQ+LfbDwX+Y85+vdTPJW9dbp2qH3E1g8asnCZYbsjksjy0aqdmdeZNJzUm2SmItG8WXHvu7ES0j0KuBd/hja6KGtQH5vPwPICdk345OuVq9FUUf72RiY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770201479400455.4497953273391; Wed, 4 Feb 2026 02:37:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnaBX-0000nc-1S; Wed, 04 Feb 2026 05:32:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vnaB9-0000VK-3X for qemu-devel@nongnu.org; Wed, 04 Feb 2026 05:32:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vnaB7-0003zn-9A for qemu-devel@nongnu.org; Wed, 04 Feb 2026 05:32:10 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-5x8X_4t8MUSIsVrHiGKG7A-1; Wed, 04 Feb 2026 05:32:05 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9901C18001E3; Wed, 4 Feb 2026 10:32:04 +0000 (UTC) Received: from corto.redhat.com (unknown [10.45.224.44]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2644A18004BB; Wed, 4 Feb 2026 10:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770201128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MquVSRVZfbbDT3uJLAMkLNQfrRxztkav4yYJm+5pL+o=; b=BwjFt10+wOJSDe+AXZnn4nPek985rCvDyzY2ttP1wVnULVv5LWaSfuBNXX9E0NTvMhLkNO mEpX6Fx3s7RC5JsOBGFBbPhgAAZuSSnZ4smcrNaY8y0fZgZgXEnTEF+rgVreEF+OkjGwzj b/J2ksm/T349DQH5v4SSAj3KfAWbvNM= X-MC-Unique: 5x8X_4t8MUSIsVrHiGKG7A-1 X-Mimecast-MFC-AGG-ID: 5x8X_4t8MUSIsVrHiGKG7A_1770201124 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Jamin Lin , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 11/45] hw/pci-host/aspeed_pcie: Drop AST2600 RC_H root-bus remap and bus-nr property Date: Wed, 4 Feb 2026 11:31:02 +0100 Message-ID: <20260204103136.1795455-12-clg@redhat.com> In-Reply-To: <20260204103136.1795455-1-clg@redhat.com> References: <20260204103136.1795455-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770201481171158500 From: Jamin Lin The original AST2600 PCIe design supported both RC_L and RC_H, using root b= us number 0 for RC_L and 0x80 for RC_H. In that model, the root port appeared = as 80:08.0 and QEMU carried a "bus-nr" property plus a config-space bus remap = to translate bus 0x80 to bus 0x00 for PCI enumeration. Linux mainline has since dropped RC_L support and updated the RC_H root bus number to start at 0. The root port is now enumerated as 00:08.0, matching = the default QEMU PCIe subsystem root bus numbering. Remove the bus number setting and the AST2600 bus remap logic, and drop the corresponding "bus-nr"/rc_bus_nr fields and property plumbing. QEMU now rel= ies on the default root bus 0 behavior. Signed-off-by: Jamin Lin Reviewed-by: C=C3=A9dric Le Goater Link: https://lore.kernel.org/qemu-devel/20260127032348.2238527-4-jamin_lin= @aspeedtech.com Signed-off-by: C=C3=A9dric Le Goater --- include/hw/pci-host/aspeed_pcie.h | 2 -- hw/pci-host/aspeed_pcie.c | 19 +------------------ 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/include/hw/pci-host/aspeed_pcie.h b/include/hw/pci-host/aspeed= _pcie.h index fde5816ea30c..143b3565917a 100644 --- a/include/hw/pci-host/aspeed_pcie.h +++ b/include/hw/pci-host/aspeed_pcie.h @@ -69,7 +69,6 @@ struct AspeedPCIERcState { uint64_t dram_base; uint32_t msi_addr; uint32_t rp_addr; - uint32_t bus_nr; char name[16]; qemu_irq irq; =20 @@ -102,7 +101,6 @@ struct AspeedPCIECfgClass { =20 uint32_t rc_msi_addr; uint32_t rc_rp_addr; - uint64_t rc_bus_nr; uint64_t nr_regs; bool rc_has_rd; }; diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c index 4fdda959396f..4f896f855cb4 100644 --- a/hw/pci-host/aspeed_pcie.c +++ b/hw/pci-host/aspeed_pcie.c @@ -268,7 +268,7 @@ static const char *aspeed_pcie_rc_root_bus_path(PCIHost= State *host_bridge, AspeedPCIECfgState *cfg =3D container_of(rc, AspeedPCIECfgState, rc); =20 - snprintf(rc->name, sizeof(rc->name), "%04x:%02x", cfg->id, rc->bus_nr); + snprintf(rc->name, sizeof(rc->name), "%04x:00", cfg->id); =20 return rc->name; } @@ -283,7 +283,6 @@ static void aspeed_pcie_rc_instance_init(Object *obj) } =20 static const Property aspeed_pcie_rc_props[] =3D { - DEFINE_PROP_UINT32("bus-nr", AspeedPCIERcState, bus_nr, 0), DEFINE_PROP_UINT32("rp-addr", AspeedPCIERcState, rp_addr, 0), DEFINE_PROP_UINT32("msi-addr", AspeedPCIERcState, msi_addr, 0), DEFINE_PROP_UINT64("dram-base", AspeedPCIERcState, dram_base, 0), @@ -490,17 +489,6 @@ static void aspeed_pcie_cfg_readwrite(AspeedPCIECfgSta= te *s, offset =3D cfg_addr & 0xffc; =20 pci =3D PCI_HOST_BRIDGE(rc); - - /* - * On the AST2600, the RC_H bus number range from 0x80 to 0xFF, with t= he - * root device and root port assigned to bus 0x80 instead of the stand= ard - * 0x00. To allow the PCI subsystem to correctly discover devices on t= he - * root bus, bus 0x80 is remapped to 0x00. - */ - if (bus =3D=3D rc->bus_nr) { - bus =3D 0; - } - pdev =3D pci_find_device(pci->bus, bus, devfn); if (!pdev) { s->regs[desc->rdata_reg] =3D ~0; @@ -650,9 +638,6 @@ static void aspeed_pcie_cfg_realize(DeviceState *dev, E= rror **errp) apc->nr_regs << 2); sysbus_init_mmio(sbd, &s->mmio); =20 - object_property_set_int(OBJECT(&s->rc), "bus-nr", - apc->rc_bus_nr, - &error_abort); object_property_set_int(OBJECT(&s->rc), "rp-addr", apc->rc_rp_addr, &error_abort); @@ -691,7 +676,6 @@ static void aspeed_pcie_cfg_class_init(ObjectClass *kla= ss, const void *data) apc->reg_map =3D &aspeed_regmap; apc->nr_regs =3D 0x100 >> 2; apc->rc_msi_addr =3D 0x1e77005C; - apc->rc_bus_nr =3D 0x80; apc->rc_rp_addr =3D PCI_DEVFN(8, 0); } =20 @@ -811,7 +795,6 @@ static void aspeed_2700_pcie_cfg_class_init(ObjectClass= *klass, apc->reg_map =3D &aspeed_2700_regmap; apc->nr_regs =3D 0x100 >> 2; apc->rc_msi_addr =3D 0x000000F0; - apc->rc_bus_nr =3D 0; apc->rc_rp_addr =3D PCI_DEVFN(0, 0); } =20 --=20 2.52.0