| Message ID | 20210811162530.affe26231bc3.I131b3c1e67e3d2ead6e98addd256c835fbef9a3e@changeid (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI: vmd: depend on !UML | expand |
Reviewed-by: Jon Derrick <jonathan.derrick@intel.com> On 8/11/2021 8:25 AM, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > With UML having enabled (simulated) PCI on UML, VMD breaks > allyesconfig/allmodconfig compilation because it assumes > it's running on X86_64 bare metal, and has hardcoded API > use of ARCH=x86. Make it depend on !UML to fix this. > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > drivers/pci/controller/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig > index 64e2f5e379aa..297bbd86806a 100644 > --- a/drivers/pci/controller/Kconfig > +++ b/drivers/pci/controller/Kconfig > @@ -257,7 +257,7 @@ config PCIE_TANGO_SMP8759 > config and MMIO accesses. > > config VMD > - depends on PCI_MSI && X86_64 && SRCU > + depends on PCI_MSI && X86_64 && SRCU && !UML > tristate "Intel Volume Management Device Driver" > help > Adds support for the Intel Volume Management Device (VMD). VMD is a >
On 8/11/21 7:25 AM, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > With UML having enabled (simulated) PCI on UML, VMD breaks > allyesconfig/allmodconfig compilation because it assumes > it's running on X86_64 bare metal, and has hardcoded API > use of ARCH=x86. Make it depend on !UML to fix this. > > Signed-off-by: Johannes Berg <johannes.berg@intel.com> > --- > drivers/pci/controller/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig > index 64e2f5e379aa..297bbd86806a 100644 > --- a/drivers/pci/controller/Kconfig > +++ b/drivers/pci/controller/Kconfig > @@ -257,7 +257,7 @@ config PCIE_TANGO_SMP8759 > config and MMIO accesses. > > config VMD > - depends on PCI_MSI && X86_64 && SRCU > + depends on PCI_MSI && X86_64 && SRCU && !UML > tristate "Intel Volume Management Device Driver" > help > Adds support for the Intel Volume Management Device (VMD). VMD is a > Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Thanks.
On 8/11/21 7:43 AM, Derrick, Jonathan wrote: > Reviewed-by: Jon Derrick <jonathan.derrick@intel.com> > Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Bjorn, can you merge this, please? or did you expect it to be merged somewhere else? thanks. > On 8/11/2021 8:25 AM, Johannes Berg wrote: >> From: Johannes Berg <johannes.berg@intel.com> >> >> With UML having enabled (simulated) PCI on UML, VMD breaks >> allyesconfig/allmodconfig compilation because it assumes >> it's running on X86_64 bare metal, and has hardcoded API >> use of ARCH=x86. Make it depend on !UML to fix this. >> >> Signed-off-by: Johannes Berg <johannes.berg@intel.com> >> --- >> drivers/pci/controller/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig >> index 64e2f5e379aa..297bbd86806a 100644 >> --- a/drivers/pci/controller/Kconfig >> +++ b/drivers/pci/controller/Kconfig >> @@ -257,7 +257,7 @@ config PCIE_TANGO_SMP8759 >> config and MMIO accesses. >> >> config VMD >> - depends on PCI_MSI && X86_64 && SRCU >> + depends on PCI_MSI && X86_64 && SRCU && !UML >> tristate "Intel Volume Management Device Driver" >> help >> Adds support for the Intel Volume Management Device (VMD). VMD is a >>
On Wed, 11 Aug 2021 16:25:30 +0200, Johannes Berg wrote: > From: Johannes Berg <johannes.berg@intel.com> > > With UML having enabled (simulated) PCI on UML, VMD breaks > allyesconfig/allmodconfig compilation because it assumes > it's running on X86_64 bare metal, and has hardcoded API > use of ARCH=x86. Make it depend on !UML to fix this. > > [...] Applied to pci/vmd, thanks! [1/1] PCI: vmd: depend on !UML https://git.kernel.org/lpieralisi/pci/c/42cf2a633d Thanks, Lorenzo
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index 64e2f5e379aa..297bbd86806a 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -257,7 +257,7 @@ config PCIE_TANGO_SMP8759 config and MMIO accesses. config VMD - depends on PCI_MSI && X86_64 && SRCU + depends on PCI_MSI && X86_64 && SRCU && !UML tristate "Intel Volume Management Device Driver" help Adds support for the Intel Volume Management Device (VMD). VMD is a