evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qlcnic: change reg name

Browse source 
Change QLCNIC_CRB_DEV_REF_COUNT to QLCNIC_CRB_DRV_ACTIVE to match
document.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amit Kumar Salecha 2010-08-25 04:03:05 +00:00 • committed by David S. Miller
parent b18971d199
commit 31018e068e
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/qlcnic/qlcnic_ethtool.c
View file

@ -99,7 +99,7 @@ static const u32 diag_registers[] = {
CRB_XG_STATE_P3, CRB_XG_STATE_P3,
CRB_FW_CAPABILITIES_1, CRB_FW_CAPABILITIES_1,
ISR_INT_STATE_REG, ISR_INT_STATE_REG,
QLCNIC_CRB_DEV_REF_COUNT, QLCNIC_CRB_DRV_ACTIVE,
QLCNIC_CRB_DEV_STATE, QLCNIC_CRB_DEV_STATE,
QLCNIC_CRB_DRV_STATE, QLCNIC_CRB_DRV_STATE,
QLCNIC_CRB_DRV_SCRATCH, QLCNIC_CRB_DRV_SCRATCH,

2
drivers/net/qlcnic/qlcnic_hdr.h
View file

@ -698,7 +698,7 @@ enum {
#define QLCNIC_PEG_ALIVE_COUNTER (QLCNIC_CAM_RAM(0xb0)) #define QLCNIC_PEG_ALIVE_COUNTER (QLCNIC_CAM_RAM(0xb0))
#define QLCNIC_PEG_HALT_STATUS1 (QLCNIC_CAM_RAM(0xa8)) #define QLCNIC_PEG_HALT_STATUS1 (QLCNIC_CAM_RAM(0xa8))
#define QLCNIC_PEG_HALT_STATUS2 (QLCNIC_CAM_RAM(0xac)) #define QLCNIC_PEG_HALT_STATUS2 (QLCNIC_CAM_RAM(0xac))
#define QLCNIC_CRB_DEV_REF_COUNT (QLCNIC_CAM_RAM(0x138)) #define QLCNIC_CRB_DRV_ACTIVE (QLCNIC_CAM_RAM(0x138))
#define QLCNIC_CRB_DEV_STATE (QLCNIC_CAM_RAM(0x140)) #define QLCNIC_CRB_DEV_STATE (QLCNIC_CAM_RAM(0x140))
#define QLCNIC_CRB_DRV_STATE (QLCNIC_CAM_RAM(0x144)) #define QLCNIC_CRB_DRV_STATE (QLCNIC_CAM_RAM(0x144))

12
drivers/net/qlcnic/qlcnic_main.c
View file

@ -540,7 +540,7 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
void __iomem *priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE; void __iomem *priv_op = adapter->ahw.pci_base0 + QLCNIC_DRV_OP_MODE;
/* If other drivers are not in use set their privilege level */ /* If other drivers are not in use set their privilege level */
ref_count = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); ref_count = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
ret = qlcnic_api_lock(adapter); ret = qlcnic_api_lock(adapter);
if (ret) if (ret)
goto err_lock; goto err_lock;
@ -2404,9 +2404,9 @@ qlcnic_clr_all_drv_state(struct qlcnic_adapter *adapter, u8 failed)
if (qlcnic_api_lock(adapter)) if (qlcnic_api_lock(adapter))
goto err; goto err;
val = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
QLC_DEV_CLR_REF_CNT(val, adapter->portnum); QLC_DEV_CLR_REF_CNT(val, adapter->portnum);
QLCWR32(adapter, QLCNIC_CRB_DEV_REF_COUNT, val); QLCWR32(adapter, QLCNIC_CRB_DRV_ACTIVE, val);
if (failed) { if (failed) {
QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_FAILED); QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_FAILED);
@ -2433,7 +2433,7 @@ qlcnic_check_drv_state(struct qlcnic_adapter *adapter)
int act, state; int act, state;
state = QLCRD32(adapter, QLCNIC_CRB_DRV_STATE); state = QLCRD32(adapter, QLCNIC_CRB_DRV_STATE);
act = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); act = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
if (((state & 0x11111111) == (act & 0x11111111)) || if (((state & 0x11111111) == (act & 0x11111111)) ||
((act & 0x11111111) == ((state >> 1) & 0x11111111))) ((act & 0x11111111) == ((state >> 1) & 0x11111111)))
@ -2468,10 +2468,10 @@ qlcnic_can_start_firmware(struct qlcnic_adapter *adapter)
if (qlcnic_api_lock(adapter)) if (qlcnic_api_lock(adapter))
return -1; return -1;
val = QLCRD32(adapter, QLCNIC_CRB_DEV_REF_COUNT); val = QLCRD32(adapter, QLCNIC_CRB_DRV_ACTIVE);
if (!(val & (1 << (portnum * 4)))) { if (!(val & (1 << (portnum * 4)))) {
QLC_DEV_SET_REF_CNT(val, portnum); QLC_DEV_SET_REF_CNT(val, portnum);
QLCWR32(adapter, QLCNIC_CRB_DEV_REF_COUNT, val); QLCWR32(adapter, QLCNIC_CRB_DRV_ACTIVE, val);
} }
prev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE); prev_state = QLCRD32(adapter, QLCNIC_CRB_DEV_STATE);