From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B61FC32772 for ; Wed, 17 Aug 2022 19:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239342AbiHQTwY (ORCPT ); Wed, 17 Aug 2022 15:52:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238316AbiHQTwW (ORCPT ); Wed, 17 Aug 2022 15:52:22 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FCF7A50D3 for ; Wed, 17 Aug 2022 12:52:21 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id t22so13409842pjy.1 for ; Wed, 17 Aug 2022 12:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc; bh=qhDBBfRO8hshZLFsK/uN7QtbS7YCbu9/Q4DaGouyGb8=; b=n6upwd6duwkOC0jSOXuwf5JBpXBb8ll7yr6SdtxFciplGgVA/yFbH0HAsgv5hDNd9S cRFT24b7Mx5gINdTvNpUPA+RFB3zngQAqQK/JT0MP3w4/SlwLbB+Ty3exe0ErwiM79LW jUKEmSJj0fX2h8bFZ0pyGQifuR556tlBlyYb2nPKKcYkf+6uw3aKhaCGBHHpuqDS+8Nm trAsNl8VFt0PehDytRl4SnuxPJOUjVmp+9f+ITzCCA1Lpj23tWt+ZQe+S5vYQ5vSK0O9 MqL34ejozL0N9X8+Kh2J9GW3m9F5eMWwrPvayJWF6csphqnZf3nR+0uBAjv3MLk70etY 7YLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=qhDBBfRO8hshZLFsK/uN7QtbS7YCbu9/Q4DaGouyGb8=; b=PDqzJTkVBbB1u1jEvcE7Q4v4ONzL0WFkwwRB78eE0Blkm8mU8z3F7y2OyLCNIDloPK rAzhZNHddQj6ennLXuhWeuvjan43syyRjceXYLWBcCtJlCYKkwDn9EbFjFVnOG1SOnHR M1wL5JQ9f61tyOn9f8dMzCqEEfsfBXqlYyot6ZvqYAgi50fvi2TEupzNGKMWXTLm7n+n M8NTEz8Sd5mvcX7vq6OO8A+3viA7w9wUjCPMK5+7mGghSVsHJhRjHFg/nuX7a/avgu5y MUMhBO9ksMxlsZHijQCFH1LLrywQSS1muEK6gDvgXIN6fUcTvXuJ2qwwhg/wj9IUwFXh SWYA== X-Gm-Message-State: ACgBeo0lT+8/UkOGPGLFiqqjLM8SyxP/1IIJKQPWKJWdDVgsz00MKihd BDO/iA6gBMNCuyJ3AfXrrpBFf1gP2CsiBQ== X-Google-Smtp-Source: AA6agR5kUtRc0Yrbc6y6cu7vFg9kh+gXbtv0CS56ZJ50rd4TF93PlLmJdr8HaHa5hHD4VfE/qwyuAA== X-Received: by 2002:a17:902:da89:b0:170:a235:5993 with SMTP id j9-20020a170902da8900b00170a2355993mr27084691plx.94.1660765940791; Wed, 17 Aug 2022 12:52:20 -0700 (PDT) Received: from google.com (201.215.168.34.bc.googleusercontent.com. [34.168.215.201]) by smtp.gmail.com with ESMTPSA id f6-20020aa79686000000b0052e23a5ab74sm10921123pfk.59.2022.08.17.12.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 12:52:20 -0700 (PDT) Date: Wed, 17 Aug 2022 19:52:16 +0000 From: William McVicker To: Matthias Kaehlcke Cc: Bjorn Helgaas , kernel-team@android.com, Sajid Dalvi , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] PCI/PM: Switch D3Hot delay to also use usleep_range Message-ID: References: <20220817185202.1689955-1-willmcvicker@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/17/2022, Matthias Kaehlcke wrote: > Hi Will, > > On Wed, Aug 17, 2022 at 06:52:02PM +0000, Will McVicker wrote: > > From: Sajid Dalvi > > > > Since the PCI spec requires a 10ms D3Hot delay (defined by > > PCI_PM_D3HOT_WAIT) and a few of the PCI quirks update the D3Hot delay up > > to 120ms, let's add support for both usleep_range and msleep based on > > 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 uslseep_range > > therefore decreases the resume time on a Pixel 6 on average by 9ms. > > > > [1] https://android.googlesource.com/kernel/gs/+/18a8cad68d8e6d50f339a716a18295e6d987cee3 > > > > Signed-off-by: Sajid Dalvi > > Signed-off-by: Will McVicker > > --- > > drivers/pci/pci.c | 20 +++++++++++++++----- > > 1 file changed, 15 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > > index 95bc329e74c0..97a042ca9032 100644 > > --- a/drivers/pci/pci.c > > +++ b/drivers/pci/pci.c > > @@ -63,16 +63,26 @@ struct pci_pme_device { > > }; > > > > #define PME_TIMEOUT 1000 /* How long between PME checks */ > > +#define MAX(a, b) ((a) >= (b) ? (a) : (b)) > > no need to define this macro, you can use max() from > include/linux/minmax.h instead. > > > > > static void pci_dev_d3_sleep(struct pci_dev *dev) > > { > > - unsigned int delay = dev->d3hot_delay; > > + unsigned int delay_ms = dev->d3hot_delay; > > > > - if (delay < pci_pm_d3hot_delay) > > - delay = pci_pm_d3hot_delay; > > + if (delay_ms < pci_pm_d3hot_delay) > > + delay_ms = pci_pm_d3hot_delay; > > nit: since you are already touching this code you could change it to: > > unsigned int delay_ms = max(dev->d3hot_delay, pci_pm_d3hot_delay); > > > > > - if (delay) > > - msleep(delay); > > + if (delay_ms) { > > + if (delay_ms <= 20) { > > + /* Use a 20-25% upper bound with 1ms minimum */ > > + unsigned int upper = MAX((delay_ms >> 3) << 1, 1); > > Not sure this optimization of using bit shifts instead of the clearer do_div() > is really needed here. pci_dev_d3_sleep() is not a super hot code path IIUC. > > > + > > + usleep_range(delay_ms * USEC_PER_MSEC, > > + (delay_ms + upper) * USEC_PER_MSEC); > > + } else { > > + msleep(delay_ms); > > + } > > + } > > } > > > > bool pci_reset_supported(struct pci_dev *dev) > > > > base-commit: 274a2eebf80c60246f9edd6ef8e9a095ad121264 > > -- > > 2.37.1.595.g718a3a8f04-goog > > Thanks for the suggestions! I'll update those in the next patchset. --Will