From patchwork Mon Mar 8 05:44:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 395343 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1439060jai; Sun, 7 Mar 2021 21:46:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJydlCerYL86CcgY1vjyxxinVTAO8xXgWozXAgCMR30E75ILGMmh6L/zXrF+QEOsK6sDHf8n X-Received: by 2002:a17:906:33d9:: with SMTP id w25mr14011718eja.413.1615182366051; Sun, 07 Mar 2021 21:46:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615182366; cv=none; d=google.com; s=arc-20160816; b=de0NwJgXG7ys/jcpxi0ati+Fd0OeFqmfK6hkIYgnXegi9D1o6BKs+23iUoKb+yOweZ 49vuNG+PUnurhQvQu8zf9AUwfQQlIc14hF1qkkSC/S7TRGtx+KyOvDAoFX0GA81k/6Er 2vtK+UW9Or0UAWCpHtZgZipqLKVITQVEKQl1LzcGXrCcQivhFjVXWcP8Ot++s6VFcP+X sIm92CWi5/YS6pkd/PRCYgTMGymbxKHRFbc+fahRcy+UWspM6ENVBzKPWmiuq6WL9o5i GhUsub+9lbN8sN62NS39n7eV4/fR6UZg4lAhwWn1+QjPaVTZel6PICpL1hZq1m0atG+t 3QYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CKfXA4DMfTR++O8eVm8Qy2CjPVyIzCtorOINkgAd8zQ=; b=k0KdDXiUygjit30s4DodEJz1wMPME05GU04N/njjfcyfNEdLVHasq8oEFUg4LLhRq6 bRfOmirLMSg8t6iLLjJhIGtD2ZFQJnUp3e2/XZaVw70dcj0EsLubofRNWMM4QuEF9fN3 d+UUE68s75PLOJzznqbMeC0Yo5NX/WwqkxW7SI7cuu9xmd3XFW5ACiNnrZZyOl/DNT86 hAd/Z/GVwN+k5gmftHeI8MTJGqaNh/klYjrqgZJPPsMeCGnczXefake4ZI4gbvXL+R5q 0lBiVFI41UAlK/OEOgvmyCMvDcGdBAjJbCHPhAd1zF6gylYoZA9GiVNVH+G1yQJG8yQp KuhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qtNe7skT; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i11si7131983edb.325.2021.03.07.21.46.05; Sun, 07 Mar 2021 21:46:06 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qtNe7skT; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234627AbhCHFp2 (ORCPT + 6 others); Mon, 8 Mar 2021 00:45:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234618AbhCHFpW (ORCPT ); Mon, 8 Mar 2021 00:45:22 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 524B8C06175F for ; Sun, 7 Mar 2021 21:45:22 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id t9so2399287pjl.5 for ; Sun, 07 Mar 2021 21:45:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CKfXA4DMfTR++O8eVm8Qy2CjPVyIzCtorOINkgAd8zQ=; b=qtNe7skTOZCl/HAWrplXkqfCuqoipUM1zBUhn4J/ju39z6M6o54BBdrFrTcPoxbEvA igtfJ+H7kRENdIl2PreWOajeae1i4hM+5V6x17GxWusJiF+BeNTvAz3IfyW7ilSYh80b T5gvWfKUg7rP165PPG8pLoMQZVUvqInHM+2grfzxdLiJ8K+6Mp/hHI1WWBb3Lmr+FWPC 3t3vWcu7oJGuB/OrWi6k9NY98zKyKmocleVWFY3dlKN879/xrHgWQE0pdAftCZpmYPIn Wg8QLJLWvRmAhGKgQMDmk1dllSGBY7y84uaOux3/6jZAOknJUFGSju9L4jR0U4zBJyzF nfQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CKfXA4DMfTR++O8eVm8Qy2CjPVyIzCtorOINkgAd8zQ=; b=XYgopGJUBAkLUQ9GtyEpwa0gR7XPnSFBmqAp5V8Tt3w4ICTzbXiPYE37ewIaxn+dxU o3jfC1vIZe9kUT/vXlX0dzJmyl65Dc2K4u3B8lWan18fFBvyFc8AWWP7WRRv4JM3HSRu EOXorCJ6mMsaVw72k2LarG0A60qTydHZPwnLqhdFOngZ050f4F/uKPHTUcmIPkU618FV 2autWXwK49LABMNg4bm3hQkBngEBHzSTIV3SdWIHWBMw4PqXBsGQ01alrjOOIYYX8Z9u LyfnZghmHDJkTV0aKD2uSoAPH/tGJcojrFO8ADaMJygmGkiL9NvMvwjCRPnHG5uOWCuX DQyQ== X-Gm-Message-State: AOAM5302uQiHcPLOAnmTcWH/FcGWYkDhVfCD+Rx028QcjBkL+nFmHtzK HZl89mw49qwUAe+TZ9JRtiqj X-Received: by 2002:a17:90a:31cf:: with SMTP id j15mr22329179pjf.41.1615182321795; Sun, 07 Mar 2021 21:45:21 -0800 (PST) Received: from localhost.localdomain ([2409:4072:6e84:fef9:1070:d306:6d0e:bf6b]) by smtp.gmail.com with ESMTPSA id y29sm4331506pfp.206.2021.03.07.21.45.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 21:45:21 -0800 (PST) From: Manivannan Sadhasivam To: miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, robh+dt@kernel.org Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, boris.brezillon@collabora.com, Daniele.Palmas@telit.com, bjorn.andersson@linaro.org, Manivannan Sadhasivam Subject: [PATCH v4 3/3] mtd: rawnand: qcom: Add support for secure regions in NAND memory Date: Mon, 8 Mar 2021 11:14:47 +0530 Message-Id: <20210308054447.28418-4-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308054447.28418-1-manivannan.sadhasivam@linaro.org> References: <20210308054447.28418-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On a typical end product, a vendor may choose to secure some regions in the NAND memory which are supposed to stay intact between FW upgrades. The access to those regions will be blocked by a secure element like Trustzone. So the normal world software like Linux kernel should not touch these regions (including reading). The regions are declared using a NAND chip DT property, "secure-regions". So let's make use of this property and skip access to the secure regions present in a system. Signed-off-by: Manivannan Sadhasivam --- drivers/mtd/nand/raw/qcom_nandc.c | 72 +++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 9 deletions(-) -- 2.25.1 diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index 87c23bb320bf..8027f7cb32be 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -431,6 +431,11 @@ struct qcom_nand_controller { * @cfg0, cfg1, cfg0_raw..: NANDc register configurations needed for * ecc/non-ecc mode for the current nand flash * device + * + * @sec_regions: Array representing the secure regions in the + * NAND chip + * + * @nr_sec_regions: Number of secure regions in the NAND chip */ struct qcom_nand_host { struct nand_chip chip; @@ -453,6 +458,9 @@ struct qcom_nand_host { u32 ecc_bch_cfg; u32 clrflashstatus; u32 clrreadstatus; + + u32 *sec_regions; + u8 nr_sec_regions; }; /* @@ -662,16 +670,27 @@ static void nandc_set_reg(struct qcom_nand_controller *nandc, int offset, } /* helper to configure address register values */ -static void set_address(struct qcom_nand_host *host, u16 column, int page) +static int set_address(struct qcom_nand_host *host, u16 column, int page) { struct nand_chip *chip = &host->chip; struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); + u32 offs = page << chip->page_shift; + int i, j; + + /* Skip touching the secure regions if present */ + for (i = 0, j = 0; i < host->nr_sec_regions; i++, j += 2) { + if (offs >= host->sec_regions[j] && + (offs <= host->sec_regions[j] + host->sec_regions[j + 1])) + return -EIO; + } if (chip->options & NAND_BUSWIDTH_16) column >>= 1; nandc_set_reg(nandc, NAND_ADDR0, page << 16 | column); nandc_set_reg(nandc, NAND_ADDR1, page >> 16 & 0xff); + + return 0; } /* @@ -1491,13 +1510,13 @@ static void qcom_nandc_command(struct nand_chip *chip, unsigned int command, WARN_ON(column != 0); host->use_ecc = true; - set_address(host, 0, page_addr); + ret = set_address(host, 0, page_addr); update_rw_regs(host, ecc->steps, true); break; case NAND_CMD_SEQIN: WARN_ON(column != 0); - set_address(host, 0, page_addr); + ret = set_address(host, 0, page_addr); break; case NAND_CMD_PAGEPROG: @@ -1615,7 +1634,10 @@ qcom_nandc_read_cw_raw(struct mtd_info *mtd, struct nand_chip *chip, host->use_ecc = false; clear_bam_transaction(nandc); - set_address(host, host->cw_size * cw, page); + ret = set_address(host, host->cw_size * cw, page); + if (ret) + return ret; + update_rw_regs(host, 1, true); config_nand_page_read(nandc); @@ -1943,7 +1965,10 @@ static int copy_last_cw(struct qcom_nand_host *host, int page) /* prepare a clean read buffer */ memset(nandc->data_buffer, 0xff, size); - set_address(host, host->cw_size * (ecc->steps - 1), page); + ret = set_address(host, host->cw_size * (ecc->steps - 1), page); + if (ret) + return ret; + update_rw_regs(host, 1, true); config_nand_single_cw_page_read(nandc, host->use_ecc); @@ -2005,12 +2030,16 @@ static int qcom_nandc_read_oob(struct nand_chip *chip, int page) struct qcom_nand_host *host = to_qcom_nand_host(chip); struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); struct nand_ecc_ctrl *ecc = &chip->ecc; + int ret; clear_read_regs(nandc); clear_bam_transaction(nandc); host->use_ecc = true; - set_address(host, 0, page); + ret = set_address(host, 0, page); + if (ret) + return ret; + update_rw_regs(host, ecc->steps, true); return read_page_ecc(host, NULL, chip->oob_poi, page); @@ -2188,7 +2217,10 @@ static int qcom_nandc_write_oob(struct nand_chip *chip, int page) mtd_ooblayout_get_databytes(mtd, nandc->data_buffer + data_size, oob, 0, mtd->oobavail); - set_address(host, host->cw_size * (ecc->steps - 1), page); + ret = set_address(host, host->cw_size * (ecc->steps - 1), page); + if (ret) + return ret; + update_rw_regs(host, 1, false); config_nand_page_write(nandc); @@ -2267,7 +2299,10 @@ static int qcom_nandc_block_markbad(struct nand_chip *chip, loff_t ofs) /* prepare write */ host->use_ecc = false; - set_address(host, host->cw_size * (ecc->steps - 1), page); + ret = set_address(host, host->cw_size * (ecc->steps - 1), page); + if (ret) + return ret; + update_rw_regs(host, 1, false); config_nand_page_write(nandc); @@ -2830,7 +2865,8 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc, struct nand_chip *chip = &host->chip; struct mtd_info *mtd = nand_to_mtd(chip); struct device *dev = nandc->dev; - int ret; + struct property *prop; + int ret, length, nr_elem; ret = of_property_read_u32(dn, "reg", &host->cs); if (ret) { @@ -2872,6 +2908,24 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc, /* set up initial status value */ host->status = NAND_STATUS_READY | NAND_STATUS_WP; + /* + * Look for secure regions in the NAND chip. These regions are supposed + * to be protected by a secure element like Trustzone. So the read/write + * accesses to these regions will be blocked in the runtime by this + * driver. + */ + prop = of_find_property(dn, "secure-regions", &length); + if (prop) { + nr_elem = length / sizeof(u32); + host->nr_sec_regions = nr_elem / 2; + + host->sec_regions = devm_kcalloc(dev, nr_elem, sizeof(u32), GFP_KERNEL); + if (!host->sec_regions) + return -ENOMEM; + + of_property_read_u32_array(dn, "secure-regions", host->sec_regions, nr_elem); + } + ret = nand_scan(chip, 1); if (ret) return ret;