Received-SPF: pass (google.com: domain of linux-kernel+bounces-97532-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <9ee40386-7367-4219-9833-54bffc173aa0@amd.com>
Date: Fri, 8 Mar 2024 14:06:38 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 1/2] platform/x86: wmi: Support reading/writing 16 bit
 EC values
Content-Language: en-US
To: Armin Wolf <W_Armin@gmx.de>, hdegoede@redhat.com,
 ilpo.jarvinen@linux.intel.com
Cc: rafael@kernel.org, lenb@kernel.org, linux-acpi@vger.kernel.org,
 platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20240308195027.7640-1-W_Armin@gmx.de>
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <20240308195027.7640-1-W_Armin@gmx.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?TWxtT0p0RDZNdFZBdDNNYWVVWThaZGxnR3FvL0pxcmY3WjRYam9Pb21qS0F3?=
 =?utf-8?B?VHZJbEJOcExvbHl5SlFpSFdLVUZaaHZjZndva1YxYmozT1NqZTFvay9mT282?=
 =?utf-8?B?dUJGS3ZxN3crU2pweDBHbE50NXcydkRCanU5MFpWZlUxazZaZDArRU1SNkl5?=
 =?utf-8?B?eVN5Uis1TlhRKzMyeCtjaTM0M0djUzhNVEJUM1ZmS0EzWVhjVlYvWFVJQnlK?=
 =?utf-8?B?OER3RUNObzkxOXQyb0ZvUlBBT1JMYlhDcFNSTzJrdUszQmRKbS80SE5iSFh6?=
 =?utf-8?B?OUg0cjB2YVNHS0xWMVZaK3VUb2xPU1kxbjBySGJSUDRIcVhDbVN5ZGVMQzdO?=
 =?utf-8?B?L21OTTRYMWFSNFdzejNqVUZ3bTVMQno4Y2dyNGZVR1doRTRuU2psTGlPTUo0?=
 =?utf-8?B?TjhxWXRmYm5BbHd6SGlXbTA0OSsvSzlOK0IzSWMrZUpFcHB6Y2VHVk1Ba1Za?=
 =?utf-8?B?L0xVN2VwZEtJZFJtTjlUb29OWnlzOFdjRnZvQlV6aDhWLzRUVUVYSEtCcXMy?=
 =?utf-8?B?MUszejNrRmRNTVFJbktRUVJvdW5La3pBeTIvN0MyVXYvZ0dhVjJnQXN3Z3Nl?=
 =?utf-8?B?Y3YwYjZWSlM0MlZJYm5yU3QrbTNpQmVuRE04NjVxL0NUUnV2ODVreEZ6MVFG?=
 =?utf-8?B?YUNZRGVEZmR1S2QzWUMvNTFkVzFjbmdzeGVmK0pldktlbk1xbDhWZ3NWWDFp?=
 =?utf-8?B?akxrMnRraEVvWGRvUStzWEVNYkxTdkx6QTRoVWtORGRTSm56bjZnN2tvcXRV?=
 =?utf-8?B?SVRBN3FUbjNZNE5qNlhYa0wzcUtqV1hzODlyVlNvU2NnektIMEh6ZFg3bTFR?=
 =?utf-8?B?aGV6Zm9PbklMT1BHd2N4Qml1TnhSaUFuQTR2Mjl3Vm5saXhHQWJhQllreHdS?=
 =?utf-8?B?c2s5aFhyYWlzT2tjK1BPQ1V6dUl4SVJ0bUk3a0RCVDVPNkdVeXJCdmNmMnlM?=
 =?utf-8?B?WFA3RjBBSTRWTndxZ0VRMDJ3Zk9CaXNXQTdSaFBRSmxtZEhEcHZqaHBJNzVL?=
 =?utf-8?B?bGZULy8xbU5wYjNGaFVTSzIwSy85UFkxNlhuSDNCUFdCcjVCMmNzYjlYdWZX?=
 =?utf-8?B?b2JkRWhWMzc2WWpSbzFZSFJocVhCZ3VLSTlrWVZXczhJcHh1UkZQQmJzTXFP?=
 =?utf-8?B?bjMrRVNOeWFoQXB5VTlSYmhyWGxVZXpKVU1vSW1VYXhBZ2Q5ZXIrdU03eUxI?=
 =?utf-8?B?RXhHb2V5LzNVMU04YUJaelBvR0xEMjllNElJdW5Ub0dyUUhyNG5vNFdnZCs2?=
 =?utf-8?B?OHA4bFpEUXZ4QkYreGlRMzRjamg3K0FpbWpzTWhVd0FVM1ZoNVYxbExseHVP?=
 =?utf-8?B?Rm9xMjBML1o3Rlhyc1dtTElLT0RSL3FEUlhNaEp4YlAwM2EzWFdjSnU3U2lN?=
 =?utf-8?B?Y2lZVFg0cHY3azdvTzk2QXNHd2c4Nm5YL09rVkk0M2hpV0lFMTlFcWtSeXhj?=
 =?utf-8?B?L0pjaVZnK3k0NmdrSG9hMXROeGdTZHlJUnRMeWlKazh1di9lZUg4WHZQRGQy?=
 =?utf-8?B?QW9UVEdQRXRRS2NRTzgybFVwcGF5NUV3VWt3emFLOFdyaWh6eXNvZ0tRRG9U?=
 =?utf-8?B?ZzlBVWUyU0tIVDBEUWhPbmY5YmZTdThIblFsMmxJSmZLd1orcDhNOHozalJ4?=
 =?utf-8?B?ZUxSbzdqVTAveEI1bURUN3BUUTI0elZsTmxuQ25HeU1sekZPby8yNDQ5VTBn?=
 =?utf-8?B?OTVkUENJa3ZBTTl2ZUNOeVB1N1JOdEQvTmZidlV6SENYTVhqSkE5SXVOM3Qz?=
 =?utf-8?B?UHV1bzVKcTJpaFB6SEtPNUN4VUlCMENHV0dUNHMrdEoyTjd0N0Y1cEtHNEd4?=
 =?utf-8?B?cVc2ZTBCUS9nQkRROS9waHJGRDdTa3NCVjI5d3QyWFQySGxJUmVMUGVvTXNl?=
 =?utf-8?B?OWt6RWdDNkw3cXVHUkgyMUxLWEpObmVMT3d3TG5pMFdXOTNpSlBWN3VmeHl1?=
 =?utf-8?B?b3d1YkErMUNuTjdkb1NwNlhRUXN5QTFBWlhmRzBYa0xPNU8rWkJqYmsvSlJq?=
 =?utf-8?B?djF2dTZIRit6VnE3K1dLRnQ5OWc1WmVoMUM4OHpoTzZMbUNtTDhXRy9hWCtq?=
 =?utf-8?B?RThIZnNjSDJuSmQ0Mkw1K3p0cUc2R1htWE1JZzNNTVFLWkxLMDlWdFpicmNR?=
 =?utf-8?Q?Zlx0wshzNxACEjzw3UYSiRVJc?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3b3b26e8-9bef-423e-207f-08dc3fab44b3
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 20:06:40.5541
 (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: cWLSYt7tJi6mZ1aJ/l9jnxldfAXV+gFeklZRvi/oWP0V/FgmUykV/LlgNPdSmLMvCQ9/SWjk7toY6VLKZblbwA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7095

On 3/8/2024 13:50, Armin Wolf wrote:
> The ACPI EC address space handler currently only supports
> reading/writing 8 bit values. Some firmware implementations however
> want to access for example 16 bit values, which is prefectly legal
> according to the ACPI spec.
> 
> Add support for reading/writing such values.
> 
> Tested on a Dell Inspiron 3505 and a Asus Prime B650-Plus.
> 
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
> Chnages since v2:
> - fix address overflow check
> 
> Changes since v1:
> - use BITS_PER_BYTE
> - validate that number of bytes to read/write does not overflow the
>    address
> ---
>   drivers/platform/x86/wmi.c | 47 ++++++++++++++++++++++++++++++--------
>   1 file changed, 37 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
> index 1920e115da89..e6cab1cf611a 100644
> --- a/drivers/platform/x86/wmi.c
> +++ b/drivers/platform/x86/wmi.c
> @@ -1153,6 +1153,32 @@ static int parse_wdg(struct device *wmi_bus_dev, struct platform_device *pdev)
>   	return 0;
>   }
> 
> +static int ec_read_multiple(u8 address, u8 *buffer, size_t bytes)
> +{
> +	int i, ret;
> +
> +	for (i = 0; i < bytes; i++) {

To make sure that you're comparing against the same size data you should 
either i "size_t" instead of "int".

> +		ret = ec_read(address + i, &buffer[i]);
> +		if (ret < 0)
> +			return ret;
> +	}
> +
> +	return 0;
> +}
> +
> +static int ec_write_multiple(u8 address, u8 *buffer, size_t bytes)
> +{
> +	int i, ret;
> +
> +	for (i = 0; i < bytes; i++) {

Same comment as above.

> +		ret = ec_write(address + i, buffer[i]);
> +		if (ret < 0)
> +			return ret;
> +	}
> +
> +	return 0;
> +}
> +
>   /*
>    * WMI can have EmbeddedControl access regions. In which case, we just want to
>    * hand these off to the EC driver.
> @@ -1162,27 +1188,28 @@ acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address,
>   			  u32 bits, u64 *value,
>   			  void *handler_context, void *region_context)
>   {
> -	int result = 0;
> -	u8 temp = 0;
> +	int bytes = bits / BITS_PER_BYTE;
> +	int ret;
> +
> +	if (!value)
> +		return AE_NULL_ENTRY;
> 
> -	if ((address > 0xFF) || !value)
> +	if (!bytes || bytes > sizeof(*value))
>   		return AE_BAD_PARAMETER;
> 
> -	if (function != ACPI_READ && function != ACPI_WRITE)
> +	if (address > U8_MAX || address + bytes - 1 > U8_MAX)
>   		return AE_BAD_PARAMETER;
> 
> -	if (bits != 8)
> +	if (function != ACPI_READ && function != ACPI_WRITE)
>   		return AE_BAD_PARAMETER;
> 
>   	if (function == ACPI_READ) {
> -		result = ec_read(address, &temp);
> -		*value = temp;
> +		ret = ec_read_multiple(address, (u8 *)value, bytes);
>   	} else {
> -		temp = 0xff & *value;
> -		result = ec_write(address, temp);
> +		ret = ec_write_multiple(address, (u8 *)value, bytes);
>   	}
> 
> -	switch (result) {
> +	switch (ret) {
>   	case -EINVAL:
>   		return AE_BAD_PARAMETER;
>   	case -ENODEV:
> --
> 2.39.2
> 
>