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

Commit a64227b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: queue: bring discard_granularity/alignment into line with SCSI
  mmc: queue: append partition subname to queue thread name
  mmc: core: make erase timeout calculation allow for gated clock
  mmc: block: switch card to User Data Area when removing the block driver
  mmc: sdio: reset card during power_restore
  mmc: cb710: fix #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
  mmc: sdhi: DMA slave ID 0 is invalid
  mmc: tmio: fix regression in TMIO_MMC_WRPROTECT_DISABLE handling
  mmc: omap_hsmmc: use original sg_len for dma_unmap_sg
  mmc: omap_hsmmc: fix ocr mask usage
  mmc: sdio: fix runtime PM path during driver removal
  mmc: Add PCI fixup quirks for Ricoh 1180:e823 reader
  mmc: sdhi: fix module unloading
  mmc: of_mmc_spi: add NO_IRQ define to of_mmc_spi.c
  mmc: vub300: fix null dereferences in error handling
parents c6830c22 c31b55cd

drivers/misc/cb710/sgbuf2.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static uint32_t sg_dwiter_read_buffer(struct sg_mapping_iter *miter) 


static inline bool needs_unaligned_copy(const void *ptr)

{

#ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS

#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS

	return false;

#else

	return ((ptr - NULL) & 3) != 0;

drivers/mmc/card/block.c

+4 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, 
	INIT_LIST_HEAD(&md->part);

	md->usage = 1;



	ret = mmc_init_queue(&md->queue, card, &md->lock);

	ret = mmc_init_queue(&md->queue, card, &md->lock, subname);

	if (ret)

		goto err_putdisk;
@@ -1297,6 +1297,9 @@ static void mmc_blk_remove(struct mmc_card *card) 
	struct mmc_blk_data *md = mmc_get_drvdata(card);



	mmc_blk_remove_parts(card, md);

	mmc_claim_host(card->host);

	mmc_blk_part_switch(card, md);

	mmc_release_host(card->host);

	mmc_blk_remove_req(md);

	mmc_set_drvdata(card, NULL);

}

drivers/mmc/card/queue.c

+6 −9
Original line number Diff line number Diff line
@@ -106,10 +106,12 @@ static void mmc_request(struct request_queue *q) 
 * @mq: mmc queue

 * @card: mmc card to attach this queue

 * @lock: queue lock

 * @subname: partition subname

 *

 * Initialise a MMC card request queue.

 */

int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock)

int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,

		   spinlock_t *lock, const char *subname)

{

	struct mmc_host *host = card->host;

	u64 limit = BLK_BOUNCE_HIGH;
@@ -133,12 +135,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 
		mq->queue->limits.max_discard_sectors = UINT_MAX;

		if (card->erased_byte == 0)

			mq->queue->limits.discard_zeroes_data = 1;

		if (!mmc_can_trim(card) && is_power_of_2(card->erase_size)) {

			mq->queue->limits.discard_granularity =

							card->erase_size << 9;

			mq->queue->limits.discard_alignment =

							card->erase_size << 9;

		}

		mq->queue->limits.discard_granularity = card->pref_erase << 9;

		if (mmc_can_secure_erase_trim(card))

			queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD,

						mq->queue);
@@ -209,8 +206,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock 


	sema_init(&mq->thread_sem, 1);



	mq->thread = kthread_run(mmc_queue_thread, mq, "mmcqd/%d",

		host->index);

	mq->thread = kthread_run(mmc_queue_thread, mq, "mmcqd/%d%s",

		host->index, subname ? subname : "");



	if (IS_ERR(mq->thread)) {

		ret = PTR_ERR(mq->thread);

drivers/mmc/card/queue.h

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ struct mmc_queue { 
	unsigned int		bounce_sg_len;

};



extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *);

extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *,

			  const char *);

extern void mmc_cleanup_queue(struct mmc_queue *);

extern void mmc_queue_suspend(struct mmc_queue *);

extern void mmc_queue_resume(struct mmc_queue *);

drivers/mmc/core/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card, 
		 */

		timeout_clks <<= 1;

		timeout_us += (timeout_clks * 1000) /

			      (card->host->ios.clock / 1000);

			      (mmc_host_clk_rate(card->host) / 1000);



		erase_timeout = timeout_us / 1000;