From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 120B6C77B7D for ; Sun, 7 May 2023 10:53:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230399AbjEGKxu (ORCPT ); Sun, 7 May 2023 06:53:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231552AbjEGKxt (ORCPT ); Sun, 7 May 2023 06:53:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ED4E61AB for ; Sun, 7 May 2023 03:53:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BB03A60E73 for ; Sun, 7 May 2023 10:53:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CAAFAC433EF; Sun, 7 May 2023 10:53:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683456827; bh=kJPuunNYrQH89putJNlvccX4zMM90aZnrV3uLrX0wVI=; h=Subject:To:Cc:From:Date:From; b=MQh9QeJli0kcsVf+lSOf4enAMcVuUqgzqqJGDnlOoGZyQyVFx1XdT4Z5NtFGh8XGd JCOdhqYteBe3+je/ywQR9VhMsmH/2FqJhemZAIWnAgVKQPCEQfsA8lySKUrEHXN7Va hyBaO8pnbMsdzc1eK/Bw5zNw6hQbcx47nNqhw32w= Subject: FAILED: patch "[PATCH] mtd: spi-nor: spansion: Enable JFFS2 write buffer for" failed to apply to 6.1-stable tree To: Takahiro.Kuwano@infineon.com, tudor.ambarus@linaro.org Cc: From: Date: Sun, 07 May 2023 12:53:37 +0200 Message-ID: <2023050737-slacker-grafted-b278@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x a9180c298d3527f43563d02a62cb9e7e145642c6 # git commit -s git send-email --to '' --in-reply-to '2023050737-slacker-grafted-b278@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: a9180c298d35 ("mtd: spi-nor: spansion: Enable JFFS2 write buffer for S25FS256T") 6afcc84080c4 ("mtd: spi-nor: spansion: Add support for Infineon S25FS256T") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a9180c298d3527f43563d02a62cb9e7e145642c6 Mon Sep 17 00:00:00 2001 From: Takahiro Kuwano Date: Thu, 6 Apr 2023 15:17:46 +0900 Subject: [PATCH] mtd: spi-nor: spansion: Enable JFFS2 write buffer for S25FS256T Infineon(Cypress) SEMPER NOR flash family has on-die ECC and its program granularity is 16-byte ECC data unit size. JFFS2 supports write buffer mode for ECC'd NOR flash. Provide a way to clear the MTD_BIT_WRITEABLE flag in order to enable JFFS2 write buffer mode support. Drop the comment as the same info is now specified in cypress_nor_ecc_init(). Fixes: 6afcc84080c4 ("mtd: spi-nor: spansion: Add support for Infineon S25FS256T") Suggested-by: Tudor Ambarus Signed-off-by: Takahiro Kuwano Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/641bfb26c6e059915ae920117b7ec278df1a6f0a.1680760742.git.Takahiro.Kuwano@infineon.com Signed-off-by: Tudor Ambarus diff --git a/drivers/mtd/spi-nor/spansion.c b/drivers/mtd/spi-nor/spansion.c index 4d0cc10e3d85..ffeede78700d 100644 --- a/drivers/mtd/spi-nor/spansion.c +++ b/drivers/mtd/spi-nor/spansion.c @@ -384,13 +384,7 @@ static void s25fs256t_post_sfdp_fixup(struct spi_nor *nor) static void s25fs256t_late_init(struct spi_nor *nor) { - /* - * Programming is supported only in 16-byte ECC data unit granularity. - * Byte-programming, bit-walking, or multiple program operations to the - * same ECC data unit without an erase are not allowed. See chapter - * 5.3.1 and 5.6 in the datasheet. - */ - nor->params->writesize = 16; + cypress_nor_ecc_init(nor); } static struct spi_nor_fixups s25fs256t_fixups = {