From patchwork Tue Apr 26 01:38:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qianfan X-Patchwork-Id: 1622159 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=Ew8VZfRX; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KnPgl41kDz9s0B for ; Tue, 26 Apr 2022 11:39:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1503983DAC; Tue, 26 Apr 2022 03:39:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="Ew8VZfRX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 33DFE83E59; Tue, 26 Apr 2022 03:39:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from m12-16.163.com (m12-16.163.com [220.181.12.16]) by phobos.denx.de (Postfix) with ESMTP id 5DC2E8021F for ; Tue, 26 Apr 2022 03:39:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=qianfanguijin@163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=Ijszn 9DaJaHVbff9HQmrdPOUdTeB8ZjciD7ByhmwnYE=; b=Ew8VZfRXv+Vac/DQ5hGnO CzdvUUKj8nDm7i2APuuqCCLIHu6i+TXFWjhesiYAjdsizCTHy/p3siJqVw7vMuZz p7sJL9Jl/F6Zr0Y4TKpMGCfvBCXWDuHqvcExArgO8XEhyEImFQs+2X8/wewV1qLS Gu/uJ85OCeLq1GiMIV2h0M= Received: from DESKTOP-B1R4FVG.localdomain (unknown [218.201.129.19]) by smtp12 (Coremail) with SMTP id EMCowACn6ScpTWdifVtKBg--.58173S2; Tue, 26 Apr 2022 09:38:51 +0800 (CST) From: qianfanguijin@163.com To: u-boot@lists.denx.de Cc: Simon Glass , qianfan Zhao Subject: [PATCH v1] splash: splash_storage_read_raw: Add mmc support Date: Tue, 26 Apr 2022 09:38:48 +0800 Message-Id: <20220426013848.2034-1-qianfanguijin@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: EMCowACn6ScpTWdifVtKBg--.58173S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxXr47KF15tr1rJFyrXF45Awb_yoW5uryUpF 4xCa45JFn8G3Zxuw13tF9ru3sYkws7GF4UJrWfWayxZrsxXwn3K3y8KFy7W3yrXryDAw15 ZrWqga1fGr45AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pic18xUUUUU= X-Originating-IP: [218.201.129.19] X-CM-SenderInfo: htld0w5dqj3xxmlqqiywtou0bp/1tbiGhbt7VaEBLe4ZAABsw X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: qianfan Zhao Add splash_mmc_read_raw for loading splash from mmc's raw partition. Signed-off-by: qianfan Zhao --- common/splash_source.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/common/splash_source.c b/common/splash_source.c index d05670f5ee..28ec405bcf 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -20,6 +20,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; @@ -64,6 +65,93 @@ static int splash_nand_read_raw(u32 bmp_load_addr, int offset, size_t read_size) } #endif +#ifdef CONFIG_MMC +static size_t blk_dread_size(struct blk_desc *desc, lbaint_t start, + u32 load_addr, size_t read_size) +{ + ALLOC_CACHE_ALIGN_BUFFER(__u8, tmpbuf, desc->blksz); + size_t n, sz_read = 0; + + while (sz_read < read_size) { + if (blk_dread(desc, start, 1, tmpbuf) < 0) + break; + + n = min(read_size - sz_read, (size_t)desc->blksz); + memcpy((void *)load_addr, tmpbuf, n); + load_addr += n; + sz_read += n; + start++; + } + + return sz_read; +} + +static struct blk_desc *mmc_blk_get_dev(const char *name) +{ + struct blk_desc *dev_desc = NULL; + + if (strncmp(name, "mmc", 3) == 0 && strlen(name) > 3) { + int mmc_dev; + char *endp; + + mmc_dev = (int)simple_strtol(name + 3, &endp, 10); + if (*endp == '\0') + dev_desc = blk_get_dev("mmc", mmc_dev); + } + + return dev_desc; +} + +static int splash_mmc_read_raw(u32 bmp_load_addr, struct splash_location *loc, + size_t read_size) +{ + struct blk_desc *dev_desc = mmc_blk_get_dev(loc->name); + lbaint_t offset; + size_t sz; + + if (!dev_desc) { + printf("mmc device %s not found\n", loc->name); + return -ENODEV; + } + + if (loc->devpart) { + struct disk_partition partition; + int ret; + + ret = part_get_info_by_name(dev_desc, loc->devpart, &partition); + if (ret < 0) { + printf("%s: partition %s not found\n", + loc->name, loc->devpart); + return ret; + } else if (partition.size * partition.blksz < read_size) { + printf("%s: partition %s size less that requested\n", + loc->name, loc->devpart); + return -E2BIG; + } + + offset = partition.start; + } else { + offset = loc->offset; + } + + sz = blk_dread_size(dev_desc, offset, bmp_load_addr, read_size); + if (sz != read_size) { + printf("%s: got %zu but expected %zu\n", + loc->name, sz, read_size); + return -EIO; + } + + return 0; +} +#else +static int splash_mmc_read_raw(u32 bmp_load_addr, struct splash_location *loc, + size_t read_size) +{ + debug("%s: mmc support not available\n", __func__); + return -ENOSYS; +} +#endif + static int splash_storage_read_raw(struct splash_location *location, u32 bmp_load_addr, size_t read_size) { @@ -78,6 +166,8 @@ static int splash_storage_read_raw(struct splash_location *location, return splash_nand_read_raw(bmp_load_addr, offset, read_size); case SPLASH_STORAGE_SF: return splash_sf_read_raw(bmp_load_addr, offset, read_size); + case SPLASH_STORAGE_MMC: + return splash_mmc_read_raw(bmp_load_addr, location, read_size); default: printf("Unknown splash location\n"); }