From patchwork Wed Nov 23 21:13:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Barrett-Morrison X-Patchwork-Id: 25216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3032865wrr; Wed, 23 Nov 2022 13:18:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf7MP/p6mhxq70QQT7f3pNJ+Q7xuarMISMagW252chDBP+5uc9DuBquspfG3YK5ovwRzaZTP X-Received: by 2002:a17:906:89a1:b0:7ae:3193:8cf3 with SMTP id gg33-20020a17090689a100b007ae31938cf3mr24012046ejc.416.1669238320522; Wed, 23 Nov 2022 13:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669238320; cv=none; d=google.com; s=arc-20160816; b=WQ/DdLlbpU5vhiXW6uZk7GgkO+cnqlbeiemShAO4gRqmLdmV1BbAIm4xErq/JZbFrw jg0iX0m/Qqai4wgjMEF5p+YMmikMtNsWR/mtgWQ3EWW2BtbP8v/aECaYmES2li8whfUD 2eYcmrWh0srHyQb5qtiqzfS8aSJrTnckBqLEbtw2UeNrdcNpg5Zl3gqBBfFNpvB0+FPt xtHJ7knzBjOBwRqvB8lHGMR0AJGNtNCAJsZb89xpMo3efcSw+POnSwJYNH8rw0vYs2vw u1GakjcKFK2zV6u6hBxR35zBgJLdrx/Y1JlzmySLtVQbtL7P/3Wx4Vk3IhTJCRywWNGG NPzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=iZJAARPx2SHtSQhuKCHJQqr1weKMEsXAzSQ/wjEgP/A=; b=Qtadbu2NZSBz9NonCYWP6CfMu83juSqwZ6eh/qLLPFxEUprDNrJa6B4iWJ5EiQzXHW SAlj9laKSkpfrYagGtucndKTwpLI808tsx4rr1Cihm2IErdQCTjHRp3KgY+JQV5zVBuR pSlmU9jVpC6H62QQ+BTw/vaz69I8LsPFEVIKWM2UsDOvlBcu3rQV4xq8+x0XalbhjVb0 sNkPUePNAARNonP+YpFwzYRtbRLRLKHAHVoWSBazMfldkfBAl9+2LVryOMVogo2GubOd 4cqFtM8SxiiZUgdpiG+RuyqzrKBrPMDKDW0VVKsDv4IgSr6ULoUVW68CVuo737duYDwu 5Xkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@timesys-com.20210112.gappssmtp.com header.s=20210112 header.b=2VLnkaoz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ez15-20020a056402450f00b0044ee4ec8915si3351545edb.39.2022.11.23.13.18.17; Wed, 23 Nov 2022 13:18:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@timesys-com.20210112.gappssmtp.com header.s=20210112 header.b=2VLnkaoz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237136AbiKWVN7 (ORCPT + 99 others); Wed, 23 Nov 2022 16:13:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235462AbiKWVNs (ORCPT ); Wed, 23 Nov 2022 16:13:48 -0500 Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CB452C65C for ; Wed, 23 Nov 2022 13:13:46 -0800 (PST) Received: by mail-qt1-x836.google.com with SMTP id fz10so26264qtb.3 for ; Wed, 23 Nov 2022 13:13:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=timesys-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iZJAARPx2SHtSQhuKCHJQqr1weKMEsXAzSQ/wjEgP/A=; b=2VLnkaozanxm/fqmdEy2NgJX+Vj307RM4OQqji23uaPYoksKrOM2UdlD19T40yFoll uoQJPjDBKAzXNPDhnl3i+7WhBNOCN7c4QrcQp1+L4y8PyVyqcHlUhxdfiWt8+037NBAv PTlPCRNXD45gQ4HNoQKAO/42mHAKfZiFa6Ifx9Kfc6bym0b/NRvTK8pORQbxn0Eo3pGu vNPrkxh880ysqwq2KaOsWZMcAABAaVjjmmK5lPLxmGwMx0JedI5gthVBfN8gvsGSNC+B eXCG1AN+EXggie2hc72e4AO9ykHncfZD/w2/z0SiZC3LXInA8jdcSjLlL9rLP1APjJCn 0hlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iZJAARPx2SHtSQhuKCHJQqr1weKMEsXAzSQ/wjEgP/A=; b=lYHOMphAITfPVDUW3J1y3MBbjOH9bE1rduaxN+MbUcHUfah8DN+H5mw4JLh7N9oyRN E3o+u059PkQRioGXoLMMIJZ6DCgs7LZSX9BggTB5GCbxmFG3rTQ7Vj8NzNlJ3MkveGou dWDXDuXRBfjQ0+20M2UvPytQCtiwj8jwNUDu04aGY3igzudQspSoa0J4tIqyA1Zddqls y6TZ6oJHlS90nA38qxk6OdjDcwY7Lay//ZkOiVS+kJM0Dhw9fSLjzVyOgJa3t8lCsK6T cn4BHVgJ+sMD1eWm01HmSFE32i8NdCj6UDNgpunMUwL8Ru0DuU20AEVzwCn1AfabanzT a4DQ== X-Gm-Message-State: ANoB5pmlNkrF11RMGb+CxJhPS6FTvO/dgUYtlRXYtMhbHdgZr6UqRHoF 10DdBVPg5Ah/4uJc+Q0MCcvVjQ== X-Received: by 2002:ac8:67c5:0:b0:3a4:f665:7791 with SMTP id r5-20020ac867c5000000b003a4f6657791mr28900709qtp.380.1669238025276; Wed, 23 Nov 2022 13:13:45 -0800 (PST) Received: from nathan-ideapad.. (d-75-76-18-234.oh.cpe.breezeline.net. [75.76.18.234]) by smtp.gmail.com with ESMTPSA id cf11-20020a05622a400b00b0039ee562799csm10222928qtb.59.2022.11.23.13.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 13:13:45 -0800 (PST) From: Nathan Barrett-Morrison Cc: nathan.morrison@timesys.com, greg.malysa@timesys.com, Tudor Ambarus , Pratyush Yadav , Michael Walle , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , linux-mtd@lists.infradead.org (open list:SPI NOR SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] mtd: spi-nore: core: Add in framework for 8S-8S-8S Octal STR mode Date: Wed, 23 Nov 2022 16:13:34 -0500 Message-Id: <20221123211335.126417-2-nathan.morrison@timesys.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221123211335.126417-1-nathan.morrison@timesys.com> References: <20221123211335.126417-1-nathan.morrison@timesys.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750323241088799871?= X-GMAIL-MSGID: =?utf-8?q?1750323241088799871?= While trying to bring up an Octal SPI device in STR mode, I found that there is currently no support for 8S-8S-8S. This patch adds the necessary, additional logic for doing so. Signed-off-by: Nathan Barrett-Morrison --- drivers/mtd/spi-nor/core.c | 57 ++++++++++++++++++++++++++++++++++++-- drivers/mtd/spi-nor/core.h | 5 +++- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index bee8fc4c9f07..66665c1bebd7 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -2253,7 +2253,8 @@ static int spi_nor_set_addr_nbytes(struct spi_nor *nor) { if (nor->params->addr_nbytes) { nor->addr_nbytes = nor->params->addr_nbytes; - } else if (nor->read_proto == SNOR_PROTO_8_8_8_DTR) { + } else if (nor->read_proto == SNOR_PROTO_8_8_8_DTR || + nor->read_proto == SNOR_PROTO_8_8_8) { /* * In 8D-8D-8D mode, one byte takes half a cycle to transfer. So * in this protocol an odd addr_nbytes cannot be used because @@ -2335,7 +2336,7 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor) { struct spi_nor_flash_parameter *params = nor->params; struct spi_nor_erase_map *map = ¶ms->erase_map; - const u8 no_sfdp_flags = nor->info->no_sfdp_flags; + const u16 no_sfdp_flags = nor->info->no_sfdp_flags; u8 i, erase_mask; if (no_sfdp_flags & SPI_NOR_DUAL_READ) { @@ -2359,6 +2360,13 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor) SNOR_PROTO_1_1_8); } + if (no_sfdp_flags & SPI_NOR_OCTAL_STR_READ) { + params->hwcaps.mask |= SNOR_HWCAPS_READ_8_8_8; + spi_nor_set_read_settings(¶ms->reads[SNOR_HWCAPS_READ_8_8_8], + 0, 20, SPINOR_OP_READ_FAST, + SNOR_PROTO_8_8_8); + } + if (no_sfdp_flags & SPI_NOR_OCTAL_DTR_READ) { params->hwcaps.mask |= SNOR_HWCAPS_READ_8_8_8_DTR; spi_nor_set_read_settings(¶ms->reads[SNOR_CMD_READ_8_8_8_DTR], @@ -2366,6 +2374,12 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor) SNOR_PROTO_8_8_8_DTR); } + if (no_sfdp_flags & SPI_NOR_OCTAL_STR_PP) { + params->hwcaps.mask |= SNOR_HWCAPS_PP_8_8_8; + spi_nor_set_pp_settings(¶ms->page_programs[SNOR_CMD_PP_8_8_8], + SPINOR_OP_PP, SNOR_PROTO_8_8_8); + } + if (no_sfdp_flags & SPI_NOR_OCTAL_DTR_PP) { params->hwcaps.mask |= SNOR_HWCAPS_PP_8_8_8_DTR; /* @@ -2631,6 +2645,38 @@ static int spi_nor_init_params(struct spi_nor *nor) return 0; } +/** spi_nor_octal_str_enable() - enable Octal STR I/O if needed + * @nor: pointer to a 'struct spi_nor' + * @enable: whether to enable or disable Octal STR + * + * Return: 0 on success, -errno otherwise. + */ +static int spi_nor_octal_str_enable(struct spi_nor *nor, bool enable) +{ + int ret; + + if (!nor->params->octal_str_enable) + return 0; + + if (!(nor->read_proto == SNOR_PROTO_8_8_8 && + nor->write_proto == SNOR_PROTO_8_8_8)) + return 0; + + if (!(nor->flags & SNOR_F_IO_MODE_EN_VOLATILE)) + return 0; + + ret = nor->params->octal_str_enable(nor, enable); + if (ret) + return ret; + + if (enable) + nor->reg_proto = SNOR_PROTO_8_8_8; + else + nor->reg_proto = SNOR_PROTO_1_1_1; + + return 0; +} + /** spi_nor_octal_dtr_enable() - enable Octal DTR I/O if needed * @nor: pointer to a 'struct spi_nor' * @enable: whether to enable or disable Octal DTR @@ -2691,6 +2737,12 @@ static int spi_nor_init(struct spi_nor *nor) return err; } + err = spi_nor_octal_str_enable(nor, true); + if (err) { + dev_dbg(nor->dev, "octal STR mode not supported\n"); + return err; + } + err = spi_nor_quad_enable(nor); if (err) { dev_dbg(nor->dev, "quad mode not supported\n"); @@ -2714,6 +2766,7 @@ static int spi_nor_init(struct spi_nor *nor) if (nor->addr_nbytes == 4 && nor->read_proto != SNOR_PROTO_8_8_8_DTR && + nor->read_proto != SNOR_PROTO_8_8_8 && !(nor->flags & SNOR_F_4B_OPCODES)) { /* * If the RESET# pin isn't hooked up properly, or the system diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 85b0cf254e97..56795db872c2 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -359,6 +359,7 @@ struct spi_nor_otp { * Table. * @otp: SPI NOR OTP info. * @octal_dtr_enable: enables SPI NOR octal DTR mode. + * @octal_str_enable: enables SPI NOR octal STR mode. * @quad_enable: enables SPI NOR quad mode. * @set_4byte_addr_mode: puts the SPI NOR in 4 byte addressing mode. * @convert_addr: converts an absolute address into something the flash @@ -508,7 +509,7 @@ struct flash_info { #define NO_CHIP_ERASE BIT(7) #define SPI_NOR_NO_FR BIT(8) - u8 no_sfdp_flags; + u16 no_sfdp_flags; #define SPI_NOR_SKIP_SFDP BIT(0) #define SECT_4K BIT(1) #define SPI_NOR_DUAL_READ BIT(3) @@ -516,6 +517,8 @@ struct flash_info { #define SPI_NOR_OCTAL_READ BIT(5) #define SPI_NOR_OCTAL_DTR_READ BIT(6) #define SPI_NOR_OCTAL_DTR_PP BIT(7) +#define SPI_NOR_OCTAL_STR_READ BIT(8) +#define SPI_NOR_OCTAL_STR_PP BIT(9) u8 fixup_flags; #define SPI_NOR_4B_OPCODES BIT(0)