From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F68136681E for ; Wed, 11 Feb 2026 10:07:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770804441; cv=none; b=nH3MK79eqGMosSZGUOzO7AdBNoLpuXlvpx/pVtZXiIoj3pIJUmf1uQ83t4KSffMO/uyrEBk0CwORlb/igXtOG9DW2CHdHHXPSRK8mJRGfMa0hV4WeYWSbeGvb8/6ZUCc6yglbz8aSZu6pUAlDBd7kNMqnK7z9XRahNhpGJOdfDg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770804441; c=relaxed/simple; bh=sk5ObcHsvkNRSkrH29Vr0ZGJD0YngGUKebB8SFdlWLg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q3VQ4HD+nIe7ULlJSUvZ9xf2xfvH9rc6BW01eP4un3GQWpLEHwVm8pVAu0aVW65MY9daHDnmM50Pc4bG+6lXauuSo6XFfxOSDzwjXItjFtDgur/z4RwnKfabZA4z0YchcaLeY9bYX3rJU+EHjqKq645+lnn8xMw6xBp/3hEd7dU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lmcFiESR; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lmcFiESR" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-8217f2ad01eso5496088b3a.2 for ; Wed, 11 Feb 2026 02:07:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770804440; x=1771409240; darn=vger.kernel.org; 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=CTOF5PYV8c2g1I+bFvYAViWDiAHB2kpsM2zHbjXs7JQ=; b=lmcFiESRt7MknW8W3yPowlodpJpM2vM8Wq27PIa+orQjVvKZg7MJpFR6GIllED+QOb TCTgskZBMYrcL2exkg3PHByaHRwy19Y9kgIxiWhXGepyjc/vv8ueUUi5KGF1XHkvrfD+ uEniclnUYxVfXvIVSOC8oDZf4z0jJs1Qy088h6HvrzQX1XXcuhehPG7zplX+akqkhvn2 XgkvozxmZABSkMrLi3oltukSTVOc+c+0XvHUNdOxoi5hfmY/3ZfKRYIiFh69PX5rxd8h N+ZN/VFECB9xSI8e+6p1joy53mPon5HqAm/vh/mEDBRw8T0L2Evdqe/TXRuxKYrkCkMj L7Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770804440; x=1771409240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=CTOF5PYV8c2g1I+bFvYAViWDiAHB2kpsM2zHbjXs7JQ=; b=jqJCsGFg6GTst/RlG6GWBCxx0YEwkUPK6CewcpTOGHck+WPQxxg2y529rM18AHlugZ 2vl3JOQsbXqmRA5JOk5jlUaBYWZXohtzGNHhky9K4AQSko9s5rx0LySYQVgXIRB51ks4 5boj6CyOVgLP54VltVZGw3hDztXAPR6oyBC3SbpxwVDiXI+p4POwJcjqjXoxRsWYh0nk 6vVZ4ojb3/sLsfYikfmQXSnZd/8FL+rb322YYF/BiWtn6gnL/z+BF4QGko23yz7tndAs 2gD6MUNRL6SgSy5vW6hV+2nuhCi6APmHkSMgxhDklO+HlDggG1gsAfbdjM7Q56yXuUEW ChRA== X-Forwarded-Encrypted: i=1; AJvYcCWQZLbt8Kyaj3uQ/7GF5YVukShSCjA/VhFmkkjZd7aXsWiW3gsgrYm3zxxkEy0vpSTfoeerpxoig5q9j+Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+/wV7upP7+LnPDOAr3ljBRk+t/UPu04mEjA/mhP1orr1kwTMh Gqvu3VEN3cQwfh6NifAWGKECX0wIwFLOG2JqWJT7rcC3Flae+cacM4Av X-Gm-Gg: AZuq6aJRc14CLi7CIsZLPWQ5XP2wQG0Z3janL5J4LoMA1nNThr7ZaPbZqIiLH2KGNcM jwVAcFkgp0nkdh0uoyWNjodnb1GOuqa4iNw884mOnCC9HQflIo+amQzOen0bzaTX72UHaEkmiTS tRdT0QaM8zBefct/PZeoO4XgXdhPS1p56UzzoscSPc0B+L3y/Sqq8uoXJBXQHtka+cJ7iKKG4jP HLwMCBtr2PRYWN460NCilohUiaoCdHr+mtvYHY+VOoUFdbaw1mveJBIMjrthqiI/RgLMSLllwHq q0rK/8/2hJ8RF/tR51BfuYDOi68n26AOVhVmpiRcj9DMNLw5flXEwUkX7PtPjIqzmYIYawQwgFx 1BvE9nSVs+D4Ll7d7dJb3fPmxkF/EV/k2t6TmByn6EWLxOhfolYKA0GFXX9vjAyCOlbPzz9QRVx doOzOGaB4SbXcvbkQeKNU6Q/5N/6XcNwzSo6EigXVO2diuYA== X-Received: by 2002:a05:6a00:ab02:b0:81f:3cb7:cf99 with SMTP id d2e1a72fcca58-8249fbed0acmr1365540b3a.17.1770804439597; Wed, 11 Feb 2026 02:07:19 -0800 (PST) Received: from twhmp6px (mxsmtp211.mxic.com.tw. [211.75.127.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8249e366a98sm1999109b3a.3.2026.02.11.02.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 02:07:19 -0800 (PST) Received: from hqs-appsw-a2o.mp600.macronix.com (unknown [172.17.236.67]) by twhmp6px (Postfix) with ESMTPS id 01FF84136078; Wed, 11 Feb 2026 18:07:17 +0800 (CST) From: Cheng Ming Lin To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Tudor Ambarus , Mikhail Kshevetskiy , Pablo Martin-Gomez , Tianling Shen , Pratyush Yadav , linux-mtd@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alvinzhou@mxic.com.tw, Cheng Ming Lin Subject: [PATCH v5 3/3] mtd: spi-nand: macronix: Enable randomizer support Date: Wed, 11 Feb 2026 18:05:53 +0800 Message-Id: <20260211100553.907585-4-linchengming884@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260211100553.907585-1-linchengming884@gmail.com> References: <20260211100553.907585-1-linchengming884@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Cheng Ming Lin Implement the 'set_randomizer' callback for Macronix SPI NAND chips. The randomizer is enabled by setting bit 1 of the Configuration Register (address 0x10). This patch adds support for the following chips: - MX35LFxG24AD series - MX35UFxG24AD series When the randomizer is enabled, data is scrambled internally during program operations and automatically descrambled during read operations. This helps reduce bit errors caused by program disturbance. Signed-off-by: Cheng Ming Lin --- drivers/mtd/nand/spi/macronix.c | 46 +++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c index edf63b9996cf..3a9ab146426b 100644 --- a/drivers/mtd/nand/spi/macronix.c +++ b/drivers/mtd/nand/spi/macronix.c @@ -14,6 +14,8 @@ #define MACRONIX_ECCSR_BF_LAST_PAGE(eccsr) FIELD_GET(GENMASK(3, 0), eccsr) #define MACRONIX_ECCSR_BF_ACCUMULATED_PAGES(eccsr) FIELD_GET(GENMASK(7, 4), eccsr) #define MACRONIX_CFG_CONT_READ BIT(2) +#define MACRONIX_CFG_RANDOMIZER_EN BIT(1) +#define MACRONIX_FEATURE_ADDR_RANDOMIZER 0x10 #define MACRONIX_FEATURE_ADDR_READ_RETRY 0x70 #define MACRONIX_NUM_READ_RETRY_MODES 5 @@ -146,7 +148,7 @@ static int macronix_set_cont_read(struct spinand_device *spinand, bool enable) * Return: 0 on success, a negative error code otherwise. */ static int macronix_set_read_retry(struct spinand_device *spinand, - unsigned int retry_mode) + unsigned int retry_mode) { struct spi_mem_op op = SPINAND_SET_FEATURE_1S_1S_1S_OP(MACRONIX_FEATURE_ADDR_READ_RETRY, spinand->scratchbuf); @@ -155,6 +157,18 @@ static int macronix_set_read_retry(struct spinand_device *spinand, return spi_mem_exec_op(spinand->spimem, &op); } +static int macronix_set_randomizer(struct spinand_device *spinand, bool enable) +{ + int ret; + + ret = spinand_write_reg_op(spinand, MACRONIX_FEATURE_ADDR_RANDOMIZER, + enable ? MACRONIX_CFG_RANDOMIZER_EN : 0); + if (ret) + return ret; + + return 0; +} + static const struct spinand_info macronix_spinand_table[] = { SPINAND_INFO("MX35LF1GE4AB", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x12), @@ -213,7 +227,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_HAS_QE_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35LF2G24AD", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x24, 0x03), NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1), @@ -225,7 +240,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_HAS_PROG_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35LF2G24AD-Z4I8", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x64, 0x03), NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), @@ -236,7 +252,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_HAS_QE_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35LF4G24AD", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x35, 0x03), NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 2, 1, 1), @@ -248,7 +265,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_HAS_PROG_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35LF4G24AD-Z4I8", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x75, 0x03), NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1), @@ -259,7 +277,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_HAS_QE_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX31LF1GE4BC", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x1e), NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), @@ -305,7 +324,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, macronix_ecc_get_status), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35UF4G24AD-Z4I8", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xf5, 0x03), NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1), @@ -317,7 +337,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, macronix_ecc_get_status), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35UF4GE4AD", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xb7, 0x03), NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1), @@ -355,7 +376,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, macronix_ecc_get_status), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35UF2G24AD-Z4I8", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xe4, 0x03), NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), @@ -367,7 +389,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, macronix_ecc_get_status), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35UF2GE4AD", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xa6, 0x03), NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), @@ -413,7 +436,8 @@ static const struct spinand_info macronix_spinand_table[] = { SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, macronix_ecc_get_status), SPINAND_READ_RETRY(MACRONIX_NUM_READ_RETRY_MODES, - macronix_set_read_retry)), + macronix_set_read_retry), + SPINAND_RANDOMIZER(macronix_set_randomizer)), SPINAND_INFO("MX35UF1GE4AD", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x96, 0x03), NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), -- 2.25.1