Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1713917pxb; Wed, 9 Feb 2022 02:56:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJz7/C51uFsFtKcGIiKUgzDsSGHtIPWUBq/E3ARlajW/xaAB8oTQeLlc7DbGOSlNv+CsaBHL X-Received: by 2002:a17:907:628f:: with SMTP id nd15mr1383322ejc.585.1644404170009; Wed, 09 Feb 2022 02:56:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644404170; cv=none; d=google.com; s=arc-20160816; b=aEC207JJLyX6pbK4Ug6uQ4VTitg7Emd2q1gLMJR5zAFmR7B0Eb6f6atk/q4ZznlDWk E+3iWoMomMFk0rfu6O4C5nYn6BuWtPCiaE3AvapGvb/qoFvvi3wRy4u+ddXSZNHnFTZk Ti845rB2STQTL+Ftbg1uxBQilPPMOJv7YFZrhq0pHKrXFiZevwJRmr8Q7d6zHo2Yl0ZX C74Dj6c2neAldG2t/aQnNWZgXRt+Q43EAs/RH3qA7gK3qW5fI2DgFAGdRxSJq2iDvTUz tDnQz4Dd0H7FVGoVBaLSq0tmKKxyV7O7cifyIB20rxPm7v9uLVbgn451Qb7e0QYARglF JWDw== 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=WyedRs2BHiQYWePmwJhnc1Y4QSpPzarPnYkF5ef9E9Q=; b=mA+/n6JeL2KrMXHGnxyKjUOto/QtRAYnYMd3y9RDX70mxXqTa2m/2y8t4qsPN9PEZL a3d3SUahGOV5MXBihjCPXfwqg2/bEGHHmGohyHd/WcwtYNbte9vlYxrJO8hJGrUxst6k jDLZucdEcS/b3MmqAMXEB2k0pyN6EAMvxEX8E/lPQUIuAxmxMZqV63vrNk8dQ6TXza/T 5voUXUpDpNdCyeNigFtCLKeWbYJdVJyZxdtdXn6akAPgq7kGn2Y4ou3OKFkYW55pD9Np YF/mGRBgsuuSAbLXH+zrZUSe+jACJAvY76Y5gGg/R94WGjTYa1bzCYGJ/+GkyvSB/cJW mHrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vPOdEtkV; 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 c6si3736543edr.654.2022.02.09.02.55.43; Wed, 09 Feb 2022 02:56:09 -0800 (PST) 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=vPOdEtkV; 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 S1386032AbiBGLdV (ORCPT + 99 others); Mon, 7 Feb 2022 06:33:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383249AbiBGLVz (ORCPT ); Mon, 7 Feb 2022 06:21:55 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5CDCC043188; Mon, 7 Feb 2022 03:21:54 -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 5B2016077B; Mon, 7 Feb 2022 11:21:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F7C1C004E1; Mon, 7 Feb 2022 11:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1644232913; bh=eMk+zsYs9KJIsnbpsZQenhxkAml+RHON7vSyYSThfvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vPOdEtkVfZMShKt/UGz6xOlv97e+y9BtmsHZWGTDZ1+rcg2dswpi5/xxTo6N5uPSJ UNs7cP4RY4g9tfTmHs/xyjIdnTGUVXnOt0pyaeym0JtsChkG/noFKetPQYS7Xyhpdo d3W7H6MyoO6nEKYti5uOgKBurc35ea4ni/qgUGDE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kamal Dasu , Florian Fainelli , Mark Brown Subject: [PATCH 5.10 32/74] spi: bcm-qspi: check for valid cs before applying chip select Date: Mon, 7 Feb 2022 12:06:30 +0100 Message-Id: <20220207103758.293372537@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220207103757.232676988@linuxfoundation.org> References: <20220207103757.232676988@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kamal Dasu commit 2cbd27267ffe020af1442b95ec57f59a157ba85c upstream. Apply only valid chip select value. This change fixes case where chip select is set to initial value of '-1' during probe and PM supend and subsequent resume can try to use the value with undefined behaviour. Also in case where gpio based chip select, the check in bcm_qspi_chip_select() shall prevent undefined behaviour on resume. Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver") Signed-off-by: Kamal Dasu Acked-by: Florian Fainelli Link: https://lore.kernel.org/r/20220127185359.27322-1-kdasu.kdev@gmail.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-bcm-qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c @@ -551,7 +551,7 @@ static void bcm_qspi_chip_select(struct u32 rd = 0; u32 wr = 0; - if (qspi->base[CHIP_SELECT]) { + if (cs >= 0 && qspi->base[CHIP_SELECT]) { rd = bcm_qspi_read(qspi, CHIP_SELECT, 0); wr = (rd & ~0xff) | (1 << cs); if (rd == wr)