From owner-svn-src-all@freebsd.org Thu Dec 3 15:55:10 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0BAD34A980C; Thu, 3 Dec 2020 15:55:10 +0000 (UTC) (envelope-from markj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cn0lx5QPBz3w4p; Thu, 3 Dec 2020 15:55:09 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ACCDA1BEA2; Thu, 3 Dec 2020 15:55:09 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B3Ft9o2065156; Thu, 3 Dec 2020 15:55:09 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B3Ft7He065145; Thu, 3 Dec 2020 15:55:07 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202012031555.0B3Ft7He065145@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 3 Dec 2020 15:55:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r368304 - in stable/12/sys: dev/qat modules/qatfw/qat_c2xxx modules/qatfw/qat_c3xxx modules/qatfw/qat_c62x modules/qatfw/qat_d15xx modules/qatfw/qat_dh895xcc X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/sys: dev/qat modules/qatfw/qat_c2xxx modules/qatfw/qat_c3xxx modules/qatfw/qat_c62x modules/qatfw/qat_d15xx modules/qatfw/qat_dh895xcc X-SVN-Commit-Revision: 368304 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Dec 2020 15:55:10 -0000 Author: markj Date: Thu Dec 3 15:55:07 2020 New Revision: 368304 URL: https://svnweb.freebsd.org/changeset/base/368304 Log: MFC r368193: qat: Fix firmware module autoloading Modified: stable/12/sys/dev/qat/qat_c2xxxreg.h stable/12/sys/dev/qat/qat_c3xxxreg.h stable/12/sys/dev/qat/qat_c62xreg.h stable/12/sys/dev/qat/qat_d15xxreg.h stable/12/sys/dev/qat/qat_dh895xccreg.h stable/12/sys/modules/qatfw/qat_c2xxx/Makefile stable/12/sys/modules/qatfw/qat_c3xxx/Makefile stable/12/sys/modules/qatfw/qat_c62x/Makefile stable/12/sys/modules/qatfw/qat_d15xx/Makefile stable/12/sys/modules/qatfw/qat_dh895xcc/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/qat/qat_c2xxxreg.h ============================================================================== --- stable/12/sys/dev/qat/qat_c2xxxreg.h Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/dev/qat/qat_c2xxxreg.h Thu Dec 3 15:55:07 2020 (r368304) @@ -169,7 +169,7 @@ /* AE firmware */ #define AE_FW_PROD_TYPE_C2XXX 0x00800000 -#define AE_FW_MOF_NAME_C2XXX "mof_firmware_c2xxx" +#define AE_FW_MOF_NAME_C2XXX "qat_c2xxxfw" #define AE_FW_MMP_NAME_C2XXX "mmp_firmware_c2xxx" #define AE_FW_UOF_NAME_C2XXX_A0 "icp_qat_nae.uof" #define AE_FW_UOF_NAME_C2XXX_B0 "icp_qat_nae_b0.uof" Modified: stable/12/sys/dev/qat/qat_c3xxxreg.h ============================================================================== --- stable/12/sys/dev/qat/qat_c3xxxreg.h Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/dev/qat/qat_c3xxxreg.h Thu Dec 3 15:55:07 2020 (r368304) @@ -168,7 +168,7 @@ /* AE firmware */ #define AE_FW_PROD_TYPE_C3XXX 0x02000000 -#define AE_FW_MOF_NAME_C3XXX "qat_c3xxx" +#define AE_FW_MOF_NAME_C3XXX "qat_c3xxxfw" #define AE_FW_MMP_NAME_C3XXX "qat_c3xxx_mmp" #define AE_FW_UOF_NAME_C3XXX "icp_qat_ae.suof" Modified: stable/12/sys/dev/qat/qat_c62xreg.h ============================================================================== --- stable/12/sys/dev/qat/qat_c62xreg.h Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/dev/qat/qat_c62xreg.h Thu Dec 3 15:55:07 2020 (r368304) @@ -191,7 +191,7 @@ /* AE firmware */ #define AE_FW_PROD_TYPE_C62X 0x01000000 -#define AE_FW_MOF_NAME_C62X "qat_c62x" +#define AE_FW_MOF_NAME_C62X "qat_c62xfw" #define AE_FW_MMP_NAME_C62X "qat_c62x_mmp" #define AE_FW_UOF_NAME_C62X "icp_qat_ae.suof" Modified: stable/12/sys/dev/qat/qat_d15xxreg.h ============================================================================== --- stable/12/sys/dev/qat/qat_d15xxreg.h Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/dev/qat/qat_d15xxreg.h Thu Dec 3 15:55:07 2020 (r368304) @@ -191,7 +191,7 @@ /* AE firmware */ #define AE_FW_PROD_TYPE_D15XX 0x01000000 -#define AE_FW_MOF_NAME_D15XX "qat_d15xx" +#define AE_FW_MOF_NAME_D15XX "qat_d15xxfw" #define AE_FW_MMP_NAME_D15XX "qat_d15xx_mmp" #define AE_FW_UOF_NAME_D15XX "icp_qat_ae.suof" Modified: stable/12/sys/dev/qat/qat_dh895xccreg.h ============================================================================== --- stable/12/sys/dev/qat/qat_dh895xccreg.h Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/dev/qat/qat_dh895xccreg.h Thu Dec 3 15:55:07 2020 (r368304) @@ -109,7 +109,7 @@ /* AE firmware */ #define AE_FW_PROD_TYPE_DH895XCC 0x00400000 -#define AE_FW_MOF_NAME_DH895XCC "qat_895xcc" +#define AE_FW_MOF_NAME_DH895XCC "qat_895xccfw" #define AE_FW_MMP_NAME_DH895XCC "qat_895xcc_mmp" #define AE_FW_UOF_NAME_DH895XCC "icp_qat_ae.uof" Modified: stable/12/sys/modules/qatfw/qat_c2xxx/Makefile ============================================================================== --- stable/12/sys/modules/qatfw/qat_c2xxx/Makefile Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/modules/qatfw/qat_c2xxx/Makefile Thu Dec 3 15:55:07 2020 (r368304) @@ -6,6 +6,6 @@ KMOD= qat_c2xxxfw IMG1= mmp_firmware_c2xxx IMG2= mof_firmware_c2xxx -FIRMWS= ${IMG1}.bin:${IMG1}:111 ${IMG2}.bin:${IMG2}:111 +FIRMWS= ${IMG1}.bin:${KMOD}:111 ${IMG2}.bin:${IMG2}:111 .include Modified: stable/12/sys/modules/qatfw/qat_c3xxx/Makefile ============================================================================== --- stable/12/sys/modules/qatfw/qat_c3xxx/Makefile Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/modules/qatfw/qat_c3xxx/Makefile Thu Dec 3 15:55:07 2020 (r368304) @@ -6,6 +6,6 @@ KMOD= qat_c3xxxfw IMG1= qat_c3xxx IMG2= qat_c3xxx_mmp -FIRMWS= ${IMG1}.bin:${IMG1}:111 ${IMG2}.bin:${IMG2}:111 +FIRMWS= ${IMG1}.bin:${KMOD}:111 ${IMG2}.bin:${IMG2}:111 .include Modified: stable/12/sys/modules/qatfw/qat_c62x/Makefile ============================================================================== --- stable/12/sys/modules/qatfw/qat_c62x/Makefile Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/modules/qatfw/qat_c62x/Makefile Thu Dec 3 15:55:07 2020 (r368304) @@ -6,6 +6,6 @@ KMOD= qat_c62xfw IMG1= qat_c62x IMG2= qat_c62x_mmp -FIRMWS= ${IMG1}.bin:${IMG1}:111 ${IMG2}.bin:${IMG2}:111 +FIRMWS= ${IMG1}.bin:${KMOD}:111 ${IMG2}.bin:${IMG2}:111 .include Modified: stable/12/sys/modules/qatfw/qat_d15xx/Makefile ============================================================================== --- stable/12/sys/modules/qatfw/qat_d15xx/Makefile Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/modules/qatfw/qat_d15xx/Makefile Thu Dec 3 15:55:07 2020 (r368304) @@ -6,6 +6,6 @@ KMOD= qat_d15xxfw IMG1= qat_d15xx IMG2= qat_d15xx_mmp -FIRMWS= ${IMG1}.bin:${IMG1}:111 ${IMG2}.bin:${IMG2}:111 +FIRMWS= ${IMG1}.bin:${KMOD}:111 ${IMG2}.bin:${IMG2}:111 .include Modified: stable/12/sys/modules/qatfw/qat_dh895xcc/Makefile ============================================================================== --- stable/12/sys/modules/qatfw/qat_dh895xcc/Makefile Thu Dec 3 15:54:41 2020 (r368303) +++ stable/12/sys/modules/qatfw/qat_dh895xcc/Makefile Thu Dec 3 15:55:07 2020 (r368304) @@ -6,6 +6,6 @@ KMOD= qat_dh895xccfw IMG1= qat_895xcc IMG2= qat_895xcc_mmp -FIRMWS= ${IMG1}.bin:${IMG1}:111 ${IMG2}.bin:${IMG2}:111 +FIRMWS= ${IMG1}.bin:${KMOD}:111 ${IMG2}.bin:${IMG2}:111 .include