From patchwork Thu May 2 14:30:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 163267 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp5810160ill; Thu, 2 May 2019 07:34:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxjUUxbDNSD0ngfcNGiMZZffd2pbcHnj40KyEnxAaCDGmnDUKxBwON2I+OHM4KFRJ1UxZYW X-Received: by 2002:a17:902:2e83:: with SMTP id r3mr4198848plb.286.1556807649087; Thu, 02 May 2019 07:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556807649; cv=none; d=google.com; s=arc-20160816; b=py9Fv7CPBQ9A5ikgfoFW41jG8OXTqa9byBODxQlQhmUUGLP7m3FnFB4VrN9FP1tqWM oXYYzLLFnebkj/E+36j0bjfmCyk5SBFgceQLYk2V67rAEBOeohV751FaBk5Z9LUjY7Eh 24GDeomrgRDY9FjMSOPWCGRZXElA4xMM51ZHQiPdyFKGL+aLqNOMFojRyWHNzoXiMj9o LCCrK5g+F+towJWAnuthr+uaW3DZSw4WzAA7AsB0QkQlWC4m+nBijR8BsMB9UzAR1y78 ZTljtbEFfOEwGkIhBIwMydE8WX1xQKOY7bK+fQgZrF2KqxnLc2ljb/Kp7nqEWSBjC8ZR BihA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:dkim-signature; bh=Akef23xsONd0UQO7Q52/SwvVw9EVxKRajkd7lt7xsWg=; b=M7yeg9LdOLQjZDDMNfjco0VwP2LvFKYwtZ2frJRPh8ONE1cfTd2ucTq47ivGQSI0j8 QGaWfxqptSzbCj0MpJ9nH1Pww0yV9BebVhJFDYxaT59iNdJZYOlCcKtrewW3LjJ+EF6q oykMEAC/b4xls5oHrSwM3p4R9drGWvbHrEIArCu/JUtPcqD6tdDhJjON6ERWj6lNwQzw KXi+3tYdyeoiTpw+McQKBfLN45ROkxK18PqkmELMQpZ6BZ9kNPReaefUMc5RuaeyDq6Z tJ38cHHDMn+o4jturLUCLKUwcFuvxjh0cOCiycWk28IN/LJo+Etnv+WSrkm/8f3ka+Nj GObw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20170209 header.b=XQ2EP4B3; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=P0bb27D+; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id g6si11346549pgi.21.2019.05.02.07.34.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 07:34:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=bombadil.20170209 header.b=XQ2EP4B3; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=P0bb27D+; spf=pass (google.com: best guess record for domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom="linux-mtd-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Akef23xsONd0UQO7Q52/SwvVw9EVxKRajkd7lt7xsWg=; b=XQ2EP4B3h0Ifd5 oAxcALmwM26dC8xLEmrtg0VmaqALZ7tMi0+PIylkWbwVOLerwK3I5orVX0iZEunZhf2LibC5p1u+t 1mbDGNixGr4tvJpJfuQhQcv+7dlKzrZ6k4QZ2alGTOxrdlnlgE4v1icFjjyso2RYkVEIaDILSTRnR Ir7Y4nHQHdgLHGc6elKs48bH7RKha/iLrp+eNMFFS6hP5hbLOj2qtWIWn7r/pHZf2L+JMnoPIgtoH KCB0HUDiynOcTbSfC0fUypSUUUSiS3kM5YSo0WK/dppYWAezSMNGZSRO3uphwRDAsvFUgM0vq1afZ Ygk6U6At6l7YDDKSEsqQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMCmb-0001zd-Ds; Thu, 02 May 2019 14:33:57 +0000 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hMClv-00015b-HO for linux-mtd@lists.infradead.org; Thu, 02 May 2019 14:33:28 +0000 Received: by mail-lf1-x143.google.com with SMTP id j20so2068411lfh.2 for ; Thu, 02 May 2019 07:33:15 -0700 (PDT) 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=rKgEJ1Km5j3zIkbrJZuw9OFBKPPbAWx/j0MzNmJOHJ4=; b=P0bb27D+6Y0ovg9oJjGhlYW8s1jemW6BE3aR8v7PboluNO0H1h3FexJXFM1Gp+rw7Q UKMl1VzeoQV4LRcKOx7xLQ+BvFFHcqBKfGUpYUfrPgpul7HdWpl8v5uANhKhGkao9xLk o8rhKUIJKWAIK9/GJvoaxjiZeinGGQ3wvxX1HRwMy7i+F5txdekxodLjFtKCkh7V7T8Q F7HidmUT/T6miXxUpJ6nlaI6ilshpRxXvtu584KBXXLDvzvLTpWWIe8IqvUa9pcZfEke 6CCdIdPHsKBHAIMdG/gbOQShE0KDyGIC1D8FluIBjzC0IQT8MOjfy0axZ/9UfoN6tEjK wOkw== 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=rKgEJ1Km5j3zIkbrJZuw9OFBKPPbAWx/j0MzNmJOHJ4=; b=FyVV9ieYVUKTQUcPDTB4HPBv4NqRkJs6XJzsLU2ZnGyZxzDlWm4GSxFn98IdomUMmd F76xB320Z9HE/1jt5fr5zb9FL6+kw3iYU6UpTKvVPMHfikP2aaxaN8P7SHWWB3wxnjjC fKI/a8UC+eB8Yp7USMzYKLJ9bezOy7CBEhcF/Yd8964MuLal6evF90cDtNXNX1eo6p12 MnNWSuM0cIkhRc+Fi9wWzbacOS29pIQ4BzhhQF57AcqJGHfLbgmLviiIpXjgZcbtB8xZ pPnzDkrP4jiIe/+Ob68EiYmOHoBprO06waMBxwQ5heSocRfq927j2BgSZf+zvLthMVRl SOJw== X-Gm-Message-State: APjAAAW+YAuqS34G2Eg/ayii0ed8bcrVl8Wp34bQRB9DOQgs+nQAXIAb 8WCWaEyk5Bv2LYFN80JZwYgefg== X-Received: by 2002:a19:4a04:: with SMTP id x4mr2191114lfa.124.1556807593883; Thu, 02 May 2019 07:33:13 -0700 (PDT) Received: from localhost.localdomain (c-d2cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.210]) by smtp.gmail.com with ESMTPSA id l79sm9430625lfe.92.2019.05.02.07.33.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 07:33:12 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Miquel Raynal , linux-mtd@lists.infradead.org Subject: [PATCH 6/9 RESEND 2] mtd: factor out v1 partition parsing Date: Thu, 2 May 2019 16:30:31 +0200 Message-Id: <20190502143034.16781-7-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502143034.16781-1-linus.walleij@linaro.org> References: <20190502143034.16781-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190502_073316_129393_F7EA2A49 X-CRM114-Status: GOOD ( 19.69 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:143 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Liviu Dudau , Ryan Harkin Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org This breaks out the parsing of v1 partitions so we can later add a v2 partition parser. Cc: Ryan Harkin Acked-by: Liviu Dudau Signed-off-by: Linus Walleij --- drivers/mtd/parsers/afs.c | 88 ++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 38 deletions(-) -- 2.20.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/drivers/mtd/parsers/afs.c b/drivers/mtd/parsers/afs.c index ccc198818057..32ded91ae66c 100644 --- a/drivers/mtd/parsers/afs.c +++ b/drivers/mtd/parsers/afs.c @@ -181,14 +181,18 @@ afs_read_iis_v1(struct mtd_info *mtd, struct image_info_v1 *iis, u_int ptr) return ret; } -static int parse_afs_partitions(struct mtd_info *mtd, - const struct mtd_partition **pparts, - struct mtd_part_parser_data *data) +static int afs_parse_v1_partition(struct mtd_info *mtd, + u_int off, struct mtd_partition *part) { - struct mtd_partition *parts; - u_int mask, off, sz; - int ret = 0; - int i; + struct image_info_v1 iis; + u_int mask; + /* + * Static checks cannot see that we bail out if we have an error + * reading the footer. + */ + u_int uninitialized_var(iis_ptr); + u_int uninitialized_var(img_ptr); + int ret; /* * This is the address mask; we use this to mask off out of @@ -196,6 +200,39 @@ static int parse_afs_partitions(struct mtd_info *mtd, */ mask = mtd->size - 1; + ret = afs_read_footer_v1(mtd, &img_ptr, &iis_ptr, off, mask); + if (ret < 0) + return ret; + + /* Read the image info block */ + ret = afs_read_iis_v1(mtd, &iis, iis_ptr); + if (ret < 0) + return ret; + + part->name = kstrdup(iis.name, GFP_KERNEL); + if (!part->name) + return -ENOMEM; + + part->size = (iis.length + mtd->erasesize - 1) & ~(mtd->erasesize - 1); + part->offset = img_ptr; + part->mask_flags = 0; + + printk(" mtd: at 0x%08x, %5lluKiB, %8u, %s\n", + img_ptr, part->size / 1024, + iis.imageNumber, part->name); + + return 0; +} + +static int parse_afs_partitions(struct mtd_info *mtd, + const struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +{ + struct mtd_partition *parts; + u_int off, sz; + int ret = 0; + int i; + /* Count the partitions by looping over all erase blocks */ for (i = off = sz = 0; off < mtd->size; off += mtd->erasesize) { if (afs_is_v1(mtd, off)) { @@ -215,38 +252,13 @@ static int parse_afs_partitions(struct mtd_info *mtd, * Identify the partitions */ for (i = off = 0; off < mtd->size; off += mtd->erasesize) { - struct image_info_v1 iis; - u_int iis_ptr, img_ptr; - - /* Read the footer. */ - ret = afs_read_footer_v1(mtd, &img_ptr, &iis_ptr, off, mask); - if (ret < 0) - goto out_free_parts; - if (ret == 0) - continue; - - /* Read the image info block */ - ret = afs_read_iis_v1(mtd, &iis, iis_ptr); - if (ret < 0) - goto out_free_parts; - if (ret == 0) - continue; - - parts[i].name = kstrdup(iis.name, GFP_KERNEL); - if (!parts[i].name) { - ret = -ENOMEM; - goto out_free_parts; - } - parts[i].size = (iis.length + mtd->erasesize - 1) & ~(mtd->erasesize - 1); - parts[i].offset = img_ptr; - parts[i].mask_flags = 0; - - printk(" mtd%d: at 0x%08x, %5lluKiB, %8u, %s\n", - i, img_ptr, parts[i].size / 1024, - iis.imageNumber, parts[i].name); - - i += 1; + if (afs_is_v1(mtd, off)) { + ret = afs_parse_v1_partition(mtd, off, &parts[i]); + if (ret) + goto out_free_parts; + i++; + } } *pparts = parts;