Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deffab05 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

qlcnic: remove obsolete register 



MSI_MODE, CAPABILITIES_FW and SCRATCHPAD registers are obsolete.
Driver should not use them.

Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2372a5f1

drivers/net/qlcnic/qlcnic_ethtool.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -606,19 +606,12 @@ qlcnic_set_pauseparam(struct net_device *netdev, 
static int qlcnic_reg_test(struct net_device *dev)

static int qlcnic_reg_test(struct net_device *dev)

{

{

	struct qlcnic_adapter *adapter = netdev_priv(dev);

	struct qlcnic_adapter *adapter = netdev_priv(dev);

	u32 data_read, data_written;

	u32 data_read;





	data_read = QLCRD32(adapter, QLCNIC_PCIX_PH_REG(0));

	data_read = QLCRD32(adapter, QLCNIC_PCIX_PH_REG(0));

	if ((data_read & 0xffff) != adapter->pdev->vendor)

	if ((data_read & 0xffff) != adapter->pdev->vendor)

		return 1;

		return 1;





	data_written = (u32)0xa5a5a5a5;



	QLCWR32(adapter, CRB_SCRATCHPAD_TEST, data_written);

	data_read = QLCRD32(adapter, CRB_SCRATCHPAD_TEST);

	if (data_written != data_read)

		return 1;



	return 0;

	return 0;

}

}

drivers/net/qlcnic/qlcnic_hdr.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -585,15 +585,8 @@ enum { 
 * for backward compability

 * for backward compability

 */

 */

#define CRB_NIC_CAPABILITIES_HOST	QLCNIC_REG(0x1a8)

#define CRB_NIC_CAPABILITIES_HOST	QLCNIC_REG(0x1a8)

#define CRB_NIC_CAPABILITIES_FW 	QLCNIC_REG(0x1dc)

#define CRB_NIC_MSI_MODE_HOST		QLCNIC_REG(0x270)

#define CRB_NIC_MSI_MODE_FW	  	QLCNIC_REG(0x274)





#define INTR_SCHEME_PERPORT	      	0x1

#define INTR_SCHEME_PERPORT	      	0x1

#define MSI_MODE_MULTIFUNC	      	0x1



/* used for ethtool tests */

#define CRB_SCRATCHPAD_TEST	    QLCNIC_REG(0x280)





/*

/*

 * CrbPortPhanCntrHi/Lo is used to pass the address of HostPhantomIndex address

 * CrbPortPhanCntrHi/Lo is used to pass the address of HostPhantomIndex address

drivers/net/qlcnic/qlcnic_init.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1189,7 +1189,6 @@ int qlcnic_init_firmware(struct qlcnic_adapter *adapter) 
		return err;

		return err;





	QLCWR32(adapter, CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT);

	QLCWR32(adapter, CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT);

	QLCWR32(adapter, CRB_NIC_MSI_MODE_HOST, MSI_MODE_MULTIFUNC);

	QLCWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);

	QLCWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);

	QLCWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);

	QLCWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);