Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91aaa0dd authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled 



commit dcf300a69ac307053dfb35c2e33972e754a98bce upstream.

Don't set octeon_dma_bar_type if PCI is disabled. This avoids creation
of the MSI irqchip later on, and saves a bit of memory.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Fixes: a214720cbf50 ("Disable MSI also when pcie-octeon.pcie_disable on")
Cc: stable@vger.kernel.org # v3.3+
Cc: linux-mips@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d93fdf44

arch/mips/pci/pci-octeon.c

+5 −5
Original line number Diff line number Diff line
@@ -571,6 +571,11 @@ static int __init octeon_pci_setup(void) 
	if (octeon_has_feature(OCTEON_FEATURE_PCIE))

		return 0;



	if (!octeon_is_pci_host()) {

		pr_notice("Not in host mode, PCI Controller not initialized\n");

		return 0;

	}



	/* Point pcibios_map_irq() to the PCI version of it */

	octeon_pcibios_map_irq = octeon_pci_pcibios_map_irq;
@@ -582,11 +587,6 @@ static int __init octeon_pci_setup(void) 
	else

		octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_BIG;



	if (!octeon_is_pci_host()) {

		pr_notice("Not in host mode, PCI Controller not initialized\n");

		return 0;

	}



	/* PCI I/O and PCI MEM values */

	set_io_port_base(OCTEON_PCI_IOSPACE_BASE);

	ioport_resource.start = 0;