From patchwork Thu Mar 30 14:14:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 77214 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1177980vqo; Thu, 30 Mar 2023 07:42:32 -0700 (PDT) X-Google-Smtp-Source: AKy350akmp18Dw0yy1MjMRO04SSyRd90w98AqBQuL83FUvNsLtP5iKP0wKUtb9CWNliZRTNef1i3 X-Received: by 2002:a62:2545:0:b0:628:f0:51d4 with SMTP id l66-20020a622545000000b0062800f051d4mr21888366pfl.11.1680187352019; Thu, 30 Mar 2023 07:42:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680187352; cv=none; d=google.com; s=arc-20160816; b=WfdJ9krxLB/mWVNYxP6OIXS3vux+0TyU6uIxWCxgKEyYMRlXI4H7QaTbKtht4kqPaG t0yEj0Kzwx0qh+AQFuXTV83b0AAmLMFQqrp/PLoqbZQG4sKgCB48pPubRB5dbs5lqQy/ TduGv77dvTkP7DbCMvuAJyRBMiuAgVLx6KONVQ7jTcQzhs65RmHrreatJDzkvsruqwpU 7+Q7cQRuTD84mXLkLmalYbb5FZExu8nBLq5ywtzE5bwDranbqs958pkDLiy9hhMT6IcM iztOBdfMN+zgfUd3xFko/1NvT+i8TdipgnzHxf3YSY0aN9jgvRg0ffvDkoDU1rib7qi7 KEBg== 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=AhkHTxwgDM3+9JrGO1GBXhfk/RJtUQIAuM7axk6zjvM=; b=QD1kdX8uDedCFSW8jIP04L7cxm8pMxsCGLAYnpWGoGOIw0VlHNX1mPBtYco1WZyiwR i6SydXMKsmgymE28sP+Hz86KZTPUGqQlFqkgYH0yfmXswd6d5pnI+NuyMtLySd7jlPOf 61be0+SexhxocIRZi5g485YOal+iJ53IVP6TXHHGBoG8NKrQRZiZpzDrP8VwixvlvaXm KPjhc9ibcHtDQKNdjVDPXkymYA7u00qT32/BDrsrGGrz02+Y4PP8vUJAPWNHIWpQMMBl ZYapHsCpm2vwjn0HFtqQnUH2/7enwEFQTgRx6kRgKs6/g8CdZaK+6PP+7ImR1KTf0ilw dd+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OX9PRYjs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f5-20020a056a0022c500b005a8d684c05dsi36635990pfj.271.2023.03.30.07.42.18; Thu, 30 Mar 2023 07:42:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OX9PRYjs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232395AbjC3OUE (ORCPT + 99 others); Thu, 30 Mar 2023 10:20:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232338AbjC3OT4 (ORCPT ); Thu, 30 Mar 2023 10:19:56 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6C8CC160; Thu, 30 Mar 2023 07:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680185977; x=1711721977; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=79LV+OrRl703R6iMPgkR0twJmLykHeDX2mMjxvwYOEg=; b=OX9PRYjsnUiuG7c1SaP9xfxZGfbP96zFaeTUay8nMAz77C40tnMnpVlB Elew9ZivchFIPDV5RoKBy4L9rco+6IxS6fzyRs2zYd9SWekU0PxS0huA3 B+uE0r8aiiDLcdYr9ijZk3lmX1SZvLP24/9+7qEUVtz7GjY3NhZzxiL2W QNzbFA3L4IvzOooWkttSFdofLTCd7145DtIUUty7R8bx0pBnt6Wcw+nOj 0VnQCDInIcVt1OovRpDnh+y2ZtGD8yG3R1SWfJ42MbiXNLZ/UmRBvKl04 MmCfxeKCkk+bLaVxXBEvfqGThl34j5s5sohZDm+kn8L0gPB0E23SxcATE Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10665"; a="339903322" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="339903322" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 07:19:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10665"; a="749213928" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="749213928" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 30 Mar 2023 07:19:17 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id CD98814B; Thu, 30 Mar 2023 17:15:40 +0300 (EEST) From: Andy Shevchenko To: Mika Westerberg , Andy Shevchenko , Olliver Schinagl , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andreas Noever , Michael Jamet , Yehezkel Bernat Subject: [PATCH v1 2/2] thunderbolt: Make use of ioread32_poll_timeout() Date: Thu, 30 Mar 2023 17:14:13 +0300 Message-Id: <20230330141413.25569-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230330141413.25569-1-andriy.shevchenko@linux.intel.com> References: <20230330141413.25569-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761804132849357542?= X-GMAIL-MSGID: =?utf-8?q?1761804132849357542?= Instead of open coding the same routine switch the code to use ioread32_poll_timeout(). Signed-off-by: Andy Shevchenko --- drivers/thunderbolt/nhi.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c index d76e923fbc6a..d0bf11b40131 100644 --- a/drivers/thunderbolt/nhi.c +++ b/drivers/thunderbolt/nhi.c @@ -16,8 +16,8 @@ #include #include #include +#include #include -#include #include #include @@ -40,7 +40,7 @@ #define MSIX_MIN_VECS 6 #define MSIX_MAX_VECS 16 -#define NHI_MAILBOX_TIMEOUT 500 /* ms */ +#define NHI_MAILBOX_TIMEOUT_US 500000 /* Host interface quirks */ #define QUIRK_AUTO_CLEAR_INT BIT(0) @@ -830,8 +830,8 @@ EXPORT_SYMBOL_GPL(tb_ring_free); */ int nhi_mailbox_cmd(struct tb_nhi *nhi, enum nhi_mailbox_cmd cmd, u32 data) { - ktime_t timeout; u32 val; + int ret; iowrite32(data, nhi->iobase + REG_INMAIL_DATA); @@ -840,16 +840,12 @@ int nhi_mailbox_cmd(struct tb_nhi *nhi, enum nhi_mailbox_cmd cmd, u32 data) val |= REG_INMAIL_OP_REQUEST | cmd; iowrite32(val, nhi->iobase + REG_INMAIL_CMD); - timeout = ktime_add_ms(ktime_get(), NHI_MAILBOX_TIMEOUT); - do { - val = ioread32(nhi->iobase + REG_INMAIL_CMD); - if (!(val & REG_INMAIL_OP_REQUEST)) - break; - usleep_range(10, 20); - } while (ktime_before(ktime_get(), timeout)); + ret = ioread32_poll_timeout(nhi->iobase + REG_INMAIL_CMD, + val, !(val & REG_INMAIL_OP_REQUEST), + 40, NHI_MAILBOX_TIMEOUT_US); + if (ret) + return ret; - if (val & REG_INMAIL_OP_REQUEST) - return -ETIMEDOUT; if (val & REG_INMAIL_ERROR) return -EIO;