From patchwork Fri Jan 29 11:10:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 575576 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BE90C140B99 for ; Fri, 29 Jan 2016 22:12:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=r0oKdrFp; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 976262814B3; Fri, 29 Jan 2016 12:11:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5AE8828BF30 for ; Fri, 29 Jan 2016 12:10:53 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-lf0-f68.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Fri, 29 Jan 2016 12:10:52 +0100 (CET) Received: by mail-lf0-f68.google.com with SMTP id t141so3569982lfd.3 for ; Fri, 29 Jan 2016 03:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ER4YBuelPp9pzrRvOKS9hxNr/d+/GfJ3Jlygf0EiL9A=; b=r0oKdrFpB6zzYxP6nbx3iHIxAXqGVgM9bdXzhPx8BZE2uZRg4WtBgICVfLL4OKQujE +rFxfCQGYuE6VNErekNdGXjeIRH9I1nDFlmLe8H8pwT8BaEXIKqmPnL5fw4Z1WhmhZ/v hke1+EhsGlhmS9KVcCZYGPlInLe8/3SR+BPhyWgQGbh9yGh3XAND277k5mlCYG+7SYxC M6OWNfM/pKOR+kDyEkG9x3YMlw/4x6CuHppLvtn3dR3Y4BqH2m5pSA2qDwM5fl5yVzqC mQ8DQTrPYsHd5+pzJ6CmTvJfDVASw2kmKY+KyF+B0DlE8iJ7TSYavGpCt2TmGbVSbNNF F27g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=ER4YBuelPp9pzrRvOKS9hxNr/d+/GfJ3Jlygf0EiL9A=; b=icBE2oh7+fkEPDLOYKtlJ9pBNjqwYKSRVqP8/LJBotGmf2yGMIIjMsJWjw77EF/c1P vnEs5HwyTXVeu6rG3OlrAZfw6OZVLT38D0HbovkNoVtV+BQlaXoqMnyDilDg4XCHO5/j 3GGlFSEeO2ZEovEuhfJQzZ1oxdRe0qLQUIK0bVIDY88RlUZ/mAq8QagwQROmwS1ckLH0 qDTixbtCkmU/+FdbRkvLiAceg1v7EgKeifW9d0HVQrfvsDQiTVu84DIJ84wgE2S28NEO /kMSCq+oLuP0TGD79iRupTMamWa6ptNpOB7AmMb7ch3+JbYHYAmpZe5nmMcu5ZCxUNWR h2Gg== X-Gm-Message-State: AG10YOQjlmHLMxAtb2RAEMxBpRDPo3tg1L3TSDDjEu8BQNSIghD/QMtj6XI38ca6z7cdmQ== X-Received: by 10.25.136.84 with SMTP id k81mr3285243lfd.78.1454065852340; Fri, 29 Jan 2016 03:10:52 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id l129sm1981024lfl.37.2016.01.29.03.10.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jan 2016 03:10:51 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: openwrt-devel@lists.openwrt.org Date: Fri, 29 Jan 2016 12:10:39 +0100 Message-Id: <1454065840-16509-2-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1454065840-16509-1-git-send-email-zajec5@gmail.com> References: <1454065840-16509-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH 2/3] kernel: mtdsplit: detect UBI partition when looking for rootfs X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This allows mtdsplit parsers work with UBI which is very popular on NAND flases. Signed-off-by: Rafał Miłecki --- target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c | 6 ++++++ target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h | 1 + 2 files changed, 7 insertions(+) diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c index 4f6b46e..9a330df 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c @@ -22,6 +22,8 @@ #include "mtdsplit.h" +#define UBI_EC_MAGIC 0x55424923 /* UBI# */ + struct squashfs_super_block { __le32 s_magic; __le32 pad0[9]; @@ -93,6 +95,10 @@ int mtd_check_rootfs_magic(struct mtd_info *mtd, size_t offset, if (type) *type = MTDSPLIT_PART_TYPE_JFFS2; return 0; + } else if (be32_to_cpu(magic) == UBI_EC_MAGIC) { + if (type) + *type = MTDSPLIT_PART_TYPE_UBI; + return 0; } return -EINVAL; diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h index b757758..42841ef 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h @@ -22,6 +22,7 @@ enum mtdsplit_part_type { MTDSPLIT_PART_TYPE_UNK = 0, MTDSPLIT_PART_TYPE_SQUASHFS, MTDSPLIT_PART_TYPE_JFFS2, + MTDSPLIT_PART_TYPE_UBI, }; #ifdef CONFIG_MTD_SPLIT