Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1331183 > unrolled thread

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

Started byZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
First post2016-02-10 15:00 +0100
Last post2016-02-10 15:10 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [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

#1331183 — [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III

FromZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Date2016-02-10 15:00 +0100
Subject[PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III
Message-ID<r0Dth-2TR-19@gated-at.bofh.it>
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

[toc] | [next] | [standalone]


#1331188

FromRalf Baechle <ralf@linux-mips.org>
Date2016-02-10 15:10 +0100
Message-ID<r0DCX-3cV-51@gated-at.bofh.it>
In reply to#1331183
On Wed, Feb 10, 2016 at 01:56:25PM +0000, Zubair Lutfullah Kakakhel wrote:

> 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.

Looks sensible.  Applied to 4.0-stable+.

Thanks,

  Ralf

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web