mmc: core: Move cached value of the negotiated ocr mask to card struct

The negotiated ocr mask is directly related to the card. Once a card
gets removed, the mask shall be dropped. By moving the cache of the ocr
mask from the host struct to the card struct we have accomplished this.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Conflicts:
	drivers/mmc/core/sd.c

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 4b6c0cae12c7fcfff5efe0dcd38ebaaef1372068..3af994d4059546b5f0afe270cca307a3bccef144 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1575,9 +1575,10 @@ void mmc_power_off(struct mmc_host *host)
 
        /*
         * Reset ocr mask to be the highest possible voltage supported for
-        * this mmc host. This value will be used at next power up.
+        * this card. This value will be used at next power up.
         */
-       host->ocr = 1 << (fls(host->ocr_avail) - 1);
+       if (host->card)
+               host->card->ocr = 1 << (fls(host->ocr_avail) - 1);
 
        if (!mmc_host_is_spi(host)) {
                host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
@@ -2606,7 +2607,7 @@ int mmc_power_restore_host(struct mmc_host *host)
                return -EINVAL;
        }
 
-       mmc_power_up(host, host->ocr);
+       mmc_power_up(host, host->card->ocr);
        ret = host->bus_ops->power_restore(host);
 
        mmc_bus_put(host);

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 75c66f975e24068ada35c788f541f7a37ab942ec..eb7161c1158739cee935c8ea404f00bcc70a8f93 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -934,6 +934,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                        goto err;
                }
 
+               card->ocr = ocr;
                card->type = MMC_TYPE_MMC;
                card->rca = 1;
                memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
@@ -1533,9 +1534,9 @@ static int mmc_resume(struct mmc_host *host)
        BUG_ON(!host->card);
 
        mmc_claim_host(host);
-       mmc_power_up(host, host->ocr);
-       mmc_select_voltage(host, host->ocr);
-       err = mmc_init_card(host, host->ocr, host->card);
+       mmc_power_up(host, host->card->ocr);
+       mmc_select_voltage(host, host->card->ocr);
+       err = mmc_init_card(host, host->card->ocr, host->card);
        mmc_release_host(host);
 
        return err;
@@ -1579,7 +1580,7 @@ static int mmc_runtime_resume(struct mmc_host *host)
 
        mmc_claim_host(host);
 
-       mmc_power_up(host, host->ocr);
+       mmc_power_up(host, host->card->ocr);
        err = mmc_resume(host);
        if (err)
                pr_err("%s: error %d doing aggessive resume\n",
@@ -1595,7 +1596,7 @@ static int mmc_power_restore(struct mmc_host *host)
 
        host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);
        mmc_claim_host(host);
-       ret = mmc_init_card(host, host->ocr, host->card);
+       ret = mmc_init_card(host, host->card->ocr, host->card);
        mmc_release_host(host);
 
        return ret;
@@ -1640,7 +1641,7 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
 int mmc_attach_mmc(struct mmc_host *host)
 {
        int err;
-       u32 ocr;
+       u32 ocr, rocr;
 
        BUG_ON(!host);
        WARN_ON(!host->claimed);
@@ -1677,12 +1678,12 @@ int mmc_attach_mmc(struct mmc_host *host)
                ocr &= ~0x7F;
        }
 
-       host->ocr = mmc_select_voltage(host, ocr);
+       rocr = mmc_select_voltage(host, ocr);
 
        /*
         * Can we support the voltage of the card?
         */
-       if (!host->ocr) {
+       if (!rocr) {
                err = -EINVAL;
                goto err;
        }
@@ -1690,7 +1691,7 @@ int mmc_attach_mmc(struct mmc_host *host)
        /*
         * Detect and init the card.
         */
-       err = mmc_init_card(host, host->ocr, NULL);
+       err = mmc_init_card(host, rocr, NULL);
        if (err)
                goto err;
 

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 9ab1b3d670b37cd075c1d916870b0965da27709e..a010ec2803e178eb80b684dd24dc0b1b2a472b08 100644 (file)
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -721,6 +721,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr)
        int err;
        u32 max_current;
        int retries = 10;
+       u32 pocr = ocr;
 
 try_again:
        if (!retries) {
@@ -774,7 +775,7 @@ try_again:
        if (!mmc_host_is_spi(host) && rocr &&
           ((*rocr & 0x41000000) == 0x41000000)) {
                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
-                                       host->ocr);
+                                       pocr);
                if (err == -EAGAIN) {
                        retries--;
                        goto try_again;
@@ -958,6 +959,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                if (IS_ERR(card))
                        return PTR_ERR(card);
 
+               card->ocr = ocr;
                card->type = MMC_TYPE_SD;
                memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
        }
@@ -1141,10 +1143,9 @@ static int mmc_sd_resume(struct mmc_host *host)
        BUG_ON(!host->card);
 
        mmc_claim_host(host);
-       mmc_power_up(host, host->ocr);
-       mmc_select_voltage(host, host->ocr);
-
-       err = mmc_sd_init_card(host, host->ocr, host->card);
+       mmc_power_up(host, host->card->ocr);
+       mmc_select_voltage(host, host->card->ocr);
+       err = mmc_sd_init_card(host, host->card->ocr, host->card);
        mmc_release_host(host);
 
        return err;
@@ -1187,7 +1188,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
 
        mmc_claim_host(host);
 
-       mmc_power_up(host, host->ocr);
+       mmc_power_up(host, host->card->ocr);
        err = mmc_sd_resume(host);
        if (err)
                pr_err("%s: error %d doing aggessive resume\n",
@@ -1203,7 +1204,7 @@ static int mmc_sd_power_restore(struct mmc_host *host)
 
        host->card->state &= ~MMC_STATE_HIGHSPEED;
        mmc_claim_host(host);
-       ret = mmc_sd_init_card(host, host->ocr, host->card);
+       ret = mmc_sd_init_card(host, host->card->ocr, host->card);
        mmc_release_host(host);
 
        return ret;
@@ -1248,10 +1249,7 @@ static void mmc_sd_attach_bus_ops(struct mmc_host *host)
 int mmc_attach_sd(struct mmc_host *host)
 {
        int err;
-       u32 ocr;
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-       int retries;
-#endif
+       u32 ocr, rocr;
 
        BUG_ON(!host);
        WARN_ON(!host->claimed);
@@ -1294,12 +1292,12 @@ int mmc_attach_sd(struct mmc_host *host)
                ocr &= ~MMC_VDD_165_195;
        }
 
-       host->ocr = mmc_select_voltage(host, ocr);
+       rocr = mmc_select_voltage(host, ocr);
 
        /*
         * Can we support the voltage(s) of the card(s)?
         */
-       if (!host->ocr) {
+       if (!rocr) {
                err = -EINVAL;
                goto err;
        }
@@ -1307,27 +1305,9 @@ int mmc_attach_sd(struct mmc_host *host)
        /*
         * Detect and init the card.
         */
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
-       retries = 5;
-       while (retries) {
-               err = mmc_sd_init_card(host, host->ocr, NULL);
-               if (err) {
-                       retries--;
-                       continue;
-               }
-               break;
-       }
-
-       if (!retries) {
-               printk(KERN_ERR "%s: mmc_sd_init_card() failure (err = %d)\n",
-                      mmc_hostname(host), err);
-               goto err;
-       }
-#else
-       err = mmc_sd_init_card(host, host->ocr, NULL);
+       err = mmc_sd_init_card(host, rocr, NULL);
        if (err)
                goto err;
-#endif
 
        mmc_release_host(host);
        err = mmc_add_card(host->card);

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 35d179c8be76505fd93a578e3908627b66356ec6..d5f59e15cff6c3e8ffc704cb6a6cb6684eacb527 100644 (file)
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -599,6 +599,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
        int err;
        int retries = 10;
        u32 rocr = 0;
+       u32 ocr_card = ocr;
 
        BUG_ON(!host);
        WARN_ON(!host->claimed);
@@ -783,6 +784,7 @@ try_again:
 
                card = oldcard;
        }
+       card->ocr = ocr_card;
        mmc_fixup_device(card, NULL);
 
        if (card->type == MMC_TYPE_SD_COMBO) {
@@ -1005,8 +1007,8 @@ static int mmc_sdio_resume(struct mmc_host *host)
 
        /* Restore power if needed */
        if (!mmc_card_keep_power(host)) {
-               mmc_power_up(host, host->ocr);
-               mmc_select_voltage(host, host->ocr);
+               mmc_power_up(host, host->card->ocr);
+               mmc_select_voltage(host, host->card->ocr);
                /*
                 * Tell runtime PM core we just powered up the card,
                 * since it still believes the card is powered off.
@@ -1024,7 +1026,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
        if (mmc_card_is_removable(host) || !mmc_card_keep_power(host)) {
                sdio_reset(host);
                mmc_go_idle(host);
-               err = mmc_sdio_init_card(host, host->ocr, host->card,
+               err = mmc_sdio_init_card(host, host->card->ocr, host->card,
                                        mmc_card_keep_power(host));
        } else if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host)) {
                /* We may have switched to 1-bit mode during suspend */
@@ -1064,7 +1066,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
 static int mmc_sdio_power_restore(struct mmc_host *host)
 {
        int ret;
-       u32 ocr;
+       u32 ocr, rocr;
 
        BUG_ON(!host);
        BUG_ON(!host->card);
@@ -1101,13 +1103,13 @@ static int mmc_sdio_power_restore(struct mmc_host *host)
        if (host->ocr_avail_sdio)
                host->ocr_avail = host->ocr_avail_sdio;
 
-       host->ocr = mmc_select_voltage(host, ocr & ~0x7F);
-       if (!host->ocr) {
+       rocr = mmc_select_voltage(host, ocr & ~0x7F);
+       if (!rocr) {
                ret = -EINVAL;
                goto out;
        }
 
-       ret = mmc_sdio_init_card(host, host->ocr, host->card,
+       ret = mmc_sdio_init_card(host, rocr, host->card,
                                mmc_card_keep_power(host));
        if (!ret && host->sdio_irqs)
                mmc_signal_sdio_irq(host);
@@ -1128,7 +1130,7 @@ static int mmc_sdio_runtime_suspend(struct mmc_host *host)
 static int mmc_sdio_runtime_resume(struct mmc_host *host)
 {
        /* Restore power and re-initialize. */
-       mmc_power_up(host, host->ocr);
+       mmc_power_up(host, host->card->ocr);
        return mmc_sdio_power_restore(host);
 }
 
@@ -1151,7 +1153,7 @@ static const struct mmc_bus_ops mmc_sdio_ops = {
 int mmc_attach_sdio(struct mmc_host *host)
 {
        int err, i, funcs;
-       u32 ocr;
+       u32 ocr, rocr;
        struct mmc_card *card;
 
        BUG_ON(!host);
@@ -1176,12 +1178,12 @@ int mmc_attach_sdio(struct mmc_host *host)
                ocr &= ~0x7F;
        }
 
-       host->ocr = mmc_select_voltage(host, ocr);
+       rocr = mmc_select_voltage(host, ocr);
 
        /*
         * Can we support the voltage(s) of the card(s)?
         */
-       if (!host->ocr) {
+       if (!rocr) {
                err = -EINVAL;
                goto err;
        }
@@ -1189,7 +1191,7 @@ int mmc_attach_sdio(struct mmc_host *host)
        /*
         * Detect and init the card.
         */
-       err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
+       err = mmc_sdio_init_card(host, rocr, NULL, 0);
        if (err)
                goto err;
 
@@ -1296,6 +1298,7 @@ err:
        return err;
 }
 
+/*
 int sdio_reset_comm(struct mmc_card *card)
 {
        struct mmc_host *host = card->host;
@@ -1332,3 +1335,4 @@ err:
        return err;
 }
 EXPORT_SYMBOL(sdio_reset_comm);
+*/

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index f42cdbd8ac21bd0353552b00e040dfe8a811aa43..33d9a74f92e6c34a5e1e14618e23ee3fac774b1b 100644 (file)
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -240,6 +240,7 @@ struct mmc_part {
 struct mmc_card {
        struct mmc_host         *host;          /* the host this device belongs to */
        struct device           dev;            /* the device */
+       u32                     ocr;            /* the current OCR setting */
        unsigned int            rca;            /* relative card address of device */
        unsigned int            type;           /* card type */
 #define MMC_TYPE_MMC           0               /* MMC card */

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index ea85ad773d5e3ecf84455f288405d2a17ac97648..34e9987d7af3e953227cfbba7e03f664a116d460 100755 (executable)
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -316,7 +316,6 @@ struct mmc_host {
        spinlock_t              lock;           /* lock for claim and bus ops */
 
        struct mmc_ios          ios;            /* current io bus settings */
-       u32                     ocr;            /* the current OCR setting */
 
        /* group bitfields together to minimize padding */
        unsigned int            use_spi_crc:1;