Commit f6265746 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: got rid of #ifdef __mips__ by new dma_spin_for_len() 



Code cleanup.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent de317067

drivers/staging/brcm80211/brcmsmac/hnddma.c

+1 −10
Original line number Diff line number Diff line
@@ -728,16 +728,7 @@ static void *_dma_rx(dma_info_t *di) 


	len = le16_to_cpu(*(u16 *) (head->data));

	DMA_TRACE(("%s: dma_rx len %d\n", di->name, len));



#if defined(__mips__)

#define OSL_UNCACHED(va)        ((void *)KSEG1ADDR((va)))

	if (!len) {

		while (!(len = *(u16 *) OSL_UNCACHED(head->data)))

			udelay(1);



		*(u16 *) (head->data) = cpu_to_le16((u16) len);

	}

#endif				/* defined(__mips__) */

	dma_spin_for_len(len, head);



	/* set actual length */

	pkt_len = min((di->rxoffset + len), di->rxbufsize);

drivers/staging/brcm80211/include/hnddma.h

+19 −0
Original line number Diff line number Diff line
@@ -204,4 +204,23 @@ extern const di_fcn_t dma64proc; 
extern uint dma_addrwidth(si_t *sih, void *dmaregs);

void dma_walk_packets(struct hnddma_pub *dmah, void (*callback_fnc)

		      (void *pkt, void *arg_a), void *arg_a);



/*

 * DMA(Bug) on some chips seems to declare that the packet is ready, but the

 * packet length is not updated yet (by DMA) on the expected time.

 * Workaround is to hold processor till DMA updates the length, and stay off

 * the bus to allow DMA update the length in buffer

 */

static inline void dma_spin_for_len(uint len, struct sk_buff *head)

{

#if defined(__mips__)

	if (!len) {

		while (!(len = *(u16 *) KSEG1ADDR(head->data)))

			udelay(1);



		*(u16 *) (head->data) = cpu_to_le16((u16) len);

	}

#endif				/* defined(__mips__) */

}



#endif				/* _hnddma_h_ */