From nobody Tue Aug 12 12:56:14 2025 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 4c1Whw0sT5z64jGv; Tue, 12 Aug 2025 12:56:16 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c1Whv1dkSz3KP1; Tue, 12 Aug 2025 12:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003375; 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=dy5H3XI3RrQPy/kL0Grx274U9nsK5Up0tJRVKXIQl3E=; b=GB1DSD+m1Hzq4J9sVO9/OYXqs5UZ1DPtyLCZfOVaZIXNCp8bGw6lGaBB35PtMf4+7IGyYx ZZXOxO5c5T8FM1QL347FQ+C8R05Pcd95GWwyJo0Q5MBUEqFNYIa74qg7qecipHRHTwZbip mcE16yEnO8gCILrffXtlNLFn+Qyw9f2BiGtm7++26VUzzsREVYfjg3bkyINTyGn+mTDgw1 GJaD62UnGBMLz0tWzC2Xk8smxtdkxDapYisDXE+Uc5oW7yp8DUEoOlOMAc59ErgQbII0F4 wfY0wHMZoW+IYU7wzOK29kYh/caoHVw8EDjn3vdMLX/bDatQWzeGhPerKTa6VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003375; 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=dy5H3XI3RrQPy/kL0Grx274U9nsK5Up0tJRVKXIQl3E=; b=ZHJGWKZgMy4uRdNOPzxW+rvl1gCxfQimHi2cRMbWK+5FDhZ/0LRZFDVdxOcJSvhTY6Nh4g IPUoE1EBuxCr60i26wQwK+p72MDOH/yO6hUaSBvmn0glVVTal1/258mNIe6IFNitupdGxp 3XGGdpNA6RtNF1Z828li6HlvYWPJnahhc88tCjFmRU0NRsgQZ6tRmWoNO4dlL83zkhp4n6 5Ck6LxgE2NRrcOGCrwpycNrDiQEBgZdstMlp12HZqXuO5sXT+rt4ZskiRrXn23JctYq0zw GitbxkYdXN92xavTrrRHOKHKQgUiRqq6gT/11SlNna5jItd5/lJKVM7WoZVeGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755003375; a=rsa-sha256; cv=none; b=PhGpTRzzbUaotvFyFLGk3xpqe5OV7KMYFmstrFfbT24FyXnt+QK70O3BYTMlikVm9sAuuA rqWEAmPUzCADB24jVsg0YEzz5LZetHpv8/PaeY+Zf2dqcv+dL4cM6ZBsbdJPNMh84SH98Q hJXEAdRtgjIXagE+EguYbHFNcqpjZSd+JLoDBqG9yxX2Amz+n94M1qIXKfZaUK2KXUyXkm Vpom2uLT+Mu7ftdlwa5UVe1acKLisA/o/ExLiPrqjpEJcW9bQyGZ9WAfzs41i62tMx5Jwv 9eI2Pz5gyM2NWJiuV3b2nptkmrGePSQpJmw5Hz7m9qmDMPuvVkknqQLe8ZCvcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c1Whv0z0nzfn5; Tue, 12 Aug 2025 12:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57CCuEEh088476; Tue, 12 Aug 2025 12:56:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CCuEuI088473; Tue, 12 Aug 2025 12:56:14 GMT (envelope-from git) Date: Tue, 12 Aug 2025 12:56:14 GMT Message-Id: <202508121256.57CCuEuI088473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a6059a556654 - stable/14 - qat: Revert changes to BAR indices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a6059a556654c033619c2a4d0f95c9ac3c92a532 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a6059a556654c033619c2a4d0f95c9ac3c92a532 commit a6059a556654c033619c2a4d0f95c9ac3c92a532 Author: Mark Johnston AuthorDate: 2025-08-01 09:29:21 +0000 Commit: Mark Johnston CommitDate: 2025-08-12 12:49:42 +0000 qat: Revert changes to BAR indices It is not clear how commit ded037e65e52 could reasonably change BAR indices, and doing so broke at least the C3000 driver. Revert that part of the change. Reported by: kp Reviewed by: kp, Haresh Sankar Raj MFC after: 3 days Fixes: ded037e65e52 ("qat: driver updates to improve code and fix bugs") Differential Revision: https://reviews.freebsd.org/D51664 (cherry picked from commit 4a8e62a1209f7d7529817c4c27b91fb97750b7b2) --- sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h | 4 ++-- sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h b/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h index a7324509bea7..f8adc0dba935 100644 --- a/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h +++ b/sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h @@ -4,8 +4,8 @@ #define ADF_200XX_HW_DATA_H_ /* PCIe configuration space */ -#define ADF_200XX_PMISC_BAR 1 -#define ADF_200XX_ETR_BAR 2 +#define ADF_200XX_PMISC_BAR 0 +#define ADF_200XX_ETR_BAR 1 #define ADF_200XX_RX_RINGS_OFFSET 8 #define ADF_200XX_TX_RINGS_MASK 0xFF #define ADF_200XX_MAX_ACCELERATORS 3 diff --git a/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h b/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h index cddfc3f84853..486c46a1cac7 100644 --- a/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h +++ b/sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h @@ -4,8 +4,8 @@ #define ADF_C3XXX_HW_DATA_H_ /* PCIe configuration space */ -#define ADF_C3XXX_PMISC_BAR 1 -#define ADF_C3XXX_ETR_BAR 2 +#define ADF_C3XXX_PMISC_BAR 0 +#define ADF_C3XXX_ETR_BAR 1 #define ADF_C3XXX_RX_RINGS_OFFSET 8 #define ADF_C3XXX_TX_RINGS_MASK 0xFF #define ADF_C3XXX_MAX_ACCELERATORS 3