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: <da80fb19-0b98-bf19-eea3-bc2cca2024f5@amd.com>
Date:   Mon, 22 May 2023 06:28:25 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.9.1
Subject: Re: [PATCH v2] PCI: Don't assume root ports from > 2015 are power
 manageable
To:     Mika Westerberg <mika.westerberg@linux.intel.com>
Cc:     Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        S-k Shyam-sundar <Shyam-sundar.S-k@amd.com>,
        Natikar Basavaraj <Basavaraj.Natikar@amd.com>,
        Deucher Alexander <Alexander.Deucher@amd.com>,
        Iain Lane <iain@orangesquash.org.uk>,
        "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
References: <20230517150827.89819-1-mario.limonciello@amd.com>
 <20230522055555.GI45886@black.fi.intel.com>
Content-Language: en-US
From:   Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <20230522055555.GI45886@black.fi.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?VWNKYURjOVNLVStoRzhlTXlPRkVIQXJ1WWRoK1U2RVBURHJuZDNBS0htWGRY?=
 =?utf-8?B?ZXRkN3djRzVCSm85Z1VMT3V2WUd1TDlsRmRrNnN3cDlLellqbmxkdjRGYWFz?=
 =?utf-8?B?NE85dkVocWltNXVSMkV1dzJlQ25xWGNwRXZvOGtLY1lEQmRhQmt3V1RGL0du?=
 =?utf-8?B?dFM5a0pFNklFSGpYd2tFenB0azJqeEhyQUthblVZZWhlcGNTNXRRMHIwVXpt?=
 =?utf-8?B?dEJEa0NFVWNjTUpUMGlPM3Y2YXozZkFyUElKM3luU3daUEQ0bkx2c2dtSkc4?=
 =?utf-8?B?aUhQNkZ2OU5wOERSTkxleWVIMDJNc2FZdFc5N0YrRWxKZGxkOTZhcURHaFEv?=
 =?utf-8?B?OXl6ZEZ0NE5ZZXNxcDR1NGpTMHF3Ylc1MGJPVkZJZzFlWlhmUS83aVI4WUZI?=
 =?utf-8?B?ODE5YmxMZndnNi9pTGhwYXYzMzRyamJrLzBGOHpVaFVRdkRVb29uYXI5OG5t?=
 =?utf-8?B?aUgvM1ArWm9WWHV3ZmZKUjg5SnlJTUhZZ3E3WSs5ODhPMnQ3aUdud1ZQRnJr?=
 =?utf-8?B?cTNRNFBCeGNmOWJhN244WkozS0RneUlTYm9SWTVtWE9uY0FFVWt5NzREcmpC?=
 =?utf-8?B?YlhoZ2JxdGlJdVB6N2lOVmpxbDc1aStjMkRFRUxRaWtrNU9VVnM5NDMya2t6?=
 =?utf-8?B?ODQySUV5TnlyZENOcUJOTXhieGNLUVpqYzR4UTFBNUtSK2M2SDNQTEdERU0r?=
 =?utf-8?B?eDZHSHlrS29LTUxsZ2FzVGNmSU5tdmtoa2JNVVRmb3p1aERRV1liOGJZazNO?=
 =?utf-8?B?MmI3VUMyWXN6QzVPQXhENHJKVVFaeXcxcFpwV3VCald0eDBmdE1WTTZnZVI5?=
 =?utf-8?B?VG9YTG8vWHk0UGdwY1VXZStDMkFVdW8vSU4yVmIzeFZCSXZ0d0VBbU03NEpk?=
 =?utf-8?B?dU11RFUzaGtnVFM2SzNHSlJSdU1nN05vVVJlUDNnNUFFOEVZM2twVThvNDY4?=
 =?utf-8?B?eXVOdThTWXFXNThtV2dQcGczMnJ5ditGSGswQ0h2Sm1qS3hwOC9MYk5xQTBv?=
 =?utf-8?B?NDZpUlExZmRWOTQ2MlJCZkJ0d0FqcWhYUjZQdWtWYW1JUVR5ZDhEWnBtbHZR?=
 =?utf-8?B?YktQSTBXTGxGT0FzQWNaYzVQaTlCeWRYQzBUUE5iUk5TSWJrbFRRaVdBRVkw?=
 =?utf-8?B?dVRFMjhkdzBhT2kyODVXQ1BZd25DSzduamdvN29tdHBUcEp4TjBtdXZETWZs?=
 =?utf-8?B?OEhoWUVvUlFDVm5DTXBaMlN1MFIvSWZPNnFCdjRneGdtSUUvUWx6eVZITXVC?=
 =?utf-8?B?Z2huU1RCRDROdmpLbVNFYlhUaGRqVW56dnJOQi9aQ2paOWx6MjdYSnFkRDlv?=
 =?utf-8?B?YnhFbVE1OFZJK2drN3kwbCswTjRCTTd4UWZpb3dZRzNiblh4ZGZHMmFCeUlX?=
 =?utf-8?B?VDhXN3R5N3c2WmRHSnB5bG54TW0reHpGekxyK1ZINVM1U1I5TENUYldBN1pE?=
 =?utf-8?B?ODRtTXhzeFM2Qk4zVU1VbkZpK1VzQmFzS3pEMmVkK3Ard21XaEJZSWJJM1F6?=
 =?utf-8?B?V3pDWW9MVVFqNXdGN0JvRG5nMzh1KzJhMm1iVi9HS1FjRU5DVStUYlRaZHdH?=
 =?utf-8?B?SEJGN2pkOFZtRjdkMStoVmdGUE1WZ2MwMGRzOFVlNjB5R1RGQVZmR2RzY3I4?=
 =?utf-8?B?bkFXNEpzYk1xL1B5T0tNRHE4YkF6SEhGMW05LzNxcCsva1dXWmY4UGlmUFZJ?=
 =?utf-8?B?ZFhvcFhEalh2eldJT3gxK2xFWHV5bjNXTmVDYUZNV0lLd1M3QVpVelJrdm5L?=
 =?utf-8?B?UjJMSmtQMVlLSjVYS2pWSXJ1d0dsV0poRUpHNVp3ZXFWakNzU2UxMkVpQ2VI?=
 =?utf-8?B?cjY3UGplR2V5dGxNSGJOZDNYTlU3YnJ3eEs0endiN2lXNThjWjZacVJHRmV0?=
 =?utf-8?B?T1pWUWJmQUVBQ05KSEFKZHRkUTN5UDltYUV2SDZhc2Vxbm5HMjZQd202V2Uy?=
 =?utf-8?B?c2N1bEVPdGtKSFY4SHdNZHZZNDJPeVNQaGhPKzlXNUNSUW9lK1NWRlRMd3F6?=
 =?utf-8?B?M2dnN3Y4bmhFY3F5UllmV2hya0dYaUFyZVBJR1JBL2lrWUlwWkl4S1VGck4x?=
 =?utf-8?B?MTNaRmEycUlYNW51ditBNjNTNW1FcW56d2RVMWJLRitQUUZKWjAwVjdiNFNF?=
 =?utf-8?B?RTI2OWp4SDVzY05HWnpwYjJoN09GemdJU3VEd01YT0NWTHBiMHp1ZlR4b1Ux?=
 =?utf-8?B?N1E9PQ==?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 88dde69e-96df-44be-7422-08db5ab7a9e4
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 11:28:28.0708
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 14L2mraujNqATFcFPjf3Sas/2adccwNaUYp4Hc4Clbeoqi0mZ/Gk3X3j2UVH4SnA/xC2lc7EAHVEITeyOvhOoQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6623
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=no 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 5/22/23 00:55, Mika Westerberg wrote:
> Hi Mario,
> 
> On Wed, May 17, 2023 at 10:08:27AM -0500, Mario Limonciello wrote:
>> Using an XHCI device to wakeup the system from s2idle fails when
>> that XHCI device is connected to a USB-C port for an AMD USB4
>> router.
>>
>> Due to commit 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during
>> suspend") all root port go into D3 during s2idle.
>> When the root ports are in D3 over s2idle it's not possible for the
>> platform firmware to properly identify the wakeup source.
>>
>> Comparing registers between Linux and Windows 11 this behavior to put root
>> ports into D3 at suspend is unique to Linux.  On an affected system
>> Windows does not put the root ports into D3 over Modern Standby.
>>
>> Windows doesn't put the root ports into D3 because root ports are not
>> power manageable; they're missing _PRW and _S0W.
>>
>> Linux shouldn't be assuming they support D3 just because they're newer
>> than 2015, the ports should also be deemed power manageable.
>> Add an extra check for this to ensure D3 isn't selected for such machines.
>>
>> Fixes: 9d26d3a8f1b0 ("PCI: Put PCIe ports into D3 during suspend")
>> Reported-by: Iain Lane <iain@orangesquash.org.uk>
>> Closes: https://forums.lenovo.com/t5/Ubuntu/Z13-can-t-resume-from-suspend-with-external-USB-keyboard/m-p/5217121
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>>   drivers/pci/pci.c | 3 +++
>>   1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
>> index 5ede93222bc1..3fe27aef09e6 100644
>> --- a/drivers/pci/pci.c
>> +++ b/drivers/pci/pci.c
>> @@ -3010,6 +3010,9 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
>>   		if (dmi_check_system(bridge_d3_blacklist))
>>   			return false;
>>   
>> +		if (!platform_pci_power_manageable(bridge))
>> +			return false;
>> +
> 
> We already call platform_pci_bridge_d3() few lines up. That function
> should know whether "platform" supports D3 for the bridges, and I think
> it actually calls acpi_device_power_manageable() that platform_pci_power_manageable()
> ends up checking too.

It does, but it doesn't end up returning false if it doesn't support it. 
  It only returns true if it does.

I've tested this patch on two different failing platforms and it works 
now on both.