mmc: sdio: Parse CISTPL_VERS_1 major and minor revision numbers

They should indicate compliance of standard.

Signed-off-by: Pali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20200727133837.19086-3-pali@kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index 3efaa9534a777d3ac8587c151ba0fed4b1a7bb95..44bea5e4aeda19b05c8e5c8149f2276f7e4e4ae9 100644 (file)
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -23,12 +23,16 @@
 static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
                         const unsigned char *buf, unsigned size)
 {
+       u8 major_rev, minor_rev;
        unsigned i, nr_strings;
        char **buffer, *string;
 
        if (size < 2)
                return 0;
 
+       major_rev = buf[0];
+       minor_rev = buf[1];
+
        /* Find all null-terminated (including zero length) strings in
           the TPLLV1_INFO field. Trailing garbage is ignored. */
        buf += 2;
@@ -60,9 +64,13 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
        }
 
        if (func) {
+               func->major_rev = major_rev;
+               func->minor_rev = minor_rev;
                func->num_info = nr_strings;
                func->info = (const char**)buffer;
        } else {
+               card->major_rev = major_rev;
+               card->minor_rev = minor_rev;
                card->num_info = nr_strings;
                card->info = (const char**)buffer;
        }

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 7d46411ffaa21477831d8f3352e871a353ae4b57..42df06c6b19ce5eb29918a709b396780d5e50818 100644 (file)
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -297,6 +297,8 @@ struct mmc_card {
        struct sdio_cis         cis;            /* common tuple info */
        struct sdio_func        *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */
        struct sdio_func        *sdio_single_irq; /* SDIO function when only one IRQ active */
+       u8                      major_rev;      /* major revision number */
+       u8                      minor_rev;      /* minor revision number */
        unsigned                num_info;       /* number of info strings */
        const char              **info;         /* info strings */
        struct sdio_func_tuple  *tuples;        /* unknown common tuples */

diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index fa2aaab5e57aa5a74cda147a2598a506e0fb4904..478855b8e406f9267f4ca5702b35343fe8f1042c 100644 (file)
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -51,6 +51,8 @@ struct sdio_func {
 
        u8                      *tmpbuf;        /* DMA:able scratch buffer */
 
+       u8                      major_rev;      /* major revision number */
+       u8                      minor_rev;      /* minor revision number */
        unsigned                num_info;       /* number of info strings */
        const char              **info;         /* info strings */