Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4678771pxj; Wed, 12 May 2021 10:42:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg8mwZne7rZRXCse/mQV4LhhvrZRNeL5H73mjy4TY2Bq4RGaP9fxfHHv+IcTF+/4Jj/swx X-Received: by 2002:a05:6402:3104:: with SMTP id dc4mr43792124edb.144.1620841329981; Wed, 12 May 2021 10:42:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620841329; cv=none; d=google.com; s=arc-20160816; b=vhkXqmta9qhdKZw0zcaJ25sxvHKaEr9y8LLYhlItJTqK58DvsuKTBZpKuS1AopkZzJ f1mj2Wlw2E4NSsVdUikIeMnLlJ8qIzmgrREY92uuxjK8Ih84rCA7aq+wbksGJytgdpiP JCTCbFfOj8Sht0/UrYMIvnKadaieeIZ93NQ/0OLj2588kzgnfLXMJDbBjfE3b3p6hqjs oFqvj3LqdVT/cuEaWE39Oy4x5WGA7z3HPD/hE4p8jVuxkbkBC78UnPhWlk1h4NBmOOvq 0aebkt+jzQ4q+TSIPGlUQOs61uWpgmKhgbpFYn0gymYMccMcaLGTEqFEaRjrvcupzD/R x0Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=j7s+F0JqzKRzNUQzwVczbxdUlxEgudhRb7CFBNz7gSU=; b=OwbkEVXGf5N5TSIsuYYkyhz6wjFW68mLkzXRN1wR0hGudgrAnJLKB8/Ms4m8zEvhKL ALM1ckNEsV1nJbq/7VxXHyWdRugjlsMlRhgyVeUBqONRH8/ADJ0fvZOkeD0O5vAzoD3/ 568y9T/Fu/b20ZOyIuCpmPB+Kvn+GtPvcBd3Z3xbfNZV7jQmo16+hyGB+wOj0qPW4R1w P12FP25dLXbhgJq5I4zv4aWSGbUfaS8W5G/W1BSa8qjVXfsRhbfhcVNiNrsOWyrV2r8d bNWkqrI/6ytKYT0H81zZdwNZIGNhhlLF1ip8C6Bde+mhbY81CS3dvu320EfPikEOsZDi 97fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ly+3FeCg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u28si247445eda.342.2021.05.12.10.41.45; Wed, 12 May 2021 10:42:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ly+3FeCg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347916AbhELRaL (ORCPT + 99 others); Wed, 12 May 2021 13:30:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:48160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237236AbhELQDx (ORCPT ); Wed, 12 May 2021 12:03:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 461C361CE5; Wed, 12 May 2021 15:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620833636; bh=zI7Y3eoRvSmUAbw0F9EQYAe4yxfzLU+kte5ZhBkqarg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ly+3FeCgttE4wmIZdIOJrmKWHcOifaynmW93Jj8IB8iwAqKRCQ8zIxIeM0CY5gp3a 4tz+DDC/HNoBHpeWLkhni3PIwWhA4re9pBDlxMusEBBvyvdJ28Ss37KTlSKFktFgl3 aX+DkiZ+Ljhk0iyXQidihQA4xvRppxy3wsOvG2Mc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, gexueyuan , Krzysztof Kozlowski , Sasha Levin Subject: [PATCH 5.11 230/601] memory: pl353: fix mask of ECC page_size config register Date: Wed, 12 May 2021 16:45:07 +0200 Message-Id: <20210512144835.403500500@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: gexueyuan [ Upstream commit 25dcca7fedcd4e31cb368ad846bfd738c0c6307c ] The mask for page size of ECC Configuration Register should be 0x3, according to the datasheet of PL353 smc. Fixes: fee10bd22678 ("memory: pl353: Add driver for arm pl353 static memory controller") Signed-off-by: gexueyuan Link: https://lore.kernel.org/r/20210331031056.5326-1-gexueyuan@gmail.com Signed-off-by: Krzysztof Kozlowski Signed-off-by: Sasha Levin --- drivers/memory/pl353-smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/memory/pl353-smc.c b/drivers/memory/pl353-smc.c index 73bd3023202f..b42804b1801e 100644 --- a/drivers/memory/pl353-smc.c +++ b/drivers/memory/pl353-smc.c @@ -63,7 +63,7 @@ /* ECC memory config register specific constants */ #define PL353_SMC_ECC_MEMCFG_MODE_MASK 0xC #define PL353_SMC_ECC_MEMCFG_MODE_SHIFT 2 -#define PL353_SMC_ECC_MEMCFG_PGSIZE_MASK 0xC +#define PL353_SMC_ECC_MEMCFG_PGSIZE_MASK 0x3 #define PL353_SMC_DC_UPT_NAND_REGS ((4 << 23) | /* CS: NAND chip */ \ (2 << 21)) /* UpdateRegs operation */ -- 2.30.2