[PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III

Path	csiph.com!xmission!news.glorb.com!bofh.it!news.nic.it!robomod
From	Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Newsgroups	linux.kernel
Subject	[PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III
Date	Wed, 10 Feb 2016 15:00:03 +0100
Message-ID	<r0Dth-2TR-19@gated-at.bofh.it> (permalink)
X-Mailer	git-send-email 1.9.1
MIME-Version	1.0
Content-Type	text/plain
X-Originating-IP	[192.168.154.45]
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	33
Organization	linux.* mail to news gateway
X-Original-Cc	<linux-mips@linux-mips.org>, <linux-kernel@vger.kernel.org>, <matt.redfearn@imgtec.com>, <Zubair.Kakakhel@imgtec.com>
X-Original-Date	Wed, 10 Feb 2016 13:56:25 +0000
X-Original-Message-ID	<1455112585-44058-1-git-send-email-Zubair.Kakakhel@imgtec.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1331183

Show key headers only | View raw

Currently the driver tries to probe the pci driver and oops.

Add CN7XXX to case so that driver probes the pcie driver.

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>

---
Based on v4.5-rc3

Boot tested only on CN7130 based utm8.

It does not oops and proceeds with the rest of the kernel boot.

---
 arch/mips/include/asm/octeon/octeon-feature.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/octeon/octeon-feature.h b/arch/mips/include/asm/octeon/octeon-feature.h
index 8ebd3f57..3ed10a8 100644
--- a/arch/mips/include/asm/octeon/octeon-feature.h
+++ b/arch/mips/include/asm/octeon/octeon-feature.h
@@ -128,7 +128,8 @@ static inline int octeon_has_feature(enum octeon_feature feature)
 	case OCTEON_FEATURE_PCIE:
 		return OCTEON_IS_MODEL(OCTEON_CN56XX)
 			|| OCTEON_IS_MODEL(OCTEON_CN52XX)
-			|| OCTEON_IS_MODEL(OCTEON_CN6XXX);
+			|| OCTEON_IS_MODEL(OCTEON_CN6XXX)
+			|| OCTEON_IS_MODEL(OCTEON_CN7XXX);
 
 	case OCTEON_FEATURE_SRIO:
 		return OCTEON_IS_MODEL(OCTEON_CN63XX)
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> - 2016-02-10 15:00 +0100
  Re: [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III Ralf Baechle <ralf@linux-mips.org> - 2016-02-10 15:10 +0100

csiph-web