From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 D65153BCD27 for ; Thu, 6 Aug 2026 19:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786045831; cv=none; b=kD6bglHvZgfmZnK+8+ybiXYZUT03L0NfILPbvnVauUdq8pMpHyI7Ts349vUg4F1z33dM4UUUTsOeZGqNWIybq7i/aZWd3kGPVHf09SUu8pRjqJkeZyx5I2Lfm32OrlP2aigiin9Y66vfwNnMSqJVFwNr0tlJnjtpzB7cbsS/SNA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786045831; c=relaxed/simple; bh=FlHRfM/txQFQjAqQvXNeHSARjD75GBtn+Ja0t4dJb0w=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MFM0MMnmk+95h/qwiKQv/7PWRcka4VM3h0HvlYtnrZPFKFZerYWER6Q0ulv4qfc17FxBq10DWcH/Vu4rtgqFrGns+lT8YyRl9gr1Nz0EV1IrUCHQXQryrJmPytoPext8LeQxU8CCPSQ3fkBtsgdCyNeoHEpNEB2IbtHYCGySXCw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=W1z6Jzqi; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="W1z6Jzqi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1786045826; x=1817581826; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=FlHRfM/txQFQjAqQvXNeHSARjD75GBtn+Ja0t4dJb0w=; b=W1z6Jzqi3AKL5H7Pi1x8tI1/edUkAUVGsuhXBrrs24Kqjbn7QKxDEkDu W6sY94SgEk1BS54Pi48niXnBpLZge4/0+klYqCA/WCsjS4m9pQ4DZGqcd t8rgLNyBY+KWPWzoo99xL2CW1dIZFBeoOAojwx2l6E4YOotitB4oEPnje bPr/ZFjf3Xf32PDdNlH78EyX1X0cuLpgfh8+Tyf2IzV/MFh+xDbbJNEq0 Lm4v0Hd88DVfZqjfBbjKblCDQZU+VoBfYkhRRRtIIKe2AvaoPYczwguGh LTFWx3zbNCJ10Vd2B/oAIlrTnh8WOtr/i45aaB1K6LQeCyFOqkQGr6Xii g==; X-CSE-ConnectionGUID: nGEgWRW8TVyMdeqxRB0fTA== X-CSE-MsgGUID: 3plLcdIIQdiRjzJuNfjeHw== X-IronPort-AV: E=McAfee;i="6800,10657,11867"; a="85622539" X-IronPort-AV: E=Sophos;i="6.25,209,1779174000"; d="scan'208";a="85622539" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2026 12:50:16 -0700 X-CSE-ConnectionGUID: +zS0gAeoQY+1fRJQ0wy8mw== X-CSE-MsgGUID: eLhNoaLwQUay6bgoibnrIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,209,1779174000"; d="scan'208";a="260923422" Received: from ubuntu.igk.intel.com ([10.102.114.174]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2026 12:50:14 -0700 From: Szymon Durawa To: helgaas@kernel.org, nirmal.patel@linux.intel.com, szymon.durawa@linux.intel.com, djbw@kernel.org, linux-pci@vger.kernel.org, lukas@wunner.de Subject: [PATCH v6 6/8] PCI: vmd: Convert bus and busn_start to an array Date: Thu, 6 Aug 2026 22:13:45 +0000 Message-ID: <20260806221351.38592-7-szymon.durawa@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260806221351.38592-1-szymon.durawa@linux.intel.com> References: <20260806221351.38592-1-szymon.durawa@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert bus and busn_start from scalar to an array to support multiple VMD buses in the future. No functional changes. Suggested-by: Nirmal Patel Signed-off-by: Szymon Durawa --- drivers/pci/controller/vmd.c | 50 +++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index 78e8bdf7c3d7..786374965f74 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -49,6 +49,11 @@ enum vmd_resource { VMD_RES_COUNT }; +enum vmd_rootbus { + VMD_BUS_0 = 0, + VMD_BUS_COUNT +}; + enum vmd_features { /* * Device may contain registers which hint the physical location of the @@ -149,8 +154,8 @@ struct vmd_dev { struct pci_sysdata sysdata; struct resource resources[VMD_RES_COUNT]; struct irq_domain *irq_domain; - struct pci_bus *bus; - u8 busn_start; + struct pci_bus *bus[VMD_BUS_COUNT]; + u8 busn_start[VMD_BUS_COUNT]; u8 first_vec; char *name; int instance; @@ -404,7 +409,7 @@ static void vmd_remove_irq_domain(struct vmd_dev *vmd) static void __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus, unsigned int devfn, int reg, int len) { - unsigned int busnr_ecam = bus->number - vmd->busn_start; + unsigned int busnr_ecam = bus->number - vmd->busn_start[VMD_BUS_0]; u32 offset = PCIE_ECAM_OFFSET(busnr_ecam, devfn, reg); if (offset + len >= resource_size(&vmd->dev->resource[VMD_CFGBAR])) @@ -655,13 +660,13 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd) switch (BUS_RESTRICT_CFG(reg)) { case 0: - vmd->busn_start = VMD_RESTRICT_0_BUS_START; + vmd->busn_start[VMD_BUS_0] = VMD_RESTRICT_0_BUS_START; break; case 1: - vmd->busn_start = VMD_RESTRICT_1_BUS_START; + vmd->busn_start[VMD_BUS_0] = VMD_RESTRICT_1_BUS_START; break; case 2: - vmd->busn_start = VMD_RESTRICT_2_BUS_START; + vmd->busn_start[VMD_BUS_0] = VMD_RESTRICT_2_BUS_START; break; default: pci_err(dev, "Unknown Bus Offset Setting (%d)\n", @@ -789,8 +794,9 @@ static void vmd_configure_cfgbar(struct vmd_dev *vmd) vmd->resources[VMD_RES_CFGBAR] = (struct resource){ .name = "VMD CFGBAR", - .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size(res) >> 20) - 1, + .start = vmd->busn_start[VMD_BUS_0], + .end = vmd->busn_start[VMD_BUS_0] + + (resource_size(res) >> 20) - 1, .flags = IORESOURCE_BUS | IORESOURCE_PCI_FIXED, }; } @@ -844,11 +850,11 @@ static int vmd_configure_membar1_membar2(struct vmd_dev *vmd, { int ret; - ret = vmd_configure_membar(vmd, 1, VMD_MEMBAR1, 0, 0); + ret = vmd_configure_membar(vmd, VMD_RES_MBAR_1, VMD_MEMBAR1, 0, 0); if (ret) return ret; - ret = vmd_configure_membar(vmd, 2, VMD_MEMBAR2, mbar2_ofs, 0); + ret = vmd_configure_membar(vmd, VMD_RES_MBAR_2, VMD_MEMBAR2, mbar2_ofs, 0); if (ret) { devm_kfree(&vmd->dev->dev, (void *)vmd->resources[VMD_RES_MBAR_1].name); memset(&vmd->resources[VMD_RES_MBAR_1], 0, sizeof(vmd->resources[VMD_RES_MBAR_1])); @@ -869,21 +875,22 @@ static int vmd_create_bus(struct vmd_dev *vmd, struct pci_sysdata *sd, pci_add_resource_offset(&resources, &vmd->resources[VMD_RES_MBAR_2], offset[1]); - vmd->bus = pci_create_root_bus(&vmd->dev->dev, vmd->busn_start, - &vmd_ops, sd, &resources); - if (!vmd->bus) { + vmd->bus[VMD_BUS_0] = pci_create_root_bus(&vmd->dev->dev, + vmd->busn_start[VMD_BUS_0], + &vmd_ops, sd, &resources); + if (!vmd->bus[VMD_BUS_0]) { pci_free_resource_list(&resources); return -ENODEV; } vmd_copy_host_bridge_flags(pci_find_host_bridge(vmd->dev->bus), - to_pci_host_bridge(vmd->bus->bridge)); + to_pci_host_bridge(vmd->bus[VMD_BUS_0]->bridge)); vmd_attach_resources(vmd); if (vmd->irq_domain) - dev_set_msi_domain(&vmd->bus->dev, vmd->irq_domain); + dev_set_msi_domain(&vmd->bus[VMD_BUS_0]->dev, vmd->irq_domain); else - dev_set_msi_domain(&vmd->bus->dev, + dev_set_msi_domain(&vmd->bus[VMD_BUS_0]->dev, dev_get_msi_domain(&vmd->dev->dev)); return 0; @@ -1037,10 +1044,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) return ret; } - WARN(sysfs_create_link(&vmd->dev->dev.kobj, &vmd->bus->dev.kobj, - "domain"), "Can't create symlink to domain\n"); + WARN(sysfs_create_link(&vmd->dev->dev.kobj, + &vmd->bus[VMD_BUS_0]->dev.kobj, "domain"), + "Can't create symlink to domain\n"); - vmd_bus_enumeration(vmd->bus, features); + vmd_bus_enumeration(vmd->bus[VMD_BUS_0], features); return 0; } @@ -1136,9 +1144,9 @@ static void vmd_remove(struct pci_dev *dev) { struct vmd_dev *vmd = pci_get_drvdata(dev); - pci_stop_root_bus(vmd->bus); + pci_stop_root_bus(vmd->bus[VMD_BUS_0]); sysfs_remove_link(&vmd->dev->dev.kobj, "domain"); - pci_remove_root_bus(vmd->bus); + pci_remove_root_bus(vmd->bus[VMD_BUS_0]); vmd_cleanup_srcu(vmd); vmd_detach_resources(vmd); vmd_remove_irq_domain(vmd); -- 2.43.0