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: <db78875c-c199-c442-eee7-a2a70ae7606e@intel.com>
Date:   Fri, 18 Mar 2022 20:41:37 +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 v2 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: <20220317233153.2617938-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: <20220317233153.2617938-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?MEpHMkw0azhlQldnVnpLTUhaVGpEUWxGZzFFT05RYnloNlpNTWlUOGkvcndB?=
 =?utf-8?B?bU9UNEVUZUJHckt4TldYK0ozeGxCclMzR2VYRTZzbWhIQThIV3JkeHhVZGZT?=
 =?utf-8?B?dzBwRTE0Q2c3NnZNZnNJelAwOWZDM2tueXVudWlrVDBhK0diVUZIaXRGSzRm?=
 =?utf-8?B?OUhHeXdONG55SzFoMi91YW0zZmI4QVJQdDZybSt6VVVidU5UNUdocjRuaEFG?=
 =?utf-8?B?VVJ4YjhRTjBpNkpncExwZ05CeGtHV0VhT3BsM2t4dHBBNHNnbGhTWFRIb1Za?=
 =?utf-8?B?M3hxVjJLNWU4N2ZQR2hSYmN5b3RBT3RSQm11NjFNcU5JVlRsc2hMMHlza0lo?=
 =?utf-8?B?bXlpYUFwYjhCakx6VGFJeS9BcjdZU3d5UFRXVWN0QUVkb1VwOTd0aXYrd0po?=
 =?utf-8?B?ZTNkU3h2WWZ3bWNCOXExRTFRYncrZXlqakw1dEVqY1ZYb2Y4ckZqVFlPT0JJ?=
 =?utf-8?B?RHA4SlluaGJYUGs4M2R5VUFDNXhPVUNqMURzbFRiUjRvWGVCSjVCSWNRNEt1?=
 =?utf-8?B?cmM5dWc3NTQ3MkZWUThUWjAzWGlnWVJBQlBMZU5TdU1CS1pVMFc4cUw0bUsr?=
 =?utf-8?B?WkY2ZFdlQTZYdmhSVGlPeE4zT2F2M1crOXU1ZGFyVkpkeVlpZmJrRUV6SElF?=
 =?utf-8?B?SjZYMXZJL1YzcEpBTzJsT3BLbHBHekRCMXZjUDJvS3JpWktsRGZMUEZCd1E2?=
 =?utf-8?B?bW9GUG5NelJqS2JkenA3SVQ0Y05MUnpSL3hYVUh0TllnVFo3UUR2RlVxUS9F?=
 =?utf-8?B?aWZkWFQ5aGl2MzhWUnVHblp0RzF4d0xaMXduaXpCWWpzTHZWTE9nMFFLa3Zp?=
 =?utf-8?B?NFZkRU95OG5Od3dHSlgybmhKNTlHUTJXemYySTNDYi82dHhTbXliMVp1alhO?=
 =?utf-8?B?NkE0dHhCU3E5TkVGazlZN0xvOFdaNmIwSkNwcjRBZWc5QU1YejNzYzZab0Zu?=
 =?utf-8?B?ZTRJbjZQUkZHUFRBRG94emNheFoyak00dkNJTjYvZXd4ZXl5TlhjeE1DQ0NJ?=
 =?utf-8?B?M2dhNi9lSmJoUXlkUGZXRmhpWE1NREU2UUdybTJONW1DNHNONUpwc2ExdTdP?=
 =?utf-8?B?ZTJmWGFEZ2x5c25mV1c0VDhFYUd6UmFldzU2TXpvYTRhMHJYTWF5SEdZY0dh?=
 =?utf-8?B?NlgvNWh4c3BlSU1KZWVERVFSdC93MWw0SDBEQWpUUkUyckdNQXlRcUVzQWhz?=
 =?utf-8?B?TlBwV3AxUUV5QnZIRndSdXgvZE83dlFWcWtqc2w3UDY0UUJvSkppcXF6WHdo?=
 =?utf-8?B?YWlsNWFSK0RGcU9Ha1VVdFRDdWYzaUhxYVVTOFFVNmgwTGdvYVh5UG1UbVBz?=
 =?utf-8?B?K3p4elY3aktpM0hJUDR4V0ZVLzZ4RHlKZFFpNUJGWHZ6NGQ4NkIwTm4wd0NC?=
 =?utf-8?B?anFmYnpWQjhKb2hYOHdBNzRDRllnY0NTR0ExNjU1SkJjTFdwVmI3TlpYOWtT?=
 =?utf-8?B?bW9HTHNIeGVqQlhKNE5TZDJWR2hlM0hBMm91NWdkOEp1cFNCbHhOcTI1Wk9U?=
 =?utf-8?B?b3VQcVNYSDM0bmx4V3l4citQOUxvVlhCNUx5QWx4UVYyNGZDZDluelg5YTVv?=
 =?utf-8?B?NGNBUEhMTlBpOVo0bW5NV2dHdk5xbldYcUlUeGVObHRFQjJDNGgxVDRPTDFZ?=
 =?utf-8?B?THVHY1oxd3luT0RtM0NsbDRpOVU2ekJXc2p2UVdyck0xVkhZb0xZYjh4MGdQ?=
 =?utf-8?B?L2FadnZMVytSRXNFYWRGVGtTZEd4VWswZnNrVmtHNGx5NlZ3YnI0VnRNbjNV?=
 =?utf-8?B?RXgzUko2Zm1OTkFheGgybGtCbFdRdnZaaEpQRzBPd3QxNWRmWnFNaXBNMjJk?=
 =?utf-8?B?RGd2VVp4NG1VeE5qTVBRNlFnNW8zcjRCUGt1b3BxWE1BbVNDc2FheDhOK1pZ?=
 =?utf-8?B?cytPNHk2dVpmb2lQamhteHdrOWl3RzZuSytRWUNVWHVCNkxGQkkxVmVQMjBz?=
 =?utf-8?B?MmoyQjNFeUMvNUVGZ0ZaS2d3a2VFZXMwZUhxMkFWRVRqS1ExNlNLaGhHQ0Jk?=
 =?utf-8?B?bFJFWXFERzF3PT0=?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 1cd31ce2-1bd2-4ff0-aa48-08da09175498
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5810.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Mar 2022 19:41:43.9702
 (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: IjchRU4Z6kC75eDODjyIdBpI1vf0cdLbgaV5DYaMYF95QVfOKt2aBSWGAX2C0GN6dCJwi6CgeRuEfT6XMLZ3hvnqlLr3L6eGFv/IxB7fatM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2254
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.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,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/18/2022 12:31 AM, 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.
>
> v2: add comments to the changes

As mentioned by Dave, this shouldn't be here.


> 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 | 18 ++++++------------
>   1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 588588cfda48..ffe76f238d7e 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -834,20 +834,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);
>   	}
>