From: Dmitry Osipenko <digetx@gmail.com>
To: "Jens Axboe" <axboe@kernel.dk>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"David Heidelberg" <david@ixit.cz>,
"Peter Geis" <pgwipeout@gmail.com>,
"Stephen Warren" <swarren@wwwdotorg.org>,
"Nicolas Chauvet" <kwizart@gmail.com>,
"Ulf Hansson" <ulf.hansson@linaro.org>,
"Adrian Hunter" <adrian.hunter@intel.com>,
"Billy Laws" <blaws05@gmail.com>
Cc: linux-tegra@vger.kernel.org, linux-block@vger.kernel.org,
Andrey Danin <danindrey@mail.ru>,
Gilles Grandou <gilles@grandou.net>,
Ryan Grachek <ryan@edited.us>,
linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 10/10] partitions/tegra: Implement eMMC boot partitions scanning
Date: Mon, 23 Mar 2020 19:34:31 +0300 [thread overview]
Message-ID: <20200323163431.7678-11-digetx@gmail.com> (raw)
In-Reply-To: <20200323163431.7678-1-digetx@gmail.com>
Some NVIDIA Tegra devices store partition table on eMMC boot partition.
In order to support this case, the tegra-partition parser will read out
partition table from a boot partition and stash it for the main eMMC
partition.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
block/partitions/tegra.c | 122 +++++++++++++++++++++++++++++++++++----
1 file changed, 111 insertions(+), 11 deletions(-)
diff --git a/block/partitions/tegra.c b/block/partitions/tegra.c
index 4cb8064bf458..09c300330f81 100644
--- a/block/partitions/tegra.c
+++ b/block/partitions/tegra.c
@@ -25,6 +25,7 @@
#include <linux/mmc/blkdev.h>
#include <linux/mmc/card.h>
#include <linux/mmc/host.h>
+#include <linux/mmc/mmc.h>
#include <soc/tegra/common.h>
#include <soc/tegra/partition.h>
@@ -50,7 +51,10 @@
struct tegra_partition_table_parser {
struct tegra_partition_table *pt;
struct parsed_partitions *state;
+ struct mmc_card *card;
bool pt_entry_checked;
+ unsigned int boot_id;
+ bool snapshot_mode;
sector_t sector;
int boot_offset;
u32 dev_instance;
@@ -67,6 +71,7 @@ struct tegra_partition_type {
char *name;
};
+static struct tegra_partition_table *scratch_pt;
static sector_t tegra_pt_sector_address;
static sector_t tegra_pt_sectors_num;
@@ -224,6 +229,10 @@ static bool tegra_partition_valid(struct tegra_partition_table_parser *ptp,
return false;
}
+ /* size will be validated when ptp->snapshot_mode=false */
+ if (ptp->snapshot_mode && size)
+ return true;
+
sect_end = get_capacity(ptp->state->bdev->bd_disk);
/* eMMC boot partitions are below ptp->boot_offset */
@@ -254,6 +263,9 @@ static bool tegra_partitions_parse(struct tegra_partition_table_parser *ptp,
sector_t sector, size;
int i, slot = 1;
+ if (ptp->snapshot_mode && !check_only)
+ return true;
+
ptp->pt_entry_checked = false;
for (i = 0; i < pt->secure.num_partitions; i++) {
@@ -369,6 +381,7 @@ tegra_partition_table_emmc_boot_offset(struct tegra_partition_table_parser *ptp)
{
struct mmc_card *card = mmc_bdev_to_card(ptp->state->bdev);
const struct of_device_id *matched;
+ int part_type, area_type;
const u32 *sdhci_bases;
u32 sdhci_base;
unsigned int i;
@@ -404,6 +417,32 @@ tegra_partition_table_emmc_boot_offset(struct tegra_partition_table_parser *ptp)
ptp->dev_id = TEGRA_PT_SDHCI_DEVICE_ID;
ptp->dev_instance = i;
+ area_type = mmc_bdev_to_area_type(ptp->state->bdev);
+
+ if (WARN_ON(area_type < 0))
+ return -1;
+
+ switch (area_type) {
+ case MMC_BLK_DATA_AREA_BOOT:
+ part_type = mmc_bdev_to_part_type(ptp->state->bdev);
+
+ if (WARN_ON(part_type < 0))
+ return -1;
+
+ ptp->boot_id = part_type - EXT_CSD_PART_CONFIG_ACC_BOOT0;
+ ptp->snapshot_mode = true;
+ break;
+
+ case MMC_BLK_DATA_AREA_MAIN:
+ break;
+
+ default:
+ TEGRA_PT_ERR(ptp, "unexpected area_type: %u\n", area_type);
+ return -1;
+ }
+
+ ptp->card = card;
+
/*
* eMMC storage has two special boot partitions in addition to the
* main one. NVIDIA's bootloader linearizes eMMC boot0->boot1->main
@@ -427,6 +466,9 @@ static int tegra_read_partition_table(struct tegra_partition_table_parser *ptp)
Sector sect;
void *part;
+ if (scratch_pt)
+ return 1;
+
for (i = 0; i < ARRAY_SIZE(ptu->pt_parts); i++) {
/*
* Partition table takes at maximum 4096 bytes, but
@@ -462,18 +504,64 @@ int tegra_partition(struct parsed_partitions *state)
if (ptp.boot_offset < 0)
return 0;
- if (tegra_pt_sector_address < ptp.boot_offset) {
- TEGRA_PT_INFO(&ptp,
- "scanning eMMC boot partitions unimplemented\n");
- return 0;
- }
+ /*
+ * Some devices store partition table on boot MMC partition.
+ * In this case a "snapshot mode" will be used, which will
+ * only read->check->store partition table, the stored table
+ * will be used for the main MMC partition later on.
+ */
+ if (ptp.snapshot_mode) {
+ sector_t boot_start, boot_end, boot_size;
- ptp.pt = kmalloc(TEGRA_PT_LOGICAL_SECTOR_SIZE, GFP_KERNEL);
- if (!ptp.pt)
- return 0;
+ /* partition is already snapshoted, no need to proceed */
+ if (scratch_pt)
+ return 0;
+
+ boot_size = ptp.boot_offset / MMC_NUM_BOOT_PARTITION;
+ boot_start = ptp.boot_id * boot_size;
+ boot_end = boot_start + boot_size;
- ptp.sector = tegra_pt_sector_address - ptp.boot_offset;
- end_sector = ptp.sector + tegra_pt_sectors_num;
+ /*
+ * Bail out if partition table isn't located here, at this MMC
+ * partition.
+ */
+ if (tegra_pt_sector_address < boot_start ||
+ tegra_pt_sector_address >= boot_end)
+ return 0;
+
+ ptp.boot_offset = boot_start;
+
+ /*
+ * Note that mmc_blk_probe() always registers boot partitions
+ * after the main and we rely on this feature, otherwise
+ * scratch_pt won't be released (although this is not a big
+ * deal).
+ */
+ ptp.pt = kmalloc(TEGRA_PT_LOGICAL_SECTOR_SIZE, GFP_KERNEL);
+ if (!ptp.pt)
+ return 0;
+
+ ptp.sector = tegra_pt_sector_address - ptp.boot_offset;
+ end_sector = ptp.sector + tegra_pt_sectors_num;
+
+ } else if (scratch_pt) {
+ TEGRA_PT_INFO(&ptp, "using stashed partition table\n");
+
+ ptp.pt = scratch_pt;
+ ptp.sector = 0;
+ end_sector = 1;
+
+ } else {
+ if (tegra_pt_sector_address < ptp.boot_offset)
+ return 0;
+
+ ptp.pt = kmalloc(TEGRA_PT_LOGICAL_SECTOR_SIZE, GFP_KERNEL);
+ if (!ptp.pt)
+ return 0;
+
+ ptp.sector = tegra_pt_sector_address - ptp.boot_offset;
+ end_sector = ptp.sector + tegra_pt_sectors_num;
+ }
/*
* Partition table is duplicated till the end_sector.
@@ -503,9 +591,21 @@ int tegra_partition(struct parsed_partitions *state)
ptp.sector += TEGRA_PT_SECTOR_SZ;
}
- if (ret == 1)
+ if (ret == 1) {
+ if (ptp.snapshot_mode) {
+ ptp.card->quirks |= MMC_QUIRK_RESCAN_MAIN_BLKDEV;
+ scratch_pt = ptp.pt;
+
+ strlcat(state->pp_buf,
+ " stashed tegra-partition table\n", PAGE_SIZE);
+
+ return ret;
+ }
+
strlcat(state->pp_buf, "\n", PAGE_SIZE);
+ }
+ scratch_pt = NULL;
kfree(ptp.pt);
return ret;
--
2.25.1
next prev parent reply other threads:[~2020-03-23 16:35 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 16:34 [PATCH v3 00/10] Introduce NVIDIA Tegra Partition Table Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 01/10] mmc: core: Add raw_boot_mult field to mmc_ext_csd Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 02/10] mmc: block: Add mmc_bdev_to_card() helper Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 03/10] partitions: Introduce NVIDIA Tegra Partition Table Dmitry Osipenko
2020-03-23 19:17 ` Michał Mirosław
2020-03-23 19:59 ` Dmitry Osipenko
2020-03-23 21:35 ` Michał Mirosław
2020-03-23 23:22 ` Dmitry Osipenko
2020-03-24 20:52 ` Michał Mirosław
2020-03-25 0:27 ` Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 04/10] block: Introduce GENHD_FL_PART_SCAN_ONCE Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 05/10] mmc: block: Add mmc_bdev_to_part_type() helper Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 06/10] mmc: block: Add mmc_bdev_to_area_type() helper Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 07/10] mmc: block: Add MMC_QUIRK_RESCAN_MAIN_BLKDEV Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 08/10] mmc: block: Support partition-table scanning on boot partitions Dmitry Osipenko
2020-03-23 16:34 ` [PATCH v3 09/10] mmc: sdhci-tegra: Enable boot partitions scanning on Tegra20 and Tegra30 Dmitry Osipenko
2020-03-23 16:34 ` Dmitry Osipenko [this message]
2020-03-23 16:49 ` [PATCH v3 00/10] Introduce NVIDIA Tegra Partition Table Dmitry Osipenko
2020-03-23 18:07 ` Michał Mirosław
2020-03-23 19:44 ` Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200323163431.7678-11-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=axboe@kernel.dk \
--cc=blaws05@gmail.com \
--cc=danindrey@mail.ru \
--cc=david@ixit.cz \
--cc=gilles@grandou.net \
--cc=jonathanh@nvidia.com \
--cc=kwizart@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=pgwipeout@gmail.com \
--cc=ryan@edited.us \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).