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

Commit 8c68bd40 authored by Michael Büsch's avatar Michael Büsch Committed by John W. Linville
Browse files

ssb: Make ssb_wait_bit multi-bit safe 



ssb_wait_bit was designed for only one-bit bitmasks.
People start using it for multi-bit bitmasks. Make the "set" case
is safe for this. The "unset" case is already safe.

This does not change behavior of the current code.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f4f314bf

drivers/ssb/main.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1192,9 +1192,9 @@ void ssb_device_enable(struct ssb_device *dev, u32 core_specific_flags) 
}

}

EXPORT_SYMBOL(ssb_device_enable);

EXPORT_SYMBOL(ssb_device_enable);





/* Wait for a bit in a register to get set or unset.

/* Wait for bitmask in a register to get set or cleared.

 * timeout is in units of ten-microseconds */

 * timeout is in units of ten-microseconds */

static int ssb_wait_bit(struct ssb_device *dev, u16 reg, u32 bitmask,

static int ssb_wait_bits(struct ssb_device *dev, u16 reg, u32 bitmask,

			 int timeout, int set)

			 int timeout, int set)

{

{

	int i;

	int i;
@@ -1203,7 +1203,7 @@ static int ssb_wait_bit(struct ssb_device *dev, u16 reg, u32 bitmask, 
	for (i = 0; i < timeout; i++) {

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

		val = ssb_read32(dev, reg);

		val = ssb_read32(dev, reg);

		if (set) {

		if (set) {

			if (val & bitmask)

			if ((val & bitmask) == bitmask)

				return 0;

				return 0;

		} else {

		} else {

			if (!(val & bitmask))

			if (!(val & bitmask))
@@ -1227,8 +1227,8 @@ void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags) 




	reject = ssb_tmslow_reject_bitmask(dev);

	reject = ssb_tmslow_reject_bitmask(dev);

	ssb_write32(dev, SSB_TMSLOW, reject | SSB_TMSLOW_CLOCK);

	ssb_write32(dev, SSB_TMSLOW, reject | SSB_TMSLOW_CLOCK);

	ssb_wait_bit(dev, SSB_TMSLOW, reject, 1000, 1);

	ssb_wait_bits(dev, SSB_TMSLOW, reject, 1000, 1);

	ssb_wait_bit(dev, SSB_TMSHIGH, SSB_TMSHIGH_BUSY, 1000, 0);

	ssb_wait_bits(dev, SSB_TMSHIGH, SSB_TMSHIGH_BUSY, 1000, 0);

	ssb_write32(dev, SSB_TMSLOW,

	ssb_write32(dev, SSB_TMSLOW,

		    SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK |

		    SSB_TMSLOW_FGC | SSB_TMSLOW_CLOCK |

		    reject | SSB_TMSLOW_RESET |

		    reject | SSB_TMSLOW_RESET |