Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sdio: add MMC_QUIRK_LENIENT_FN0

Normally writes to SDIO function 0 outside the vendor specific CCCR
registers are prohibited.

To support embedded devices that require writes to SDIO function 0 outside
this range (e.g. TI WL127x embedded sdio wifi device),
MMC_QUIRK_LENIENT_FN0 is introduced.

A card quirks field is added to `struct mmc_card' to support non-standard
devices (e.g. embedded sdio devices).

[akpm@linux-foundation.org: code in C, not cpp!]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Ohad Ben-Cohen and committed by
Linus Torvalds
7c979ec7 ad1e597d

+8 -1
+1 -1
drivers/mmc/core/sdio_io.c
··· 624 624 625 625 BUG_ON(!func); 626 626 627 - if (addr < 0xF0 || addr > 0xFF) { 627 + if ((addr < 0xF0 || addr > 0xFF) && (!mmc_card_lenient_fn0(func->card))) { 628 628 if (err_ret) 629 629 *err_ret = -EINVAL; 630 630 return;
+7
include/linux/mmc/card.h
··· 97 97 #define MMC_STATE_READONLY (1<<1) /* card is read-only */ 98 98 #define MMC_STATE_HIGHSPEED (1<<2) /* card is in high speed mode */ 99 99 #define MMC_STATE_BLOCKADDR (1<<3) /* card uses block-addressing */ 100 + unsigned int quirks; /* card quirks */ 101 + #define MMC_QUIRK_LENIENT_FN0 (1<<0) /* allow SDIO FN0 writes outside of the VS CCCR range */ 100 102 101 103 u32 raw_cid[4]; /* raw card CID */ 102 104 u32 raw_csd[4]; /* raw card CSD */ ··· 133 131 #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY) 134 132 #define mmc_card_set_highspeed(c) ((c)->state |= MMC_STATE_HIGHSPEED) 135 133 #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR) 134 + 135 + static inline int mmc_card_lenient_fn0(const struct mmc_card *c) 136 + { 137 + return c->quirks & MMC_QUIRK_LENIENT_FN0; 138 + } 136 139 137 140 #define mmc_card_name(c) ((c)->cid.prod_name) 138 141 #define mmc_card_id(c) (dev_name(&(c)->dev))