From 100ddf892240c1ae34522d04f16b6e1998643020 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Thu, 4 Aug 2022 09:37:55 -0400 Subject: [PATCH] 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 ++++++++++++++++++ .../{qat => qat_c2xxx}/mmp_firmware_c2xxx.bin | Bin .../{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(-) create mode 100644 sys/contrib/dev/qat_c2xxx/LICENSE rename sys/contrib/dev/{qat => qat_c2xxx}/mmp_firmware_c2xxx.bin (100%) rename sys/contrib/dev/{qat => qat_c2xxx}/mof_firmware_c2xxx.bin (100%) rename sys/modules/{qatfw/qat_c2xxx => qat_c2xxxfw}/Makefile (79%) 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