Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Message-ID: <ba571993-90fb-ae67-6617-0b63571298be@intel.com>
Date:   Thu, 14 Apr 2022 19:54:02 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Firefox/91.0 Thunderbird/91.8.0
Subject: Re: [PATCH v4 2/2] PCI/PM: Fix pci_pm_suspend_noirq() to disable PTM
Content-Language: en-US
To:     Rajvi Jingar <rajvi.jingar@intel.com>, <bhelgaas@google.com>
CC:     <david.e.box@linux.intel.com>, <linux-pci@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <linux-pm@vger.kernel.org>
References: <20220325195053.769373-1-rajvi.jingar@intel.com>
 <20220325195053.769373-2-rajvi.jingar@intel.com>
From:   "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Organization: Intel Technology Poland Sp. z o. o., KRS 101882, ul. Slowackiego
 173, 80-298 Gdansk
In-Reply-To: <20220325195053.769373-2-rajvi.jingar@intel.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QmZYb0RyL2hESHJtYkRiUDZGd3FnYTFOSkRCd1I5UFJPMk83OUhDR1cxQ0Jq?=
 =?utf-8?B?ajQ1ajk5OEs5bm5MSmV2R0dpZ1l3QzJSeThEUmdPR2Q3aDBuKzRNdDdmL0Yv?=
 =?utf-8?B?dmx2V3MvT0lxaUhveUFOUEFwMjJZd1Ryb1pVOUFIMXZuLzB5RVAzMGRwUkFR?=
 =?utf-8?B?MDgvNmo5cktvUUZDTXNjdkVkVjdsZXZ2R2dOWHIvRmZZVVM3Zy9KVWNwTWJw?=
 =?utf-8?B?OWpqcERJaytWRk8rc1Q4ZHA2V0xZWWxHeG9reWdzSGZkcmNjVm1TZzZYbzZO?=
 =?utf-8?B?MDd0K1hBaDljTU5FNGhnMS9XcTkrU2dwSklmN0VJUlA5NmRlMkI3clo3ands?=
 =?utf-8?B?UG9ZVHA4K0lJMjN5NWR1Yk1WZlFMakl5SllwT2FZMVBEMFpBa0pmTEV0UFZ6?=
 =?utf-8?B?azRrL1pXY3gvTm9hZm1Cd1NFOUxjdmtOREtXRHBYaTBEVEJNMGJGUjNFdng5?=
 =?utf-8?B?ZjBMcU1oRkFMQnkrK25Db2RKUldvMTh4NlhxRWpsUDh6ZFU0ZExydlNrQWow?=
 =?utf-8?B?TEJEK05PVVJ5cm15aHJ2T2JTaVc4TmtFdkhUVEd5aE9XRmV1Z0p1YnFMczl6?=
 =?utf-8?B?Znl4aU1wVVB2RkJVMVRDYXVNUlZTdk1NdnRvRXAwS3QxSWZCL1F4bzJnS0dS?=
 =?utf-8?B?c21mUU5vM2paTzYweFVyQWwxNVRHenhwc3A1UHA5L3dub0hwMERHeWltVHFw?=
 =?utf-8?B?K2QyZ1haaS91ZXdjaGtLWjJ4Z2lPb1F0SitLVitmTGZuNzU5cUdsTjdxQ0Nx?=
 =?utf-8?B?MXZrTDBoaHFzbDRCY0I3ZHBER1ZZWXY3MFJJSjh1RGJ3MTg3RTllWGd2Wklk?=
 =?utf-8?B?MnQrY0pudXczTm1OWUkzTVE3YVMvVWloTm51U2xhQ0RVcTBkbFp5TVgzL29M?=
 =?utf-8?B?OFhBMjcxcnNjdWRyOUNrTzR6UHp5Y1FpbG9ISlpoU0N3c25uRlAwQm1vQnJv?=
 =?utf-8?B?alhRSEF0S1ZPejZDeG5XRC9EdFo5RDNnYUtMQzNsSXBSQ1VzSFNXNVlDS0Nx?=
 =?utf-8?B?VnpSaW5Zc3M0bnU2NXVqZm5VY0txYWhUMlZKNHB3Y3J2aFJiUUlYaTZNb2Rs?=
 =?utf-8?B?T1VBTUI0WXFmbEcveDFOYStBalFQdVVSWC9pZnRIanRTV1BwbUF5aFpyMTFV?=
 =?utf-8?B?c1lJK2VmOWZsbG1DK0tNRHRHQkdvaTVWZVBGbGgvaWhKak11b2dnMzBDSDlH?=
 =?utf-8?B?WWtMOGhqK2pOLzludTdBcXI2R3FURHlkMmZFeTEyWnhpb2RhdU5VYXh1QVVl?=
 =?utf-8?B?N2lGcGc1M2FMekN5MGZSY2I3OFQrckEzaEdNaG9SS3dhNWdPeXZFWUJQdmxR?=
 =?utf-8?B?RkpVbE1MWmJSaFFiUitQd0p4NERaVU9EOTd1YXNOcVFpVEEwcmZEeUNJNWpX?=
 =?utf-8?B?Snl5RUdSMXdObWJtYUJLVTZETytYakFrSWN5SlFXbEFvY1ZoR0dSempjbkI5?=
 =?utf-8?B?STFHZ1JsNDhZTzNIUHpZdVphV1k0c3JlN25xOVhha3kwRURpRklLU3MzVSsz?=
 =?utf-8?B?d0I0NGsxVFdzT2RRR1c1VVMyODFlMkF1aldBM2V5TTd4eEhYYjRhT1hlODFK?=
 =?utf-8?B?QXk2QWFTUE1TNGlOUis4ZGVSTGl6VFlnenFjZVhOd2UwQlpMZ3ZKSFVndHp1?=
 =?utf-8?B?YVZPQ1gyTzU3OTRQaVQzRklwOWJydWhGSjF6aVU2bldaUnJVZXFZKzZkZmN4?=
 =?utf-8?B?REQ4bVlXMWhZRnQ5NTJGN1NjVTVBUXhBMURnK3NxMlp4RVVYZXdqK3Rkdlor?=
 =?utf-8?B?R3lPeGZlUC9ONDFWTHNwZ3hhc2Z1TU91RU9sVEFQUzBqL3NjY3E3RHRScUhl?=
 =?utf-8?B?RTJBTE5sbGF3MDdmUFpudy9ERHB1Sm45SGFaVzR4NCtnRjBNYmdMZ3R3K21H?=
 =?utf-8?B?QnREc3RHaUk4aCtzMGNyOGIveTVnckhBdGJUZjhXSVZlOS9OWmc4MmRFb2RY?=
 =?utf-8?B?ais4ZHB4ajYva1lhWXBIS1pBSXlBbUcxMkhCWjAxRGRlVUs4RXJoS3B4V1hJ?=
 =?utf-8?B?ZkQ5MVA0Y2xJVzhQVFJqa3VjWkxlMTd4Vm5nWEVYSGU3N2VLakJndk9rTG1C?=
 =?utf-8?B?eE1XTlY4RHVCc2xZUTEranVsenAyWndZelp2cE0zazVaRVYwRCt4ZlNaK0FO?=
 =?utf-8?B?NUNkcHJVRWFmQmsvcjdValdKU0JQV1lMQTBrbGE1ZWVyOFl4Q3dZUnBHVnU2?=
 =?utf-8?B?ZmoyMmJoMDFrVWhNRXNkeU5HdktIODFFbXFDWVU1dEhtZTR2ckRtcDVVZmxG?=
 =?utf-8?B?aUkrdXpuL1RabUpSUEpNMnViM3MxNEt6a3FsZldVcXZwWkFSNGZWUnZFaGRJ?=
 =?utf-8?B?MnFXZndLeXBtRVlmK2NMWjc3Z0RMbzJEczk0V01HMTVQSWN1MFk4a2Zrb2VV?=
 =?utf-8?Q?v0Hl09pEIYdoVpXs=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 18c68f93-8e80-4e3b-38c9-08da1e3fc62e
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5810.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2022 17:54:08.5693
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: OEo1edL3KPj8cGd5GSnyjE6Hd9eDEBJiCqJ3pDvt0LrU9mS6+/I2Ueh7HW8Vhnz4gosr78xVwW6OC9kjzLYmwdX90ph3n19jouA7egE3UO8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5244
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 3/25/2022 8:50 PM, Rajvi Jingar wrote:
> For the PCIe devices (like nvme) that do not go into D3 state still need to
> disable PTM on PCIe root ports to allow the port to enter a lower-power PM
> state and the SoC to reach a lower-power idle state as a whole. Move the
> pci_disable_ptm() out of pci_prepare_to_sleep() as this code path is not
> followed for devices that do not go into D3. This patch fixes the issue
> seen on Dell XPS 9300 with Ice Lake CPU and Dell Precision 5530 with Coffee
> Lake CPU platforms to get improved residency in low power idle states.
>
> Fixes: a697f072f5da ("PCI: Disable PTM during suspend to save power")
> Signed-off-by: Rajvi Jingar <rajvi.jingar@intel.com>
> Suggested-by: David E. Box <david.e.box@linux.intel.com>

Sorry for the delay here.

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>


> ---
>   v1 -> v2: add Fixes tag in commit message
>   v2 -> v3: move changelog after "---" marker
>   v3 -> v4: add "---" marker after changelog
> ---
>   drivers/pci/pci-driver.c | 10 ++++++++++
>   drivers/pci/pci.c        | 10 ----------
>   2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 8b55a90126a2..ab733374a260 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -847,6 +847,16 @@ static int pci_pm_suspend_noirq(struct device *dev)
>   
>   	if (!pci_dev->state_saved) {
>   		pci_save_state(pci_dev);
> +		/*
> +		 * There are systems (for example, Intel mobile chips since Coffee
> +		 * Lake) where the power drawn while suspended can be significantly
> +		 * reduced by disabling PTM on PCIe root ports as this allows the
> +		 * port to enter a lower-power PM state and the SoC to reach a
> +		 * lower-power idle state as a whole.
> +		 */
> +		if (pci_pcie_type(pci_dev) == PCI_EXP_TYPE_ROOT_PORT)
> +			pci_disable_ptm(pci_dev);
> +
>   		/*
>   		 * If the device is a bridge with a child in D0 below it, it needs to
>   		 * stay in D0, so check skip_bus_pm to avoid putting it into a
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 9ecce435fb3f..f8768672c064 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -2660,16 +2660,6 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
>   	if (target_state == PCI_POWER_ERROR)
>   		return -EIO;
>   
> -	/*
> -	 * There are systems (for example, Intel mobile chips since Coffee
> -	 * Lake) where the power drawn while suspended can be significantly
> -	 * reduced by disabling PTM on PCIe root ports as this allows the
> -	 * port to enter a lower-power PM state and the SoC to reach a
> -	 * lower-power idle state as a whole.
> -	 */
> -	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
> -		pci_disable_ptm(dev);
> -
>   	pci_enable_wake(dev, target_state, wakeup);
>   
>   	error = pci_set_power_state(dev, target_state);