On Mon, Sep 18, 2023 at 3:46 PM Jinhui Guo <guojinhui.liam@xxxxxxxxxxxxx> wrote:
>
> Setting the devices' numa_node needs to be done in
> platform_device_register_full(), because that's where the
> platform device object is allocated.
>
> Fixes: 4a60406d3592 ("driver core: platform: expose numa_node to users in sysfs")
> Cc: stable@xxxxxxxxxxxxxxx
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Closes: https://lore.kernel.org/oe-kbuild-all/202309122309.mbxAnAIe-lkp@xxxxxxxxx/
> Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Rafael J. Wysocki <rafael@xxxxxxxxxx>
No, I haven't given you this tag.
I don't think that Greg has given you the one above either.
Please don't add tage that you haven't received to your patches,
because they are not applicable with incorrect tags.
> Signed-off-by: Jinhui Guo <guojinhui.liam@xxxxxxxxxxxxx>
> ---
> V5 -> V6:
> 1. Update subject to correct function name platform_device_add().
> 2. Provide a more clear and accurate description of the changes
> made in commit (suggested by Rafael J. Wysocki).
> 3. Add reviewer name.
>
> V4 -> V5:
> Add Cc: stable line and changes from the previous submited patches.
>
> V3 -> V4:
> Refactor code to be an ACPI function call.
>
> V2 -> V3:
> Fix Signed-off name.
>
> V1 -> V2:
> Fix compile error without enabling CONFIG_ACPI.
> ---
>
> drivers/acpi/acpi_platform.c | 4 +---
> drivers/base/platform.c | 1 +
> include/linux/acpi.h | 5 +++++
> 3 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> index 48d15dd785f6..adcbfbdc343f 100644
> --- a/drivers/acpi/acpi_platform.c
> +++ b/drivers/acpi/acpi_platform.c
> @@ -178,11 +178,9 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
> if (IS_ERR(pdev))
> dev_err(&adev->dev, "platform device creation failed: %ld\n",
> PTR_ERR(pdev));
> - else {
> - set_dev_node(&pdev->dev, acpi_get_node(adev->handle));
> + else
> dev_dbg(&adev->dev, "created platform device %s\n",
> dev_name(&pdev->dev));
> - }
>
> kfree(resources);
>
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index 76bfcba25003..35c891075d95 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -841,6 +841,7 @@ struct platform_device *platform_device_register_full(
> goto err;
> }
>
> + set_dev_node(&pdev->dev, ACPI_NODE_GET(ACPI_COMPANION(&pdev->dev)));
> ret = platform_device_add(pdev);
> if (ret) {
> err:
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index a73246c3c35e..6a349d53f19e 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -477,6 +477,10 @@ static inline int acpi_get_node(acpi_handle handle)
> return 0;
> }
> #endif
> +
> +#define ACPI_NODE_GET(adev) ((adev) && (adev)->handle ? \
> + acpi_get_node((adev)->handle) : NUMA_NO_NODE)
> +
> extern int pnpacpi_disabled;
>
> #define PXM_INVAL (-1)
> @@ -770,6 +774,7 @@ const char *acpi_get_subsystem_id(acpi_handle handle);
> #define ACPI_COMPANION_SET(dev, adev) do { } while (0)
> #define ACPI_HANDLE(dev) (NULL)
> #define ACPI_HANDLE_FWNODE(fwnode) (NULL)
> +#define ACPI_NODE_GET(adev) NUMA_NO_NODE
>
> #include <acpi/acpi_numa.h>
>
> --
> 2.20.1
>
