From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Anshuman Gupta <anshuman.gupta@intel.com>
Cc: <intel-xe@lists.freedesktop.org>, <linux-acpi@vger.kernel.org>,
<linux-pci@vger.kernel.org>, <rafael@kernel.org>,
<lenb@kernel.org>, <bhelgaas@google.com>,
<ilpo.jarvinen@linux.intel.com>, <lucas.demarchi@intel.com>,
<badal.nilawar@intel.com>, <kam.nasim@intel.com>
Subject: Re: [RFC 3/6] drm/xe/vrsr: Apis to init and enable VRSR feature
Date: Mon, 10 Mar 2025 13:23:29 -0400 [thread overview]
Message-ID: <Z88gEQxr301VcJia@intel.com> (raw)
In-Reply-To: <20250224164849.3746751-4-anshuman.gupta@intel.com>
On Mon, Feb 24, 2025 at 10:18:46PM +0530, Anshuman Gupta wrote:
> From: Badal Nilawar <badal.nilawar@intel.com>
>
> APIs to enable and initialize VRSR feature.
>
> Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
> ---
> drivers/gpu/drm/xe/xe_device_types.h | 1 +
> drivers/gpu/drm/xe/xe_pcode_api.h | 8 +++
> drivers/gpu/drm/xe/xe_pm.c | 91 ++++++++++++++++++++++++++++
> drivers/gpu/drm/xe/xe_pm.h | 3 +
> 4 files changed, 103 insertions(+)
>
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index c2ab2c91c968..da7946b75cd5 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -7,6 +7,7 @@
> #define _XE_DEVICE_TYPES_H_
>
> #include <linux/pci.h>
> +#include <linux/pci-acpi.h>
>
> #include <drm/drm_device.h>
> #include <drm/drm_file.h>
> diff --git a/drivers/gpu/drm/xe/xe_pcode_api.h b/drivers/gpu/drm/xe/xe_pcode_api.h
> index 2bae9afdbd35..17a90b2c6737 100644
> --- a/drivers/gpu/drm/xe/xe_pcode_api.h
> +++ b/drivers/gpu/drm/xe/xe_pcode_api.h
> @@ -42,6 +42,14 @@
> #define POWER_SETUP_I1_SHIFT 6 /* 10.6 fixed point format */
> #define POWER_SETUP_I1_DATA_MASK REG_GENMASK(15, 0)
>
> +#define PCODE_D3_VRAM_SELF_REFRESH 0x71
> +#define PCODE_D3_VRSR_SC_DISABLE 0x0
> +#define PCODE_D3_VRSR_SC_ENABLE 0x1
> +#define PCODE_D3_VRSR_SC_AUX_PL_AND_PERST_DELAY 0x2
> +#define PCODE_D3_VRSR_PERST_SHIFT 16
> +#define POWER_D3_VRSR_PSERST_MASK REG_GENMASK(31, 16)
> +#define POWER_D3_VRSR_AUX_PL_MASK REG_GENMASK(15, 0)
> +
> #define PCODE_FREQUENCY_CONFIG 0x6e
> /* Frequency Config Sub Commands (param1) */
> #define PCODE_MBOX_FC_SC_READ_FUSED_P0 0x0
> diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
> index dead236355d8..32583651988f 100644
> --- a/drivers/gpu/drm/xe/xe_pm.c
> +++ b/drivers/gpu/drm/xe/xe_pm.c
> @@ -23,6 +23,7 @@
> #include "xe_guc.h"
> #include "xe_irq.h"
> #include "xe_mmio.h"
> +#include "xe_pcode_api.h"
> #include "xe_pcode.h"
> #include "xe_pxp.h"
> #include "regs/xe_regs.h"
> @@ -85,6 +86,92 @@ static struct lockdep_map xe_pm_runtime_nod3cold_map = {
> };
> #endif
>
> +/**
> + * xe_pm_init_vrsr - Initialize VRAM self refresh
> + * @xe: The xe device
> + *
> + * This function reads the AUX power and PERST assertion delay from pcode.
> + * Then request host BIOS via ACPI _DSM to grant required AUX power and PERST
> + * assertion delay.
> + *
> + * Return: returns 0 on success and errno on failure
> + */
> +int
why not void?
we are not checking it anyway...
> xe_pm_init_vrsr(struct xe_device *xe)
perhaps xe_pm_d3cold_vrsr_init()
> +{
> + struct xe_tile *root_tile = xe_device_get_root_tile(xe);
> + struct pci_dev *pdev = to_pci_dev(xe->drm.dev);
> + struct pci_dev *root_pdev;
> + int ret;
> + u32 uval;
> + u32 aux_pwr_limit;
> + u32 perst_delay;
> +
> + root_pdev = pcie_find_root_port(pdev);
> + if (!root_pdev)
> + return -EINVAL;
> +
> + /* Avoid Illegal Subcommand error */
> + if (xe->info.platform != XE_BATTLEMAGE)
> + return -ENXIO;
I wonder if we should do a has_d3cold_vrsr flag for this, or at least
move this check earlier.
> +
> + ret = xe_pcode_read(root_tile, PCODE_MBOX(PCODE_D3_VRAM_SELF_REFRESH,
> + PCODE_D3_VRSR_SC_AUX_PL_AND_PERST_DELAY, 0),
> + &uval, NULL);
> +
> + if (ret)
> + return ret;
> +
> + aux_pwr_limit = REG_FIELD_GET(POWER_D3_VRSR_AUX_PL_MASK, uval);
> + perst_delay = REG_FIELD_GET(POWER_D3_VRSR_PSERST_MASK, uval);
> +
> + drm_dbg(&xe->drm, "AUX POWER LIMIT =%d\n", aux_pwr_limit);
> + drm_dbg(&xe->drm, "PERST Assertion delay =%d\n", perst_delay);
> +
> + ret = pci_acpi_request_d3cold_aux_power(root_pdev, aux_pwr_limit);
> + if (ret)
> + goto vrsr;
> +
> + ret = pci_acpi_add_perst_assertion_delay(root_pdev, perst_delay);
> + if (ret)
> + goto vrsr;
> +
> + return ret;
> +
> +vrsr:
> + drm_err(&xe->drm, "ACPI DSM failed, VRSR is not capable\n");
> + xe->d3cold.vrsr_capable = false;
> + return ret;
> +}
> +
> +/**
> + * xe_pm_enable_vrsr - Enable VRAM self refresh
> + * @xe: The xe device.
> + * @enable: true: Enable, false: Disable
> + *
> + * This function enables the VRSR feature in D3Cold path.
> + *
> + * Return: It returns 0 on success and errno on failure.
> + */
> +int xe_pm_enable_vrsr(struct xe_device *xe, bool enable)
> +{
> + struct xe_tile *root_tile = xe_device_get_root_tile(xe);
> + int ret;
> + u32 uval = 0;
> +
> + /* Avoid Illegal Subcommand error */
> + if (xe->info.platform != XE_BATTLEMAGE)
> + return -ENXIO;
> +
> + if (enable)
> + ret = xe_pcode_write(root_tile, PCODE_MBOX(PCODE_D3_VRAM_SELF_REFRESH,
> + PCODE_D3_VRSR_SC_ENABLE, 0), uval);
> + else
> + ret = xe_pcode_write(root_tile, PCODE_MBOX(PCODE_D3_VRAM_SELF_REFRESH,
> + PCODE_D3_VRSR_SC_DISABLE, 0), uval);
> +
> + return ret;
> +}
> +
> /**
> * xe_rpm_reclaim_safe() - Whether runtime resume can be done from reclaim context
> * @xe: The xe device.
> @@ -330,6 +417,10 @@ int xe_pm_init(struct xe_device *xe)
> return err;
>
> xe->d3cold.vrsr_capable = xe_pm_vrsr_capable(xe);
> + if (xe->d3cold.vrsr_capable) {
> + drm_dbg(&xe->drm, "vram sr capable\n");
> + xe_pm_init_vrsr(xe);
> + }
perhaps move this piece of code entirely to the init function itself?
> }
>
> xe_pm_runtime_init(xe);
> diff --git a/drivers/gpu/drm/xe/xe_pm.h b/drivers/gpu/drm/xe/xe_pm.h
> index 998d1ed64556..c9f176912b46 100644
> --- a/drivers/gpu/drm/xe/xe_pm.h
> +++ b/drivers/gpu/drm/xe/xe_pm.h
> @@ -35,4 +35,7 @@ bool xe_rpm_reclaim_safe(const struct xe_device *xe);
> struct task_struct *xe_pm_read_callback_task(struct xe_device *xe);
> int xe_pm_module_init(void);
>
> +int xe_pm_init_vrsr(struct xe_device *xe);
> +int xe_pm_enable_vrsr(struct xe_device *xe, bool enable);
> +
> #endif
> --
> 2.34.1
>
next prev parent reply other threads:[~2025-03-10 17:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 16:48 [RFC 0/6] VRAM Self Refresh Anshuman Gupta
2025-02-24 16:48 ` [RFC 1/6] PCI/ACPI: Implement PCI FW _DSM method Anshuman Gupta
2025-02-24 19:40 ` Bjorn Helgaas
2025-02-25 18:25 ` Gupta, Anshuman
2025-02-25 20:30 ` Bjorn Helgaas
2025-02-24 16:48 ` [RFC 2/6] drm/xe/vrsr: Detect vrsr capability Anshuman Gupta
2025-03-07 21:50 ` Rodrigo Vivi
2025-02-24 16:48 ` [RFC 3/6] drm/xe/vrsr: Apis to init and enable VRSR feature Anshuman Gupta
2025-02-24 19:43 ` Bjorn Helgaas
2025-03-10 17:23 ` Rodrigo Vivi [this message]
2025-02-24 16:48 ` [RFC 4/6] drm/xe/vrsr: Refactor d3cold.allowed to a enum Anshuman Gupta
2025-03-10 17:28 ` Rodrigo Vivi
2025-04-01 5:24 ` Poosa, Karthik
2025-02-24 16:48 ` [RFC 5/6] drm/xe/pm: D3Cold target state Anshuman Gupta
2025-02-24 19:45 ` Bjorn Helgaas
2025-02-25 17:49 ` Ville Syrjälä
2025-02-25 18:00 ` Gupta, Anshuman
2025-02-25 18:44 ` Ville Syrjälä
2025-02-24 16:48 ` [RFC 6/6] drm/xe/vrsr: Enable VRSR Anshuman Gupta
2025-04-01 5:19 ` [RFC,6/6] " Poosa, Karthik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z88gEQxr301VcJia@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=anshuman.gupta@intel.com \
--cc=badal.nilawar@intel.com \
--cc=bhelgaas@google.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=kam.nasim@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox