From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> To: intel-gfx@lists.freedesktop.org Cc: Alan Previn <alan.previn.teres.alexis@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, dri-devel@lists.freedesktop.org, Tomas Winkler <tomas.winkler@intel.com>, Vitaly Lubart <vitaly.lubart@intel.com> Subject: [Intel-gfx] [PATCH v5 06/15] mei: pxp: support matching with a gfx discrete card Date: Mon, 12 Sep 2022 17:57:30 -0700 [thread overview] Message-ID: <20220913005739.798337-7-daniele.ceraolospurio@intel.com> (raw) In-Reply-To: <20220913005739.798337-1-daniele.ceraolospurio@intel.com> From: Tomas Winkler <tomas.winkler@intel.com> With on-boards graphics card, both i915 and MEI are in the same device hierarchy with the same parent, while for discrete gfx card the MEI is its child device. Adjust the match function for that scenario by matching MEI parent device with i915. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Vitaly Lubart <vitaly.lubart@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> --- V2: 1. More detailed commit message 2. Check for dev is not null before it is accessed. V3-5: Rebase drivers/misc/mei/pxp/mei_pxp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index f221464c4009..8dd09b1722eb 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -156,17 +156,24 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent, { struct device *base = data; + if (!dev) + return 0; + if (!dev->driver || strcmp(dev->driver->name, "i915") || subcomponent != I915_COMPONENT_PXP) return 0; base = base->parent; - if (!base) + if (!base) /* mei device */ return 0; - base = base->parent; - dev = dev->parent; + base = base->parent; /* pci device */ + /* for dgfx */ + if (base && dev == base) + return 1; + /* for pch */ + dev = dev->parent; return (base && dev && dev == base); } -- 2.37.2
WARNING: multiple messages have this Message-ID (diff)
From: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> To: intel-gfx@lists.freedesktop.org Cc: Alan Previn <alan.previn.teres.alexis@intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, dri-devel@lists.freedesktop.org, Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>, Tomas Winkler <tomas.winkler@intel.com>, Vitaly Lubart <vitaly.lubart@intel.com> Subject: [PATCH v5 06/15] mei: pxp: support matching with a gfx discrete card Date: Mon, 12 Sep 2022 17:57:30 -0700 [thread overview] Message-ID: <20220913005739.798337-7-daniele.ceraolospurio@intel.com> (raw) In-Reply-To: <20220913005739.798337-1-daniele.ceraolospurio@intel.com> From: Tomas Winkler <tomas.winkler@intel.com> With on-boards graphics card, both i915 and MEI are in the same device hierarchy with the same parent, while for discrete gfx card the MEI is its child device. Adjust the match function for that scenario by matching MEI parent device with i915. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Vitaly Lubart <vitaly.lubart@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Alan Previn <alan.previn.teres.alexis@intel.com> --- V2: 1. More detailed commit message 2. Check for dev is not null before it is accessed. V3-5: Rebase drivers/misc/mei/pxp/mei_pxp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index f221464c4009..8dd09b1722eb 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -156,17 +156,24 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent, { struct device *base = data; + if (!dev) + return 0; + if (!dev->driver || strcmp(dev->driver->name, "i915") || subcomponent != I915_COMPONENT_PXP) return 0; base = base->parent; - if (!base) + if (!base) /* mei device */ return 0; - base = base->parent; - dev = dev->parent; + base = base->parent; /* pci device */ + /* for dgfx */ + if (base && dev == base) + return 1; + /* for pch */ + dev = dev->parent; return (base && dev && dev == base); } -- 2.37.2
next prev parent reply other threads:[~2022-09-13 0:59 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-13 0:57 [PATCH v5 00/15] drm/i915: HuC loading for DG2 Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-13 0:57 ` [PATCH v5 01/15] mei: add support to GSC extended header Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-24 12:15 ` Greg Kroah-Hartman 2022-09-24 12:15 ` [Intel-gfx] " Greg Kroah-Hartman 2022-09-13 0:57 ` [PATCH v5 02/15] mei: bus: enable sending gsc commands Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-24 12:15 ` Greg Kroah-Hartman 2022-09-24 12:15 ` [Intel-gfx] " Greg Kroah-Hartman 2022-09-13 0:57 ` [PATCH v5 03/15] mei: adjust extended header kdocs Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-24 12:15 ` Greg Kroah-Hartman 2022-09-24 12:15 ` [Intel-gfx] " Greg Kroah-Hartman 2022-09-13 0:57 ` [PATCH v5 04/15] mei: bus: extend bus API to support command streamer API Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-24 12:16 ` Greg Kroah-Hartman 2022-09-24 12:16 ` [Intel-gfx] " Greg Kroah-Hartman 2022-09-13 0:57 ` [PATCH v5 05/15] mei: pxp: add command streamer API to the PXP driver Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-24 12:16 ` Greg Kroah-Hartman 2022-09-24 12:16 ` [Intel-gfx] " Greg Kroah-Hartman 2022-09-13 0:57 ` Daniele Ceraolo Spurio [this message] 2022-09-13 0:57 ` [PATCH v5 06/15] mei: pxp: support matching with a gfx discrete card Daniele Ceraolo Spurio 2022-09-24 12:16 ` Greg Kroah-Hartman 2022-09-24 12:16 ` [Intel-gfx] " Greg Kroah-Hartman 2022-09-13 0:57 ` [PATCH v5 07/15] drm/i915/pxp: load the pxp module when we have a gsc-loaded huc Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] [PATCH v5 08/15] drm/i915/pxp: implement function for sending tee stream command Daniele Ceraolo Spurio 2022-09-13 0:57 ` Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] [PATCH v5 09/15] drm/i915/pxp: add huc authentication and loading command Daniele Ceraolo Spurio 2022-09-13 0:57 ` Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] [PATCH v5 10/15] drm/i915/dg2: setup HuC loading via GSC Daniele Ceraolo Spurio 2022-09-13 0:57 ` Daniele Ceraolo Spurio 2022-09-13 0:57 ` [PATCH v5 11/15] drm/i915/huc: track delayed HuC load with a fence Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] [PATCH v5 12/15] drm/i915/huc: stall media submission until HuC is loaded Daniele Ceraolo Spurio 2022-09-13 0:57 ` Daniele Ceraolo Spurio 2022-09-13 23:22 ` [PATCH] " Daniele Ceraolo Spurio 2022-09-13 23:22 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-27 18:54 ` Teres Alexis, Alan Previn 2022-09-27 18:54 ` [Intel-gfx] " Teres Alexis, Alan Previn 2022-09-13 0:57 ` [PATCH v5 13/15] drm/i915/huc: better define HuC status getparam possible return values Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-13 0:57 ` [PATCH v5 14/15] drm/i915/huc: define gsc-compatible HuC fw for DG2 Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-13 0:57 ` [PATCH v5 15/15] HAX: drm/i915: force INTEL_MEI_GSC and INTEL_MEI_PXP on for CI Daniele Ceraolo Spurio 2022-09-13 0:57 ` [Intel-gfx] " Daniele Ceraolo Spurio 2022-09-13 2:16 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: HuC loading for DG2 (rev5) Patchwork 2022-09-13 2:16 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-09-13 2:39 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-09-13 10:44 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2022-09-13 22:11 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: HuC loading for DG2 (rev6) Patchwork 2022-09-13 22:12 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-09-13 22:34 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-09-14 0:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: HuC loading for DG2 (rev7) Patchwork 2022-09-14 0:52 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-09-14 1:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-09-14 16:19 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2022-09-14 16:51 ` [PATCH v5 00/15] drm/i915: HuC loading for DG2 Winkler, Tomas 2022-09-14 16:51 ` [Intel-gfx] " Winkler, Tomas 2022-09-14 18:11 ` Greg Kroah-Hartman 2022-09-14 18:11 ` [Intel-gfx] " Greg Kroah-Hartman 2022-09-15 20:54 ` Winkler, Tomas 2022-09-15 20:54 ` Winkler, Tomas
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=20220913005739.798337-7-daniele.ceraolospurio@intel.com \ --to=daniele.ceraolospurio@intel.com \ --cc=alan.previn.teres.alexis@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=tomas.winkler@intel.com \ --cc=vitaly.lubart@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.