diff options
| -rw-r--r-- | drivers/platform/msm/qcn/qcn_sdio.c | 90 | ||||
| -rw-r--r-- | include/linux/qcn_sdio_al.h | 1 |
2 files changed, 89 insertions, 2 deletions
diff --git a/drivers/platform/msm/qcn/qcn_sdio.c b/drivers/platform/msm/qcn/qcn_sdio.c index 71787acd6940..18bca8b2e13c 100644 --- a/drivers/platform/msm/qcn/qcn_sdio.c +++ b/drivers/platform/msm/qcn/qcn_sdio.c @@ -33,6 +33,8 @@ module_param(rx_dump, bool, S_IRUGO | S_IWUSR | S_IWGRP); static int dump_len = 32; module_param(dump_len, int, S_IRUGO | S_IWUSR | S_IWGRP); +static struct mmc_host *current_host; + #define HEX_DUMP(mode, buf, len) \ print_hex_dump(KERN_ERR, mode, 2, 32, 4, buf, \ dump_len > len ? len : dump_len, 0) @@ -65,6 +67,8 @@ static struct list_head cinfo_head; static atomic_t status; static spinlock_t async_lock; +static int qcn_create_sysfs(struct device *dev); + #if (QCN_SDIO_META_VER_0) #define META_INFO(event, data) \ ((u32)((u32)data << QCN_SDIO_HMETA_DATA_SHFT) | \ @@ -587,6 +591,18 @@ static int qcn_sdio_recv_buff(u32 cid, void *buff, size_t len) return ret; } +static void qcn_sdio_purge_rw_buff(void) +{ + struct qcn_sdio_rw_info *rw_req = NULL; + + while (!list_empty(&sdio_ctxt->rw_wait_q)) { + rw_req = list_first_entry(&sdio_ctxt->rw_wait_q, + struct qcn_sdio_rw_info, list); + list_del(&rw_req->list); + qcn_sdio_free_rw_req(rw_req); + } +} + static void qcn_sdio_rw_work(struct work_struct *work) { int ret = 0; @@ -685,11 +701,14 @@ int qcn_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) qcn_enable_async_irq(true); sdio_release_host(sdio_ctxt->func); + if (qcn_read_meta_info()) { pr_err("%s: Error: SDIO Config\n", __func__); qcn_send_meta_info((u8)QCN_SDIO_SW_MODE_HEVENT, (u32)0); } + current_host = func->card->host; + return 0; err: kfree(sdio_ctxt); @@ -702,7 +721,13 @@ static void qcn_sdio_remove(struct sdio_func *func) struct qcn_sdio_client_info *cinfo = NULL; struct qcn_sdio_ch_info *ch_info = NULL; + sdio_claim_host(sdio_ctxt->func); qcn_enable_async_irq(false); + sdio_release_host(sdio_ctxt->func); + + qcn_sdio_purge_rw_buff(); + + destroy_workqueue(sdio_ctxt->qcn_sdio_wq); mutex_lock(&lock); list_for_each_entry(cinfo, &cinfo_head, cli_list) { while (!list_empty(&cinfo->ch_head)) { @@ -711,11 +736,18 @@ static void qcn_sdio_remove(struct sdio_func *func) sdio_al_deregister_channel(&ch_info->ch_handle); } mutex_unlock(&lock); - cinfo->cli_data.remove(&cinfo->cli_handle); + if (cinfo->is_probed) { + cinfo->cli_data.remove(&cinfo->cli_handle); + cinfo->is_probed = 0; + } mutex_lock(&lock); } mutex_unlock(&lock); - destroy_workqueue(sdio_ctxt->qcn_sdio_wq); + + sdio_claim_host(sdio_ctxt->func); + sdio_release_irq(sdio_ctxt->func); + sdio_release_host(sdio_ctxt->func); + kfree(sdio_ctxt); sdio_ctxt = NULL; } @@ -752,6 +784,8 @@ static int qcn_sdio_plat_probe(struct platform_device *pdev) init_completion(&client_probe_complete); + qcn_create_sysfs(&pdev->dev); + return ret; } @@ -1120,3 +1154,55 @@ int sdio_al_meta_transfer(struct sdio_al_channel_handle *handle, return qcn_send_meta_info(event, data); } EXPORT_SYMBOL(sdio_al_meta_transfer); + +int qcn_sdio_card_state(bool enable) +{ + int ret = 0; + + if (!current_host) + return -ENODEV; + + mmc_try_claim_host(current_host, 2000); + if (enable) { + ret = mmc_add_host(current_host); + if (ret) + pr_err("%s ret = %d\n", __func__, ret); + } else { + mmc_remove_host(current_host); + } + mmc_release_host(current_host); + + return ret; +} +EXPORT_SYMBOL(qcn_sdio_card_state); + +static ssize_t qcn_card_state(struct device *dev, + struct device_attribute *attr, + const char *buf, + size_t count) +{ + int state = 0; + + if (sscanf(buf, "%du", &state) != 1) + return -EINVAL; + + qcn_sdio_card_state(state); + + return count; +} +static DEVICE_ATTR(card_state, 0220, NULL, qcn_card_state); + +static int qcn_create_sysfs(struct device *dev) +{ + int ret = 0; + + ret = device_create_file(dev, &dev_attr_card_state); + if (ret) { + pr_err("Failed to create device file, err = %d\n", ret); + goto out; + } + + return 0; +out: + return ret; +} diff --git a/include/linux/qcn_sdio_al.h b/include/linux/qcn_sdio_al.h index 97d8aa189735..bee020b0ccb4 100644 --- a/include/linux/qcn_sdio_al.h +++ b/include/linux/qcn_sdio_al.h @@ -292,4 +292,5 @@ int sdio_al_meta_transfer(struct sdio_al_channel_handle *ch_handle, unsigned int data, unsigned int trans); extern void qcn_sdio_client_probe_complete(int id); +int qcn_sdio_card_state(bool enable); #endif /* _QCN_SDIO_AL_ */ |