Commit a513c315 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream' of... 

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
parents fd6746da 113b898e

drivers/net/wireless/ray_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ 
#include <pcmcia/ds.h>

#include <pcmcia/mem_op.h>



#include <net/ieee80211.h>

#include <linux/wireless.h>

#include <net/iw_handler.h>



#include <asm/io.h>

#include <asm/system.h>

drivers/net/wireless/zd1211rw/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw.o 
zd1211rw-objs := zd_chip.o zd_ieee80211.o \

		zd_mac.o zd_netdev.o \

		zd_rf_al2230.o zd_rf_rf2959.o \

		zd_rf_al7230b.o \

		zd_rf.o zd_usb.o zd_util.o



ifeq ($(CONFIG_ZD1211RW_DEBUG),y)

drivers/net/wireless/zd1211rw/zd_chip.c

+49 −13
Original line number Diff line number Diff line
@@ -42,12 +42,11 @@ void zd_chip_init(struct zd_chip *chip, 


void zd_chip_clear(struct zd_chip *chip)

{

	mutex_lock(&chip->mutex);

	ZD_ASSERT(!mutex_is_locked(&chip->mutex));

	zd_usb_clear(&chip->usb);

	zd_rf_clear(&chip->rf);

	mutex_unlock(&chip->mutex);

	mutex_destroy(&chip->mutex);

	memset(chip, 0, sizeof(*chip));

	ZD_MEMCLEAR(chip, sizeof(*chip));

}



static int scnprint_mac_oui(const u8 *addr, char *buffer, size_t size)
@@ -68,10 +67,11 @@ static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size) 
	i += scnprint_mac_oui(chip->e2p_mac, buffer+i, size-i);

	i += scnprintf(buffer+i, size-i, " ");

	i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);

	i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c", chip->pa_type,

	i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c", chip->pa_type,

		chip->patch_cck_gain ? 'g' : '-',

		chip->patch_cr157 ? '7' : '-',

		chip->patch_6m_band_edge ? '6' : '-');

		chip->patch_6m_band_edge ? '6' : '-',

		chip->new_phy_layout ? 'N' : '-');

	return i;

}
@@ -330,13 +330,14 @@ static int read_pod(struct zd_chip *chip, u8 *rf_type) 
	chip->patch_cck_gain = (value >> 8) & 0x1;

	chip->patch_cr157 = (value >> 13) & 0x1;

	chip->patch_6m_band_edge = (value >> 21) & 0x1;

	chip->new_phy_layout = (value >> 31) & 0x1;



	dev_dbg_f(zd_chip_dev(chip),

		"RF %s %#01x PA type %#01x patch CCK %d patch CR157 %d "

		"patch 6M %d\n",

		"patch 6M %d new PHY %d\n",

		zd_rf_name(*rf_type), *rf_type,

		chip->pa_type, chip->patch_cck_gain,

		chip->patch_cr157, chip->patch_6m_band_edge);

		chip->patch_cr157, chip->patch_6m_band_edge, chip->new_phy_layout);

	return 0;

error:

	*rf_type = 0;
@@ -344,6 +345,7 @@ static int read_pod(struct zd_chip *chip, u8 *rf_type) 
	chip->patch_cck_gain = 0;

	chip->patch_cr157 = 0;

	chip->patch_6m_band_edge = 0;

	chip->new_phy_layout = 0;

	return r;

}
@@ -717,7 +719,7 @@ static int zd1211b_hw_reset_phy(struct zd_chip *chip) 
		{ CR21,  0x0e }, { CR22,  0x23 }, { CR23,  0x90 },

		{ CR24,  0x14 }, { CR25,  0x40 }, { CR26,  0x10 },

		{ CR27,  0x10 }, { CR28,  0x7f }, { CR29,  0x80 },

		{ CR30,  0x49 }, /* jointly decoder, no ASIC */

		{ CR30,  0x4b }, /* ASIC/FWT, no jointly decoder */

		{ CR31,  0x60 }, { CR32,  0x43 }, { CR33,  0x08 },

		{ CR34,  0x06 }, { CR35,  0x0a }, { CR36,  0x00 },

		{ CR37,  0x00 }, { CR38,  0x38 }, { CR39,  0x0c },
@@ -807,7 +809,6 @@ static int zd1211_hw_init_hmac(struct zd_chip *chip) 
		{ CR_ACK_TIMEOUT_EXT,		0x80 },

		{ CR_ADDA_PWR_DWN,		0x00 },

		{ CR_ACK_TIME_80211,		0x100 },

		{ CR_IFS_VALUE,			0x547c032 },

		{ CR_RX_PE_DELAY,		0x70 },

		{ CR_PS_CTRL,			0x10000000 },

		{ CR_RTS_CTS_RATE,		0x02030203 },
@@ -854,11 +855,10 @@ static int zd1211b_hw_init_hmac(struct zd_chip *chip) 
		{ CR_ACK_TIMEOUT_EXT,		0x80 },

		{ CR_ADDA_PWR_DWN,		0x00 },

		{ CR_ACK_TIME_80211,		0x100 },

		{ CR_IFS_VALUE,			0x547c032 },

		{ CR_RX_PE_DELAY,		0x70 },

		{ CR_PS_CTRL,			0x10000000 },

		{ CR_RTS_CTS_RATE,		0x02030203 },

		{ CR_RX_THRESHOLD,		0x000c0640 },

		{ CR_RX_THRESHOLD,		0x000c0eff, },

		{ CR_AFTER_PNP,			0x1 },

		{ CR_WEP_PROTECT,		0x114 },

	};
@@ -970,10 +970,15 @@ static int hw_init(struct zd_chip *chip) 
	r = hw_init_hmac(chip);

	if (r)

		return r;

	r = set_beacon_interval(chip, 100);



	/* Although the vendor driver defaults to a different value during

	 * init, it overwrites the IFS value with the following every time

	 * the channel changes. We should aim to be more intelligent... */

	r = zd_iowrite32_locked(chip, IFS_VALUE_DEFAULT, CR_IFS_VALUE);

	if (r)

		return r;

	return 0;



	return set_beacon_interval(chip, 100);

}



#ifdef DEBUG
@@ -1613,3 +1618,34 @@ int zd_rfwritev_locked(struct zd_chip *chip, 


	return 0;

}



/*

 * We can optionally program the RF directly through CR regs, if supported by

 * the hardware. This is much faster than the older method.

 */

int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value)

{

	struct zd_ioreq16 ioreqs[] = {

		{ CR244, (value >> 16) & 0xff },

		{ CR243, (value >>  8) & 0xff },

		{ CR242,  value        & 0xff },

	};

	ZD_ASSERT(mutex_is_locked(&chip->mutex));

	return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));

}



int zd_rfwritev_cr_locked(struct zd_chip *chip,

	                  const u32 *values, unsigned int count)

{

	int r;

	unsigned int i;



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

		r = zd_rfwrite_cr_locked(chip, values[i]);

		if (r)

			return r;

	}



	return 0;

}

drivers/net/wireless/zd1211rw/zd_chip.h

+14 −1
Original line number Diff line number Diff line
@@ -473,7 +473,15 @@ 


#define CR_ACK_TIMEOUT_EXT		CTL_REG(0x0690)

#define CR_BCN_FIFO_SEMAPHORE		CTL_REG(0x0694)



#define CR_IFS_VALUE			CTL_REG(0x0698)

#define IFS_VALUE_DIFS_SH		0

#define IFS_VALUE_EIFS_SH		12

#define IFS_VALUE_SIFS_SH		24

#define IFS_VALUE_DEFAULT		((  50 << IFS_VALUE_DIFS_SH) | \

					 (1148 << IFS_VALUE_EIFS_SH) | \

					 (  10 << IFS_VALUE_SIFS_SH))



#define CR_RX_TIME_OUT			CTL_REG(0x069C)

#define CR_TOTAL_RX_FRM			CTL_REG(0x06A0)

#define CR_CRC32_CNT			CTL_REG(0x06A4)
@@ -630,6 +638,7 @@ enum { 
	LOAD_CODE_SIZE			= 0xe, /* words */

	LOAD_VECT_SIZE			= 0x10000 - 0xfff7, /* words */

	EEPROM_REGS_OFFSET		= LOAD_CODE_SIZE + LOAD_VECT_SIZE,

	EEPROM_REGS_SIZE		= 0x7e, /* words */

	E2P_BASE_OFFSET			= EEPROM_START_OFFSET +

		                          EEPROM_REGS_OFFSET,

};
@@ -655,7 +664,7 @@ struct zd_chip { 
	/* SetPointOFDM in the vendor driver */

	u8 ofdm_cal_values[3][E2P_CHANNEL_COUNT];

	u8 pa_type:4, patch_cck_gain:1, patch_cr157:1, patch_6m_band_edge:1,

	   is_zd1211b:1;

	   new_phy_layout:1, is_zd1211b:1;

};



static inline struct zd_chip *zd_usb_to_chip(struct zd_usb *usb)
@@ -739,8 +748,12 @@ static inline int zd_rfwrite_locked(struct zd_chip *chip, u32 value, u8 bits) 
	return zd_usb_rfwrite(&chip->usb, value, bits);

}



int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value);



int zd_rfwritev_locked(struct zd_chip *chip,

	               const u32* values, unsigned int count, u8 bits);

int zd_rfwritev_cr_locked(struct zd_chip *chip,

	                  const u32* values, unsigned int count);



/* Locking functions for reading and writing registers.

 * The different parameters are intentional.

drivers/net/wireless/zd1211rw/zd_def.h

+6 −0
Original line number Diff line number Diff line
@@ -45,4 +45,10 @@ do { \ 
#  define ZD_ASSERT(x) do { } while (0)

#endif



#ifdef DEBUG

#  define ZD_MEMCLEAR(pointer, size) memset((pointer), 0xff, (size))

#else

#  define ZD_MEMCLEAR(pointer, size) do { } while (0)

#endif



#endif /* _ZD_DEF_H */