From patchwork Wed Mar 4 03:12:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Light Hsieh X-Patchwork-Id: 11419241 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 21C9F139A for ; Wed, 4 Mar 2020 03:12:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2B66214D8 for ; Wed, 4 Mar 2020 03:12:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="O6mF9GbT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387459AbgCDDM1 (ORCPT ); Tue, 3 Mar 2020 22:12:27 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:39422 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2387398AbgCDDM1 (ORCPT ); Tue, 3 Mar 2020 22:12:27 -0500 X-UUID: 5d9cb5feac8e4259ba7b1a46bfa0517a-20200304 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=qsn5ZtkxofEPhSlSyo8Sta1tKWHmr79ZpPp6bUCSBTY=; b=O6mF9GbTYg3/U0O2uHd8IUGywS/WyPCyEhT9S2wLrY+qe4qwWXRTUtL18guPa1SVZo6ihIGjy4sTdWoF3PBTNZgRXZyTGVFqPiZJYi672+XXqH5jhquz0obYmjBirf1oKxnFhPGbo089h5Si2IRPqux7OU5XFn0gToXtdA4904Q=; X-UUID: 5d9cb5feac8e4259ba7b1a46bfa0517a-20200304 Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1104357860; Wed, 04 Mar 2020 11:12:20 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 4 Mar 2020 11:11:10 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 4 Mar 2020 11:09:47 +0800 From: To: CC: , , , , , , Light Hsieh Subject: [RESEND PATCH v1 1/3] mmc: record wp_grp_size and boot_wp_status Date: Wed, 4 Mar 2020 11:12:15 +0800 Message-ID: <1583291537-15053-2-git-send-email-light.hsieh@mediatek.com> X-Mailer: git-send-email 1.8.1.1.dirty In-Reply-To: <1583291537-15053-1-git-send-email-light.hsieh@mediatek.com> References: <1583291537-15053-1-git-send-email-light.hsieh@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: EF3CC1366C200503190F9B55F614E6A974DDF1E539B2458F696DA0060AB324932000:8 X-MTK: N Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Light Hsieh 1. record wp_grp_size (write-protection group size) in struct mmc_csd and struct mmc_card. 2. record boot_wp_status (boot partition write-protection status) in struct mmc_ext_csd. Signed-off-by: Light Hsieh --- drivers/mmc/core/mmc.c | 16 ++++++++++++++++ include/linux/mmc/card.h | 3 +++ include/linux/mmc/mmc.h | 1 + 3 files changed, 20 insertions(+) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index f6912de..77305c8 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -127,6 +127,16 @@ static void mmc_set_erase_size(struct mmc_card *card) mmc_init_erase(card); } +static void mmc_set_wp_grp_size(struct mmc_card *card) +{ + if (card->ext_csd.erase_group_def & 1) + card->wp_grp_size = card->ext_csd.hc_erase_size * + card->ext_csd.raw_hc_erase_gap_size; + else + card->wp_grp_size = card->csd.erase_size * + (card->csd.wp_grp_size + 1); +} + /* * Given a 128-bit response, decode to our card CSD structure. */ @@ -177,6 +187,7 @@ static int mmc_decode_csd(struct mmc_card *card) b = UNSTUFF_BITS(resp, 37, 5); csd->erase_size = (a + 1) * (b + 1); csd->erase_size <<= csd->write_blkbits - 9; + csd->wp_grp_size = UNSTUFF_BITS(resp, 32, 5); } return 0; @@ -496,6 +507,8 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd) card->ext_csd.boot_ro_lock = ext_csd[EXT_CSD_BOOT_WP]; card->ext_csd.boot_ro_lockable = true; + card->ext_csd.boot_wp_status = ext_csd[EXT_CSD_BOOT_WP_STATUS]; + /* Save power class values */ card->ext_csd.raw_pwr_cl_52_195 = ext_csd[EXT_CSD_PWR_CL_52_195]; @@ -769,6 +782,7 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width) card->raw_csd[2], card->raw_csd[3]); MMC_DEV_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year); MMC_DEV_ATTR(erase_size, "%u\n", card->erase_size << 9); +MMC_DEV_ATTR(wp_grp_size, "%u\n", card->wp_grp_size << 9); MMC_DEV_ATTR(preferred_erase_size, "%u\n", card->pref_erase << 9); MMC_DEV_ATTR(ffu_capable, "%d\n", card->ext_csd.ffu_capable); MMC_DEV_ATTR(hwrev, "0x%x\n", card->cid.hwrev); @@ -828,6 +842,7 @@ static ssize_t mmc_dsr_show(struct device *dev, &dev_attr_csd.attr, &dev_attr_date.attr, &dev_attr_erase_size.attr, + &dev_attr_wp_grp_size.attr, &dev_attr_preferred_erase_size.attr, &dev_attr_fwrev.attr, &dev_attr_ffu_capable.attr, @@ -1709,6 +1724,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, mmc_set_erase_size(card); } } + mmc_set_wp_grp_size(card); /* * Ensure eMMC user default partition is enabled diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index cf3780a..0139461 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -32,6 +32,7 @@ struct mmc_csd { unsigned int r2w_factor; unsigned int max_dtr; unsigned int erase_size; /* In sectors */ + unsigned int wp_grp_size; unsigned int read_blkbits; unsigned int write_blkbits; unsigned int capacity; @@ -94,6 +95,7 @@ struct mmc_ext_csd { u8 raw_exception_status; /* 54 */ u8 raw_partition_support; /* 160 */ u8 raw_rpmb_size_mult; /* 168 */ + u8 boot_wp_status; /* 174 */ u8 raw_erased_mem_count; /* 181 */ u8 strobe_support; /* 184 */ u8 raw_ext_csd_structure; /* 194 */ @@ -278,6 +280,7 @@ struct mmc_card { unsigned int eg_boundary; /* don't cross erase-group boundaries */ unsigned int erase_arg; /* erase / trim / discard */ u8 erased_byte; /* value of erased bytes */ + unsigned int wp_grp_size; /* write group size(sectors) */ u32 raw_cid[4]; /* raw card CID */ u32 raw_csd[4]; /* raw card CSD */ diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 897a87c..2c9d988 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h @@ -259,6 +259,7 @@ static inline bool mmc_op_multi(u32 opcode) #define EXT_CSD_RPMB_MULT 168 /* RO */ #define EXT_CSD_FW_CONFIG 169 /* R/W */ #define EXT_CSD_BOOT_WP 173 /* R/W */ +#define EXT_CSD_BOOT_WP_STATUS 174 /* RO */ #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ #define EXT_CSD_PART_CONFIG 179 /* R/W */ #define EXT_CSD_ERASED_MEM_CONT 181 /* RO */