Unverified Commit 1e94b0d2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10333 BMA: Fix DMA reset problem and change the version 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3EVKHX2LZTRX3VY227GKP3JUFITZOBGH/ 
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/10333

 

Reviewed-by: default avatarChen Jiesong <chenjiesong@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 21ce84da 13bd1658

drivers/net/ethernet/huawei/bma/cdev_drv/bma_cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/huawei/bma/edma_drv/bma_pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/huawei/bma/edma_drv/edma_host.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/huawei/bma/kbox_drv/kbox_include.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/huawei/bma/veth_drv/veth_hb.h

+1 −1
Original line number Diff line number Diff line
@@ -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"