Commit 14e29869 authored by Wujiahai's avatar Wujiahai Committed by Wang Hai
Browse files

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: 22c4847a ("Huawei BMA: Fix iBMA driver bug")
Signed-off-by: default avatarWujiahai <wujiahai@huawei.com>
parent 828b7a33

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.5"

#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;