2 files changed, 14 insertions, 15 deletions

diff --git a/sys/dev/qat/qat_api/common/compression/dc_datapath.c b/sys/dev/qat/qat_api/common/compression/dc_datapath.c
index de14be2fdb0d..312b2d6749cc 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_datapath.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_datapath.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright(c) 2007-2022 Intel Corporation */
+/* Copyright(c) 2007-2025 Intel Corporation */
 /**
  *****************************************************************************
  * @file dc_datapath.c
@@ -118,14 +118,19 @@ dcCompression_ProcessCallback(void *pRespMsg)
 
 	/* Cast response message to compression response message type */
 	pCompRespMsg = (icp_qat_fw_comp_resp_t *)pRespMsg;
-
+	if (!(pCompRespMsg)) {
+		QAT_UTILS_LOG("pCompRespMsg is NULL\n");
+		return;
+	}
 	/* Extract request data pointer from the opaque data */
 	LAC_MEM_SHARED_READ_TO_PTR(pCompRespMsg->opaque_data, pReqData);
+	if (!(pReqData)) {
+		QAT_UTILS_LOG("pReqData is NULL\n");
+		return;
+	}
 
 	/* Extract fields from the request data structure */
 	pCookie = (dc_compression_cookie_t *)pReqData;
-	if (!pCookie)
-		return;
 
 	pSessionDesc = DC_SESSION_DESC_FROM_CTX_GET(pCookie->pSessionHandle);
 	pService = (sal_compression_service_t *)(pCookie->dcInstance);
@@ -523,7 +528,7 @@ dcCheckOpData(sal_compression_service_t *pService, CpaDcOpData *pOpData)
 	if (CPA_TRUE == pOpData->integrityCrcCheck &&
 	    NULL == pOpData->pCrcData) {
 		LAC_INVALID_PARAM_LOG("Integrity CRC data structure "
-				      "not intialized in CpaDcOpData");
+				      "not initialized in CpaDcOpData");
 		return CPA_STATUS_INVALID_PARAM;
 	}
 
@@ -1401,7 +1406,6 @@ cpaDcCompressData(CpaInstanceHandle dcInstance,
 	CpaInstanceHandle insHandle = NULL;
 	Cpa64U srcBuffSize = 0;
 
-
 	if (CPA_INSTANCE_HANDLE_SINGLE == dcInstance) {
 		insHandle = dcGetFirstHandle();
 	} else {
@@ -1507,7 +1511,6 @@ cpaDcCompressData2(CpaInstanceHandle dcInstance,
 		return CPA_STATUS_INVALID_PARAM;
 	}
 
-
 	if ((CPA_TRUE == pOpData->compressAndVerify) &&
 	    (CPA_TRUE == pOpData->compressAndVerifyAndRecover) &&
 	    (CPA_FALSE == pOpData->integrityCrcCheck)) {
@@ -1526,7 +1529,6 @@ cpaDcCompressData2(CpaInstanceHandle dcInstance,
 		return CPA_STATUS_UNSUPPORTED;
 	}
 
-
 	if (CPA_INSTANCE_HANDLE_SINGLE == dcInstance) {
 		insHandle = dcGetFirstHandle();
 	} else {
@@ -1703,7 +1705,6 @@ dcDecompressDataCheck(CpaInstanceHandle insHandle,
 		return CPA_STATUS_INVALID_PARAM;
 	}
 
-
 	*srcBufferSize = srcBuffSize;
 
 	return CPA_STATUS_SUCCESS;
@@ -1724,7 +1725,6 @@ cpaDcDecompressData(CpaInstanceHandle dcInstance,
 	Cpa64U srcBuffSize = 0;
 	CpaStatus status = CPA_STATUS_SUCCESS;
 
-
 	if (CPA_INSTANCE_HANDLE_SINGLE == dcInstance) {
 		insHandle = dcGetFirstHandle();
 	} else {
@@ -1783,7 +1783,6 @@ cpaDcDecompressData(CpaInstanceHandle dcInstance,
 		return CPA_STATUS_INVALID_PARAM;
 	}
 
-
 	if (CPA_DC_STATEFUL == pSessionDesc->sessState) {
 		/* Lock the session to check if there are in-flight stateful
 		 * requests */
@@ -1864,7 +1863,6 @@ cpaDcDecompressData2(CpaInstanceHandle dcInstance,
 					   callbackTag);
 	}
 
-
 	if (CPA_INSTANCE_HANDLE_SINGLE == dcInstance) {
 		insHandle = dcGetFirstHandle();
 	} else {
@@ -1931,7 +1929,6 @@ cpaDcDecompressData2(CpaInstanceHandle dcInstance,
 		return CPA_STATUS_INVALID_PARAM;
 	}
 
-
 	if (CPA_DC_STATEFUL == pSessionDesc->sessState) {
 		/* Lock the session to check if there are in-flight stateful
 		 * requests */
diff --git a/sys/dev/qat/qat_api/common/compression/dc_session.c b/sys/dev/qat/qat_api/common/compression/dc_session.c
index c92d6eebdc47..60f4410dac32 100644
--- a/sys/dev/qat/qat_api/common/compression/dc_session.c
+++ b/sys/dev/qat/qat_api/common/compression/dc_session.c
@@ -151,7 +151,8 @@ dcCompHwBlockPopulate(sal_compression_service_t *pService,
 	}
 
 	/* Set delay match mode */
-	if (CPA_TRUE == pService->comp_device_data.enableDmm) {
+	if (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED ==
+	    pService->comp_device_data.enableDmm) {
 		dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED;
 	} else {
 		dmm = ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_DISABLED;
@@ -282,7 +283,8 @@ dcCompHwBlockPopulateGen4(sal_compression_service_t *pService,
 		hw_comp_lower_csr.hash_update =
 		    ICP_QAT_HW_COMP_20_SKIP_HASH_UPDATE_DONT_ALLOW;
 		hw_comp_lower_csr.edmm =
-		    (CPA_TRUE == pService->comp_device_data.enableDmm) ?
+		    (ICP_QAT_HW_COMPRESSION_DELAYED_MATCH_ENABLED ==
+			pService->comp_device_data.enableDmm) ?
 		    ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_ENABLED :
 		    ICP_QAT_HW_COMP_20_EXTENDED_DELAY_MATCH_MODE_EDMM_DISABLED;