From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Lyude <cpaul@redhat.com>
Cc: intel-gfx@lists.freedesktop.org,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Matt Roper <matthew.d.roper@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v11 1/7] drm/i915/gen6+: Return -EINVAL on invalid pcode commands
Date: Fri, 12 Aug 2016 14:23:28 +0300 [thread overview]
Message-ID: <20160812112328.GX4329@intel.com> (raw)
In-Reply-To: <1470945277-7973-2-git-send-email-cpaul@redhat.com>
On Thu, Aug 11, 2016 at 03:54:30PM -0400, Lyude wrote:
> In order to add proper support for the SAGV, we need to be able to know
> what the cause of a failure to change the SAGV through the pcode mailbox
> was. The reasoning for this is that some very early pre-release Skylake
> machines don't actually allow you to control the SAGV on them, and
> indicate an invalid mailbox command was sent.
>
> This also might come in handy in the future for debugging.
>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/gpu/drm/i915/i915_reg.h | 1 +
> drivers/gpu/drm/i915/intel_pm.c | 10 ++++++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index da82744..73b3d4d 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -7121,6 +7121,7 @@ enum {
> #define VLV_MEDIA_C0_COUNT _MMIO(0x13811C)
>
> #define GEN6_PCODE_MAILBOX _MMIO(0x138124)
> +#define GEN6_PCODE_INVALID_CMD (1<<0)
It doesn't work quite like that. Instead the low 8 bits will contian
the error code, iff pcode has cleared the "READY" bit:
snb-ivb docs say:
00h MAILBOX_GTDRIVER_CC_SUCCESS
01h MAILBOX_GTDRIVER_CC_ILLEGAL_CMD
02h MAILBOX_GTDRIVER_CC_MIN_FREQUENCY_TABLE_GT_RATIO_OUT_OF_RANGE
03h MAILBOX_GTDRIVER_CC_TIMEOUT
FFh MAILBOX_GTDRIVER_CC_UNIMPLEMENTED_CMD
hsw-bdw docs say:
00h SUCCESS
01h ILLEGAL_CMD
02h TIMEOUT
03h ILLEGAL_DATA
10h MIN_FREQUENCY_TABLE_GT_RATIO_OUT_OF_RANGE
skl docs say:
00h SUCCESS
01h ILLEGAL_CMD
02h TIMEOUT
03h ILLEGAL_DATA
So looks like 02h and 03h will need to be interpreted in two different
ways depending on the platform. Assuming we want to decode the error
into a a human readable form for dmesg.
> #define GEN6_PCODE_READY (1<<31)
> #define GEN6_PCODE_WRITE_RC6VIDS 0x4
> #define GEN6_PCODE_READ_RC6VIDS 0x5
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 99014d7..8752730 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -7674,6 +7674,11 @@ int sandybridge_pcode_read(struct drm_i915_private *dev_priv, u32 mbox, u32 *val
> *val = I915_READ_FW(GEN6_PCODE_DATA);
> I915_WRITE_FW(GEN6_PCODE_DATA, 0);
>
> + if (I915_READ_FW(GEN6_PCODE_MAILBOX) & GEN6_PCODE_INVALID_CMD) {
> + DRM_DEBUG_DRIVER("warning: pcode (read) mailbox access indicated invalid command\n");
> + return -EINVAL;
> + }
> +
> return 0;
> }
>
> @@ -7704,6 +7709,11 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv,
>
> I915_WRITE_FW(GEN6_PCODE_DATA, 0);
>
> + if (I915_READ_FW(GEN6_PCODE_MAILBOX) & GEN6_PCODE_INVALID_CMD) {
> + DRM_DEBUG_DRIVER("warning: pcode (write) mailbox access indicated invalid command\n");
> + return -EINVAL;
> + }
> +
> return 0;
> }
>
> --
> 2.7.4
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2016-08-12 11:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 19:54 [PATCH v11 0/7] Finally fix watermarks Lyude
2016-08-11 19:54 ` [PATCH v11 1/7] drm/i915/gen6+: Return -EINVAL on invalid pcode commands Lyude
2016-08-12 11:23 ` Ville Syrjälä [this message]
2016-08-11 19:54 ` [PATCH v11 2/7] drm/i915/skl: Add support for the SAGV, fix underrun hangs Lyude
2016-08-12 12:04 ` Ville Syrjälä
2016-08-11 19:54 ` [PATCH v11 3/7] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw Lyude
2016-08-11 19:54 ` [PATCH v11 4/7] drm/i915/skl: Update plane watermarks atomically during plane updates Lyude
2016-08-12 12:42 ` Ville Syrjälä
2016-08-11 19:54 ` [PATCH v11 5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state Lyude
2016-08-11 19:54 ` [PATCH v11 6/7] drm/i915: Move CRTC updating in atomic_commit into it's own hook Lyude
2016-08-11 19:54 ` [PATCH v11 7/7] drm/i915/skl: Update DDB values atomically with wms/plane attrs Lyude
2016-08-12 13:30 ` Ville Syrjälä
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=20160812112328.GX4329@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=airlied@linux.ie \
--cc=cpaul@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthew.d.roper@intel.com \
--cc=stable@vger.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;
as well as URLs for NNTP newsgroup(s).