lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wl18xx: deprecate PG1 support

Browse Source 
The new PG2 version of the chip has a few differences in terms of FW
API if compared to PG1.  PG1 is just a sample that shouldn't be used
in real life, so to avoid having to handle both separately, mark the
PG1 version as deprecated and bail out during probe.

Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Luciano Coelho
2012-06-25 14:15:55 +03:00
parent 725b82775e
commit e59bec1628
2 changed files with 21 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/wireless/ti/wl18xx/acx.h
View File

@@ -32,25 +32,21 @@ enum {
/* numbers of bits the length field takes (add 1 for the actual number) */ /* numbers of bits the length field takes (add 1 for the actual number) */
#define WL18XX_HOST_IF_LEN_SIZE_FIELD 15 #define WL18XX_HOST_IF_LEN_SIZE_FIELD 15
#define WL18XX_ACX_EVENTS_VECTOR_PG1 (WL1271_ACX_INTR_WATCHDOG | \ #define WL18XX_ACX_EVENTS_VECTOR (WL1271_ACX_INTR_WATCHDOG | \
WL1271_ACX_INTR_INIT_COMPLETE | \ WL1271_ACX_INTR_INIT_COMPLETE | \
WL1271_ACX_INTR_EVENT_A | \ WL1271_ACX_INTR_EVENT_A | \
WL1271_ACX_INTR_EVENT_B | \ WL1271_ACX_INTR_EVENT_B | \
WL1271_ACX_INTR_CMD_COMPLETE | \ WL1271_ACX_INTR_CMD_COMPLETE | \
WL1271_ACX_INTR_HW_AVAILABLE | \ WL1271_ACX_INTR_HW_AVAILABLE | \
WL1271_ACX_INTR_DATA) WL1271_ACX_INTR_DATA | \
WL1271_ACX_SW_INTR_WATCHDOG)
#define WL18XX_ACX_EVENTS_VECTOR_PG2 (WL18XX_ACX_EVENTS_VECTOR_PG1 | \ #define WL18XX_INTR_MASK (WL1271_ACX_INTR_WATCHDOG | \
WL1271_ACX_SW_INTR_WATCHDOG) WL1271_ACX_INTR_EVENT_A | \
WL1271_ACX_INTR_EVENT_B | \
#define WL18XX_INTR_MASK_PG1 (WL1271_ACX_INTR_WATCHDOG | \ WL1271_ACX_INTR_HW_AVAILABLE | \
WL1271_ACX_INTR_EVENT_A | \ WL1271_ACX_INTR_DATA | \
WL1271_ACX_INTR_EVENT_B | \ WL1271_ACX_SW_INTR_WATCHDOG)
WL1271_ACX_INTR_HW_AVAILABLE | \
WL1271_ACX_INTR_DATA)
#define WL18XX_INTR_MASK_PG2 (WL18XX_INTR_MASK_PG1 | \
WL1271_ACX_SW_INTR_WATCHDOG)
struct wl18xx_acx_host_config_bitmap { struct wl18xx_acx_host_config_bitmap {
struct acx_header header; struct acx_header header;

45
drivers/net/wireless/ti/wl18xx/main.c
View File

@@ -612,20 +612,11 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
WLCORE_QUIRK_TX_PAD_LAST_FRAME; WLCORE_QUIRK_TX_PAD_LAST_FRAME;
break; break;
case CHIP_ID_185x_PG10: case CHIP_ID_185x_PG10:
wl1271_debug(DEBUG_BOOT, "chip id 0x%x (185x PG10)", wl1271_warning("chip id 0x%x (185x PG10) is deprecated",
wl->chip.id); wl->chip.id);
wl->sr_fw_name = WL18XX_FW_NAME; ret = -ENODEV;
/* wl18xx uses the same firmware for PLT */ goto out;
wl->plt_fw_name = WL18XX_FW_NAME;
wl->quirks |= WLCORE_QUIRK_NO_ELP |
WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED |
WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN |
WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
/* PG 1.0 has some problems with MCS_13, so disable it */
wl->ht_cap[IEEE80211_BAND_2GHZ].mcs.rx_mask[1] &= ~BIT(5);
break;
default: default:
wl1271_warning("unsupported chip id: 0x%x", wl->chip.id); wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
ret = -ENODEV; ret = -ENODEV;
@@ -776,21 +767,14 @@ out:
static int wl18xx_set_mac_and_phy(struct wl1271 *wl) static int wl18xx_set_mac_and_phy(struct wl1271 *wl)
{ {
struct wl18xx_priv *priv = wl->priv; struct wl18xx_priv *priv = wl->priv;
size_t len;
int ret; int ret;
/* the parameters struct is smaller for PG1 */
if (wl->chip.id == CHIP_ID_185x_PG10)
len = offsetof(struct wl18xx_mac_and_phy_params, psat) + 1;
else
len = sizeof(struct wl18xx_mac_and_phy_params);
ret = wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]); ret = wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = wlcore_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy, ret = wlcore_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy,
len, false); sizeof(struct wl18xx_mac_and_phy_params), false);
out: out:
return ret; return ret;
@@ -801,13 +785,8 @@ static int wl18xx_enable_interrupts(struct wl1271 *wl)
u32 event_mask, intr_mask; u32 event_mask, intr_mask;
int ret; int ret;
if (wl->chip.id == CHIP_ID_185x_PG10) { event_mask = WL18XX_ACX_EVENTS_VECTOR;
event_mask = WL18XX_ACX_EVENTS_VECTOR_PG1; intr_mask = WL18XX_INTR_MASK;
intr_mask = WL18XX_INTR_MASK_PG1;
} else {
event_mask = WL18XX_ACX_EVENTS_VECTOR_PG2;
intr_mask = WL18XX_INTR_MASK_PG2;
}
ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, event_mask); ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, event_mask);
if (ret < 0) if (ret < 0)
@@ -1049,16 +1028,6 @@ static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
} else if (!strcmp(ht_mode_param, "mimo")) { } else if (!strcmp(ht_mode_param, "mimo")) {
wl1271_debug(DEBUG_ACX, "using MIMO rate mask"); wl1271_debug(DEBUG_ACX, "using MIMO rate mask");
/*
* PG 1.0 has some problems with MCS_13, so disable it
*
* TODO: instead of hacking this in here, we should
* make it more general and change a bit in the
* wlvif->rate_set instead.
*/
if (wl->chip.id == CHIP_ID_185x_PG10)
return CONF_TX_MIMO_RATES & ~CONF_HW_BIT_RATE_MCS_13;
return CONF_TX_MIMO_RATES; return CONF_TX_MIMO_RATES;
} else { } else {
return 0; return 0;