From patchwork Mon Feb 19 19:58:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 203342 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp84092dyc; Mon, 19 Feb 2024 15:05:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWBVAyksGdEw0O8uiRrL3KQsiUHWVrzNcv8VFFtbGoQCUyOVaxW39R/ll/eu+hyA1keBJbWblBOgLZPMTXNiw7U+B/XtA== X-Google-Smtp-Source: AGHT+IGxBhvlAy5LEhe6PiZfHm/PgiUpi4anot6jSbU0P7IoQrJNqI9FC3IeFoiVV6/ldKyVtajB X-Received: by 2002:a05:6808:3209:b0:3c0:354b:1559 with SMTP id cb9-20020a056808320900b003c0354b1559mr20168722oib.53.1708383933538; Mon, 19 Feb 2024 15:05:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708383933; cv=pass; d=google.com; s=arc-20160816; b=Yd0TP+zkfU07TD77t0+gCtoj6etTNBdyHZp+RAceG6U7vJQwifm/C3lN4f0FFBbf+t lJgwqliKaq/4Sr/S9cRGEwiMnBnVxtGPGwAh6huavb4moF9iQO4IecGR9RzGyEx6EA4r cjnwIkODkhKjPCMiTrkqT8Gqu0zQxfrQw3NjPuvwjH5DSLlEXC+I3F3Mv3eRdRdovcnk NPtYEDIUJpEsOwDhMPW3Iimdb3aincxAsf0s8f0PUb17RlmHv7+cO0E8LHo1CG5P73zh VGHtPxoYLJP+FS3xo3rLDAVxwwPiEKNtUWLA6H0zC01ely1Oi7VU7JaEc8iej02jsmLT famw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=s4DzhaKf0vAIXchiqvP1x0OqPxipS/FnE8nIaEoxUKA=; fh=LOynIoGsIcCMdPC1QzzjJynRZ/faW1WIR3/UfREgjqw=; b=DT0l/ujGwwPmKwAQJ2P7+iIRd4uQCcv5G8OfjmQE9nPoLjpm8Gg48uUzJ6eZtjGTzz QJgS97blwyDeds9sBFC2taIYT9dhCwwjq8rP1NgpaonZ9Grtn4CZCOtF4MOsiQB7Bqjx SY8vXv0paVu3IBP5RRbzvDqMFF4xqwl7OFAn/U5YuDeuZUxG3K0L3AWvI6GomQeH9jHB 0FzARpGYFDEr4tKpFb/V93ReXB7oAXKNbvap0PIaCAyhXueKzB0UbRzmlU2Y2xgVHpX0 1pLetL/T3tpMp+Ot8eX/tepXsx3FUyKTK84UJbo+5mxFZJyUVkvJdAUEz7O25a2x2UZ8 NO+g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h36kLlcW; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71932-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71932-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id y18-20020a05620a44d200b00787389cfc39si8521405qkp.735.2024.02.19.15.05.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 15:05:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71932-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=h36kLlcW; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71932-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71932-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 020481C2387A for ; Mon, 19 Feb 2024 20:00:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6A6DC5380C; Mon, 19 Feb 2024 19:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="h36kLlcW" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34F2451033 for ; Mon, 19 Feb 2024 19:58:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708372699; cv=none; b=eNxv+LJR1iUxqapVgr5+vO3EdQM/FSUw3sG4RJ3CRbq9RBkg2PdXPHDgL66Gn5uemNWnS0mYF5uv00oawQXUZGPSsb1kCi6Tk9/QMEhNtfx4fRzrG/RO3qUXjMWVOobV2f/YbouJWCKfnzdSlfCmrGILUX0ruJ5cMvIQ4PRWcBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708372699; c=relaxed/simple; bh=TquE1dW+qm+nVtngnRKRNtP2lZTiAhrMZ6Ch/QG2DI4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rQtbnXSOQybKUj6K2A57OAiFQ6fF4xFUAiBUeWrpjRHVzvwiWCi+3DhOjp3wix2ZnB3xiXqdkxjVpqHKnp53QjARKfYBzmqj0UdnO4jKQiSB94vmmSca5ukag3YCdsXg9PgTs6c6xP80sU4OlMkrm5nK9w0PFGEGSIcP6b+W4Xg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=h36kLlcW; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708372698; x=1739908698; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TquE1dW+qm+nVtngnRKRNtP2lZTiAhrMZ6Ch/QG2DI4=; b=h36kLlcWT41Km2bnHbnqIMtkxibn6hWt5bUK+lgwpv6gr0woKlY5XHqu 4q1fE/qYTAy8tBnmtNDFX07/cbHtvLNEi/BjL3fc3JwpGs3R91LlUsSFm kJZtaSFUlEzzmJw/cd6Y9MhyfVp0dx0n1PuBl15hKa+Y0KSVHOOMZ8KkH 0CLPmiXvFe7x7exa57/TTWRdclapNwT9SXdr/TUXkfdPv+7zDAR1XE95N zOABs5e4HnWJvezLgTzXoBXxuXTF+4hY8NlL4F9CEeTdII6S6sONYG71X BJvMLIxDxymIk7QXFdUXa6BXCel4mEtW2jCzj9l91z6JqpEEeNDa9cCFP Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10989"; a="19893439" X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="19893439" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 11:58:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="9239476" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 11:58:14 -0800 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 1BC0611F855; Mon, 19 Feb 2024 21:58:08 +0200 (EET) From: Sakari Ailus To: linux-kernel@vger.kernel.org Cc: Hans de Goede , Tomas Winkler , Wentong Wu , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH v2 1/3] mei: vsc: Call wake_up() in the threaded IRQ handler Date: Mon, 19 Feb 2024 21:58:05 +0200 Message-Id: <20240219195807.517742-2-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240219195807.517742-1-sakari.ailus@linux.intel.com> References: <20240219195807.517742-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791370391616813434 X-GMAIL-MSGID: 1791370391616813434 The hard IRQ handler vsc_tp_irq() is called with a raw spinlock taken. wake_up() acquires a spinlock, a sleeping lock on PREEMPT_RT. This leads to sleeping in atomic context. Move the wake_up() call to the threaded IRQ handler vsc_tp_thread_isr() where it can be safely called. Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device") Signed-off-by: Sakari Ailus --- drivers/misc/mei/vsc-tp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c index 6f4a4be6ccb5..2b69ada9349e 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -416,8 +416,6 @@ static irqreturn_t vsc_tp_isr(int irq, void *data) atomic_inc(&tp->assert_cnt); - wake_up(&tp->xfer_wait); - return IRQ_WAKE_THREAD; } @@ -425,6 +423,8 @@ static irqreturn_t vsc_tp_thread_isr(int irq, void *data) { struct vsc_tp *tp = data; + wake_up(&tp->xfer_wait); + if (tp->event_notify) tp->event_notify(tp->event_notify_context); From patchwork Mon Feb 19 19:58:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 203355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp108945dyc; Mon, 19 Feb 2024 16:14:56 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU7g1WJyGBwrU6q9i8IZLyplcmjfqKnDe0tndmFnMw/TKDloLhoYBq1ZhLQnoxzAF16SKJaW27MpCRGfjmG60uy3nd4xw== X-Google-Smtp-Source: AGHT+IFHLzquyxIt70CrtgkHjWlxnVKX/aXGhXOvtppdBhESQKCICLqETxzvBv+jWQTylFR7mCDU X-Received: by 2002:a05:6a00:812:b0:6e4:6047:fdf3 with SMTP id m18-20020a056a00081200b006e46047fdf3mr5446550pfk.14.1708388096799; Mon, 19 Feb 2024 16:14:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708388096; cv=pass; d=google.com; s=arc-20160816; b=GMVYCkEfYmrdIhMiTyNJ7fuUzj9svaR2Fr/1QlnvHj/Io1EkkFREjPFTxPjnvvj/3v oQmJbMpF9sy9ht1iNoOeYg3H76PhqKoq6D/RfmdX3wqSmOsuBPOfZiY4NeUAqi20GNsN F1K3Vp/zyNWC25zHVN2fANmXqz4ARmEPCPpb9UJBY9Zgi5w1trizM8iqhOwrQYKLapPa Vh0ifDdKMOAVmrmHcx9brKOTq0MPpUfrvc5GJ+vpQuF5CB2pTckwNVCW0mpWM3SIpUci s+zjKAzP7xb9EkEIXCocxxt3AcZh6XYd3ZidAqgqhHhrekaJZnGajD/+NNkqnScoNs0g TWFg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=htg8kYRNZIoVfW56cPMainX/lb36vC/kv5I6HAzDcOM=; fh=LOynIoGsIcCMdPC1QzzjJynRZ/faW1WIR3/UfREgjqw=; b=Gr3gQMKjtctChBBU9VDtEROZfyuS0Egci1cs98epWD/faN+mXlT5eLTiC3gEpZbxZc 497LIHcM4+pNYJPttg7LXFG0IITNMBUUYw2WryROYJ19iSBcmgAVXWNCP01hYRpNZRiV iEAwojDPVFOZb0LjYoGXPS2lZsbz8rteqj89+M8z2V+VX++XupGV1OTsTUOQjxr+o2jj P5LPt6ivLEjIm2Xaq2ESfq254idRNtRdpVAig7xMZdquxgB3QQdt8VKTSIi2R8EILfD8 j/GApRAGs7SyxI+fflJhrpmhSHGKsGVEq1ejWqgqMmTOtaEcy11UOgWx93CZfSD4SPAU Nymg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KseJSHvp; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71933-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71933-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id l190-20020a6391c7000000b005d8e283c1ebsi5100377pge.840.2024.02.19.16.14.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 16:14:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71933-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KseJSHvp; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71933-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71933-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2D69D28773C for ; Mon, 19 Feb 2024 20:00:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B28C453819; Mon, 19 Feb 2024 19:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="KseJSHvp" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B24251C3B for ; Mon, 19 Feb 2024 19:58:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708372700; cv=none; b=Yjx/apO242M+IylS9M/Isl5rQjBApd25A42pVv7dTb2OKkMDwfXNvkazDEKefaWQfV7nRWTTRMscpTC+INmBj+YBJeXlrlRq88pEnfBMAuub1NxxzRaTTj89jWRJH0Lrzvxp1fwQDpmNVdLVqUbnw34h/UhVjucoGFVIIChv8m4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708372700; c=relaxed/simple; bh=LQfcvhDhukePnMMEY/6b22ES5Z9aTSaVbHBODDBxTV4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r/SwLuo3IyrtkwH5zk2G/fWM+fbvb/HXLYLPFxddf1schAyvCCHCet1rEs7YGlhojZDzfhI/PQL3+BYTPxPBE4yZ56qEUoCL07TwteVsqItZ0694BkaUa0tJZeOEpobvVPHc7Dseal57cfNS5tpg/j9TO/g/EeqFf0N2B3yLCEw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=KseJSHvp; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708372699; x=1739908699; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LQfcvhDhukePnMMEY/6b22ES5Z9aTSaVbHBODDBxTV4=; b=KseJSHvpEc1wtknMgeWZqvKEV5RoHg64hxMw4ETuO6xp6gh3lsdchTtI yEU9KjXu3vG4EXmDcBdn5rcwsoAb+p9saUiJjc/rdNJ8yoPWts8XKijm+ p6b8osnGKLGgh8Y9G6lRaKIXJeJSB5Q10ekxHVEKuIo6oTtP4N6uMGHqz fWuSvJ5qKtMgbs7xhuuyxCb3qCRSagyTac/CMZrJXNJ7Qoth6NEEi0pkq nwsinAcRy/8FlK5AtwROGMsmSYO1J4GCnOxIBBtS3LyVlOmmiYG+39/b7 ypuWaHWyfcCTI/uW1JxaBeBzP9ETi1VmjIayqPZLMnOgC8Ir03qFrc2r1 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10989"; a="19893443" X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="19893443" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 11:58:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="9239483" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 11:58:15 -0800 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 770F411FB11; Mon, 19 Feb 2024 21:58:10 +0200 (EET) From: Sakari Ailus To: linux-kernel@vger.kernel.org Cc: Hans de Goede , Tomas Winkler , Wentong Wu , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH v2 2/3] mei: vsc: Don't use sleeping condition in wait_event_timeout() Date: Mon, 19 Feb 2024 21:58:06 +0200 Message-Id: <20240219195807.517742-3-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240219195807.517742-1-sakari.ailus@linux.intel.com> References: <20240219195807.517742-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791374757069797252 X-GMAIL-MSGID: 1791374757069797252 vsc_tp_wakeup_request() called wait_event_timeout() with gpiod_get_value_cansleep() which may sleep, and does so as the implementation is that of gpio-ljca. Move the GPIO state check outside the call. Fixes: 566f5ca97680 ("mei: Add transport driver for IVSC device") Signed-off-by: Sakari Ailus --- drivers/misc/mei/vsc-tp.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c index 2b69ada9349e..7b678005652b 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -25,7 +25,8 @@ #define VSC_TP_ROM_BOOTUP_DELAY_MS 10 #define VSC_TP_ROM_XFER_POLL_TIMEOUT_US (500 * USEC_PER_MSEC) #define VSC_TP_ROM_XFER_POLL_DELAY_US (20 * USEC_PER_MSEC) -#define VSC_TP_WAIT_FW_ASSERTED_TIMEOUT (2 * HZ) +#define VSC_TP_WAIT_FW_POLL_TIMEOUT (2 * HZ) +#define VSC_TP_WAIT_FW_POLL_DELAY_US (20 * USEC_PER_MSEC) #define VSC_TP_MAX_XFER_COUNT 5 #define VSC_TP_PACKET_SYNC 0x31 @@ -101,13 +102,15 @@ static int vsc_tp_wakeup_request(struct vsc_tp *tp) gpiod_set_value_cansleep(tp->wakeupfw, 0); ret = wait_event_timeout(tp->xfer_wait, - atomic_read(&tp->assert_cnt) && - gpiod_get_value_cansleep(tp->wakeuphost), - VSC_TP_WAIT_FW_ASSERTED_TIMEOUT); + atomic_read(&tp->assert_cnt), + VSC_TP_WAIT_FW_POLL_TIMEOUT); if (!ret) return -ETIMEDOUT; - return 0; + return read_poll_timeout(gpiod_get_value_cansleep, ret, ret, + VSC_TP_WAIT_FW_POLL_DELAY_US, + VSC_TP_WAIT_FW_POLL_TIMEOUT, false, + tp->wakeuphost); } static void vsc_tp_wakeup_release(struct vsc_tp *tp) From patchwork Mon Feb 19 19:58:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 203256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp10817dyc; Mon, 19 Feb 2024 12:00:21 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVgscpze+pbJCBAjR0zxINGmcD0KCB8KqHVmQrmoUTY5iZfWqRV5OzlO8Xzd2zmoTE+gi88C+PCCpBT98NbcajSus+Q3A== X-Google-Smtp-Source: AGHT+IF114GhoDB4RZqIWHRZ3Olk+2AZ5kMCDgNuwhJtnbS9uu7dcYcpvQmzeSifFforEQwIz/Yw X-Received: by 2002:a05:6402:1b1a:b0:561:4460:6726 with SMTP id by26-20020a0564021b1a00b0056144606726mr9337027edb.26.1708372821520; Mon, 19 Feb 2024 12:00:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708372821; cv=pass; d=google.com; s=arc-20160816; b=rouOHJg1Guyh/gUwaSe76tDIOnQxKS79dzR44SDqyO2YHiKPgXGrBEetmQNGzB+4NN 9MZ+Mk0tOv1YuS4oclt/4JGZ+hfBzK8TDL52JYNxyqDumovPnwwQZmo2fFSiMrCekUX3 DxgZvrHtBCLF/Wr45qqN4It7RzsmhcQgdk6jaYR+hszjd69nXRje1B0C9LIKuH+8SPe+ VO2cz01PfZp+eC3cpsinRaFODLRVsy0G82MuD5DgQ+t3pPv0BGnRlvMlnTvYlAcbT/65 mnvC+Cc5oSVnpXKs5SeF350k7NkNpi3pdbCLE2io91ZX/tfniJAlay5VCa0XuhYVepMQ 9Ffw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=ThsPRVmdFuUvkxFAoIw51QZUrjDGzA50FojJIKHCHwQ=; fh=LOynIoGsIcCMdPC1QzzjJynRZ/faW1WIR3/UfREgjqw=; b=HGJ3zHjYs+Swr7clCqtLhcQxMv1hc0gdsroj991ryi5ul+11ZtYgeE7ROWXV/2vMtQ eqNOEln5mIABfMZR5iJIiqJEHoACxJZh4bRakKPt9MOm+BIBvAzgBkQXHj/M4JwuoO3l 0RmWsyz0jOL+MlaZ71nrBkRgMMb5NKX7ybyPcsJJvTywOTU1yzLcLdnWwVSsXuGpZFUI +ZrQimTE8ny+4BOtG7swwRHYT2MCJQqYlWPguqf5vGhJ75oA2gg8wmyGnI584vLTwWjg nk+kUmwqj7vG1CGJJaBWkbd9ciFUIDmbYBZbWhl1ZIkj0YP1IPOCr8dXV29iCn5zjYOU /y1g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZOVKngJu; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71934-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71934-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id v22-20020aa7d9d6000000b005647cd2038esi1008784eds.294.2024.02.19.12.00.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 12:00:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71934-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZOVKngJu; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-71934-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71934-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 264D71F245E6 for ; Mon, 19 Feb 2024 20:00:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DFFDD53E2B; Mon, 19 Feb 2024 19:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZOVKngJu" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFBE0524D7 for ; Mon, 19 Feb 2024 19:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708372701; cv=none; b=DQTaDayEW44jg42s1xzAmxjWGGlBDehQrtP8iKmMXmlwYdvvjZMbPpK6ZqjXVt3cBLM9V4MW/yVICNDpKJEcXrhfcI51gZ64tbv2LFIX0uH5D1NPrgXbVpQ7iXMuDMYWjSLFO/fCKvv3qhFIaPi2Tinnms2kRhJKJ+XAp0b/kxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708372701; c=relaxed/simple; bh=CnCKLmpVpCmUXuzfNqSYcIlBmrUGIF8rsECdq6agMcQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XkqExx1k9P7DT6bKD3rfCiUUjVR2HYPHBYznF0SP5UnTDoah/bZkXWrpI7vFRI3BahtG1GCAwp9oG9ci8O0CYjdcVOq6rJycRkCNvQwetN6HrUzDPzGD7MG2PnCq7ZSVjn3N/w26TVyWi599b9oSiJzWR+3unDTFs2Js2CTWiLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ZOVKngJu; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708372700; x=1739908700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CnCKLmpVpCmUXuzfNqSYcIlBmrUGIF8rsECdq6agMcQ=; b=ZOVKngJuBYY2bzZ1AY+1qW4Abg91gl3onef0FaQCxg8fwaADKf8ZjVQC gdwiX3LjyPLA88x9pYbKeAE2nXxwimQQyKDjMLK9LpDqftDE/Cnui6vpL Fec2IfjqLpQ6PsRE0K6f+AdD62MeEqPz2a4NE3+ZqPLDpo0Dwd01MJGz+ ELrZF91PVLcl326sd56xRCsYdOR2CtoxVPOnSouBluTKvfxEx5BPIR+GY APTOqx8DFwyWikdRyFzMkmRLWhm08PkXLJllhq3DSnbVyLdtDjF4MGxik /tZl3PAB65av7HePgVx+t/nqbliMD5W5C1YUxb/PqroE9yNI3SoSJkH+8 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10989"; a="19893449" X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="19893449" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 11:58:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,170,1705392000"; d="scan'208";a="9239492" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2024 11:58:15 -0800 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 44BF9120204; Mon, 19 Feb 2024 21:58:11 +0200 (EET) From: Sakari Ailus To: linux-kernel@vger.kernel.org Cc: Hans de Goede , Tomas Winkler , Wentong Wu , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH v2 3/3] mei: vsc: Assign pinfo fields in variable declaration Date: Mon, 19 Feb 2024 21:58:07 +0200 Message-Id: <20240219195807.517742-4-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240219195807.517742-1-sakari.ailus@linux.intel.com> References: <20240219195807.517742-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791358740019332349 X-GMAIL-MSGID: 1791358740019332349 Assign all possible fields of pinfo in variable declaration, instead of just zeroing it there. Signed-off-by: Sakari Ailus --- drivers/misc/mei/vsc-tp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c index 7b678005652b..9b4584d67a1b 100644 --- a/drivers/misc/mei/vsc-tp.c +++ b/drivers/misc/mei/vsc-tp.c @@ -445,11 +445,16 @@ static int vsc_tp_match_any(struct acpi_device *adev, void *data) static int vsc_tp_probe(struct spi_device *spi) { - struct platform_device_info pinfo = { 0 }; + struct vsc_tp *tp; + struct platform_device_info pinfo = { + .name = "intel_vsc", + .data = &tp, + .size_data = sizeof(tp), + .id = PLATFORM_DEVID_NONE, + }; struct device *dev = &spi->dev; struct platform_device *pdev; struct acpi_device *adev; - struct vsc_tp *tp; int ret; tp = devm_kzalloc(dev, sizeof(*tp), GFP_KERNEL); @@ -501,13 +506,8 @@ static int vsc_tp_probe(struct spi_device *spi) ret = -ENODEV; goto err_destroy_lock; } - pinfo.fwnode = acpi_fwnode_handle(adev); - - pinfo.name = "intel_vsc"; - pinfo.data = &tp; - pinfo.size_data = sizeof(tp); - pinfo.id = PLATFORM_DEVID_NONE; + pinfo.fwnode = acpi_fwnode_handle(adev); pdev = platform_device_register_full(&pinfo); if (IS_ERR(pdev)) { ret = PTR_ERR(pdev);