Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp61752ybz; Fri, 24 Apr 2020 11:49:46 -0700 (PDT) X-Google-Smtp-Source: APiQypLoO1QDry79Cqk8cWoDbNNDbV5hg20hqd/qDfaRS5voWj/E0ggq9Ik1CGY58L0fZays36Cb X-Received: by 2002:a50:a985:: with SMTP id n5mr8645123edc.338.1587754186420; Fri, 24 Apr 2020 11:49:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587754186; cv=none; d=google.com; s=arc-20160816; b=nz3uatJ5k0oiRYrj+LqXB7S0K73IkbBM44eNXVIltmk9VrtiWaTBW6Cyld+ICea+TG Zy6xe8imtrsBW3MksMX0d8I8TKFTpqf3P5tJIWYtqTZDBI61yq7AGwPQIeiqaiya0sBO 6ewpoJlrYUcCoqdPohexhcFQfwVRJhmdXqrk3suszwnXGVyTwJs9J3f0cRbaAQMP68eo EQc4hxeFeIiIvn6jC+1iILxj987c2qtwVPR80na9UrQWrWLVDiLQRcXAqf6W6xUilMJx quOk7CyuJtkYFZfoPg1AiJ4J5rERiWGX7AB/V5i4mV6VPOLdj6FvkKRLE60Xor2GxXDe pKmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ChEstIHCEfiW2Hp7Q6OB5Ms+2ON8V0fnE6j2cFQvJvk=; b=Y6r57IwZ/wxgQUUUeOHs+TBxC0bhQBl1ffS2uwkIcuUIZaGa1Mh8MV8VbXVumvKn+d 1u7PDUxkYE5oMuLTn7p+qhWVeR8uPyeHQnpSE729XoyINQPJcDWfazlj3a3YH2+5kxAY 9CgXXsPF/YCNr+K8IMkGjL+F9vuuBQzlRX0hGN2Kwrj9OIS/DNMxGXsXh5vPo4GroGoS sCAS8SqDOJyZBpeD8T6PuBHLWAbHFfAm7JDUGGiC3zFLDJEEQ4xcGC42PiNi+bF++Lle +xRBVXz/gzZ8wirA8rQC0vYmo4GSdXcxKkG9PSa9Gw8Fev41DQBMZxdsTMjqZS8Ltrc9 1Yfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=sFB2fXoc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w11si3519472ejz.146.2020.04.24.11.49.22; Fri, 24 Apr 2020 11:49:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=sFB2fXoc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729363AbgDXSpU (ORCPT + 99 others); Fri, 24 Apr 2020 14:45:20 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:44052 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729114AbgDXSpR (ORCPT ); Fri, 24 Apr 2020 14:45:17 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 03OIj47K102872; Fri, 24 Apr 2020 13:45:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1587753904; bh=ChEstIHCEfiW2Hp7Q6OB5Ms+2ON8V0fnE6j2cFQvJvk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=sFB2fXocNnlu/Qjyf86i+5rUf1ktdgzXL961EOG2iagnnSNK0tYiVik0zZm/bUGkb aS4XI2MAa8kwGz92fp+301nXE0Y7k1EKMBM7j7jk0qx9F2E6fT/l5TcrlBgqFhD4Kp q1ghsxTfsa3b9lpAghFlGFIc5FfMJePgiSHisP9o= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 03OIj4kD086213; Fri, 24 Apr 2020 13:45:04 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Fri, 24 Apr 2020 13:45:03 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Fri, 24 Apr 2020 13:45:03 -0500 Received: from pratyush-OptiPlex-790.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id 03OIiAaI047967; Fri, 24 Apr 2020 13:45:00 -0500 From: Pratyush Yadav To: Tudor Ambarus , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Mark Brown , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , , , , CC: Pratyush Yadav , Sekhar Nori Subject: [PATCH v4 12/16] mtd: spi-nor: perform a Soft Reset on shutdown Date: Sat, 25 Apr 2020 00:14:06 +0530 Message-ID: <20200424184410.8578-13-p.yadav@ti.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200424184410.8578-1-p.yadav@ti.com> References: <20200424184410.8578-1-p.yadav@ti.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A Software Reset sequence will return the flash to Power-on-Reset (POR) state. It consists of two commands: Soft Reset Enable and Soft Reset. Perform a Soft Reset on shutdown on flashes that support it so that the flash can be reset to its initial state and any configurations made by spi-nor (given that they're only done in volatile registers) will be reset. This will hand back the flash in pristine state for any further operations on it. Signed-off-by: Pratyush Yadav --- drivers/mtd/spi-nor/core.c | 45 +++++++++++++++++++++++++++++++++++++ drivers/mtd/spi-nor/core.h | 2 ++ include/linux/mtd/spi-nor.h | 2 ++ 3 files changed, 49 insertions(+) diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index c75765f09d62..b0f94d6d28bf 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -40,6 +40,9 @@ #define SPI_NOR_MAX_ADDR_WIDTH 4 +#define SPI_NOR_SRST_SLEEP_MIN 200 +#define SPI_NOR_SRST_SLEEP_MAX 400 + /** * spi_nor_get_cmd_ext() - Get the command opcode extension based on the * extension type. @@ -3189,6 +3192,41 @@ static int spi_nor_init(struct spi_nor *nor) return 0; } +static void spi_nor_soft_reset(struct spi_nor *nor) +{ + struct spi_mem_op op; + int ret; + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRSTEN, 8), + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_NO_ADDR, + SPI_MEM_OP_NO_DATA); + spi_nor_spimem_setup_op(nor, &op, SNOR_PROTO_8_8_8_DTR); + ret = spi_mem_exec_op(nor->spimem, &op); + if (ret) { + dev_warn(nor->dev, "Software reset failed: %d\n", ret); + return; + } + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRST, 8), + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_NO_ADDR, + SPI_MEM_OP_NO_DATA); + spi_nor_spimem_setup_op(nor, &op, SNOR_PROTO_8_8_8_DTR); + ret = spi_mem_exec_op(nor->spimem, &op); + if (ret) { + dev_warn(nor->dev, "Software reset failed: %d\n", ret); + return; + } + + /* + * Software Reset is not instant, and the delay varies from flash to + * flash. Looking at a few flashes, most range somewhere below 100 + * microseconds. So, sleep for a range of 200-400 us. + */ + usleep_range(SPI_NOR_SRST_SLEEP_MIN, SPI_NOR_SRST_SLEEP_MAX); +} + /* mtd resume handler */ static void spi_nor_resume(struct mtd_info *mtd) { @@ -3208,6 +3246,10 @@ void spi_nor_restore(struct spi_nor *nor) if (nor->addr_width == 4 && !(nor->flags & SNOR_F_4B_OPCODES) && nor->flags & SNOR_F_BROKEN_RESET) nor->params->set_4byte_addr_mode(nor, false); + + if (nor->info->flags & SPI_NOR_OCTAL_DTR_READ && + nor->flags & SNOR_F_SOFT_RESET) + spi_nor_soft_reset(nor); } EXPORT_SYMBOL_GPL(spi_nor_restore); @@ -3394,6 +3436,9 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, nor->flags |= SNOR_F_HAS_SR_TB_BIT6; } + if (info->flags & SPI_NOR_SOFT_RESET) + nor->flags |= SNOR_F_SOFT_RESET; + if (info->flags & NO_CHIP_ERASE) nor->flags |= SNOR_F_NO_OP_CHIP_ERASE; if (info->flags & USE_CLSR) diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 6338d32a0d77..86c31357b321 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -26,6 +26,7 @@ enum spi_nor_option_flags { SNOR_F_HAS_SR_TB_BIT6 = BIT(11), SNOR_F_HAS_4BIT_BP = BIT(12), SNOR_F_HAS_SR_BP3_BIT6 = BIT(13), + SNOR_F_SOFT_RESET = BIT(14), }; struct spi_nor_read_command { @@ -321,6 +322,7 @@ struct flash_info { * Must be used with SPI_NOR_4BIT_BP. */ #define SPI_NOR_OCTAL_DTR_READ BIT(19) /* Flash supports octal DTR Read. */ +#define SPI_NOR_SOFT_RESET BIT(20) /* Flash supports soft reset command */ /* Part specific fixup hooks. */ const struct spi_nor_fixups *fixups; diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 9bb41d9401c6..7b828ee1c036 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -51,6 +51,8 @@ #define SPINOR_OP_CLFSR 0x50 /* Clear flag status register */ #define SPINOR_OP_RDEAR 0xc8 /* Read Extended Address Register */ #define SPINOR_OP_WREAR 0xc5 /* Write Extended Address Register */ +#define SPINOR_OP_SRSTEN 0x66 /* Software Reset Enable */ +#define SPINOR_OP_SRST 0x99 /* Software Reset */ /* 4-byte address opcodes - used on Spansion and some Macronix flashes. */ #define SPINOR_OP_READ_4B 0x13 /* Read data bytes (low frequency) */ -- 2.25.0