diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index 98afe42ffadffc02ca70271cd2f1ebd864c21f92..75542fedfb227696a53788f3d50526f2e032d7b5 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -182,6 +182,15 @@ struct hnae3_vector_info {
 #define HNAE3_RING_GL_RX 0
 #define HNAE3_RING_GL_TX 1
 
+#define HNAE3_FW_VERSION_BYTE3_SHIFT	24
+#define HNAE3_FW_VERSION_BYTE3_MASK	GENMASK(31, 24)
+#define HNAE3_FW_VERSION_BYTE2_SHIFT	16
+#define HNAE3_FW_VERSION_BYTE2_MASK	GENMASK(23, 16)
+#define HNAE3_FW_VERSION_BYTE1_SHIFT	8
+#define HNAE3_FW_VERSION_BYTE1_MASK	GENMASK(15, 8)
+#define HNAE3_FW_VERSION_BYTE0_SHIFT	0
+#define HNAE3_FW_VERSION_BYTE0_MASK	GENMASK(7, 0)
+
 struct hnae3_ring_chain_node {
 	struct hnae3_ring_chain_node *next;
 	u32 tqp_index;
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index 5e800bd290552dc80aa8e6e8930b9673ef1f30c4..3dc6b65062fe7faa50bc6b987a165e0166090551 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -545,11 +545,15 @@ static void hns3_get_drvinfo(struct net_device *netdev,
 	fw_version = priv->ae_handle->ae_algo->ops->get_fw_version(h);
 
 	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
-		 "%d.%d.%d.%d",
-		 hnae3_get_field(fw_version, 0xFF000000, 24),
-		 hnae3_get_field(fw_version, 0x00FF0000, 16),
-		 hnae3_get_field(fw_version, 0x0000FF00, 8),
-		 hnae3_get_field(fw_version, 0x000000FF, 0));
+		 "%lu.%lu.%lu.%lu",
+		 hnae3_get_field(fw_version, HNAE3_FW_VERSION_BYTE3_MASK,
+				 HNAE3_FW_VERSION_BYTE3_SHIFT),
+		 hnae3_get_field(fw_version, HNAE3_FW_VERSION_BYTE2_MASK,
+				 HNAE3_FW_VERSION_BYTE2_SHIFT),
+		 hnae3_get_field(fw_version, HNAE3_FW_VERSION_BYTE1_MASK,
+				 HNAE3_FW_VERSION_BYTE1_SHIFT),
+		 hnae3_get_field(fw_version, HNAE3_FW_VERSION_BYTE0_MASK,
+				 HNAE3_FW_VERSION_BYTE0_SHIFT));
 }
 
 static u32 hns3_get_link(struct net_device *netdev)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
index c0c521e9fc1569dac95031bb1d5957dc89efa973..95ed67ac38f4933cc8a7582762efaf18a7592c39 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c
@@ -432,7 +432,15 @@ int hclge_cmd_init(struct hclge_dev *hdev)
 	}
 	hdev->fw_version = version;
 
-	dev_info(&hdev->pdev->dev, "The firmware version is %08x\n", version);
+	pr_info_once("The firmware version is %lu.%lu.%lu.%lu\n",
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE3_MASK,
+				     HNAE3_FW_VERSION_BYTE3_SHIFT),
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE2_MASK,
+				     HNAE3_FW_VERSION_BYTE2_SHIFT),
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE1_MASK,
+				     HNAE3_FW_VERSION_BYTE1_SHIFT),
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE0_MASK,
+				     HNAE3_FW_VERSION_BYTE0_SHIFT));
 
 	/* ask the firmware to enable some features, driver can work without
 	 * it.
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
index 8011f849897ce89b25f563f7a43b17357b9a161a..227f0e6f9d7cd7f30f679c021ceb1cfb1760818d 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
@@ -410,8 +410,15 @@ int hclgevf_cmd_init(struct hclgevf_dev *hdev)
 	}
 	hdev->fw_version = version;
 
-	dev_info(&hdev->pdev->dev, "The firmware version is %08x\n", version);
-
+	pr_info_once("The firmware version is %lu.%lu.%lu.%lu\n",
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE3_MASK,
+				     HNAE3_FW_VERSION_BYTE3_SHIFT),
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE2_MASK,
+				     HNAE3_FW_VERSION_BYTE2_SHIFT),
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE1_MASK,
+				     HNAE3_FW_VERSION_BYTE1_SHIFT),
+		     hnae3_get_field(version, HNAE3_FW_VERSION_BYTE0_MASK,
+				     HNAE3_FW_VERSION_BYTE0_SHIFT));
 	return 0;
 
 err_cmd_init: