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 2FDFDC433EF for ; Thu, 10 Mar 2022 06:59:25 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7128F839BD; Thu, 10 Mar 2022 07:59:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kCB2dRzI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 98EEE839B0; Thu, 10 Mar 2022 07:59:20 +0100 (CET) Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9A5FF839CA for ; Thu, 10 Mar 2022 07:59:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jaimeliao.tw@gmail.com Received: by mail-pf1-x436.google.com with SMTP id g19so4329858pfc.9 for ; Wed, 09 Mar 2022 22:59:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=BA38Xveinn81jpGvtsfDEjq39Q20cYSamSy4HyERzFw=; b=kCB2dRzIQ81sc7ijDslgRkdF6CNL+K/FMf/GmOraEZvTPf2v2cE8xNTJv6a3QMtHFk KR05VQitGDcv8uNQFi9RVFntaMUU/cU0BvIDm3upk18sOWC892j6kXDTf+W3to9Ktwwd JIT4OfvcbPUFZgu6z6ymQZgzeAUrFWOa2SXp4s9l4Ys1mF5gcFpvPzJP9tWCISpUM2zR X3kceFjdbvSGdYvuP13gKE6ZsHpwdda4qn6v8cXMq+piRtM/qGI0QIxRxR87z0o2p//c bjSOulQjJVF4kiPSc2ZOpQustuJGWFvt0PEhYNM+q7Vhmej2eYOXQoVCa37qTnVJHLih uaRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BA38Xveinn81jpGvtsfDEjq39Q20cYSamSy4HyERzFw=; b=erD6vbdcgWVbOlOcS/Czp4/JYAQwRcR3nYXxSUGBMH16Ms1VBgvebR1fBC6x64qnxx MmSx0cFaoHzElEImaihPtTE3sk7vx98s4SDaWHas4XbTRX4r+t6xX5NNWrGsQiXmgqsb 3K8txiLgwyVW6rK6ntLF+HPjK8/sKJqBkcqMVwXQjf3gupwwZ3APB/LeewpbM7xhUclx jy3zzfQZmTasKi/u/14jIxZ0gwoGga+mhJlfBnqiDfsbiNYYOQ1IurhSWbzIzIHJ/xzk /3DzSWmXJBp1DGysK7OcQqDkJY4onC5Vx/mvWaMU9YQYWTNSkB6HM9u/i2efWBLHoHV/ YEMA== X-Gm-Message-State: AOAM533uSMrdcJalMuL96KeCbMZzWhxPjXCD/c+o3Qlgn1nKHGelnrXu 8Sw/EZoh4XaNqSxuBB96RzNIQKtyJZA= X-Google-Smtp-Source: ABdhPJzvgto+d4xPMBmfa/U3d4SvQUbQMMoL5ySP4kKMx+4ILepKa/Lu9JP/l9G+Sof85AcYDDo1bg== X-Received: by 2002:a05:6a00:22c1:b0:4f7:3e72:d99b with SMTP id f1-20020a056a0022c100b004f73e72d99bmr3577141pfj.79.1646895554483; Wed, 09 Mar 2022 22:59:14 -0800 (PST) Received: from localhost.localdomain ([123.51.145.88]) by smtp.gmail.com with ESMTPSA id s14-20020a056a0008ce00b004f66dcd4f1csm6150675pfu.32.2022.03.09.22.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 22:59:14 -0800 (PST) From: JaimeLiao To: u-boot@lists.denx.de, jagan@amarulasolutions.com, vigneshr@ti.com, miquel.raynal@bootlin.com Cc: zhengxunli@mxic.com.tw, jaimeliao@mxic.com.tw, JaimeLiao Subject: [PATCH] mtd: spi-nor: Parse SFDP Command Sequence to change to Octal DDR(8D-8D-8D) mode Date: Thu, 10 Mar 2022 14:59:09 +0800 Message-Id: <20220310065909.354-1-jaimeliao.tw@gmail.com> X-Mailer: git-send-email 2.17.1 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 Parcing table of SFDP Command Sequence to change to Octal DDR(8D-8D-8D) mode(CSODDR) and following SPI protocol to judge opcode, address, dummy and data. Enabling Octal DDR mode when nor->octal_dtr_enable didn't hook. Signed-off-by: JaimeLiao --- drivers/mtd/spi/spi-nor-core.c | 114 ++++++++++++++++++++++++++++++++- include/linux/mtd/spi-nor.h | 8 ++- 2 files changed, 120 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index d5d905fa5a..058dd8e889 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -63,6 +63,9 @@ struct sfdp_parameter_header { #define SFDP_SECTOR_MAP_ID 0xff81 /* Sector Map Table */ #define SFDP_SST_ID 0x01bf /* Manufacturer specific Table */ #define SFDP_PROFILE1_ID 0xff05 /* xSPI Profile 1.0 Table */ +#define SFDP_CSODDR_ID 0xff0a /* Command Sequences to Change to Octal + * DDR (8D-8D-8D) mode + */ #define SFDP_SIGNATURE 0x50444653U #define SFDP_JESD216_MAJOR 1 @@ -172,6 +175,11 @@ struct sfdp_header { #define PROFILE1_DWORD5_DUMMY_100MHZ GENMASK(11, 7) #define PROFILE1_DUMMY_DEFAULT 20 +/* Command Sequences to Change to Octal DDR (8D-8D-8D) mode */ +#define CSODDR_LENGTH_OF_CMD GENMASK(31, 24) +#define CSODDR_DWORD1_OF_CMD GENMASK(31, 0) +#define CSODDR_DWORD2_OF_CMD GENMASK(31, 0) + struct sfdp_bfpt { u32 dwords[BFPT_DWORD_MAX]; }; @@ -2434,6 +2442,49 @@ out: return ret; } +/** + * spi_nor_parse_csoddr() - Parse Command Sequences to Change to Octal DDR (8D-8D-8D) + * mode. + * @nor: pointer to a 'struct spi_nor' + * @csoddr_header: pointer to the 'struct sfdp_parameter_header' describing + * the CSODDR table length and version. + * + * Return: 0 on success, -errno otherwise. + */ +static int spi_nor_parse_csoddr(struct spi_nor *nor, + const struct sfdp_parameter_header *csoddr_header) +{ + u32 *table, addr; + size_t len; + int ret, i; + + len = csoddr_header->length * sizeof(*table); + table = kmalloc(len, GFP_KERNEL); + if (!table) + return -ENOMEM; + + addr = SFDP_PARAM_HEADER_PTP(csoddr_header); + ret = spi_nor_read_sfdp(nor, addr, len, table); + if (ret) + goto out; + + /* Fix endianness of the table DWORDs. */ + for (i = 0; i < csoddr_header->length; i++) + table[i] = le32_to_cpu(table[i]); + + /* Each command sequence consists of 2DWORDs(8 bytes) */ + for(i = 0; i < csoddr_header->length/2; i++) { + if(FIELD_GET(CSODDR_LENGTH_OF_CMD, table[2*i])) { + memcpy(&nor->csoddr_cmd[i].cmd_byte[0], &table[2*i], 4); + memcpy(&nor->csoddr_cmd[i].cmd_byte[4], &table[2*i+1], 4); + } + } + +out: + kfree(table); + return ret; +} + /** * spi_nor_parse_sfdp() - parse the Serial Flash Discoverable Parameters. * @nor: pointer to a 'struct spi_nor' @@ -2540,6 +2591,10 @@ static int spi_nor_parse_sfdp(struct spi_nor *nor, err = spi_nor_parse_profile1(nor, param_header, params); break; + case SFDP_CSODDR_ID: + err = spi_nor_parse_csoddr(nor, param_header); + break; + default: break; } @@ -3489,6 +3544,63 @@ static struct spi_nor_fixups mt35xu512aba_fixups = { }; #endif /* CONFIG_SPI_FLASH_MT35XU */ +/** + * spi_nor_generall_octal_dtr_enable() - execute command sequence to enable octal dtr mode. + * @nor: pointer to a 'struct spi_nor' + * + * Command Sequence to change to Octal DTR mode is parcing from SFDP table. + * Executing commands to enable Octal DTR mode. + * + * Return: 0 on success, -errno otherwise. + */ +static int spi_nor_generall_octal_dtr_enable(struct spi_nor *nor) +{ + struct spi_mem_op op; + int ret, i; + u8 opcode, buf, word_buf[2]; + u32 addr; + + /* According SPI protocol for judging combination of commands */ + for(i = 0; i < MAX_COMMAND_SEQUENCE_DTR; i++) { + if(nor->csoddr_cmd[i].cmd_byte[3]) { + if(nor->csoddr_cmd[i].cmd_byte[3] == 1) { + opcode = nor->csoddr_cmd[i].cmd_byte[2]; + ret = nor->write_reg(nor, opcode, NULL, 0); + } else if(nor->csoddr_cmd[i].cmd_byte[3] == 2 ) { + opcode = nor->csoddr_cmd[i].cmd_byte[2]; + buf = nor->csoddr_cmd[i].cmd_byte[1]; + ret = nor->write_reg(nor, opcode, &buf, 1); + } else if(nor->csoddr_cmd[i].cmd_byte[3] == 3 ) { + opcode = nor->csoddr_cmd[i].cmd_byte[2]; + word_buf[0] = nor->csoddr_cmd[i].cmd_byte[1]; + word_buf[1] = nor->csoddr_cmd[i].cmd_byte[0]; + ret = nor->write_reg(nor, opcode, word_buf, 2); + } else if(nor->csoddr_cmd[i].cmd_byte[3] > 5) { + opcode = nor->csoddr_cmd[i].cmd_byte[2]; + addr = nor->csoddr_cmd[i].cmd_byte[1] << 24 | nor->csoddr_cmd[i].cmd_byte[0] << 16 | + nor->csoddr_cmd[i].cmd_byte[7] << 8 | nor->csoddr_cmd[i].cmd_byte[7]; + buf = nor->csoddr_cmd[i].cmd_byte[5]; + op = (struct spi_mem_op) + SPI_MEM_OP(SPI_MEM_OP_CMD(opcode, 1), + SPI_MEM_OP_ADDR(4, addr, 1), + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_DATA_OUT(1, &buf, 1)); + + ret = spi_mem_exec_op(nor->spi, &op); + } + + if (ret) { + dev_err(nor->dev, "Failed to enable octal DTR mode\n"); + return ret; + } + } + } + + nor->reg_proto = SNOR_PROTO_8_8_8_DTR; + + return 0; +} + /** spi_nor_octal_dtr_enable() - enable Octal DTR I/O if needed * @nor: pointer to a 'struct spi_nor' * @@ -3499,7 +3611,7 @@ static int spi_nor_octal_dtr_enable(struct spi_nor *nor) int ret; if (!nor->octal_dtr_enable) - return 0; + nor->octal_dtr_enable = spi_nor_generall_octal_dtr_enable; if (!(nor->read_proto == SNOR_PROTO_8_8_8_DTR && nor->write_proto == SNOR_PROTO_8_8_8_DTR)) diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 7ddc4ba2bf..7c4b982bf3 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -261,7 +261,8 @@ static inline u8 spi_nor_get_protocol_width(enum spi_nor_protocol proto) return spi_nor_get_protocol_data_nbits(proto); } -#define SPI_NOR_MAX_CMD_SIZE 8 +#define SPI_NOR_MAX_CMD_SIZE 8 +#define MAX_COMMAND_SEQUENCE_DTR 4 enum spi_nor_ops { SPI_NOR_OPS_READ = 0, SPI_NOR_OPS_WRITE, @@ -375,6 +376,10 @@ struct spi_nor_pp_command { enum spi_nor_protocol proto; }; +struct csoddr { + u8 cmd_byte[8]; +}; + enum spi_nor_read_command_index { SNOR_CMD_READ, SNOR_CMD_READ_FAST, @@ -563,6 +568,7 @@ struct spi_nor { void *priv; /* Compatibility for spi_flash, remove once sf layer is merged with mtd */ const char *name; + struct csoddr csoddr_cmd[MAX_COMMAND_SEQUENCE_DTR]; u32 size; u32 sector_size; u32 erase_size; -- 2.17.1