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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 416D6C35242 for ; Fri, 24 Jan 2020 09:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F5802075D for ; Fri, 24 Jan 2020 09:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859963; bh=q+QDt2ioB/kryBOY8rTvsyJRBMF0gzcOxUhOjxDecDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=04fCTI0yWqvgAhLIR4r5JAxwcABUHjxJkST2bOkxEbZmetOgeCj7rpZ9hGHGuUi6E DJX25KNwgFVhwrt8Uhbco82N2PQ2oKF5LcxOvYNEuD/EBfOwcXEP5KipKcgyqwpy/C 6Ql4CGWryhdp14/yoaEoJMLuQfJWLwL6ZlRbR2bk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388657AbgAXJ7W (ORCPT ); Fri, 24 Jan 2020 04:59:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:34828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbgAXJ7V (ORCPT ); Fri, 24 Jan 2020 04:59:21 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D6112075D; Fri, 24 Jan 2020 09:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859960; bh=q+QDt2ioB/kryBOY8rTvsyJRBMF0gzcOxUhOjxDecDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GZEM7tKYl2GA1aTN5JJjCQqchOmz1xarQtfSOEo3UH2n3g4i0nuyjWI9ssKZfEHP/ iNrnxGMBPmMGEkRcEcdkbmAMgobbIL9BAhsIS+HR7uC8FMX3FEU6DiUp4XwU3hq9vf oxBOp7gD9rErlKG00pfYPJFIAzjFkUoZxQV5mKAU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , Markus Mayer , Viresh Kumar , Sasha Levin Subject: [PATCH 4.14 228/343] cpufreq: brcmstb-avs-cpufreq: Fix initial command check Date: Fri, 24 Jan 2020 10:30:46 +0100 Message-Id: <20200124092950.139347375@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Fainelli [ Upstream commit 22a26cc6a51ef73dcfeb64c50513903f6b2d53d8 ] There is a logical error in brcm_avs_is_firmware_loaded() whereby if the firmware returns -EINVAL, we will be reporting this as an error. The comment is correct, the code was not. Fixes: de322e085995 ("cpufreq: brcmstb-avs-cpufreq: AVS CPUfreq driver for Broadcom STB SoCs") Signed-off-by: Florian Fainelli Acked-by: Markus Mayer Signed-off-by: Viresh Kumar Signed-off-by: Sasha Levin --- drivers/cpufreq/brcmstb-avs-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c index 7281a2c19c362..bae3190376582 100644 --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c @@ -762,8 +762,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv) rc = brcm_avs_get_pmap(priv, NULL); magic = readl(priv->base + AVS_MBOX_MAGIC); - return (magic == AVS_FIRMWARE_MAGIC) && (rc != -ENOTSUPP) && - (rc != -EINVAL); + return (magic == AVS_FIRMWARE_MAGIC) && ((rc != -ENOTSUPP) || + (rc != -EINVAL)); } static unsigned int brcm_avs_cpufreq_get(unsigned int cpu) -- 2.20.1