On Sat, Dec 5, 2009 at 7:06 PM, Larry Finger <Larry.Finger@xxxxxxxxxxxx> 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.
>
> Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
> Reported-and-tested-by: Antti Kaijanmäki <antti@xxxxxxxxxxxxxx>
> Tested-by: Hin-Tak Leung <hintak.leung@xxxxxxxxx>
The patch looks fine - I'll have a go later. Stylistically, I don't
think you need to copy the vendor driver though. Since you are storing
rfkill_mask in the device structure, there is no need to have the
variable tmp (and it is an awkful name - although, I know, it is
temp!), because you can simply set the rfkill_mask at the beginning,
then override it for newer models. e.g.
I suggest you change the logic to something like this:
priv->rfkill_mask = 0x02;
if (newer product/gpio detection code) {
priv->rfkill_mask = 0x04;
}
and while you are at it, called
0x02 RFKILL_MASK_FOR_MODEL_8187_89_97 and 0x04
RFKILL_MASK_FOR_MODEL_8198 for clarity. Does it sound reasonable?
> ---
>
> 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
> @@ -122,6 +123,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,8 @@ 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);
> + u16 tmp;
> int err, i;
>
> dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops);
> @@ -1481,6 +1483,18 @@ static int __devinit rtl8187_probe(struc
> (*channel++).hw_value = txpwr & 0xFF;
> (*channel++).hw_value = txpwr >> 8;
> }
> + /* Handle the differing GPIO bit in different models */
> + if (product_id == 0x8197 || product_id == 0x8198) {
> + eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_SELECT_GPIO, &tmp);
> + tmp &= 0xFF00;
> + } else
> + tmp = 0;
> + if (tmp)
> + priv->rfkill_mask = 0x4;
> + else
> + priv->rfkill_mask = 0x2;
> + printk(KERN_INFO "rtl8187: rfkill mask set to %d for Product ID 0x%x",
> + priv->rfkill_mask, product_id);
>
> /*
> * 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@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
