mmc: debugfs: Move block debugfs into block module

If we don't have the block layer enabled, we do not present card
status and extcsd in the debugfs.

Debugfs is not ABI, and maintaining files of no relevance for
non-block devices comes at a high maintenance cost if we shall
support it with the block layer compiled out.

The debugfs entries suffer from all the same starvation
issues as the other userspace things, under e.g. a heavy
dd operation.

The expected number of debugfs users utilizing these two
debugfs files is already low as there is an ioctl() to get the
same information using the mmc-tools, and of these few users
the expected number of people using it on SDIO or combo cards
are expected to be zero.

It is therefore logical to move this over to the block layer
when it is enabled, using the new custom requests and issue
it using the block request queue.

On the other hand it moves some debugfs code from debugfs.c
and into block.c.

Tested during heavy dd load by cat:in the status file.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 0 insertions, 89 deletions

diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index a1fba5732d66..01e459a34f33 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -281,85 +281,6 @@ void mmc_remove_host_debugfs(struct mmc_host *host)
         debugfs_remove_recursive(host->debugfs_root);
 }
 
-static int mmc_dbg_card_status_get(void *data, u64 *val)
-{
-        struct mmc_card *card = data;
-        u32             status;
-        int             ret;
-
-        mmc_get_card(card);
-
-        ret = mmc_send_status(data, &status);
-        if (!ret)
-                *val = status;
-
-        mmc_put_card(card);
-
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(mmc_dbg_card_status_fops, mmc_dbg_card_status_get,
-                NULL, "%08llx\n");
-
-#define EXT_CSD_STR_LEN 1025
-
-static int mmc_ext_csd_open(struct inode *inode, struct file *filp)
-{
-        struct mmc_card *card = inode->i_private;
-        char *buf;
-        ssize_t n = 0;
-        u8 *ext_csd;
-        int err, i;
-
-        buf = kmalloc(EXT_CSD_STR_LEN + 1, GFP_KERNEL);
-        if (!buf)
-                return -ENOMEM;
-
-        mmc_get_card(card);
-        err = mmc_get_ext_csd(card, &ext_csd);
-        mmc_put_card(card);
-        if (err)
-                goto out_free;
-
-        for (i = 0; i < 512; i++)
-                n += sprintf(buf + n, "%02x", ext_csd[i]);
-        n += sprintf(buf + n, "\n");
-
-        if (n != EXT_CSD_STR_LEN) {
-                err = -EINVAL;
-                goto out_free;
-        }
-
-        filp->private_data = buf;
-        kfree(ext_csd);
-        return 0;
-
-out_free:
-        kfree(buf);
-        return err;
-}
-
-static ssize_t mmc_ext_csd_read(struct file *filp, char __user *ubuf,
-                                size_t cnt, loff_t *ppos)
-{
-        char *buf = filp->private_data;
-
-        return simple_read_from_buffer(ubuf, cnt, ppos,
-                                       buf, EXT_CSD_STR_LEN);
-}
-
-static int mmc_ext_csd_release(struct inode *inode, struct file *file)
-{
-        kfree(file->private_data);
-        return 0;
-}
-
-static const struct file_operations mmc_dbg_ext_csd_fops = {
-        .open           = mmc_ext_csd_open,
-        .read           = mmc_ext_csd_read,
-        .release        = mmc_ext_csd_release,
-        .llseek         = default_llseek,
-};
-
 void mmc_add_card_debugfs(struct mmc_card *card)
 {
         struct mmc_host *host = card->host;
@@ -382,16 +303,6 @@ void mmc_add_card_debugfs(struct mmc_card *card)
         if (!debugfs_create_x32("state", S_IRUSR, root, &card->state))
                 goto err;
 
-        if (mmc_card_mmc(card) || mmc_card_sd(card))
-                if (!debugfs_create_file("status", S_IRUSR, root, card,
-                                        &mmc_dbg_card_status_fops))
-                        goto err;
-
-        if (mmc_card_mmc(card))
-                if (!debugfs_create_file("ext_csd", S_IRUSR, root, card,
-                                        &mmc_dbg_ext_csd_fops))
-                        goto err;
-
         return;
 
 err: