* [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III
@ 2016-02-10 13:56 Zubair Lutfullah Kakakhel
2016-02-10 13:56 ` Zubair Lutfullah Kakakhel
2016-02-10 14:07 ` Ralf Baechle
0 siblings, 2 replies; 3+ messages in thread
From: Zubair Lutfullah Kakakhel @ 2016-02-10 13:56 UTC (permalink / raw)
To: ralf, david.daney
Cc: linux-mips, linux-kernel, matt.redfearn, Zubair.Kakakhel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III
2016-02-10 13:56 [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III Zubair Lutfullah Kakakhel
@ 2016-02-10 13:56 ` Zubair Lutfullah Kakakhel
2016-02-10 14:07 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: Zubair Lutfullah Kakakhel @ 2016-02-10 13:56 UTC (permalink / raw)
To: ralf, david.daney
Cc: linux-mips, linux-kernel, matt.redfearn, Zubair.Kakakhel
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III
2016-02-10 13:56 [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III Zubair Lutfullah Kakakhel
2016-02-10 13:56 ` Zubair Lutfullah Kakakhel
@ 2016-02-10 14:07 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2016-02-10 14:07 UTC (permalink / raw)
To: Zubair Lutfullah Kakakhel
Cc: david.daney, linux-mips, linux-kernel, matt.redfearn
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-10 14:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-10 13:56 [PATCH] MIPS: OCTEON: Update OCTEON_FEATURE_PCIE for Octeon III Zubair Lutfullah Kakakhel
2016-02-10 13:56 ` Zubair Lutfullah Kakakhel
2016-02-10 14:07 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox