svn commit: r368193 - in head/sys: dev/qat modules/qatfw/qat_c2xxx modules/qatfw/qat_c3xxx modules/qatfw/qat_c62x modules/qatfw/qat_d15xx modules/qatfw/qat_dh895xcc

Mon Nov 30 20:53:28 UTC 2020

Author: markj
Date: Mon Nov 30 20:53:25 2020
New Revision: 368193
URL: https://svnweb.freebsd.org/changeset/base/368193

Log:
  qat: Fix firmware module autoloading
  
  If firmware_get() fails to find a loaded firmware image, it searches for
  candidate KLDs to load.  It will search for a KLD containing a module
  with the same name as the requested image, and failing that, will load a
  KLD with the same basename as the requested image.
  
  The module name given by fw_stub.awk is simply "<mangled KLD name>_fw".
  
  QAT firmware modules contain two images, neither of which match either
  of the names used during lookup, so automatic loading of firmware images
  after mountroot does not work.  Work around this by using the same
  string for the first image name and for the KLD basename.
  
  MFC after:	3 days
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/sys/dev/qat/qat_c2xxxreg.h
  head/sys/dev/qat/qat_c3xxxreg.h
  head/sys/dev/qat/qat_c62xreg.h
  head/sys/dev/qat/qat_d15xxreg.h
  head/sys/dev/qat/qat_dh895xccreg.h
  head/sys/modules/qatfw/qat_c2xxx/Makefile
  head/sys/modules/qatfw/qat_c3xxx/Makefile
  head/sys/modules/qatfw/qat_c62x/Makefile
  head/sys/modules/qatfw/qat_d15xx/Makefile
  head/sys/modules/qatfw/qat_dh895xcc/Makefile

Modified: head/sys/dev/qat/qat_c2xxxreg.h
==============================================================================

--- head/sys/dev/qat/qat_c2xxxreg.h	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/dev/qat/qat_c2xxxreg.h	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/dev/qat/qat_c3xxxreg.h
==============================================================================
--- head/sys/dev/qat/qat_c3xxxreg.h	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/dev/qat/qat_c3xxxreg.h	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/dev/qat/qat_c62xreg.h
==============================================================================
--- head/sys/dev/qat/qat_c62xreg.h	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/dev/qat/qat_c62xreg.h	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/dev/qat/qat_d15xxreg.h
==============================================================================
--- head/sys/dev/qat/qat_d15xxreg.h	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/dev/qat/qat_d15xxreg.h	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/dev/qat/qat_dh895xccreg.h
==============================================================================
--- head/sys/dev/qat/qat_dh895xccreg.h	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/dev/qat/qat_dh895xccreg.h	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/modules/qatfw/qat_c2xxx/Makefile
==============================================================================
--- head/sys/modules/qatfw/qat_c2xxx/Makefile	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/modules/qatfw/qat_c2xxx/Makefile	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/modules/qatfw/qat_c3xxx/Makefile
==============================================================================
--- head/sys/modules/qatfw/qat_c3xxx/Makefile	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/modules/qatfw/qat_c3xxx/Makefile	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/modules/qatfw/qat_c62x/Makefile
==============================================================================
--- head/sys/modules/qatfw/qat_c62x/Makefile	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/modules/qatfw/qat_c62x/Makefile	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/modules/qatfw/qat_d15xx/Makefile
==============================================================================
--- head/sys/modules/qatfw/qat_d15xx/Makefile	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/modules/qatfw/qat_d15xx/Makefile	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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: head/sys/modules/qatfw/qat_dh895xcc/Makefile
==============================================================================
--- head/sys/modules/qatfw/qat_dh895xcc/Makefile	Mon Nov 30 19:18:50 2020	(r368192)
+++ head/sys/modules/qatfw/qat_dh895xcc/Makefile	Mon Nov 30 20:53:25 2020	(r368193)
@@ -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>
