From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFB291DF97C for ; Sat, 24 Jan 2026 13:37:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769261858; cv=none; b=FZY8LsX8U/d6T+GdQUdZ/Co3+YE/cSXWLrDExpns1k9IHi1Bij9iKvYfPMRW+jPPLdr1hP+EwwaNgPHEgb/8qh6vcw9OiuhS+6KDg6YH6pF4rA3Pi4tJ0CyeeEbwn7/Ufy44SxzIRRxS7vuxM4014UJTPFrvxWHH/bBR7zmFibk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769261858; c=relaxed/simple; bh=s/lC1OtK987xqty7UxUrXuVn+8kdCpcDik/4q+c9fvQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=T4VoKUSN6VPcbC54CI+TvJYMGz3+LMf1/03FeQZCYEHLmfxDf26pWQh2icSD7xIUP+LkRzxKm+gECS87hYyT3ZCM58oRRqnjlpPED4tvhwWAQXWpPncI2t8iZfhSGvSNrmxI7p1RPUAtlPuRSjJw8RQYDO6BbDKhMCntFxLIW0k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HdnO6o18; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HdnO6o18" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769261856; x=1800797856; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=s/lC1OtK987xqty7UxUrXuVn+8kdCpcDik/4q+c9fvQ=; b=HdnO6o18OeboV2/8ucQ157TglwMbEB+L2ggEGWvH9609GG4GXKCQzbQ7 p+osINhhZRS83AAYVoPiyp9LRgwf8jLFnqkQ/KQQomSFoY2kC0wq7QnJO vJy9WNtSv/y4utRCZCWbh03fkmlmVkN649WuoODmNG70bQO66DxOygzsl j3Jy2Ii8Nzy68R6hFFOWQ6iOxh2hBfyiGGjQiLuB0WXERzEgMHF/YpACq Ty9HwE/R0djr4d5vmaZtiWBsh3xCFJirBTjrNa0H1TbWL69H8SLWIFebj hYiaYktePR8uwxFG6e9O/vbcyWYf11fXPvNX9LbBegok+IxSsRRJXo8wr Q==; X-CSE-ConnectionGUID: 6nSBEUuNR0WnRw8M0iKzyA== X-CSE-MsgGUID: hqJLhVlMRpSNLMiFGXGkaA== X-IronPort-AV: E=McAfee;i="6800,10657,11681"; a="73077995" X-IronPort-AV: E=Sophos;i="6.21,250,1763452800"; d="scan'208";a="73077995" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2026 05:37:35 -0800 X-CSE-ConnectionGUID: 1fvmnNMNQK2H5bab/RyO7A== X-CSE-MsgGUID: zsf98SHFT7mlBw8HdQEPGw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,250,1763452800"; d="scan'208";a="211768110" Received: from black.igk.intel.com ([10.91.253.5]) by orviesa004.jf.intel.com with ESMTP; 24 Jan 2026 05:37:34 -0800 Received: by black.igk.intel.com (Postfix, from userid 1003) id 18D7C95; Sat, 24 Jan 2026 14:37:32 +0100 (CET) From: Andy Shevchenko To: Andy Shevchenko , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra Subject: [PATCH v2 1/1] mtd: cfi_cmdset_0001: Factor out do_write_buffer_locked() to reduce stack frame Date: Sat, 24 Jan 2026 14:35:56 +0100 Message-ID: <20260124133730.3454241-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compiler is not happy about used stack frame: drivers/mtd/chips/cfi_cmdset_0001.c: In function 'do_write_buffer': drivers/mtd/chips/cfi_cmdset_0001.c:1887:1: error: the frame size of 1296 bytes is larger than 1280 bytes [-Werror=frame-larger-than=] Fix this by factoring out do_write_buffer_locked(). Signed-off-by: Andy Shevchenko --- v2: left ENABLE_VPP() and XIP_INVAL_CACHED_RANGE() where they were originally drivers/mtd/chips/cfi_cmdset_0001.c | 82 +++++++++++++++++------------ 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index c10693ba265b..c495bee04053 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -1720,42 +1720,24 @@ static int cfi_intelext_write_words (struct mtd_info *mtd, loff_t to , size_t le } -static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, - unsigned long adr, const struct kvec **pvec, - unsigned long *pvec_seek, int len) +static int __xipram do_write_buffer_locked(struct map_info *map, struct flchip *chip, + unsigned long cmd_adr, unsigned long adr, + const struct kvec **pvec, + unsigned long *pvec_seek, int len) { struct cfi_private *cfi = map->fldrv_priv; map_word status, write_cmd, datum; - unsigned long cmd_adr; - int ret, wbufsize, word_gap, words; + int ret, word_gap, words; const struct kvec *vec; unsigned long vec_seek; unsigned long initial_adr; int initial_len = len; - wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize; - adr += chip->start; initial_adr = adr; - cmd_adr = adr & ~(wbufsize-1); - - /* Sharp LH28F640BF chips need the first address for the - * Page Buffer Program command. See Table 5 of - * LH28F320BF, LH28F640BF, LH28F128BF Series (Appendix FUM00701) */ - if (is_LH28F640BF(cfi)) - cmd_adr = adr; /* Let's determine this according to the interleave only once */ write_cmd = (cfi->cfiq->P_ID != P_ID_INTEL_PERFORMANCE) ? CMD(0xe8) : CMD(0xe9); - mutex_lock(&chip->mutex); - ret = get_chip(map, chip, cmd_adr, FL_WRITING); - if (ret) { - mutex_unlock(&chip->mutex); - return ret; - } - - XIP_INVAL_CACHED_RANGE(map, initial_adr, initial_len); - ENABLE_VPP(map); xip_disable(map, chip, cmd_adr); /* ยง4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set @@ -1789,7 +1771,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, xip_enable(map, chip, cmd_adr); printk(KERN_ERR "%s: Chip not ready for buffer write. Xstatus = %lx, status = %lx\n", map->name, Xstatus.x[0], status.x[0]); - goto out; + return ret; } /* Figure out the number of words to write */ @@ -1853,7 +1835,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, chip->state = FL_STATUS; xip_enable(map, chip, cmd_adr); printk(KERN_ERR "%s: buffer write error (status timeout)\n", map->name); - goto out; + return ret; } /* check for errors */ @@ -1866,21 +1848,53 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, map_write(map, CMD(0x70), cmd_adr); xip_enable(map, chip, cmd_adr); - if (chipstatus & 0x02) { - ret = -EROFS; - } else if (chipstatus & 0x08) { + if (chipstatus & 0x02) + return -EROFS; + + if (chipstatus & 0x08) { printk(KERN_ERR "%s: buffer write error (bad VPP)\n", map->name); - ret = -EIO; - } else { - printk(KERN_ERR "%s: buffer write error (status 0x%lx)\n", map->name, chipstatus); - ret = -EINVAL; + return -EIO; } - goto out; + printk(KERN_ERR "%s: buffer write error (status 0x%lx)\n", map->name, chipstatus); + return -EINVAL; } xip_enable(map, chip, cmd_adr); - out: DISABLE_VPP(map); + return 0; +} + +static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, + unsigned long adr, const struct kvec **pvec, + unsigned long *pvec_seek, int len) +{ + struct cfi_private *cfi = map->fldrv_priv; + unsigned long cmd_adr; + int ret, wbufsize; + + wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize; + adr += chip->start; + cmd_adr = adr & ~(wbufsize - 1); + + /* Sharp LH28F640BF chips need the first address for the + * Page Buffer Program command. See Table 5 of + * LH28F320BF, LH28F640BF, LH28F128BF Series (Appendix FUM00701) */ + if (is_LH28F640BF(cfi)) + cmd_adr = adr; + + mutex_lock(&chip->mutex); + ret = get_chip(map, chip, cmd_adr, FL_WRITING); + if (ret) { + mutex_unlock(&chip->mutex); + return ret; + } + + XIP_INVAL_CACHED_RANGE(map, adr, len); + ENABLE_VPP(map); + + ret = do_write_buffer_locked(map, chip, cmd_adr, adr, pvec, pvec_seek, len); + + DISABLE_VPP(map); put_chip(map, chip, cmd_adr); mutex_unlock(&chip->mutex); return ret; -- 2.50.1