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

Commit 7962024e authored by Sreenivasa Honnur's avatar Sreenivasa Honnur Committed by Jeff Garzik
Browse files

S2io: Check for register initialization completion before accesing device registers 



- Making sure register initialisation is complete before proceeding further.
  The driver must wait until initialization is complete before attempting to
  access any other device registers.

Signed-off-by: default avatarSurjit Reang <surjit.reang@neterion.com>
Signed-off-by: default avatarSreenivasa Honnur <sreenivasa.honnur@neterion.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 17cf803a

drivers/net/s2io-regs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,7 @@ struct XENA_dev_config { 
#define ADAPTER_STATUS_RC_PRC_QUIESCENT    vBIT(0xFF,16,8)

#define ADAPTER_STATUS_RC_PRC_QUIESCENT    vBIT(0xFF,16,8)

#define ADAPTER_STATUS_MC_DRAM_READY       s2BIT(24)

#define ADAPTER_STATUS_MC_DRAM_READY       s2BIT(24)

#define ADAPTER_STATUS_MC_QUEUES_READY     s2BIT(25)

#define ADAPTER_STATUS_MC_QUEUES_READY     s2BIT(25)

#define ADAPTER_STATUS_RIC_RUNNING         s2BIT(26)

#define ADAPTER_STATUS_M_PLL_LOCK          s2BIT(30)

#define ADAPTER_STATUS_M_PLL_LOCK          s2BIT(30)

#define ADAPTER_STATUS_P_PLL_LOCK          s2BIT(31)

#define ADAPTER_STATUS_P_PLL_LOCK          s2BIT(31)

drivers/net/s2io.c

+15 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ 
#include "s2io.h"

#include "s2io.h"

#include "s2io-regs.h"

#include "s2io-regs.h"





#define DRV_VERSION "2.0.26.6"

#define DRV_VERSION "2.0.26.10"





/* S2io Driver name & version. */

/* S2io Driver name & version. */

static char s2io_driver_name[] = "Neterion";

static char s2io_driver_name[] = "Neterion";
@@ -1100,6 +1100,20 @@ static int init_nic(struct s2io_nic *nic) 
	msleep(500);

	msleep(500);

	val64 = readq(&bar0->sw_reset);

	val64 = readq(&bar0->sw_reset);





	/* Ensure that it's safe to access registers by checking

	 * RIC_RUNNING bit is reset. Check is valid only for XframeII.

	 */

	if (nic->device_type == XFRAME_II_DEVICE) {

		for (i = 0; i < 50; i++) {

			val64 = readq(&bar0->adapter_status);

			if (!(val64 & ADAPTER_STATUS_RIC_RUNNING))

				break;

			msleep(10);

		}

		if (i == 50)

			return -ENODEV;

	}



	/*  Enable Receiving broadcasts */

	/*  Enable Receiving broadcasts */

	add = &bar0->mac_cfg;

	add = &bar0->mac_cfg;

	val64 = readq(&bar0->mac_cfg);

	val64 = readq(&bar0->mac_cfg);