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

mmc: core: Report firmware version for eMMC 5.0 devices.

For eMMC 5.0 compliant device, firmware version is stored in ext_csd.
Report firmware as a 64bit hexa decimal. Vendor can use hexa or ascii
string to report firmware version.
Also add FFU related EXT_CSD register and note if the device is FFU capable.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Gwendal Grignou and committed by
Ulf Hansson 0f762426 e7791079

+32 -1
+26 -1
drivers/mmc/core/mmc.c
··· 628 628 card->ext_csd.data_sector_size = 512; 629 629 } 630 630 631 + /* eMMC v5 or later */ 632 + if (card->ext_csd.rev >= 7) { 633 + memcpy(card->ext_csd.fwrev, &ext_csd[EXT_CSD_FIRMWARE_VERSION], 634 + MMC_FIRMWARE_LEN); 635 + card->ext_csd.ffu_capable = 636 + (ext_csd[EXT_CSD_SUPPORTED_MODE] & 0x1) && 637 + !(ext_csd[EXT_CSD_FW_CONFIG] & 0x1); 638 + } 631 639 out: 632 640 return err; 633 641 } ··· 730 722 MMC_DEV_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year); 731 723 MMC_DEV_ATTR(erase_size, "%u\n", card->erase_size << 9); 732 724 MMC_DEV_ATTR(preferred_erase_size, "%u\n", card->pref_erase << 9); 733 - MMC_DEV_ATTR(fwrev, "0x%x\n", card->cid.fwrev); 725 + MMC_DEV_ATTR(ffu_capable, "%d\n", card->ext_csd.ffu_capable); 734 726 MMC_DEV_ATTR(hwrev, "0x%x\n", card->cid.hwrev); 735 727 MMC_DEV_ATTR(manfid, "0x%06x\n", card->cid.manfid); 736 728 MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name); ··· 743 735 MMC_DEV_ATTR(raw_rpmb_size_mult, "%#x\n", card->ext_csd.raw_rpmb_size_mult); 744 736 MMC_DEV_ATTR(rel_sectors, "%#x\n", card->ext_csd.rel_sectors); 745 737 738 + static ssize_t mmc_fwrev_show(struct device *dev, 739 + struct device_attribute *attr, 740 + char *buf) 741 + { 742 + struct mmc_card *card = mmc_dev_to_card(dev); 743 + 744 + if (card->ext_csd.rev < 7) { 745 + return sprintf(buf, "0x%x\n", card->cid.fwrev); 746 + } else { 747 + return sprintf(buf, "0x%*phN\n", MMC_FIRMWARE_LEN, 748 + card->ext_csd.fwrev); 749 + } 750 + } 751 + 752 + static DEVICE_ATTR(fwrev, S_IRUGO, mmc_fwrev_show, NULL); 753 + 746 754 static struct attribute *mmc_std_attrs[] = { 747 755 &dev_attr_cid.attr, 748 756 &dev_attr_csd.attr, ··· 766 742 &dev_attr_erase_size.attr, 767 743 &dev_attr_preferred_erase_size.attr, 768 744 &dev_attr_fwrev.attr, 745 + &dev_attr_ffu_capable.attr, 769 746 &dev_attr_hwrev.attr, 770 747 &dev_attr_manfid.attr, 771 748 &dev_attr_name.attr,
+3
include/linux/mmc/card.h
··· 88 88 unsigned int data_tag_unit_size; /* DATA TAG UNIT size */ 89 89 unsigned int boot_ro_lock; /* ro lock support */ 90 90 bool boot_ro_lockable; 91 + bool ffu_capable; /* Firmware upgrade support */ 92 + #define MMC_FIRMWARE_LEN 8 93 + u8 fwrev[MMC_FIRMWARE_LEN]; /* FW version */ 91 94 u8 raw_exception_status; /* 54 */ 92 95 u8 raw_partition_support; /* 160 */ 93 96 u8 raw_rpmb_size_mult; /* 168 */
+3
include/linux/mmc/mmc.h
··· 296 296 #define EXT_CSD_SANITIZE_START 165 /* W */ 297 297 #define EXT_CSD_WR_REL_PARAM 166 /* RO */ 298 298 #define EXT_CSD_RPMB_MULT 168 /* RO */ 299 + #define EXT_CSD_FW_CONFIG 169 /* R/W */ 299 300 #define EXT_CSD_BOOT_WP 173 /* R/W */ 300 301 #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ 301 302 #define EXT_CSD_PART_CONFIG 179 /* R/W */ ··· 333 332 #define EXT_CSD_GENERIC_CMD6_TIME 248 /* RO */ 334 333 #define EXT_CSD_CACHE_SIZE 249 /* RO, 4 bytes */ 335 334 #define EXT_CSD_PWR_CL_DDR_200_360 253 /* RO */ 335 + #define EXT_CSD_FIRMWARE_VERSION 254 /* RO, 8 bytes */ 336 + #define EXT_CSD_SUPPORTED_MODE 493 /* RO */ 336 337 #define EXT_CSD_TAG_UNIT_SIZE 498 /* RO */ 337 338 #define EXT_CSD_DATA_TAG_SUPPORT 499 /* RO */ 338 339 #define EXT_CSD_MAX_PACKED_WRITES 500 /* RO */