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: <8cd8d02f-f4b2-3ad3-a3e5-f9857d8519e2@amd.com>
Date:   Tue, 16 May 2023 15:44:17 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.1
Subject: Re: [PATCH 1/2] power: supply: Use the scope of power supplies to
 tell if power is system supplied
To:     Sebastian Reichel <sebastian.reichel@collabora.com>,
        Mario Limonciello <mario.limonciello@amd.com>
Cc:     heikki.krogerus@linux.intel.com, rafael@kernel.org,
        ajayg@nvidia.com, andriy.shevchenko@linux.intel.com,
        linux-i2c@vger.kernel.org, linux-pm@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
        Evan.Quan@amd.com, Lijo.Lazar@amd.com, Sanket.Goswami@amd.com
References: <20230516182541.5836-1-mario.limonciello@amd.com>
 <20230516182541.5836-2-mario.limonciello@amd.com>
 <20230516204114.vv5w2vmcyulmhmm4@mercury.elektranox.org>
Content-Language: en-US
From:   "Limonciello, Mario" <mlimonci@amd.com>
In-Reply-To: <20230516204114.vv5w2vmcyulmhmm4@mercury.elektranox.org>
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?MDl0SnFKYU9qdjAvSnFDa3hpSkZmcS8zSzZrVGRwc3ByV3JrZzZ5T1RTRUF1?=
 =?utf-8?B?K1NmcThqSTk3WDdGSVVBQWJOa2l5RzBjc0puTUxHY0RKWHBVY3hmNmZlL3lo?=
 =?utf-8?B?SUhGdzhJcW1wY3l3WUt4Sk1XZXhYeG9xODBtdzYzKzVYQmlsVENGdTc2MkZH?=
 =?utf-8?B?OG5lZU1Bbm1yR08xUXVNRytMeVgxK0QxeC9sQjR3amVadW1VekJMbUVXd0ZB?=
 =?utf-8?B?enRPRUYySmc3ejZxZTZrb3V4NkdRRkgzNFd4WG1xMGlvVkIwUjQwNzhUeXpQ?=
 =?utf-8?B?aUV1M0pNb3pQWVo5NWVUMGFleS9Fdm9OZS9FZDlqWUVuV21zOVdqaGI5YnRw?=
 =?utf-8?B?WHpueXlOZzlGVy95VlFIeFJYbkxYTjdxcHhLak9IN3FoVkgxN28rQWk3UE5R?=
 =?utf-8?B?SGQyUUx5OHVJZkJvcWlGdEY3bmNDVUk1aFBvVzZxaGFRamozbUxQOU5sZVZh?=
 =?utf-8?B?b3JpTXNaeHBxZzdqcTRmSU5HZVc0QWZOcWhBbDRqUnNVQ0VneGs5RzdrT0E5?=
 =?utf-8?B?MTJlTmhJTTBsVGtYcS9lc3I1YzgxOXE4RlE3T0pIcjAwVFRZYnJFaXBNc2xY?=
 =?utf-8?B?QWU5dG9ZaVRXQ0p6eXhZZ0FybWFZekdrL2FpU0lDM3ZCbVY2NjdxT0RaaUtj?=
 =?utf-8?B?ZzdUOHlCOVAvV3hXRzlYa0hZUEMxdHU2LzlUbTl2SzRLUUNHVEtFejMzU3A2?=
 =?utf-8?B?Q0ZOb1JjT1BPSHl4NUw3TlptMUhIaGFBNSt5cFZHM3ZGYXRnaUJydDhzL2Z4?=
 =?utf-8?B?M0tJUVFqaGhtaVlYdDJiMU1xQ01HcDg4UCt5dzZ0MWZidXJDUzVQc1BYQ2tw?=
 =?utf-8?B?Qk1mamcxOFZEVWlzSUJtR2ZMM0ZxT1BnTVg4Q2g3VFhicmFBN2RCaTNYNW95?=
 =?utf-8?B?b2VVU3MrM2w2b3NndnR4bk5aR3IzdkN6L1NtV3ZJdDc0MUxPVjhGREMyV2tr?=
 =?utf-8?B?TExBN3ZqMTRyb2prK2ZlR25uZkMvQjJ5TUtFWDR2V05hTGEwMTc3QXZCNWUz?=
 =?utf-8?B?SFdoaU5kYkxDTXZ0UDBvUktoakVlNDEzSU40anVhc3BQOUI3TXJJNDQvckQw?=
 =?utf-8?B?S1BqRHA2ZjZjUlY4azFtZHFVMGpqTTNwcno5K0lSeGtwNWMvQTMxNE9FMU56?=
 =?utf-8?B?V0FkMjkwUkFvOHU5cC9sWWNnb3pIMGlQanAyOTNST2RqUjFoS3JicFVYdDJ4?=
 =?utf-8?B?MG9MdUt6RUVRQk1iZlY5aU9qUkl1Ly93U2kvQnNFdWV0cnloUlo4aXUveEd4?=
 =?utf-8?B?NTVlMEd3YldGNlVZb3pDdWtQSGcySGo0dDN3WER5bXduRVhpS2lpdkpESUN1?=
 =?utf-8?B?RG5NRXo4dHQwTmpOTVA3ZFhjcW0vZTNhYlROaFZXdmJuaEk4bENuM2lvRFFy?=
 =?utf-8?B?dDN5N2FaTHhSVmpzYklKQktOVCtPb2VaNkY4d0tqelpraTJaV05LWWxHeHc0?=
 =?utf-8?B?ZklZdUMvT3cxSlh1VUVFTlJpbmZGQUR3QnFyQ2plbEh0QW5KMDFyNG15ZjRx?=
 =?utf-8?B?U3FXSjByMU1PUCtHdzd2OVV1SkhtVEpyaC9XQWNGcGNoL2VMVU5EODdjMXpl?=
 =?utf-8?B?RlBhNy9RTFF6RVA3cXp0NmV0Rlg3OEZBTkw0RUlIWTFvVEZET2N3MWdRdW9s?=
 =?utf-8?B?M1l3d1ZabGhaUGFjenN6cEw3c0VFcW1ZL0dWMllVQXpKSE1icHJ6LzRmZ1hi?=
 =?utf-8?B?TnhiY2ZvVy9scThEQ3RIY0xwTXM2YkI1ajhQQ2NvU041eTBSODNHSmtEamZQ?=
 =?utf-8?B?QzFyc0lwRE1mUm5vZkx0QUwzMzlmZGtuampIZE9RZWEwQU9uTS9jRllGT0p2?=
 =?utf-8?B?QW9hejYxcURiaEl6YjFJYytCWG54Y2N3dzNocmsyM0tMZC9lN09LYUFtemF0?=
 =?utf-8?B?NFptRCtOK0RmdHg1UkdFV3ZnY2FzaUZEb2F2M0NtMjVWY2FTaTlGS3R3L2ZL?=
 =?utf-8?B?MGhhWk9hK0dDWkpaNmJoOCtlZjZzVm1LU2NnSFcxdVdEdjFlcklIcmtlSTVX?=
 =?utf-8?B?VDVCRWFMVHUzV1o3Z2pqU01sNlQrRVlTUVZaRHhLNmd4ZjhBRkpZbjhSYXB5?=
 =?utf-8?B?U3hSamg0YkZrNnl5bjE0d3l6ckRCMHphdU4vclZlTnUva0xJMzRVdjBFTk83?=
 =?utf-8?Q?NNy5mflFpsxduv4oKGvvKRk2o?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3807c1c3-a552-4f4c-90e3-08db564e532a
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 20:44:20.9927
 (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: YbL/38pSDaSOLlWFNnD/+M6f2+T+ZAoZQan/mIZ81HGJuuPqk98OC/fkxCUoOvrC2jA84tM4g/0HNO8aQeDk3A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4118
X-Spam-Status: No, score=-3.8 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,URIBL_BLOCKED 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 5/16/2023 3:41 PM, Sebastian Reichel wrote:
> Hi,
>
> On Tue, May 16, 2023 at 01:25:40PM -0500, Mario Limonciello wrote:
>> The logic used for power_supply_is_system_supplied() counts all power
>> supplies and:
>> * If no power supplies found assumes AC
>> * If non-battery power supplies found uses online to determine AC/DC.
>>    - If any are onlined, assumes AC
>>    - Othewise DC.
>>
>> This logic makes sense for desktop systems that don't export an ACPI
>> battery, but it fails once you include a dGPU that provides a UCSI
>> power supply on a desktop system without any other power supplies.
>>
>> The dGPU by default doesn't have anything plugged in so it's 'offline'.
>> This makes power_supply_is_system_supplied() return 0 with a count of
>> 1 meaning all drivers that use this get a wrong judgement.
>>
>> To fix this case adjust the logic to also examine the scope of the
>> power supply. If the power supply is deemed a device power supply,
>> then don't count it.
>>
>> Cc: Evan Quan <Evan.Quan@amd.com>
>> Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
> Good find; the current logic should also break with a desktop PC
> once a POWER_SUPPLY_SCOPE_DEVICE battery device is attached (e.g.
> a HID device), because it increases the counter.

Yup!

> I suppose I can just apply this to my fixes branch since there is
> no compile time dependency to the second patch?

Yes, that's correct.  I don't see a problem with the other patch going 
through
another tree.

> -- Sebastian
>
>>   drivers/power/supply/power_supply_core.c | 8 ++++++--
>>   1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
>> index ab986dbace16..d57f420ba8c3 100644
>> --- a/drivers/power/supply/power_supply_core.c
>> +++ b/drivers/power/supply/power_supply_core.c
>> @@ -348,6 +348,10 @@ static int __power_supply_is_system_supplied(struct device *dev, void *data)
>>   	struct power_supply *psy = dev_get_drvdata(dev);
>>   	unsigned int *count = data;
>>   
>> +	if (!psy->desc->get_property(psy, POWER_SUPPLY_PROP_SCOPE, &ret))
>> +		if (ret.intval == POWER_SUPPLY_SCOPE_DEVICE)
>> +			return 0;
>> +
>>   	(*count)++;
>>   	if (psy->desc->type != POWER_SUPPLY_TYPE_BATTERY)
>>   		if (!psy->desc->get_property(psy, POWER_SUPPLY_PROP_ONLINE,
>> @@ -366,8 +370,8 @@ int power_supply_is_system_supplied(void)
>>   				      __power_supply_is_system_supplied);
>>   
>>   	/*
>> -	 * If no power class device was found at all, most probably we are
>> -	 * running on a desktop system, so assume we are on mains power.
>> +	 * If no system scope power class device was found at all, most probably we
>> +	 * are running on a desktop system, so assume we are on mains power.
>>   	 */
>>   	if (count == 0)
>>   		return 1;
>> -- 
>> 2.34.1
>>