From patchwork Wed Sep 13 21:27:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 140173 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp856136vqi; Fri, 15 Sep 2023 00:02:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnLEpDhD09m0pqd/3NmcNaUrB42CNP7pRc6ueAPgitg72tC03sobnvTaEjffVH9N4q8Pxj X-Received: by 2002:a05:6a20:8f02:b0:15a:2d98:bc81 with SMTP id b2-20020a056a208f0200b0015a2d98bc81mr1203506pzk.53.1694761352176; Fri, 15 Sep 2023 00:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694761352; cv=none; d=google.com; s=arc-20160816; b=0zAtZpdaXVfcmt5YXN/reCljnqZR2NPKlfd4cc1cUpqy8uN7Xzh599ntquzmn7fXGa qsoupxA7SxLbaHg+FqhMo5xWdDgHRsnaGSogHhV5c+YL+Uov2eNMqAeF43NP4UWWpNUF dNadyXcwKwSdkPpSJNu8RC9CieLK00oGnCAbA+QribIxbvajQC5SBIGcRln6tCowjnpi U7VRjNhAqPtW8nj7fw/ABwFSCRy5+9XSdo7Z4KUqhqihTC0vGTFzct5f05PJnRBZ0lpb WLle5mQPRa/Xtp3zdntml8gVWio1MZFvRQknHtQKtKFqvvafUOgLUReS5r21u+AFcWcf 6yHw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0FSXe6bNCBpdZi03aeP0wSp6h1r1vEv3fBGeHHeswAM=; fh=5P2u8pACeXHzMbKFYECFOSm9AHpASBd8snUOaO+lMmE=; b=ZY5fLuSaxMvtGPpcu/7H8n7zTPSI56+T84aHFSBe+P1kFdBV67Rv6eXB+jr22TR+4Z ySs7YAVAJnDbhnnJ41MqknQdzqThBqnEUZwesu7jss0H7alpWbcMwo54cLlJvMJjyVcn sRnaA290kY7p8aQXmHiiG3YfutNDjC1sY4qtaUoIqQ0F7lOUoq/7Qg9VHhdakiOOJdDX KXaTHK/pz4y9uySXr4cJ7cac5o/Jcq1g9+rkrpoa327eRSbnmnNjugy8hTIrHdZ7gxdX tX3L4v4OHIzrntwpLo2Z+lueuAzqmj66+JbWjGAXNF6HUiYylXbRgKAsRTyS7+Dewjwa /OCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="MN7B+0/a"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id ay5-20020a056a00300500b0068e3a3cdfecsi2804166pfb.224.2023.09.15.00.02.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 00:02:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="MN7B+0/a"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id A5A8E82372EB; Wed, 13 Sep 2023 14:27:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232659AbjIMV1j (ORCPT + 34 others); Wed, 13 Sep 2023 17:27:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232173AbjIMV1e (ORCPT ); Wed, 13 Sep 2023 17:27:34 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E2CC1739 for ; Wed, 13 Sep 2023 14:27:30 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-68bed2c786eso247238b3a.0 for ; Wed, 13 Sep 2023 14:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694640450; x=1695245250; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0FSXe6bNCBpdZi03aeP0wSp6h1r1vEv3fBGeHHeswAM=; b=MN7B+0/aeKk1to07jMjepdo89gf4ksqoYzQfjr4H7Me4WC90DbPbmC2TTGyRU6cM26 PD+d+hcvJIElgIQV6yLgyJ7fxI2UV8/34U/VXU9CrPDjOPIHd2VhBGmIeI10AzOFcsKu VK7N/AWKRUQzFSI9TgoSpxLXIpkUfXW2wfBY8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694640450; x=1695245250; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0FSXe6bNCBpdZi03aeP0wSp6h1r1vEv3fBGeHHeswAM=; b=VdmhIqytpAaI9m34inT8//XF5oAn2EmLEovMw32G0MQcGLYuRpRKNb1WVXq2sHV/lD iP54b8QZk5FqFUFMIzJ+5kHNsyrkA9j8eXPvCc5/+l07gdt+HCcursD6YqX7Wjit5DW0 JLpXobQJMGhOObEDdTdvyjK7P44i3YF3JTroNHUWvNQqRxPrAmXIlohmqwey8qnAJfux A60HoXlhU98NZD9ganrL6a4S7e1HI1XvT0CgSawnTwZTsVSCM0ZUCLPl7M095G928hnZ Ldern5gPtqvfCp7ukXOr34JVYpplZGpVNJw8sAkln4Un2cfU49P9/Wczm713PdGCEI6r cYTQ== X-Gm-Message-State: AOJu0Yx+gNqb2eok5o4XvCdO8kG9lTKX3JHeP2HevSEdv9wERi4KMjHY do4/aGSB7fKXVP3rXuRGaJlx+Q== X-Received: by 2002:a05:6a20:3d14:b0:152:8774:e1ab with SMTP id y20-20020a056a203d1400b001528774e1abmr4265873pzi.52.1694640449755; Wed, 13 Sep 2023 14:27:29 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:11a:201:ae97:c6dc:1d98:494f]) by smtp.gmail.com with ESMTPSA id a10-20020a17090ad80a00b0025bdc3454c6sm1923976pjv.8.2023.09.13.14.27.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 14:27:29 -0700 (PDT) From: Stephen Boyd To: Mika Westerberg , Hans de Goede , Mark Gross Cc: linux-kernel@vger.kernel.org, patches@lists.linux.dev, platform-driver-x86@vger.kernel.org, Andy Shevchenko , Kuppuswamy Sathyanarayanan , Prashant Malani Subject: [PATCH v4 3/4] platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command() Date: Wed, 13 Sep 2023 14:27:21 -0700 Message-ID: <20230913212723.3055315-4-swboyd@chromium.org> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog In-Reply-To: <20230913212723.3055315-1-swboyd@chromium.org> References: <20230913212723.3055315-1-swboyd@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 14:27:54 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777086079338829824 X-GMAIL-MSGID: 1777086079338829824 Andy discovered this bug during patch review. The 'scu' argument to this function shouldn't be overridden by the function itself. It doesn't make any sense. Looking at the commit history, we see that commit f57fa18583f5 ("platform/x86: intel_scu_ipc: Introduce new SCU IPC API") removed the setting of the scu to ipcdev in other functions, but not this one. That was an oversight. Remove this line so that we stop overriding the scu instance that is used by this function. Reported-by: Andy Shevchenko Closes: https://lore.kernel.org/r/ZPjdZ3xNmBEBvNiS@smile.fi.intel.com Cc: Prashant Malani Reviewed-by: Andy Shevchenko Reviewed-by: Mika Westerberg Fixes: f57fa18583f5 ("platform/x86: intel_scu_ipc: Introduce new SCU IPC API") Signed-off-by: Stephen Boyd Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/intel_scu_ipc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 299c15312acb..3271f81a9c00 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c @@ -443,7 +443,6 @@ int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd, mutex_unlock(&ipclock); return -ENODEV; } - scu = ipcdev; cmdval = sub << 12 | cmd; ipc_command(scu, cmdval); err = intel_scu_ipc_check_status(scu);