!10396 BMA: Fix DMA reset problem and change the version number

Merge Pull Request from: @ci-robot PR sync from: Li Nan <linan122@huawei.com> https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SYJ3P6KBJD6J7JBXNKWW4I7TBTKK6IGF/ From: Wujiahai <wujiahai@huawei.com> 1. Resolved the problem that the DMA reset does not meet the expectation due to the mismatch between the register configuration and the communication transmission direction during DMA reset. 2. Change the iBMA driver version. Wujiahai (4): BMA/edma_drv: Fix DMA reset problem and change the version number. BMA/cdev_drv: Change the version number. BMA/veth_drv: Change the version number. BMA/kbox_drv: Change the version number. -- 2.27.0 https://gitee.com/openeuler/kernel/issues/IA97VA Link:https://gitee.com/openeuler/kernel/pulls/10396 Reviewed-by: Chen Jiesong <chenjiesong@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
openeuler-mirror · Jul 30, 2024 · 60a3bc9 · 60a3bc9
2 parents eaf5cff + 3477ae7
commit 60a3bc9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/drivers/net/ethernet/huawei/bma/cdev_drv/bma_cdev.c b/drivers/net/ethernet/huawei/bma/cdev_drv/bma_cdev.c
@@ -28,7 +28,7 @@
 #ifdef DRV_VERSION
 #define CDEV_VERSION		MICRO_TO_STR(DRV_VERSION)
 #else
-#define CDEV_VERSION		"0.3.6"
+#define CDEV_VERSION		"0.3.7"
 #endif
 
 #define CDEV_DEFAULT_NUM	4

diff --git a/drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h b/drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h
@@ -71,7 +71,7 @@ struct bma_pci_dev_s {
 #ifdef DRV_VERSION
 #define BMA_VERSION MICRO_TO_STR(DRV_VERSION)
 #else
-#define BMA_VERSION "0.3.6"
+#define BMA_VERSION "0.3.7"
 #endif
 
 #ifdef CONFIG_ARM64

diff --git a/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c b/drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c
@@ -689,9 +689,9 @@ void edma_host_reset_dma(struct edma_host_s *edma_host, int dir)
 		return;
 
 	if (dir == BMC_TO_HOST)
-		reg_addr = REG_PCIE1_DMA_READ_ENGINE_ENABLE;
-	else if (dir == HOST_TO_BMC)
 		reg_addr = REG_PCIE1_DMA_WRITE_ENGINE_ENABLE;
+	else if (dir == HOST_TO_BMC)
+		reg_addr = REG_PCIE1_DMA_READ_ENGINE_ENABLE;
 	else
 		return;
 

diff --git a/drivers/net/ethernet/huawei/bma/kbox_drv/kbox_include.h b/drivers/net/ethernet/huawei/bma/kbox_drv/kbox_include.h
@@ -23,7 +23,7 @@
 #ifdef DRV_VERSION
 #define KBOX_VERSION MICRO_TO_STR(DRV_VERSION)
 #else
-#define KBOX_VERSION "0.3.6"
+#define KBOX_VERSION "0.3.7"
 #endif
 
 #define UNUSED(x) (x = x)

diff --git a/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.h b/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.h
@@ -31,7 +31,7 @@ extern "C" {
 #ifdef DRV_VERSION
 #define VETH_VERSION	MICRO_TO_STR(DRV_VERSION)
 #else
-#define VETH_VERSION	"0.3.6"
+#define VETH_VERSION	"0.3.7"
 #endif
 
 #define MODULE_NAME	"veth"