From: YunQiang Su <syq@debian.org>
To: pburton@wavecomp.com, linux-mips@vger.kernel.org, aaro.koskinen@iki.fi
Cc: YunQiang Su <ysu@wavecomp.com>
Subject: [PATCH v2] Disable MSI also when pcie-octeon.pcie_disable on
Date: Tue, 8 Jan 2019 13:45:10 +0800 [thread overview]
Message-ID: <20190108054510.7393-1-syq@debian.org> (raw)
From: YunQiang Su <ysu@wavecomp.com>
Octeon has an boot-time option to disable pcie.
Since MSI depends on PCI-E, we should also disable MSI also with
this options is on.
Signed-off-by: YunQiang Su <ysu@wavecomp.com>
---
arch/mips/pci/msi-octeon.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c
index 2a5bb849b..288b58b00 100644
--- 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;
--
2.20.1
next reply other threads:[~2019-01-08 5:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 5:45 YunQiang Su [this message]
2019-01-08 7:41 ` [PATCH v2] Disable MSI also when pcie-octeon.pcie_disable on YunQiang Su
2019-01-10 18:24 ` Paul Burton
2019-01-10 18:35 ` Yunqiang Su
2019-01-10 18:45 ` Paul Burton
2019-01-10 18:49 ` YunQiang Su
2019-01-10 18:55 ` YunQiang Su
2019-01-10 18:58 ` Paul Burton
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=20190108054510.7393-1-syq@debian.org \
--to=syq@debian.org \
--cc=aaro.koskinen@iki.fi \
--cc=linux-mips@vger.kernel.org \
--cc=pburton@wavecomp.com \
--cc=ysu@wavecomp.com \
/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).