2005-04-17 02:20:36 +04:00
/*
* Driver for NEC VR4100 series Serial Interface Unit .
*
2005-12-12 23:11:50 +03:00
* Copyright ( C ) 2004 - 2005 Yoichi Yuasa < yoichi_yuasa @ tripeaks . co . jp >
2005-04-17 02:20:36 +04:00
*
* Based on drivers / serial / 8250. c , by Russell King .
*
* This program is free software ; you can redistribute it and / or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation ; either version 2 of the License , or
* ( at your option ) any later version .
*
* This program is distributed in the hope that it will be useful ,
* but WITHOUT ANY WARRANTY ; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the
* GNU General Public License for more details .
*
* You should have received a copy of the GNU General Public License
* along with this program ; if not , write to the Free Software
* Foundation , Inc . , 59 Temple Place , Suite 330 , Boston , MA 02111 - 1307 USA
*/
# if defined(CONFIG_SERIAL_VR41XX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
# define SUPPORT_SYSRQ
# endif
# include <linux/console.h>
2005-10-29 22:07:23 +04:00
# include <linux/platform_device.h>
2005-04-17 02:20:36 +04:00
# include <linux/err.h>
# include <linux/ioport.h>
# include <linux/init.h>
# include <linux/interrupt.h>
# include <linux/module.h>
# include <linux/serial.h>
# include <linux/serial_core.h>
# include <linux/serial_reg.h>
# include <linux/tty.h>
# include <linux/tty_flip.h>
# include <asm/io.h>
2006-07-13 12:33:03 +04:00
# include <asm/vr41xx/irq.h>
2005-04-17 02:20:36 +04:00
# include <asm/vr41xx/siu.h>
# include <asm/vr41xx/vr41xx.h>
# define SIU_PORTS_MAX 2
# define SIU_BAUD_BASE 1152000
# define SIU_MAJOR 204
# define SIU_MINOR_BASE 82
# define RX_MAX_COUNT 256
# define TX_MAX_COUNT 15
# define SIUIRSEL 0x08
# define TMICMODE 0x20
# define TMICTX 0x10
# define IRMSEL 0x0c
# define IRMSEL_HP 0x08
# define IRMSEL_TEMIC 0x04
# define IRMSEL_SHARP 0x00
# define IRUSESEL 0x02
# define SIRSEL 0x01
struct siu_port {
unsigned int type ;
unsigned int irq ;
unsigned long start ;
} ;
static const struct siu_port siu_type1_ports [ ] = {
{ . type = PORT_VR41XX_SIU ,
. irq = SIU_IRQ ,
. start = 0x0c000000UL , } ,
} ;
# define SIU_TYPE1_NR_PORTS (sizeof(siu_type1_ports) / sizeof(struct siu_port))
static const struct siu_port siu_type2_ports [ ] = {
{ . type = PORT_VR41XX_SIU ,
. irq = SIU_IRQ ,
. start = 0x0f000800UL , } ,
{ . type = PORT_VR41XX_DSIU ,
. irq = DSIU_IRQ ,
. start = 0x0f000820UL , } ,
} ;
# define SIU_TYPE2_NR_PORTS (sizeof(siu_type2_ports) / sizeof(struct siu_port))
static struct uart_port siu_uart_ports [ SIU_PORTS_MAX ] ;
static uint8_t lsr_break_flag [ SIU_PORTS_MAX ] ;
# define siu_read(port, offset) readb((port)->membase + (offset))
# define siu_write(port, offset, value) writeb((value), (port)->membase + (offset))
void vr41xx_select_siu_interface ( siu_interface_t interface )
{
struct uart_port * port ;
unsigned long flags ;
uint8_t irsel ;
port = & siu_uart_ports [ 0 ] ;
spin_lock_irqsave ( & port - > lock , flags ) ;
irsel = siu_read ( port , SIUIRSEL ) ;
if ( interface = = SIU_INTERFACE_IRDA )
irsel | = SIRSEL ;
else
irsel & = ~ SIRSEL ;
siu_write ( port , SIUIRSEL , irsel ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
EXPORT_SYMBOL_GPL ( vr41xx_select_siu_interface ) ;
void vr41xx_use_irda ( irda_use_t use )
{
struct uart_port * port ;
unsigned long flags ;
uint8_t irsel ;
port = & siu_uart_ports [ 0 ] ;
spin_lock_irqsave ( & port - > lock , flags ) ;
irsel = siu_read ( port , SIUIRSEL ) ;
if ( use = = FIR_USE_IRDA )
irsel | = IRUSESEL ;
else
irsel & = ~ IRUSESEL ;
siu_write ( port , SIUIRSEL , irsel ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
EXPORT_SYMBOL_GPL ( vr41xx_use_irda ) ;
void vr41xx_select_irda_module ( irda_module_t module , irda_speed_t speed )
{
struct uart_port * port ;
unsigned long flags ;
uint8_t irsel ;
port = & siu_uart_ports [ 0 ] ;
spin_lock_irqsave ( & port - > lock , flags ) ;
irsel = siu_read ( port , SIUIRSEL ) ;
irsel & = ~ ( IRMSEL | TMICTX | TMICMODE ) ;
switch ( module ) {
case SHARP_IRDA :
irsel | = IRMSEL_SHARP ;
break ;
case TEMIC_IRDA :
irsel | = IRMSEL_TEMIC | TMICMODE ;
if ( speed = = IRDA_TX_4MBPS )
irsel | = TMICTX ;
break ;
case HP_IRDA :
irsel | = IRMSEL_HP ;
break ;
default :
break ;
}
siu_write ( port , SIUIRSEL , irsel ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
EXPORT_SYMBOL_GPL ( vr41xx_select_irda_module ) ;
static inline void siu_clear_fifo ( struct uart_port * port )
{
siu_write ( port , UART_FCR , UART_FCR_ENABLE_FIFO ) ;
siu_write ( port , UART_FCR , UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR |
UART_FCR_CLEAR_XMIT ) ;
siu_write ( port , UART_FCR , 0 ) ;
}
static inline int siu_probe_ports ( void )
{
switch ( current_cpu_data . cputype ) {
case CPU_VR4111 :
case CPU_VR4121 :
return SIU_TYPE1_NR_PORTS ;
case CPU_VR4122 :
case CPU_VR4131 :
case CPU_VR4133 :
return SIU_TYPE2_NR_PORTS ;
}
return 0 ;
}
static inline unsigned long siu_port_size ( struct uart_port * port )
{
switch ( port - > type ) {
case PORT_VR41XX_SIU :
return 11UL ;
case PORT_VR41XX_DSIU :
return 8UL ;
}
return 0 ;
}
static inline unsigned int siu_check_type ( struct uart_port * port )
{
switch ( current_cpu_data . cputype ) {
case CPU_VR4111 :
case CPU_VR4121 :
if ( port - > line = = 0 )
return PORT_VR41XX_SIU ;
break ;
case CPU_VR4122 :
case CPU_VR4131 :
case CPU_VR4133 :
if ( port - > line = = 0 )
return PORT_VR41XX_SIU ;
else if ( port - > line = = 1 )
return PORT_VR41XX_DSIU ;
break ;
}
return PORT_UNKNOWN ;
}
static inline const char * siu_type_name ( struct uart_port * port )
{
switch ( port - > type ) {
case PORT_VR41XX_SIU :
return " SIU " ;
case PORT_VR41XX_DSIU :
return " DSIU " ;
}
2005-06-05 02:43:34 +04:00
return NULL ;
2005-04-17 02:20:36 +04:00
}
static unsigned int siu_tx_empty ( struct uart_port * port )
{
uint8_t lsr ;
lsr = siu_read ( port , UART_LSR ) ;
if ( lsr & UART_LSR_TEMT )
return TIOCSER_TEMT ;
return 0 ;
}
static void siu_set_mctrl ( struct uart_port * port , unsigned int mctrl )
{
uint8_t mcr = 0 ;
if ( mctrl & TIOCM_DTR )
mcr | = UART_MCR_DTR ;
if ( mctrl & TIOCM_RTS )
mcr | = UART_MCR_RTS ;
if ( mctrl & TIOCM_OUT1 )
mcr | = UART_MCR_OUT1 ;
if ( mctrl & TIOCM_OUT2 )
mcr | = UART_MCR_OUT2 ;
if ( mctrl & TIOCM_LOOP )
mcr | = UART_MCR_LOOP ;
siu_write ( port , UART_MCR , mcr ) ;
}
static unsigned int siu_get_mctrl ( struct uart_port * port )
{
uint8_t msr ;
unsigned int mctrl = 0 ;
msr = siu_read ( port , UART_MSR ) ;
if ( msr & UART_MSR_DCD )
mctrl | = TIOCM_CAR ;
if ( msr & UART_MSR_RI )
mctrl | = TIOCM_RNG ;
if ( msr & UART_MSR_DSR )
mctrl | = TIOCM_DSR ;
if ( msr & UART_MSR_CTS )
mctrl | = TIOCM_CTS ;
return mctrl ;
}
2005-08-31 13:12:14 +04:00
static void siu_stop_tx ( struct uart_port * port )
2005-04-17 02:20:36 +04:00
{
unsigned long flags ;
uint8_t ier ;
spin_lock_irqsave ( & port - > lock , flags ) ;
ier = siu_read ( port , UART_IER ) ;
ier & = ~ UART_IER_THRI ;
siu_write ( port , UART_IER , ier ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
2005-08-31 13:12:14 +04:00
static void siu_start_tx ( struct uart_port * port )
2005-04-17 02:20:36 +04:00
{
unsigned long flags ;
uint8_t ier ;
spin_lock_irqsave ( & port - > lock , flags ) ;
ier = siu_read ( port , UART_IER ) ;
ier | = UART_IER_THRI ;
siu_write ( port , UART_IER , ier ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
static void siu_stop_rx ( struct uart_port * port )
{
unsigned long flags ;
uint8_t ier ;
spin_lock_irqsave ( & port - > lock , flags ) ;
ier = siu_read ( port , UART_IER ) ;
ier & = ~ UART_IER_RLSI ;
siu_write ( port , UART_IER , ier ) ;
port - > read_status_mask & = ~ UART_LSR_DR ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
static void siu_enable_ms ( struct uart_port * port )
{
unsigned long flags ;
uint8_t ier ;
spin_lock_irqsave ( & port - > lock , flags ) ;
ier = siu_read ( port , UART_IER ) ;
ier | = UART_IER_MSI ;
siu_write ( port , UART_IER , ier ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
static void siu_break_ctl ( struct uart_port * port , int ctl )
{
unsigned long flags ;
uint8_t lcr ;
spin_lock_irqsave ( & port - > lock , flags ) ;
lcr = siu_read ( port , UART_LCR ) ;
if ( ctl = = - 1 )
lcr | = UART_LCR_SBC ;
else
lcr & = ~ UART_LCR_SBC ;
siu_write ( port , UART_LCR , lcr ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
static inline void receive_chars ( struct uart_port * port , uint8_t * status )
2005-04-17 02:20:36 +04:00
{
struct tty_struct * tty ;
uint8_t lsr , ch ;
char flag ;
int max_count = RX_MAX_COUNT ;
tty = port - > info - > tty ;
lsr = * status ;
do {
ch = siu_read ( port , UART_RX ) ;
port - > icount . rx + + ;
flag = TTY_NORMAL ;
# ifdef CONFIG_SERIAL_VR41XX_CONSOLE
lsr | = lsr_break_flag [ port - > line ] ;
lsr_break_flag [ port - > line ] = 0 ;
# endif
if ( unlikely ( lsr & ( UART_LSR_BI | UART_LSR_FE |
UART_LSR_PE | UART_LSR_OE ) ) ) {
if ( lsr & UART_LSR_BI ) {
lsr & = ~ ( UART_LSR_FE | UART_LSR_PE ) ;
port - > icount . brk + + ;
if ( uart_handle_break ( port ) )
goto ignore_char ;
}
if ( lsr & UART_LSR_FE )
port - > icount . frame + + ;
if ( lsr & UART_LSR_PE )
port - > icount . parity + + ;
if ( lsr & UART_LSR_OE )
port - > icount . overrun + + ;
lsr & = port - > read_status_mask ;
if ( lsr & UART_LSR_BI )
flag = TTY_BREAK ;
if ( lsr & UART_LSR_FE )
flag = TTY_FRAME ;
if ( lsr & UART_LSR_PE )
flag = TTY_PARITY ;
}
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
if ( uart_handle_sysrq_char ( port , ch ) )
2005-04-17 02:20:36 +04:00
goto ignore_char ;
2005-05-10 02:21:59 +04:00
uart_insert_char ( port , lsr , UART_LSR_OE , ch , flag ) ;
2005-04-17 02:20:36 +04:00
ignore_char :
lsr = siu_read ( port , UART_LSR ) ;
} while ( ( lsr & UART_LSR_DR ) & & ( max_count - - > 0 ) ) ;
tty_flip_buffer_push ( tty ) ;
* status = lsr ;
}
static inline void check_modem_status ( struct uart_port * port )
{
uint8_t msr ;
msr = siu_read ( port , UART_MSR ) ;
if ( ( msr & UART_MSR_ANY_DELTA ) = = 0 )
return ;
if ( msr & UART_MSR_DDCD )
uart_handle_dcd_change ( port , msr & UART_MSR_DCD ) ;
if ( msr & UART_MSR_TERI )
port - > icount . rng + + ;
if ( msr & UART_MSR_DDSR )
port - > icount . dsr + + ;
if ( msr & UART_MSR_DCTS )
uart_handle_cts_change ( port , msr & UART_MSR_CTS ) ;
wake_up_interruptible ( & port - > info - > delta_msr_wait ) ;
}
static inline void transmit_chars ( struct uart_port * port )
{
struct circ_buf * xmit ;
int max_count = TX_MAX_COUNT ;
xmit = & port - > info - > xmit ;
if ( port - > x_char ) {
siu_write ( port , UART_TX , port - > x_char ) ;
port - > icount . tx + + ;
port - > x_char = 0 ;
return ;
}
if ( uart_circ_empty ( xmit ) | | uart_tx_stopped ( port ) ) {
2005-08-31 13:12:14 +04:00
siu_stop_tx ( port ) ;
2005-04-17 02:20:36 +04:00
return ;
}
do {
siu_write ( port , UART_TX , xmit - > buf [ xmit - > tail ] ) ;
xmit - > tail = ( xmit - > tail + 1 ) & ( UART_XMIT_SIZE - 1 ) ;
port - > icount . tx + + ;
if ( uart_circ_empty ( xmit ) )
break ;
} while ( max_count - - > 0 ) ;
if ( uart_circ_chars_pending ( xmit ) < WAKEUP_CHARS )
uart_write_wakeup ( port ) ;
if ( uart_circ_empty ( xmit ) )
2005-08-31 13:12:14 +04:00
siu_stop_tx ( port ) ;
2005-04-17 02:20:36 +04:00
}
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
static irqreturn_t siu_interrupt ( int irq , void * dev_id )
2005-04-17 02:20:36 +04:00
{
struct uart_port * port ;
uint8_t iir , lsr ;
port = ( struct uart_port * ) dev_id ;
iir = siu_read ( port , UART_IIR ) ;
if ( iir & UART_IIR_NO_INT )
return IRQ_NONE ;
lsr = siu_read ( port , UART_LSR ) ;
if ( lsr & UART_LSR_DR )
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 17:55:46 +04:00
receive_chars ( port , & lsr ) ;
2005-04-17 02:20:36 +04:00
check_modem_status ( port ) ;
if ( lsr & UART_LSR_THRE )
transmit_chars ( port ) ;
return IRQ_HANDLED ;
}
static int siu_startup ( struct uart_port * port )
{
int retval ;
2005-06-05 02:43:34 +04:00
if ( port - > membase = = NULL )
return - ENODEV ;
2005-04-17 02:20:36 +04:00
siu_clear_fifo ( port ) ;
( void ) siu_read ( port , UART_LSR ) ;
( void ) siu_read ( port , UART_RX ) ;
( void ) siu_read ( port , UART_IIR ) ;
( void ) siu_read ( port , UART_MSR ) ;
if ( siu_read ( port , UART_LSR ) = = 0xff )
return - ENODEV ;
retval = request_irq ( port - > irq , siu_interrupt , 0 , siu_type_name ( port ) , port ) ;
if ( retval )
return retval ;
if ( port - > type = = PORT_VR41XX_DSIU )
vr41xx_enable_dsiuint ( DSIUINT_ALL ) ;
siu_write ( port , UART_LCR , UART_LCR_WLEN8 ) ;
spin_lock_irq ( & port - > lock ) ;
siu_set_mctrl ( port , port - > mctrl ) ;
spin_unlock_irq ( & port - > lock ) ;
siu_write ( port , UART_IER , UART_IER_RLSI | UART_IER_RDI ) ;
( void ) siu_read ( port , UART_LSR ) ;
( void ) siu_read ( port , UART_RX ) ;
( void ) siu_read ( port , UART_IIR ) ;
( void ) siu_read ( port , UART_MSR ) ;
return 0 ;
}
static void siu_shutdown ( struct uart_port * port )
{
unsigned long flags ;
uint8_t lcr ;
siu_write ( port , UART_IER , 0 ) ;
spin_lock_irqsave ( & port - > lock , flags ) ;
port - > mctrl & = ~ TIOCM_OUT2 ;
siu_set_mctrl ( port , port - > mctrl ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
lcr = siu_read ( port , UART_LCR ) ;
lcr & = ~ UART_LCR_SBC ;
siu_write ( port , UART_LCR , lcr ) ;
siu_clear_fifo ( port ) ;
( void ) siu_read ( port , UART_RX ) ;
if ( port - > type = = PORT_VR41XX_DSIU )
vr41xx_disable_dsiuint ( DSIUINT_ALL ) ;
free_irq ( port - > irq , port ) ;
}
static void siu_set_termios ( struct uart_port * port , struct termios * new ,
struct termios * old )
{
tcflag_t c_cflag , c_iflag ;
uint8_t lcr , fcr , ier ;
unsigned int baud , quot ;
unsigned long flags ;
c_cflag = new - > c_cflag ;
switch ( c_cflag & CSIZE ) {
case CS5 :
lcr = UART_LCR_WLEN5 ;
break ;
case CS6 :
lcr = UART_LCR_WLEN6 ;
break ;
case CS7 :
lcr = UART_LCR_WLEN7 ;
break ;
default :
lcr = UART_LCR_WLEN8 ;
break ;
}
if ( c_cflag & CSTOPB )
lcr | = UART_LCR_STOP ;
if ( c_cflag & PARENB )
lcr | = UART_LCR_PARITY ;
if ( ( c_cflag & PARODD ) ! = PARODD )
lcr | = UART_LCR_EPAR ;
if ( c_cflag & CMSPAR )
lcr | = UART_LCR_SPAR ;
baud = uart_get_baud_rate ( port , new , old , 0 , port - > uartclk / 16 ) ;
quot = uart_get_divisor ( port , baud ) ;
fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 ;
spin_lock_irqsave ( & port - > lock , flags ) ;
uart_update_timeout ( port , c_cflag , baud ) ;
c_iflag = new - > c_iflag ;
port - > read_status_mask = UART_LSR_THRE | UART_LSR_OE | UART_LSR_DR ;
if ( c_iflag & INPCK )
port - > read_status_mask | = UART_LSR_FE | UART_LSR_PE ;
if ( c_iflag & ( BRKINT | PARMRK ) )
port - > read_status_mask | = UART_LSR_BI ;
port - > ignore_status_mask = 0 ;
if ( c_iflag & IGNPAR )
port - > ignore_status_mask | = UART_LSR_FE | UART_LSR_PE ;
if ( c_iflag & IGNBRK ) {
port - > ignore_status_mask | = UART_LSR_BI ;
if ( c_iflag & IGNPAR )
port - > ignore_status_mask | = UART_LSR_OE ;
}
if ( ( c_cflag & CREAD ) = = 0 )
port - > ignore_status_mask | = UART_LSR_DR ;
ier = siu_read ( port , UART_IER ) ;
ier & = ~ UART_IER_MSI ;
if ( UART_ENABLE_MS ( port , c_cflag ) )
ier | = UART_IER_MSI ;
siu_write ( port , UART_IER , ier ) ;
siu_write ( port , UART_LCR , lcr | UART_LCR_DLAB ) ;
siu_write ( port , UART_DLL , ( uint8_t ) quot ) ;
siu_write ( port , UART_DLM , ( uint8_t ) ( quot > > 8 ) ) ;
siu_write ( port , UART_LCR , lcr ) ;
siu_write ( port , UART_FCR , fcr ) ;
siu_set_mctrl ( port , port - > mctrl ) ;
spin_unlock_irqrestore ( & port - > lock , flags ) ;
}
static void siu_pm ( struct uart_port * port , unsigned int state , unsigned int oldstate )
{
switch ( state ) {
case 0 :
switch ( port - > type ) {
case PORT_VR41XX_SIU :
vr41xx_supply_clock ( SIU_CLOCK ) ;
break ;
case PORT_VR41XX_DSIU :
vr41xx_supply_clock ( DSIU_CLOCK ) ;
break ;
}
break ;
case 3 :
switch ( port - > type ) {
case PORT_VR41XX_SIU :
vr41xx_mask_clock ( SIU_CLOCK ) ;
break ;
case PORT_VR41XX_DSIU :
vr41xx_mask_clock ( DSIU_CLOCK ) ;
break ;
}
break ;
}
}
static const char * siu_type ( struct uart_port * port )
{
return siu_type_name ( port ) ;
}
static void siu_release_port ( struct uart_port * port )
{
unsigned long size ;
if ( port - > flags & UPF_IOREMAP ) {
iounmap ( port - > membase ) ;
port - > membase = NULL ;
}
size = siu_port_size ( port ) ;
release_mem_region ( port - > mapbase , size ) ;
}
static int siu_request_port ( struct uart_port * port )
{
unsigned long size ;
struct resource * res ;
size = siu_port_size ( port ) ;
res = request_mem_region ( port - > mapbase , size , siu_type_name ( port ) ) ;
if ( res = = NULL )
return - EBUSY ;
if ( port - > flags & UPF_IOREMAP ) {
port - > membase = ioremap ( port - > mapbase , size ) ;
if ( port - > membase = = NULL ) {
release_resource ( res ) ;
return - ENOMEM ;
}
}
return 0 ;
}
static void siu_config_port ( struct uart_port * port , int flags )
{
if ( flags & UART_CONFIG_TYPE ) {
port - > type = siu_check_type ( port ) ;
( void ) siu_request_port ( port ) ;
}
}
static int siu_verify_port ( struct uart_port * port , struct serial_struct * serial )
{
if ( port - > type ! = PORT_VR41XX_SIU & & port - > type ! = PORT_VR41XX_DSIU )
return - EINVAL ;
if ( port - > irq ! = serial - > irq )
return - EINVAL ;
if ( port - > iotype ! = serial - > io_type )
return - EINVAL ;
if ( port - > mapbase ! = ( unsigned long ) serial - > iomem_base )
return - EINVAL ;
return 0 ;
}
static struct uart_ops siu_uart_ops = {
. tx_empty = siu_tx_empty ,
. set_mctrl = siu_set_mctrl ,
. get_mctrl = siu_get_mctrl ,
. stop_tx = siu_stop_tx ,
. start_tx = siu_start_tx ,
. stop_rx = siu_stop_rx ,
. enable_ms = siu_enable_ms ,
. break_ctl = siu_break_ctl ,
. startup = siu_startup ,
. shutdown = siu_shutdown ,
. set_termios = siu_set_termios ,
. pm = siu_pm ,
. type = siu_type ,
. release_port = siu_release_port ,
. request_port = siu_request_port ,
. config_port = siu_config_port ,
. verify_port = siu_verify_port ,
} ;
static int siu_init_ports ( void )
{
const struct siu_port * siu ;
struct uart_port * port ;
int i , num ;
switch ( current_cpu_data . cputype ) {
case CPU_VR4111 :
case CPU_VR4121 :
siu = siu_type1_ports ;
break ;
case CPU_VR4122 :
case CPU_VR4131 :
case CPU_VR4133 :
siu = siu_type2_ports ;
break ;
default :
return 0 ;
}
port = siu_uart_ports ;
num = siu_probe_ports ( ) ;
for ( i = 0 ; i < num ; i + + ) {
spin_lock_init ( & port - > lock ) ;
port - > irq = siu - > irq ;
port - > uartclk = SIU_BAUD_BASE * 16 ;
port - > fifosize = 16 ;
port - > regshift = 0 ;
port - > iotype = UPIO_MEM ;
port - > flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF ;
port - > type = siu - > type ;
port - > line = i ;
port - > mapbase = siu - > start ;
siu + + ;
port + + ;
}
return num ;
}
# ifdef CONFIG_SERIAL_VR41XX_CONSOLE
# define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
static void wait_for_xmitr ( struct uart_port * port )
{
int timeout = 10000 ;
uint8_t lsr , msr ;
do {
lsr = siu_read ( port , UART_LSR ) ;
if ( lsr & UART_LSR_BI )
lsr_break_flag [ port - > line ] = UART_LSR_BI ;
if ( ( lsr & BOTH_EMPTY ) = = BOTH_EMPTY )
break ;
} while ( timeout - - > 0 ) ;
if ( port - > flags & UPF_CONS_FLOW ) {
timeout = 1000000 ;
do {
msr = siu_read ( port , UART_MSR ) ;
if ( ( msr & UART_MSR_CTS ) ! = 0 )
break ;
} while ( timeout - - > 0 ) ;
}
}
2006-03-20 23:00:09 +03:00
static void siu_console_putchar ( struct uart_port * port , int ch )
{
wait_for_xmitr ( port ) ;
siu_write ( port , UART_TX , ch ) ;
}
2005-04-17 02:20:36 +04:00
static void siu_console_write ( struct console * con , const char * s , unsigned count )
{
struct uart_port * port ;
uint8_t ier ;
port = & siu_uart_ports [ con - > index ] ;
ier = siu_read ( port , UART_IER ) ;
siu_write ( port , UART_IER , 0 ) ;
2006-03-20 23:00:09 +03:00
uart_console_write ( port , s , count , siu_console_putchar ) ;
2005-04-17 02:20:36 +04:00
wait_for_xmitr ( port ) ;
siu_write ( port , UART_IER , ier ) ;
}
static int siu_console_setup ( struct console * con , char * options )
{
struct uart_port * port ;
int baud = 9600 ;
int parity = ' n ' ;
int bits = 8 ;
int flow = ' n ' ;
if ( con - > index > = SIU_PORTS_MAX )
con - > index = 0 ;
port = & siu_uart_ports [ con - > index ] ;
if ( port - > membase = = NULL ) {
if ( port - > mapbase = = 0 )
return - ENODEV ;
2005-06-05 02:43:34 +04:00
port - > membase = ioremap ( port - > mapbase , siu_port_size ( port ) ) ;
2005-04-17 02:20:36 +04:00
}
vr41xx_select_siu_interface ( SIU_INTERFACE_RS232C ) ;
if ( options ! = NULL )
uart_parse_options ( options , & baud , & parity , & bits , & flow ) ;
return uart_set_options ( port , con , baud , parity , bits , flow ) ;
}
static struct uart_driver siu_uart_driver ;
static struct console siu_console = {
. name = " ttyVR " ,
. write = siu_console_write ,
. device = uart_console_device ,
. setup = siu_console_setup ,
. flags = CON_PRINTBUFFER ,
. index = - 1 ,
. data = & siu_uart_driver ,
} ;
static int __devinit siu_console_init ( void )
{
struct uart_port * port ;
int num , i ;
num = siu_init_ports ( ) ;
if ( num < = 0 )
return - ENODEV ;
for ( i = 0 ; i < num ; i + + ) {
port = & siu_uart_ports [ i ] ;
2005-06-05 02:43:34 +04:00
port - > ops = & siu_uart_ops ;
2005-04-17 02:20:36 +04:00
}
register_console ( & siu_console ) ;
return 0 ;
}
console_initcall ( siu_console_init ) ;
# define SERIAL_VR41XX_CONSOLE &siu_console
# else
# define SERIAL_VR41XX_CONSOLE NULL
# endif
static struct uart_driver siu_uart_driver = {
. owner = THIS_MODULE ,
. driver_name = " SIU " ,
. dev_name = " ttyVR " ,
. major = SIU_MAJOR ,
. minor = SIU_MINOR_BASE ,
. cons = SERIAL_VR41XX_CONSOLE ,
} ;
2006-03-22 11:07:53 +03:00
static int __devinit siu_probe ( struct platform_device * dev )
2005-04-17 02:20:36 +04:00
{
struct uart_port * port ;
int num , i , retval ;
num = siu_init_ports ( ) ;
if ( num < = 0 )
return - ENODEV ;
siu_uart_driver . nr = num ;
retval = uart_register_driver ( & siu_uart_driver ) ;
if ( retval )
return retval ;
for ( i = 0 ; i < num ; i + + ) {
port = & siu_uart_ports [ i ] ;
port - > ops = & siu_uart_ops ;
2005-11-10 01:32:44 +03:00
port - > dev = & dev - > dev ;
2005-04-17 02:20:36 +04:00
retval = uart_add_one_port ( & siu_uart_driver , port ) ;
2005-06-05 02:43:34 +04:00
if ( retval < 0 ) {
port - > dev = NULL ;
2005-04-17 02:20:36 +04:00
break ;
2005-06-05 02:43:34 +04:00
}
2005-04-17 02:20:36 +04:00
}
if ( i = = 0 & & retval < 0 ) {
uart_unregister_driver ( & siu_uart_driver ) ;
return retval ;
}
return 0 ;
}
2006-03-22 11:07:53 +03:00
static int __devexit siu_remove ( struct platform_device * dev )
2005-04-17 02:20:36 +04:00
{
struct uart_port * port ;
int i ;
for ( i = 0 ; i < siu_uart_driver . nr ; i + + ) {
port = & siu_uart_ports [ i ] ;
2005-11-10 01:32:44 +03:00
if ( port - > dev = = & dev - > dev ) {
2005-04-17 02:20:36 +04:00
uart_remove_one_port ( & siu_uart_driver , port ) ;
port - > dev = NULL ;
}
}
uart_unregister_driver ( & siu_uart_driver ) ;
return 0 ;
}
2005-11-10 01:32:44 +03:00
static int siu_suspend ( struct platform_device * dev , pm_message_t state )
2005-04-17 02:20:36 +04:00
{
struct uart_port * port ;
int i ;
for ( i = 0 ; i < siu_uart_driver . nr ; i + + ) {
port = & siu_uart_ports [ i ] ;
if ( ( port - > type = = PORT_VR41XX_SIU | |
2005-11-10 01:32:44 +03:00
port - > type = = PORT_VR41XX_DSIU ) & & port - > dev = = & dev - > dev )
2005-04-17 02:20:36 +04:00
uart_suspend_port ( & siu_uart_driver , port ) ;
}
return 0 ;
}
2005-11-10 01:32:44 +03:00
static int siu_resume ( struct platform_device * dev )
2005-04-17 02:20:36 +04:00
{
struct uart_port * port ;
int i ;
for ( i = 0 ; i < siu_uart_driver . nr ; i + + ) {
port = & siu_uart_ports [ i ] ;
if ( ( port - > type = = PORT_VR41XX_SIU | |
2005-11-10 01:32:44 +03:00
port - > type = = PORT_VR41XX_DSIU ) & & port - > dev = = & dev - > dev )
2005-04-17 02:20:36 +04:00
uart_resume_port ( & siu_uart_driver , port ) ;
}
return 0 ;
}
static struct platform_device * siu_platform_device ;
2005-11-10 01:32:44 +03:00
static struct platform_driver siu_device_driver = {
2005-04-17 02:20:36 +04:00
. probe = siu_probe ,
2006-03-22 11:07:53 +03:00
. remove = __devexit_p ( siu_remove ) ,
2005-04-17 02:20:36 +04:00
. suspend = siu_suspend ,
. resume = siu_resume ,
2005-11-10 01:32:44 +03:00
. driver = {
. name = " SIU " ,
2006-03-22 11:07:53 +03:00
. owner = THIS_MODULE ,
2005-11-10 01:32:44 +03:00
} ,
2005-04-17 02:20:36 +04:00
} ;
2006-03-22 11:07:53 +03:00
static int __init vr41xx_siu_init ( void )
2005-04-17 02:20:36 +04:00
{
int retval ;
2006-03-22 11:07:53 +03:00
siu_platform_device = platform_device_alloc ( " SIU " , - 1 ) ;
if ( ! siu_platform_device )
return - ENOMEM ;
retval = platform_device_add ( siu_platform_device ) ;
if ( retval < 0 ) {
platform_device_put ( siu_platform_device ) ;
return retval ;
}
2005-04-17 02:20:36 +04:00
2005-11-10 01:32:44 +03:00
retval = platform_driver_register ( & siu_device_driver ) ;
2005-04-17 02:20:36 +04:00
if ( retval < 0 )
platform_device_unregister ( siu_platform_device ) ;
return retval ;
}
2006-03-22 11:07:53 +03:00
static void __exit vr41xx_siu_exit ( void )
2005-04-17 02:20:36 +04:00
{
2005-11-10 01:32:44 +03:00
platform_driver_unregister ( & siu_device_driver ) ;
2005-04-17 02:20:36 +04:00
platform_device_unregister ( siu_platform_device ) ;
}
module_init ( vr41xx_siu_init ) ;
module_exit ( vr41xx_siu_exit ) ;