From: Jan Kiszka <jan.kiszka@siemens.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H . Peter Anvin" <hpa@zytor.com>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: x86@kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
jailhouse-dev@googlegroups.com, linux-pci@vger.kernel.org,
virtualization@lists.linux-foundation.org,
Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: [PATCH v5 5/7] x86: Consolidate PCI_MMCONFIG configs
Date: Wed, 7 Mar 2018 08:39:16 +0100 [thread overview]
Message-ID: <2a0ccd51ea6f7996e07162918228e23bdc1fbb03.1520408357.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1520408357.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1520408357.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
Since e279b6c1d329 ("x86: start unification of arch/x86/Kconfig.*"), we
have two PCI_MMCONFIG entries, one from the original i386 and another
from x86_64. This consolidates both entries into a single one.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
arch/x86/Kconfig | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c19f5342ec2b..8986a6b6e3df 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2641,8 +2641,10 @@ config PCI_DIRECT
depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC || PCI_GOMMCONFIG))
config PCI_MMCONFIG
- def_bool y
- depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)
+ bool "Support mmconfig PCI config space access" if X86_64
+ default y
+ depends on PCI && (ACPI || SFI)
+ depends on X86_64 || (PCI_GOANY || PCI_GOMMCONFIG)
config PCI_OLPC
def_bool y
@@ -2657,11 +2659,6 @@ config PCI_DOMAINS
def_bool y
depends on PCI
-config PCI_MMCONFIG
- bool "Support mmconfig PCI config space access"
- default y
- depends on X86_64 && PCI && (ACPI || SFI)
-
config PCI_CNB20LE_QUIRK
bool "Read CNB20LE Host Bridge Windows" if EXPERT
depends on PCI
--
2.13.6
next prev parent reply other threads:[~2018-03-07 7:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 7:39 [PATCH v5 0/7] jailhouse: Enhance secondary Jailhouse guest support /wrt PCI Jan Kiszka
2018-03-07 7:39 ` [PATCH v5 1/7] jailhouse: Provide detection for non-x86 systems Jan Kiszka
2018-03-08 11:33 ` [tip:x86/platform] " tip-bot for Jan Kiszka
2018-03-07 7:39 ` [PATCH v5 2/7] PCI: Scan all functions when running over Jailhouse Jan Kiszka
2018-03-08 11:34 ` [tip:x86/platform] " tip-bot for Jan Kiszka
2018-03-07 7:39 ` [PATCH v5 3/7] x86/jailhouse: Enable PCI mmconfig access in inmates Jan Kiszka
2018-03-08 11:35 ` [tip:x86/platform] " tip-bot for Otavio Pontes
2018-03-07 7:39 ` [PATCH v5 4/7] x86: Align x86_64 PCI_MMCONFIG with 32-bit variant Jan Kiszka
2018-03-08 11:35 ` [tip:x86/platform] " tip-bot for Jan Kiszka
2018-03-07 7:39 ` Jan Kiszka [this message]
2018-03-08 11:36 ` [tip:x86/platform] x86: Consolidate PCI_MMCONFIG configs tip-bot for Jan Kiszka
2018-03-07 7:39 ` [PATCH v5 6/7] x86/jailhouse: Allow to use PCI_MMCONFIG without ACPI Jan Kiszka
2018-03-08 11:36 ` [tip:x86/platform] " tip-bot for Jan Kiszka
2018-03-07 7:39 ` [PATCH v5 7/7] MAINTAINERS: Add entry for Jailhouse Jan Kiszka
2018-03-08 11:36 ` [tip:x86/platform] " tip-bot for Jan Kiszka
2018-03-19 19:48 ` [PATCH v5 0/7] jailhouse: Enhance secondary Jailhouse guest support /wrt PCI Bjorn Helgaas
2018-03-19 19:50 ` Thomas Gleixner
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=2a0ccd51ea6f7996e07162918228e23bdc1fbb03.1520408357.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=andy.shevchenko@gmail.com \
--cc=bhelgaas@google.com \
--cc=hpa@zytor.com \
--cc=jailhouse-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@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).