From d46d9f261c5c69f19fe66fc916d02084212b75f2 Mon Sep 17 00:00:00 2001 From: Wujiahai Date: Tue, 30 Jul 2024 14:23:11 +0800 Subject: [PATCH 1/4] BMA/edma_drv: Fix DMA reset problem and change the version number. driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IA97VA CVE: NA ----------------------------------------- 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. Fixes: 915ded04f7e2 ("Huawei BMA: Adding Huawei BMA driver: host_edma_drv") Signed-off-by: Wujiahai --- drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h | 2 +- drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h b/drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h index 9eca34e6d47d..4a256085a2e8 100644 --- 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 index 3525d41c865f..52b50592e53b 100644 --- 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; -- Gitee From 45317af569948f128b42a37b143daef0051af655 Mon Sep 17 00:00:00 2001 From: Wujiahai Date: Tue, 30 Jul 2024 14:23:12 +0800 Subject: [PATCH 2/4] BMA/cdev_drv: Change the version number. driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IA97VA CVE: NA ----------------------------------------- 1. Change the iBMA driver version. Fixes: c3b73474211b ("Huawei BMA: To fix the bug in the iBMA driver code") Signed-off-by: Wujiahai --- drivers/net/ethernet/huawei/bma/cdev_drv/bma_cdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/huawei/bma/cdev_drv/bma_cdev.c b/drivers/net/ethernet/huawei/bma/cdev_drv/bma_cdev.c index 9022ceaa8f47..0ca73d40e6d8 100644 --- 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 -- Gitee From c53f7dcf8d7d44af9e816636b2453d8396101936 Mon Sep 17 00:00:00 2001 From: Wujiahai Date: Tue, 30 Jul 2024 14:23:13 +0800 Subject: [PATCH 3/4] BMA/veth_drv: Change the version number. driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IA97VA CVE: NA ----------------------------------------- 1. Change the iBMA driver version. Fixes: c3b73474211b ("Huawei BMA: To fix the bug in the iBMA driver code") Signed-off-by: Wujiahai --- drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.h b/drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.h index 777a9bbc4ac1..f54d2df2771e 100644 --- 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" -- Gitee From 3477ae781802d76abd527a1c7b6064beaa720e5d Mon Sep 17 00:00:00 2001 From: Wujiahai Date: Tue, 30 Jul 2024 14:23:14 +0800 Subject: [PATCH 4/4] BMA/kbox_drv: Change the version number. driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IA97VA CVE: NA ----------------------------------------- 1. Change the iBMA driver version. Fixes: c3b73474211b ("Huawei BMA: To fix the bug in the iBMA driver code") Signed-off-by: Wujiahai --- drivers/net/ethernet/huawei/bma/kbox_drv/kbox_include.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/huawei/bma/kbox_drv/kbox_include.h b/drivers/net/ethernet/huawei/bma/kbox_drv/kbox_include.h index 5406246ef548..efc108a5a9d8 100644 --- 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) -- Gitee