From nobody Thu Aug 04 13:55:43 2022 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 4Lz9H41GDNz4Xv7m; Thu, 4 Aug 2022 13:55:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lz9H40lK1z4MX0; Thu, 4 Aug 2022 13:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659621344; 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=cxgj13ZfCEb9yKG4OqH0yfS2/eeblmG+j82GHWXQ9lw=; b=tx8Iq7oAiACEkhsxIPEnUNLVJbxCw1JQddRX4UwEJAgM6wT1NME8Gom6N892w/NbVEQRQM oe4/txF3zOhP5O+A4cC+CFq5w7lFM+Zc0oxaNzixOk7cqqM5agTz0bmFYOeYBYv9DWmsIy /iWkZ/+XnPuY8M9WV+LX9/ezxmrV9A/sb12ZtJA0bSnn9ulZprH9HkenuFvc85fL19J5OW TEHcXuI3nStF434NJqdV2chKL4iBDfrhx3rE/TF7C8cCAa+hb7xh2oMES1GqsomqHkQKqW JohtlgRYH/KdsC9vdaz+PEiyE7EaqOySJuAT4NUTBQbUtefaJcfkC0ew+Guveg== 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 4Lz9H36pq2zHgD; Thu, 4 Aug 2022 13:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 274DthLu056189; Thu, 4 Aug 2022 13:55:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 274DthT7056188; Thu, 4 Aug 2022 13:55:43 GMT (envelope-from git) Date: Thu, 4 Aug 2022 13:55:43 GMT Message-Id: <202208041355.274DthT7056188@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: 100ddf892240 - main - qat: Move qat_c2xxx firmware files and build glue into separate dirs 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 100ddf892240c1ae34522d04f16b6e1998643020 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659621344; 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=cxgj13ZfCEb9yKG4OqH0yfS2/eeblmG+j82GHWXQ9lw=; b=KY0xhosnuJLqe9mZmvPf/kBaPI21m2s5bkBPjgR6cp8iBYonoABofExWlxs29yGRQhuc0I SwxBG2r66SxKy0tFXHZ+2uQtbP3cvMcAzZ3Y0TBNVw2ETzUS1rA979RiFcP6Br+ddh5+wt zNjPQYjeoV15L6lKMYZUYgPa8DCug3lzdruVQ5FAZKqH8gPIJbgdME+B/h0SEbm/U+inKO CdMH7c8b/DCXXmqxijaGBABlQLQ7BEZkJjXOAxgxbCWdeI2jqG+bHN0+SNPQdURlw8jXJs an6DyDGq5vAgXIvmlbtM6eJ16GtXwScnhENLNQ4yKhC2HAUFFjDlYMskggeJNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659621344; a=rsa-sha256; cv=none; b=pFgVijoTyzu1/3TV9F/WII2k1al+kvG4VgBSp8EHxnGvcn2nScxgSC81g0+FQ1wejC8xoG Z69J/m+2bNiWRW2gh/ulAxAy7X96p1i7D9D2fT+W8VpAc4R1fN5NvbCePE/Bh3Of5g+IqD pRxeMsB5eNiXCxQyYYD7rTb1XPAZgGTxd3br6e+KzO+ARSOngkXoylKCVV1axxsR0yDHE/ QQPzb0NLY1syyFUA6nEFHjrTLue1oRsi4ohp364jrugI8HeYVJtKNmgw/YNCQuRJtqEBPr 2FO8rwr0HOIBHjur2UhBAY1ZS3N04YetTt8AL90G4hB6MMjdeD5KDVKGnllrtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=100ddf892240c1ae34522d04f16b6e1998643020 commit 100ddf892240c1ae34522d04f16b6e1998643020 Author: Mark Johnston AuthorDate: 2022-08-04 13:37:55 +0000 Commit: Mark Johnston CommitDate: 2022-08-04 13:37:55 +0000 qat: Move qat_c2xxx firmware files and build glue into separate dirs Reviewed by: Zdziarski, KrzysztofX Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36032 --- sys/contrib/dev/qat_c2xxx/LICENSE | 39 +++++++++++++++++++++ .../dev/{qat => qat_c2xxx}/mmp_firmware_c2xxx.bin | Bin .../dev/{qat => qat_c2xxx}/mof_firmware_c2xxx.bin | Bin sys/modules/Makefile | 6 ++-- .../{qatfw/qat_c2xxx => qat_c2xxxfw}/Makefile | 2 +- sys/modules/qatfw/Makefile | 1 - 6 files changed, 44 insertions(+), 4 deletions(-) diff --git a/sys/contrib/dev/qat_c2xxx/LICENSE b/sys/contrib/dev/qat_c2xxx/LICENSE new file mode 100644 index 000000000000..2d9af4268f0f --- /dev/null +++ b/sys/contrib/dev/qat_c2xxx/LICENSE @@ -0,0 +1,39 @@ +Copyright (c) 2021 Intel Corporation + +Redistribution. Redistribution and use in binary form, without +modification, are permitted provided that the following conditions are +met: + +* Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. +* Neither the name of Intel Corporation nor the names of its suppliers + may be used to endorse or promote products derived from this software + without specific prior written permission. +* No reverse engineering, decompilation, or disassembly of this software + is permitted. + +Limited patent license. Intel Corporation grants a world-wide, +royalty-free, non-exclusive license under patents it now or hereafter +owns or controls to make, have made, use, import, offer to sell and +sell ("Utilize") this software, but solely to the extent that any +such patent is necessary to Utilize the software alone, or in +combination with an operating system licensed under an approved Open +Source license as listed by the Open Source Initiative at +http://opensource.org/licenses. The patent license shall not apply to +any other combinations which include this software. No hardware per +se is licensed hereunder. + +DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + diff --git a/sys/contrib/dev/qat/mmp_firmware_c2xxx.bin b/sys/contrib/dev/qat_c2xxx/mmp_firmware_c2xxx.bin similarity index 100% rename from sys/contrib/dev/qat/mmp_firmware_c2xxx.bin rename to sys/contrib/dev/qat_c2xxx/mmp_firmware_c2xxx.bin diff --git a/sys/contrib/dev/qat/mof_firmware_c2xxx.bin b/sys/contrib/dev/qat_c2xxx/mof_firmware_c2xxx.bin similarity index 100% rename from sys/contrib/dev/qat/mof_firmware_c2xxx.bin rename to sys/contrib/dev/qat_c2xxx/mof_firmware_c2xxx.bin diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f460a102b204..0c5e14a5e4c5 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -308,8 +308,9 @@ SUBDIR= \ puc \ pwm \ ${_qat} \ - ${_qat_c2xxx} \ ${_qatfw} \ + ${_qat_c2xxx} \ + ${_qat_c2xxxfw} \ ${_qlxge} \ ${_qlxgb} \ ${_qlxgbe} \ @@ -683,8 +684,9 @@ _nctgpio= nctgpio _ntb= ntb _ocs_fc= ocs_fc _qat= qat -_qat_c2xxx= qat_c2xxx _qatfw= qatfw +_qat_c2xxx= qat_c2xxx +_qat_c2xxxfw= qat_c2xxxfw .if ${MK_OFED} != "no" || defined(ALL_MODULES) _rdma= rdma .endif diff --git a/sys/modules/qatfw/qat_c2xxx/Makefile b/sys/modules/qat_c2xxxfw/Makefile similarity index 79% rename from sys/modules/qatfw/qat_c2xxx/Makefile rename to sys/modules/qat_c2xxxfw/Makefile index fe73d1ef6aea..bb237a1fbcaf 100644 --- a/sys/modules/qatfw/qat_c2xxx/Makefile +++ b/sys/modules/qat_c2xxxfw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/sys/contrib/dev/qat +.PATH: ${SRCTOP}/sys/contrib/dev/qat_c2xxx KMOD= qat_c2xxxfw IMG1= mof_firmware_c2xxx diff --git a/sys/modules/qatfw/Makefile b/sys/modules/qatfw/Makefile index 098771477ba5..6c87a28c6527 100644 --- a/sys/modules/qatfw/Makefile +++ b/sys/modules/qatfw/Makefile @@ -3,7 +3,6 @@ # $FreeBSD$ SUBDIR= qat_c62x \ qat_200xx \ - qat_c2xxx \ qat_c3xxx \ qat_c4xxx \ qat_dh895xcc