Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F6ABC678D4 for ; Thu, 2 Mar 2023 01:46:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8DCB68573B; Thu, 2 Mar 2023 02:46:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1677721606; bh=sWcWobz6zUovCjNK47I2v3TqANukJY2I0L2+8hl/APU=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=bCJgKugw5FkwUwcnQJuyAZOEWOJI9eEi90BU3oAMgialflTFzcCX62F5iEmneEcF4 P8B770cDG2IssGLAgGyQQ5bVSwqt0m8R175ka3FX4iWRygZ+gzhza3b7BlgKb2BnyG giERk6yxZWRXusFZoWlo9SvNa0mUrYE80P55OXjX/KDgpnVYw+FqE7OwsQ6u90ul2e sYtAHs6IUPL83dwWdr7RrizajPkm3Fq+G07cjjRVEEe9T6cVKzQqPne7/UqnKwxoDY kb0YdVCMKgX1myDo68zql2LP+trHWfMBGyzkLPcA7TxFtxv7L6fv6aCdXLWu5gxRKr 2/2VaBEwoBWqA== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 6A69E85B57; Thu, 2 Mar 2023 02:46:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1677721604; bh=sWcWobz6zUovCjNK47I2v3TqANukJY2I0L2+8hl/APU=; h=From:To:Cc:Subject:Date:From; b=jjva8LNDa2jEtiPYydTKYR//QC3gBUuXVsXI3P7gc6+4BDdPqEeNeRIcZJc1Vi/L0 dKbVsiUnLHAisdEz/jc01LSjy9qecD/lik3xQmfwIOnqeTIn0l82xLsWd1Hfdcelkx BZe+n7ADcT9OjVLNEnDehIrHWeqclEz4s6dlf4JRnZMeIlRgX7kVvDQ7fuesEdPc8C 8qoDLPnpGxyaGVNs4RTtEizzx1s+EJM4syFJ/VpGuFsDjyluite9WC5x7/OPOWoMyO PC3yqJEbMGGtWzk3eEvbqnVsNWhpwFwaTZv0O4dtLP6qsBo5dhxQGy1j5r+rs5GLfv 8xzUMNGGMY5Bw== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Jagan Teki , Vignesh R Subject: [PATCH] mtd: spi-nor: Add CHIP_ERASE optimization Date: Thu, 2 Mar 2023 02:46:32 +0100 Message-Id: <20230302014632.243929-1-marex@denx.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.6 at phobos.denx.de X-Virus-Status: Clean Add support for CHIP_ERASE opcode 0xc7 . This is useful in case the entire SPI NOR is supposed to be erase at once, as is it considerably faster than 4k sector erase and even slightly faster than 64k block erase. The spi_nor_erase_chip() implementation is adapted from Linux 6.1.y as of commit 7d54cb2c26dad ("Linux 6.1.14") . The chip erase is only used in case the entire MTD device is being erased, and the chip does support this functionality. Timing figures from W25Q128JW: 16 MiB erase using 4kiB sector erase opcode 0x20 ... 107.5s 16 MiB erase using 64kiB block erase opcode 0xd8 ... 39.1s 16 MiB erase using chip erase opcode 0xc7 .......... 38.7s Signed-off-by: Marek Vasut --- Cc: Jagan Teki Cc: Vignesh R --- drivers/mtd/spi/spi-nor-core.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 2c3116ee530..83d7fe44ee1 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -903,6 +903,30 @@ static int read_bar(struct spi_nor *nor, const struct flash_info *info) } #endif +/** + * spi_nor_erase_chip() - Erase the entire flash memory. + * @nor: pointer to 'struct spi_nor'. + * + * Return: 0 on success, -errno otherwise. + */ +static int spi_nor_erase_chip(struct spi_nor *nor) +{ + struct spi_mem_op op = + SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_CHIP_ERASE, 0), + SPI_MEM_OP_NO_ADDR, + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_NO_DATA); + int ret; + + spi_nor_setup_op(nor, &op, nor->write_proto); + + ret = spi_mem_exec_op(nor->spi, &op); + if (ret) + return ret; + + return nor->mtd.size; +} + /* * Initiate the erasure of a single sector. Returns the number of bytes erased * on success, a negative error code on error. @@ -974,7 +998,12 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) if (ret < 0) goto erase_err; - ret = spi_nor_erase_sector(nor, addr); + if (len == mtd->size && + !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) { + ret = spi_nor_erase_chip(nor); + } else { + ret = spi_nor_erase_sector(nor, addr); + } if (ret < 0) goto erase_err; -- 2.39.2