[2.6 patch] sh: export get_cpu_subtype

[2.6 patch] sh: export get_cpu_subtype

[Adrian Bunk]

This patch fixes the following build error:

<--  snip  -->

...
  MODPOST 1837 modules
ERROR: "get_cpu_subtype" [arch/sh/oprofile/oprofile.ko] undefined!
...
make[2]: *** [__modpost] Error 1

<--  snip  -->

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
3b4d9e75cf4e2d0eb47bc9e8867a9a60dbd1d8c2 diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index bca2bbc..9324cb9 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -398,6 +398,7 @@ const char *get_cpu_subtype(struct sh_cpuinfo *c)
 {
 	return cpu_name[c->type];
 }
+EXPORT_SYMBOL(get_cpu_subtype);
 
 #ifdef CONFIG_PROC_FS
 /* Symbolic CPU flags, keep in sync with asm/cpu-features.h */

[2.6 patch] sh dreamcast: export board_pci_channels

[Adrian Bunk]

This patch fixes the following build error:

<--  snip  -->

...
  MODPOST 1837 modules
ERROR: "board_pci_channels" [drivers/pcmcia/yenta_socket.ko] undefined!
...
make[2]: *** [__modpost] Error 1

<--  snip  -->

I freely admit that it's a pathological configuration, but as long as 
it is allowed it should build.

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

 arch/sh/drivers/pci/ops-dreamcast.c |    2 ++
 1 file changed, 2 insertions(+)

632d9b2b1d3b5f3c0fed0353b098f92e28c4217d diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c
index e1284fc..f54c291 100644
--- a/arch/sh/drivers/pci/ops-dreamcast.c
+++ b/arch/sh/drivers/pci/ops-dreamcast.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/pci.h>
+#include <linux/module.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -48,6 +49,7 @@ struct pci_channel board_pci_channels[] = {
 	  &gapspci_mem_resource, 0, 1 },
 	{ 0, }
 };
+EXPORT_SYMBOL(board_pci_channels);
 
 /*
  * The !gapspci_config_access case really shouldn't happen, ever, unless

[2.6 patch] move arch/sh/lib/io.o to obj-y

[Adrian Bunk]

EXPORT_SYMBOL's in lib-y considered harmful:

<--  snip  -->

...
  MODPOST 1837 modules
ERROR: "__raw_readsl" [drivers/ssb/ssb.ko] undefined!
ERROR: "__raw_writesl" [drivers/ssb/ssb.ko] undefined!
ERROR: "__raw_writesl" [drivers/net/smc91x.ko] undefined!
ERROR: "__raw_readsl" [drivers/net/smc91x.ko] undefined!
ERROR: "__raw_writesl" [drivers/net/3c59x.ko] undefined!
ERROR: "__raw_readsl" [drivers/net/3c59x.ko] undefined!
...
make[2]: *** [__modpost] Error 1

<--  snip  -->

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

b4dec4046b4e491c0ad2cb1046699f22d635fcab diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 3424b90..265aca0 100644
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -2,9 +2,11 @@
 # Makefile for SuperH-specific library files..
 #
 
-lib-y  = delay.o io.o memset.o memmove.o memchr.o \
+lib-y  = delay.o memset.o memmove.o memchr.o \
 	 checksum.o strlen.o div64.o div64-generic.o
 
+obj-y				+= io.o
+
 memcpy-y			:= memcpy.o
 memcpy-$(CONFIG_CPU_SH4)	:= memcpy-sh4.o
 

[2.6 patch] sh/boards/dreamcast/rtc.c: make 2 functions static

[Adrian Bunk]

This patch makes the needlessly global aica_rtc_{get,set}timeofday() 
static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

 arch/sh/boards/dreamcast/rtc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

1716a5d5a29b5a2c16713e34465558cce3895545 diff --git a/arch/sh/boards/dreamcast/rtc.c b/arch/sh/boards/dreamcast/rtc.c
index b3a876a..a743368 100644
--- a/arch/sh/boards/dreamcast/rtc.c
+++ b/arch/sh/boards/dreamcast/rtc.c
@@ -30,7 +30,7 @@
  *
  * Grabs the current RTC seconds counter and adjusts it to the Unix Epoch.
  */
-void aica_rtc_gettimeofday(struct timespec *ts)
+static void aica_rtc_gettimeofday(struct timespec *ts)
 {
 	unsigned long val1, val2;
 
@@ -54,7 +54,7 @@ void aica_rtc_gettimeofday(struct timespec *ts)
  *
  * Adjusts the given @tv to the AICA Epoch and sets the RTC seconds counter.
  */
-int aica_rtc_settimeofday(const time_t secs)
+static int aica_rtc_settimeofday(const time_t secs)
 {
 	unsigned long val1, val2;
 	unsigned long adj = secs + TWENTY_YEARS;

[2.6 patch] sh: make EARLY_PCI_OP's static

[Adrian Bunk]

This patch makes the needlessly global EARLY_PCI_OP's static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
bc7fc605abf94396ac4b30eaa5270e0f42d15924 diff --git a/arch/sh/drivers/pci/pci-auto.c b/arch/sh/drivers/pci/pci-auto.c
index ea40470..cf48b12 100644
--- a/arch/sh/drivers/pci/pci-auto.c
+++ b/arch/sh/drivers/pci/pci-auto.c
@@ -78,7 +78,7 @@ static struct pci_dev *fake_pci_dev(struct pci_channel *hose,
 }
 
 #define EARLY_PCI_OP(rw, size, type)					\
-int early_##rw##_config_##size(struct pci_channel *hose,		\
+static int early_##rw##_config_##size(struct pci_channel *hose,		\
 	int top_bus, int bus, int devfn, int offset, type value)	\
 {									\
 	return pci_##rw##_config_##size(				\

[2.6 patch] sh: make pcibios_max_latency static

[Adrian Bunk]

This patch makes the needlessly global pcibios_max_latency static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
68ca774cb5441d414e0bbb837bfc35488bf68bd6 diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index f57095a..d3839e6 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -135,7 +135,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
  *  If we set up a device for bus mastering, we need to check and set
  *  the latency timer as it may not be properly set.
  */
-unsigned int pcibios_max_latency = 255;
+static unsigned int pcibios_max_latency = 255;
 
 void pcibios_set_master(struct pci_dev *dev)
 {

[2.6 patch] sh/kernel/ cleanups

[Adrian Bunk]

This patch contains the following cleanups:
- make the following needlessly global code static:
  - cf-enabler.c: cf_init()
  - cpu/clock.c: __clk_enable()
  - cpu/clock.c: __clk_disable()
  - process_32.c: default_idle()
  - time_32.c: struct clocksource_sh
  - timers/timer-tmu.c: struct tmu_timer_ops
- remove the following unused functions (no CONFIG_BLK_DEV_FD on sh):
  - process_{32,64}.c: disable_hlt()
  - process_{32,64}.c: enable_hlt()

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

 arch/sh/kernel/cf-enabler.c       |    2 +-
 arch/sh/kernel/cpu/clock.c        |    6 ++----
 arch/sh/kernel/process_32.c       |   14 +-------------
 arch/sh/kernel/process_64.c       |   10 ----------
 arch/sh/kernel/time_32.c          |    2 +-
 arch/sh/kernel/timers/timer-tmu.c |    2 +-
 include/asm-sh/clock.h            |    3 ---
 include/asm-sh/system.h           |    8 --------
 include/asm-sh/timer.h            |    1 -
 9 files changed, 6 insertions(+), 42 deletions(-)

6afa3ab285425364d3764cb8f9bd3b054405ecc1 diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c
index 01ff4d0..d3d9f32 100644
--- a/arch/sh/kernel/cf-enabler.c
+++ b/arch/sh/kernel/cf-enabler.c
@@ -157,7 +157,7 @@ static int __init cf_init_se(void)
 }
 #endif
 
-int __init cf_init(void)
+static int __init cf_init(void)
 {
 	if (mach_is_se() || mach_is_7722se() || mach_is_7721se())
 		return cf_init_se();
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
index b5f1e23..73334c6 100644
--- a/arch/sh/kernel/cpu/clock.c
+++ b/arch/sh/kernel/cpu/clock.c
@@ -88,7 +88,7 @@ static void propagate_rate(struct clk *clk)
 	}
 }
 
-int __clk_enable(struct clk *clk)
+static int __clk_enable(struct clk *clk)
 {
 	/*
 	 * See if this is the first time we're enabling the clock, some
@@ -111,7 +111,6 @@ int __clk_enable(struct clk *clk)
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(__clk_enable);
 
 int clk_enable(struct clk *clk)
 {
@@ -131,7 +130,7 @@ static void clk_kref_release(struct kref *kref)
 	/* Nothing to do */
 }
 
-void __clk_disable(struct clk *clk)
+static void __clk_disable(struct clk *clk)
 {
 	int count = kref_put(&clk->kref, clk_kref_release);
 
@@ -143,7 +142,6 @@ void __clk_disable(struct clk *clk)
 			clk->ops->disable(clk);
 	}
 }
-EXPORT_SYMBOL_GPL(__clk_disable);
 
 void clk_disable(struct clk *clk)
 {
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index b98e37a..e15086a 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -34,18 +34,6 @@ void (*pm_idle)(void);
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
-void disable_hlt(void)
-{
-	hlt_counter++;
-}
-EXPORT_SYMBOL(disable_hlt);
-
-void enable_hlt(void)
-{
-	hlt_counter--;
-}
-EXPORT_SYMBOL(enable_hlt);
-
 static int __init nohlt_setup(char *__unused)
 {
 	hlt_counter = 1;
@@ -60,7 +48,7 @@ static int __init hlt_setup(char *__unused)
 }
 __setup("hlt", hlt_setup);
 
-void default_idle(void)
+static void default_idle(void)
 {
 	if (!hlt_counter) {
 		clear_thread_flag(TIF_POLLING_NRFLAG);
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -36,16 +36,6 @@ static int hlt_counter = 1;
 
 #define HARD_IDLE_TIMEOUT (HZ / 3)
 
-void disable_hlt(void)
-{
-	hlt_counter++;
-}
-
-void enable_hlt(void)
-{
-	hlt_counter--;
-}
-
 static int __init nohlt_setup(char *__unused)
 {
 	hlt_counter = 1;
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c
index 7281342..0758b5e 100644
--- a/arch/sh/kernel/time_32.c
+++ b/arch/sh/kernel/time_32.c
@@ -211,7 +211,7 @@ unsigned long sh_hpt_frequency = 0;
 
 #define NSEC_PER_CYC_SHIFT	10
 
-struct clocksource clocksource_sh = {
+static struct clocksource clocksource_sh = {
 	.name		= "SuperH",
 	.rating		= 200,
 	.mask		= CLOCKSOURCE_MASK(32),
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c
index 8935570..1ca9ad4 100644
--- a/arch/sh/kernel/timers/timer-tmu.c
+++ b/arch/sh/kernel/timers/timer-tmu.c
@@ -209,7 +209,7 @@ static int tmu_timer_init(void)
 	return 0;
 }
 
-struct sys_timer_ops tmu_timer_ops = {
+static struct sys_timer_ops tmu_timer_ops = {
 	.init		= tmu_timer_init,
 	.start		= tmu_timer_start,
 	.stop		= tmu_timer_stop,
diff --git a/include/asm-sh/clock.h b/include/asm-sh/clock.h
index b550a27..608fda5 100644
--- a/include/asm-sh/clock.h
+++ b/include/asm-sh/clock.h
@@ -41,9 +41,6 @@ void arch_init_clk_ops(struct clk_ops **, int type);
 /* arch/sh/kernel/cpu/clock.c */
 int clk_init(void);
 
-int __clk_enable(struct clk *);
-void __clk_disable(struct clk *);
-
 void clk_recalc_rate(struct clk *);
 
 int clk_register(struct clk *);
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index e65b6b8..056d68c 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -148,14 +148,6 @@ extern unsigned long cached_to_uncached;
 
 extern struct dentry *sh_debugfs_root;
 
-/* XXX
- * disable hlt during certain critical i/o operations
- */
-#define HAVE_DISABLE_HLT
-void disable_hlt(void);
-void enable_hlt(void);
-
-void default_idle(void);
 void per_cpu_trap_init(void);
 
 asmlinkage void break_point_trap(void);
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
index 701ba84..327f7eb 100644
--- a/include/asm-sh/timer.h
+++ b/include/asm-sh/timer.h
@@ -40,6 +40,5 @@ struct sys_timer *get_sys_timer(void);
 /* arch/sh/kernel/time.c */
 void handle_timer_tick(void);
 extern unsigned long sh_hpt_frequency;
-extern struct clocksource clocksource_sh;
 
 #endif /* __ASM_SH_TIMER_H */

Change console to another UART

[oihana]

Hello, 

I am working with a STi7109 and mb411. The STi7109 has 4 UARTs and they
are configured by default as follow....
- UART0 is reserved for SC0
- UART1 is reserved for SC1
- UART2 is reserved for console
- UART3 is reserved for KGDB

What I need is to have the Console in the UART1 because I need the UART2
free, and I have enough with one SC (SC0). 

I realized that if I change on my STWorkBench the Kernel Debug
configuration, from ttyAS0 to ttyAS1, the console comes out from the
other serial port, but it still uses the UART2. 

So I tried to change the configuration in the stasc.c
(kernel/src/drivers/serial/stasc.c).

- Original configuration for my chip and board:
struct asc_port asc_ports[ASC_NPORTS] = {
#if defined(CONFIG_CPU_SUBTYPE_STB7100)
        /* UART2 */ 
	
	{  
		.port	= {
			.membase	= (void *)0xb8032000,
			.mapbase	= 0xb8032000,
			.iotype		= SERIAL_IO_MEM,
			.irq		= 121,
			.ops		= &asc_uart_ops,
			.flags		= ASYNC_BOOT_AUTOCONF,
			.fifosize	= FIFO_SIZE,
			.line		= 0,
		},
		.pio_port	= 4, 
		.pio_pin	= {3, 2, 4, 5},
	} ,
			 
	
	/* UART3 */
	{   
		.port	= {
			.membase	= (void *)0xb8033000,
			.mapbase	= 0xb8033000,
			.iotype		= SERIAL_IO_MEM,
			.irq		= 120,
			.ops		= &asc_uart_ops,
			.flags		= ASYNC_BOOT_AUTOCONF,
			.fifosize	= FIFO_SIZE,
			.line		= 1,
		},
		.pio_port	= 5, 
		.pio_pin	= {0, 1, 2, 3},
	}
...
...


- My changes: I tried to change the order, to have in the first element
the UART3 and in the second the UART2, or to have UART1 and UART2....
and nothing seams to work. 

        /* UART1 */
	{   
		.port	= {
			.membase	= (void *)0xb8031000,
			.mapbase	= 0xb8031000,
			.iotype		= SERIAL_IO_MEM,
			.irq		= 122,
			.ops		= &asc_uart_ops,
			.flags		= ASYNC_BOOT_AUTOCONF,
			.fifosize	= FIFO_SIZE,
			.line		= 1,
		},
		.pio_port	= 1, 
		.pio_pin	= {0, 1, 4, 5},
	},
	
	/* UART2 */  
	{  
		.port	= {
			.membase	= (void *)0xb8032000,
			.mapbase	= 0xb8032000,
			.iotype		= SERIAL_IO_MEM,
			.irq		= 121,
			.ops		= &asc_uart_ops,
			.flags		= ASYNC_BOOT_AUTOCONF,
			.fifosize	= FIFO_SIZE,
			.line		= 0,
		},
		.pio_port	= 4, 
		.pio_pin	= {3, 2, 4, 5},
	} 

If the first element is the UART2, the kernel runs OK. So that I can go
into using the minicom or ssh. In the other hand, if the UART2 is the
second element, kernel seams if it was run (in the STWorkBench)... but
the ethernet ping to the board tells me "Destination Host Unreachable",
and I don't get any answer from the 3 serial points in which i
listen... 

Could someone help me please????????

Thanks, 

Oihana

Re: Change console to another UART

[Nobuhiro Iwamatsu]

Hi,

2008/6/18 oihana <munoz.o@ikusi.es>:
> Hello,
>
> I am working with a STi7109 and mb411. The STi7109 has 4 UARTs and they
> are configured by default as follow....
> - UART0 is reserved for SC0
> - UART1 is reserved for SC1
> - UART2 is reserved for console
> - UART3 is reserved for KGDB
>
> What I need is to have the Console in the UART1 because I need the UART2
> free, and I have enough with one SC (SC0).
>
> I realized that if I change on my STWorkBench the Kernel Debug
> configuration, from ttyAS0 to ttyAS1, the console comes out from the
> other serial port, but it still uses the UART2.
>
> So I tried to change the configuration in the stasc.c
> (kernel/src/drivers/serial/stasc.c).
Hmm? I could not find it.
Is this a thing peculiar to ST?
You should send an email to support of ST if so.

Best regards,
 Nobuhiro

Re: [2.6 patch] sh: export get_cpu_subtype

[Paul Mundt]

On Wed, Jun 18, 2008 at 01:30:24AM +0300, Adrian Bunk wrote:
> This patch fixes the following build error:
> 
> <--  snip  -->
> 
> ...
>   MODPOST 1837 modules
> ERROR: "get_cpu_subtype" [arch/sh/oprofile/oprofile.ko] undefined!
> ...
> make[2]: *** [__modpost] Error 1
> 
> <--  snip  -->
> 
> Reported-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

On Wed, Jun 18, 2008 at 01:30:40AM +0300, Adrian Bunk wrote:
> This patch fixes the following build error:
> 
> <--  snip  -->
> 
> ...
>   MODPOST 1837 modules
> ERROR: "board_pci_channels" [drivers/pcmcia/yenta_socket.ko] undefined!
> ...
> make[2]: *** [__modpost] Error 1
> 
> <--  snip  -->
> 
> I freely admit that it's a pathological configuration, but as long as 
> it is allowed it should build.
> 
> Reported-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

On Wed, Jun 18, 2008 at 01:30:53AM +0300, Adrian Bunk wrote:
> EXPORT_SYMBOL's in lib-y considered harmful:
> 
> <--  snip  -->
> 
> ...
>   MODPOST 1837 modules
> ERROR: "__raw_readsl" [drivers/ssb/ssb.ko] undefined!
> ERROR: "__raw_writesl" [drivers/ssb/ssb.ko] undefined!
> ERROR: "__raw_writesl" [drivers/net/smc91x.ko] undefined!
> ERROR: "__raw_readsl" [drivers/net/smc91x.ko] undefined!
> ERROR: "__raw_writesl" [drivers/net/3c59x.ko] undefined!
> ERROR: "__raw_readsl" [drivers/net/3c59x.ko] undefined!
> ...
> make[2]: *** [__modpost] Error 1
> 
> <--  snip  -->
> 
> Reported-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

On Wed, Jun 18, 2008 at 01:30:57AM +0300, Adrian Bunk wrote:
> This patch makes the needlessly global aica_rtc_{get,set}timeofday() 
> static.
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

On Wed, Jun 18, 2008 at 01:31:03AM +0300, Adrian Bunk wrote:
> This patch makes the needlessly global EARLY_PCI_OP's static.
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

On Wed, Jun 18, 2008 at 01:33:40AM +0300, Adrian Bunk wrote:
> This patch makes the needlessly global pcibios_max_latency static.
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

On Wed, Jun 18, 2008 at 03:36:50AM +0300, Adrian Bunk wrote:
> This patch contains the following cleanups:
> - make the following needlessly global code static:
>   - cf-enabler.c: cf_init()
>   - cpu/clock.c: __clk_enable()
>   - cpu/clock.c: __clk_disable()
>   - process_32.c: default_idle()
>   - time_32.c: struct clocksource_sh
>   - timers/timer-tmu.c: struct tmu_timer_ops
> - remove the following unused functions (no CONFIG_BLK_DEV_FD on sh):
>   - process_{32,64}.c: disable_hlt()
>   - process_{32,64}.c: enable_hlt()
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

These are all applied, thanks.