drivers:misc:ti-st: handle delayed tty receive

When certain technologies shutdown their interface without waiting for
the acknowledgement from the chip. The receive_buf from the TTY would be
invoked a while after the relevant technology is unregistered.

This patch introduces a new flag "is_registered" which maintains the
state of protocols BT, FM or GPS and thereby removes the need to clear
the protocol data from ST when protocols gets unregistered.

This fixes corner cases when HCI RESET is sent down from bluetooth stack
and the receive_buf is called from tty after 250ms before which
bluetooth would have unregistered from the system.
OR - when FM application decides to close down the device without
sending a power-off FM command resulting in some RDS data or interrupt
data coming in after the driver is unregistered.

Signed-off-by: Pavan Savoy <pavan_savoy@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
index 486117f72c9fb87baaf1d39ffbc7cdea33dddfaf..f91f82eabda72a311602a8979ab835e0d938ffd6 100644 (file)
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
@@ -43,13 +43,15 @@ static void add_channel_to_table(struct st_data_s *st_gdata,
        pr_info("%s: id %d\n", __func__, new_proto->chnl_id);
        /* list now has the channel id as index itself */
        st_gdata->list[new_proto->chnl_id] = new_proto;
+       st_gdata->is_registered[new_proto->chnl_id] = true;
 }
 
 static void remove_channel_from_table(struct st_data_s *st_gdata,
                struct st_proto_s *proto)
 {
        pr_info("%s: id %d\n", __func__, proto->chnl_id);
-       st_gdata->list[proto->chnl_id] = NULL;
+/*     st_gdata->list[proto->chnl_id] = NULL; */
+       st_gdata->is_registered[proto->chnl_id] = false;
 }
 
 /*
@@ -104,7 +106,7 @@ void st_send_frame(unsigned char chnl_id, struct st_data_s *st_gdata)
 
        if (unlikely
            (st_gdata == NULL || st_gdata->rx_skb == NULL
-            || st_gdata->list[chnl_id] == NULL)) {
+            || st_gdata->is_registered[chnl_id] == false)) {
                pr_err("chnl_id %d not registered, no data to send?",
                           chnl_id);
                kfree_skb(st_gdata->rx_skb);
@@ -141,14 +143,15 @@ void st_reg_complete(struct st_data_s *st_gdata, char err)
        unsigned char i = 0;
        pr_info(" %s ", __func__);
        for (i = 0; i < ST_MAX_CHANNELS; i++) {
-               if (likely(st_gdata != NULL && st_gdata->list[i] != NULL &&
-                          st_gdata->list[i]->reg_complete_cb != NULL)) {
+               if (likely(st_gdata != NULL &&
+                       st_gdata->is_registered[i] == true &&
+                               st_gdata->list[i]->reg_complete_cb != NULL)) {
                        st_gdata->list[i]->reg_complete_cb
                                (st_gdata->list[i]->priv_data, err);
                        pr_info("protocol %d's cb sent %d\n", i, err);
                        if (err) { /* cleanup registered protocol */
                                st_gdata->protos_registered--;
-                               st_gdata->list[i] = NULL;
+                               st_gdata->is_registered[i] = false;
                        }
                }
        }
@@ -475,9 +478,9 @@ void kim_st_list_protocols(struct st_data_s *st_gdata, void *buf)
 {
        seq_printf(buf, "[%d]\nBT=%c\nFM=%c\nGPS=%c\n",
                        st_gdata->protos_registered,
-                       st_gdata->list[0x04] != NULL ? 'R' : 'U',
-                       st_gdata->list[0x08] != NULL ? 'R' : 'U',
-                       st_gdata->list[0x09] != NULL ? 'R' : 'U');
+                       st_gdata->is_registered[0x04] == true ? 'R' : 'U',
+                       st_gdata->is_registered[0x08] == true ? 'R' : 'U',
+                       st_gdata->is_registered[0x09] == true ? 'R' : 'U');
 }
 
 /********************************************************************/
@@ -504,7 +507,7 @@ long st_register(struct st_proto_s *new_proto)
                return -EPROTONOSUPPORT;
        }
 
-       if (st_gdata->list[new_proto->chnl_id] != NULL) {
+       if (st_gdata->is_registered[new_proto->chnl_id] == true) {
                pr_err("chnl_id %d already registered", new_proto->chnl_id);
                return -EALREADY;
        }
@@ -563,7 +566,7 @@ long st_register(struct st_proto_s *new_proto)
                /* check for already registered once more,
                 * since the above check is old
                 */
-               if (st_gdata->list[new_proto->chnl_id] != NULL) {
+               if (st_gdata->is_registered[new_proto->chnl_id] == true) {
                        pr_err(" proto %d already registered ",
                                   new_proto->chnl_id);
                        return -EALREADY;

diff --git a/include/linux/ti_wilink_st.h b/include/linux/ti_wilink_st.h
index 7071ec5d011883940f4bd088aed1066a048b44dc..b004e557caa9c064c15b41b26bf773677f529913 100644 (file)
--- a/include/linux/ti_wilink_st.h
+++ b/include/linux/ti_wilink_st.h
@@ -140,12 +140,12 @@ extern long st_unregister(struct st_proto_s *);
  */
 struct st_data_s {
        unsigned long st_state;
-       struct tty_struct *tty;
        struct sk_buff *tx_skb;
 #define ST_TX_SENDING  1
 #define ST_TX_WAKEUP   2
        unsigned long tx_state;
        struct st_proto_s *list[ST_MAX_CHANNELS];
+       bool is_registered[ST_MAX_CHANNELS];
        unsigned long rx_state;
        unsigned long rx_count;
        struct sk_buff *rx_skb;
@@ -155,6 +155,7 @@ struct st_data_s {
        unsigned char   protos_registered;
        unsigned long ll_state;
        void *kim_data;
+       struct tty_struct *tty;
 };
 
 /*