From: Nirmoy Das <nirmoy.das@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Cc: Nirmoy Das <nirmoy.das@intel.com>
Subject: Re: [PATCH v2 04/15] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access
Date: Wed, 10 Jan 2024 12:48:24 +0100 [thread overview]
Message-ID: <754013ea-ffb6-412a-a1bb-2560f0932879@linux.intel.com> (raw)
In-Reply-To: <b266f56d-ddad-4836-b888-800c213e842f@linux.intel.com>
On 1/10/2024 11:49 AM, Nirmoy Das wrote:
> Hi Ville,
>
> Apologies, but I lost track of this series after I returned from sick
> leave.
Please ignore the uncontextual "but" in the previous response. I need to
disable auto correct options.
Regards,
Nirmoy
>
>
> On 12/15/2023 11:59 AM, Ville Syrjala wrote:
>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>
>> On MTL accessing stolen memory via the BARs is somehow borked,
>> and it can hang the machine. As a workaround let's bypass the
>> BARs and just go straight to DSMBASE/GSMBASE instead.
>>
>> Note that on every other platform this itself would hang the
>> machine, but on MTL the system firmware is expected to relax
>> the access permission guarding stolen memory to enable this
>> workaround, and thus direct CPU accesses should be fine.
>>
>> TODO: add w/a numbers and whatnot
>>
>> Cc: Paz Zcharya <pazz@chromium.org>
>> Cc: Nirmoy Das <nirmoy.das@intel.com>
>> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> ---
>> drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 11 ++++++++++-
>> drivers/gpu/drm/i915/gt/intel_ggtt.c | 13 ++++++++++++-
>> 2 files changed, 22 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>> b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>> index ee237043c302..252fe5cd6ede 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
>> @@ -941,7 +941,16 @@ i915_gem_stolen_lmem_setup(struct
>> drm_i915_private *i915, u16 type,
>> dsm_size = ALIGN_DOWN(lmem_size - dsm_base, SZ_1M);
>> }
>> - if (pci_resource_len(pdev, GEN12_LMEM_BAR) < lmem_size) {
>> + if (IS_METEORLAKE(i915)) {
>> + /*
>> + * Workaround: access via BAR can hang MTL, go directly to DSM.
>> + *
>> + * Normally this would not work but on MTL the system firmware
>> + * should have relaxed the access permissions sufficiently.
>> + */
>> + io_start = intel_uncore_read64(uncore, GEN12_DSMBASE) &
>> GEN12_BDSM_MASK;
>> + io_size = dsm_size;
>
> This will work well on host driver but I am afraid this will not work
> on VM when someone tries to do direct device assignment of the igfx.
>
> GSMBASE/DSMBASE is reserved region so won't show up in VM, last I
> checked.
>
> This is an obscure usages but are we suppose to support that? If so
> then we need to detect that and fall back to binder approach.
>
>
> Regards,
>
> Nirmoy
>
>> + } else if (pci_resource_len(pdev, GEN12_LMEM_BAR) < lmem_size) {
>> io_start = 0;
>> io_size = 0;
>> } else {
>> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c
>> b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>> index 21a7e3191c18..ab71d74ec426 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
>> @@ -24,6 +24,7 @@
>> #include "intel_ring.h"
>> #include "i915_drv.h"
>> #include "i915_pci.h"
>> +#include "i915_reg.h"
>> #include "i915_request.h"
>> #include "i915_scatterlist.h"
>> #include "i915_utils.h"
>> @@ -1152,13 +1153,23 @@ static unsigned int gen6_gttadr_offset(struct
>> drm_i915_private *i915)
>> static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
>> {
>> struct drm_i915_private *i915 = ggtt->vm.i915;
>> + struct intel_uncore *uncore = ggtt->vm.gt->uncore;
>> struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
>> phys_addr_t phys_addr;
>> u32 pte_flags;
>> int ret;
>> GEM_WARN_ON(pci_resource_len(pdev, GEN4_GTTMMADR_BAR) !=
>> gen6_gttmmadr_size(i915));
>> - phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) +
>> gen6_gttadr_offset(i915);
>> + /*
>> + * Workaround: access via BAR can hang MTL, go directly to GSM.
>> + *
>> + * Normally this would not work but on MTL the system firmware
>> + * should have relaxed the access permissions sufficiently.
>> + */
>> + if (IS_METEORLAKE(i915))
>> + phys_addr = intel_uncore_read64(uncore, GEN12_GSMBASE) &
>> GEN12_BDSM_MASK;
>> + else
>> + phys_addr = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) +
>> gen6_gttadr_offset(i915);
>> if (needs_wc_ggtt_mapping(i915))
>> ggtt->gsm = ioremap_wc(phys_addr, size);
next prev parent reply other threads:[~2024-01-10 11:48 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-15 10:59 [PATCH v2 00/15] drm/i915: (stolen) memory region related fixes Ville Syrjala
2023-12-15 10:59 ` [PATCH v2 01/15] drm/i915: Use struct resource for memory region IO as well Ville Syrjala
2023-12-15 10:59 ` [PATCH v2 02/15] drm/i915: Print memory region info during probe Ville Syrjala
2023-12-15 10:59 ` [PATCH v2 03/15] drm/i915: Remove ad-hoc lmem/stolen debugs Ville Syrjala
2023-12-15 10:59 ` [PATCH v2 04/15] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access Ville Syrjala
2023-12-15 21:58 ` Sripada, Radhakrishna
2024-01-10 9:13 ` Andrzej Hajda
2024-01-10 10:49 ` Nirmoy Das
2024-01-10 11:48 ` Nirmoy Das [this message]
2024-01-12 15:12 ` Ville Syrjälä
2024-01-12 16:31 ` Nirmoy Das
2024-01-12 16:55 ` Ville Syrjälä
2023-12-15 10:59 ` [PATCH v2 05/15] drm/i915: Disable the "binder" Ville Syrjala
2024-01-10 10:28 ` Andrzej Hajda
2023-12-15 10:59 ` [PATCH v2 06/15] drm/i915: Rename the DSM/GSM registers Ville Syrjala
2023-12-15 13:56 ` Andrzej Hajda
2023-12-15 10:59 ` [PATCH v2 07/15] drm/i915: Fix PTE decode during initial plane readout Ville Syrjala
2023-12-18 12:36 ` Andrzej Hajda
2023-12-15 10:59 ` [PATCH v2 08/15] drm/i915: Fix region start " Ville Syrjala
2023-12-18 13:00 ` Andrzej Hajda
2023-12-19 0:01 ` Ville Syrjälä
2024-01-12 14:53 ` Ville Syrjälä
2023-12-15 10:59 ` [PATCH v2 09/15] drm/i915: Fix MTL " Ville Syrjala
2023-12-19 10:58 ` Andrzej Hajda
2024-01-12 14:52 ` Ville Syrjälä
2023-12-15 10:59 ` [PATCH v2 10/15] drm/i915: s/phys_base/dma_addr/ Ville Syrjala
2023-12-19 10:55 ` Andrzej Hajda
2023-12-15 10:59 ` [PATCH v2 11/15] drm/i915: Split the smem and lmem plane readout apart Ville Syrjala
2023-12-19 10:55 ` Andrzej Hajda
2023-12-19 12:47 ` Ville Syrjälä
2023-12-15 10:59 ` [PATCH v2 12/15] drm/i915: Simplify intel_initial_plane_config() calling convention Ville Syrjala
2023-12-19 10:59 ` Andrzej Hajda
2024-01-13 0:55 ` kernel test robot
2024-01-13 6:27 ` kernel test robot
2023-12-15 10:59 ` [PATCH v2 13/15] drm/i915/fbdev: Fix smem_start for LMEMBAR stolen objects Ville Syrjala
2024-01-10 9:12 ` Andrzej Hajda
2023-12-15 10:59 ` [PATCH v2 14/15] drm/i915: Tweak BIOS fb reuse check Ville Syrjala
2024-01-10 9:36 ` Andrzej Hajda
2023-12-15 10:59 ` [PATCH v2 15/15] drm/i915: Try to relocate the BIOS fb to the start of ggtt Ville Syrjala
2024-01-10 10:11 ` Andrzej Hajda
2024-01-11 13:42 ` Ville Syrjälä
2024-01-11 14:06 ` [PATCH v3 " Ville Syrjala
2023-12-15 15:45 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: (stolen) memory region related fixes (rev3) Patchwork
2023-12-15 15:45 ` ✗ Fi.CI.SPARSE: " Patchwork
2023-12-15 16:02 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-01-11 17:08 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: (stolen) memory region related fixes (rev5) Patchwork
2024-01-11 17:08 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-01-11 17:22 ` ✓ Fi.CI.BAT: success " Patchwork
2024-01-11 22:46 ` ✓ Fi.CI.IGT: " Patchwork
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=754013ea-ffb6-412a-a1bb-2560f0932879@linux.intel.com \
--to=nirmoy.das@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=nirmoy.das@intel.com \
--cc=ville.syrjala@linux.intel.com \
/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