Menu
▾
▴
linuxsh-dev
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
(82) |
Jun
(72) |
Jul
(39) |
Aug
(104) |
Sep
(61) |
Oct
(55) |
Nov
(101) |
Dec
(48) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(52) |
Feb
(67) |
Mar
(18) |
Apr
(16) |
May
(33) |
Jun
(12) |
Jul
(102) |
Aug
(168) |
Sep
(65) |
Oct
(60) |
Nov
(43) |
Dec
(121) |
| 2002 |
Jan
(69) |
Feb
(32) |
Mar
(90) |
Apr
(59) |
May
(45) |
Jun
(43) |
Jul
(33) |
Aug
(21) |
Sep
(11) |
Oct
(20) |
Nov
(26) |
Dec
(3) |
| 2003 |
Jan
(12) |
Feb
(18) |
Mar
(11) |
Apr
(11) |
May
(41) |
Jun
(76) |
Jul
(77) |
Aug
(15) |
Sep
(38) |
Oct
(56) |
Nov
(19) |
Dec
(39) |
| 2004 |
Jan
(17) |
Feb
(52) |
Mar
(36) |
Apr
(34) |
May
(48) |
Jun
(85) |
Jul
(38) |
Aug
(42) |
Sep
(41) |
Oct
(77) |
Nov
(27) |
Dec
(19) |
| 2005 |
Jan
(32) |
Feb
(35) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(31) |
Jul
(46) |
Aug
(93) |
Sep
(65) |
Oct
(85) |
Nov
(219) |
Dec
(47) |
| 2006 |
Jan
(170) |
Feb
(103) |
Mar
(49) |
Apr
(43) |
May
(45) |
Jun
(29) |
Jul
(77) |
Aug
(82) |
Sep
(43) |
Oct
(45) |
Nov
(26) |
Dec
(85) |
| 2007 |
Jan
(42) |
Feb
(48) |
Mar
(64) |
Apr
(31) |
May
(88) |
Jun
(53) |
Jul
(175) |
Aug
(212) |
Sep
(91) |
Oct
(103) |
Nov
(110) |
Dec
(5) |
| 2008 |
Jan
(20) |
Feb
(11) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(5) |
Sep
(3) |
Oct
(12) |
Nov
|
Dec
|
|
From: NIIBE Y. <gn...@ch...> - 2000-06-16 07:15:19
|
Well, I got the number from HPA.
204, 8 = /dev/ttySC0
9 = /dev/ttySC1
10 = /dev/ttySC2
11 = /dev/ttySC3
205, 8 = /dev/cusc0
9 = /dev/cusc1
10 = /dev/cusc2
11 = /dev/cusc3
I think it is enough. SCI, SCIF, SCIF for IrDA, and Smartcard support.
--
|
|
From: NIIBE Y. <gn...@ch...> - 2000-06-16 00:57:20
|
YAEGASHI Takeshi wrote: > And, HD64461 has several 16550A-style ports. How should we > support them together with internal ports? Does standard "serial.c" work for HD64461 with little change? Well, it would be bad idea for us to use /dev/ttyS0 for SCI/F as if it were standard serial device. We would need to get assigenment of new device number for SCI/SCIF. Say, /dev/ttySC0, /dev/ttySC1, and /dev/ttySC2. If we need this (independent # for SCI/F), sooner is better (before the release of 2.4). Please let me know your opinion. -- |
|
From: Stuart M. <Stu...@st...> - 2000-06-15 17:21:32
|
Hi Mitch
I tried the binutils on SourceForge, unfortunatly one of Niibe-san's
patches appears to be missing:
Index: bfd/elflink.c
===================================================================
RCS file: /cvsroot/linuxsh/binutils/bfd/elflink.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 elflink.c
*** bfd/elflink.c 2000/05/06 05:10:12 1.1.1.1
--- bfd/elflink.c 2000/06/15 17:10:01
***************
*** 226,231 ****
--- 226,232 ----
{
case STV_INTERNAL:
case STV_HIDDEN:
+ #if 0 /* FIXME: should check documentation */
/* This symbol must be defined in the shared object or
executable. */
if (h->root.type == bfd_link_hash_undefined)
***************
*** 236,242 ****
(*info->callbacks->undefined_symbol)
(info, name, abfd, bfd_und_section_ptr, 0);
}
!
h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
break;
--- 237,243 ----
(*info->callbacks->undefined_symbol)
(info, name, abfd, bfd_und_section_ptr, 0);
}
! #endif
h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
break;
I've no idea what this does, but it appears to be needed for the glibc
build.
Stuart
On Jun 10, 5:09am, mj...@al... wrote:
> Subject: [linuxsh-dev] binutils in CVS should be OK now
>
> Hello,
>
> Tonight I fixed the "binutils" module in CVS to be (nearly)
> that of binutils-000218 plus Niibe-san's patch. In theory
> it should now be possible to use this version for your
> everyday use. My apologies for the delay. I've not had
> the time to attend to this earlier.
>
> Could people test it please?
>
> If you've already checked out binutils, you can refresh
> your checkout by doing a "cd" into the binutils directory,
> then running "cvs up -P -d".
>
> If people would like me to put a fresh CVS snapshot on
> sourceforge, please let me know.
>
> If you have any questions or experience problems, please
> send them to this list.
>
> Regards,
>
> Mitch.
> http://www.alphalink.com.au/
>
> _______________________________________________
> linuxsh-dev mailing list
> lin...@li...
> http://lists.sourceforge.net/mailman/listinfo/linuxsh-dev
>-- End of excerpt from mj...@al...
|
|
From: YAEGASHI T. <yae...@ma...> - 2000-06-15 16:24:12
|
Hello Stuart, >Attached is a patch which adds support for multiple SCI and SCIF's. This >allows you to use both the serial ports at the same time, and select which >serial port you want to use for a console at boot time. Great. This feature is just what I need recently, and I'm about to begin hacking now. :-> >On processors which have two serial ports: > SCI : ttyS0 > SCIF : ttyS1 >so if you want to use the SCIF as a console, add a command line option >along the lines of: > console=ttyS1,38400 >Similarly /dev/console will be bound to whichever serial port was selected >on the command line (as long as /dev/console is major 5, minor 1). I would support this scheme. >Before you leap to install this patch, there is one thing I must point >out. I've not been able to test this on anything other than a 7750, so >I'd appreciate it if someone could check this out on an SH3. I'll test this patch on my environment later. Thank you. BTW, SH7709(A) has three serial ports: SCI, SCIF, and IrDA(just like SCIF, but at 0xa4000140). Is it easy to expand this patch to support them all? And, HD64461 has several 16550A-style ports. How should we support them together with internal ports? -- YAEGASHI Takeshi <yae...@ma...> |
|
From: Stuart M. <Stu...@st...> - 2000-06-15 15:55:53
|
Folks
Attached is a patch which adds support for multiple SCI and SCIF's. This
allows you to use both the serial ports at the same time, and select which
serial port you want to use for a console at boot time.
On processors which have two serial ports:
SCI : ttyS0
SCIF : ttyS1
so if you want to use the SCIF as a console, add a command line option
along the lines of:
console=ttyS1,38400
Similarly /dev/console will be bound to whichever serial port was selected
on the command line (as long as /dev/console is major 5, minor 1).
Before you leap to install this patch, there is one thing I must point
out. I've not been able to test this on anything other than a 7750, so
I'd appreciate it if someone could check this out on an SH3.
All comments welcome.
Stuart
Index: include/asm-sh/io.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io.h,v
retrieving revision 1.4
diff -c -r1.4 io.h
*** include/asm-sh/io.h 2000/05/07 23:31:59 1.4
--- include/asm-sh/io.h 2000/06/15 15:43:18
***************
*** 85,93 ****
#define isa_memcpy_toio(a,b,c) \
memcpy((void *)(sh_isa_slot((unsigned long)(a))),(b),(c))
- #define ctrl_in(addr) *(addr)
- #define ctrl_out(data,addr) *(addr) = (data)
-
extern __inline__ unsigned long ctrl_inb(unsigned long addr)
{
return *(volatile unsigned char*)addr;
--- 85,90 ----
Index: arch/sh/config.in
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/config.in,v
retrieving revision 1.8
diff -c -r1.8 config.in
*** arch/sh/config.in 2000/06/14 09:35:58 1.8
--- arch/sh/config.in 2000/06/15 15:43:20
***************
*** 167,177 ****
fi
tristate 'Serial support' CONFIG_SERIAL
- if [ "$CONFIG_SERIAL" = "y" -o "$CONFIG_SERIAL" = "m" ]; then
- choice 'Serial interface type' \
- "SCI CONFIG_SH_SCI_SERIAL \
- SCIF CONFIG_SH_SCIF_SERIAL"
- fi
if [ "$CONFIG_SERIAL" = "y" ]; then
bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE
fi
--- 167,172 ----
Index: drivers/char/sh-sci.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/drivers/char/sh-sci.c,v
retrieving revision 1.9
diff -c -r1.9 sh-sci.c
*** drivers/char/sh-sci.c 2000/06/14 09:38:30 1.9
--- drivers/char/sh-sci.c 2000/06/15 15:43:23
***************
*** 5,10 ****
--- 5,11 ----
* SuperH on-chip serial module support. (SCI with no FIFO / with FIFO)
* Copyright (C) 1999, 2000 Niibe Yutaka
* Copyright (C) 2000 Sugioka Toshinobu
+ * Modified to support multiple serial ports. Stuart Menefy (May 2000).
*
* TTY code is based on sx.c (Specialix SX driver) by:
*
***************
*** 50,62 ****
#endif
#include "sh-sci.h"
- struct sci_port sci_ports[1];
-
#ifdef CONFIG_SERIAL_CONSOLE
static struct console sercons;
#endif
/* Function prototypes */
static void sci_disable_tx_interrupts(void *ptr);
static void sci_enable_tx_interrupts(void *ptr);
static void sci_disable_rx_interrupts(void *ptr);
--- 51,65 ----
#endif
#include "sh-sci.h"
#ifdef CONFIG_SERIAL_CONSOLE
static struct console sercons;
+ static struct sci_port* sercons_port;
+ static int sercons_baud;
#endif
/* Function prototypes */
+ static void sci_init_pins_sci(struct sci_port* port, unsigned int cflag);
+ static void sci_init_pins_scif(struct sci_port* port, unsigned int cflag);
static void sci_disable_tx_interrupts(void *ptr);
static void sci_enable_tx_interrupts(void *ptr);
static void sci_disable_rx_interrupts(void *ptr);
***************
*** 71,79 ****
static struct tty_driver sci_driver, sci_callout_driver;
! #define SCI_NPORTS 1
static struct tty_struct *sci_table[SCI_NPORTS] = { NULL, };
! static struct termios *sci_termios[2]; /* nomal, locked */
int sci_refcount;
int sci_debug = 0;
--- 74,83 ----
static struct tty_driver sci_driver, sci_callout_driver;
! static struct sci_port sci_ports[SCI_NPORTS] = SCI_INIT;
static struct tty_struct *sci_table[SCI_NPORTS] = { NULL, };
! static struct termios *sci_termios[SCI_NPORTS];
! static struct termios *sci_termios_locked[SCI_NPORTS];
int sci_refcount;
int sci_debug = 0;
***************
*** 96,101 ****
--- 100,162 ----
NULL
};
+ #if defined(SCI_ONLY) || defined(SCI_AND_SCIF)
+ static void sci_init_pins_sci(struct sci_port* port, unsigned int cflag)
+ {
+ }
+ #endif
+
+ #if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
+ #if defined(__sh3__)
+ /* For SH7709, SH7709A, SH7729 */
+ static void sci_init_pins_scif(struct sci_port* port, unsigned int cflag)
+ {
+ unsigned int fcr_val = 0;
+
+ {
+ unsigned short data;
+
+ /* We need to set SCPCR to enable RTS/CTS */
+ data = ctrl_inw(SCPCR);
+ /* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/
+ ctrl_outw(data&0x0fcf, SCPCR);
+ }
+ if (cflag & CRTSCTS)
+ fcr_val |= SCFCR_MCE;
+ else {
+ unsigned short data;
+
+ /* We need to set SCPCR to enable RTS/CTS */
+ data = ctrl_inw(SCPCR);
+ /* Clear out SCP7MD1,0, SCP4MD1,0,
+ Set SCP6MD1,0 = {01} (output) */
+ ctrl_outw((data&0x0fcf)|0x1000, SCPCR);
+
+ data = ctrl_inb(SCPDR);
+ /* Set /RTS2 (bit6) = 0 */
+ ctrl_outb(SCPDR, data&0xbf);
+ }
+ sci_out(port, SCFCR, fcr_val);
+ }
+
+ #else
+
+ /* For SH7750 */
+ static void sci_init_pins_scif(struct sci_port* port, unsigned int cflag)
+ {
+ unsigned int fcr_val = 0;
+
+ if (cflag & CRTSCTS) {
+ fcr_val |= SCFCR_MCE;
+ } else {
+ ctrl_outw(0x0080, SCSPTR2); /* Set RTS = 1 */
+ }
+ sci_out(port, SCFCR, fcr_val);
+ }
+
+ #endif
+ #endif /* SCIF_ONLY || SCI_AND_SCIF */
+
static void sci_setsignals(struct sci_port *port, int dtr, int rts)
{
/* This routine is used for seting signals of: DTR, DCD, CTS/RTS */
***************
*** 120,126 ****
*/
}
! static void sci_set_baud(int baud)
{
int t;
--- 181,187 ----
*/
}
! static void sci_set_baud(struct sci_port *port, int baud)
{
int t;
***************
*** 151,189 ****
}
if (t > 0) {
! /* sci_setsignals (port, 1, -1); */
if(t >= 256) {
! ctrl_out((ctrl_in(SCSMR) & ~3) | 1, SCSMR);
t >>= 2;
}
! ctrl_outb(t, SCBRR);
! ctrl_outw(0xa400, RFCR); /* Refresh counter clear */
! while (ctrl_inw(RFCR) < WAIT_RFCR_COUNTER)
! ;
} else {
! /* sci_setsignals (port, 0, -1); */
}
}
! static void sci_set_termios_cflag(int cflag, int baud)
{
! unsigned short status;
! unsigned short smr_val;
! #if defined(CONFIG_SH_SCIF_SERIAL)
! unsigned short fcr_val=6; /* TFRST=1, RFRST=1 */
! #endif
do
! status = ctrl_in(SC_SR);
! while (!(status & SCI_TEND));
! ctrl_out(0x00, SCSCR); /* TE=0, RE=0, CKE1=0 */
! #if defined(CONFIG_SH_SCIF_SERIAL)
! ctrl_out(fcr_val, SCFCR);
! fcr_val = 0;
! #endif
! smr_val = ctrl_in(SCSMR) & 3;
if ((cflag & CSIZE) == CS7)
smr_val |= 0x40;
if (cflag & PARENB)
--- 212,245 ----
}
if (t > 0) {
! sci_setsignals (port, 1, -1);
if(t >= 256) {
! sci_out(port, SCSMR, (sci_in(port, SCSMR) & ~3) | 1);
t >>= 2;
}
! sci_out(port, SCBRR, t);
! udelay((1000000+(baud-1)) / baud); /* Wait one bit interval */
} else {
! sci_setsignals (port, 0, -1);
}
}
! static void sci_set_termios_cflag(struct sci_port *port, int cflag, int baud)
{
! unsigned int status;
! unsigned int smr_val;
do
! status = sci_in(port, SCxSR);
! while (!(status & SCxSR_TEND(port)));
! sci_out(port, SCSCR, 0x00); /* TE=0, RE=0, CKE1=0 */
!
! if (port->type == PORT_SCIF) {
! sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
! }
! smr_val = sci_in(port, SCSMR) & 3;
if ((cflag & CSIZE) == CS7)
smr_val |= 0x40;
if (cflag & PARENB)
***************
*** 192,234 ****
smr_val |= 0x10;
if (cflag & CSTOPB)
smr_val |= 0x08;
! ctrl_out(smr_val, SCSMR);
!
! #if defined(CONFIG_SH_SCIF_SERIAL)
! #if defined(__sh3__)
! { /* For SH7709, SH7709A, SH7729 */
! unsigned short data;
!
! /* We need to set SCPCR to enable RTS/CTS */
! data = ctrl_inw(SCPCR);
! /* Clear out SCP7MD1,0, SCP6MD1,0, SCP4MD1,0*/
! ctrl_outw(data&0x0fcf, SCPCR);
! }
! #endif
! if (cflag & CRTSCTS)
! fcr_val |= 0x08;
! else {
! #if defined(__sh3__)
! unsigned short data;
!
! /* We need to set SCPCR to enable RTS/CTS */
! data = ctrl_inw(SCPCR);
! /* Clear out SCP7MD1,0, SCP4MD1,0,
! Set SCP6MD1,0 = {01} (output) */
! ctrl_outw((data&0x0fcf)|0x1000, SCPCR);
! data = ctrl_inb(SCPDR);
! /* Set /RTS2 (bit6) = 0 */
! ctrl_outb(data&0xbf, SCPDR);
! #elif defined(__SH4__)
! ctrl_outw(0x0080, SCSPTR); /* Set RTS = 1 */
! #endif
! }
! ctrl_out(fcr_val, SCFCR);
! #endif
! sci_set_baud(baud);
! ctrl_out(SCSCR_INIT, SCSCR); /* TIE=0,RIE=0,TE=1,RE=1 */
}
static int sci_set_real_termios(void *ptr)
--- 248,259 ----
smr_val |= 0x10;
if (cflag & CSTOPB)
smr_val |= 0x08;
! sci_out(port, SCSMR, smr_val);
! port->init_pins(port, cflag);
! sci_set_baud(port, baud);
! sci_out(port, SCSCR, SCSCR_INIT(port));
}
static int sci_set_real_termios(void *ptr)
***************
*** 237,243 ****
if (port->old_cflag != port->gs.tty->termios->c_cflag) {
port->old_cflag = port->gs.tty->termios->c_cflag;
! sci_set_termios_cflag(port->old_cflag, port->gs.baud);
sci_enable_rx_interrupts(port);
}
--- 262,268 ----
if (port->old_cflag != port->gs.tty->termios->c_cflag) {
port->old_cflag = port->gs.tty->termios->c_cflag;
! sci_set_termios_cflag(port, port->old_cflag, port->gs.baud);
sci_enable_rx_interrupts(port);
}
***************
*** 273,299 ****
unsigned short ctrl;
unsigned char c;
! status = ctrl_in(SC_SR);
! if (!(status & SCI_TD_E)) {
save_and_cli(flags);
! ctrl = ctrl_in(SCSCR);
if (port->gs.xmit_cnt == 0) {
ctrl &= ~SCI_CTRL_FLAGS_TIE;
port->gs.flags &= ~GS_TX_INTEN;
} else
ctrl |= SCI_CTRL_FLAGS_TIE;
! ctrl_out(ctrl, SCSCR);
restore_flags(flags);
return;
}
while (1) {
count = port->gs.xmit_cnt;
! #if defined(CONFIG_SH_SCIF_SERIAL)
! txroom = 16 - (ctrl_inw(SCFDR)>>8);
! #else
! txroom = (ctrl_in(SC_SR)&SCI_TD_E)?1:0;
! #endif
if (count > txroom)
count = txroom;
--- 298,324 ----
unsigned short ctrl;
unsigned char c;
! status = sci_in(port, SCxSR);
! if (!(status & SCxSR_TDxE(port))) {
save_and_cli(flags);
! ctrl = sci_in(port, SCSCR);
if (port->gs.xmit_cnt == 0) {
ctrl &= ~SCI_CTRL_FLAGS_TIE;
port->gs.flags &= ~GS_TX_INTEN;
} else
ctrl |= SCI_CTRL_FLAGS_TIE;
! sci_out(port, SCSCR, ctrl);
restore_flags(flags);
return;
}
while (1) {
count = port->gs.xmit_cnt;
! if (port->type == PORT_SCIF) {
! txroom = 16 - (sci_in(port, SCFDR)>>8);
! } else {
! txroom = (sci_in(port, SCxSR) & SCI_TDRE)?1:0;
! }
if (count > txroom)
count = txroom;
***************
*** 307,315 ****
for (i=0; i<count; i++) {
c = port->gs.xmit_buf[port->gs.xmit_tail + i];
! ctrl_outb(c, SC_TDR);
}
! ctrl_out(SCI_TD_E_CLEAR, SC_SR);
/* Update the kernel buffer end */
port->gs.xmit_tail = (port->gs.xmit_tail + count) & (SERIAL_XMIT_SIZE-1);
--- 332,340 ----
for (i=0; i<count; i++) {
c = port->gs.xmit_buf[port->gs.xmit_tail + i];
! sci_out(port, SCxTDR, c);
}
! sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
/* Update the kernel buffer end */
port->gs.xmit_tail = (port->gs.xmit_tail + count) & (SERIAL_XMIT_SIZE-1);
***************
*** 327,344 ****
}
save_and_cli(flags);
! ctrl = ctrl_in(SCSCR);
if (port->gs.xmit_cnt == 0) {
ctrl &= ~SCI_CTRL_FLAGS_TIE;
port->gs.flags &= ~GS_TX_INTEN;
} else {
! #if defined(CONFIG_SH_SCIF_SERIAL)
! ctrl_in(SC_SR); /* Dummy read */
! ctrl_out(SCI_TD_E_CLEAR, SC_SR);
! #endif
ctrl |= SCI_CTRL_FLAGS_TIE;
}
! ctrl_out(ctrl, SCSCR);
restore_flags(flags);
}
--- 352,369 ----
}
save_and_cli(flags);
! ctrl = sci_in(port, SCSCR);
if (port->gs.xmit_cnt == 0) {
ctrl &= ~SCI_CTRL_FLAGS_TIE;
port->gs.flags &= ~GS_TX_INTEN;
} else {
! if (port->type == PORT_SCIF) {
! sci_in(port, SCxSR); /* Dummy read */
! sci_out(port, SCxSR, SCIF_TDFE);
! }
ctrl |= SCI_CTRL_FLAGS_TIE;
}
! sci_out(port, SCSCR, ctrl);
restore_flags(flags);
}
***************
*** 349,365 ****
int copied=0;
unsigned short status;
! status = ctrl_in(SC_SR);
! if (!(status & SCI_RD_F))
return;
tty = port->gs.tty;
while (1) {
! #if defined(CONFIG_SH_SCIF_SERIAL)
! count = ctrl_inw(SCFDR)&0x001f;
! #else
! count = (ctrl_in(SC_SR)&SCI_RD_F)?1:0;
! #endif
/* Don't copy more bytes than there is room for in the buffer */
if (tty->flip.count + count > TTY_FLIPBUF_SIZE)
--- 374,390 ----
int copied=0;
unsigned short status;
! status = sci_in(port, SCxSR);
! if (!(status & SCxSR_RDxF(port)))
return;
tty = port->gs.tty;
while (1) {
! if (port->type == PORT_SCIF) {
! count = sci_in(port, SCFDR)&0x001f;
! } else {
! count = (sci_in(port, SCxSR)&SCxSR_RDxF(port))?1:0;
! }
/* Don't copy more bytes than there is room for in the buffer */
if (tty->flip.count + count > TTY_FLIPBUF_SIZE)
***************
*** 370,378 ****
break;
for (i=0; i<count; i++)
! tty->flip.char_buf_ptr[i] = ctrl_inb(SC_RDR);
! ctrl_in(SC_SR); /* dummy read */
! ctrl_out(SCI_RDRF_CLEAR, SC_SR);
memset(tty->flip.flag_buf_ptr, TTY_NORMAL, count);
--- 395,403 ----
break;
for (i=0; i<count; i++)
! tty->flip.char_buf_ptr[i] = sci_in(port, SCxRDR);
! sci_in(port, SCxSR); /* dummy read */
! sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
memset(tty->flip.flag_buf_ptr, TTY_NORMAL, count);
***************
*** 392,407 ****
static void sci_rx_interrupt(int irq, void *ptr, struct pt_regs *regs)
{
struct sci_port *port = ptr;
- unsigned long flags;
if (port->gs.flags & GS_ACTIVE)
if (!(port->gs.flags & SCI_RX_THROTTLE)) {
sci_receive_chars(port);
return;
}
! save_and_cli(flags);
! ctrl_out(ctrl_in(SCSCR) & ~SCI_CTRL_FLAGS_RIE, SCSCR);
! restore_flags(flags);
}
static void sci_tx_interrupt(int irq, void *ptr, struct pt_regs *regs)
--- 417,429 ----
static void sci_rx_interrupt(int irq, void *ptr, struct pt_regs *regs)
{
struct sci_port *port = ptr;
if (port->gs.flags & GS_ACTIVE)
if (!(port->gs.flags & SCI_RX_THROTTLE)) {
sci_receive_chars(port);
return;
}
! sci_disable_rx_interrupts(port);
}
static void sci_tx_interrupt(int irq, void *ptr, struct pt_regs *regs)
***************
*** 411,429 ****
if (port->gs.flags & GS_ACTIVE)
sci_transmit_chars(port);
else {
! unsigned long flags;
!
! save_and_cli(flags);
! ctrl_out(ctrl_in(SCSCR) & ~SCI_CTRL_FLAGS_TIE, SCSCR);
! restore_flags(flags);
}
}
static void sci_er_interrupt(int irq, void *ptr, struct pt_regs *regs)
{
/* Handle errors */
! if (ctrl_in(SC_SR) & SCI_ERRORS)
! ctrl_out(SCI_ERROR_CLEAR, SC_SR);
/* Kick the transmission */
sci_tx_interrupt(irq, ptr, regs);
--- 433,449 ----
if (port->gs.flags & GS_ACTIVE)
sci_transmit_chars(port);
else {
! sci_disable_tx_interrupts(port);
}
}
static void sci_er_interrupt(int irq, void *ptr, struct pt_regs *regs)
{
+ struct sci_port *port = ptr;
+
/* Handle errors */
! if (sci_in(port, SCxSR) & SCxSR_ERRORS(port))
! sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
/* Kick the transmission */
sci_tx_interrupt(irq, ptr, regs);
***************
*** 436,449 ****
static void sci_disable_tx_interrupts(void *ptr)
{
unsigned long flags;
unsigned short ctrl;
/* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
save_and_cli(flags);
! ctrl = ctrl_in(SCSCR);
ctrl &= ~SCI_CTRL_FLAGS_TIE;
! ctrl_out(ctrl, SCSCR);
restore_flags(flags);
}
--- 456,470 ----
static void sci_disable_tx_interrupts(void *ptr)
{
+ struct sci_port *port = ptr;
unsigned long flags;
unsigned short ctrl;
/* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
save_and_cli(flags);
! ctrl = sci_in(port, SCSCR);
ctrl &= ~SCI_CTRL_FLAGS_TIE;
! sci_out(port, SCSCR, ctrl);
restore_flags(flags);
}
***************
*** 451,484 ****
{
struct sci_port *port = ptr;
! disable_irq(SCI_TXI_IRQ);
sci_transmit_chars(port);
! enable_irq(SCI_TXI_IRQ);
}
static void sci_disable_rx_interrupts(void * ptr)
{
unsigned long flags;
unsigned short ctrl;
/* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
save_and_cli(flags);
! ctrl = ctrl_in(SCSCR);
ctrl &= ~SCI_CTRL_FLAGS_RIE;
! ctrl_out(ctrl, SCSCR);
restore_flags(flags);
}
static void sci_enable_rx_interrupts(void * ptr)
{
unsigned long flags;
unsigned short ctrl;
/* Set RIE (Receive Interrupt Enable) bit in SCSCR */
save_and_cli(flags);
! ctrl = ctrl_in(SCSCR);
ctrl |= SCI_CTRL_FLAGS_RIE;
! ctrl_out(ctrl, SCSCR);
restore_flags(flags);
}
--- 472,507 ----
{
struct sci_port *port = ptr;
! disable_irq(port->irqs[SCIx_TXI_IRQ]);
sci_transmit_chars(port);
! enable_irq(port->irqs[SCIx_TXI_IRQ]);
}
static void sci_disable_rx_interrupts(void * ptr)
{
+ struct sci_port *port = ptr;
unsigned long flags;
unsigned short ctrl;
/* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
save_and_cli(flags);
! ctrl = sci_in(port, SCSCR);
ctrl &= ~SCI_CTRL_FLAGS_RIE;
! sci_out(port, SCSCR, ctrl);
restore_flags(flags);
}
static void sci_enable_rx_interrupts(void * ptr)
{
+ struct sci_port *port = ptr;
unsigned long flags;
unsigned short ctrl;
/* Set RIE (Receive Interrupt Enable) bit in SCSCR */
save_and_cli(flags);
! ctrl = sci_in(port, SCSCR);
ctrl |= SCI_CTRL_FLAGS_RIE;
! sci_out(port, SCSCR, ctrl);
restore_flags(flags);
}
***************
*** 490,500 ****
static int sci_chars_in_buffer(void * ptr)
{
! #if defined(CONFIG_SH_SCIF_SERIAL)
! return (ctrl_inw(SCFDR) >> 8) + ((ctrl_in(SC_SR) & SCI_TEND)? 0: 1);
! #else
! return (ctrl_in(SC_SR) & SCI_TEND)? 0: 1;
! #endif
}
static void sci_shutdown_port(void * ptr)
--- 513,525 ----
static int sci_chars_in_buffer(void * ptr)
{
! struct sci_port *port = ptr;
!
! if (port->type == PORT_SCIF) {
! return (sci_in(port, SCFDR) >> 8) + ((sci_in(port, SCxSR) & SCxSR_TEND(port))? 0: 1);
! } else {
! return (sci_in(port, SCxSR) & SCxSR_TEND(port))? 0: 1;
! }
}
static void sci_shutdown_port(void * ptr)
***************
*** 527,539 ****
port->gs.tty = tty;
port->gs.count++;
- #ifdef CONFIG_SERIAL_CONSOLE
- if (sercons.cflag && sercons.index == line) {
- tty->termios->c_cflag = sercons.cflag;
- sercons.cflag = 0;
- }
- #endif
-
/*
* Start up serial port
*/
--- 552,557 ----
***************
*** 566,571 ****
--- 584,598 ----
sci_set_real_termios(port);
}
+ #ifdef CONFIG_SERIAL_CONSOLE
+ if (sercons.cflag && sercons.index == line) {
+ tty->termios->c_cflag = sercons.cflag;
+ port->gs.baud = sercons_baud;
+ sercons.cflag = 0;
+ sci_set_real_termios(port);
+ }
+ #endif
+
sci_enable_rx_interrupts(port);
port->gs.session = current->session;
***************
*** 680,685 ****
--- 707,731 ----
return;
}
+ #ifdef CONFIG_PROC_FS
+ static int sci_read_proc(char *page, char **start, off_t off, int count,
+ int *eof, void *data)
+ {
+ int i;
+ struct sci_port *port;
+ int len = 0;
+
+ len += sprintf(page, "serinfo:1.0\n");
+ for (i = 0; i < SCI_NPORTS && len < 4000; i++) {
+ port = &sci_ports[i];
+ len += sprintf(page+len, "%d: uart:%s address: %08x\n", i,
+ (port->type == PORT_SCI) ? "SCI" : "SCIF",
+ port->base);
+ }
+ return len;
+ }
+ #endif
+
/* ********************************************************************** *
* Here are the initialization routines. *
* ********************************************************************** */
***************
*** 695,701 ****
sci_driver.name = "ttyS";
sci_driver.major = TTY_MAJOR;
sci_driver.minor_start = SCI_MINOR_START;
! sci_driver.num = 1;
sci_driver.type = TTY_DRIVER_TYPE_SERIAL;
sci_driver.subtype = SERIAL_TYPE_NORMAL;
sci_driver.init_termios = tty_std_termios;
--- 741,747 ----
sci_driver.name = "ttyS";
sci_driver.major = TTY_MAJOR;
sci_driver.minor_start = SCI_MINOR_START;
! sci_driver.num = SCI_NPORTS;
sci_driver.type = TTY_DRIVER_TYPE_SERIAL;
sci_driver.subtype = SERIAL_TYPE_NORMAL;
sci_driver.init_termios = tty_std_termios;
***************
*** 704,712 ****
sci_driver.flags = TTY_DRIVER_REAL_RAW;
sci_driver.refcount = &sci_refcount;
sci_driver.table = sci_table;
! sci_driver.termios = &sci_termios[0];
! sci_driver.termios_locked = &sci_termios[1];
! sci_termios[0] = sci_termios[1] = NULL;
sci_driver.open = sci_open;
sci_driver.close = gs_close;
--- 750,757 ----
sci_driver.flags = TTY_DRIVER_REAL_RAW;
sci_driver.refcount = &sci_refcount;
sci_driver.table = sci_table;
! sci_driver.termios = sci_termios;
! sci_driver.termios_locked = sci_termios_locked;
sci_driver.open = sci_open;
sci_driver.close = gs_close;
***************
*** 723,733 ****
--- 768,782 ----
sci_driver.stop = gs_stop;
sci_driver.start = gs_start;
sci_driver.hangup = gs_hangup;
+ #ifdef CONFIG_PROC_FS
+ sci_driver.read_proc = sci_read_proc;
+ #endif
sci_callout_driver = sci_driver;
sci_callout_driver.name = "cua";
sci_callout_driver.major = TTYAUX_MAJOR;
sci_callout_driver.subtype = SERIAL_TYPE_CALLOUT;
+ sci_callout_driver.read_proc = NULL;
if ((error = tty_register_driver(&sci_driver))) {
printk(KERN_ERR "sci: Couldn't register SCI driver, error = %d\n",
***************
*** 741,756 ****
return 1;
}
! port = &sci_ports[0];
! port->gs.callout_termios = tty_std_termios;
! port->gs.normal_termios = tty_std_termios;
! port->gs.magic = SCI_MAGIC;
! port->gs.close_delay = HZ/2;
! port->gs.closing_wait = 30 * HZ;
! port->gs.rd = &sci_real_driver;
! init_waitqueue_head(&port->gs.open_wait);
! init_waitqueue_head(&port->gs.close_wait);
! port->old_cflag = 0;
return 0;
}
--- 790,806 ----
return 1;
}
! for (port = &sci_ports[0]; port < &sci_ports[SCI_NPORTS]; port++) {
! port->gs.callout_termios = sci_callout_driver.init_termios;
! port->gs.normal_termios = sci_driver.init_termios;
! port->gs.magic = SCI_MAGIC;
! port->gs.close_delay = HZ/2;
! port->gs.closing_wait = 30 * HZ;
! port->gs.rd = &sci_real_driver;
! init_waitqueue_head(&port->gs.open_wait);
! init_waitqueue_head(&port->gs.close_wait);
! port->old_cflag = 0;
! }
return 0;
}
***************
*** 759,784 ****
{
struct sci_port *port;
int i;
!
! for (i=SCI_ERI_IRQ; i<SCI_IRQ_END; i++)
! set_ipr_data(i, SCI_IPR_ADDR, SCI_IPR_POS, SCI_PRIORITY);
!
! port = &sci_ports[0];
!
! if (request_irq(SCI_ERI_IRQ, sci_er_interrupt, SA_INTERRUPT,
! "serial", port)) {
! printk(KERN_ERR "sci: Cannot allocate error irq.\n");
! return -ENODEV;
! }
! if (request_irq(SCI_RXI_IRQ, sci_rx_interrupt, SA_INTERRUPT,
! "serial", port)) {
! printk(KERN_ERR "sci: Cannot allocate rx irq.\n");
! return -ENODEV;
! }
! if (request_irq(SCI_TXI_IRQ, sci_tx_interrupt, SA_INTERRUPT,
! "serial", port)) {
! printk(KERN_ERR "sci: Cannot allocate tx irq.\n");
! return -ENODEV;
}
/* XXX: How about BRI interrupt?? */
--- 809,828 ----
{
struct sci_port *port;
int i;
! void (*handlers[3])(int irq, void *ptr, struct pt_regs *regs) = {
! sci_er_interrupt, sci_rx_interrupt, sci_tx_interrupt
! };
!
! for (port = &sci_ports[0]; port < &sci_ports[SCI_NPORTS]; port++) {
! for (i=0; i<3; i++) {
! set_ipr_data(port->irqs[i], port->intc_addr, port->intc_pos, SCI_PRIORITY);
!
! if (request_irq(port->irqs[i], handlers[i], SA_INTERRUPT,
! "serial", port)) {
! printk(KERN_ERR "sci: Cannot allocate irq.\n");
! return -ENODEV;
! }
! }
}
/* XXX: How about BRI interrupt?? */
***************
*** 825,833 ****
if (in_gdb == 1) {
in_gdb = 0;
! get_char();
! put_char('\r');
! put_char('\n');
}
}
#endif
--- 869,877 ----
if (in_gdb == 1) {
in_gdb = 0;
! get_char(sercons_port);
! put_char(sercons_port, '\r');
! put_char(sercons_port, '\n');
}
}
#endif
***************
*** 839,845 ****
static void serial_console_write(struct console *co, const char *s,
unsigned count)
{
! put_string(s, count);
}
/*
--- 883,889 ----
static void serial_console_write(struct console *co, const char *s,
unsigned count)
{
! put_string(sercons_port, s, count);
}
/*
***************
*** 870,875 ****
--- 914,921 ----
int cflag = CREAD | HUPCL | CLOCAL;
char *s;
+ sercons_port = &sci_ports[co->index];
+
if (options) {
baud = simple_strtoul(options, NULL, 10);
s = options;
***************
*** 918,926 ****
cflag |= PARENB;
break;
}
co->cflag = cflag;
! sci_set_termios_cflag(cflag, baud);
return 0;
}
--- 964,975 ----
cflag |= PARENB;
break;
}
+
co->cflag = cflag;
+ sercons_baud = baud;
! sci_set_termios_cflag(sercons_port, cflag, baud);
! sercons_port->old_cflag = cflag;
return 0;
}
Index: drivers/char/sh-sci.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/drivers/char/sh-sci.h,v
retrieving revision 1.8
diff -c -r1.8 sh-sci.h
*** drivers/char/sh-sci.h 2000/06/14 09:37:54 1.8
--- drivers/char/sh-sci.h 2000/06/15 15:43:26
***************
*** 5,152 ****
* SuperH on-chip serial module support. (SCI with no FIFO / with FIFO)
* Copyright (C) 1999, 2000 Niibe Yutaka
* Copyright (C) 2000 Greg Banks
*
*/
#include <linux/config.h>
! #if defined(CONFIG_SH_SCI_SERIAL)
! #if defined(__sh3__)
! #define SCSMR (volatile unsigned char *)0xfffffe80
! #define SCBRR 0xfffffe82
! #define SCSCR (volatile unsigned char *)0xfffffe84
! #define SC_TDR 0xfffffe86
! #define SC_SR (volatile unsigned char *)0xfffffe88
! #define SC_RDR 0xfffffe8a
! #define SCSPTR 0xffffff7c
! #elif defined(__SH4__)
! #define SCSMR (volatile unsigned char *)0xffe00000
! #define SCBRR 0xffe00004
! #define SCSCR (volatile unsigned char *)0xffe00008
! #define SC_TDR 0xffe0000c
! #define SC_SR (volatile unsigned char *)0xffe00010
! #define SC_RDR 0xffe00014
! #define SCSPTR 0xffe0001c
#endif
-
- #define SCSCR_INIT 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
! #define SCI_TD_E 0x80
! #define SCI_RD_F 0x40
! #define SCI_ORER 0x20
! #define SCI_FER 0x10
! #define SCI_PER 0x08
! #define SCI_TEND 0x04
#define SCI_ERRORS ( SCI_PER | SCI_FER | SCI_ORER)
- #define SCI_TD_E_CLEAR 0x78
- #define SCI_RDRF_CLEAR 0xbc
- #define SCI_ERROR_CLEAR 0xc4
-
- #define SCI_CTRL_FLAGS_TIE 0x80
- #define SCI_CTRL_FLAGS_RIE 0x40
- #define SCI_CTRL_FLAGS_TE 0x20
- #define SCI_CTRL_FLAGS_RE 0x10
- /* TEIE=0x04 */
- #define SCI_CTRL_FLAGS_CKE1 0x02
- #define SCI_CTRL_FLAGS_CKE0 0x01
-
- #define SCI_ERI_IRQ 23
- #define SCI_RXI_IRQ 24
- #define SCI_TXI_IRQ 25
- #define SCI_TEI_IRQ 26
- #define SCI_IRQ_END 27
! #define SCI_IPR_ADDR INTC_IPRB
! #define SCI_IPR_POS 1
#endif
-
- #if defined(CONFIG_SH_SCIF_SERIAL)
- #if defined(__sh3__)
- #define SCSMR (volatile unsigned char *)0xA4000150
- #define SCBRR 0xA4000152
- #define SCSCR (volatile unsigned char *)0xA4000154
- #define SC_TDR 0xA4000156
- #define SC_SR (volatile unsigned short *)0xA4000158
- #define SC_RDR 0xA400015A
- #define SCFCR (volatile unsigned char *)0xA400015C
- #define SCFDR 0xA400015E
-
- #undef SCSPTR /* SH7709 doesn't have SCSPTR */
- #define SCPCR 0xA4000116 /* Instead, it has SCPCR and SCPDR */
- #define SCPDR 0xA4000136
- #undef SCLSR
-
- #define SCSCR_INIT 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
- /* 0x33 when external clock is used */
- #define SCI_IPR_ADDR INTC_IPRE
- #define SCI_IPR_POS 1
-
- #elif defined(__SH4__)
- #define SCSMR (volatile unsigned short *)0xFFE80000
- #define SCBRR 0xFFE80004
- #define SCSCR (volatile unsigned short *)0xFFE80008
- #define SC_TDR 0xFFE8000C
- #define SC_SR (volatile unsigned short *)0xFFE80010
- #define SC_RDR 0xFFE80014
- #define SCFCR (volatile unsigned short *)0xFFE80018
- #define SCFDR 0xFFE8001C
- #define SCSPTR 0xFFE80020
- #define SCLSR 0xFFE80024
-
- #define SCSCR_INIT 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
- #define SCI_IPR_ADDR INTC_IPRC
- #define SCI_IPR_POS 1
! #endif
- #define SCI_ER 0x0080
- #define SCI_TEND 0x0040
- #define SCI_TD_E 0x0020
- #define SCI_BRK 0x0010
- #define SCI_FER 0x0008
- #define SCI_PER 0x0004
- #define SCI_RD_F 0x0002
- #define SCI_DR 0x0001
-
- #define SCI_ERRORS ( SCI_PER | SCI_FER | SCI_ER | SCI_BRK)
- #define SCI_TD_E_CLEAR 0x00df
- #define SCI_TEND_CLEAR 0x00bf
- #define SCI_RDRF_CLEAR 0x00fc
- #define SCI_ERROR_CLEAR 0x0063
-
- #define SCI_CTRL_FLAGS_TIE 0x80
- #define SCI_CTRL_FLAGS_RIE 0x40
- #define SCI_CTRL_FLAGS_TE 0x20
- #define SCI_CTRL_FLAGS_RE 0x10
- #define SCI_CTRL_FLAGS_REIE 0x08
- #define SCI_CTRL_FLAGS_CKE1 0x02
-
- #if defined(__sh3__)
- #define SCI_ERI_IRQ 56
- #define SCI_RXI_IRQ 57
- #define SCI_BRI_IRQ 58
- #define SCI_TXI_IRQ 59
- #define SCI_IRQ_END 60
- #elif defined(__SH4__)
- #define SCI_ERI_IRQ 40
- #define SCI_RXI_IRQ 41
- #define SCI_BRI_IRQ 42
- #define SCI_TXI_IRQ 43
- #define SCI_IRQ_END 44
- #endif
- #endif
-
- #if defined(__sh3__)
- #define RFCR 0xffffff74
- #elif defined(__SH4__)
- #define RFCR 0xFF800028
- #endif
-
#define SCI_PRIORITY 3
#define SCI_MINOR_START 64
#define SCI_RX_THROTTLE 0x0000001
#define O_OTHER(tty) \
((O_OLCUC(tty)) ||\
(O_ONLCR(tty)) ||\
--- 5,138 ----
* SuperH on-chip serial module support. (SCI with no FIFO / with FIFO)
* Copyright (C) 1999, 2000 Niibe Yutaka
* Copyright (C) 2000 Greg Banks
+ * Modified to support multiple serial ports. Stuart Menefy (May 2000).
*
*/
#include <linux/config.h>
! /* Values for sci_port->type */
! #define PORT_SCI 0
! #define PORT_SCIF 1
!
! /* Offsets into the sci_port->irqs array */
! #define SCIx_ERI_IRQ 0
! #define SCIx_RXI_IRQ 1
! #define SCIx_TXI_IRQ 2
!
! /* ERI, RXI, TXI, INTC reg, INTC pos */
! #define SCI_IRQS { 23, 24, 25 }, INTC_IPRB, 1
! #define SH3_SCIF_IRQS { 56, 57, 59 }, INTC_IPRE, 1
! #define SH4_SCIF_IRQS { 40, 41, 43 }, INTC_IPRC, 1
!
! #if defined(CONFIG_CPU_SUBTYPE_SH7708)
! # define SCI_NPORTS 1
! # define SCI_INIT { \
! { {}, PORT_SCI, 0xfffffe80, SCI_IRQS, sci_init_pins_sci } \
! }
! # define SCSPTR 0xffffff7c /* 8 bit */
! # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
! # define SCI_ONLY
! #elif defined(CONFIG_CPU_SUBTYPE_SH7709)
! # define SCI_NPORTS 2
! # define SCI_INIT { \
! { {}, PORT_SCI, 0xfffffe80, SCI_IRQS, sci_init_pins_sci }, \
! { {}, PORT_SCIF, 0xA4000150, SH3_SCIF_IRQS, sci_init_pins_scif } \
! }
! # define SCPCR 0xA4000116 /* 16 bit SCI and SCIF */
! # define SCPDR 0xA4000136 /* 8 bit SCI and SCIF */
! # define SCSCR_INIT(port) 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
! # define SCI_AND_SCIF
! #elif defined(CONFIG_CPU_SUBTYPE_SH7750)
! # define SCI_NPORTS 2
! # define SCI_INIT { \
! { {}, PORT_SCI, 0xffe00000, SCI_IRQS, sci_init_pins_sci }, \
! { {}, PORT_SCIF, 0xFFE80000, SH4_SCIF_IRQS, sci_init_pins_scif } \
! }
! # define SCSPTR1 0xffe0001c /* 8 bit SCI */
! # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */
! # define SCLSR2 0xFFE80024 /* 16 bit SCIF */
! # define SCSCR_INIT(port) (((port)->type == PORT_SCI) ? \
! 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ : \
! 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ )
! # define SCI_AND_SCIF
! #else
! # error CPU subtype not defined
#endif
! /* SCSCR */
! #define SCI_CTRL_FLAGS_TIE 0x80 /* all */
! #define SCI_CTRL_FLAGS_RIE 0x40 /* all */
! #define SCI_CTRL_FLAGS_TE 0x20 /* all */
! #define SCI_CTRL_FLAGS_RE 0x10 /* all */
! /* SCI_CTRL_FLAGS_REIE 0x08 * 7750 SCIF */
! /* SCI_CTRL_FLAGS_MPIE 0x08 * 7708 SCI, 7709 SCI, 7750 SCI */
! /* SCI_CTRL_FLAGS_TEIE 0x04 * 7708 SCI, 7709 SCI, 7750 SCI */
! /* SCI_CTRL_FLAGS_CKE1 0x02 * all */
! /* SCI_CTRL_FLAGS_CKE0 0x01 * 7708 SCI, 7709 SCI/SCIF, 7750 SCI */
!
! /* SCxSR SCI */
! #define SCI_TDRE 0x80 /* 7708 SCI, 7709 SCI, 7750 SCI */
! #define SCI_RDRF 0x40 /* 7708 SCI, 7709 SCI, 7750 SCI */
! #define SCI_ORER 0x20 /* 7708 SCI, 7709 SCI, 7750 SCI */
! #define SCI_FER 0x10 /* 7708 SCI, 7709 SCI, 7750 SCI */
! #define SCI_PER 0x08 /* 7708 SCI, 7709 SCI, 7750 SCI */
! #define SCI_TEND 0x04 /* 7708 SCI, 7709 SCI, 7750 SCI */
! /* SCI_MPB 0x02 * 7708 SCI, 7709 SCI, 7750 SCI */
! /* SCI_MPBT 0x01 * 7708 SCI, 7709 SCI, 7750 SCI */
#define SCI_ERRORS ( SCI_PER | SCI_FER | SCI_ORER)
! /* SCxSR SCIF */
! #define SCIF_ER 0x0080 /* 7709 SCIF, 7750 SCIF */
! #define SCIF_TEND 0x0040 /* 7709 SCIF, 7750 SCIF */
! #define SCIF_TDFE 0x0020 /* 7709 SCIF, 7750 SCIF */
! #define SCIF_BRK 0x0010 /* 7709 SCIF, 7750 SCIF */
! #define SCIF_FER 0x0008 /* 7709 SCIF, 7750 SCIF */
! #define SCIF_PER 0x0004 /* 7709 SCIF, 7750 SCIF */
! #define SCIF_RDF 0x0002 /* 7709 SCIF, 7750 SCIF */
! #define SCIF_DR 0x0001 /* 7709 SCIF, 7750 SCIF */
!
! #define SCIF_ERRORS ( SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
!
! #if defined(SCI_ONLY)
! # define SCxSR_TEND(port) SCI_TEND
! # define SCxSR_ERRORS(port) SCI_ERRORS
! # define SCxSR_RDxF(port) SCI_RDRF
! # define SCxSR_TDxE(port) SCI_TDRE
! # define SCxSR_RDxF_CLEAR(port) 0xbc
! # define SCxSR_ERROR_CLEAR(port) 0xc4
! # define SCxSR_TDxE_CLEAR(port) 0x78
! #elif defined(SCIF_ONLY)
! # define SCxSR_TEND(port) SCIF_TEND
! # define SCxSR_ERRORS(port) SCIF_ERRORS
! # define SCxSR_RDxF(port) SCIF_RDF
! # define SCxSR_TDxE(port) SCIF_TDFE
! # define SCxSR_RDxF_CLEAR(port) 0x00fc
! # define SCxSR_ERROR_CLEAR(port) 0x0063
! # define SCxSR_TDxE_CLEAR(port) 0x00df
! #else
! # define SCxSR_TEND(port) (((port)->type == PORT_SCI) ? SCI_TEND : SCIF_TEND)
! # define SCxSR_ERRORS(port) (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS)
! # define SCxSR_RDxF(port) (((port)->type == PORT_SCI) ? SCI_RDRF : SCIF_RDF)
! # define SCxSR_TDxE(port) (((port)->type == PORT_SCI) ? SCI_TDRE : SCIF_TDFE)
! # define SCxSR_RDxF_CLEAR(port) (((port)->type == PORT_SCI) ? 0xbc : 0x00fc)
! # define SCxSR_ERROR_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x0063)
! # define SCxSR_TDxE_CLEAR(port) (((port)->type == PORT_SCI) ? 0x78 : 0x00df)
#endif
! /* SCFCR */
! #define SCFCR_RFRST 0x0002
! #define SCFCR_TFRST 0x0004
! #define SCFCR_MCE 0x0008
#define SCI_PRIORITY 3
#define SCI_MINOR_START 64
+
+ /* Generic serial flags */
#define SCI_RX_THROTTLE 0x0000001
+ /* generic serial tty */
#define O_OTHER(tty) \
((O_OLCUC(tty)) ||\
(O_ONLCR(tty)) ||\
***************
*** 171,185 ****
#define SCI_MAGIC 0xbabeface
- #ifdef GENERIC_SERIAL_H
struct sci_port {
struct gs_port gs;
unsigned int old_cflag;
};
#endif
! #define WAIT_RFCR_COUNTER 200
/*
* Values for the BitRate Register (SCBRR)
*
--- 157,244 ----
#define SCI_MAGIC 0xbabeface
struct sci_port {
struct gs_port gs;
+ int type;
+ unsigned int base;
+ unsigned char irqs[3]; /* ERI, RXI, TXI */
+ unsigned int intc_addr, intc_pos;
+ void (*init_pins)(struct sci_port* port, unsigned int cflag);
unsigned int old_cflag;
};
+
+ #define SCI_IN(size, offset) \
+ unsigned int addr = port->base + (offset); \
+ if ((size) == 8) { \
+ return ctrl_inb(addr); \
+ } else { \
+ return ctrl_inw(addr); \
+ }
+ #define SCI_OUT(size, offset, value) \
+ unsigned int addr = port->base + (offset); \
+ if ((size) == 8) { \
+ ctrl_outb(value, addr); \
+ } else { \
+ ctrl_outw(value, addr); \
+ }
+
+ #define CPU_SCIx_FNS(name, sci_offset, sci_size, scif_offset, scif_size)\
+ static inline unsigned int sci_##name##_in(struct sci_port* port) \
+ { \
+ if (port->type == PORT_SCI) { \
+ SCI_IN(sci_size, sci_offset) \
+ } else { \
+ SCI_IN(scif_size, scif_offset); \
+ } \
+ } \
+ static inline void sci_##name##_out(struct sci_port* port, unsigned int value) \
+ { \
+ if (port->type == PORT_SCI) { \
+ SCI_OUT(sci_size, sci_offset, value) \
+ } else { \
+ SCI_OUT(scif_size, scif_offset, value); \
+ } \
+ }
+
+ #define CPU_SCIF_FNS(name, scif_offset, scif_size) \
+ static inline unsigned int sci_##name##_in(struct sci_port* port) \
+ { \
+ SCI_IN(scif_size, scif_offset); \
+ } \
+ static inline void sci_##name##_out(struct sci_port* port, unsigned int value) \
+ { \
+ SCI_OUT(scif_size, scif_offset, value); \
+ }
+
+ #ifdef __sh3__
+ #define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh4_sci_offset, sh4_sci_size, \
+ sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+ CPU_SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh3_scif_offset, sh3_scif_size)
+ #define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+ CPU_SCIF_FNS(name, sh3_scif_offset, sh3_scif_size)
+ #else
+ #define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size, sh4_sci_offset, sh4_sci_size, \
+ sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+ CPU_SCIx_FNS(name, sh4_sci_offset, sh4_sci_size, sh4_scif_offset, sh4_scif_size)
+ #define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size, sh4_scif_offset, sh4_scif_size) \
+ CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
#endif
+
+ /* reg SCI/SH3 SCI/SH4 SCIF/SH3 SCIF/SH4 */
+ /* name off sz off sz off sz off sz */
+ SCIx_FNS(SCSMR, 0x00, 8, 0x00, 8, 0x00, 8, 0x00, 16)
+ SCIx_FNS(SCBRR, 0x02, 8, 0x04, 8, 0x02, 8, 0x04, 8)
+ SCIx_FNS(SCSCR, 0x04, 8, 0x08, 8, 0x04, 8, 0x08, 16)
+ SCIx_FNS(SCxTDR, 0x06, 8, 0x0c, 8, 0x06, 8, 0x0C, 8)
+ SCIx_FNS(SCxSR, 0x08, 8, 0x10, 8, 0x08, 16, 0x10, 16)
+ SCIx_FNS(SCxRDR, 0x0a, 8, 0x14, 8, 0x0A, 8, 0x14, 8)
+ SCIF_FNS(SCFCR, 0x0c, 8, 0x18, 16)
+ SCIF_FNS(SCFDR, 0x0e, 16, 0x1C, 16)
! #define sci_in(port, reg) sci_##reg##_in(port)
! #define sci_out(port, reg, value) sci_##reg##_out(port, value)
+
/*
* Values for the BitRate Register (SCBRR)
*
***************
*** 228,234 ****
}
#endif
! static __inline__ void put_char(char c)
{
unsigned long flags;
unsigned short status;
--- 287,293 ----
}
#endif
! static __inline__ void put_char(struct sci_port *port, char c)
{
unsigned long flags;
unsigned short status;
***************
*** 236,273 ****
save_and_cli(flags);
do
! status = ctrl_in(SC_SR);
! while (!(status & SCI_TD_E));
!
! ctrl_outb(c, SC_TDR);
! ctrl_in(SC_SR); /* Dummy read */
! ctrl_out(SCI_TD_E_CLEAR, SC_SR);
restore_flags(flags);
}
! static __inline__ void handle_error(void)
{ /* Clear error flags */
! ctrl_out(SCI_ERROR_CLEAR, SC_SR);
}
! static __inline__ int get_char(void)
{
unsigned long flags;
unsigned short status;
int c;
save_and_cli(flags);
! do {
! status = ctrl_in(SC_SR);
! if (status & SCI_ERRORS) {
! handle_error();
continue;
}
! } while (!(status & SCI_RD_F));
! c = ctrl_inb(SC_RDR);
! ctrl_in(SC_SR); /* Dummy read */
! ctrl_out(SCI_RDRF_CLEAR, SC_SR);
restore_flags(flags);
return c;
--- 295,332 ----
save_and_cli(flags);
do
! status = sci_in(port, SCxSR);
! while (!(status & SCxSR_TDxE(port)));
!
! sci_out(port, SCxTDR, c);
! sci_in(port, SCxSR); /* Dummy read */
! sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
restore_flags(flags);
}
! static __inline__ void handle_error(struct sci_port *port)
{ /* Clear error flags */
! sci_out(port, SCxSR, SCxSR_ERROR_CLEAR(port));
}
! static __inline__ int get_char(struct sci_port *port)
{
unsigned long flags;
unsigned short status;
int c;
save_and_cli(flags);
! do {
! status = sci_in(port, SCxSR);
! if (status & SCxSR_ERRORS(port)) {
! handle_error(port);
continue;
}
! } while (!(status & SCxSR_RDxF(port)));
! c = sci_in(port, SCxRDR);
! sci_in(port, SCxSR); /* Dummy read */
! sci_out(port, SCxSR, SCxSR_RDxF_CLEAR(port));
restore_flags(flags);
return c;
***************
*** 278,284 ****
* This routine does not wait for a positive acknowledge.
*/
! static __inline__ void put_string(const char *buffer, int count)
{
int i;
const unsigned char *p = buffer;
--- 337,344 ----
* This routine does not wait for a positive acknowledge.
*/
! static __inline__ void put_string(struct sci_port *port,
! const char *buffer, int count)
{
int i;
const unsigned char *p = buffer;
***************
*** 289,296 ****
/* $<packet info>#<checksum>. */
do {
unsigned char c;
! put_char('$');
! put_char('O'); /* 'O'utput to console */
checksum = 'O';
for (i=0; i<count; i++) { /* Don't use run length encoding */
--- 349,356 ----
/* $<packet info>#<checksum>. */
do {
unsigned char c;
! put_char(port, '$');
! put_char(port, 'O'); /* 'O'utput to console */
checksum = 'O';
for (i=0; i<count; i++) { /* Don't use run length encoding */
***************
*** 299,317 ****
c = *p++;
h = highhex(c);
l = lowhex(c);
! put_char(h);
! put_char(l);
checksum += h + l;
}
! put_char('#');
! put_char(highhex(checksum));
! put_char(lowhex(checksum));
! } while (get_char() != '+');
} else
#endif
for (i=0; i<count; i++) {
if (*p == 10)
! put_char('\r');
! put_char(*p++);
}
}
--- 359,377 ----
c = *p++;
h = highhex(c);
l = lowhex(c);
! put_char(port, h);
! put_char(port, l);
checksum += h + l;
}
! put_char(port, '#');
! put_char(port, highhex(checksum));
! put_char(port, lowhex(checksum));
! } while (get_char(port) != '+');
} else
#endif
for (i=0; i<count; i++) {
if (*p == 10)
! put_char(port, '\r');
! put_char(port, *p++);
}
}
|
|
From: Stuart M. <Stu...@st...> - 2000-06-14 09:44:08
|
OK, my changes are in. Sorry about the delay. Stuart On Jun 10, 12:07pm, gn...@ch... wrote: > Subject: [linuxsh-dev] Please commit your changes > > Stuart, Takeshi, and Toshiharu, could you please update your changes > and commit them to the CVS repository. > > I think that I'll send the patch against the standard kernel next > week. > -- > > _______________________________________________ > linuxsh-dev mailing list > lin...@li... > http://lists.sourceforge.net/mailman/listinfo/linuxsh-dev >-- End of excerpt from gn...@ch... |
|
From: NIIBE Y. <gn...@ch...> - 2000-06-13 10:28:26
|
Stuart Menefy wrote: > Yes. The problem appears to be caused by a fix which was put into the > generic mount code (in copy_mount_options). This now correctly checks > the address the user gave for the file system type. However this has > highlighted a bug in the SuperH code. __copy_user should return the > number of bytes not copied (ie 0 for a success). However the SH version > was returning EFAULT for a failure. The attached patch should fix > this. [...] > Could somebody check my resoning? If its sound I'll check in, together > with the other changes. I've checked. Your analysis is right. It should not return -EFAULT, it's put_user/get_user which return -EFAULT, there was some confusion. > ! " .long 9b,2b\n" This is right, the return value is remaining bytes. > ! " add #1, %0\n\t" [...] > ! " .long 1b,3b\n" This fix is also right. We should add +1 to get the value. Thank you. -- |
|
From: Stuart M. <Stu...@st...> - 2000-06-12 18:37:45
|
Folks YAEGASHI Takeshi wrote: > Yesterday, I had updated my kernel to the latest 2.4.0-test1 > from CVS, and /bin/mount(in Chiyonofuji-2000-05-16) had gotten > not to work. On 2.3.99-pre9 kernel it worked well and I could > mount ext2/vfat partitions of CF. Have anyone ever had a > similar exprerience? Yes. The problem appears to be caused by a fix which was put into the generic mount code (in copy_mount_options). This now correctly checks the address the user gave for the file system type. However this has highlighted a bug in the SuperH code. __copy_user should return the number of bytes not copied (ie 0 for a success). However the SH version was returning EFAULT for a failure. The attached patch should fix this. Whether you would have seen the problem or not depends on which mount executable you are using. It would only have been a problem if the filesystem type name appeared in a page which did not have a valid page immediatly after it. Could somebody check my resoning? If its sound I'll check in, together with the other changes. Stuart ------------------------------------------------------------------------------ Index: include/asm-sh/uaccess.h =================================================================== RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/uaccess.h,v retrieving revision 1.5 diff -c -r1.5 uaccess.h *** include/asm-sh/uaccess.h 2000/05/22 09:41:34 1.5 --- include/asm-sh/uaccess.h 2000/06/12 18:17:27 *************** *** 209,214 **** --- 209,215 ---- extern void __put_user_unknown(void); /* Generic arbitrary sized copy. */ + /* Return the number of bytes NOT copied */ /* XXX: should be such that: 4byte and the rest. */ extern __inline__ __kernel_size_t __copy_user(void *__to, const void *__from, __kernel_size_t __n) *************** *** 230,246 **** "3:\n\t" "mov.l 5f, %1\n\t" "jmp @%1\n\t" ! " mov %7, %0\n\t" ".balign 4\n" "5: .long 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" " .balign 4\n" ! " .long 9b,3b\n" ! " .long 1b,2b\n" ".previous" : "=r" (res), "=&z" (__dummy), "=r" (_f), "=r" (_t) ! : "2" (__from), "3" (__to), "0" (res), "i" (-EFAULT) : "memory"); return res; --- 231,247 ---- "3:\n\t" "mov.l 5f, %1\n\t" "jmp @%1\n\t" ! " add #1, %0\n\t" ".balign 4\n" "5: .long 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" " .balign 4\n" ! " .long 9b,2b\n" ! " .long 1b,3b\n" ".previous" : "=r" (res), "=&z" (__dummy), "=r" (_f), "=r" (_t) ! : "2" (__from), "3" (__to), "0" (res) : "memory"); return res; |
|
From: YAEGASHI T. <yae...@ma...> - 2000-06-10 23:49:00
|
>Some comment lines needed(pointed out by Mitch) are not included >yet. I found some mistakes in CPG table of SH-3 in time.c, so >I'll submit a patch which corrects them with comments later. Hmm... is there any way to inspect current clock operating mode, or to sense MD pins? -- YAEGASHI Takeshi <yae...@ma...> You cat get this patch at: http://sourceforge.net/patch/download.php?id=100543 Index: arch/sh/config.in =================================================================== RCS file: /cvsroot/linuxsh/kernel/arch/sh/config.in,v retrieving revision 1.7 diff -u -r1.7 config.in --- arch/sh/config.in 2000/06/10 21:45:03 1.7 +++ arch/sh/config.in 2000/06/10 23:33:19 @@ -36,6 +36,11 @@ define_bool CONFIG_CPU_SH3 n define_bool CONFIG_CPU_SH4 y fi +if [ "$CONFIG_SH_HP600" = "y" ]; then +define_int CONFIG_CLOCK_MODE 3 +else +int 'Clock operating mode' CONFIG_CLOCK_MODE 0 +fi bool 'Little Endian' CONFIG_LITTLE_ENDIAN if [ "$CONFIG_SH_SOLUTION_ENGINE" = "y" -o "$CONFIG_SH_HP600" = "y" ]; then define_hex CONFIG_MEMORY_START 0c000000 Index: arch/sh/kernel/time.c =================================================================== RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/time.c,v retrieving revision 1.10 diff -u -r1.10 time.c --- arch/sh/kernel/time.c 2000/06/10 21:45:18 1.10 +++ arch/sh/kernel/time.c 2000/06/10 23:33:20 @@ -389,7 +389,7 @@ #if defined(__sh3__) static int ifc_table[] = { 1, 2, 4, 1, 3, 1, 1, 1 }; static int pfc_table[] = { 1, 2, 4, 1, 3, 6, 1, 1 }; - static int stc_table[] = { 1, 2, 3, 4, 6, 8, 1, 1 }; + static int stc_table[] = { 1, 2, 4, 8, 3, 6, 1, 1 }; #elif defined(__SH4__) static int ifc_table[] = { 1, 2, 3, 4, 6, 8, 1, 1 }; #define bfc_table ifc_table /* Same */ @@ -421,12 +421,31 @@ tmp = (frqcr & 0x2000) >> 11; tmp |= frqcr & 0x0003; pfc = pfc_table[tmp]; -#ifdef CONFIG_SH_HP600 - master_clock = cpu_clock/6; + /* In the following master_clock and bus_clock are + corresponding to outputs of PLL1 and PLL2, respectively. */ +#if 0 + printk("frqcr=0x%x, stc=%d, ifc=%d, pfc=%d\n", frqcr, stc, ifc, pfc); +#endif +#if CONFIG_CLOCK_MODE == 0 || CONFIG_CLOCK_MODE == 7 || \ + CONFIG_CLOCK_MODE == 1 || CONFIG_CLOCK_MODE == 2 + master_clock = cpu_clock*ifc; + bus_clock = master_clock/stc; + module_clock = master_clock/pfc; +#elif CONFIG_CLOCK_MODE == 3 || CONFIG_CLOCK_MODE == 4 + if (frqcr & 0x0080) { + /* PLL1 is on */ + master_clock = cpu_clock*ifc; + bus_clock = master_clock/stc; + } + else { + /* PLL1 is off */ + master_clock = 0; + bus_clock = cpu_clock*ifc; + } + module_clock = bus_clock/pfc; #else - master_clock = cpu_clock; +#error Unsupported clock mode(check CONFIG_CLOCK_MODE) #endif - bus_clock = master_clock/pfc; } #elif defined(__SH4__) { @@ -437,11 +456,11 @@ pfc = pfc_table[frqcr & 0x0007]; master_clock = cpu_clock * ifc; bus_clock = master_clock/bfc; + module_clock = master_clock/pfc; } #endif printk("Bus clock: %d.%02dMHz\n", (bus_clock/1000000), (bus_clock % 1000000)/10000); - module_clock = master_clock/pfc; printk("Module clock: %d.%02dMHz\n", (module_clock/1000000), (module_clock % 1000000)/10000); interval = (module_clock/(HZ*4)); |
|
From: YAEGASHI T. <yae...@ma...> - 2000-06-10 21:49:09
|
>Stuart, Takeshi, and Toshiharu, could you please update your changes >and commit them to the CVS repository. > >I think that I'll send the patch against the standard kernel next >week. I've committed my HP600 code with a little more changes into the repository. Thank you all for comments and suggestions. Some comment lines needed(pointed out by Mitch) are not included yet. I found some mistakes in CPG table of SH-3 in time.c, so I'll submit a patch which corrects them with comments later. -- YAEGASHI Takeshi <yae...@ma...> |
|
From: NIIBE Y. <gn...@ch...> - 2000-06-10 03:09:58
|
Stuart, Takeshi, and Toshiharu, could you please update your changes and commit them to the CVS repository. I think that I'll send the patch against the standard kernel next week. -- |
|
From: <mj...@al...> - 2000-06-09 19:13:15
|
Hello, Tonight I fixed the "binutils" module in CVS to be (nearly) that of binutils-000218 plus Niibe-san's patch. In theory it should now be possible to use this version for your everyday use. My apologies for the delay. I've not had the time to attend to this earlier. Could people test it please? If you've already checked out binutils, you can refresh your checkout by doing a "cd" into the binutils directory, then running "cvs up -P -d". If people would like me to put a fresh CVS snapshot on sourceforge, please let me know. If you have any questions or experience problems, please send them to this list. Regards, Mitch. http://www.alphalink.com.au/ |
|
From: NIIBE Y. <gn...@ch...> - 2000-06-08 09:30:21
|
ptrace does not work yet. We need following patch. But still GDB not worked.
--------------------------
2000-06-08 NIIBE Yutaka <gn...@m1...>
* arch/sh/kernel/ptrace.c (sys_ptrace): Bug fix. Change the
last argument of access_process_vm.
(ubc_set_tracing): Handle SH7709's UBC. I don't know it's right.
I see SH7729 manual.
Index: arch/sh/kernel/ptrace.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/ptrace.c,v
retrieving revision 1.5
diff -u -r1.5 ptrace.c
--- arch/sh/kernel/ptrace.c 2000/05/09 01:42:21 1.5
+++ arch/sh/kernel/ptrace.c 2000/06/08 09:21:46
@@ -10,6 +10,7 @@
*
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/mm.h>
@@ -121,13 +122,21 @@
{
ctrl_outl(nextpc1, UBC_BARA);
ctrl_outb(asid, UBC_BASRA);
+#if defined(CONFIG_CPU_SUBTYPE_SH7709)
+ ctrl_outl(0x0fff, UBC_BAMRA);
+#else
ctrl_outb(BAMR_12, UBC_BAMRA);
+#endif
ctrl_outw(BBR_INST | BBR_READ, UBC_BBRA);
if (nextpc2 != (unsigned long) -1) {
ctrl_outl(nextpc2, UBC_BARB);
ctrl_outb(asid, UBC_BASRB);
+#if defined(CONFIG_CPU_SUBTYPE_SH7709)
+ ctrl_outl(0x0fff, UBC_BAMRA);
+#else
ctrl_outb(BAMR_12, UBC_BAMRB);
+#endif
ctrl_outw(BBR_INST | BBR_READ, UBC_BBRB);
}
ctrl_outw(BRCR_PCBA | BRCR_PCBB, UBC_BRCR);
@@ -322,7 +331,7 @@
/* Compute next pc. */
pc = get_stack_long(child, (long)&dummy->pc);
regs = (struct pt_regs *)((unsigned long)child + THREAD_SIZE - sizeof(struct pt_regs));
- if (access_process_vm(child, pc&~3, &tmp, sizeof(tmp), 1) != sizeof(data))
+ if (access_process_vm(child, pc&~3, &tmp, sizeof(tmp), 0) != sizeof(tmp))
break;
#ifdef __LITTLE_ENDIAN__
|
|
From: kaz K. <kk...@rr...> - 2000-06-08 00:44:20
|
Toshiharu Nozawa wrote: > I had the same troubles, too. I memorize it that the cause was > endian conversion of MRSHPC. meaning of SWAP flag on manual was > contrary. My enabler is used with some software, then seems to > work well all. but, Because it become the cause of confusion, > I intend to revise it. Ah! I see. Thank you for the clarification. kaz |
|
From: Toshiharu N. <no...@kt...> - 2000-06-07 14:33:15
|
kaz Kojima wrote: > I can't say it's wrong. But I've troubled with this bus sizing > in porting pcmcia-cs, though I forgot its detail. This is the > reason why I used the word defensive. I had the same troubles, too. I memorize it that the cause was endian conversion of MRSHPC. meaning of SWAP flag on manual was contrary. My enabler is used with some software, then seems to work well all. but, Because it become the cause of confusion, I intend to revise it. Thnaks kaz |
|
From: kaz K. <kk...@rr...> - 2000-06-07 10:58:42
|
Toshiharu Nozawa writes: > According to the manual of MRSHPC, there was resize to PCMCIA bus. > On this account byte/word space every 256KByte thinks that > there is not semantics. > Then, I have decided to do every access to real-word space. > Is this wrong? (However, this is the cause of confusion.) I can't say it's wrong. But I've troubled with this bus sizing in porting pcmcia-cs, though I forgot its detail. This is the reason why I used the word defensive. kaz |
|
From: Toshiharu N. <no...@hi...> - 2000-06-07 10:17:43
|
Thank you for an opinion. I confirmed whether other Solution Engine worked. Solution Engine of SH3(09A) worked. but, it will work only with my boot environment. there was still a lot of problems. kaz Kojima wrote: > causes problem by the magic number 0x3000. It's not bad to initialize > sh_pcic_io_start and sh_pcic_io_stop but they will cheaged by PCMCIA > driver like pcmcia-cs. Nozawa-san, you can't handle these variable > as constants. OK. I understand. Probably, I thought so. I will revise this. > > It seems that your comments above means we need this "0x400000" for > > byte access of "read" (in). Is there any reason why we don't need > > this "0x40000" for "write" (out)? > > This chip is odd enough. These four 256KB spaces are exactly same in > write access. According to the manual of MRSHPC, there was resize to PCMCIA bus. On this account byte/word space every 256KByte thinks that there is not semantics. Then, I have decided to do every access to real-word space. Is this wrong? (However, this is the cause of confusion.) -- |
|
From: NIIBE Y. <gn...@ch...> - 2000-06-07 09:53:14
|
OK. I'll leave the changes of io_se.c to confirm the intention of
changes. At this stage, it seems for me that setting sh_pcic_XXX
variables would be better placed in cf-enabler.c.
Since he doesn't have CVS access, I'll commit following changes.
2000-06-07 Toshiharu Nozawa <no...@hi...>
Compact Flash Support for SolutionEngine.
* arch/sh/kernel/cf-enabler.c (cf_init): Implemented for
SolutionEngine.
* include/asm-sh/hitachi_se.h (PA_MRSHPC_*, MRSHPC_*): Added.
* arch/sh/config.in: SolutionEngine may use enabler.
2000-06-02 NIIBE Yutaka <gn...@m1...>
* arch/sh/kernel/entry.S (Throughout): Use ".align 2" instead
Index: arch/sh/config.in
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/config.in,v
retrieving revision 1.5
diff -u -r1.5 config.in
--- arch/sh/config.in 2000/05/04 06:32:44 1.5
+++ arch/sh/config.in 2000/06/07 09:41:53
@@ -61,8 +61,8 @@
bool 'Networking support' CONFIG_NET
-if [ "$CONFIG_SH_SOLUTION_ENGINE" != "y" ]; then
- bool 'Directly Connected Compact Flash support' CONFIG_CF_ENABLER
+if [ "$CONFIG_SH_GENERIC" = "y" -o "$CONFIG_SH_SOLUTION_ENGINE" = "y" ]; then
+ bool 'Compact Flash Enabler support' CONFIG_CF_ENABLER
fi
bool 'PCI support' CONFIG_PCI
Index: arch/sh/kernel/cf-enabler.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/cf-enabler.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 cf-enabler.c
--- arch/sh/kernel/cf-enabler.c 2000/04/14 16:49:01 1.1.1.1
+++ arch/sh/kernel/cf-enabler.c 2000/06/07 09:41:53
@@ -3,17 +3,79 @@
* linux/drivers/block/cf-enabler.c
*
* Copyright (C) 1999 Niibe Yutaka
+ * Copyright (C) 2000 Toshiharu Nozawa
*
* Enable the CF configuration.
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <asm/io.h>
#include <asm/irq.h>
+#ifdef CONFIG_SH_SOLUTION_ENGINE
+#include <asm/hitachi_se.h>
+/*
+ * 0xB8400000 : Common Memory
+ * 0xB8500000 : Attribute
+ * 0xB8600000 : I/O
+ */
+
+int __init cf_init(void)
+{
+ if ((ctrl_inw(MRSHPC_CSR) & 0x000c) != 0)
+ return 0; /* Not detected */
+
+ if ((ctrl_inw(MRSHPC_CSR) & 0x0080) == 0) {
+ ctrl_outw(0x0674, MRSHPC_CPWCR); /* Card Vcc is 3.3v? */
+ } else {
+ ctrl_outw(0x0678, MRSHPC_CPWCR); /* Card Vcc is 5V */
+ }
+
+ /*
+ * PC-Card window open
+ * flag == COMMON/ATTRIBUTE/IO
+ */
+ /* common window open */
+ ctrl_outw(0x8a84, MRSHPC_MW0CR1);/* window 0xb8400000 */
+ if((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
+ /* common mode & bus width 16bit SWAP = 1*/
+ ctrl_outw(0x0b00, MRSHPC_MW0CR2);
+ else
+ /* common mode & bus width 16bit SWAP = 0*/
+ ctrl_outw(0x0300, MRSHPC_MW0CR2);
+
+ /* attribute window open */
+ ctrl_outw(0x8a85, MRSHPC_MW1CR1);/* window 0xb8500000 */
+ if ((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
+ /* attribute mode & bus width 16bit SWAP = 1*/
+ ctrl_outw(0x0a00, MRSHPC_MW1CR2);
+ else
+ /* attribute mode & bus width 16bit SWAP = 0*/
+ ctrl_outw(0x0200, MRSHPC_MW1CR2);
+
+ /* I/O window open */
+ ctrl_outw(0x8a86, MRSHPC_IOWCR1);/* I/O window 0xb8600000 */
+ ctrl_outw(0x0008, MRSHPC_CDCR); /* I/O card mode */
+ if ((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
+ ctrl_outw(0x0a00, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 1*/
+ else
+ ctrl_outw(0x0200, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 0*/
+
+ ctrl_outw(0x2000, MRSHPC_ICR);
+ ctrl_outb(0x00, PA_MRSHPC_MW2 + 0x206);
+ ctrl_outb(0x42, PA_MRSHPC_MW2 + 0x200);
+ return 0;
+}
+#else /* then generic system type */
#define CF_CIS_BASE 0xb8000000
/*
+ * You can connect Compact Flash directly to the bus of SuperH.
+ * This is the enabler for that.
+ */
+
+/*
* 0xB8000000 : Attribute
* 0xB8001000 : Common Memory
* 0xBA000000 : I/O
@@ -21,10 +83,12 @@
int __init cf_init(void)
{
+ /* Enable the card, and set the level interrupt */
outw(0x0042, CF_CIS_BASE+0x0200);
make_imask_irq(14);
disable_irq(14);
return 0;
}
+#endif
__initcall (cf_init);
Index: arch/sh/kernel/io_se.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/io_se.c,v
retrieving revision 1.4
diff -u -r1.4 io_se.c
--- arch/sh/kernel/io_se.c 2000/05/07 23:31:58 1.4
+++ arch/sh/kernel/io_se.c 2000/06/07 09:41:53
@@ -7,7 +7,6 @@
* I/O routine for Hitachi SolutionEngine.
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
Index: arch/sh/kernel/irq.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/irq.c,v
retrieving revision 1.8
diff -u -r1.8 irq.c
--- arch/sh/kernel/irq.c 2000/05/14 08:41:25 1.8
+++ arch/sh/kernel/irq.c 2000/06/07 09:41:54
@@ -13,6 +13,7 @@
* Naturally it's not a 1:1 relation, but there are similarities.
*/
+#include <linux/config.h>
#include <linux/ptrace.h>
#include <linux/errno.h>
#include <linux/kernel_stat.h>
Index: include/asm-sh/hitachi_se.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/hitachi_se.h,v
retrieving revision 1.2
diff -u -r1.2 hitachi_se.h
--- include/asm-sh/hitachi_se.h 2000/05/09 00:14:00 1.2
+++ include/asm-sh/hitachi_se.h 2000/06/07 09:42:00
@@ -39,6 +39,22 @@
#define PA_BCR 0xb1400000 /* FPGA */
#define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controler */
+#define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */
+#define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */
+#define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */
+#define MRSHPC_OPTION (PA_MRSHPC + 6)
+#define MRSHPC_CSR (PA_MRSHPC + 8)
+#define MRSHPC_ISR (PA_MRSHPC + 10)
+#define MRSHPC_ICR (PA_MRSHPC + 12)
+#define MRSHPC_CPWCR (PA_MRSHPC + 14)
+#define MRSHPC_MW0CR1 (PA_MRSHPC + 16)
+#define MRSHPC_MW1CR1 (PA_MRSHPC + 18)
+#define MRSHPC_IOWCR1 (PA_MRSHPC + 20)
+#define MRSHPC_MW0CR2 (PA_MRSHPC + 22)
+#define MRSHPC_MW1CR2 (PA_MRSHPC + 24)
+#define MRSHPC_IOWCR2 (PA_MRSHPC + 26)
+#define MRSHPC_CDCR (PA_MRSHPC + 28)
+#define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
#define BCR_ILCRA (PA_BCR + 0)
#define BCR_ILCRB (PA_BCR + 2)
|
|
From: kaz K. <kk...@rr...> - 2000-06-07 08:58:53
|
NIIBE Yutaka writes:
> Let's clarify things.
>
> #1:
> Is this correct?
>
> > /* SH pcmcia io window base, start and end. */
> > -int sh_pcic_io_wbase = 0xb8400000;
> > -int sh_pcic_io_start;
> > -int sh_pcic_io_stop;
> > +int sh_pcic_io_wbase = 0xb8600000;
> > +int sh_pcic_io_start = 0x3000;
> > +int sh_pcic_io_stop = 0x3fff;
>
> Specifically, io_wbase has been changed. Does not cause any problem?
The windows of MR-SHPC can be mapped every 1MB-aligned position
in area 6 (0xb8000000-0xbc000000). I'm not sure why Nozawa-san makes
this change, but anyway, it doesn't cause any problem.
I missed one point. Perhaps
> port2adr(unsigned int port)
> {
>- if (port >= 0x2000)
>+ if (port >= 0x3000)
>+ return (volatile __u16 *) (PA_MRSHPC_IO + (port - 0x3000));
causes problem by the magic number 0x3000. It's not bad to initialize
sh_pcic_io_start and sh_pcic_io_stop but they will cheaged by PCMCIA
driver like pcmcia-cs. Nozawa-san, you can't handle these variable
as constants.
> #2:
> > unsigned long inb(unsigned int port)
> > {
> > if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
> >- return *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port);
> >+ return *(__u8 *) port2adr(port);
> > else if (shifted_port(port))
>
> It seems that your comments above means we need this "0x400000" for
> byte access of "read" (in). Is there any reason why we don't need
> this "0x40000" for "write" (out)?
This chip is odd enough. These four 256KB spaces are exactly same in
write access.
kaz
|
|
From: NIIBE Y. <gn...@ch...> - 2000-06-07 08:25:28
|
kaz Kojima writes:
> MR-SHPC-01 chip has 1MB window which is constructed as the set of
> four 256KB spaces. First 256KB space is "real word" space and the
> second is "real byte" space. So the above change makes byte input
> from the "real word" space. It seems not good in the i/o window
> case since the access to this area has 16-bit sizing which will
> cause problems on some PCMCIA cards. Of course, it might not cause
> any problem on CF(ATA) cards, but I'd like to be defensive for such
> chip :-)
Let's clarify things.
#1:
Is this correct?
> /* SH pcmcia io window base, start and end. */
> -int sh_pcic_io_wbase = 0xb8400000;
> -int sh_pcic_io_start;
> -int sh_pcic_io_stop;
> +int sh_pcic_io_wbase = 0xb8600000;
> +int sh_pcic_io_start = 0x3000;
> +int sh_pcic_io_stop = 0x3fff;
Specifically, io_wbase has been changed. Does not cause any problem?
#2:
> unsigned long inb(unsigned int port)
> {
> if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
>- return *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port);
>+ return *(__u8 *) port2adr(port);
> else if (shifted_port(port))
It seems that your comments above means we need this "0x400000" for
byte access of "read" (in). Is there any reason why we don't need
this "0x40000" for "write" (out)?
--
|
|
From: kaz K. <kk...@rr...> - 2000-06-07 08:17:12
|
NIIBE Yutaka wrote:
>> --- linux-2.4.0-test1/arch/sh/kernel/io_se.c Mon May 22 12:55:06 2000
>> +++ linux-sh/arch/sh/kernel/io_se.c Wed Jun 7 12:55:33 2000
>
> I'd like to listen comment from Kaz. It seems there's some conflict
> on usage of sh_pcic_XXX semantics.
I think all changes by Nozawa-san are fine except
> unsigned long inb(unsigned int port)
> {
> if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
>- return *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port);
>+ return *(__u8 *) port2adr(port);
> else if (shifted_port(port))
MR-SHPC-01 chip has 1MB window which is constructed as the set of
four 256KB spaces. First 256KB space is "real word" space and the
second is "real byte" space. So the above change makes byte input
from the "real word" space. It seems not good in the i/o window
case since the access to this area has 16-bit sizing which will
cause problems on some PCMCIA cards. Of course, it might not cause
any problem on CF(ATA) cards, but I'd like to be defensive for such
chip :-)
kaz
|
|
From: NIIBE Y. <gn...@ch...> - 2000-06-07 07:19:17
|
Toshiharu Nozawa wrote: > I made enabler of the ATA card which I used the PC card > slot on Solution Engine for. Nice work. Questions: (1) Does it work on other SolutionEngin(s)? SH7709? SH7709A? Here's comments. > --- linux-2.4.0-test1/arch/sh/config.in Sun May 21 04:05:29 2000 > +++ linux-sh/arch/sh/config.in Wed Jun 7 01:13:01 2000 > @@ -61,9 +61,9 @@ > > bool 'Networking support' CONFIG_NET > > -if [ "$CONFIG_SH_SOLUTION_ENGINE" != "y" ]; then > +#if [ "$CONFIG_SH_SOLUTION_ENGINE" != "y" ]; then > bool 'Directly Connected Compact Flash support' CONFIG_CF_ENABLER > -fi > +#fi > > bool 'PCI support' CONFIG_PCI > if [ "$CONFIG_PCI" = "y" ]; then We should change the explanation. For solution engine, it's nof "Directly Connected Compact Flash Support". I'd just use: "Compact Flash Enabler". > --- linux-2.4.0-test1/arch/sh/kernel/cf-enabler.c Mon Mar 6 02:33:55 > 2000 > +++ linux-sh/arch/sh/kernel/cf-enabler.c Wed Jun 7 12:22:14 2000 Will applied. > --- linux-2.4.0-test1/include/asm-sh/hitachi_se.h Sun May 21 04:05:30 > 2000 > +++ linux-sh/include/asm-sh/hitachi_se.h Wed Jun 7 12:11:43 2000 Ditto. These two are no problem. For the changes of following file: > --- linux-2.4.0-test1/arch/sh/kernel/io_se.c Mon May 22 12:55:06 2000 > +++ linux-sh/arch/sh/kernel/io_se.c Wed Jun 7 12:55:33 2000 I'd like to listen comment from Kaz. It seems there's some conflict on usage of sh_pcic_XXX semantics. -- |
|
From: Toshiharu N. <no...@hi...> - 2000-06-07 06:47:06
|
I made enabler of the ATA card which I used the PC card
slot on Solution Engine for.
IDE through SuperI/O becomes a storage usable immediately
when I select Solution Engine in Sytem type.
However, I was able to use an ATA card as a storage
because it was not the person who had extension connector.
It works with Solution Engine of SH4.
I want please to hear an opinion of all.
diff -ruN linux-2.4.0-test1/arch/sh/config.in linux-sh/arch/sh/config.in
--- linux-2.4.0-test1/arch/sh/config.in Sun May 21 04:05:29 2000
+++ linux-sh/arch/sh/config.in Wed Jun 7 01:13:01 2000
@@ -61,9 +61,9 @@
bool 'Networking support' CONFIG_NET
-if [ "$CONFIG_SH_SOLUTION_ENGINE" != "y" ]; then
+#if [ "$CONFIG_SH_SOLUTION_ENGINE" != "y" ]; then
bool 'Directly Connected Compact Flash support' CONFIG_CF_ENABLER
-fi
+#fi
bool 'PCI support' CONFIG_PCI
if [ "$CONFIG_PCI" = "y" ]; then
diff -ruN linux-2.4.0-test1/arch/sh/kernel/cf-enabler.c
linux-sh/arch/sh/kernel/cf-enabler.c
--- linux-2.4.0-test1/arch/sh/kernel/cf-enabler.c Mon Mar 6 02:33:55
2000
+++ linux-sh/arch/sh/kernel/cf-enabler.c Wed Jun 7 12:22:14 2000
@@ -12,13 +12,62 @@
#include <asm/io.h>
#include <asm/irq.h>
+#ifdef CONFIG_SH_SOLUTION_ENGINE
+#include <asm/hitachi_se.h>
+/*
+ * 0xB8400000 : Common Memory
+ * 0xB8500000 : Attribute
+ * 0xB8600000 : I/O
+ */
+int __init cf_init(void)
+{
+ if((ctrl_inw(MRSHPC_CSR) & 0x000c) == 0){/* if card detect is true */
+ if((ctrl_inw(MRSHPC_CSR) & 0x0080) == 0){
+ ctrl_outw(0x0674, MRSHPC_CPWCR);/* Card Vcc is 3.3v? */
+ }
+ else{
+ ctrl_outw(0x0678, MRSHPC_CPWCR);/* Card Vcc is 5V */
+ }
+ /*wait(10000);*//* 10ms wait */
+ }
+ else{
+ return 0;
+ }
+/*
+ PC-Card window open
+ flag == COMMON/ATTRIBUTE/IO
+*/
+ /* common window open */
+ ctrl_outw(0x8a84, MRSHPC_MW0CR1);/* window 0xb8400000 */
+ if((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
+ ctrl_outw(0x0b00, MRSHPC_MW0CR2);/* common mode & bus width 16bit
SWAP = 1*/
+ else
+ ctrl_outw(0x0300, MRSHPC_MW0CR2);/* common mode & bus width 16bit
SWAP = 0*/
+ /* attribute window open */
+ ctrl_outw(0x8a85, MRSHPC_MW1CR1);/* window 0xb8500000 */
+ if((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
+ ctrl_outw(0x0a00, MRSHPC_MW1CR2);/* attribute mode & bus width 16bit
SWAP = 1*/
+ else
+ ctrl_outw(0x0200, MRSHPC_MW1CR2);/* attribute mode & bus width 16bit
SWAP = 0*/
+ /* I/O window open */
+ ctrl_outw(0x8a86, MRSHPC_IOWCR1);/* I/O window 0xb8600000 */
+ ctrl_outw(0x0008, MRSHPC_CDCR); /* I/O card mode */
+ if((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0)
+ ctrl_outw(0x0a00, MRSHPC_IOWCR2);/* bus width 16bit SWAP = 1*/
+ else
+ ctrl_outw(0x0200, MRSHPC_IOWCR2);/* bus width 16bit SWAP = 0*/
+ ctrl_outw(0x2000, MRSHPC_ICR);
+ ctrl_outb(0x00, PA_MRSHPC_MW2 + 0x206);
+ ctrl_outb(0x42, PA_MRSHPC_MW2 + 0x200);
+ return 0;
+}
+#else /* then generic system type */
#define CF_CIS_BASE 0xb8000000
/*
* 0xB8000000 : Attribute
* 0xB8001000 : Common Memory
* 0xBA000000 : I/O
*/
-
int __init cf_init(void)
{
outw(0x0042, CF_CIS_BASE+0x0200);
@@ -26,5 +75,5 @@
disable_irq(14);
return 0;
}
-
+#endif
__initcall (cf_init);
diff -ruN linux-2.4.0-test1/arch/sh/kernel/io_se.c
linux-sh/arch/sh/kernel/io_se.c
--- linux-2.4.0-test1/arch/sh/kernel/io_se.c Mon May 22 12:55:06 2000
+++ linux-sh/arch/sh/kernel/io_se.c Wed Jun 7 12:55:33 2000
@@ -13,15 +13,16 @@
#include <asm/hitachi_se.h>
/* SH pcmcia io window base, start and end. */
-int sh_pcic_io_wbase = 0xb8400000;
-int sh_pcic_io_start;
-int sh_pcic_io_stop;
+int sh_pcic_io_wbase = 0xb8600000;
+int sh_pcic_io_start = 0x3000;
+int sh_pcic_io_stop = 0x3fff;
int sh_pcic_io_type;
int sh_pcic_io_dummy;
static inline void delay(void)
{
ctrl_inw(0xa0000000);
+ ctrl_inw(0xa0000000);
}
/* MS7750 requires special versions of in*, out* routines, since
@@ -31,12 +32,12 @@
static inline volatile __u16 *
port2adr(unsigned int port)
{
- if (port >= 0x2000)
+ if (port >= 0x3000)
+ return (volatile __u16 *) (PA_MRSHPC_IO + (port - 0x3000));
+ else if (port >= 0x2000)
return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
else if (port >= 0x1000)
return (volatile __u16 *) (PA_83902 + (port << 1));
- else if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
- return (volatile __u16 *) (sh_pcic_io_wbase + (port &~ 1));
else
return (volatile __u16 *) (PA_SUPERIO + (port << 1));
}
@@ -58,9 +59,9 @@
unsigned long inb(unsigned int port)
{
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
- return *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port);
+ return *(__u8 *) port2adr(port);
else if (shifted_port(port))
- return (*port2adr(port) >> 8);
+ return (*port2adr(port) >> 8)&0xff;
else
return (*port2adr(port))&0xff;
}
@@ -70,9 +71,9 @@
unsigned long v;
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
- v = *(__u8 *) (sh_pcic_io_wbase + 0x40000 + port);
+ v = *(__u8 *) port2adr(port);
else if (shifted_port(port))
- v = (*port2adr(port) >> 8);
+ v = (*port2adr(port) >> 8)&0xff;
else
v = (*port2adr(port))&0xff;
delay();
@@ -98,7 +99,7 @@
void outb(unsigned long value, unsigned int port)
{
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
- *(__u8 *)(sh_pcic_io_wbase + port) = value;
+ *(__u8 *)port2adr(port) = (__u8)value;
else if (shifted_port(port))
*(port2adr(port)) = value << 8;
else
@@ -108,7 +109,7 @@
void outb_p(unsigned long value, unsigned int port)
{
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop)
- *(__u8 *)(sh_pcic_io_wbase + port) = value;
+ *(__u8 *)port2adr(port) = (__u8)value;
else if (shifted_port(port))
*(port2adr(port)) = value << 8;
else
@@ -135,14 +136,14 @@
volatile __u16 *p = port2adr(port);
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) {
- volatile __u8 *bp = (__u8 *) (sh_pcic_io_wbase + 0x40000 + port);
+ volatile __u8 *bp = (__u8 *) port2adr(port);
while (count--)
*((__u8 *) addr)++ = *bp;
} else if (shifted_port(port)) {
- while (count--)
- *((__u8 *) addr)++ = *p >> 8;
+ while (count--)
+ *((__u8 *) addr)++ = (*p >> 8)&0xff;
} else {
- while (count--)
+ while (count--)
*((__u8 *) addr)++ = *p;
}
}
@@ -164,14 +165,14 @@
volatile __u16 *p = port2adr(port);
if (sh_pcic_io_start <= port && port <= sh_pcic_io_stop) {
- volatile __u8 *bp = (__u8 *) (sh_pcic_io_wbase + port);
+ volatile __u8 *bp = (__u8 *) port2adr(port);
while (count--)
*bp = *((__u8 *) addr)++;
} else if (shifted_port(port)) {
- while (count--)
+ while (count--)
*p = *((__u8 *) addr)++ << 8;
} else {
- while (count--)
+ while (count--)
*p = *((__u8 *) addr)++;
}
}
@@ -187,7 +188,7 @@
{
maybebadio(outsw, port);
}
-
+
/* Map ISA bus address to the real address. Only for PCMCIA. */
/* ISA page descriptor. */
diff -ruN linux-2.4.0-test1/include/asm-sh/hitachi_se.h
linux-sh/include/asm-sh/hitachi_se.h
--- linux-2.4.0-test1/include/asm-sh/hitachi_se.h Sun May 21 04:05:30
2000
+++ linux-sh/include/asm-sh/hitachi_se.h Wed Jun 7 12:11:43 2000
@@ -39,6 +39,22 @@
#define PA_BCR 0xb1400000 /* FPGA */
#define PA_MRSHPC 0xb83fffe0 /* MR-SHPC-01 PCMCIA controler */
+#define PA_MRSHPC_MW1 0xb8400000 /* MR-SHPC-01 memory window base */
+#define PA_MRSHPC_MW2 0xb8500000 /* MR-SHPC-01 attribute window base */
+#define PA_MRSHPC_IO 0xb8600000 /* MR-SHPC-01 I/O window base */
+#define MRSHPC_OPTION (PA_MRSHPC + 6)
+#define MRSHPC_CSR (PA_MRSHPC + 8)
+#define MRSHPC_ISR (PA_MRSHPC + 10)
+#define MRSHPC_ICR (PA_MRSHPC + 12)
+#define MRSHPC_CPWCR (PA_MRSHPC + 14)
+#define MRSHPC_MW0CR1 (PA_MRSHPC + 16)
+#define MRSHPC_MW1CR1 (PA_MRSHPC + 18)
+#define MRSHPC_IOWCR1 (PA_MRSHPC + 20)
+#define MRSHPC_MW0CR2 (PA_MRSHPC + 22)
+#define MRSHPC_MW1CR2 (PA_MRSHPC + 24)
+#define MRSHPC_IOWCR2 (PA_MRSHPC + 26)
+#define MRSHPC_CDCR (PA_MRSHPC + 28)
+#define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
#define BCR_ILCRA (PA_BCR + 0)
#define BCR_ILCRB (PA_BCR + 2)
--
// Toshiharu Nozawa <no...@hi...> //
// HITACHI ULSI Systems Application Engneering Dept.//
|
|
From: <mj...@al...> - 2000-06-07 02:50:17
|
Dear Takeshi, >I've made a small ramdisk image (2MB when gzip'ed) from >gNiibe's Chiyonofuji. I think it can be used as a simple >installer, like a boot floppy of major Linux distribution. A cut-down ramdisk image for people to try is a great idea, thanks. >BTW, I wish to put my HP600 specific codes into CVS. May I post >a patch to SF's Patch Manager or linuxsh-dev list? Both is a good idea. email lets people look and learn, while putting the patch on SourceForge lets people retrieve the patch without damage caused by over-eager mail software. If you put it into SF, you can include a link to the patch in your email (as well as the attached patch). Regards, Mitch. http://www.alphalink.com.au/ |
|
From: <mj...@al...> - 2000-06-07 02:47:22
|
Dear Takeshi, >Ok, here is the patch against linux-sh-2000-06-05.diff.gz from >m17n.org Boy, this is a lot of work. Congratulations. And I'm very glad to see it go into the CVS kernel. Especially the 64461 work! >+ Would anyone design and contribute our logo? :-> I believe Stuart Menefy had Tux in a hammock having a sleep (Shhh! Get it?). That would make a good logo. >- SolutionEngine CONFIG_SH_SOLUTION_ENGINE" Generic >+ SolutionEngine CONFIG_SH_SOLUTION_ENGINE \ >+ HP600 CONFIG_SH_HP600" Generic Is this support applicable to other models in the 600 series? Might "6x0" be an idea? Also, is there an entry in Configure.help for the new defines? linux/arch/sh/kernel/hd64461.c >--- linux-2.4.0-test1.orig/arch/sh/kernel/hd64461.c Thu Jan 1 09:00:00 1970 >+++ linux/arch/sh/kernel/hd64461.c Tue Jun 6 17:36:10 2000 >+static void __init setup_hd64461(void) >+{ >+ int i; >+ >+ printk(KERN_INFO "HD64461 at 0x%x on irq %d (%d - %d) Usually kernel messages like this come up because the device has been detected (cf being manually configured). I would suggest either the word "detected" or "configured" after the HD64461. Otherwise people might think the kernel is confirming through detection something that exists because it's been configured. >+++ linux/arch/sh/kernel/time.c Tue Jun 6 17:38:38 2000 >+#ifdef CONFIG_SH_HP600 >+ master_clock = cpu_clock/6; >+#else > master_clock = cpu_clock; >+#endif Where does the 6 come from? Suggest a comment here, or move it to a header file (with a comment). >+++ linux/drivers/char/scan_keyb.c Tue Jun 6 17:37:17 2000 > #if defined(CONFIG_CPU_SUBTYPE_SH7709) >+#ifdef CONFIG_SH_HP600 >+#define PCLK 22222222 >+#else > #define PCLK 33333333 >+#endif Suggest comments? >+ if [ "$CONFIG_HD64461" = "y" ]; then >+ tristate ' HD64461 Frame Buffer support' CONFIG_FB_HIT >+ fi Is there a description in Configure.help. >+++ linux/include/asm-sh/linux_logo.h Tue Jun 6 19:19:49 2000 >@@ -0,0 +1,48 @@ >+/* $Id: linux_logo.h,v 1.1 2000/03/24 04:03:16 keshi Exp $ >+ * include/asm-i386/linux_logo.h: This is a linux logo s/i386/sh/ >+#define linux_logo_banner "Linux/ia32 version " UTS_RELEASE s/ia32/SuperH/ Nice job! http://www.alphalink.com.au/ |
25 messages has been excluded from this view by a project administrator.
