Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ea67fae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "Here are some mmc fixes intended for v4.9 rc2.

  This time I have also included a few changes for a memstick driver
  which has a corresponding mmc driver. They use the same USB device as
  parent, hence both needs to play nice with runtime PM, which they
  didn't.

  MMC core:
   - Update MAINTAINERS as the mmc tree moved to kernel.org
   - A few fixes for HS400es mode
   - A few other minor fixes

  MMC host:
   - sdhci: Fix an issue when dealing with stop commands
   - sdhci-pci: Fix a bus power failure issue
   - sdhci-esdhc-imx: Correct two register accesses
   - sdhci-of-arasan: Fix the 1.8V I/O signal switch behaviour
   - rtsx_usb_sdmmc: Fix runtime PM issues

  Other: (Because of no maintainer)
   - memstick: rtsx_usb_ms: Fix runtime PM issues"

* tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  MAINTAINERS: mmc: Move the mmc tree to kernel.org
  memstick: rtsx_usb_ms: Manage runtime PM when accessing the device
  memstick: rtsx_usb_ms: Runtime resume the device when polling for cards
  mmc: rtsx_usb_sdmmc: Handle runtime PM while changing the led
  mmc: rtsx_usb_sdmmc: Avoid keeping the device runtime resumed when unused
  mmc: sdhci: cast unsigned int to unsigned long long to avoid unexpeted error
  mmc: sdhci-esdhc-imx: Correct two register accesses
  mmc: sdhci-pci: Fix bus power failing to enable for some Intel controllers
  mmc: sdhci-pci: Let devices define their own sdhci_ops
  mmc: sdhci: Rename sdhci_set_power() to sdhci_set_power_noreg()
  mmc: sdhci: Fix SDHCI_QUIRK2_STOP_WITH_TC
  mmc: core: Annotate cmd_hdr as __le32
  mmc: sdhci-of-arasan: add sdhci_arasan_voltage_switch for arasan, 5.1
  mmc: core: changes frequency to hs_max_dtr when selecting hs400es
  mmc: core: switch to 1V8 or 1V2 for hs400es mode
  mmc: block: add missing header dependencies
  mmc: sdhci-of-arasan: Fix non static symbol warning
parents a28ad14e 82bb095e

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8212,7 +8212,7 @@ F: include/linux/mfd/ 
MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM

M:	Ulf Hansson <ulf.hansson@linaro.org>

L:	linux-mmc@vger.kernel.org

T:	git git://git.linaro.org/people/ulf.hansson/mmc.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git

S:	Maintained

F:	Documentation/devicetree/bindings/mmc/

F:	drivers/mmc/

drivers/memstick/host/rtsx_usb_ms.c

+6 −0
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work) 
	int rc;



	if (!host->req) {

		pm_runtime_get_sync(ms_dev(host));

		do {

			rc = memstick_next_req(msh, &host->req);

			dev_dbg(ms_dev(host), "next req %d\n", rc);
@@ -544,6 +545,7 @@ static void rtsx_usb_ms_handle_req(struct work_struct *work) 
						host->req->error);

			}

		} while (!rc);

		pm_runtime_put(ms_dev(host));

	}



}
@@ -570,6 +572,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh, 
	dev_dbg(ms_dev(host), "%s: param = %d, value = %d\n",

			__func__, param, value);



	pm_runtime_get_sync(ms_dev(host));

	mutex_lock(&ucr->dev_mutex);



	err = rtsx_usb_card_exclusive_check(ucr, RTSX_USB_MS_CARD);
@@ -635,6 +638,7 @@ static int rtsx_usb_ms_set_param(struct memstick_host *msh, 
	}

out:

	mutex_unlock(&ucr->dev_mutex);

	pm_runtime_put(ms_dev(host));



	/* power-on delay */

	if (param == MEMSTICK_POWER && value == MEMSTICK_POWER_ON)
@@ -681,6 +685,7 @@ static int rtsx_usb_detect_ms_card(void *__host) 
	int err;



	for (;;) {

		pm_runtime_get_sync(ms_dev(host));

		mutex_lock(&ucr->dev_mutex);



		/* Check pending MS card changes */
@@ -703,6 +708,7 @@ static int rtsx_usb_detect_ms_card(void *__host) 
		}



poll_again:

		pm_runtime_put(ms_dev(host));

		if (host->eject)

			break;

drivers/mmc/card/block.c

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <asm/uaccess.h>



#include "queue.h"

#include "block.h"



MODULE_ALIAS("mmc:block");

#ifdef MODULE_PARAM_PREFIX
@@ -1786,7 +1787,7 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq, 
	struct mmc_blk_data *md = mq->data;

	struct mmc_packed *packed = mqrq->packed;

	bool do_rel_wr, do_data_tag;

	u32 *packed_cmd_hdr;

	__le32 *packed_cmd_hdr;

	u8 hdr_blocks;

	u8 i = 1;

drivers/mmc/card/queue.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ enum mmc_packed_type { 


struct mmc_packed {

	struct list_head	list;

	u32			cmd_hdr[1024];

	__le32			cmd_hdr[1024];

	unsigned int		blocks;

	u8			nr_entries;

	u8			retries;

drivers/mmc/core/mmc.c

+12 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,16 @@ static int mmc_select_hs400es(struct mmc_card *card) 
		goto out_err;

	}



	if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_2V)

		err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120);



	if (err && card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400_1_8V)

		err = __mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);



	/* If fails try again during next card power cycle */

	if (err)

		goto out_err;



	err = mmc_select_bus_width(card);

	if (err < 0)

		goto out_err;
@@ -1272,6 +1282,8 @@ static int mmc_select_hs400es(struct mmc_card *card) 
	if (err)

		goto out_err;



	mmc_set_clock(host, card->ext_csd.hs_max_dtr);



	err = mmc_switch_status(card);

	if (err)

		goto out_err;