From nobody Mon Aug 4 12:44:57 2025 X-Original-To: dev-commits-src-main@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 4bwbqY6D5Dz641fy; Mon, 04 Aug 2025 12:44:57 +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 4bwbqY34Plz3PGL; Mon, 04 Aug 2025 12:44:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754311497; 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=28vGt3U+w5IgCIcl0v2KNoPI4cA0bkmlD7d0LajfUsw=; b=SJnvCutVGsXtgwyGWdqDsRDt/0q+LTKUUIxyAI7i5NvpnutyEqfYP6SdNbhyzThqiKbK2s 6bSVkqZLU+EHgUCOdYjXN6zJW0N5W6Lp0T9CoY1NN6AIi3KPZy+5HzxHLTaxhBb+Drgxqb ZkgM1qdk7kemI5bp1cxCoT+3FQKhxYuGocsTvfLeWet9Zwtimy/lzpr9TIEXmfEja3NP5h VnQDQ8EiHkO/qUoAI2pVIcE9yHhWvPyjWE2PYMDV2uFOE1H4NZJxc5xppomfBB5Yrq7O4A YEfLZa7TWnTMF9mLUAR3YJ/6zfUvy+7B2Qq5eKyRU5L4VV2U9SLfgK6zL/ndYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754311497; 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=28vGt3U+w5IgCIcl0v2KNoPI4cA0bkmlD7d0LajfUsw=; b=XhwtYNaEpkUhEJh/p4JoT6wCRjFf48mwBnNyvPYgPfJoUusPLcxM/qWOdUBvbTXcjXg035 I9oiz8cgPdiZafPL76JMzR8HcZ7Yp6KhC7HJdLfYX0WWYlrbWLPnaHsRf+kgc5ZJevuE/x x1QdcDBmzsyZSPY3q1b7QInJYZZi12BiMK5tUXjlqf15dK2sLwdl2xBlmoHCNU1pMuwvKj utKPQdqSYfY67n1xxUwxJzXr0x2FF5PSJr8Qg8EgyjyOT40w1iHIz/0qUATucxLRx3QY/h DKIDuS3YKjksbs+8wpg/OrZCi0YEe+lSVhRtvsp8IGVElWLmsKrlVPU9g/lFcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754311497; a=rsa-sha256; cv=none; b=MfKRyaEyM3dd0l0RT4BZGBAZuQ3PkrCkYBhgSHOJKgm+BqpKDMaIeCYyc3p25R+Grjvdsu /4o7nrIxRFxmFqT4O6M/bRcDVguzoOPPcRZVfDrnm7HswXtdrtgGMepvN6KBO4dk9Qs2ms tzZUv4w1q8sAkf2lhuk39kUuW3z9gtX7vL5qeCGxKOim+e16BM6kCLxCAnvTc3MixFL7L0 29UiwsVFGfqleVZ3cXzr24HpInRxFIy6iAFsEv8yKsqPxlIyhEHf15g1DSP6SohzfLcRo+ ie9k/qFAj0rJ65Ot2ZmhcdICMnT0Hw66lOAjtcI/z85myWiL+yxumsnj6AjYng== 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 4bwbqY2PJlzq98; Mon, 04 Aug 2025 12:44:57 +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 574CivGn004581; Mon, 4 Aug 2025 12:44:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 574CivPb004578; Mon, 4 Aug 2025 12:44:57 GMT (envelope-from git) Date: Mon, 4 Aug 2025 12:44:57 GMT Message-Id: <202508041244.574CivPb004578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4a8e62a1209f - main - qat: Revert changes to BAR indices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4a8e62a1209f7d7529817c4c27b91fb97750b7b2 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4a8e62a1209f7d7529817c4c27b91fb97750b7b2 commit 4a8e62a1209f7d7529817c4c27b91fb97750b7b2 Author: Mark Johnston AuthorDate: 2025-08-01 09:29:21 +0000 Commit: Mark Johnston CommitDate: 2025-08-04 12:44:05 +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 --- 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