From patchwork Mon Apr 16 20:32:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 133493 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp3972297ljb; Mon, 16 Apr 2018 13:33:41 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+x8btA2IBwfN0vLArK0g2gYBobvzOynkoJCfrd+M6BSyZ7JQl4+tOkkPXPb3VpdjdhFf82 X-Received: by 10.80.181.227 with SMTP id a90mr28335719ede.55.1523910821003; Mon, 16 Apr 2018 13:33:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523910820; cv=none; d=google.com; s=arc-20160816; b=b9CDyT+XZsvCWYNfFx726Bt7mMjcSOxSvecuhRHx1cIAA1DDsV8vQzdsuVC6rU2q4G uX02LUMTqOBe0yv7xAQovOGFE/4ot7OclY7GjFTjdcnGDI2woeUlliRY6XTbymxqC6AS IljyZL9z3WMNztRwyieV/YajNIHVgdbzq0lK+ssZE+BqFS3vSAXzvtVX7iLTmzJD3/bN baDMIN4V5WP5/8lT0Bk3BWMd1w4e9za3z4xeofoSwWca6seBAEcjpcU8WIFqHH+zffLw OtPAc8VF0Gkp9ogO6TJw16LZA0+/brPN631VrheAl3l1NJUpUUmB2ALMSKKhWGb1H2rY 3bDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:arc-authentication-results; bh=Ie5LukCjVOysCjuovqpIyxKbWnNef1wfFXXZA7GwdT0=; b=RT1gzaPnafWsA8z0vn6IN1Dq11a0UMDnryEiY7/MEkLckXkc8/z8IeFeSim4ccsT73 71U7jQeEh78T2eyroUJDxFias5sZDJZ6nQSMBxPUnWPr3aMJsPOPT1c2mxIj1y47Rb4z 2bWXra9/5+EYWihdy4hSy3USvSlojDyz7VEsxmleNpmtkElNYjCzLhI2OjwdYT+o/JzW Oikry/z0lOkuD8f2ufSYv4/2dMcIle6OOxHa8dMUYnPV13Sdq14QrN537pN3tnt7U8pQ 5VbQqrmF5Q852Nx8HXj3a0mKF23NgSa8APCCJC+KTByL3mawS6ruvvKRGuceaZlKzUPp yYjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YSkFrTxw; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id m41si3239608edc.25.2018.04.16.13.33.40; Mon, 16 Apr 2018 13:33:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YSkFrTxw; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 5BD44C21E35; Mon, 16 Apr 2018 20:32:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6225CC21E35; Mon, 16 Apr 2018 20:32:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B01E3C21D4A; Mon, 16 Apr 2018 20:32:34 +0000 (UTC) Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by lists.denx.de (Postfix) with ESMTPS id E306CC21C27 for ; Mon, 16 Apr 2018 20:32:33 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id g203-v6so24034688lfg.11 for ; Mon, 16 Apr 2018 13:32:33 -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; bh=Q8bvUv2q7LxZPTwcgDVbvQsotO60/gZjqz08Xuymf+4=; b=YSkFrTxwKiyTuxFUp06KZk1VDyclB1eh4/d2F6OhebjLGrIEbUqYv4CMog8sk89f+3 +07Q98MmydodzUjQ5a8jfLSNryJoPY+o1ZFalcTl8ClFj0NK7pEE5CgzKZQHaQBAbRbG qnFHAmbOsrdI4gvdHb+7rtvac4tmg1BSfmLWQ= 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; bh=Q8bvUv2q7LxZPTwcgDVbvQsotO60/gZjqz08Xuymf+4=; b=LRaWG1WWcR1Tvc5/jnJq0YdkOTWff/kImg5ysuvv5ptx4CxmnfSl9MNIi/NdClAuMl ZlO/z0JONPoznUO1DDK39x6k4k7RLQSqRARnUYc/nfTMKxOT2rpnGQiN5N4AqDWVvLSY kdlUECwwEmTs02QHYI9T5hdAZu8yS4er/k69+oy2yv4hh981mBcxwu804km3BWgGLglE kdFQdCe1z8C+DSPdLci11d+ArfSNm5wmnjy/kmWrJyy2veDovGngy67UOEgLBs8cgyfU OVHoabmElFEqWErnByRkOzwGG4so7wztSiY5v0N4DYIHHTlvJgMuUPTMVz/TGdp9m24v 0hiA== X-Gm-Message-State: ALQs6tD4is+55c5oF2ayCcSAn9LJAsFAVDWDW27+Pk68Y9T7OYHyOr25 zvPOJ3XfxBDEK/C2NCJW4qHjmhUuevY= X-Received: by 2002:a19:1903:: with SMTP id 3-v6mr14948018lfz.59.1523910752885; Mon, 16 Apr 2018 13:32:32 -0700 (PDT) Received: from localhost ([195.238.92.132]) by smtp.gmail.com with ESMTPSA id j8sm2273391lje.83.2018.04.16.13.32.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Apr 2018 13:32:31 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Mon, 16 Apr 2018 23:32:23 +0300 Message-Id: <20180416203227.26523-2-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180416203227.26523-1-semen.protsenko@linaro.org> References: <20180416203227.26523-1-semen.protsenko@linaro.org> Cc: Amit Pundir , Tom Rini , Praneeth Bajjuri , John Stultz , Sumit Semwal Subject: [U-Boot] [PATCH 1/5] common: Add support for Android DT image X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Android documentation recommends new image format for storing DTB/DTBO files: [1]. To support that format, two things should be done: 1. Add dt_table.h file from Android (BSD-3 relicensed version): [2]. This header defines structures and constants that we need to work with that DT image format. Changes: - re-licensed from Apache to BSD-3 - removed functions declarations - change the coding style to kernel (make checkpatch happy) 2. Add helper functions for Android DTB/DTBO format. In image-android-dt.* files you can find helper functions to work with Android DT image format, such us routines for: - printing the dump of image structure - getting the address and size of desired dtb/dtbo file [1] https://source.android.com/devices/architecture/dto/partitions [2] https://android.googlesource.com/platform/system/libufdt/+/58a7582180f477032cd6c74f8d9afad0038e74c3/utils/src/dt_table.h Signed-off-by: Sam Protsenko --- common/image-android-dt.c | 134 +++++++++++++++++++++++++++++++++++++ include/dt_table.h | 46 +++++++++++++ include/image-android-dt.h | 18 +++++ 3 files changed, 198 insertions(+) create mode 100644 common/image-android-dt.c create mode 100644 include/dt_table.h create mode 100644 include/image-android-dt.h diff --git a/common/image-android-dt.c b/common/image-android-dt.c new file mode 100644 index 0000000000..f218db06bb --- /dev/null +++ b/common/image-android-dt.c @@ -0,0 +1,134 @@ +/* + * (C) Copyright 2018 Linaro Ltd. + * Sam Protsenko + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include +#include +#include + +/** + * Check if image header is correct. + * + * @param hdr Address to image header + * @return true if header is correct or false if header is incorrect + */ +bool android_dt_check_header(const struct dt_table_header *hdr) +{ + return fdt32_to_cpu(hdr->magic) == DT_TABLE_MAGIC; +} + +/** + * Get the address of FDT (dtb or dtbo) in memory by its index in image. + * + * @param hdr Address to image header + * @param index Index of desired FDT in image (starting from 0) + * @param[out] addr If not null, will contain address to specified FDT + * @param[out] size If not NULL, will contain size of specified FDT + * + * @return true on success or false on error + */ +bool android_dt_get_fdt_by_index(const struct dt_table_header *hdr, + u32 index, ulong *addr, u32 *size) +{ + const struct dt_table_entry *e; + u32 entry_count = fdt32_to_cpu(hdr->dt_entry_count); + u32 entries_offset = fdt32_to_cpu(hdr->dt_entries_offset); + u32 entry_size = fdt32_to_cpu(hdr->dt_entry_size); + u32 dt_offset, dt_size; + + if (index > entry_count) { + printf("Error: index > dt_entry_count (%u > %u)\n", index, + entry_count); + return false; + } + + e = (const struct dt_table_entry *)((ulong)hdr + entries_offset + + index * entry_size); + dt_offset = fdt32_to_cpu(e->dt_offset); + dt_size = fdt32_to_cpu(e->dt_size); + + if (addr) + *addr = ((ulong)hdr + dt_offset); + if (size) + *size = dt_size; + + return true; +} + +#if !defined(CONFIG_SPL_BUILD) +static void android_dt_print_fdt_info(const struct fdt_header *fdt) +{ + u32 fdt_size; + int root_node_off; + const char *compatible = NULL; + + fdt_size = fdt_totalsize(fdt); + root_node_off = fdt_path_offset(fdt, "/"); + if (root_node_off < 0) { + printf("Error: Root node not found\n"); + } else { + compatible = fdt_getprop(fdt, root_node_off, "compatible", + NULL); + } + + printf(" (FDT)size = %d\n", fdt_size); + printf(" (FDT)compatible = %s\n", + compatible ? compatible : "(unknown)"); +} + +/** + * Print information about DT image structure. + * + * @param hdr Address to image header + */ +void android_dt_print_contents(const struct dt_table_header *hdr) +{ + u32 i; + u32 entry_count = fdt32_to_cpu(hdr->dt_entry_count); + u32 entries_offset = fdt32_to_cpu(hdr->dt_entries_offset); + u32 entry_size = fdt32_to_cpu(hdr->dt_entry_size); + + /* Print image header info */ + printf("dt_table_header:\n"); + printf(" magic = %08x\n", fdt32_to_cpu(hdr->magic)); + printf(" total_size = %d\n", fdt32_to_cpu(hdr->total_size)); + printf(" header_size = %d\n", fdt32_to_cpu(hdr->header_size)); + printf(" dt_entry_size = %d\n", entry_size); + printf(" dt_entry_count = %d\n", entry_count); + printf(" dt_entries_offset = %d\n", entries_offset); + printf(" page_size = %d\n", fdt32_to_cpu(hdr->page_size)); + printf(" reserved[0] = %08x\n", fdt32_to_cpu(hdr->reserved[0])); + + /* Print image entries info */ + for (i = 0; i < entry_count; ++i) { + const struct dt_table_entry *e; + const struct fdt_header *fdt; + u32 dt_offset, dt_size; + u32 j; + + e = (const struct dt_table_entry *)((ulong)hdr + entries_offset + + i * entry_size); + dt_offset = fdt32_to_cpu(e->dt_offset); + dt_size = fdt32_to_cpu(e->dt_size); + + printf("dt_table_entry[%d]:\n", i); + printf(" dt_size = %d\n", dt_size); + printf(" dt_offset = %d\n", dt_offset); + printf(" id = %08x\n", fdt32_to_cpu(e->id)); + printf(" rev = %08x\n", fdt32_to_cpu(e->rev)); + + for (j = 0; j < 4; ++j) { + printf(" custom[%d] = %08x\n", j, + fdt32_to_cpu(e->custom[j])); + } + + /* Print FDT info for this entry */ + fdt = (const struct fdt_header *)((ulong)hdr + dt_offset); + android_dt_print_fdt_info(fdt); + } +} +#endif diff --git a/include/dt_table.h b/include/dt_table.h new file mode 100644 index 0000000000..19cbbeab2a --- /dev/null +++ b/include/dt_table.h @@ -0,0 +1,46 @@ +/* + * This is from the Android Project, + * Repository: https://android.googlesource.com/platform/system/libufdt + * File: utils/src/dt_table.h + * Commit: 58a7582180f477032cd6c74f8d9afad0038e74c3 + * Copyright (C) 2017 The Android Open Source Project + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef DT_TABLE_H +#define DT_TABLE_H + +#include + +#define DT_TABLE_MAGIC 0xd7b7ab1e +#define DT_TABLE_DEFAULT_PAGE_SIZE 2048 + +struct dt_table_header { + u32 magic; /* DT_TABLE_MAGIC */ + u32 total_size; /* includes dt_table_header + all dt_table_entry + * and all dtb/dtbo + */ + u32 header_size; /* sizeof(dt_table_header) */ + + u32 dt_entry_size; /* sizeof(dt_table_entry) */ + u32 dt_entry_count; /* number of dt_table_entry */ + u32 dt_entries_offset; /* offset to the first dt_table_entry + * from head of dt_table_header. + * The value will be equal to header_size if + * no padding is appended + */ + u32 page_size; /* flash page size we assume */ + u32 reserved[1]; /* must be zero */ +}; + +struct dt_table_entry { + u32 dt_size; + u32 dt_offset; /* offset from head of dt_table_header */ + + u32 id; /* optional, must be zero if unused */ + u32 rev; /* optional, must be zero if unused */ + u32 custom[4]; /* optional, must be zero if unused */ +}; + +#endif diff --git a/include/image-android-dt.h b/include/image-android-dt.h new file mode 100644 index 0000000000..f9b5ff3f13 --- /dev/null +++ b/include/image-android-dt.h @@ -0,0 +1,18 @@ +/* + * (C) Copyright 2018 Linaro Ltd. + * Sam Protsenko + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef IMAGE_ANDROID_DT_H +#define IMAGE_ANDROID_DT_H + +#include + +bool android_dt_check_header(const struct dt_table_header *hdr); +void android_dt_print_contents(const struct dt_table_header *hdr); +bool android_dt_get_fdt_by_index(const struct dt_table_header *hdr, + u32 index, ulong *addr, u32 *size); + +#endif /* IMAGE_ANDROID_DT_H */