From patchwork Wed Sep 21 21:27:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William McVicker X-Patchwork-Id: 1680840 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=GYVh1Hv2; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4MXs3q3ybBz1ypH for ; Thu, 22 Sep 2022 07:28:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229585AbiIUV2U (ORCPT ); Wed, 21 Sep 2022 17:28:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230358AbiIUV2H (ORCPT ); Wed, 21 Sep 2022 17:28:07 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5199EA61E6 for ; Wed, 21 Sep 2022 14:28:06 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id r7-20020a632047000000b00439d0709849so4099154pgm.22 for ; Wed, 21 Sep 2022 14:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date; bh=Rj57beHCIEQ+ldfbuTVP/EURNkRb2EXXRe6WPMDPyCc=; b=GYVh1Hv2Gcij7haZHYTZEMfH/lnByf/3y5MSsbXvhHiBfK+A+BYPENJDuzsSzoR7NW Iy9Tz1XcjiMkpveXZpqcgEfFCrMGSEqgpO+hWaUIjqkuxF0QT36fZtYb7UFmM+iW0eGh meDKyvNcKVG4/6WdDGEzHaD6LlsfLTJQPp/Ij6mzKeCo3bovst4NjEOSjKzsUzmnrvAy xh/xKWaS0ZGrxoHVqWbwAZc26NlkKS2n96WMBCwuENEbgWcAVTCQqwNbpY5RwVDnH8mf +APEBFXVKaU7t0YLDp3Bq6aV8wOHoyd1vuRX9liZHfCY7CuMAv4wXqWZfc62vYBLw4KU +SlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date; bh=Rj57beHCIEQ+ldfbuTVP/EURNkRb2EXXRe6WPMDPyCc=; b=sSpf7kLcJpBld0nWZmaBuqBRetV3FeZ0dTb8bR7a0rxSdZnSm6mnBf0wSaG5/R8rYY GP3PbHjWllqP0gpUHYNt/czEdARN2xAqIro+TJujcqagUxejJeSaBc9IFdU37t/dy1lq 6WwxFUNkoasKcw0xxZF2IERUi/gIFpWA5kL43/MB51ImABe9MW/0M1eWteBDqfU/rGLX Kobpdna/86BB2kX4YlRoGiz1ZI/JoBEADcVI2NO1j6ax+A1qkKchm5GEaE9Bppshu7DI P1LJ03c+cDZ0mpzFatofKlqvi8J+rHeMeuvKw8k9Sop0UK8CxU4YJPROumKvqx/RQJxd yVew== X-Gm-Message-State: ACrzQf0gRU4liBFvAX1/WvbXA3R5kL0yz8bKlEeZUkfmv8UQMRJvDIMe AZCapb9air7/8I4KaRXSQjjz2wsgjrZDTjduPg0= X-Google-Smtp-Source: AMsMyM5mAkA1kCKFW+/25JHt+67NH6269Gra3l4xUtoGcl1oXEHtJf1kgg3hlPjQjU1VBuulUjPXtNOUjkRczoTgxWE= X-Received: from wmcvicker.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5ebe]) (user=willmcvicker job=sendgmr) by 2002:a05:6a00:1342:b0:545:4d30:eecb with SMTP id k2-20020a056a00134200b005454d30eecbmr164457pfu.69.1663795685856; Wed, 21 Sep 2022 14:28:05 -0700 (PDT) Date: Wed, 21 Sep 2022 21:27:35 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog Message-ID: <20220921212735.2131588-1-willmcvicker@google.com> Subject: [PATCH v4] PCI/PM: Switch D3hot delay to use usleep_range() From: Will McVicker To: Bjorn Helgaas Cc: kernel-team@android.com, Sajid Dalvi , Matthias Kaehlcke , Will McVicker , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HK_RANDOM_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=no 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-pci@vger.kernel.org From: Sajid Dalvi The PCIe r6.0, sec 5.9 spec requires a 10ms D3hot delay (defined by PCI_PM_D3HOT_WAIT) for transitions to or from D3hot. So let's switch to usleep_range() for the delay time to improve the delay accuracy. This patch is based off of a commit from Sajid Dalvi in the Pixel 6 kernel tree [1]. Testing on a Pixel 6, found that the 10ms delay for the Exynos PCIe device was on average delaying for 19ms when the spec requires 10ms. Switching from msleep() to usleep_range() therefore decreases the resume time on a Pixel 6 on average by 9ms. Note: some ancient Intel chips do have a quirk that sets the delay to 120ms. Using usleep_delay() may add a few extra milliseconds for those chips. [1] https://android.googlesource.com/kernel/gs/+/18a8cad68d8e6d50f339a716a18295e6d987cee3 Signed-off-by: Sajid Dalvi Signed-off-by: Will McVicker Reviewed-by: Matthias Kaehlcke --- drivers/pci/pci.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) v4: * Drop use of msleep() in favor of always using usleep_range(). * Update the commit message. v3: * Use DIV_ROUND_CLOSEST instead of bit manipulation. * Minor refactor to use max() where relavant. v2: * Update to use 20-25% upper bound * Update to use usleep_range() for <=20ms, else use msleep() base-commit: fcf773ae8016c6bffe5d408d3eda50d981b946e6 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 516bf0c2ca02..2127aba3550b 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -66,13 +66,15 @@ struct pci_pme_device { static void pci_dev_d3_sleep(struct pci_dev *dev) { - unsigned int delay = dev->d3hot_delay; - - if (delay < pci_pm_d3hot_delay) - delay = pci_pm_d3hot_delay; - - if (delay) - msleep(delay); + unsigned int delay_ms = max(dev->d3hot_delay, pci_pm_d3hot_delay); + unsigned int upper; + + if (delay_ms) { + /* Use a 20% upper bound, 1ms minimum */ + upper = max(DIV_ROUND_CLOSEST(delay_ms, 5), 1U); + usleep_range(delay_ms * USEC_PER_MSEC, + (delay_ms + upper) * USEC_PER_MSEC); + } } bool pci_reset_supported(struct pci_dev *dev)