From patchwork Wed Sep 13 21:27:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 139102 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp96180vqb; Wed, 13 Sep 2023 14:27:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfqunM/KiM/e9nwJmGGsGh3m+Ow9I+OhRV6sSnSq7rRFtTyaa7lIGXfi8x0c0iSq7gt49G X-Received: by 2002:a17:902:c943:b0:1bf:7dfd:5b05 with SMTP id i3-20020a170902c94300b001bf7dfd5b05mr8979077pla.27.1694640466760; Wed, 13 Sep 2023 14:27:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694640466; cv=none; d=google.com; s=arc-20160816; b=DSGcEY/ScnYwpWkVTT1/suZhEYGGuMbltG4wdEwAlJLXra/q+RDWQcJ+Z+NqyhUW0J QN03l/SzXmd2DdWLjxSGI6SuNUG2aZoHi4v+D1J9lD7766AJSShPGCC1PXQS0UPWgs0K 8dm1GG5biZbLqewhHcqIZgvPWeMyxVkx1nnIKCM/kFxjU6x05WMm71RBhSHDjuHkcCfK 0+MRmkJ7l1cArsjgU9QT8ONbzFRlBPHS7bztU3yMSXjtxB1NaOfPHxqYhgx+g3UkR+I/ cqMYgQYzbN0cwjAdq7UngBdSAQQJFe1vT7tRowJIBDLrnyMXYpfX1h067zyaOQt3lg2l /MwA== 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=oOiFJlPGyJUavNNVJMIMcGzvlYAGe09SF66xWdVaxyU=; fh=5P2u8pACeXHzMbKFYECFOSm9AHpASBd8snUOaO+lMmE=; b=txiSp0UdGlHhr+ItsjD9eeKUAMYlzgmwsNW0dcO5DBXvEtCsfctEEUVnQ5ZlOjFPOQ /ORoT5m5c9XLqRPKRC8XWGftzmam0ObaitN7NbjPBrdz0H2bPhX6UYp6LIYAmI+9+eRm fhFtvYzbBXGo8UFPCmSaQN0Tk+HCONRnAy/n9O9QTj6b364+56/yfNL1/bfITZiGeWJL 9Yl0L9nH4HxjF10LgfaiIvLXx7RZjZIIU4jkwuTB37zfkojHKKOIuLlYvoXIjTFV21bZ 0CCKzk1r0HOR8YayMY2eg8fsiGbcxyCikj5Gghbyj48SixL51EUOZODoWPt+P3H7gn7C 5hmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aP1CrSMP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id n18-20020a170902e55200b001b8ba81d04dsi180692plf.395.2023.09.13.14.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 14:27:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aP1CrSMP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 29FC782B1E7C; Wed, 13 Sep 2023 14:27:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232297AbjIMV1e (ORCPT + 34 others); Wed, 13 Sep 2023 17:27:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbjIMV1b (ORCPT ); Wed, 13 Sep 2023 17:27:31 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0B661724 for ; Wed, 13 Sep 2023 14:27:27 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-577dad08512so695452a12.1 for ; Wed, 13 Sep 2023 14:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694640447; x=1695245247; 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=oOiFJlPGyJUavNNVJMIMcGzvlYAGe09SF66xWdVaxyU=; b=aP1CrSMPFY/9BpGHOgfmmkbW0TKI9OKa0TkBfI4Q6dG7IY75LrR1u7SseAg0gt5zaY YZhHEEZRwh0ykb9Bcx+/aHeT2UNCT64SnjpbzVzNVD2hopL543cXm4yOjppFRsEKGok5 Z/10+RP7OdA67IIdWydENjNRC6wJ8ap9/JL5s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694640447; x=1695245247; 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=oOiFJlPGyJUavNNVJMIMcGzvlYAGe09SF66xWdVaxyU=; b=KiOTj4jqq6Iupsf2O53IYhab68xDWNUVaWebBtRAOW54rIryAoJfYiBPGDV0dA8aZ0 1V0HshVrr5yxEjZnSiO8iAqgJwvyKxIaDb2tJaaupNyeAyzQsYDQJY2JMUzTXagAiQ/8 D2zTL2XWNMpenlOlnvWIMIoKKZIenqcCXGy+sZlwDy1tnzRJbwfhdpYgxVnFC2Mfb1DW mA+zUwtenBTEIDG1LnL1zR9cWw5FUiUK7jkl+stlkDh+KpLWg/UGJ7d0Jn+zpMHqI3Ka fySNsws1fCmKDuz54tnF/YN3QiN9iY/rsoDcbuo5/1KB8TqJ0waR+oqUbqZDd951KnQC KTtw== X-Gm-Message-State: AOJu0YyQKAF61QNAN2lY/NtFIegbUjbtOnivrZa26SiuYSDtswOR9e9V xXJdR7Qi5Ba8+VBxd+somsyTpg== X-Received: by 2002:a17:90b:30c2:b0:26f:392f:f901 with SMTP id hi2-20020a17090b30c200b0026f392ff901mr5552309pjb.14.1694640447120; Wed, 13 Sep 2023 14:27:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 14:27:26 -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 1/4] platform/x86: intel_scu_ipc: Check status after timeout in busy_loop() Date: Wed, 13 Sep 2023 14:27:19 -0700 Message-ID: <20230913212723.3055315-2-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 (morse.vger.email [0.0.0.0]); Wed, 13 Sep 2023 14:27:42 -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 morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776959322075000990 X-GMAIL-MSGID: 1776959322075000990 It's possible for the polling loop in busy_loop() to get scheduled away for a long time. status = ipc_read_status(scu); // status = IPC_STATUS_BUSY if (!(status & IPC_STATUS_BUSY)) If this happens, then the status bit could change while the task is scheduled away and this function would never read the status again after timing out. Instead, the function will return -ETIMEDOUT when it's possible that scheduling didn't work out and the status bit was cleared. Bit polling code should always check the bit being polled one more time after the timeout in case this happens. Fix this by reading the status once more after the while loop breaks. The readl_poll_timeout() macro implements all of this, and it is shorter, so use that macro here to consolidate code and fix this. There were some concerns with using readl_poll_timeout() because it uses timekeeping, and timekeeping isn't running early on or during the late stages of system suspend or early stages of system resume, but an audit of the code concluded that this code isn't called during those times so it is safe to use the macro. Cc: Prashant Malani Reviewed-by: Andy Shevchenko Reviewed-by: Mika Westerberg Reviewed-by: Kuppuswamy Sathyanarayanan Fixes: e7b7ab3847c9 ("platform/x86: intel_scu_ipc: Sleeping is fine when polling") Signed-off-by: Stephen Boyd Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/intel_scu_ipc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 6851d10d6582..4c774ee8bb1b 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -231,19 +232,15 @@ static inline u32 ipc_data_readl(struct intel_scu_ipc_dev *scu, u32 offset) /* Wait till scu status is busy */ static inline int busy_loop(struct intel_scu_ipc_dev *scu) { - unsigned long end = jiffies + IPC_TIMEOUT; + u8 status; + int err; - do { - u32 status; + err = readx_poll_timeout(ipc_read_status, scu, status, !(status & IPC_STATUS_BUSY), + 100, jiffies_to_usecs(IPC_TIMEOUT)); + if (err) + return err; - status = ipc_read_status(scu); - if (!(status & IPC_STATUS_BUSY)) - return (status & IPC_STATUS_ERR) ? -EIO : 0; - - usleep_range(50, 100); - } while (time_before(jiffies, end)); - - return -ETIMEDOUT; + return (status & IPC_STATUS_ERR) ? -EIO : 0; } /* Wait till ipc ioc interrupt is received or timeout in 10 HZ */ From patchwork Wed Sep 13 21:27:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 139158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp150580vqb; Wed, 13 Sep 2023 16:29:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgSitU4Mn6iZ0Z2cnT5tomnuB+FKzm1nSvq7hsL4jxUH9AuH8J4Z4dFP6VXSpQimgfOigw X-Received: by 2002:a17:90a:eb0b:b0:273:e64c:f22e with SMTP id j11-20020a17090aeb0b00b00273e64cf22emr3344057pjz.29.1694647771531; Wed, 13 Sep 2023 16:29:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694647771; cv=none; d=google.com; s=arc-20160816; b=J3fWn+Bw2RB2ZYbFE8tzCdGb3iMCG2MNa0d4/iejCfyAXEYwImwp1BWvVqqbnH+qI5 t5t0HzWd3igqJ+ENdqV2Q3+igtkURKVItMVlIgixBbhjVJiDxjRMN4OTDf4aUOAx1MjY mSsJBsB08TYEQ2cX/CbWbaSlNNwqL+qyjraupwP/XEI1GjRkNJMkxRqWEH62aSv+7VJT LYvhFuIlvO3Bw/AITVRXIwy3NnTs2Xz29Sbq/sQKpU3vLsWCB5de+AI+vbZCOR6oAKQ3 dHK4o32kkc2WGiZOodsePP7FA3HG11YU017Zt6eRJmdBt7A7iZkaMiqD7bd8jRrYlYQf JMrA== 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=/kiTus1GQ2wpWYv2hiScbkUesx/S4YRwA/TTSZ+SSL4=; fh=5P2u8pACeXHzMbKFYECFOSm9AHpASBd8snUOaO+lMmE=; b=e8HJ90qC1A/o5cTUUkZxJL5npFscby0Z3Z9WCzqQxHB2v0yQoR2Gec70usw5BPtw83 pQfje7somRQBpklsw+RYQ5dCAuwWaSX7Nw/WYfUvu/g7MZs3OJaLJWIp0brnyb71kgja 52g3QjPpDe0k9LJWBrtVlVwhMuBgYbzEsmuo3gXvHRQuFpjMf7cRWQmcWqRgPZYoRgDK 0BjlWJAFEYG6xI/KxVKkkZmzP+zcvft52IfnNCF9yZ1uIkJTvdYs7JNhmjYgYwdm+/Sd oKN0MtlWozfrndjFrnTukXeXrrEfV9FqtD1OpcsKfoHwQCyqC5TK1XBN7ekq6NT6s4Hw 0e0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=irWRL3Dh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id l10-20020a17090aec0a00b00267ba1c43adsi333559pjy.101.2023.09.13.16.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 16:29:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=irWRL3Dh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id E08D481EE2CF; Wed, 13 Sep 2023 14:27:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232512AbjIMV1g (ORCPT + 34 others); Wed, 13 Sep 2023 17:27:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229743AbjIMV1c (ORCPT ); Wed, 13 Sep 2023 17:27:32 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5D041724 for ; Wed, 13 Sep 2023 14:27:28 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-68fb46f38f9so241927b3a.1 for ; Wed, 13 Sep 2023 14:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694640448; x=1695245248; 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=/kiTus1GQ2wpWYv2hiScbkUesx/S4YRwA/TTSZ+SSL4=; b=irWRL3Dhte1i12EFMTqrguyLoUPSaGHc1URlmZ4ILg/6UhpBKDkn1uiORA47RurTRr HbBMckPJCQ5HWE/fi2DItGu3CzIZSEn3F8xSRYyCi8EQiOTULT3US9aI+JgA/0EibUsS irsjZ7ugWpzAT8M00n9Egc6hiYVBG6ygIQe1k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694640448; x=1695245248; 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=/kiTus1GQ2wpWYv2hiScbkUesx/S4YRwA/TTSZ+SSL4=; b=T0E5D/dtZ2hsvgH6kX/qyRB17Z0DjVz6evDpwh4o5S4VxCFevgyRJYCCMRdIOrDfNU Jqg+I0AabV6oPtsB5yiZfsogBBYZQitiPI43pwS1Kqpk4CW56QsMWqPr3evuxROp9S6H foafImwsWWg+xlN9Wwe13rOj/JpIWdMIth9hAMS1Afxs5goRzn0Ta44C3tMtbixFWs1x pXOhKhnKDzxlhsuZV25JvjOPDFbZpvLNBcAmjwJNdhQjl74USLDA9MCRfUxEXDPyXpJw INDoEqOWoltQtYpcd/sgoYukou9PT7xu/52t3OZqmkMb1wTY99XMVyDG+BynubLE2atB 7qkA== X-Gm-Message-State: AOJu0Yy7AtTG4OZjSFKJrUsdPVgqgZyy9FBrER0UfcljYimSnpDMfXdZ 1AoeKQio3VC8HaC70s0AAJiLWw== X-Received: by 2002:a05:6a20:561a:b0:147:d861:50e4 with SMTP id ir26-20020a056a20561a00b00147d86150e4mr3072141pzc.33.1694640448396; Wed, 13 Sep 2023 14:27:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 14:27:27 -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 2/4] platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt() Date: Wed, 13 Sep 2023 14:27:20 -0700 Message-ID: <20230913212723.3055315-3-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 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 14:27:59 -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 agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776966981581163188 X-GMAIL-MSGID: 1776966981581163188 It's possible for the completion in ipc_wait_for_interrupt() to timeout, simply because the interrupt was delayed in being processed. A timeout in itself is not an error. This driver should check the status register upon a timeout to ensure that scheduling or interrupt processing delays don't affect the outcome of the IPC return value. CPU0 SCU ---- --- ipc_wait_for_interrupt() wait_for_completion_timeout(&scu->cmd_complete) [TIMEOUT] status[IPC_STATUS_BUSY]=0 Fix this problem by reading the status bit in all cases, regardless of the timeout. If the completion times out, we'll assume the problem was that the IPC_STATUS_BUSY bit was still set, but if the status bit is cleared in the meantime we know that we hit some scheduling delay and we should just check the error bit. Cc: Prashant Malani Reviewed-by: Kuppuswamy Sathyanarayanan Reviewed-by: Andy Shevchenko Reviewed-by: Mika Westerberg Fixes: ed12f295bfd5 ("ipc: Added support for IPC interrupt mode") Signed-off-by: Stephen Boyd --- drivers/platform/x86/intel_scu_ipc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 4c774ee8bb1b..299c15312acb 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c @@ -248,10 +248,12 @@ static inline int ipc_wait_for_interrupt(struct intel_scu_ipc_dev *scu) { int status; - if (!wait_for_completion_timeout(&scu->cmd_complete, IPC_TIMEOUT)) - return -ETIMEDOUT; + wait_for_completion_timeout(&scu->cmd_complete, IPC_TIMEOUT); status = ipc_read_status(scu); + if (status & IPC_STATUS_BUSY) + return -ETIMEDOUT; + if (status & IPC_STATUS_ERR) return -EIO; 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); From patchwork Wed Sep 13 21:27:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 139201 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp39736vqi; Wed, 13 Sep 2023 18:14:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFag+xFGb+k0P5LBlLtFOtA4SgoL2vKhujp4k/N1enkcLF8zCWSTVt7yOCniiOONJzsJEih X-Received: by 2002:a17:902:e84c:b0:1c3:4565:225 with SMTP id t12-20020a170902e84c00b001c345650225mr5302863plg.10.1694654090423; Wed, 13 Sep 2023 18:14:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694654090; cv=none; d=google.com; s=arc-20160816; b=Z2ipYRWj5KiIE4mXvvwK9zzFoFrocpnU/E/srgXaA6oqghPNuBJcqtCQokjNkN3uc1 gJtJKzxL6maK3o0YVoHM/iyxjVrfN1oEfRBlqTDdmqBhq5wFd7S3dH+9CI3Ul344GISb wrpa3WV3Tz5Fr+dJE2M9oky4mA7EZIKdaznnwoSV+77x+mzY0yZb1RVkKeZ5feNNebfs dGfy8yGre2euydfRzHxmBQqE0Sb5aSHw5/7KE1wYYt9jrelrPQWQyk17prmQxSqWeCO8 MOe47a6LG7t6v+wibgZek/7SXRRDOyTpDXItdfzFxW1eaABjhh4KU9LOeyCD2s07IiCA fJ1g== 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=q/wc8HkItTPJiIGmBh6ydt0pRRoKMzvmGRq2mSNptlY=; fh=5P2u8pACeXHzMbKFYECFOSm9AHpASBd8snUOaO+lMmE=; b=AF4j2CWKgyYx/QqG0WO6mlT0ASJSuC8dPwZ4RM3FKXNUhunqwdZQ8HDS3x4GQo4slS 7VWfgTN+jfupNKPFkPtnC+5O5QSs4qcDeofE2YC7M/Ve7Vm/kbae6jGYyR8kIdxHhE8I XCptvoN5ZNFPLKS0JTiAAiQddBOB8iKYnXF2QJK67DKBzZQ4TsFdPhaNBPxKRRP8KFQI SVxqQCuo5djRqYHo3zJRn8ux8AsFIModUf+Nf4qbx1otjoxtZanirCrZ6ogvtHBSpR3z PBXxrvX+K9Xyl9k6qMT8LYJ1x+Fj9jQOJFxQ6sTtTY1aSUtfv/uct6VX3b9zfblu5SJ+ dXcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fF7HMN3K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id lf5-20020a170902fb4500b001b886d36bf6si465963plb.226.2023.09.13.18.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 18:14:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fF7HMN3K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id DE60E80CBDE5; Wed, 13 Sep 2023 14:27:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232679AbjIMV1l (ORCPT + 34 others); Wed, 13 Sep 2023 17:27:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232319AbjIMV1f (ORCPT ); Wed, 13 Sep 2023 17:27:35 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 904A5173A for ; Wed, 13 Sep 2023 14:27:31 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-53fbf2c42bfso183617a12.3 for ; Wed, 13 Sep 2023 14:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694640451; x=1695245251; 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=q/wc8HkItTPJiIGmBh6ydt0pRRoKMzvmGRq2mSNptlY=; b=fF7HMN3KdU2SukU5x66c5UGp8hAb6HIIdQyYqzgs7JSV4wzNW/+ih11xKYI+iC9RLv hmHT/1UIJbkD79TkZSeuIQp9aDCAMI7dUQnik+JPyuw71pXKx0+94pR/FhaISepou0Kk 8BxJo3bTchjg4DLgxixeA9lXn0qOZYXI20R6s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694640451; x=1695245251; 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=q/wc8HkItTPJiIGmBh6ydt0pRRoKMzvmGRq2mSNptlY=; b=dsp8Io/6K8TOvFNIPjluFmimuYQyR/eA8nviqw0htw1Zg78QpKAc2Wgt+vllfhyB3u kQTKCC1ep55CvHxXpodzahn/52B/EGSwaaE+EwQ9C/DJl4yr6uKQyWz3pAW+/nX6CJri sYSk42Z+SGpWb5BxQh6hBpIFvuCPE7LwEMTaxBm3hm0g40xnX/pSH9St1gelXQpTj6Dy OAOiWhLBrFolJDwEMkg33t/i/5sxOSO60rjhVH+gf1OcW8W3Qk0/bLvXPBwIhdxemJS+ 5jhGggWzmX3YTwq3GJp4RhZS5Jk/NiFMRsjrHm5DjSgK/Qqds9Mw4JKrqyUDNLxsRRJJ YHdw== X-Gm-Message-State: AOJu0Yy+wp3x94zQGOznaJR45iR3LLR9fKzwDXBG75IfgqWzkB3ueXR+ rCoQgOzhqb1wpwue6Fio5dJtzA== X-Received: by 2002:a17:90b:4a88:b0:262:f449:4497 with SMTP id lp8-20020a17090b4a8800b00262f4494497mr3595415pjb.2.1694640451077; Wed, 13 Sep 2023 14:27:31 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 14:27:30 -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 4/4] platform/x86: intel_scu_ipc: Fail IPC send if still busy Date: Wed, 13 Sep 2023 14:27:22 -0700 Message-ID: <20230913212723.3055315-5-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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 14:27:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776973607727338836 X-GMAIL-MSGID: 1776973607727338836 It's possible for interrupts to get significantly delayed to the point that callers of intel_scu_ipc_dev_command() and friends can call the function once, hit a timeout, and call it again while the interrupt still hasn't been processed. This driver will get seriously confused if the interrupt is finally processed after the second IPC has been sent with ipc_command(). It won't know which IPC has been completed. This could be quite disastrous if calling code assumes something has happened upon return from intel_scu_ipc_dev_simple_command() when it actually hasn't. Let's avoid this scenario by simply returning -EBUSY in this case. Hopefully higher layers will know to back off or fail gracefully when this happens. It's all highly unlikely anyway, but it's better to be correct here as we have no way to know which IPC the status register is telling us about if we send a second IPC while the previous IPC is still processing. Cc: Prashant Malani Cc: Kuppuswamy Sathyanarayanan Reviewed-by: Andy Shevchenko Reviewed-by: Mika Westerberg Fixes: ed12f295bfd5 ("ipc: Added support for IPC interrupt mode") Signed-off-by: Stephen Boyd Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/intel_scu_ipc.c | 40 +++++++++++++++++++--------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 3271f81a9c00..a68df4133403 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c @@ -265,6 +265,24 @@ static int intel_scu_ipc_check_status(struct intel_scu_ipc_dev *scu) return scu->irq > 0 ? ipc_wait_for_interrupt(scu) : busy_loop(scu); } +static struct intel_scu_ipc_dev *intel_scu_ipc_get(struct intel_scu_ipc_dev *scu) +{ + u8 status; + + if (!scu) + scu = ipcdev; + if (!scu) + return ERR_PTR(-ENODEV); + + status = ipc_read_status(scu); + if (status & IPC_STATUS_BUSY) { + dev_dbg(&scu->dev, "device is busy\n"); + return ERR_PTR(-EBUSY); + } + + return scu; +} + /* Read/Write power control(PMIC in Langwell, MSIC in PenWell) registers */ static int pwr_reg_rdwr(struct intel_scu_ipc_dev *scu, u16 *addr, u8 *data, u32 count, u32 op, u32 id) @@ -278,11 +296,10 @@ static int pwr_reg_rdwr(struct intel_scu_ipc_dev *scu, u16 *addr, u8 *data, memset(cbuf, 0, sizeof(cbuf)); mutex_lock(&ipclock); - if (!scu) - scu = ipcdev; - if (!scu) { + scu = intel_scu_ipc_get(scu); + if (IS_ERR(scu)) { mutex_unlock(&ipclock); - return -ENODEV; + return PTR_ERR(scu); } for (nc = 0; nc < count; nc++, offset += 2) { @@ -437,12 +454,12 @@ int intel_scu_ipc_dev_simple_command(struct intel_scu_ipc_dev *scu, int cmd, int err; mutex_lock(&ipclock); - if (!scu) - scu = ipcdev; - if (!scu) { + scu = intel_scu_ipc_get(scu); + if (IS_ERR(scu)) { mutex_unlock(&ipclock); - return -ENODEV; + return PTR_ERR(scu); } + cmdval = sub << 12 | cmd; ipc_command(scu, cmdval); err = intel_scu_ipc_check_status(scu); @@ -482,11 +499,10 @@ int intel_scu_ipc_dev_command_with_size(struct intel_scu_ipc_dev *scu, int cmd, return -EINVAL; mutex_lock(&ipclock); - if (!scu) - scu = ipcdev; - if (!scu) { + scu = intel_scu_ipc_get(scu); + if (IS_ERR(scu)) { mutex_unlock(&ipclock); - return -ENODEV; + return PTR_ERR(scu); } memcpy(inbuf, in, inlen);