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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
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 <bsd.kmod.mk>
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
