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

Commit c15f63bf authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Update interrupt handling by removing an extra SPI read 



Remove separate interrupt register reading from the interrupt handling
routine. This will slightly improve interrupt performance.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 284134eb

drivers/net/wireless/wl12xx/wl1271_main.c

+30 −44
Original line number Diff line number Diff line
@@ -76,20 +76,14 @@ static void wl1271_power_on(struct wl1271 *wl) 
	wl->set_power(true);

}



static void wl1271_fw_status(struct wl1271 *wl, struct wl1271_fw_status *status)

static void wl1271_fw_status(struct wl1271 *wl,

			     struct wl1271_fw_status *status)

{

	u32 total = 0;

	int i;



	/*

	 * FIXME: Reading the FW status directly from the registers seems to

	 * be the right thing to do, but it doesn't work.  And in the

	 * reference driver, there is a workaround called

	 * USE_SDIO_24M_WORKAROUND, which reads the status from memory

	 * instead, so we do the same here.

	 */



	wl1271_spi_mem_read(wl, STATUS_MEM_ADDRESS, status, sizeof(*status));

	wl1271_spi_reg_read(wl, FW_STATUS_ADDR, status,

			    sizeof(*status), false);



	wl1271_debug(DEBUG_IRQ, "intr: 0x%x (fw_rx_counter = %d, "

		     "drv_rx_counter = %d, tx_results_counter = %d)",
@@ -114,11 +108,10 @@ static void wl1271_fw_status(struct wl1271 *wl, struct wl1271_fw_status *status) 
	wl->time_offset = jiffies_to_usecs(jiffies) - status->fw_localtime;

}



#define WL1271_IRQ_MAX_LOOPS 10

static void wl1271_irq_work(struct work_struct *work)

{

	u32 intr, ctr = WL1271_IRQ_MAX_LOOPS;

	int ret;

	u32 intr;

	struct wl1271 *wl =

		container_of(work, struct wl1271, irq_work);
@@ -135,7 +128,8 @@ static void wl1271_irq_work(struct work_struct *work) 


	wl1271_reg_write32(wl, ACX_REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);



	intr = wl1271_reg_read32(wl, ACX_REG_INTERRUPT_CLEAR);

	wl1271_fw_status(wl, wl->fw_status);

	intr = wl->fw_status->intr;

	if (!intr) {

		wl1271_debug(DEBUG_IRQ, "Zero interrupt received.");

		goto out_sleep;
@@ -143,10 +137,6 @@ static void wl1271_irq_work(struct work_struct *work) 


	intr &= WL1271_INTR_MASK;



	do {

		wl1271_fw_status(wl, wl->fw_status);





	if (intr & (WL1271_ACX_INTR_EVENT_A |

		    WL1271_ACX_INTR_EVENT_B)) {

		wl1271_debug(DEBUG_IRQ,
@@ -177,10 +167,6 @@ static void wl1271_irq_work(struct work_struct *work) 
		wl1271_rx(wl, wl->fw_status);

	}



		intr = wl1271_reg_read32(wl, ACX_REG_INTERRUPT_CLEAR);

		intr &= WL1271_INTR_MASK;

	} while (intr && --ctr);



out_sleep:

	wl1271_reg_write32(wl, ACX_REG_INTERRUPT_MASK,

			   WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK));

drivers/net/wireless/wl12xx/wl1271_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#define REGISTERS_WORK_SIZE 0x0000b000



#define HW_ACCESS_ELP_CTRL_REG_ADDR         0x1FFFC

#define STATUS_MEM_ADDRESS                  0x40400

#define FW_STATUS_ADDR                      (0x14FC0 + 0xA000)



/* ELP register commands */

#define ELPCTRL_WAKE_UP             0x1