From nobody Sun Nov 08 01:36:18 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jMb9G68yYz6yHy0 for ; Sun, 08 Nov 2026 01:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jMb9G5Tt8z4rp0 for ; Sun, 08 Nov 2026 01:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794101778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RyaAelzt49Jms4BVqjy1gVXLvMIBh29mbDAyvISPq58=; b=l4KajPOqhAun15J9t61q3WMJ6j1Fn2k9QofQXfSktrTmCUzoEsv1UVXElc3YCCnK5ulyVD Z8KrZ58elSHFg7J8/l4ZYcrh5biDDukys8WsWsPHWFiZPMT4HMUnHHPrCkuqEK0XQjW+pU fJE8B8Pnm7hxGgG+pkwESQ8b667YVkrNSt1VTqQhqJT5TyzebXjZz66QSX6EiYSS7C9pQK JmhOgW6WBo1YarAJhQGdtD3WIT9Y3BbB5LKi+2o5TFaZtKTjHKpxTULyRxhXuK1h/QvOA+ cS4QYvCXv4EMrRpZnZWZ4bYI/4Nf51oBImM3SLP/w+vtMwNa0NNXejNL4YviEA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794101778; b=Ntnda2fdEzadpH5pGmo+6hSmmjUta9pCSMguKBCZTqSVhixkMBQ+jagDvrEtvfnp53mGB8 1SCd2hAErFcxELigGM3ZMQUUFxCga0osfRh/yNQsi5kCWtLGpaBbUpyYJeN49PteQWm3ya Iyk56IG3Y5B4WwlL9k5V1hXAsdIa3gvJzOyNkVcTWcnJG10Gw+d7YroY3qu+WIOq2VMDzC Sv+KyMHyglU7TyitM6GEFnqqGRdobCXi9CZTW6kwYjL7jt8lw+VKpckZNxQT6VtH87x7Lh VTfrvFaUiChQ+MQtsrpDkkVDGxddSGI+2jrty237UKjrRai4dOvb025PbEZjvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794101778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RyaAelzt49Jms4BVqjy1gVXLvMIBh29mbDAyvISPq58=; b=HyuQ6IwQm3oi+UxtSC6UBa/mnyvDlk4+fBuBeq/Kb84YwCIF3Z4LjjMj2wb6Oyi+aib3M6 tzEQyot3IdFU8s1fqlBJmoizr7CrYA04iiy3+7H2skY4k6Ts8fdpqMPE6ATXEWeDIBWffP psEsvdMYm6yWyRH16VzdR72heH6jKb0fV76SUSgEEJhH3hEUsWugQ5UK8Xkv01V4dPHk8L s8CleqNQ0+kOPnFh0X2IFlOY24wzrRUdG3lJyW12ena39JEovnIRA6FL1O2rRzCMvdQbw2 T6micxLOTnbbHlTO/IrUBa2Ii4JCf/4jOaLQ3rYu0HMhbxIfFzTUNLDAwzY4DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jMb9G56CMzn2v for ; Sun, 08 Nov 2026 01:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 49208 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 08 Nov 2026 01:36:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Nick Price Subject: git: 665afd2a9d64 - main - pci: restore resizable BAR sizes in pci_cfg_restore() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nprice X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 665afd2a9d6469ce692de4018c7c015a194c201d Auto-Submitted: auto-generated Date: Sun, 08 Nov 2026 01:36:18 +0000 Message-Id: <6aefd212.49208.16eb4536@gitrepo.freebsd.org> The branch main has been updated by nprice: URL: https://cgit.FreeBSD.org/src/commit/?id=665afd2a9d6469ce692de4018c7c015a194c201d commit 665afd2a9d6469ce692de4018c7c015a194c201d Author: Nick Price AuthorDate: 2026-11-08 01:36:01 +0000 Commit: Nick Price CommitDate: 2026-11-08 01:36:05 +0000 pci: restore resizable BAR sizes in pci_cfg_restore() After a device reset, resizable BARs return to their default sizes. Restore them to the sizes they had prior to reset. Reviewed by: imp, adrian Differential Revision: https://reviews.freebsd.org/D61110 Approved by: adrian (mentor) Signed-off-by: Nick Price --- sys/dev/pci/pci.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/pci/pcireg.h | 9 +++++++++ 2 files changed, 58 insertions(+) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 88a1bb376fca..35f8e1154d6c 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -6868,6 +6868,54 @@ pci_cfg_restore_pcix(device_t dev, struct pci_devinfo *dinfo) dinfo->cfg.pcix.pcix_command, 2); } +static void +pci_restore_bar_sizes(device_t dev) +{ + struct pci_devinfo *dinfo; + struct pci_map *pm; + uint32_t ctrl; + uint16_t cmd; + int cur, i, nbars, ptr, size; + + dinfo = device_get_ivars(dev); + if (pci_find_extcap(dev, PCIZ_RESIZE_BAR, &ptr) != 0) + return; + ctrl = pci_read_config(dev, ptr + PCIR_REBAR_CTRL(0), 4); + nbars = (ctrl & PCIM_REBAR_CTRL_NBAR_MASK) >> + PCIM_REBAR_CTRL_NBAR_SHIFT; + if (nbars < 1 || nbars > PCI_MAXMAPS_0) + return; + + cmd = pci_read_config(dev, PCIR_COMMAND, 2); + for (i = 0; i < nbars; i++) { + ctrl = pci_read_config(dev, ptr + PCIR_REBAR_CTRL(i), 4); + if ((ctrl & PCIM_REBAR_CTRL_BAR_IDX) > PCIR_MAX_BAR_0) + continue; + pm = pci_find_bar(dev, + PCIR_BAR(ctrl & PCIM_REBAR_CTRL_BAR_IDX)); + if (pm == NULL || pm->pm_size < 20 || pm->pm_size > 63) + continue; + size = pm->pm_size - 20; + cur = (ctrl & PCIM_REBAR_CTRL_SIZE_MASK) >> + PCIM_REBAR_CTRL_SIZE_SHIFT; + if (cur == size) + continue; + /* Disable decoding before resizing. */ + if ((cmd & PCIM_CMD_MEMEN) != 0) { + cmd &= ~PCIM_CMD_MEMEN; + pci_write_config(dev, PCIR_COMMAND, cmd, 2); + } + ctrl &= ~PCIM_REBAR_CTRL_SIZE_MASK; + ctrl |= size << PCIM_REBAR_CTRL_SIZE_SHIFT; + pci_write_config(dev, ptr + PCIR_REBAR_CTRL(i), ctrl, 4); + if (bootverbose) + pci_printf(&dinfo->cfg, + "map[%02x]: resized to %ju MB from %ju MB\n", + pm->pm_reg, (uintmax_t)1 << size, + (uintmax_t)1 << cur); + } +} + void pci_cfg_restore(device_t dev, struct pci_devinfo *dinfo) { @@ -6918,6 +6966,7 @@ pci_cfg_restore(device_t dev, struct pci_devinfo *dinfo) dinfo->cfg.bridge.br_control, 2); break; } + pci_restore_bar_sizes(dev); pci_restore_bars(dev); if ((dinfo->cfg.hdrtype & PCIM_HDRTYPE) != PCIM_HDRTYPE_BRIDGE) diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h index 5faaf3d7c793..dc73807e7ff1 100644 --- a/sys/dev/pci/pcireg.h +++ b/sys/dev/pci/pcireg.h @@ -1080,6 +1080,15 @@ #define PCIR_SRIOV_BARS 0x24 #define PCIR_SRIOV_BAR(x) (PCIR_SRIOV_BARS + (x) * 4) +/* Resizable BAR definitions */ +#define PCIR_REBAR_CAP(n) (0x04 + (n) * 8) +#define PCIR_REBAR_CTRL(n) (0x08 + (n) * 8) +#define PCIM_REBAR_CTRL_BAR_IDX 0x00000007 +#define PCIM_REBAR_CTRL_NBAR_MASK 0x000000e0 +#define PCIM_REBAR_CTRL_NBAR_SHIFT 5 +#define PCIM_REBAR_CTRL_SIZE_MASK 0x00003f00 +#define PCIM_REBAR_CTRL_SIZE_SHIFT 8 + /* Extended Capability Vendor-Specific definitions */ #define PCIR_VSEC_HEADER 0x04 #define PCIR_VSEC_ID(hdr) ((hdr) & 0xffff)