[igt-dev] [PATCH i-g-t v2 2/4] lib/igt_pm: change d3cold_allowed function parameters

[Gupta, Anshuman]

> -----Original Message-----
> From: Tauro, Riana <riana.tauro at intel.com>
> Sent: Friday, August 4, 2023 4:01 PM
> To: igt-dev at lists.freedesktop.org
> Cc: Tauro, Riana <riana.tauro at intel.com>; Gupta, Anshuman
> <anshuman.gupta at intel.com>; Dixit, Ashutosh <ashutosh.dixit at intel.com>;
> Belgaumkar, Vinay <vinay.belgaumkar at intel.com>; Nilawar, Badal
> <badal.nilawar at intel.com>; Sundaresan, Sujaritha
> <sujaritha.sundaresan at intel.com>
> Subject: [PATCH i-g-t v2 2/4] lib/igt_pm: change d3cold_allowed function
> parameters
> 
> The existing d3cold_allowed get/set function in igt_pm uses igt_device_card as
> a function argument.
> Xe tests cannot use this function as they need to pass pci_device as parameter.
> To have a common library function for both i915 and xe, use a common
> parameter between igt_device_card and pci_device ie.pci_slot_name.
> 
> Change function parameter of d3cold_allowed get/set functions to pci slot
> name.
> Change the data type of value from char to uint32_t as it is more appropriate.
> 
> Modify i915_suspend to use these functions.
> No Functional Changes.
> 
> v2: Add justification for change  in commit message (Anshuman)
> 
> Signed-off-by: Riana Tauro <riana.tauro at intel.com>
Reviewed-by: Anshuman Gupta <anshuman.gupta at intel.com>
> ---
>  lib/igt_pm.c              | 22 +++++++++++-----------
>  lib/igt_pm.h              |  4 ++--
>  tests/i915/i915_suspend.c |  8 ++++----
>  3 files changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/lib/igt_pm.c b/lib/igt_pm.c index ba591f0f8..11cf82950 100644
> --- a/lib/igt_pm.c
> +++ b/lib/igt_pm.c
> @@ -1204,47 +1204,47 @@ void igt_pm_setup_pci_card_runtime_pm(struct
> pci_device *pci_dev)
> 
>  /**
>   * igt_pm_get_d3cold_allowed:
> - * @igt_device_card: device card
> - * @val: value to be read into
> + * @pci_slot_name: slot name of the pci device
> + * @value: value to be read into
>   *
>   * Reads the value of d3cold_allowed attribute
>   * of the pci device
>   */
> -void igt_pm_get_d3cold_allowed(struct igt_device_card *card, char *val)
> +void igt_pm_get_d3cold_allowed(const char *pci_slot_name, uint32_t
> +*value)
>  {
>  	char name[PATH_MAX];
>  	int fd;
> 
>  	snprintf(name, PATH_MAX, "/sys/bus/pci/devices/%s",
> -		 card->pci_slot_name);
> +		 pci_slot_name);
> 
>  	fd = open(name, O_RDONLY);
>  	igt_assert_f(fd >= 0, "Can't open %s\n", name);
> 
> -	igt_sysfs_read(fd, "d3cold_allowed", val, sizeof(val));
> +	__igt_sysfs_get_u32(fd, "d3cold_allowed", value);
> 
>  	close(fd);
>  }
> 
>  /**
> - * igt_pm_get_d3cold_allowed:
> - * @igt_device_card: device card
> - * @val: value to be written
> + * igt_pm_set_d3cold_allowed:
> + * @pci_slot_name: slot name of pci device
> + * @value: value to be written
>   *
>   * writes the value to d3cold_allowed attribute of pci device
>   */
> -void igt_pm_set_d3cold_allowed(struct igt_device_card *card, const char *val)
> +void igt_pm_set_d3cold_allowed(const char *pci_slot_name, uint32_t
> +value)
>  {
>  	char name[PATH_MAX];
>  	int fd;
> 
>  	snprintf(name, PATH_MAX, "/sys/bus/pci/devices/%s",
> -		 card->pci_slot_name);
> +		 pci_slot_name);
> 
>  	fd = open(name, O_RDONLY);
>  	igt_assert_f(fd >= 0, "Can't open %s\n", name);
> 
> -	igt_sysfs_write(fd, "d3cold_allowed", val, sizeof(val));
> +	__igt_sysfs_set_u32(fd, "d3cold_allowed", value);
>  	close(fd);
>  }
> 
> diff --git a/lib/igt_pm.h b/lib/igt_pm.h index 71ec2f239..306a9eb46 100644
> --- a/lib/igt_pm.h
> +++ b/lib/igt_pm.h
> @@ -79,8 +79,8 @@ enum igt_acpi_d_state
>  igt_pm_get_acpi_real_d_state(struct pci_device *pci_dev);  void
> igt_pm_enable_pci_card_runtime_pm(struct pci_device *root,
>  				       struct pci_device *i915);
> -void igt_pm_get_d3cold_allowed(struct igt_device_card *card, char *val); -void
> igt_pm_set_d3cold_allowed(struct igt_device_card *card, const char *val);
> +void igt_pm_get_d3cold_allowed(const char *pci_slot_name, uint32_t
> +*value); void igt_pm_set_d3cold_allowed(const char *pci_slot_name,
> +uint32_t value);
>  void igt_pm_setup_pci_card_runtime_pm(struct pci_device *pci_dev);  void
> igt_pm_restore_pci_card_runtime_pm(void);
>  void igt_pm_print_pci_card_runtime_status(void);
> diff --git a/tests/i915/i915_suspend.c b/tests/i915/i915_suspend.c index
> 851e797c2..c25805584 100644
> --- a/tests/i915/i915_suspend.c
> +++ b/tests/i915/i915_suspend.c
> @@ -283,7 +283,7 @@ static void
>  test_suspend_without_i915(int state)
>  {
>  	struct igt_device_card card;
> -	char d3cold_allowed[2];
> +	uint32_t d3cold_allowed;
>  	int fd;
> 
>  	fd = __drm_open_driver(DRIVER_INTEL);
> @@ -297,8 +297,8 @@ test_suspend_without_i915(int state)
>  	 */
>  	if (state == SUSPEND_STATE_FREEZE &&
>  	    igt_device_find_first_i915_discrete_card(&card)) {
> -		igt_pm_get_d3cold_allowed(&card, d3cold_allowed);
> -		igt_pm_set_d3cold_allowed(&card, "0\n");
> +		igt_pm_get_d3cold_allowed(card.pci_slot_name,
> &d3cold_allowed);
> +		igt_pm_set_d3cold_allowed(card.pci_slot_name, 0);
>  	}
>  	drm_close_driver(fd);
> 
> @@ -308,7 +308,7 @@ test_suspend_without_i915(int state)
>  	igt_system_suspend_autoresume(state, SUSPEND_TEST_NONE);
> 
>  	if (state == SUSPEND_STATE_FREEZE && strlen(card.card))
> -		igt_pm_set_d3cold_allowed(&card, d3cold_allowed);
> +		igt_pm_set_d3cold_allowed(card.pci_slot_name,
> d3cold_allowed);
> 
>  	igt_kmsg(KMSG_INFO "Re-loading i915 \n");
>  	igt_assert_eq(igt_i915_driver_load(NULL), 0);
> --
> 2.40.0