[PATCH] MIPS: remove checks for CONFIG_SGI_IP35

[PATCH] MIPS: remove checks for CONFIG_SGI_IP35

[Paul Bolle]

Ever since (shortly before) v2.4.0 there have been checks for
CONFIG_SGI_IP35. But a Kconfig symbol SGI_IP35 was never added to the
tree. Remove these checks.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Untested.

For some reason CONFIG_SGI_IP35 was heavily used in arch/ia64 too.
Anyhow, IA64 has dropped that macro years ago.

 arch/mips/include/asm/sn/addrs.h    |  2 --
 arch/mips/include/asm/sn/agent.h    |  4 +---
 arch/mips/include/asm/sn/klconfig.h | 18 +-----------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/arch/mips/include/asm/sn/addrs.h b/arch/mips/include/asm/sn/addrs.h
index 66814f8ba8e8..b18772778a79 100644
--- a/arch/mips/include/asm/sn/addrs.h
+++ b/arch/mips/include/asm/sn/addrs.h
@@ -20,8 +20,6 @@
 
 #if defined(CONFIG_SGI_IP27)
 #include <asm/sn/sn0/addrs.h>
-#elif defined(CONFIG_SGI_IP35)
-#include <asm/sn/sn1/addrs.h>
 #endif
 

diff --git a/arch/mips/include/asm/sn/agent.h b/arch/mips/include/asm/sn/agent.h
index e33d09293019..fe84c1fc8551 100644
--- a/arch/mips/include/asm/sn/agent.h
+++ b/arch/mips/include/asm/sn/agent.h
@@ -16,9 +16,7 @@
 
 #if defined(CONFIG_SGI_IP27)
 #include <asm/sn/sn0/hub.h>
-#elif defined(CONFIG_SGI_IP35)
-#include <asm/sn/sn1/hub.h>
-#endif	/* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */
+#endif
 
 /*
  * NIC register macros
diff --git a/arch/mips/include/asm/sn/klconfig.h b/arch/mips/include/asm/sn/klconfig.h
index 467c313d5767..f0ec614afa92 100644
--- a/arch/mips/include/asm/sn/klconfig.h
+++ b/arch/mips/include/asm/sn/klconfig.h
@@ -40,26 +40,10 @@
 //#include <sys/graph.h>
 //#include <sys/xtalk/xbow.h>
 
-#elif defined(CONFIG_SGI_IP35)
-
-#include <asm/sn/sn1/addrs.h>
-#include <sys/sn/router.h>
-#include <sys/graph.h>
-#include <asm/xtalk/xbow.h>
-
-#endif /* !CONFIG_SGI_IP27 && !CONFIG_SGI_IP35 */
-
-#if defined(CONFIG_SGI_IP27) || defined(CONFIG_SGI_IP35)
 #include <asm/sn/agent.h>
 #include <asm/fw/arc/types.h>
 #include <asm/fw/arc/hinv.h>
-#if defined(CONFIG_SGI_IP35)
-// The hack file has to be before vector and after sn0_fru....
-#include <asm/hack.h>
-#include <asm/sn/vector.h>
-#include <asm/xtalk/xtalk.h>
-#endif /* CONFIG_SGI_IP35 */
-#endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */
+#endif
 
 typedef u64  nic_t;
 
-- 
1.9.0

Re: [PATCH] MIPS: remove checks for CONFIG_SGI_IP35

[Ralf Baechle]

On Tue, May 20, 2014 at 01:21:49PM +0200, Paul Bolle wrote:

> Ever since (shortly before) v2.4.0 there have been checks for
> CONFIG_SGI_IP35. But a Kconfig symbol SGI_IP35 was never added to the
> tree. Remove these checks.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested.
> 
> For some reason CONFIG_SGI_IP35 was heavily used in arch/ia64 too.
> Anyhow, IA64 has dropped that macro years ago.

The #ifdefs exist because these headers are originally from IRIX and the
equivalent IRIX definitions were converted to Linux-style.  For the
IA64 version keeping those ifdefs around obviously made no sense since -
since IP35 (Origin 300/3000 series) is MIPS-based, so it was dropped
again.

There is some out-of-tree support for IP35 so I'd like to drop this
patch.

  Ralf

Re: [PATCH] MIPS: remove checks for CONFIG_SGI_IP35

[Paul Bolle]

On Thu, 2014-05-22 at 15:12 +0200, Ralf Baechle wrote:
> On Tue, May 20, 2014 at 01:21:49PM +0200, Paul Bolle wrote:
> 
> > Ever since (shortly before) v2.4.0 there have been checks for
> > CONFIG_SGI_IP35. But a Kconfig symbol SGI_IP35 was never added to the
> > tree. Remove these checks.
> > 
> > Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> > ---
> > Untested.
> > 
> > For some reason CONFIG_SGI_IP35 was heavily used in arch/ia64 too.
> > Anyhow, IA64 has dropped that macro years ago.
> 
> The #ifdefs exist because these headers are originally from IRIX and the
> equivalent IRIX definitions were converted to Linux-style.  For the
> IA64 version keeping those ifdefs around obviously made no sense since -
> since IP35 (Origin 300/3000 series) is MIPS-based, so it was dropped
> again.

Nice to know. Thanks.

> There is some out-of-tree support for IP35 so I'd like to drop this
> patch.

Thanks for handling this (and the similar) patches so quickly. I
disagree with your decision here. But there are many, many issues like
this still left in the tree. So there's no point in making noise about
just this one Kconfig macro.

By the way, could you perhaps look at CONFIG_SYS_HAS_CPU_RM9000? It
seems the Kconfig entry for SYS_HAS_CPU_RM9000 is simply missing. But
the CPU support code is rather complicated and I stopped trying to
understand it after staring at it for way too long.

Thanks again,


Paul Bolle

Re: [PATCH] MIPS: remove checks for CONFIG_SGI_IP35

[Ralf Baechle]

On Thu, May 22, 2014 at 03:58:08PM +0200, Paul Bolle wrote:

> By the way, could you perhaps look at CONFIG_SYS_HAS_CPU_RM9000? It
> seems the Kconfig entry for SYS_HAS_CPU_RM9000 is simply missing. But
> the CPU support code is rather complicated and I stopped trying to
> understand it after staring at it for way too long.

Seem that crept back in through commit 69f24d17 [MIPS: Optimize
current_cpu_type() for better code.] which had been developed before
but merged after RM9000 was removed.

There were various other artifacts of the RM9000 support around which I
also removed.  Only a few comments and PRID_IMP_RM9000 which helps
avoid accidental reuse of the value are now remaining.

  Ralf