Return-path: Received: from mail-fx0-f213.google.com ([209.85.220.213]:40659 "EHLO mail-fx0-f213.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756899AbZLEVzU convert rfc822-to-8bit (ORCPT ); Sat, 5 Dec 2009 16:55:20 -0500 Received: by fxm5 with SMTP id 5so3659236fxm.28 for ; Sat, 05 Dec 2009 13:55:25 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <4b1ac00a.nP75mlCdUd2PKZib%Larry.Finger@lwfinger.net> References: <4b1ac00a.nP75mlCdUd2PKZib%Larry.Finger@lwfinger.net> From: =?ISO-8859-1?Q?G=E1bor_Stefanik?= Date: Sat, 5 Dec 2009 22:55:05 +0100 Message-ID: <69e28c910912051355s2f13400eo1eff46c4cd6d32f4@mail.gmail.com> Subject: Re: [RFC/RFT V2] rtl8187: Modify rfkill for new models To: Larry Finger Cc: antti@kaijanmaki.net, Hin-Tak Leung , Herton Ronaldo Krzesinski , linux-wireless@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Sat, Dec 5, 2009 at 9:18 PM, Larry Finger wrote: > There are different bits used to convey the setting of the rfkill > switch to the driver. The current driver only supports one of these > possibilities. These changes were derived from the latest version > of the vendor driver. > > This patch fixes the regression noted in Bug #14xxx. > > Signed-off-by: Larry Finger > Reported-and-tested-by: Antti Kaijanm?ki > Tested-by: Hin-Tak Leung > Cc: Stable > --- > > Index: wireless-testing/drivers/net/wireless/rtl818x/rtl8187.h > =================================================================== > --- wireless-testing.orig/drivers/net/wireless/rtl818x/rtl8187.h > +++ wireless-testing/drivers/net/wireless/rtl818x/rtl8187.h > @@ -23,6 +23,7 @@ > ?#define RTL8187_EEPROM_TXPWR_CHAN_1 ? ?0x16 ? ?/* 3 channels */ > ?#define RTL8187_EEPROM_TXPWR_CHAN_6 ? ?0x1B ? ?/* 2 channels */ > ?#define RTL8187_EEPROM_TXPWR_CHAN_4 ? ?0x3D ? ?/* 2 channels */ > +#define RTL8187_EEPROM_SELECT_GPIO ? ? 0x3B ? ?/* Which pin has rfkill? */ > > ?#define RTL8187_REQT_READ ? ? ?0xC0 > ?#define RTL8187_REQT_WRITE ? ? 0x40 > @@ -31,6 +32,9 @@ > > ?#define RTL8187_MAX_RX ? ? ? ? 0x9C4 > > +#define RFKILL_MASK_8187_89_97 0x2 > +#define RFKILL_MASK_8198 ? ? ? 0x4 > + > ?struct rtl8187_rx_info { > ? ? ? ?struct urb *urb; > ? ? ? ?struct ieee80211_hw *dev; > @@ -122,6 +126,7 @@ struct rtl8187_priv { > ? ? ? ?u8 noise; > ? ? ? ?u8 slot_time; > ? ? ? ?u8 aifsn[4]; > + ? ? ? u8 rfkill_mask; > ? ? ? ?struct { > ? ? ? ? ? ? ? ?__le64 buf; > ? ? ? ? ? ? ? ?struct sk_buff_head queue; > Index: wireless-testing/drivers/net/wireless/rtl818x/rtl8187_dev.c > =================================================================== > --- wireless-testing.orig/drivers/net/wireless/rtl818x/rtl8187_dev.c > +++ wireless-testing/drivers/net/wireless/rtl818x/rtl8187_dev.c > @@ -1322,6 +1322,7 @@ static int __devinit rtl8187_probe(struc > ? ? ? ?struct ieee80211_channel *channel; > ? ? ? ?const char *chip_name; > ? ? ? ?u16 txpwr, reg; > + ? ? ? u16 product_id = le16_to_cpu(udev->descriptor.idProduct); > ? ? ? ?int err, i; > > ? ? ? ?dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops); > @@ -1481,6 +1482,15 @@ static int __devinit rtl8187_probe(struc > ? ? ? ? ? ? ? ?(*channel++).hw_value = txpwr & 0xFF; > ? ? ? ? ? ? ? ?(*channel++).hw_value = txpwr >> 8; > ? ? ? ?} > + ? ? ? /* Handle the differing GPIO bit in different models */ > + ? ? ? priv->rfkill_mask = RFKILL_MASK_8187_89_97; > + ? ? ? if (product_id == 0x8197 || product_id == 0x8198) { > + ? ? ? ? ? ? ? eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_SELECT_GPIO, ®); > + ? ? ? ? ? ? ? if (reg & 0xFF00) > + ? ? ? ? ? ? ? ? ? ? ? priv->rfkill_mask = RFKILL_MASK_8198; > + ? ? ? } > + ? ? ? printk(KERN_INFO "rtl8187: rfkill mask set to %d for Product ID 0x%x", > + ? ? ? ? ? ? ?priv->rfkill_mask, product_id); printk(KERN_DEBUG... ? > > ? ? ? ?/* > ? ? ? ? * XXX: Once this driver supports anything that requires > Index: wireless-testing/drivers/net/wireless/rtl818x/rtl8187_rfkill.c > =================================================================== > --- wireless-testing.orig/drivers/net/wireless/rtl818x/rtl8187_rfkill.c > +++ wireless-testing/drivers/net/wireless/rtl818x/rtl8187_rfkill.c > @@ -25,10 +25,10 @@ static bool rtl8187_is_radio_enabled(str > ? ? ? ?u8 gpio; > > ? ? ? ?gpio = rtl818x_ioread8(priv, &priv->map->GPIO0); > - ? ? ? rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~0x02); > + ? ? ? rtl818x_iowrite8(priv, &priv->map->GPIO0, gpio & ~priv->rfkill_mask); > ? ? ? ?gpio = rtl818x_ioread8(priv, &priv->map->GPIO1); > > - ? ? ? return gpio & 0x02; > + ? ? ? return gpio & priv->rfkill_mask; > ?} > > ?void rtl8187_rfkill_init(struct ieee80211_hw *hw) > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > -- Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)