lkml.org 
[lkml]   [2019]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 20/44] MIPS: OCTEON: dont set octeon_dma_bar_type if PCI is disabled
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Aaro Koskinen <aaro.koskinen@iki.fi>

    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: Aaro Koskinen <aaro.koskinen@iki.fi>
    Signed-off-by: Paul 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/pci/pci-octeon.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/arch/mips/pci/pci-octeon.c
    +++ b/arch/mips/pci/pci-octeon.c
    @@ -568,6 +568,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;

    @@ -579,11 +584,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;

    \
     
     \ /
      Last update: 2019-02-13 19:53    [W:3.887 / U:1.676 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site