Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Message-ID: <e651d5e5-50a9-4884-8263-ce9d0d705b52@intel.com>
Date:   Tue, 17 Oct 2023 10:51:04 +0200
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 5/6] ACPI: NFIT: Replace acpi_driver with
 platform_driver
Content-Language: en-US
To:     <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <nvdimm@lists.linux.dev>,
        "Williams, Dan J" <dan.j.williams@intel.com>
CC:     <rafael.j.wysocki@intel.com>, <andriy.shevchenko@intel.com>,
        <lenb@kernel.org>, <vishal.l.verma@intel.com>,
        <ira.weiny@intel.com>
References: <20231006173055.2938160-1-michal.wilczynski@intel.com>
 <20231006173055.2938160-6-michal.wilczynski@intel.com>
From:   "Wilczynski, Michal" <michal.wilczynski@intel.com>
In-Reply-To: <20231006173055.2938160-6-michal.wilczynski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S1BZTTA3WUtZMjlJRTNYa2RnemgzSkIvQTdxSmx1RHNiN205c2JleXJKSCtJ?=
 =?utf-8?B?MUMrcGxRdit2VDhVOU13WXdZY3Y1Skw0N3ZIc0tieGhZVHVHck9KQ0p3QVZO?=
 =?utf-8?B?aDh3bkVqc2h0NnFPazNqMlVKQjBXRCtKOTVma0NMUUIyS1FmNFRTaTBBTGd0?=
 =?utf-8?B?dndMQXBObnoxaFBra2s3QWIxTEJyemFsNW5XZWdEOCtOMFZVdHFCbDh2YWlp?=
 =?utf-8?B?T09rVHJXVlZiR0FtZHpaeSsvK2R4TWk1bHZpMWk0T1lnUzRkQmQwMkwrcWhv?=
 =?utf-8?B?UVZ1bjUxWEJkRXZYWnhsbjA3bnVsWUVLdmVMaDFmQmNjck5rRUxPckhZQXBM?=
 =?utf-8?B?Z1YxVWdwZm1pSHJYY0k1ZlRwUDFac1BSTnpEVUFwUXZVTEdxeEtjem84bHBH?=
 =?utf-8?B?c0lBYVlMelR3MFA5dXhtMjVScFVxMlBXQ1h2bW5wWnFwU3VmZFE5bkY0Z1pv?=
 =?utf-8?B?TnRLSnRNQVpCMGNRYlYxUWlvYlZ0UEdlRGxjRTJuNGhQbUJaaE1ML1h1TnNR?=
 =?utf-8?B?Q3VCeDd5a2Y4K0U5cWxLcjNmak9PZ0wzd2ZKWGxlMy9TWU81M2haR3RjYzBB?=
 =?utf-8?B?eXF6RklMdEJaN1piNWtJTlRLMEM3ZzNZeGVIWTlyNHBsMTkydk8yZmdQVmgw?=
 =?utf-8?B?NUFUSVl0ZlQwcmxzUzllNnZOditmbUw2ZlhoYU9DQVhwanVvbkM3UXdDSjVT?=
 =?utf-8?B?RHVSbzdpL3dYcCtBaGtWd3RuNmZVcVdEdU1ibTEweU9Ba1pLZ1JaVUJRODhx?=
 =?utf-8?B?WjVrQmlianpzenZQZVBLVW9md2NTRmNkZkxRZmVGdWpaY0FDa0FlWHJCanI3?=
 =?utf-8?B?ZEhZdCtWM1BhYXY4dnMyVGlLMDFZSEVFV0FneEZaK2ExOUZaVDR5bCthQWFn?=
 =?utf-8?B?V2xsbWVNdi96ZDhNREZtajlBRlQ1VUxTWU9LdVFrbW5IQW9LcUE2NWhXeUlB?=
 =?utf-8?B?YmxWLzQvTzV5UXc2aU9FNlo4QjlVWXl1L1NubkYvTDJxa04wVityMjFudHcr?=
 =?utf-8?B?Ym5KMUd0dHlVR2NaYTdOSU83dG5zVnRZQ1h3Tm4yTmxIUUlZTmg4VGVCUlg2?=
 =?utf-8?B?VUVCdk9NWTNGUms1amF6N2VTUitIeWJKT083UHdybjNIT0x1eWJDZjErNERE?=
 =?utf-8?B?Uzl6amxiNFJadDZTbVF4bHpSbTd4Vkc1S0QxRkt4M05pOVJ4dDI2K0FSZnk2?=
 =?utf-8?B?QSs3MXk1MG9aRzg3Rld3UkRRNE1UbjRrcXBaZGJ0ZlI4cTVjWlNBbTFxRkV2?=
 =?utf-8?B?MnN4UlpJT0lSOEEyMllaczRkUlpZaVNON3d5Sm1hcTl6d2g0M05oWmhTM3V1?=
 =?utf-8?B?Mkh1bkROTHA4Vm1LNWxHL2J0cUdSYTNjZnRTdksvVmYrZTc1USszNkE0cGwr?=
 =?utf-8?B?Ukw2RnlOcFQ5ZkVVdjdSSWJQTEN0emE2VVgxSFB3c0d4eXptdHdHRk5QdzFz?=
 =?utf-8?B?MHlPOWE4cEhTS3NDOGErWFhOLy9ZRFFJbTBZc1VJL0dYWHJVcmxzS2RFNXU1?=
 =?utf-8?B?VXhwSS9GQXNNa1pLMnhZS1ZwbnBRRERtVTBoTExPVHZxVXcxR2VYVjNVZWZE?=
 =?utf-8?B?Z1VLSkZhamFYc0ZObzlvb0NkV0s4ZWIzNkpiM3pockZZUEJ2UWRYYlZRb2cz?=
 =?utf-8?B?NW1oWXFicy9SMGZaVndMeXdKSzlNUHZEL01YWVpoSFpUNytyWFlOZnJNSTJZ?=
 =?utf-8?B?Zm5wQW80V3VvM0RaRC9zNlhSTCtDdG5rdFRZaHBCZlozcnlOTTZnQWVITnJy?=
 =?utf-8?B?WWxLU29nQllJamtHMjVLTmk0MG0zcCtWU01Pb1czYU5STm5SdDV2UUp3NTFB?=
 =?utf-8?B?U3RqcjVROU5YN1NSQnE5Mkpsd1hXMXBnTktHUzZQaFRSUCtqOFhudlh6UmNE?=
 =?utf-8?B?V2ZpeTdCV01QL1hzVjJRSU42Mkxvd0xCOHVQMXA4Qm0xVWR6T1o1T0J4VFR1?=
 =?utf-8?B?dy9yMldnSHhSZ0ZrUnh6Uk9jQ2NHdFhoU2QwYlEyZktybVpreFZGaTZRNURy?=
 =?utf-8?B?bnp6ZDUzSmVNQ1JCemNtc0M5V0xKaDNUR3JlN3hNRnpMY1h5UkdRTFlPbEtZ?=
 =?utf-8?B?ZzZNZFpqWEY3bUNUQXZmZEpHSGszOGZJckVZY0pKT3hNd2dqaC85YnN6Zlgw?=
 =?utf-8?B?elF6bTgxSVNyb015RXdRNjU1aExPaEhHQjFCRCtTam8zOEpCakkyRVhLZGlQ?=
 =?utf-8?B?elE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: a34f9224-1a5a-4d19-57f9-08dbceee35ad
X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5603.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 08:51:10.4113
 (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: 8qH99j2yGghrSBVQloffheQDPXiF/H9LSMHLNKwpNdkd4GbdTuqe6eLFZTB3I3JAQfbkWe0AznONjm5lkJGFROBsuMy+uCNiFEK0xqkVqGg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4846
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 17 Oct 2023 01:51:50 -0700 (PDT)


On 10/6/2023 7:30 PM, Michal Wilczynski wrote:
> NFIT driver uses struct acpi_driver incorrectly to register itself.
> This is wrong as the instances of the ACPI devices are not meant
> to be literal devices, they're supposed to describe ACPI entry of a
> particular device.
>
> Use platform_driver instead of acpi_driver. In relevant places call
> platform devices instances pdev to make a distinction with ACPI
> devices instances.
>
> NFIT driver uses devm_*() family of functions extensively. This change
> has no impact on correct functioning of the whole devm_*() family of
> functions, since the lifecycle of the device stays the same. It is still
> being created during the enumeration, and destroyed on platform device
> removal.
>
> Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>

Hi Dan,
Rafael already reviewed this patch series and merged patches
that he likes. We're waiting on your input regarding two NFIT
commits in this series.

Thanks a lot !
Michał

> ---
>  drivers/acpi/nfit/core.c | 34 ++++++++++++++++++----------------
>  1 file changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 942b84d94078..fb0bc16fa186 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -15,6 +15,7 @@
>  #include <linux/sort.h>
>  #include <linux/io.h>
>  #include <linux/nd.h>
> +#include <linux/platform_device.h>
>  #include <asm/cacheflush.h>
>  #include <acpi/nfit.h>
>  #include "intel.h"
> @@ -98,7 +99,7 @@ static struct acpi_device *to_acpi_dev(struct acpi_nfit_desc *acpi_desc)
>  			|| strcmp(nd_desc->provider_name, "ACPI.NFIT") != 0)
>  		return NULL;
>  
> -	return to_acpi_device(acpi_desc->dev);
> +	return ACPI_COMPANION(acpi_desc->dev);
>  }
>  
>  static int xlat_bus_status(void *buf, unsigned int cmd, u32 status)
> @@ -3284,11 +3285,11 @@ static void acpi_nfit_put_table(void *table)
>  
>  static void acpi_nfit_notify(acpi_handle handle, u32 event, void *data)
>  {
> -	struct acpi_device *adev = data;
> +	struct device *dev = data;
>  
> -	device_lock(&adev->dev);
> -	__acpi_nfit_notify(&adev->dev, handle, event);
> -	device_unlock(&adev->dev);
> +	device_lock(dev);
> +	__acpi_nfit_notify(dev, handle, event);
> +	device_unlock(dev);
>  }
>  
>  static void acpi_nfit_remove_notify_handler(void *data)
> @@ -3329,11 +3330,12 @@ void acpi_nfit_shutdown(void *data)
>  }
>  EXPORT_SYMBOL_GPL(acpi_nfit_shutdown);
>  
> -static int acpi_nfit_add(struct acpi_device *adev)
> +static int acpi_nfit_probe(struct platform_device *pdev)
>  {
>  	struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
>  	struct acpi_nfit_desc *acpi_desc;
> -	struct device *dev = &adev->dev;
> +	struct device *dev = &pdev->dev;
> +	struct acpi_device *adev = ACPI_COMPANION(dev);
>  	struct acpi_table_header *tbl;
>  	acpi_status status = AE_OK;
>  	acpi_size sz;
> @@ -3360,7 +3362,7 @@ static int acpi_nfit_add(struct acpi_device *adev)
>  	acpi_desc = devm_kzalloc(dev, sizeof(*acpi_desc), GFP_KERNEL);
>  	if (!acpi_desc)
>  		return -ENOMEM;
> -	acpi_nfit_desc_init(acpi_desc, &adev->dev);
> +	acpi_nfit_desc_init(acpi_desc, dev);
>  
>  	/* Save the acpi header for exporting the revision via sysfs */
>  	acpi_desc->acpi_header = *tbl;
> @@ -3391,7 +3393,7 @@ static int acpi_nfit_add(struct acpi_device *adev)
>  		return rc;
>  
>  	rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
> -					     acpi_nfit_notify, adev);
> +					     acpi_nfit_notify, dev);
>  	if (rc)
>  		return rc;
>  
> @@ -3475,11 +3477,11 @@ static const struct acpi_device_id acpi_nfit_ids[] = {
>  };
>  MODULE_DEVICE_TABLE(acpi, acpi_nfit_ids);
>  
> -static struct acpi_driver acpi_nfit_driver = {
> -	.name = KBUILD_MODNAME,
> -	.ids = acpi_nfit_ids,
> -	.ops = {
> -		.add = acpi_nfit_add,
> +static struct platform_driver acpi_nfit_driver = {
> +	.probe = acpi_nfit_probe,
> +	.driver = {
> +		.name = KBUILD_MODNAME,
> +		.acpi_match_table = acpi_nfit_ids,
>  	},
>  };
>  
> @@ -3517,7 +3519,7 @@ static __init int nfit_init(void)
>  		return -ENOMEM;
>  
>  	nfit_mce_register();
> -	ret = acpi_bus_register_driver(&acpi_nfit_driver);
> +	ret = platform_driver_register(&acpi_nfit_driver);
>  	if (ret) {
>  		nfit_mce_unregister();
>  		destroy_workqueue(nfit_wq);
> @@ -3530,7 +3532,7 @@ static __init int nfit_init(void)
>  static __exit void nfit_exit(void)
>  {
>  	nfit_mce_unregister();
> -	acpi_bus_unregister_driver(&acpi_nfit_driver);
> +	platform_driver_unregister(&acpi_nfit_driver);
>  	destroy_workqueue(nfit_wq);
>  	WARN_ON(!list_empty(&acpi_descs));
>  }