Message ID | 20230423135124.55196-1-kilobyte@angband.pl |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2230790vqo; Sun, 23 Apr 2023 07:47:09 -0700 (PDT) X-Google-Smtp-Source: AKy350ZG0d81GOmpDEn2rrKdDLuwLRGMg5Nk+aRwCEThUCKhpU2eCBxmNZGZW8bLhoSXe0ytUuRV X-Received: by 2002:a05:6a20:728b:b0:f2:ae03:4020 with SMTP id o11-20020a056a20728b00b000f2ae034020mr8958714pzk.54.1682261229080; Sun, 23 Apr 2023 07:47:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682261229; cv=none; d=google.com; s=arc-20160816; b=HlmVmI8ZB2SfppN4XdBTWR3nlb8NJDYfyseJEgDqNEb4SB+lMpefp6x3zB240HBGE8 Jje7LfYT/D0Kre+SaDuaRCSgD3og5BauHDiAvpc+RJ1NT4ZKB1s3f+OpfuQT378rsVlB MpeijKMmjz7VzfRMajWqQ4x3GpPajOZyOOQXRLq0ebs9av2mMo0MSv5UK1ywT/FyzO1F 72eJvo7+laLTs/FFEkk8X9JvC/8I3b5QAHm/efH9K+J16tLALwMZbLw2eC/Mw6Ev8M7z Dks3uVzyTxB9dKzRDOEjK3P47mprI4j65KBBCPE+dMKRLv0E/3eCYdK8Ov+0v+cnrFbW vt/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=t7E2Cfb8s9cniW4an/ct2kiBsoLowqJvY125LeR0Aqw=; b=jx0UW3GGsu8anRkfKkbXUIscE8AP7e8s5FsCgGH9FEwPChShtZqwvuTZ3r3jLjzWLb Pr2gCAZkTJrI5l+HTsXnX9uAtC7UGx3WrLe+v3EmSgnOfBbLCoxORQEMARFtCTw06cz3 EhuqaZoQNit1VLdJ/KB81M73WGxLoCvNXLmvnREeLf0JI78bOClFi0MZGaBsxCNWXYsV N+DSie7y+ccIb/ARJi+cYtk1qlD5vJ+MyuLX1wEzYVfkctiHdW5wI2Gy9k2mziNLN2GA bA+FY6w79p4agm1gBWafhedl7m2SQmv3xdk4ch4jYR7+bvidcib+fujVgDHx4XhBX9QY ufAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@angband.pl header.s=tartarus header.b=IwRroCzm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a3-20020aa79703000000b0063d19a45a93si9112595pfg.280.2023.04.23.07.46.54; Sun, 23 Apr 2023 07:47:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@angband.pl header.s=tartarus header.b=IwRroCzm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230400AbjDWO02 (ORCPT <rfc822;fengqi706@gmail.com> + 99 others); Sun, 23 Apr 2023 10:26:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbjDWO00 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 23 Apr 2023 10:26:26 -0400 X-Greylist: delayed 2072 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 23 Apr 2023 07:26:24 PDT Received: from tartarus.angband.pl (tartarus.angband.pl [51.83.246.204]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3B5E103 for <linux-kernel@vger.kernel.org>; Sun, 23 Apr 2023 07:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=angband.pl; s=tartarus; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=t7E2Cfb8s9cniW4an/ct2kiBsoLowqJvY125LeR0Aqw=; b=IwRroCzm2yYthRD2acJt/nlQuD 7W26ifGrFqykO4xnGMq8P7M2p77nC4ZGOD90+c9sQF7aHmOq9EvlNHMZ6Yt8AaeUdSIAT4FbisCXB 0FdebBR9sD1LI7YtYh7jzRy+aYw9tCMI596pVCB5xqlVN38SFgbDalQ5vKVbj5+FqpLM=; Received: from localhost ([127.0.0.1] helo=valinor.angband.pl) by tartarus.angband.pl with smtp (Exim 4.96) (envelope-from <kilobyte@valinor.angband.pl>) id 1pqa7o-00GisH-05; Sun, 23 Apr 2023 15:51:32 +0200 Received: (nullmailer pid 55273 invoked by uid 1000); Sun, 23 Apr 2023 13:51:30 -0000 From: kilobyte@angband.pl To: Tomas Winkler <tomas.winkler@intel.com>, Arnd Bergmann <arnd@arndb.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org Cc: Adam Borowski <kilobyte@angband.pl> Subject: [PATCH] mei: make hdcp and pxp depend on X86 && PCI Date: Sun, 23 Apr 2023 15:51:24 +0200 Message-Id: <20230423135124.55196-1-kilobyte@angband.pl> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: kilobyte@valinor.angband.pl X-SA-Exim-Scanned: No (on tartarus.angband.pl); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763978751013078049?= X-GMAIL-MSGID: =?utf-8?q?1763978751013078049?= |
Series |
mei: make hdcp and pxp depend on X86 && PCI
|
|
Commit Message
Adam Borowski
April 23, 2023, 1:51 p.m. UTC
From: Adam Borowski <kilobyte@angband.pl> All other MEI configs do so already. This fixes a Kconfig gripe if I915 gets ported to other archs (such as RISC-V in Intel Horse Creek...). Signed-off-by: Adam Borowski <kilobyte@angband.pl> --- drivers/misc/mei/hdcp/Kconfig | 1 + drivers/misc/mei/pxp/Kconfig | 1 + 2 files changed, 2 insertions(+)
Comments
What is the exact issue you are experiencing, can you add the error message this fixes? > > From: Adam Borowski <kilobyte@angband.pl> > > All other MEI configs do so already. This fixes a Kconfig gripe if I915 gets > ported to other archs (such as RISC-V in Intel Horse Creek...). > > Signed-off-by: Adam Borowski <kilobyte@angband.pl> > --- > drivers/misc/mei/hdcp/Kconfig | 1 + > drivers/misc/mei/pxp/Kconfig | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig > index 54e1c9526909..83e67771ac6b 100644 > --- a/drivers/misc/mei/hdcp/Kconfig > +++ b/drivers/misc/mei/hdcp/Kconfig > @@ -4,6 +4,7 @@ > config INTEL_MEI_HDCP > tristate "Intel HDCP2.2 services of ME Interface" > select INTEL_MEI_ME > + depends on X86 && PCI > depends on DRM_I915 > help > MEI Support for HDCP2.2 Services on Intel platforms. > diff --git a/drivers/misc/mei/pxp/Kconfig b/drivers/misc/mei/pxp/Kconfig > index 4029b96afc04..95f2c2470d28 100644 > --- a/drivers/misc/mei/pxp/Kconfig > +++ b/drivers/misc/mei/pxp/Kconfig > @@ -5,6 +5,7 @@ > config INTEL_MEI_PXP > tristate "Intel PXP services of ME Interface" > select INTEL_MEI_ME > + depends on X86 && PCI > depends on DRM_I915 > help > MEI Support for PXP Services on Intel platforms. > -- > 2.40.0
On Tue, Apr 25, 2023 at 04:39:23AM +0000, Winkler, Tomas wrote: > What is the exact issue you are experiencing, can you add the error message this fixes? The problem doesn't trigger in mainline, as DRM_I915 can't be enabled on !X86; https://github.com/kilobyte/linux branch i915 has a WIP port. Some unrelated piece (I suspect ACPI changes, didn't bother to investigate) has in the meantime grown enough bits to enable prerequsites that trigger: WARNING: unmet direct dependencies detected for INTEL_MEI_ME Depends on [n]: X86 && PCI [=y] Selected by [y]: - INTEL_MEI_HDCP [=y] && DRM_I915 [=y] - INTEL_MEI_PXP [=y] && DRM_I915 [=y] This doesn't cause an actual build failure, as drivers/misc/Makefile has > obj-$(CONFIG_INTEL_MEI) += mei/ which won't try to build mei/hdcp nor mei/pxp despite them being enabled in the config. Of all the settings in drivers/misc/mei/Kconfig, only these two (that reside in their own subdirectories) lack this stanza. You'd want to deduplicate the selects one day -- but alas, "select" relations are not as straightforward as "depends", thus I only did the same as for all other settings in drivers/misc/mei/Kconfig. Should I quote this warning in full in the commit message? I thought that "make ... depend on ..." already explains enough. Also, as this lack of dependency is an obvious and self-contained change, I decided to submit it directly via mei, rather than ask for an ACK then spam you with every iteration of the patchset. Should it go via drm/i915 instead? (I'd also like to apologize for sitting on this patchset so long, my brain's firmware is faulty :/ ). > > From: Adam Borowski <kilobyte@angband.pl> > > > > All other MEI configs do so already. This fixes a Kconfig gripe if I915 gets > > ported to other archs (such as RISC-V in Intel Horse Creek...). > > > > Signed-off-by: Adam Borowski <kilobyte@angband.pl> > > --- > > drivers/misc/mei/hdcp/Kconfig | 1 + > > drivers/misc/mei/pxp/Kconfig | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig > > index 54e1c9526909..83e67771ac6b 100644 > > --- a/drivers/misc/mei/hdcp/Kconfig > > +++ b/drivers/misc/mei/hdcp/Kconfig > > @@ -4,6 +4,7 @@ > > config INTEL_MEI_HDCP > > tristate "Intel HDCP2.2 services of ME Interface" > > select INTEL_MEI_ME > > + depends on X86 && PCI > > depends on DRM_I915 > > help > > MEI Support for HDCP2.2 Services on Intel platforms. > > diff --git a/drivers/misc/mei/pxp/Kconfig b/drivers/misc/mei/pxp/Kconfig > > index 4029b96afc04..95f2c2470d28 100644 > > --- a/drivers/misc/mei/pxp/Kconfig > > +++ b/drivers/misc/mei/pxp/Kconfig > > @@ -5,6 +5,7 @@ > > config INTEL_MEI_PXP > > tristate "Intel PXP services of ME Interface" > > select INTEL_MEI_ME > > + depends on X86 && PCI > > depends on DRM_I915 > > help > > MEI Support for PXP Services on Intel platforms. > > -- > > 2.40.0 Meow!
On Tue, Apr 25, 2023 at 01:52:10PM +0200, Adam Borowski wrote: > On Tue, Apr 25, 2023 at 04:39:23AM +0000, Winkler, Tomas wrote: > > What is the exact issue you are experiencing, can you add the error message this fixes? > > The problem doesn't trigger in mainline Then it's nothing we need to worry about in mainline. If/when other changes ever happen to need it here in mainline, we will gladly take the change. For obvious reasons, we can't take patches for issues outside of our codebase. Nor do you want us to, as that way lies madness and an unmaintainable mess. thanks, greg k-h
On Tue, Apr 25, 2023 at 03:40:10PM +0200, Greg Kroah-Hartman wrote: > On Tue, Apr 25, 2023 at 01:52:10PM +0200, Adam Borowski wrote: > > On Tue, Apr 25, 2023 at 04:39:23AM +0000, Winkler, Tomas wrote: > > > What is the exact issue you are experiencing, can you add the error message this fixes? > > > > The problem doesn't trigger in mainline > > Then it's nothing we need to worry about in mainline. If/when other > changes ever happen to need it here in mainline, we will gladly take the > change. > > For obvious reasons, we can't take patches for issues outside of our > codebase. Nor do you want us to, as that way lies madness and an > unmaintainable mess. The problem in mainline is inconsistency: out of 6 config items, 4 repeat the "depends on X86 && PCI" line, the other 2 do not. There's indeed no immediate functional issue, but I'd argue that a dormant bug is still a bug. So we can fix the cosmetic (currently) issue on its own, or as part of the large patchset -- the latter having a side effect of stuffing your mailboxes more than needed (neither Greg, Arnd, nor Tomas are involved in other bits). But do the selects really require so much duplication? Perhaps I'm trying to fix the underlying issue wrong? Meow!
On Tue, Apr 25, 2023, at 16:27, Adam Borowski wrote: > On Tue, Apr 25, 2023 at 03:40:10PM +0200, Greg Kroah-Hartman wrote: >> On Tue, Apr 25, 2023 at 01:52:10PM +0200, Adam Borowski wrote: >> > On Tue, Apr 25, 2023 at 04:39:23AM +0000, Winkler, Tomas wrote: >> > > What is the exact issue you are experiencing, can you add the error message this fixes? >> > >> > The problem doesn't trigger in mainline >> >> Then it's nothing we need to worry about in mainline. If/when other >> changes ever happen to need it here in mainline, we will gladly take the >> change. >> >> For obvious reasons, we can't take patches for issues outside of our >> codebase. Nor do you want us to, as that way lies madness and an >> unmaintainable mess. > > The problem in mainline is inconsistency: out of 6 config items, 4 repeat > the "depends on X86 && PCI" line, the other 2 do not. There's indeed no > immediate functional issue, but I'd argue that a dormant bug is still a bug. > > So we can fix the cosmetic (currently) issue on its own, or as part of the > large patchset -- the latter having a side effect of stuffing your mailboxes > more than needed (neither Greg, Arnd, nor Tomas are involved in other bits). > > But do the selects really require so much duplication? Perhaps I'm trying > to fix the underlying issue wrong? I think something along these lines would do (untested): diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig index d21486d69df2..8e5d79cff80b 100644 --- a/drivers/misc/mei/Kconfig +++ b/drivers/misc/mei/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2003-2019, Intel Corporation. All rights reserved. -config INTEL_MEI +menuconfig INTEL_MEI tristate "Intel Management Engine Interface" depends on X86 && PCI help @@ -13,8 +13,6 @@ config INTEL_MEI config INTEL_MEI_ME tristate "ME Enabled Intel Chipsets" - select INTEL_MEI - depends on X86 && PCI help MEI support for ME Enabled Intel chipsets. @@ -38,8 +36,6 @@ config INTEL_MEI_ME config INTEL_MEI_TXE tristate "Intel Trusted Execution Environment with ME Interface" - select INTEL_MEI - depends on X86 && PCI help MEI Support for Trusted Execution Environment device on Intel SoCs @@ -48,9 +44,7 @@ config INTEL_MEI_TXE config INTEL_MEI_GSC tristate "Intel MEI GSC embedded device" - depends on INTEL_MEI depends on INTEL_MEI_ME - depends on X86 && PCI depends on DRM_I915 help Intel auxiliary driver for GSC devices embedded in Intel graphics devices. @@ -63,3 +57,4 @@ config INTEL_MEI_GSC source "drivers/misc/mei/hdcp/Kconfig" source "drivers/misc/mei/pxp/Kconfig" +endmenu
> > On Tue, Apr 25, 2023, at 16:27, Adam Borowski wrote: > > On Tue, Apr 25, 2023 at 03:40:10PM +0200, Greg Kroah-Hartman wrote: > >> On Tue, Apr 25, 2023 at 01:52:10PM +0200, Adam Borowski wrote: > >> > On Tue, Apr 25, 2023 at 04:39:23AM +0000, Winkler, Tomas wrote: > >> > > What is the exact issue you are experiencing, can you add the error > message this fixes? > >> > > >> > The problem doesn't trigger in mainline > >> > >> Then it's nothing we need to worry about in mainline. If/when other > >> changes ever happen to need it here in mainline, we will gladly take > >> the change. > >> > >> For obvious reasons, we can't take patches for issues outside of our > >> codebase. Nor do you want us to, as that way lies madness and an > >> unmaintainable mess. > > > > The problem in mainline is inconsistency: out of 6 config items, 4 > > repeat the "depends on X86 && PCI" line, the other 2 do not. There's > > indeed no immediate functional issue, but I'd argue that a dormant bug is > still a bug. The MEI protocol (CONFIG_INTEL_MEI) is not PCI or X86 dependent. INTEL_MEI_GSC is PCI dependent but not X86. (Hope I correct also on implementation side) They HW layers are currently X86 dependent. > > > > So we can fix the cosmetic (currently) issue on its own, or as part of > > the large patchset -- the latter having a side effect of stuffing your > > mailboxes more than needed (neither Greg, Arnd, nor Tomas are involved > in other bits). > > > > But do the selects really require so much duplication? Perhaps I'm > > trying to fix the underlying issue wrong? > > I think something along these lines would do (untested): > > diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig index > d21486d69df2..8e5d79cff80b 100644 > --- a/drivers/misc/mei/Kconfig > +++ b/drivers/misc/mei/Kconfig > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > # Copyright (c) 2003-2019, Intel Corporation. All rights reserved. > -config INTEL_MEI > +menuconfig INTEL_MEI > tristate "Intel Management Engine Interface" > depends on X86 && PCI > help > @@ -13,8 +13,6 @@ config INTEL_MEI > > config INTEL_MEI_ME > tristate "ME Enabled Intel Chipsets" > - select INTEL_MEI > - depends on X86 && PCI > help > MEI support for ME Enabled Intel chipsets. > > @@ -38,8 +36,6 @@ config INTEL_MEI_ME > > config INTEL_MEI_TXE > tristate "Intel Trusted Execution Environment with ME Interface" > - select INTEL_MEI > - depends on X86 && PCI > help > MEI Support for Trusted Execution Environment device on Intel SoCs > > @@ -48,9 +44,7 @@ config INTEL_MEI_TXE > > config INTEL_MEI_GSC > tristate "Intel MEI GSC embedded device" > - depends on INTEL_MEI > depends on INTEL_MEI_ME > - depends on X86 && PCI > depends on DRM_I915 > help > Intel auxiliary driver for GSC devices embedded in Intel graphics devices. > @@ -63,3 +57,4 @@ config INTEL_MEI_GSC > source "drivers/misc/mei/hdcp/Kconfig" > source "drivers/misc/mei/pxp/Kconfig" > > +endmenu
On Wed, Apr 26, 2023, at 19:11, Winkler, Tomas wrote: >> >> On Tue, Apr 25, 2023, at 16:27, Adam Borowski wrote: >> > The problem in mainline is inconsistency: out of 6 config items, 4 >> > repeat the "depends on X86 && PCI" line, the other 2 do not. There's >> > indeed no immediate functional issue, but I'd argue that a dormant bug is >> still a bug. > > The MEI protocol (CONFIG_INTEL_MEI) is not PCI or X86 dependent. > INTEL_MEI_GSC is PCI dependent but not X86. (Hope I correct also on > implementation side) > They HW layers are currently X86 dependent. Ok, so in that case the dependencies should be relaxed like below I guess, in order to allow using the MEI on non-x86 i915 devices. Arnd diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig index d21486d69df2..7c6e3b4588d0 100644 --- a/drivers/misc/mei/Kconfig +++ b/drivers/misc/mei/Kconfig @@ -2,7 +2,6 @@ # Copyright (c) 2003-2019, Intel Corporation. All rights reserved. config INTEL_MEI tristate "Intel Management Engine Interface" - depends on X86 && PCI help The Intel Management Engine (Intel ME) provides Manageability, Security and Media services for system containing Intel chipsets. @@ -39,7 +38,7 @@ config INTEL_MEI_ME config INTEL_MEI_TXE tristate "Intel Trusted Execution Environment with ME Interface" select INTEL_MEI - depends on X86 && PCI + depends on X86 help MEI Support for Trusted Execution Environment device on Intel SoCs @@ -50,7 +49,7 @@ config INTEL_MEI_GSC tristate "Intel MEI GSC embedded device" depends on INTEL_MEI depends on INTEL_MEI_ME - depends on X86 && PCI + depends on PCI depends on DRM_I915 help Intel auxiliary driver for GSC devices embedded in Intel graphics devices.
> On Wed, Apr 26, 2023, at 19:11, Winkler, Tomas wrote: > >> > >> On Tue, Apr 25, 2023, at 16:27, Adam Borowski wrote: > >> > The problem in mainline is inconsistency: out of 6 config items, 4 > >> > repeat the "depends on X86 && PCI" line, the other 2 do not. > >> > There's indeed no immediate functional issue, but I'd argue that a > >> > dormant bug is > >> still a bug. > > > > The MEI protocol (CONFIG_INTEL_MEI) is not PCI or X86 dependent. > > INTEL_MEI_GSC is PCI dependent but not X86. (Hope I correct also on > > implementation side) They HW layers are currently X86 dependent. > > Ok, so in that case the dependencies should be relaxed like below I guess, in > order to allow using the MEI on non-x86 i915 devices. > > Arnd > > diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig index > d21486d69df2..7c6e3b4588d0 100644 > --- a/drivers/misc/mei/Kconfig > +++ b/drivers/misc/mei/Kconfig > @@ -2,7 +2,6 @@ > # Copyright (c) 2003-2019, Intel Corporation. All rights reserved. > config INTEL_MEI > tristate "Intel Management Engine Interface" > - depends on X86 && PCI > help > The Intel Management Engine (Intel ME) provides Manageability, > Security and Media services for system containing Intel chipsets. > @@ -39,7 +38,7 @@ config INTEL_MEI_ME > config INTEL_MEI_TXE > tristate "Intel Trusted Execution Environment with ME Interface" > select INTEL_MEI > - depends on X86 && PCI > + depends on X86 This should be both X86 and PCI, this is a HW dependent module > help > MEI Support for Trusted Execution Environment device on Intel SoCs > > @@ -50,7 +49,7 @@ config INTEL_MEI_GSC > tristate "Intel MEI GSC embedded device" > depends on INTEL_MEI > depends on INTEL_MEI_ME > - depends on X86 && PCI > + depends on PCI > depends on DRM_I915 > help > Intel auxiliary driver for GSC devices embedded in Intel graphics devices.
diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig index 54e1c9526909..83e67771ac6b 100644 --- a/drivers/misc/mei/hdcp/Kconfig +++ b/drivers/misc/mei/hdcp/Kconfig @@ -4,6 +4,7 @@ config INTEL_MEI_HDCP tristate "Intel HDCP2.2 services of ME Interface" select INTEL_MEI_ME + depends on X86 && PCI depends on DRM_I915 help MEI Support for HDCP2.2 Services on Intel platforms. diff --git a/drivers/misc/mei/pxp/Kconfig b/drivers/misc/mei/pxp/Kconfig index 4029b96afc04..95f2c2470d28 100644 --- a/drivers/misc/mei/pxp/Kconfig +++ b/drivers/misc/mei/pxp/Kconfig @@ -5,6 +5,7 @@ config INTEL_MEI_PXP tristate "Intel PXP services of ME Interface" select INTEL_MEI_ME + depends on X86 && PCI depends on DRM_I915 help MEI Support for PXP Services on Intel platforms.