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;
Message-ID: <17f70982-5805-b9f7-cdec-96d1ce589b9a@intel.com>
Date:   Fri, 11 Mar 2022 19:33:21 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Firefox/91.0 Thunderbird/91.7.0
Subject: Re: [PATCH 1/2] PCI/PM: refactor pci_pm_suspend_noirq()
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>
References: <20220224202937.2414867-1-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: <20220224202937.2414867-1-rajvi.jingar@intel.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cjRCMG1scVhOWnlTMVhManh5TG4yL3ovRVhEbEpWenpYTnI5VDNraFNNQlNU?=
 =?utf-8?B?QjBUSit3Yk1JekhweEVQK29jckdvMzVjMk1JRW9ZYUROLy9KcjJ6eGhHL3lm?=
 =?utf-8?B?b1hlRG1BeU1haXFGWFVyOFQvMDVXOVlGTWo5bGMzeEtsZlZONzk0K21DYlVU?=
 =?utf-8?B?SnovekZvQ3MzWm93SEpPc210WTg5dFQxNm9hV3ZTUklZRGxrYzhzK3krTmJT?=
 =?utf-8?B?T2hucUMveHYrd3FpNENkbnA4RXp1bDFDb2NBY0VlNFdoRUxIY2lYVXRhUEhO?=
 =?utf-8?B?YW9lZHZzTlRpTW5JQmtVdlhOTkVVWUFQVGl1bFBCOWkvUkxUZ0xRSEowbSs4?=
 =?utf-8?B?eE1pc1IrbnFiQUlRcmRIckZMYlVKQkdBdDFBTGtMR3ZzV3pSU2hMS3B0aVRY?=
 =?utf-8?B?VmwwYTRVQlk5aExxbUVqNkh1Z3BBb3dMQmhnTUZVSWVZMzNsME5uR3lDOXMr?=
 =?utf-8?B?b2FZbTN6QnFpUTl1S2U3SHNiNzRmL1YyUm1Ebng5cUFCMTBTcnQ0OTRyNmNz?=
 =?utf-8?B?WGI3Qm5RK05XV2pObGptRFJ3alRESnk3ZVRoMjNmai9LaVlJT0kyWkxOMjcx?=
 =?utf-8?B?ZlhzSWd3V1RpUkpDSm0rODJuME0wdGNqY0J5b0ZzcGFRUkF4bnB2aU50ZStq?=
 =?utf-8?B?VUlORUhmTys2ejFza2p5SXNSRGFnczgwYUhIbFhlL1Y3NW42Y1hwNFozTkNT?=
 =?utf-8?B?bHk1bzhmbXlJSFM0eGVzbkZxUW9VTjRWK2FtSjkzblQ4WjlRaFpaSmR1MGl1?=
 =?utf-8?B?K3l1UHpmUFNkWjBVOG9qTVFmckVMVVk4bTRIcVJub3V2OFd5eGFOYTNSakRJ?=
 =?utf-8?B?MTdKN3F5QUFabi8wUzVGM21nSnU0QklMV29Rb2pQNkhaTjFOeDRlcEwyZWZ5?=
 =?utf-8?B?WWZjRCszK295TEpMSlB1WlZBY25UdzN0MjkzZndLNmM3MDcvWTBlL3FKaGVt?=
 =?utf-8?B?aU9LV2xBaUdKUExib1NmQkxERGlvdmpZc25vaTV5RkJxYzd2M01wNHpHQnZ1?=
 =?utf-8?B?QU4zMm11M2JQUXRsU1dGVC9iUzFpbFpzcEhlQUxpM3BwNGxGZWdONk9PZ3VS?=
 =?utf-8?B?T2k3c3RCRkY3NE82eEVCYmxYTHd2emVCYWJUclFNL2YvcVhWdlJUdVJ3NEQ4?=
 =?utf-8?B?ejczcUxLVjMxSnVhZG82VXhwUEpZem9rNURpNi9iZy9zZjdzTWRlYm4vMTU5?=
 =?utf-8?B?UUhvL05pNkIvTlZRRS9qdWR0LzN5SlRhMHVLaWVkcThVTG53RTEvUWVzbHh1?=
 =?utf-8?B?YldYd3BiOFNnSnpReVh1emwyY0JBY3BsQTVqYXU1T3VJTk43YUk5bHo3YVhR?=
 =?utf-8?B?S1RycVdlc2hqRlJ4cldtaGhTRW0yYWYxRDlTL1NGbVJMT3pFSVM4dmZKMUpm?=
 =?utf-8?B?MGE0QWxoOUtCWTFuVDk4MzZpdmhRWlNCMERCMzQ0U0lvUkRCenN2eCtQNVNn?=
 =?utf-8?B?bUUzUWVDMVNmNmNNT2p5bEVHQ2xCdTJwTGhUNUJGSzNLUFYrNy9GTDR6enZv?=
 =?utf-8?B?bUs0NWozTE5jS1RpQ25qWlNZVUpzV1dKY24xOGhtbDhNQnJRa0ZrQ0hDZDVO?=
 =?utf-8?B?OXhZUXE3Y3YySVQ3TnBYdy9GUDlXNDBvbHRGMExnaU03M1lFdWpKUDgyTVp0?=
 =?utf-8?B?NFQ4Vm1YTWpuS04yNzY1Y25tTWQxeVZEQ1RjRXlML3UxcEh2bisrWEZvK1FN?=
 =?utf-8?B?RmF1YUQ5MzdPU1NWRzNzWlJSWTF0SVVLdVdWL0ZzWU5kRGVnY2Q2T1pBYmlK?=
 =?utf-8?B?MkxpeWZOVW45TEVKL3ZRaC9ydUJvRzZTTkVTbEVwZ0g2ZWtQTWptdXRYbFhx?=
 =?utf-8?B?b0xtNDdrdHl4YWxTZUdDdVlhNjlzNmxpUXJtdkF6RHpsMjRZa05pYXF6NlRJ?=
 =?utf-8?B?ZnB4OExCcGhBQ09iTHZoRnc0dXZyNmlneXdveGRKNFZTRW9lTmh3elNQS2xB?=
 =?utf-8?B?WE8yM08rTjlVVURnVElCZEd1c21RZERpSGZuUitIUVpnQUdEUXJiYmRLUWhE?=
 =?utf-8?B?c0Z1VnJqMEQ4RG81VnA1R2VCZndHVjJYSnQ5WUlpSmY3NithQS9hbjVEM1BH?=
 =?utf-8?B?bGtkQ1BJWlpvU29BYTI1NS84RmFJdDZpdGx5WXVWMmV5RUVzZzVZUDNIT08r?=
 =?utf-8?B?YVk3aGJsdE9hZ25SR29IK3NVYW1hQm1Nd2FVTmhMdDljYlVXZnZDcDZwT3V0?=
 =?utf-8?B?YUlpM0R2R3oxVnlLY2JmZkJtQUovYkFOMkx6S3cwKzk5VDRmbkRFVVpyc0JT?=
 =?utf-8?B?REtJd3BhWXgya1dCWEFoaDc1clVBPT0=?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f0a13402-e13a-4d24-e386-08da038da232
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5810.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2022 18:33:27.5362
 (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: XekYhJwxTBRAnJCofeb4if9GjBxijsqC9Tqo62YprqqLqQqJBS8zb9pEx8jKv0CYOR6uQGy5M/C/nm8lvk6kBHkzZ+Mx3lgmUKBnyF/1MwU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB5033
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham 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 2/24/2022 9:29 PM, Rajvi Jingar wrote:
> The state of the device is saved during pci_pm_suspend_noirq(), if it has
> not already been saved, regardless of the skip_bus_pm flag value. So
> skip_bus_pm check is removed before saving the device state.
>
> Signed-off-by: Rajvi Jingar <rajvi.jingar@intel.com>
> Suggested-by: David E. Box <david.e.box@linux.intel.com>
> ---
>   drivers/pci/pci-driver.c | 15 ++-------------
>   1 file changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 588588cfda48..ac3f7e1676a9 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -834,20 +834,9 @@ static int pci_pm_suspend_noirq(struct device *dev)
>   		}
>   	}
>   
> -	if (pci_dev->skip_bus_pm) {
> -		/*
> -		 * Either the device is a bridge with a child in D0 below it, or
> -		 * the function is running for the second time in a row without
> -		 * going through full resume, which is possible only during
> -		 * suspend-to-idle in a spurious wakeup case.  The device should
> -		 * be in D0 at this point, but if it is a bridge, it may be
> -		 * necessary to save its state.
> -		 */

The comment is outdated, but the role of skip_bus_pm needs to be 
explained.  It only applies to the bridge with a child in D0 case now, 
because the other one has gone away, so I would put a new comment before 
the reworked check below.


> -		if (!pci_dev->state_saved)
> -			pci_save_state(pci_dev);
> -	} else if (!pci_dev->state_saved) {
> +	if (!pci_dev->state_saved) {
>   		pci_save_state(pci_dev);
> -		if (pci_power_manageable(pci_dev))

For example:

/*

  * 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 low-power state in that case.

  */


> +		if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev))
>   			pci_prepare_to_sleep(pci_dev);
>   	}
>