Commit 972da7ec authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

bcma: update core (en|dis)abling functions 



Broadocm updated their code, this may be needed for newer hardware or
some corner cases.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 55fee98a

drivers/bcma/core.c

+25 −3
Original line number Diff line number Diff line
@@ -9,6 +9,25 @@ 
#include <linux/export.h>

#include <linux/bcma/bcma.h>



static bool bcma_core_wait_value(struct bcma_device *core, u16 reg, u32 mask,

				 u32 value, int timeout)

{

	unsigned long deadline = jiffies + timeout;

	u32 val;



	do {

		val = bcma_aread32(core, reg);

		if ((val & mask) == value)

			return true;

		cpu_relax();

		udelay(10);

	} while (!time_after_eq(jiffies, deadline));



	bcma_warn(core->bus, "Timeout waiting for register 0x%04X!\n", reg);



	return false;

}



bool bcma_core_is_enabled(struct bcma_device *core)

{

	if ((bcma_aread32(core, BCMA_IOCTL) & (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC))
@@ -25,13 +44,15 @@ void bcma_core_disable(struct bcma_device *core, u32 flags) 
	if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)

		return;



	bcma_awrite32(core, BCMA_IOCTL, flags);

	bcma_aread32(core, BCMA_IOCTL);

	udelay(10);

	bcma_core_wait_value(core, BCMA_RESET_ST, ~0, 0, 300);



	bcma_awrite32(core, BCMA_RESET_CTL, BCMA_RESET_CTL_RESET);

	bcma_aread32(core, BCMA_RESET_CTL);

	udelay(1);



	bcma_awrite32(core, BCMA_IOCTL, flags);

	bcma_aread32(core, BCMA_IOCTL);

	udelay(10);

}

EXPORT_SYMBOL_GPL(bcma_core_disable);
@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device *core, u32 flags) 
	bcma_aread32(core, BCMA_IOCTL);



	bcma_awrite32(core, BCMA_RESET_CTL, 0);

	bcma_aread32(core, BCMA_RESET_CTL);

	udelay(1);



	bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));