Commit e40aa173 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove EFUSEGetEfuseDefinition from hal_ops 



Remove EFUSEGetEfuseDefinition from hal_ops and remove its wrapper
EFUSE_GetEfuseDefinition(). Call rtl8188e_EFUSE_GetEfuseDefinition()
directly instead.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-26-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3bb7e968

drivers/staging/r8188eu/core/rtw_efuse.c

+10 −34
Original line number Diff line number Diff line
@@ -157,30 +157,6 @@ ReadEFuseByte( 
	*pbuf = (u8)(value32 & 0xff);

}



/*  */

/* 	Description: */

/* 		1. Execute E-Fuse read byte operation according as map offset and */

/* 		    save to E-Fuse table. */

/* 		2. Referred from SD1 Richard. */

/*  */

/* 	Assumption: */

/* 		1. Boot from E-Fuse and successfully auto-load. */

/* 		2. PASSIVE_LEVEL (USB interface) */

/*  */

/* 	Created by Roger, 2008.10.21. */

/*  */

/* 	2008/12/12 MH	1. Reorganize code flow and reserve bytes. and add description. */

/* 					2. Add efuse utilization collect. */

/* 	2008/12/22 MH	Read Efuse must check if we write section 1 data again!!! Sec1 */

/* 					write addr must be after sec5. */

/*  */



void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool pseudo

	)

{

	pAdapter->HalFunc.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut, pseudo);

}



/*-----------------------------------------------------------------------------

 * Function:	EFUSE_Read1Byte

 *
@@ -205,7 +181,7 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address) 
	u32 k = 0;

	u16 contentLen = 0;



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, false);

	rtl8188e_EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, false);



	if (Address < contentLen) {	/* E-fuse 512Byte */

		/* Write E-fuse Register address bit0~7 */
@@ -385,8 +361,8 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cnts 
	u8 res = _FAIL;

	u8 (*rw8)(struct adapter *, u16, u8*);



	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);

	rtl8188e_EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false);

	rtl8188e_EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);



	if (start_addr > real_content_len)

		return _FAIL;
@@ -421,7 +397,7 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cnts 
u16 efuse_GetMaxSize(struct adapter *padapter)

{

	u16 max_size;

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false);

	rtl8188e_EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false);

	return max_size;

}

/*  */
@@ -438,7 +414,7 @@ u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
{

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	rtl8188e_EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -456,7 +432,7 @@ u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
{

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	rtl8188e_EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -479,7 +455,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
	u8 ret = _SUCCESS;

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	rtl8188e_EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -571,7 +547,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data 
	u8 ret = _SUCCESS;

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	rtl8188e_EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -738,7 +714,7 @@ static void Efuse_ReadAllMap(struct adapter *pAdapter, u8 efuseType, u8 *Efuse, 


	rtl8188e_EfusePowerSwitch(pAdapter, false, true);



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);

	rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);



	rtl8188e_ReadEFuse(pAdapter, efuseType, 0, mapLen, Efuse, pseudo);
@@ -769,7 +745,7 @@ void EFUSE_ShadowMapUpdate( 
	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);

	rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);



	if (pEEPROM->bautoload_fail_flag)

		memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen);

drivers/staging/r8188eu/core/rtw_mp_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ int rtl8188eu_oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv) 
	cnts = pefuse->cnts;

	data = pefuse->data;



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);

	rtl8188e_EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);



	if ((addr + cnts) > max_available_size)

		return NDIS_STATUS_NOT_ACCEPTED;
@@ -944,7 +944,7 @@ int rtl8188eu_oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv) 
	cnts = pefuse->cnts;

	data = pefuse->data;



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);

	rtl8188e_EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);



	if ((addr + cnts) > max_available_size)

		return NDIS_STATUS_NOT_ACCEPTED;
@@ -1055,7 +1055,7 @@ int rtl8188eu_oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv) 
	struct adapter *Adapter = (struct adapter *)(poid_par_priv->adapter_context);

	u16	maplen = 0;



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&maplen, false);

	rtl8188e_EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&maplen, false);



	*poid_par_priv->bytes_rw = 0;

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+6 −7
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ static void Hal_EFUSEGetEfuseDefinition_Pseudo88E(struct adapter *pAdapter, u8 e 
	}

}



static void rtl8188e_EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest)

void rtl8188e_EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest)

{

	if (bPseudoTest)

		Hal_EFUSEGetEfuseDefinition_Pseudo88E(pAdapter, efuseType, type, pOut);
@@ -1205,7 +1205,7 @@ static int hal_EfusePgPacketRead_8188e(struct adapter *pAdapter, u8 offset, u8 * 
	u8 max_section = 0;

	u8 tmp_header = 0;



	EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (void *)&max_section, bPseudoTest);

	rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (void *)&max_section, bPseudoTest);



	if (!data)

		return false;
@@ -1341,7 +1341,7 @@ static bool hal_EfusePgPacketWrite2ByteHeader(struct adapter *pAdapter, u8 efuse 
	u8 pg_header = 0, tmp_header = 0, pg_header_temp = 0;

	u8 repeatcnt = 0;



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest);

	rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest);



	while (efuse_addr < efuse_max_available_len) {

		pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F;
@@ -1521,8 +1521,8 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, u 
	u16	startAddr = 0, efuse_max_available_len = 0, efuse_max = 0;

	struct pgpkt curPkt;



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&efuse_max, bPseudoTest);

	rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest);

	rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&efuse_max, bPseudoTest);



	if (efuseType == EFUSE_WIFI) {

		if (bPseudoTest) {
@@ -1610,7 +1610,7 @@ hal_EfusePgCheckAvailableAddr( 
	u16	efuse_max_available_len = 0;



	/* Change to check TYPE_EFUSE_MAP_LEN , because 8188E raw 256, logic map over 256. */

	EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len, false);

	rtl8188e_EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len, false);



	if (Efuse_GetCurrentSize(pAdapter, efuseType, bPseudoTest) >= efuse_max_available_len)

		return false;
@@ -1782,7 +1782,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->write_rfreg = &rtl8188e_PHY_SetRFReg;



	/*  Efuse related function */

	pHalFunc->EFUSEGetEfuseDefinition = &rtl8188e_EFUSE_GetEfuseDefinition;

	pHalFunc->EfuseGetCurrentSize = &rtl8188e_EfuseGetCurrentSize;

	pHalFunc->Efuse_PgPacketRead = &rtl8188e_Efuse_PgPacketRead;

	pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;

drivers/staging/r8188eu/include/hal_intf.h

+2 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ struct hal_ops { 
			       enum rf_radio_path eRFPath, u32 RegAddr,

			       u32 BitMask, u32 Data);



	void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType,

					u8 type, void *pOut, bool bPseudoTest);

	u16	(*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType,

				       bool bPseudoTest);

	int	(*Efuse_PgPacketRead)(struct adapter *adapter, u8 offset,
@@ -221,6 +219,8 @@ void rtl8188e_EfusePowerSwitch(struct adapter *pAdapter, u8 bWrite, u8 PwrState) 
void rtl8188e_ReadEFuse(struct adapter *Adapter, u8 efuseType,

			u16 _offset, u16 _size_byte, u8 *pbuf,

			bool bPseudoTest);

void rtl8188e_EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType,

				       u8 type, void *pOut, bool bPseudoTest);



void	rtw_hal_free_data(struct adapter *padapter);

uint rtw_hal_init(struct adapter *padapter);

drivers/staging/r8188eu/include/rtw_efuse.h

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ u8 rtw_BT_efuse_map_write(struct adapter *adapter, u16 addr, 
u16 Efuse_GetCurrentSize(struct adapter *adapter, u8 efusetype, bool test);

u8 Efuse_CalculateWordCnts(u8 word_en);

void ReadEFuseByte(struct adapter *adapter, u16 _offset, u8 *pbuf, bool test);

void EFUSE_GetEfuseDefinition(struct adapter *adapt, u8 type, u8 type1,

			      void *out, bool bPseudoTest);

u8 efuse_OneByteRead(struct adapter *adapter, u16 addr, u8 *data, bool test);

u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data, bool	test);