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 EEDBFC433FE for ; Sun, 6 Nov 2022 17:12:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231269AbiKFRMw (ORCPT ); Sun, 6 Nov 2022 12:12:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230341AbiKFRLh (ORCPT ); Sun, 6 Nov 2022 12:11:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E4EC1401D; Sun, 6 Nov 2022 09:07:25 -0800 (PST) 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 926F760CF8; Sun, 6 Nov 2022 17:07:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9149C433B5; Sun, 6 Nov 2022 17:07:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667754436; bh=17nVzYZDlxOShlzcokmJyNZashaE+MB7kmghc896PYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IqQsuXTLkA4pHHdBZIiXvtRh4FXqyYePFhAcXpY1A71Du1THDOpl83/lX2wgvUKc0 hjVh+CJrfnIoDKIRd+D0ttmBQlDTCHeh9zxsxWmR+YcdfsKTsgkd5dRuR0CnJ0ALar X6dx4DztzPigMnKrQ0z1tn+Ge/2KLM9RCLN9qBrKhwagBNIAthJ+gHj9dQqLDbAGmL lI392D8mZIpV1aWRW1U1pVrpBUkfbGA3aShy9B7qG6+fGUCwg/DrEX/36VqXnDiepg zVaBY/4Pi7UPAR0NiJuM3dU5nMjXP0hlAkARGoDKEcbmT16uJaQ8hZGOLGmsKYGoy2 aqfcwgyY4CQqQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mauro Lima , Mika Westerberg , Mark Brown , Sasha Levin , tudor.ambarus@microchip.com, pratyush@kernel.org, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, linux-mtd@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 4/7] spi: intel: Fix the offset to get the 64K erase opcode Date: Sun, 6 Nov 2022 12:07:01 -0500 Message-Id: <20221106170705.1580963-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221106170705.1580963-1-sashal@kernel.org> References: <20221106170705.1580963-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mauro Lima [ Upstream commit 6a43cd02ddbc597dc9a1f82c1e433f871a2f6f06 ] According to documentation, the 64K erase opcode is located in VSCC range [16:23] instead of [8:15]. Use the proper value to shift the mask over the correct range. Signed-off-by: Mauro Lima Reviewed-by: Mika Westerberg Link: https://lore.kernel.org/r/20221012152135.28353-1-mauro.lima@eclypsium.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/mtd/spi-nor/intel-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c index d60cbf23d9aa..642a6f9071f2 100644 --- a/drivers/mtd/spi-nor/intel-spi.c +++ b/drivers/mtd/spi-nor/intel-spi.c @@ -116,7 +116,7 @@ #define ERASE_OPCODE_SHIFT 8 #define ERASE_OPCODE_MASK (0xff << ERASE_OPCODE_SHIFT) #define ERASE_64K_OPCODE_SHIFT 16 -#define ERASE_64K_OPCODE_MASK (0xff << ERASE_OPCODE_SHIFT) +#define ERASE_64K_OPCODE_MASK (0xff << ERASE_64K_OPCODE_SHIFT) #define INTEL_SPI_TIMEOUT 5000 /* ms */ #define INTEL_SPI_FIFO_SZ 64 -- 2.35.1