From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 506E1C5519F for ; Wed, 18 Nov 2020 04:20:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00099238E6 for ; Wed, 18 Nov 2020 04:20:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="W76esqTs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725947AbgKREUh (ORCPT ); Tue, 17 Nov 2020 23:20:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725446AbgKREUh (ORCPT ); Tue, 17 Nov 2020 23:20:37 -0500 Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11DC1C0613D4 for ; Tue, 17 Nov 2020 20:20:37 -0800 (PST) Received: by mail-ot1-x342.google.com with SMTP id f16so486630otl.11 for ; Tue, 17 Nov 2020 20:20:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=6Wvxu8t2+2ioygEU2T4ArcOLVAxHUsdhIF9PdXDAJM4=; b=W76esqTsZ86EDM1lwch0e8uC4aT1RtvVouxGvKObeDHmB3bZMoC5oHjC2nJz9cteck 8koiNfwuE4Z3/i5L4VnIDUfcdNiXZbW+Fr9jjzKkS1Kx+5LYisyTaMeOs3gfmR83xPBt mGiuQpNmNtzFg2Rm+4dtyxgp3aEI2suOJTus+WjaZ1z4n4XNxPlWrXY6pj4Yf/lK64jx 4z8KLPyY/MdVNqTLwUaJLg4hTzTdzNuano/+1SdaiLuv+rcSyQQ5ozNgfgE/iJkGQSrM Si2u1p24qNr3vp49zz4qq7CydjH5Si4OSL49NNKvlLZ8lzlcUAy+tvHSdps+7yL+hhV6 e50Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=6Wvxu8t2+2ioygEU2T4ArcOLVAxHUsdhIF9PdXDAJM4=; b=sis9vf4cHzEonUfRViwCrY6YkxiiIIN8L2UpIJrV5+QpjDCwxHxLDwOwLQi4cbIpy4 RUDJ7/U0u89p+5qgCBX5+89zWdX6YJ/hLKdQfoJN3sa8vrVospkVeYDa+Q0qWOoM09LL Cmf5gBtAx8wEsTk56tptiaUD0Pwsz24vd5geLemFLTr+rLdTAd8xRc7wX+L3z7iMNXmJ VFgSwKuaTn9FdUHWnbZznzmpMaKjjWauPh/PHk5J+B2Eia7kpPGGa8sY8IBetMPdGMKp sWtUnHSjQ3O8sP6RvHID0Oq4T0XL0dxuK3HDxbOGim+Neqj4dBSu9pYE8qdUnnHrpmBm +ZRw== X-Gm-Message-State: AOAM533t9DR5RvCGTI1imce3ejBFla5NsvZ8XB6aKqkrGvvAFS7WqrcS hwtXJn2kF73LT8q6EalOG7abiA== X-Google-Smtp-Source: ABdhPJwqlVmYvFehmr/fzkq8uhhNTcWyQ3lNwNUQ3Bom+EBGXSfkQub4UHEpAO+oVi/uB5L0kvpjtg== X-Received: by 2002:a9d:6847:: with SMTP id c7mr5260354oto.134.1605673236210; Tue, 17 Nov 2020 20:20:36 -0800 (PST) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id a4sm6459055otj.29.2020.11.17.20.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 20:20:35 -0800 (PST) Date: Tue, 17 Nov 2020 22:20:33 -0600 From: Bjorn Andersson To: Manivannan Sadhasivam Cc: miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, robh+dt@kernel.org, linux-mtd@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/4] mtd: parsers: Add Qcom SMEM parser Message-ID: <20201118042033.GH8532@builder.lan> References: <20201117174845.28684-1-manivannan.sadhasivam@linaro.org> <20201117174845.28684-3-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201117174845.28684-3-manivannan.sadhasivam@linaro.org> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Tue 17 Nov 11:48 CST 2020, Manivannan Sadhasivam wrote: > NAND based Qualcomm platforms have the partition table populated in the > Shared Memory (SMEM). Hence, add a parser for parsing the partitions > from it. > > Signed-off-by: Manivannan Sadhasivam > --- > drivers/mtd/parsers/Kconfig | 8 ++ > drivers/mtd/parsers/Makefile | 1 + > drivers/mtd/parsers/qcomsmempart.c | 169 +++++++++++++++++++++++++++++ > 3 files changed, 178 insertions(+) > create mode 100644 drivers/mtd/parsers/qcomsmempart.c > > diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig > index e72354322f62..d90c30229052 100644 > --- a/drivers/mtd/parsers/Kconfig > +++ b/drivers/mtd/parsers/Kconfig > @@ -160,3 +160,11 @@ config MTD_REDBOOT_PARTS_READONLY > 'FIS directory' images, enable this option. > > endif # MTD_REDBOOT_PARTS > + > +config MTD_QCOMSMEM_PARTS > + tristate "Qualcomm SMEM NAND flash partition parser" > + depends on MTD_NAND_QCOM || COMPILE_TEST > + depends on QCOM_SMEM > + help > + This provides support for parsing partitions from Shared Memory (SMEM) > + for NAND flash on Qualcomm platforms. > diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile > index b0c5f62f9e85..50eb0b0a2210 100644 > --- a/drivers/mtd/parsers/Makefile > +++ b/drivers/mtd/parsers/Makefile > @@ -9,3 +9,4 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o > obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o > obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o > obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o > +obj-$(CONFIG_MTD_QCOMSMEM_PARTS) += qcomsmempart.o > diff --git a/drivers/mtd/parsers/qcomsmempart.c b/drivers/mtd/parsers/qcomsmempart.c > new file mode 100644 > index 000000000000..d8c2a3fa4dfe > --- /dev/null > +++ b/drivers/mtd/parsers/qcomsmempart.c > @@ -0,0 +1,169 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Qualcomm SMEM NAND flash partition parser > + * > + * Copyright (C) 2020, Linaro Ltd. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define SMEM_AARM_PARTITION_TABLE 9 > +#define SMEM_APPS 0 > + > +#define SMEM_FLASH_PART_MAGIC1 0x55ee73aa > +#define SMEM_FLASH_PART_MAGIC2 0xe35ebddb > +#define SMEM_FLASH_PTABLE_V3 3 > +#define SMEM_FLASH_PTABLE_V4 4 > +#define SMEM_FLASH_PTABLE_MAX_PARTS_V3 16 > +#define SMEM_FLASH_PTABLE_MAX_PARTS_V4 48 > +#define SMEM_FLASH_PTABLE_HDR_LEN (4 * sizeof(u32)) > +#define SMEM_FLASH_PTABLE_NAME_SIZE 16 > + > +/** > + * struct smem_flash_pentry - SMEM Flash partition entry > + * @name: Name of the partition > + * @offset: Offset in blocks > + * @length: Length of the partition in blocks > + * @attr: Flags for this partition > + */ > +struct smem_flash_pentry { > + char name[SMEM_FLASH_PTABLE_NAME_SIZE]; > + u32 offset; It would be nice if you noted that these are little endian (using __le32) and used le32_to_cpu() below. Apart from that I think this looks really good. > + u32 length; > + u8 attr; > +} __packed __aligned(4); > + > +/** > + * struct smem_flash_ptable - SMEM Flash partition table > + * @magic1: Partition table Magic 1 > + * @magic2: Partition table Magic 2 > + * @version: Partition table version > + * @numparts: Number of partitions in this ptable > + * @pentry: Flash partition entries belonging to this ptable > + */ > +struct smem_flash_ptable { > + u32 magic1; > + u32 magic2; > + u32 version; > + u32 numparts; > + struct smem_flash_pentry pentry[SMEM_FLASH_PTABLE_MAX_PARTS_V4]; > +} __packed __aligned(4); > + > +static int parse_qcomsmem_part(struct mtd_info *mtd, > + const struct mtd_partition **pparts, > + struct mtd_part_parser_data *data) > +{ > + struct smem_flash_pentry *pentry; > + struct smem_flash_ptable *ptable; > + size_t len = SMEM_FLASH_PTABLE_HDR_LEN; > + struct mtd_partition *parts; > + char *name, *c; > + int ret, i; > + > + pr_debug("Parsing partition table info from SMEM\n"); > + ptable = qcom_smem_get(SMEM_APPS, SMEM_AARM_PARTITION_TABLE, &len); > + if (IS_ERR(ptable)) { > + pr_err("Error reading partition table header\n"); > + return PTR_ERR(ptable); > + } > + > + /* Verify ptable magic */ > + if (ptable->magic1 != SMEM_FLASH_PART_MAGIC1 || > + ptable->magic2 != SMEM_FLASH_PART_MAGIC2) { > + pr_err("Partition table magic verification failed\n"); > + return -EINVAL; > + } > + > + /* Ensure that # of partitions is less than the max we have allocated */ > + if (ptable->numparts > SMEM_FLASH_PTABLE_MAX_PARTS_V4) { > + pr_err("Partition numbers exceed the max limit\n"); > + return -EINVAL; > + } > + > + /* Find out length of partition data based on table version */ > + if (ptable->version <= SMEM_FLASH_PTABLE_V3) { > + len = SMEM_FLASH_PTABLE_HDR_LEN + SMEM_FLASH_PTABLE_MAX_PARTS_V3 * > + sizeof(struct smem_flash_pentry); > + } else if (ptable->version == SMEM_FLASH_PTABLE_V4) { > + len = SMEM_FLASH_PTABLE_HDR_LEN + SMEM_FLASH_PTABLE_MAX_PARTS_V4 * > + sizeof(struct smem_flash_pentry); > + } else { > + pr_err("Unknown ptable version (%d)", ptable->version); > + return -EINVAL; > + } > + > + /* > + * Now that the partition table header has been parsed, verified > + * and the length of the partition table calculated, read the > + * complete partition table > + */ > + ptable = qcom_smem_get(SMEM_APPS, SMEM_AARM_PARTITION_TABLE, &len); > + if (IS_ERR_OR_NULL(ptable)) { > + pr_err("Error reading partition table\n"); > + return PTR_ERR(ptable); > + } > + > + parts = kcalloc(ptable->numparts, sizeof(*parts), GFP_KERNEL); > + if (!parts) > + return -ENOMEM; > + > + for (i = 0; i < ptable->numparts; i++) { > + pentry = &ptable->pentry[i]; > + if (pentry->name[0] == '\0') > + continue; > + > + name = kstrdup(pentry->name, GFP_KERNEL); > + if (!name) { > + ret = -ENOMEM; > + goto out_free_parts; > + } > + > + /* Convert name to lower case */ > + for (c = name; *c != '\0'; c++) > + *c = tolower(*c); > + > + parts[i].name = name; > + parts[i].offset = pentry->offset * mtd->erasesize; > + parts[i].mask_flags = pentry->attr; > + parts[i].size = pentry->length * mtd->erasesize; > + pr_debug("%d: %s offs=0x%08x size=0x%08x attr:0x%08x\n", > + i, pentry->name, pentry->offset, pentry->length, > + pentry->attr); > + } > + > + pr_debug("SMEM partition table found: ver: %d len: %d\n", > + ptable->version, ptable->numparts); > + *pparts = parts; > + > + return i; Had to check a few times, but afaict this is just ptable->numparts in disguise... So how about just writing that instead? Regards, Bjorn > + > +out_free_parts: > + while (--i >= 0) > + kfree(parts[i].name); > + kfree(parts); > + *pparts = NULL; > + > + return ret; > +} > + > +static const struct of_device_id qcomsmem_of_match_table[] = { > + { .compatible = "qcom,smem-part" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, qcomsmem_of_match_table); > + > +static struct mtd_part_parser mtd_parser_qcomsmem = { > + .parse_fn = parse_qcomsmem_part, > + .name = "qcomsmem", > + .of_match_table = qcomsmem_of_match_table, > +}; > +module_mtd_part_parser(mtd_parser_qcomsmem); > + > +MODULE_LICENSE("GPL v2"); > +MODULE_AUTHOR("Manivannan Sadhasivam "); > +MODULE_DESCRIPTION("Qualcomm SMEM NAND flash partition parser"); > -- > 2.17.1 >