lkml.org 
[lkml]   [2019]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 59/99] Disable MSI also when pcie-octeon.pcie_disable on
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

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

    From: YunQiang Su <ysu@wavecomp.com>

    commit a214720cbf50cd8c3f76bbb9c3f5c283910e9d33 upstream.

    Octeon has an boot-time option to disable pcie.

    Since MSI depends on PCI-E, we should also disable MSI also with
    this option is on in order to avoid inadvertently accessing PCIe
    registers.

    Signed-off-by: YunQiang Su <ysu@wavecomp.com>
    Signed-off-by: Paul Burton <paul.burton@mips.com>
    Cc: pburton@wavecomp.com
    Cc: linux-mips@vger.kernel.org
    Cc: aaro.koskinen@iki.fi
    Cc: stable@vger.kernel.org # v3.3+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/pci/msi-octeon.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/arch/mips/pci/msi-octeon.c
    +++ b/arch/mips/pci/msi-octeon.c
    @@ -369,7 +369,9 @@ int __init octeon_msi_initialize(void)
    int irq;
    struct irq_chip *msi;

    - if (octeon_dma_bar_type == OCTEON_DMA_BAR_TYPE_PCIE) {
    + if (octeon_dma_bar_type == OCTEON_DMA_BAR_TYPE_INVALID) {
    + return 0;
    + } else if (octeon_dma_bar_type == OCTEON_DMA_BAR_TYPE_PCIE) {
    msi_rcv_reg[0] = CVMX_PEXP_NPEI_MSI_RCV0;
    msi_rcv_reg[1] = CVMX_PEXP_NPEI_MSI_RCV1;
    msi_rcv_reg[2] = CVMX_PEXP_NPEI_MSI_RCV2;

    \
     
     \ /
      Last update: 2019-01-21 15:06    [W:4.112 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site