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: <cb94e592-0fd8-3274-aeeb-49fbd6f74761@intel.com>
Date:   Thu, 14 Apr 2022 19:53:25 +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 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>, <linux-pm@vger.kernel.org>
References: <20220325195053.769373-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: <20220325195053.769373-1-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?ZzRJbEtXbkZ1emFzTURPNWFxRWxrU2UwR2ljSnFJTmdMV2tqeW5mN3dhSGN2?=
 =?utf-8?B?bWp0NFlsUDhpL3NFOTJpb0NHMTJVMER3eDVodlhDdTNNMDZTbG8rRmpSVHJT?=
 =?utf-8?B?UjdFSW9JQ2x3NDU0Y0daelJQY0p3U3JSd1VPSkdyMVo4dk8vVjh2TTlzZzFH?=
 =?utf-8?B?WXNhNjh5RlVrTWJQVkxPWmY2dElZSVEwTkNnM09OcDFEUjlOdForOTllT0NO?=
 =?utf-8?B?VGVWNGF3V1FyKzZzemtyUjZmT3RUNG81Q25PQ2RsYkxoc25rY1NoZ3pNb2Np?=
 =?utf-8?B?RGlhLzF6UEFWditpbEEvVkRYeDlkWkNXMmdWRzBiakJGZHlJNktZb29EZlpt?=
 =?utf-8?B?dU0zVDkzUmRjc3JXTzBtdnhwb3RtdUpNS3pxNTkrTWhjTHhjdStUcVNOSFFv?=
 =?utf-8?B?bmwrOUpibHJqNXE4amlpM3BtQjU2dVRoWjNOVWFVT3RPTXpZZ3hUR2psbVBy?=
 =?utf-8?B?dHBjWXV3MlJpV0JtK0cxR2t6QWFMdFFzR1RFY1BxUXcrVXZIVGVwMzV6YXdC?=
 =?utf-8?B?SnhiZHRzaDFwK2ZaUUFKenVoSGt0SlNiZk1HdytoZDRCWExUV3ozVE9BQ0FM?=
 =?utf-8?B?c2ZZUjJMdG9zRVdDVitlTzRJZmtkQ0RYYzhSd2toYjV2c2x3RHhKK2RScFBs?=
 =?utf-8?B?OUFQVU8vNTRSZm03cW8wcldkcTdjdEtaZVE2enZkTjg5ZVUrSWthcGorVjNP?=
 =?utf-8?B?M29nZTdMNUJXczJ3VWQvM3p5b1g5elNKd0RCRVZkbUVRc2pvWGdLTmRRVWlG?=
 =?utf-8?B?bElYUE9BSUROZlNyNkdIVVFlMzlLdU01NmRvcUd2UTB2MEJwUkl0RURqTDVi?=
 =?utf-8?B?QlpsK25CTHZSWXcyZWYwaGcyem83Vmk0MVVmVmVXQnQ3YTNBMHhPY0ZIUW9k?=
 =?utf-8?B?bXVGdXBvemFCanhGWjBPZDliSlo5MTJXYWhabFNpQ2ZuQlJzOUdQN25LbXEv?=
 =?utf-8?B?amJ3WjJqa1lrMmYybk9KUTdtcEZ0cTNHNkF0c2h3TE9WNjl0U0MzSndqWDJz?=
 =?utf-8?B?S3R2N2pMeGpBNzlyay93WmVxb0k2aGhjcjcxQzNUb2ZXL0lSemRObVE3c2xk?=
 =?utf-8?B?WlRIR2ptcmNsS00zNU9XQ0ZUb3RmY2J1K1BMc0hUdXFtdkxpNmluTnNVcW04?=
 =?utf-8?B?dmhHQ3NUSVd2czY1a09aSXdFVy9hTU10bWdTOE1MTEFKTHRRclpJNjRUcTB6?=
 =?utf-8?B?aVEvZHNpWk5IdGhQVlh6aTZTektkYStENVVXVVh5anBrT3VyYWIzMzFZNWxV?=
 =?utf-8?B?aC9mYWllbkM3N1N1a0RIdHBkYm5PL0MxU3NFQUt0YndHWTVWSG83WW0rM05N?=
 =?utf-8?B?WEVqcmtKN0oyRVA0RUg3T29lcThKV2FqWEh4VEhrT2RQNERvS0hScGVaQ2hN?=
 =?utf-8?B?bkMzU3ViK3dRWE00L3RtWlp6ZzlzT1VjaTA5aVFpT3hraWJkVE4xSEJzU0pj?=
 =?utf-8?B?MHNiOWVDdm1LbjczTWVReVR2SGcxV20rRkJ1bW5oT2RQSGJEUHhoRVJ1Wkt5?=
 =?utf-8?B?czBpeTNHOVlySkhwdjFKS1paaUs2K1k4UUxhUHdnVjc1ZTVnL0xoSmRKd3hZ?=
 =?utf-8?B?UmRDbGlyREFnUU1VTnpwR3pnSzdpanVVRVkvOTFWZEZDMisxaWNjUDVIMFUr?=
 =?utf-8?B?bitXVTV3TlB3cHR2TEZwMFFCSG5tdXVXWFdjVFBxUkNobkNyOXZVN3lsZUN1?=
 =?utf-8?B?ZmtTbCtjOUVPQ3phRmRUamY2QW8wemVsN0xaT0NlMnp6aUVGc28zZVJsNEh4?=
 =?utf-8?B?UkJKZmUrWTB1NHdieDlBY1VKWndQWXVlWG1sY1huUW9KL1BiUGFJbG90bDRh?=
 =?utf-8?B?UXY5d1huNk16R2RhNE0va0FwbGlDa2FZNWhpSnNZdys4Wkx0YjVNNEYyWlV4?=
 =?utf-8?B?NWJUdmNmdDZ0UzVRRG5VSXpYOVJjSEgzUlp2Rlp2R1diblMyeDZMbDhVR3ZP?=
 =?utf-8?B?WUVXR0VseHNneDM4YXQzcUE3UDlmOHZ6bndmaGNCejQ3TFlZOVhRdFpEK3FK?=
 =?utf-8?B?ZUhrRWg4Mm0vSjVqcG12bllxeThHcjF3ZzNhczAwUHVURm1nNjdVQytPWmsv?=
 =?utf-8?B?WktVZ0FTU1c5bzkxRFJHMjlRN1J1Z1VQQ0lmc0ZVZEp3K3d4NHg3TWhvZERF?=
 =?utf-8?B?Z2tESHZBYXMrMm5ITTJqY21yYW9kTjRZV0RRcmlDeEJ6NERyZUVockF2Rnpm?=
 =?utf-8?B?SlNBaUlIWklsVWw1TlBiRDRUNTNyZEVhejJGbHdidUVMeWpRSXRtcHBmUjB5?=
 =?utf-8?B?c3Byakt3blZOVWdNTGZSY1RHWFJoK3VDOVVhTnNGRml2NVJlZVNJQ3cvYkI5?=
 =?utf-8?B?RUxTM2l6Nzh5LzVyei9jTUU0NjRTU0RZaDlzN1dtMzNEblpHM252S3hBSnVZ?=
 =?utf-8?Q?49dMRKQQXg144060=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 7f66f2b2-8bd4-458b-3fad-08da1e3fb020
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:53:31.5834
 (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: l4AsUctZExLDFvUTwS1FXJrGeROHXbdOskWG11PjwWDsTAJ/lAevmGtLaR4ob+aQOphyW2XjLTlDAhMg5vsUxLCeLPz5edOi+nhkVl1qcSo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5244
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-5.3 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_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 3/25/2022 8:50 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>

Sorry for the delay here.

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


> ---
>   v1 -> v2: add comments to the changes
>   v2 -> v3: move changelog after "---" marker
>   v3 -> v4: add "---" marker after changelog
> ---
>   drivers/pci/pci-driver.c | 18 ++++++------------
>   1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 4ceeb75fc899..8b55a90126a2 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -845,20 +845,14 @@ static int pci_pm_suspend_noirq(struct device *dev)
>   		}
>   	}
>   
> -	if (pci_dev->skip_bus_pm) {
> +	if (!pci_dev->state_saved) {
> +		pci_save_state(pci_dev);
>   		/*
> -		 * 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.
> +		 * 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->state_saved)
> -			pci_save_state(pci_dev);
> -	} else if (!pci_dev->state_saved) {
> -		pci_save_state(pci_dev);
> -		if (pci_power_manageable(pci_dev))
> +		if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev))
>   			pci_prepare_to_sleep(pci_dev);
>   	}
>