Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6
Linus Torvalds [Sun, 20 Sep 2009 23:02:06 +0000 (16:02 -0700)]
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
  includecheck fix: x86, cpu/common.c
  includecheck fix: kernel/trace, ring_buffer.c
  includecheck fix: include/linux, ftrace.h
  includecheck fix: include/linux, page_cgroup.h
  includecheck fix: include/linux, aio.h
  includecheck fix: include/drm, drm_memory.h
  includecheck fix: include/acpi, acpi_bus.h
  includecheck fix: drivers/xen, evtchn.c
  includecheck fix: drivers/video, vgacon.c
  includecheck fix: drivers/scsi, ibmvscsi.c
  includecheck fix: drivers/scsi, libfcoe.c
  includecheck fix: x86, shadow.c
  includecheck fix: x86, traps.c
  includecheck fix: um, helper.c
  includecheck fix: s390, sys_s390.c

190 files changed:
Documentation/trace/power.txt [deleted file]
arch/mips/loongson/common/time.c
arch/mn10300/kernel/asm-offsets.c
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/perf_counter.c
arch/x86/kernel/cpuid.c
arch/x86/kernel/microcode_core.c
arch/x86/kernel/msr.c
arch/x86/kernel/process.c
block/bsg.c
block/genhd.c
drivers/base/core.c
drivers/base/devtmpfs.c
drivers/block/aoe/aoechr.c
drivers/block/pktcdvd.c
drivers/char/cyclades.c
drivers/char/esp.c
drivers/char/hw_random/core.c
drivers/char/isicom.c
drivers/char/mem.c
drivers/char/misc.c
drivers/char/mxser.c
drivers/char/n_tty.c
drivers/char/raw.c
drivers/char/riscom8.c
drivers/char/tty_io.c
drivers/char/tty_ioctl.c
drivers/char/tty_ldisc.c
drivers/char/tty_port.c
drivers/char/vt.c
drivers/char/vt_ioctl.c
drivers/cpuidle/cpuidle.c
drivers/gpu/drm/drm_sysfs.c
drivers/hid/usbhid/hiddev.c
drivers/i2c/busses/i2c-imx.c
drivers/i2c/busses/i2c-mv64xxx.c
drivers/input/input.c
drivers/isdn/gigaset/interface.c
drivers/md/dm-ioctl.c
drivers/media/dvb/dvb-core/dvbdev.c
drivers/net/slip.c
drivers/net/tun.c
drivers/serial/21285.c
drivers/serial/8250.c
drivers/serial/8250.h
drivers/serial/amba-pl010.c
drivers/serial/amba-pl011.c
drivers/serial/atmel_serial.c
drivers/serial/bfin_5xx.c
drivers/serial/bfin_sport_uart.c
drivers/serial/clps711x.c
drivers/serial/cpm_uart/cpm_uart_core.c
drivers/serial/dz.c
drivers/serial/icom.c
drivers/serial/imx.c
drivers/serial/ioc3_serial.c
drivers/serial/ioc4_serial.c
drivers/serial/ip22zilog.c
drivers/serial/jsm/jsm_neo.c
drivers/serial/jsm/jsm_tty.c
drivers/serial/m32r_sio.c
drivers/serial/max3100.c
drivers/serial/mcf.c
drivers/serial/mpc52xx_uart.c
drivers/serial/mpsc.c
drivers/serial/msm_serial.c
drivers/serial/mux.c
drivers/serial/netx-serial.c
drivers/serial/nwpserial.c
drivers/serial/pmac_zilog.c
drivers/serial/pnx8xxx_uart.c
drivers/serial/pxa.c
drivers/serial/sa1100.c
drivers/serial/samsung.c
drivers/serial/sb1250-duart.c
drivers/serial/sc26xx.c
drivers/serial/serial_core.c
drivers/serial/serial_cs.c
drivers/serial/serial_ks8695.c
drivers/serial/serial_lh7a40x.c
drivers/serial/serial_txx9.c
drivers/serial/sh-sci.c
drivers/serial/sn_console.c
drivers/serial/sunhv.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/serial/timbuart.c
drivers/serial/uartlite.c
drivers/serial/ucc_uart.c
drivers/serial/vr41xx_siu.c
drivers/serial/zs.c
drivers/usb/class/cdc-acm.c
drivers/usb/class/usblp.c
drivers/usb/core/file.c
drivers/usb/core/usb.c
drivers/usb/misc/iowarrior.c
drivers/usb/misc/legousbtower.c
drivers/usb/serial/ark3116.c
drivers/usb/serial/belkin_sa.c
drivers/usb/serial/ch341.c
drivers/usb/serial/console.c
drivers/usb/serial/cp210x.c
drivers/usb/serial/cyberjack.c
drivers/usb/serial/cypress_m8.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/empeg.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/garmin_gps.c
drivers/usb/serial/generic.c
drivers/usb/serial/io_edgeport.c
drivers/usb/serial/io_ti.c
drivers/usb/serial/ipaq.c
drivers/usb/serial/ipw.c
drivers/usb/serial/ir-usb.c
drivers/usb/serial/iuu_phoenix.c
drivers/usb/serial/keyspan.c
drivers/usb/serial/keyspan.h
drivers/usb/serial/keyspan_pda.c
drivers/usb/serial/kl5kusb105.c
drivers/usb/serial/kobil_sct.c
drivers/usb/serial/mct_u232.c
drivers/usb/serial/mos7720.c
drivers/usb/serial/mos7840.c
drivers/usb/serial/navman.c
drivers/usb/serial/omninet.c
drivers/usb/serial/opticon.c
drivers/usb/serial/option.c
drivers/usb/serial/oti6858.c
drivers/usb/serial/pl2303.c
drivers/usb/serial/sierra.c
drivers/usb/serial/spcp8x5.c
drivers/usb/serial/symbolserial.c
drivers/usb/serial/ti_usb_3410_5052.c
drivers/usb/serial/usb-serial.c
drivers/usb/serial/usb_debug.c
drivers/usb/serial/visor.c
drivers/usb/serial/whiteheat.c
include/linux/cyclades.h
include/linux/device.h
include/linux/genhd.h
include/linux/hayesesp.h
include/linux/kfifo.h
include/linux/miscdevice.h
include/linux/perf_counter.h
include/linux/serial.h
include/linux/serial_8250.h
include/linux/serial_core.h
include/linux/tty.h
include/linux/usb.h
include/linux/usb/serial.h
include/linux/vt.h
include/linux/vt_kern.h
include/trace/events/power.h [new file with mode: 0644]
include/trace/events/sched.h
kernel/kfifo.c
kernel/perf_counter.c
kernel/power/console.c
kernel/sched_clock.c
kernel/sched_fair.c
kernel/trace/Makefile
kernel/trace/power-traces.c [new file with mode: 0644]
kernel/trace/trace.h
kernel/trace/trace_entries.h
kernel/trace/trace_power.c [deleted file]
scripts/tracing/power.pl [deleted file]
sound/sound_core.c
tools/perf/Documentation/perf-sched.txt [new file with mode: 0644]
tools/perf/Documentation/perf-timechart.txt [new file with mode: 0644]
tools/perf/Documentation/perf-trace.txt [new file with mode: 0644]
tools/perf/Makefile
tools/perf/builtin-record.c
tools/perf/builtin-sched.c [new file with mode: 0644]
tools/perf/builtin-timechart.c [new file with mode: 0644]
tools/perf/builtin.h
tools/perf/command-list.txt
tools/perf/perf.c
tools/perf/util/event.h
tools/perf/util/header.c
tools/perf/util/header.h
tools/perf/util/parse-events.c
tools/perf/util/parse-options.h
tools/perf/util/svghelper.c [new file with mode: 0644]
tools/perf/util/svghelper.h [new file with mode: 0644]
tools/perf/util/thread.c
tools/perf/util/thread.h
tools/perf/util/trace-event-info.c
tools/perf/util/trace-event-parse.c
tools/perf/util/trace-event-read.c
tools/perf/util/trace-event.h

diff --git a/Documentation/trace/power.txt b/Documentation/trace/power.txt
deleted file mode 100644 (file)
index cd805e1..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-The power tracer collects detailed information about C-state and P-state
-transitions, instead of just looking at the high-level "average"
-information.
-
-There is a helper script found in scrips/tracing/power.pl in the kernel
-sources which can be used to parse this information and create a
-Scalable Vector Graphics (SVG) picture from the trace data.
-
-To use this tracer:
-
-       echo 0 > /sys/kernel/debug/tracing/tracing_enabled
-       echo power > /sys/kernel/debug/tracing/current_tracer
-       echo 1 > /sys/kernel/debug/tracing/tracing_enabled
-       sleep 1
-       echo 0 > /sys/kernel/debug/tracing/tracing_enabled
-       cat /sys/kernel/debug/tracing/trace | \
-               perl scripts/tracing/power.pl > out.sv
index 0edbef3..6e08c82 100644 (file)
@@ -23,6 +23,6 @@ void __init plat_time_init(void)
 
 void read_persistent_clock(struct timespec *ts)
 {
-       ts->tv_sec = return mc146818_get_cmos_time();
+       ts->tv_sec = mc146818_get_cmos_time();
        ts->tv_nsec = 0;
 }
index 2646fcb..82b4007 100644 (file)
@@ -95,7 +95,7 @@ void foo(void)
        OFFSET(__iobase,                mn10300_serial_port, _iobase);
 
        DEFINE(__UART_XMIT_SIZE,        UART_XMIT_SIZE);
-       OFFSET(__xmit_buffer,           uart_info, xmit.buf);
-       OFFSET(__xmit_head,             uart_info, xmit.head);
-       OFFSET(__xmit_tail,             uart_info, xmit.tail);
+       OFFSET(__xmit_buffer,           uart_state, xmit.buf);
+       OFFSET(__xmit_head,             uart_state, xmit.head);
+       OFFSET(__xmit_tail,             uart_state, xmit.tail);
 }
index 7bb676c..7d5c3b0 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/cpufreq.h>
 #include <linux/compiler.h>
 #include <linux/dmi.h>
-#include <trace/power.h>
+#include <trace/events/power.h>
 
 #include <linux/acpi.h>
 #include <linux/io.h>
@@ -72,8 +72,6 @@ static DEFINE_PER_CPU(struct acpi_cpufreq_data *, drv_data);
 
 static DEFINE_PER_CPU(struct aperfmperf, old_perf);
 
-DEFINE_TRACE(power_mark);
-
 /* acpi_perf_data is a pointer to percpu data. */
 static struct acpi_processor_performance *acpi_perf_data;
 
@@ -332,7 +330,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
        unsigned int next_perf_state = 0; /* Index into perf table */
        unsigned int i;
        int result = 0;
-       struct power_trace it;
 
        dprintk("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu);
 
@@ -364,7 +361,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy,
                }
        }
 
-       trace_power_mark(&it, POWER_PSTATE, next_perf_state);
+       trace_power_frequency(POWER_PSTATE, data->freq_table[next_state].frequency);
 
        switch (data->cpu_feature) {
        case SYSTEM_INTEL_MSR_CAPABLE:
index 2732e2c..dbdf712 100644 (file)
@@ -36,10 +36,10 @@ static u64 perf_counter_mask __read_mostly;
 #define BTS_RECORD_SIZE                24
 
 /* The size of a per-cpu BTS buffer in bytes: */
-#define BTS_BUFFER_SIZE                (BTS_RECORD_SIZE * 1024)
+#define BTS_BUFFER_SIZE                (BTS_RECORD_SIZE * 2048)
 
 /* The BTS overflow threshold in bytes from the end of the buffer: */
-#define BTS_OVFL_TH            (BTS_RECORD_SIZE * 64)
+#define BTS_OVFL_TH            (BTS_RECORD_SIZE * 128)
 
 
 /*
@@ -1488,8 +1488,7 @@ void perf_counter_print_debug(void)
        local_irq_restore(flags);
 }
 
-static void intel_pmu_drain_bts_buffer(struct cpu_hw_counters *cpuc,
-                                      struct perf_sample_data *data)
+static void intel_pmu_drain_bts_buffer(struct cpu_hw_counters *cpuc)
 {
        struct debug_store *ds = cpuc->ds;
        struct bts_record {
@@ -1498,8 +1497,11 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_counters *cpuc,
                u64     flags;
        };
        struct perf_counter *counter = cpuc->counters[X86_PMC_IDX_FIXED_BTS];
-       unsigned long orig_ip = data->regs->ip;
        struct bts_record *at, *top;
+       struct perf_output_handle handle;
+       struct perf_event_header header;
+       struct perf_sample_data data;
+       struct pt_regs regs;
 
        if (!counter)
                return;
@@ -1510,19 +1512,38 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_counters *cpuc,
        at  = (struct bts_record *)(unsigned long)ds->bts_buffer_base;
        top = (struct bts_record *)(unsigned long)ds->bts_index;
 
+       if (top <= at)
+               return;
+
        ds->bts_index = ds->bts_buffer_base;
 
+
+       data.period     = counter->hw.last_period;
+       data.addr       = 0;
+       regs.ip         = 0;
+
+       /*
+        * Prepare a generic sample, i.e. fill in the invariant fields.
+        * We will overwrite the from and to address before we output
+        * the sample.
+        */
+       perf_prepare_sample(&header, &data, counter, &regs);
+
+       if (perf_output_begin(&handle, counter,
+                             header.size * (top - at), 1, 1))
+               return;
+
        for (; at < top; at++) {
-               data->regs->ip  = at->from;
-               data->addr      = at->to;
+               data.ip         = at->from;
+               data.addr       = at->to;
 
-               perf_counter_output(counter, 1, data);
+               perf_output_sample(&handle, &header, &data, counter);
        }
 
-       data->regs->ip  = orig_ip;
-       data->addr      = 0;
+       perf_output_end(&handle);
 
        /* There's new data available. */
+       counter->hw.interrupts++;
        counter->pending_kill = POLL_IN;
 }
 
@@ -1552,13 +1573,9 @@ static void x86_pmu_disable(struct perf_counter *counter)
        x86_perf_counter_update(counter, hwc, idx);
 
        /* Drain the remaining BTS records. */
-       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS)) {
-               struct perf_sample_data data;
-               struct pt_regs regs;
+       if (unlikely(idx == X86_PMC_IDX_FIXED_BTS))
+               intel_pmu_drain_bts_buffer(cpuc);
 
-               data.regs = &regs;
-               intel_pmu_drain_bts_buffer(cpuc, &data);
-       }
        cpuc->counters[idx] = NULL;
        clear_bit(idx, cpuc->used_mask);
 
@@ -1619,7 +1636,6 @@ static int p6_pmu_handle_irq(struct pt_regs *regs)
        int idx, handled = 0;
        u64 val;
 
-       data.regs = regs;
        data.addr = 0;
 
        cpuc = &__get_cpu_var(cpu_hw_counters);
@@ -1644,7 +1660,7 @@ static int p6_pmu_handle_irq(struct pt_regs *regs)
                if (!x86_perf_counter_set_period(counter, hwc, idx))
                        continue;
 
-               if (perf_counter_overflow(counter, 1, &data))
+               if (perf_counter_overflow(counter, 1, &data, regs))
                        p6_pmu_disable_counter(hwc, idx);
        }
 
@@ -1665,13 +1681,12 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
        int bit, loops;
        u64 ack, status;
 
-       data.regs = regs;
        data.addr = 0;
 
        cpuc = &__get_cpu_var(cpu_hw_counters);
 
        perf_disable();
-       intel_pmu_drain_bts_buffer(cpuc, &data);
+       intel_pmu_drain_bts_buffer(cpuc);
        status = intel_pmu_get_status();
        if (!status) {
                perf_enable();
@@ -1702,7 +1717,7 @@ again:
 
                data.period = counter->hw.last_period;
 
-               if (perf_counter_overflow(counter, 1, &data))
+               if (perf_counter_overflow(counter, 1, &data, regs))
                        intel_pmu_disable_counter(&counter->hw, bit);
        }
 
@@ -1729,7 +1744,6 @@ static int amd_pmu_handle_irq(struct pt_regs *regs)
        int idx, handled = 0;
        u64 val;
 
-       data.regs = regs;
        data.addr = 0;
 
        cpuc = &__get_cpu_var(cpu_hw_counters);
@@ -1754,7 +1768,7 @@ static int amd_pmu_handle_irq(struct pt_regs *regs)
                if (!x86_perf_counter_set_period(counter, hwc, idx))
                        continue;
 
-               if (perf_counter_overflow(counter, 1, &data))
+               if (perf_counter_overflow(counter, 1, &data, regs))
                        amd_pmu_disable_counter(hwc, idx);
        }
 
index b07af88..6a52d4b 100644 (file)
@@ -182,7 +182,7 @@ static struct notifier_block __refdata cpuid_class_cpu_notifier =
        .notifier_call = cpuid_class_cpu_callback,
 };
 
-static char *cpuid_nodename(struct device *dev)
+static char *cpuid_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "cpu/%u/cpuid", MINOR(dev->devt));
 }
@@ -203,7 +203,7 @@ static int __init cpuid_init(void)
                err = PTR_ERR(cpuid_class);
                goto out_chrdev;
        }
-       cpuid_class->nodename = cpuid_nodename;
+       cpuid_class->devnode = cpuid_devnode;
        for_each_online_cpu(i) {
                err = cpuid_device_create(i);
                if (err != 0)
index 9371448..0db7969 100644 (file)
@@ -236,7 +236,7 @@ static const struct file_operations microcode_fops = {
 static struct miscdevice microcode_dev = {
        .minor                  = MICROCODE_MINOR,
        .name                   = "microcode",
-       .devnode                = "cpu/microcode",
+       .nodename               = "cpu/microcode",
        .fops                   = &microcode_fops,
 };
 
index 7dd9500..6a3cefc 100644 (file)
@@ -241,7 +241,7 @@ static struct notifier_block __refdata msr_class_cpu_notifier = {
        .notifier_call = msr_class_cpu_callback,
 };
 
-static char *msr_nodename(struct device *dev)
+static char *msr_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "cpu/%u/msr", MINOR(dev->devt));
 }
@@ -262,7 +262,7 @@ static int __init msr_init(void)
                err = PTR_ERR(msr_class);
                goto out_chrdev;
        }
-       msr_class->nodename = msr_nodename;
+       msr_class->devnode = msr_devnode;
        for_each_online_cpu(i) {
                err = msr_device_create(i);
                if (err != 0)
index 071166a..847ab41 100644 (file)
@@ -9,7 +9,7 @@
 #include <linux/pm.h>
 #include <linux/clockchips.h>
 #include <linux/random.h>
-#include <trace/power.h>
+#include <trace/events/power.h>
 #include <asm/system.h>
 #include <asm/apic.h>
 #include <asm/syscalls.h>
@@ -25,9 +25,6 @@ EXPORT_SYMBOL(idle_nomwait);
 
 struct kmem_cache *task_xstate_cachep;
 
-DEFINE_TRACE(power_start);
-DEFINE_TRACE(power_end);
-
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 {
        *dst = *src;
@@ -299,9 +296,7 @@ static inline int hlt_use_halt(void)
 void default_idle(void)
 {
        if (hlt_use_halt()) {
-               struct power_trace it;
-
-               trace_power_start(&it, POWER_CSTATE, 1);
+               trace_power_start(POWER_CSTATE, 1);
                current_thread_info()->status &= ~TS_POLLING;
                /*
                 * TS_POLLING-cleared state must be visible before we
@@ -314,7 +309,6 @@ void default_idle(void)
                else
                        local_irq_enable();
                current_thread_info()->status |= TS_POLLING;
-               trace_power_end(&it);
        } else {
                local_irq_enable();
                /* loop is done by the caller */
@@ -372,9 +366,7 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait);
  */
 void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
 {
-       struct power_trace it;
-
-       trace_power_start(&it, POWER_CSTATE, (ax>>4)+1);
+       trace_power_start(POWER_CSTATE, (ax>>4)+1);
        if (!need_resched()) {
                if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
                        clflush((void *)&current_thread_info()->flags);
@@ -384,15 +376,13 @@ void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
                if (!need_resched())
                        __mwait(ax, cx);
        }
-       trace_power_end(&it);
 }
 
 /* Default MONITOR/MWAIT with no hints, used for default C1 state */
 static void mwait_idle(void)
 {
-       struct power_trace it;
        if (!need_resched()) {
-               trace_power_start(&it, POWER_CSTATE, 1);
+               trace_power_start(POWER_CSTATE, 1);
                if (cpu_has(&current_cpu_data, X86_FEATURE_CLFLUSH_MONITOR))
                        clflush((void *)&current_thread_info()->flags);
 
@@ -402,7 +392,6 @@ static void mwait_idle(void)
                        __sti_mwait(0, 0);
                else
                        local_irq_enable();
-               trace_power_end(&it);
        } else
                local_irq_enable();
 }
@@ -414,13 +403,11 @@ static void mwait_idle(void)
  */
 static void poll_idle(void)
 {
-       struct power_trace it;
-
-       trace_power_start(&it, POWER_CSTATE, 0);
+       trace_power_start(POWER_CSTATE, 0);
        local_irq_enable();
        while (!need_resched())
                cpu_relax();
-       trace_power_end(&it);
+       trace_power_end(0);
 }
 
 /*
index 5f184bb..0676301 100644 (file)
@@ -1062,7 +1062,7 @@ EXPORT_SYMBOL_GPL(bsg_register_queue);
 
 static struct cdev bsg_cdev;
 
-static char *bsg_nodename(struct device *dev)
+static char *bsg_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));
 }
@@ -1087,7 +1087,7 @@ static int __init bsg_init(void)
                ret = PTR_ERR(bsg_class);
                goto destroy_kmemcache;
        }
-       bsg_class->nodename = bsg_nodename;
+       bsg_class->devnode = bsg_devnode;
 
        ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg");
        if (ret)
index 2ad91dd..517e433 100644 (file)
@@ -998,12 +998,12 @@ struct class block_class = {
        .name           = "block",
 };
 
-static char *block_nodename(struct device *dev)
+static char *block_devnode(struct device *dev, mode_t *mode)
 {
        struct gendisk *disk = dev_to_disk(dev);
 
-       if (disk->nodename)
-               return disk->nodename(disk);
+       if (disk->devnode)
+               return disk->devnode(disk, mode);
        return NULL;
 }
 
@@ -1011,7 +1011,7 @@ static struct device_type disk_type = {
        .name           = "disk",
        .groups         = disk_attr_groups,
        .release        = disk_release,
-       .nodename       = block_nodename,
+       .devnode        = block_devnode,
 };
 
 #ifdef CONFIG_PROC_FS
index 390e664..6bee6af 100644 (file)
@@ -166,13 +166,16 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
        if (MAJOR(dev->devt)) {
                const char *tmp;
                const char *name;
+               mode_t mode = 0;
 
                add_uevent_var(env, "MAJOR=%u", MAJOR(dev->devt));
                add_uevent_var(env, "MINOR=%u", MINOR(dev->devt));
-               name = device_get_nodename(dev, &tmp);
+               name = device_get_devnode(dev, &mode, &tmp);
                if (name) {
                        add_uevent_var(env, "DEVNAME=%s", name);
                        kfree(tmp);
+                       if (mode)
+                               add_uevent_var(env, "DEVMODE=%#o", mode & 0777);
                }
        }
 
@@ -1148,8 +1151,9 @@ static struct device *next_device(struct klist_iter *i)
 }
 
 /**
- * device_get_nodename - path of device node file
+ * device_get_devnode - path of device node file
  * @dev: device
+ * @mode: returned file access mode
  * @tmp: possibly allocated string
  *
  * Return the relative path of a possible device node.
@@ -1157,21 +1161,22 @@ static struct device *next_device(struct klist_iter *i)
  * a name. This memory is returned in tmp and needs to be
  * freed by the caller.
  */
-const char *device_get_nodename(struct device *dev, const char **tmp)
+const char *device_get_devnode(struct device *dev,
+                              mode_t *mode, const char **tmp)
 {
        char *s;
 
        *tmp = NULL;
 
        /* the device type may provide a specific name */
-       if (dev->type && dev->type->nodename)
-               *tmp = dev->type->nodename(dev);
+       if (dev->type && dev->type->devnode)
+               *tmp = dev->type->devnode(dev, mode);
        if (*tmp)
                return *tmp;
 
        /* the class may provide a specific name */
-       if (dev->class && dev->class->nodename)
-               *tmp = dev->class->nodename(dev);
+       if (dev->class && dev->class->devnode)
+               *tmp = dev->class->devnode(dev, mode);
        if (*tmp)
                return *tmp;
 
index fd488ad..a1cb5af 100644 (file)
@@ -6,9 +6,10 @@
  * During bootup, before any driver core device is registered,
  * devtmpfs, a tmpfs-based filesystem is created. Every driver-core
  * device which requests a device node, will add a node in this
- * filesystem. The node is named after the the name of the device,
- * or the susbsytem can provide a custom name. All devices are
- * owned by root and have a mode of 0600.
+ * filesystem.
+ * By default, all devices are named after the the name of the
+ * device, owned by root and have a default mode of 0600. Subsystems
+ * can overwrite the default setting if needed.
  */
 
 #include <linux/kernel.h>
@@ -20,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/shmem_fs.h>
 #include <linux/cred.h>
+#include <linux/sched.h>
 #include <linux/init_task.h>
 
 static struct vfsmount *dev_mnt;
@@ -134,7 +136,7 @@ int devtmpfs_create_node(struct device *dev)
        const char *tmp = NULL;
        const char *nodename;
        const struct cred *curr_cred;
-       mode_t mode;
+       mode_t mode = 0;
        struct nameidata nd;
        struct dentry *dentry;
        int err;
@@ -142,14 +144,16 @@ int devtmpfs_create_node(struct device *dev)
        if (!dev_mnt)
                return 0;
 
-       nodename = device_get_nodename(dev, &tmp);
+       nodename = device_get_devnode(dev, &mode, &tmp);
        if (!nodename)
                return -ENOMEM;
 
+       if (mode == 0)
+               mode = 0600;
        if (is_blockdev(dev))
-               mode = S_IFBLK|0600;
+               mode |= S_IFBLK;
        else
-               mode = S_IFCHR|0600;
+               mode |= S_IFCHR;
 
        curr_cred = override_creds(&init_cred);
        err = vfs_path_lookup(dev_mnt->mnt_root, dev_mnt,
@@ -165,8 +169,12 @@ int devtmpfs_create_node(struct device *dev)
 
        dentry = lookup_create(&nd, 0);
        if (!IS_ERR(dentry)) {
+               int umask;
+
+               umask = sys_umask(0000);
                err = vfs_mknod(nd.path.dentry->d_inode,
                                dentry, mode, dev->devt);
+               sys_umask(umask);
                /* mark as kernel created inode */
                if (!err)
                        dentry->d_inode->i_private = &dev_mnt;
@@ -271,7 +279,7 @@ int devtmpfs_delete_node(struct device *dev)
        if (!dev_mnt)
                return 0;
 
-       nodename = device_get_nodename(dev, &tmp);
+       nodename = device_get_devnode(dev, NULL, &tmp);
        if (!nodename)
                return -ENOMEM;
 
index 1988835..62141ec 100644 (file)
@@ -266,7 +266,7 @@ static const struct file_operations aoe_fops = {
        .owner = THIS_MODULE,
 };
 
-static char *aoe_nodename(struct device *dev)
+static char *aoe_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "etherd/%s", dev_name(dev));
 }
@@ -288,7 +288,7 @@ aoechr_init(void)
                unregister_chrdev(AOE_MAJOR, "aoechr");
                return PTR_ERR(aoe_class);
        }
-       aoe_class->nodename = aoe_nodename;
+       aoe_class->devnode = aoe_devnode;
 
        for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
                device_create(aoe_class, NULL,
index 95f11cd..fd5bb8a 100644 (file)
@@ -2857,7 +2857,7 @@ static struct block_device_operations pktcdvd_ops = {
        .media_changed =        pkt_media_changed,
 };
 
-static char *pktcdvd_nodename(struct gendisk *gd)
+static char *pktcdvd_devnode(struct gendisk *gd, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "pktcdvd/%s", gd->disk_name);
 }
@@ -2914,7 +2914,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev)
        disk->fops = &pktcdvd_ops;
        disk->flags = GENHD_FL_REMOVABLE;
        strcpy(disk->disk_name, pd->name);
-       disk->nodename = pktcdvd_nodename;
+       disk->devnode = pktcdvd_devnode;
        disk->private_data = pd;
        disk->queue = blk_alloc_queue(GFP_KERNEL);
        if (!disk->queue)
@@ -3070,7 +3070,7 @@ static const struct file_operations pkt_ctl_fops = {
 static struct miscdevice pkt_misc = {
        .minor          = MISC_DYNAMIC_MINOR,
        .name           = DRIVER_NAME,
-       .name           = "pktcdvd/control",
+       .nodename       = "pktcdvd/control",
        .fops           = &pkt_ctl_fops
 };
 
index 2dafc2d..df5038b 100644 (file)
@@ -11,7 +11,7 @@
  * Initially written by Randolph Bentson <bentson@grieg.seaslug.org>.
  * Modified and maintained by Marcio Saito <marcio@cyclades.com>.
  *
- * Copyright (C) 2007 Jiri Slaby <jirislaby@gmail.com>
+ * Copyright (C) 2007-2009 Jiri Slaby <jirislaby@gmail.com>
  *
  * Much of the design and some of the code came from serial.c
  * which was copyright (C) 1991, 1992  Linus Torvalds.  It was
  * and then fixed as suggested by Michael K. Johnson 12/12/92.
  * Converted to pci probing and cleaned up by Jiri Slaby.
  *
- * This version supports shared IRQ's (only for PCI boards).
- *
- * Prevent users from opening non-existing Z ports.
- *
- * Revision 2.3.2.8   2000/07/06 18:14:16 ivan
- * Fixed the PCI detection function to work properly on Alpha systems.
- * Implemented support for TIOCSERGETLSR ioctl.
- * Implemented full support for non-standard baud rates.
- *
- * Revision 2.3.2.7   2000/06/01 18:26:34 ivan
- * Request PLX I/O region, although driver doesn't use it, to avoid
- * problems with other drivers accessing it.
- * Removed count for on-board buffer characters in cy_chars_in_buffer
- * (Cyclades-Z only).
- *
- * Revision 2.3.2.6   2000/05/05 13:56:05 ivan
- * Driver now reports physical instead of virtual memory addresses.
- * Masks were added to some Cyclades-Z read accesses.
- * Implemented workaround for PLX9050 bug that would cause a system lockup
- * in certain systems, depending on the MMIO addresses allocated to the
- * board.
- * Changed the Tx interrupt programming in the CD1400 chips to boost up
- * performance (Cyclom-Y only).
- * Code is now compliant with the new module interface (module_[init|exit]).
- * Make use of the PCI helper functions to access PCI resources.
- * Did some code "housekeeping".
- *
- * Revision 2.3.2.5   2000/01/19 14:35:33 ivan
- * Fixed bug in cy_set_termios on CRTSCTS flag turnoff.
- *
- * Revision 2.3.2.4   2000/01/17 09:19:40 ivan
- * Fixed SMP locking in Cyclom-Y interrupt handler.
- *
- * Revision 2.3.2.3   1999/12/28 12:11:39 ivan
- * Added a new cyclades_card field called nports to allow the driver to
- * know the exact number of ports found by the Z firmware after its load;
- * RX buffer contention prevention logic on interrupt op mode revisited
- * (Cyclades-Z only);
- * Revisited printk's for Z debug;
- * Driver now makes sure that the constant SERIAL_XMIT_SIZE is defined;
- *
- * Revision 2.3.2.2   1999/10/01 11:27:43 ivan
- * Fixed bug in cyz_poll that would make all ports but port 0
- * unable to transmit/receive data (Cyclades-Z only);
- * Implemented logic to prevent the RX buffer from being stuck with data
- * due to a driver / firmware race condition in interrupt op mode
- * (Cyclades-Z only);
- * Fixed bug in block_til_ready logic that would lead to a system crash;
- * Revisited cy_close spinlock usage;
- *
- * Revision 2.3.2.1   1999/09/28 11:01:22 ivan
- * Revisited CONFIG_PCI conditional compilation for PCI board support;
- * Implemented TIOCGICOUNT and TIOCMIWAIT ioctl support;
- * _Major_ cleanup on the Cyclades-Z interrupt support code / logic;
- * Removed CTS handling from the driver -- this is now completely handled
- * by the firmware (Cyclades-Z only);
- * Flush RX on-board buffers on a port open (Cyclades-Z only);
- * Fixed handling of ASYNC_SPD_* TTY flags;
- * Module unload now unmaps all memory area allocated by ioremap;
- *
- * Revision 2.3.1.1   1999/07/15 16:45:53 ivan
- * Removed CY_PROC conditional compilation;
- * Implemented SMP-awareness for the driver;
- * Implemented a new ISA IRQ autoprobe that uses the irq_probe_[on|off]
- * functions;
- * The driver now accepts memory addresses (maddr=0xMMMMM) and IRQs
- * (irq=NN) as parameters (only for ISA boards);
- * Fixed bug in set_line_char that would prevent the Cyclades-Z
- * ports from being configured at speeds above 115.2Kbps;
- * Fixed bug in cy_set_termios that would prevent XON/XOFF flow control
- * switching from working properly;
- * The driver now only prints IRQ info for the Cyclades-Z if it's
- * configured to work in interrupt mode;
- *
- * Revision 2.2.2.3   1999/06/28 11:13:29 ivan
- * Added support for interrupt mode operation for the Z cards;
- * Removed the driver inactivity control for the Z;
- * Added a missing MOD_DEC_USE_COUNT in the cy_open function for when
- * the Z firmware is not loaded yet;
- * Replaced the "manual" Z Tx flush buffer by a call to a FW command of
- * same functionality;
- * Implemented workaround for IRQ setting loss on the PCI configuration
- * registers after a PCI bridge EEPROM reload (affects PLX9060 only);
- *
- * Revision 2.2.2.2  1999/05/14 17:18:15 ivan
- * /proc entry location changed to /proc/tty/driver/cyclades;
- * Added support to shared IRQ's (only for PCI boards);
- * Added support for Cobalt Qube2 systems;
- * IRQ [de]allocation scheme revisited;
- * BREAK implementation changed in order to make use of the 'break_ctl'
- * TTY facility;
- * Fixed typo in TTY structure field 'driver_name';
- * Included a PCI bridge reset and EEPROM reload in the board
- * initialization code (for both Y and Z series).
- *
- * Revision 2.2.2.1  1999/04/08 16:17:43 ivan
- * Fixed a bug in cy_wait_until_sent that was preventing the port to be
- * closed properly after a SIGINT;
- * Module usage counter scheme revisited;
- * Added support to the upcoming Y PCI boards (i.e., support to additional
- * PCI Device ID's).
- *
- * Revision 2.2.1.10 1999/01/20 16:14:29 ivan
- * Removed all unnecessary page-alignement operations in ioremap calls
- * (ioremap is currently safe for these operations).
- *
- * Revision 2.2.1.9  1998/12/30 18:18:30 ivan
- * Changed access to PLX PCI bridge registers from I/O to MMIO, in
- * order to make PLX9050-based boards work with certain motherboards.
- *
- * Revision 2.2.1.8  1998/11/13 12:46:20 ivan
- * cy_close function now resets (correctly) the tty->closing flag;
- * JIFFIES_DIFF macro fixed.
- *
- * Revision 2.2.1.7  1998/09/03 12:07:28 ivan
- * Fixed bug in cy_close function, which was not informing HW of
- * which port should have the reception disabled before doing so;
- * fixed Cyclom-8YoP hardware detection bug.
- *
- * Revision 2.2.1.6  1998/08/20 17:15:39 ivan
- * Fixed bug in cy_close function, which causes malfunction
- * of one of the first 4 ports when a higher port is closed
- * (Cyclom-Y only).
- *
- * Revision 2.2.1.5  1998/08/10 18:10:28 ivan
- * Fixed Cyclom-4Yo hardware detection bug.
- *
- * Revision 2.2.1.4  1998/08/04 11:02:50 ivan
- * /proc/cyclades implementation with great collaboration of
- * Marc Lewis <marc@blarg.net>;
- * cyy_interrupt was changed to avoid occurrence of kernel oopses
- * during PPP operation.
- *
- * Revision 2.2.1.3  1998/06/01 12:09:10 ivan
- * General code review in order to comply with 2.1 kernel standards;
- * data loss prevention for slow devices revisited (cy_wait_until_sent
- * was created);
- * removed conditional compilation for new/old PCI structure support
- * (now the driver only supports the new PCI structure).
- *
- * Revision 2.2.1.1  1998/03/19 16:43:12 ivan
- * added conditional compilation for new/old PCI structure support;
- * removed kernel series (2.0.x / 2.1.x) conditional compilation.
- *
- * Revision 2.1.1.3  1998/03/16 18:01:12 ivan
- * cleaned up the data loss fix;
- * fixed XON/XOFF handling once more (Cyclades-Z);
- * general review of the driver routines;
- * introduction of a mechanism to prevent data loss with slow
- * printers, by forcing a delay before closing the port.
- *
- * Revision 2.1.1.2  1998/02/17 16:50:00 ivan
- * fixed detection/handling of new CD1400 in Ye boards;
- * fixed XON/XOFF handling (Cyclades-Z);
- * fixed data loss caused by a premature port close;
- * introduction of a flag that holds the CD1400 version ID per port
- * (used by the CYGETCD1400VER new ioctl).
- *
- * Revision 2.1.1.1  1997/12/03 17:31:19 ivan
- * Code review for the module cleanup routine;
- * fixed RTS and DTR status report for new CD1400's in get_modem_info;
- * includes anonymous changes regarding signal_pending.
- *
- * Revision 2.1  1997/11/01 17:42:41 ivan
- * Changes in the driver to support Alpha systems (except 8Zo V_1);
- * BREAK fix for the Cyclades-Z boards;
- * driver inactivity control by FW implemented;
- * introduction of flag that allows driver to take advantage of
- * a special CD1400 feature related to HW flow control;
- * added support for the CD1400  rev. J (Cyclom-Y boards);
- * introduction of ioctls to:
- *  - control the rtsdtr_inv flag (Cyclom-Y);
- *  - control the rflow flag (Cyclom-Y);
- *  - adjust the polling interval (Cyclades-Z);
- *
- * Revision 1.36.4.33  1997/06/27 19:00:00  ivan
- * Fixes related to kernel version conditional
- * compilation.
- *
- * Revision 1.36.4.32  1997/06/14 19:30:00  ivan
- * Compatibility issues between kernels 2.0.x and
- * 2.1.x (mainly related to clear_bit function).
- *
- * Revision 1.36.4.31  1997/06/03 15:30:00  ivan
- * Changes to define the memory window according to the
- * board type.
- *
- * Revision 1.36.4.30  1997/05/16 15:30:00  daniel
- * Changes to support new cycladesZ boards.
- *
- * Revision 1.36.4.29  1997/05/12 11:30:00  daniel
- * Merge of Bentson's and Daniel's version 1.36.4.28.
- * Corrects bug in cy_detect_pci: check if there are more
- * ports than the number of static structs allocated.
- * Warning message during initialization if this driver is
- * used with the new generation of cycladesZ boards.  Those
- * will be supported only in next release of the driver.
- * Corrects bug in cy_detect_pci and cy_detect_isa that
- * returned wrong number of VALID boards, when a cyclomY
- * was found with no serial modules connected.
- * Changes to use current (2.1.x) kernel subroutine names
- * and created macros for compilation with 2.0.x kernel,
- * instead of the other way around.
- *
- * Revision 1.36.4.28  1997/05/?? ??:00:00  bentson
- * Change queue_task_irq_off to queue_task_irq.
- * The inline function queue_task_irq_off (tqueue.h)
- * was removed from latest releases of 2.1.x kernel.
- * Use of macro __init to mark the initialization
- * routines, so memory can be reused.
- * Also incorporate implementation of critical region
- * in function cleanup_module() created by anonymous
- * linuxer.
- *
- * Revision 1.36.4.28  1997/04/25 16:00:00  daniel
- * Change to support new firmware that solves DCD problem:
- * application could fail to receive SIGHUP signal when DCD
- * varying too fast.
- *
- * Revision 1.36.4.27  1997/03/26 10:30:00  daniel
- * Changed for support linux versions 2.1.X.
- * Backward compatible with linux versions 2.0.X.
- * Corrected illegal use of filler field in
- * CH_CTRL struct.
- * Deleted some debug messages.
- *
- * Revision 1.36.4.26  1997/02/27 12:00:00  daniel
- * Included check for NULL tty pointer in cyz_poll.
- *
- * Revision 1.36.4.25  1997/02/26 16:28:30  bentson
- * Bill Foster at Blarg! Online services noticed that
- * some of the switch elements of -Z modem control
- * lacked a closing "break;"
- *
- * Revision 1.36.4.24  1997/02/24 11:00:00  daniel
- * Changed low water threshold for buffer xmit_buf
- *
- * Revision 1.36.4.23  1996/12/02 21:50:16  bentson
- * Marcio provided fix to modem status fetch for -Z
- *
- * Revision 1.36.4.22  1996/10/28 22:41:17  bentson
- * improve mapping of -Z control page (thanks to Steve
- * Price <stevep@fa.tdktca.com> for help on this)
- *
- * Revision 1.36.4.21  1996/09/10 17:00:10  bentson
- * shift from CPU-bound to memcopy in cyz_polling operation
- *
- * Revision 1.36.4.20  1996/09/09 18:30:32  Bentson
- * Added support to set and report higher speeds.
- *
- * Revision 1.36.4.19c  1996/08/09 10:00:00  Marcio Saito
- * Some fixes in the HW flow control for the BETA release.
- * Don't try to register the IRQ.
- *
- * Revision 1.36.4.19  1996/08/08 16:23:18  Bentson
- * make sure "cyc" appears in all kernel messages; all soft interrupts
- * handled by same routine; recognize out-of-band reception; comment
- * out some diagnostic messages; leave RTS/CTS flow control to hardware;
- * fix race condition in -Z buffer management; only -Y needs to explicitly
- * flush chars; tidy up some startup messages;
- *
- * Revision 1.36.4.18  1996/07/25 18:57:31  bentson
- * shift MOD_INC_USE_COUNT location to match
- * serial.c; purge some diagnostic messages;
- *
- * Revision 1.36.4.17  1996/07/25 18:01:08  bentson
- * enable modem status messages and fetch & process them; note
- * time of last activity type for each port; set_line_char now
- * supports more than line 0 and treats 0 baud correctly;
- * get_modem_info senses rs_status;
- *
- * Revision 1.36.4.16  1996/07/20 08:43:15  bentson
- * barely works--now's time to turn on
- * more features 'til it breaks
- *
- * Revision 1.36.4.15  1996/07/19 22:30:06  bentson
- * check more -Z board status; shorten boot message
- *
- * Revision 1.36.4.14  1996/07/19 22:20:37  bentson
- * fix reference to ch_ctrl in startup; verify return
- * values from cyz_issue_cmd and cyz_update_channel;
- * more stuff to get modem control correct;
- *
- * Revision 1.36.4.13  1996/07/11 19:53:33  bentson
- * more -Z stuff folded in; re-order changes to put -Z stuff
- * after -Y stuff (to make changes clearer)
- *
- * Revision 1.36.4.12  1996/07/11 15:40:55  bentson
- * Add code to poll Cyclades-Z.  Add code to get & set RS-232 control.
- * Add code to send break.  Clear firmware ID word at startup (so
- * that other code won't talk to inactive board).
- *
- * Revision 1.36.4.11  1996/07/09 05:28:29  bentson
- * add code for -Z in set_line_char
- *
- * Revision 1.36.4.10  1996/07/08 19:28:37  bentson
- * fold more -Z stuff (or in some cases, error messages)
- * into driver; add text to "don't know what to do" messages.
- *
- * Revision 1.36.4.9  1996/07/08 18:38:38  bentson
- * moved compile-time flags near top of file; cosmetic changes
- * to narrow text (to allow 2-up printing); changed many declarations
- * to "static" to limit external symbols; shuffled code order to
- * coalesce -Y and -Z specific code, also to put internal functions
- * in order of tty_driver structure; added code to recognize -Z
- * ports (and for moment, do nothing or report error); add cy_startup
- * to parse boot command line for extra base addresses for ISA probes;
- *
- * Revision 1.36.4.8  1996/06/25 17:40:19  bentson
- * reorder some code, fix types of some vars (int vs. long),
- * add cy_setup to support user declared ISA addresses
- *
- * Revision 1.36.4.7  1996/06/21 23:06:18  bentson
- * dump ioctl based firmware load (it's now a user level
- * program); ensure uninitialzed ports cannot be used
- *
- * Revision 1.36.4.6  1996/06/20 23:17:19  bentson
- * rename vars and restructure some code
- *
- * Revision 1.36.4.5  1996/06/14 15:09:44  bentson
- * get right status back after boot load
- *
- * Revision 1.36.4.4  1996/06/13 19:51:44  bentson
- * successfully loads firmware
- *
- * Revision 1.36.4.3  1996/06/13 06:08:33  bentson
- * add more of the code for the boot/load ioctls
- *
- * Revision 1.36.4.2  1996/06/11 21:00:51  bentson
- * start to add Z functionality--starting with ioctl
- * for loading firmware
- *
- * Revision 1.36.4.1  1996/06/10 18:03:02  bentson
- * added code to recognize Z/PCI card at initialization; report
- * presence, but card is not initialized (because firmware needs
- * to be loaded)
- *
- * Revision 1.36.3.8  1996/06/07 16:29:00  bentson
- * starting minor number at zero; added missing verify_area
- * as noted by Heiko EiƟfeldt <heiko@colossus.escape.de>
- *
- * Revision 1.36.3.7  1996/04/19 21:06:18  bentson
- * remove unneeded boot message & fix CLOCAL hardware flow
- * control (Miquel van Smoorenburg <miquels@Q.cistron.nl>);
- * remove unused diagnostic statements; minor 0 is first;
- *
- * Revision 1.36.3.6  1996/03/13 13:21:17  marcio
- * The kernel function vremap (available only in later 1.3.xx kernels)
- * allows the access to memory addresses above the RAM. This revision
- * of the driver supports PCI boards below 1Mb (device id 0x100) and
- * above 1Mb (device id 0x101).
- *
- * Revision 1.36.3.5  1996/03/07 15:20:17  bentson
- * Some global changes to interrupt handling spilled into
- * this driver--mostly unused arguments in system function
- * calls.  Also added change by Marcio Saito which should
- * reduce lost interrupts at startup by fast processors.
- *
- * Revision 1.36.3.4  1995/11/13  20:45:10  bentson
- * Changes by Corey Minyard <minyard@wf-rch.cirr.com> distributed
- * in 1.3.41 kernel to remove a possible race condition, extend
- * some error messages, and let the driver run as a loadable module
- * Change by Alan Wendt <alan@ez0.ezlink.com> to remove a
- * possible race condition.
- * Change by Marcio Saito <marcio@cyclades.com> to fix PCI addressing.
- *
- * Revision 1.36.3.3  1995/11/13  19:44:48  bentson
- * Changes by Linus Torvalds in 1.3.33 kernel distribution
- * required due to reordering of driver initialization.
- * Drivers are now initialized *after* memory management.
- *
- * Revision 1.36.3.2  1995/09/08  22:07:14  bentson
- * remove printk from ISR; fix typo
- *
- * Revision 1.36.3.1  1995/09/01  12:00:42  marcio
- * Minor fixes in the PCI board support. PCI function calls in
- * conditional compilation (CONFIG_PCI). Thanks to Jim Duncan
- * <duncan@okay.com>. "bad serial count" message removed.
- *
- * Revision 1.36.3  1995/08/22  09:19:42  marcio
- * Cyclom-Y/PCI support added. Changes in the cy_init routine and
- * board initialization. Changes in the boot messages. The driver
- * supports up to 4 boards and 64 ports by default.
- *
- * Revision 1.36.1.4  1995/03/29  06:14:14  bentson
- * disambiguate between Cyclom-16Y and Cyclom-32Ye;
- *
- * Revision 1.36.1.3  1995/03/23  22:15:35  bentson
- * add missing break in modem control block in ioctl switch statement
- * (discovered by Michael Edward Chastain <mec@jobe.shell.portal.com>);
- *
- * Revision 1.36.1.2  1995/03/22  19:16:22  bentson
- * make sure CTS flow control is set as soon as possible (thanks
- * to note from David Lambert <lambert@chesapeake.rps.slb.com>);
- *
- * Revision 1.36.1.1  1995/03/13  15:44:43  bentson
- * initialize defaults for receive threshold and stale data timeout;
- * cosmetic changes;
- *
- * Revision 1.36  1995/03/10  23:33:53  bentson
- * added support of chips 4-7 in 32 port Cyclom-Ye;
- * fix cy_interrupt pointer dereference problem
- * (Joe Portman <baron@aa.net>);
- * give better error response if open is attempted on non-existent port
- * (Zachariah Vaum <jchryslr@netcom.com>);
- * correct command timeout (Kenneth Lerman <lerman@@seltd.newnet.com>);
- * conditional compilation for -16Y on systems with fast, noisy bus;
- * comment out diagnostic print function;
- * cleaned up table of base addresses;
- * set receiver time-out period register to correct value,
- * set receive threshold to better default values,
- * set chip timer to more accurate 200 Hz ticking,
- * add code to monitor and modify receive parameters
- * (Rik Faith <faith@cs.unc.edu> Nick Simicich
- * <njs@scifi.emi.net>);
- *
- * Revision 1.35  1994/12/16  13:54:18  steffen
- * additional patch by Marcio Saito for board detection
- * Accidently left out in 1.34
- *
- * Revision 1.34  1994/12/10  12:37:12  steffen
- * This is the corrected version as suggested by Marcio Saito
- *
- * Revision 1.33  1994/12/01  22:41:18  bentson
- * add hooks to support more high speeds directly; add tytso
- * patch regarding CLOCAL wakeups
- *
- * Revision 1.32  1994/11/23  19:50:04  bentson
- * allow direct kernel control of higher signalling rates;
- * look for cards at additional locations
- *
- * Revision 1.31  1994/11/16  04:33:28  bentson
- * ANOTHER fix from Corey Minyard, minyard@wf-rch.cirr.com--
- * a problem in chars_in_buffer has been resolved by some
- * small changes;  this should yield smoother output
- *
- * Revision 1.30  1994/11/16  04:28:05  bentson
- * Fix from Corey Minyard, Internet: minyard@metronet.com,
- * UUCP: minyard@wf-rch.cirr.com, WORK: minyardbnr.ca, to
- * cy_hangup that appears to clear up much (all?) of the
- * DTR glitches; also he's added/cleaned-up diagnostic messages
- *
- * Revision 1.29  1994/11/16  04:16:07  bentson
- * add change proposed by Ralph Sims, ralphs@halcyon.com, to
- * operate higher speeds in same way as other serial ports;
- * add more serial ports (for up to two 16-port muxes).
- *
- * Revision 1.28  1994/11/04  00:13:16  root
- * turn off diagnostic messages
- *
- * Revision 1.27  1994/11/03  23:46:37  root
- * bunch of changes to bring driver into greater conformance
- * with the serial.c driver (looking for missed fixes)
- *
- * Revision 1.26  1994/11/03  22:40:36  root
- * automatic interrupt probing fixed.
- *
- * Revision 1.25  1994/11/03  20:17:02  root
- * start to implement auto-irq
- *
- * Revision 1.24  1994/11/03  18:01:55  root
- * still working on modem signals--trying not to drop DTR
- * during the getty/login processes
- *
- * Revision 1.23  1994/11/03  17:51:36  root
- * extend baud rate support; set receive threshold as function
- * of baud rate; fix some problems with RTS/CTS;
- *
- * Revision 1.22  1994/11/02  18:05:35  root
- * changed arguments to udelay to type long to get
- * delays to be of correct duration
- *
- * Revision 1.21  1994/11/02  17:37:30  root
- * employ udelay (after calibrating loops_per_second earlier
- * in init/main.c) instead of using home-grown delay routines
- *
- * Revision 1.20  1994/11/02  03:11:38  root
- * cy_chars_in_buffer forces a return value of 0 to let
- * login work (don't know why it does); some functions
- * that were returning EFAULT, now executes the code;
- * more work on deciding when to disable xmit interrupts;
- *
- * Revision 1.19  1994/11/01  20:10:14  root
- * define routine to start transmission interrupts (by enabling
- * transmit interrupts); directly enable/disable modem interrupts;
- *
- * Revision 1.18  1994/11/01  18:40:45  bentson
- * Don't always enable transmit interrupts in startup; interrupt on
- * TxMpty instead of TxRdy to help characters get out before shutdown;
- * restructure xmit interrupt to check for chars first and quit if
- * none are ready to go; modem status (MXVRx) is upright, _not_ inverted
- * (to my view);
- *
- * Revision 1.17  1994/10/30  04:39:45  bentson
- * rename serial_driver and callout_driver to cy_serial_driver and
- * cy_callout_driver to avoid linkage interference; initialize
- * info->type to PORT_CIRRUS; ruggedize paranoia test; elide ->port
- * from cyclades_port structure; add paranoia check to cy_close;
- *
- * Revision 1.16  1994/10/30  01:14:33  bentson
- * change major numbers; add some _early_ return statements;
- *
- * Revision 1.15  1994/10/29  06:43:15  bentson
- * final tidying up for clean compile;  enable some error reporting
- *
- * Revision 1.14  1994/10/28  20:30:22  Bentson
- * lots of changes to drag the driver towards the new tty_io
- * structures and operation.  not expected to work, but may
- * compile cleanly.
- *
- * Revision 1.13  1994/07/21  23:08:57  Bentson
- * add some diagnostic cruft; support 24 lines (for testing
- * both -8Y and -16Y cards; be more thorough in servicing all
- * chips during interrupt; add "volatile" a few places to
- * circumvent compiler optimizations; fix base & offset
- * computations in block_til_ready (was causing chip 0 to
- * stop operation)
- *
- * Revision 1.12  1994/07/19  16:42:11  Bentson
- * add some hackery for kernel version 1.1.8; expand
- * error messages; refine timing for delay loops and
- * declare loop params volatile
- *
- * Revision 1.11  1994/06/11  21:53:10  bentson
- * get use of save_car right in transmit interrupt service
- *
- * Revision 1.10.1.1  1994/06/11  21:31:18  bentson
- * add some diagnostic printing; try to fix save_car stuff
- *
- * Revision 1.10  1994/06/11  20:36:08  bentson
- * clean up compiler warnings
- *
- * Revision 1.9  1994/06/11  19:42:46  bentson
- * added a bunch of code to support modem signalling
- *
- * Revision 1.8  1994/06/11  17:57:07  bentson
- * recognize break & parity error
- *
- * Revision 1.7  1994/06/05  05:51:34  bentson
- * Reorder baud table to be monotonic; add cli to CP; discard
- * incoming characters and status if the line isn't open; start to
- * fold code into cy_throttle; start to port get_serial_info,
- * set_serial_info, get_modem_info, set_modem_info, and send_break
- * from serial.c; expand cy_ioctl; relocate and expand config_setup;
- * get flow control characters from tty struct; invalidate ports w/o
- * hardware;
- *
- * Revision 1.6  1994/05/31  18:42:21  bentson
- * add a loop-breaker in the interrupt service routine;
- * note when port is initialized so that it can be shut
- * down under the right conditions; receive works without
- * any obvious errors
- *
- * Revision 1.5  1994/05/30  00:55:02  bentson
- * transmit works without obvious errors
- *
- * Revision 1.4  1994/05/27  18:46:27  bentson
- * incorporated more code from lib_y.c; can now print short
- * strings under interrupt control to port zero; seems to
- * select ports/channels/lines correctly
- *
- * Revision 1.3  1994/05/25  22:12:44  bentson
- * shifting from multi-port on a card to proper multiplexor
- * data structures;  added skeletons of most routines
- *
- * Revision 1.2  1994/05/19  13:21:43  bentson
- * start to crib from other sources
- *
  */
 
-#define CY_VERSION     "2.5"
+#define CY_VERSION     "2.6"
 
 /* If you need to install more boards than NR_CARDS, change the constant
    in the definition below. No other change is necessary to support up to
 #include <linux/firmware.h>
 #include <linux/device.h>
 
-#include <asm/system.h>
 #include <linux/io.h>
-#include <asm/irq.h>
 #include <linux/uaccess.h>
 
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
-static void cy_throttle(struct tty_struct *tty);
 static void cy_send_xchar(struct tty_struct *tty, char ch);
 
 #ifndef SERIAL_XMIT_SIZE
 #define        SERIAL_XMIT_SIZE        (min(PAGE_SIZE, 4096))
 #endif
-#define WAKEUP_CHARS           256
 
 #define STD_COM_FLAGS (0)
 
@@ -756,25 +184,25 @@ static int cy_next_channel;       /* next minor available */
  *                                               HI            VHI
  *     20
  */
-static int baud_table[] = {
+static const int baud_table[] = {
        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200,
        1800, 2400, 4800, 9600, 19200, 38400, 57600, 76800, 115200, 150000,
        230400, 0
 };
 
-static char baud_co_25[] = {   /* 25 MHz clock option table */
+static const char baud_co_25[] = {     /* 25 MHz clock option table */
        /* value =>    00    01   02    03    04 */
        /* divide by    8    32   128   512  2048 */
        0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03, 0x03, 0x02,
        0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static char baud_bpr_25[] = {  /* 25 MHz baud rate period table */
+static const char baud_bpr_25[] = {    /* 25 MHz baud rate period table */
        0x00, 0xf5, 0xa3, 0x6f, 0x5c, 0x51, 0xf5, 0xa3, 0x51, 0xa3,
        0x6d, 0x51, 0xa3, 0x51, 0xa3, 0x51, 0x36, 0x29, 0x1b, 0x15
 };
 
-static char baud_co_60[] = {   /* 60 MHz clock option table (CD1400 J) */
+static const char baud_co_60[] = {     /* 60 MHz clock option table (CD1400 J) */
        /* value =>    00    01   02    03    04 */
        /* divide by    8    32   128   512  2048 */
        0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x03, 0x03,
@@ -782,13 +210,13 @@ static char baud_co_60[] = {      /* 60 MHz clock option table (CD1400 J) */
        0x00
 };
 
-static char baud_bpr_60[] = {  /* 60 MHz baud rate period table (CD1400 J) */
+static const char baud_bpr_60[] = {    /* 60 MHz baud rate period table (CD1400 J) */
        0x00, 0x82, 0x21, 0xff, 0xdb, 0xc3, 0x92, 0x62, 0xc3, 0x62,
        0x41, 0xc3, 0x62, 0xc3, 0x62, 0xc3, 0x82, 0x62, 0x41, 0x32,
        0x21
 };
 
-static char baud_cor3[] = {    /* receive threshold */
+static const char baud_cor3[] = {      /* receive threshold */
        0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
        0x0a, 0x0a, 0x0a, 0x09, 0x09, 0x08, 0x08, 0x08, 0x08, 0x07,
        0x07
@@ -805,7 +233,7 @@ static char baud_cor3[] = { /* receive threshold */
  * cables.
  */
 
-static char rflow_thr[] = {    /* rflow threshold */
+static const char rflow_thr[] = {      /* rflow threshold */
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a,
        0x0a
@@ -814,7 +242,7 @@ static char rflow_thr[] = { /* rflow threshold */
 /*  The Cyclom-Ye has placed the sequential chips in non-sequential
  *  address order.  This look-up table overcomes that problem.
  */
-static int cy_chip_offset[] = { 0x0000,
+static const unsigned int cy_chip_offset[] = { 0x0000,
        0x0400,
        0x0800,
        0x0C00,
@@ -827,7 +255,7 @@ static int cy_chip_offset[] = { 0x0000,
 /* PCI related definitions */
 
 #ifdef CONFIG_PCI
-static struct pci_device_id cy_pci_dev_id[] __devinitdata = {
+static const struct pci_device_id cy_pci_dev_id[] = {
        /* PCI < 1Mb */
        { PCI_DEVICE(PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_CYCLOM_Y_Lo) },
        /* PCI > 1Mb */
@@ -850,7 +278,7 @@ MODULE_DEVICE_TABLE(pci, cy_pci_dev_id);
 #endif
 
 static void cy_start(struct tty_struct *);
-static void set_line_char(struct cyclades_port *);
+static void cy_set_line_char(struct cyclades_port *, struct tty_struct *);
 static int cyz_issue_cmd(struct cyclades_card *, __u32, __u8, __u32);
 #ifdef CONFIG_ISA
 static unsigned detect_isa_irq(void __iomem *);
@@ -869,6 +297,20 @@ static void cyz_rx_restart(unsigned long);
 static struct timer_list cyz_rx_full_timer[NR_PORTS];
 #endif                         /* CONFIG_CYZ_INTR */
 
+static inline void cyy_writeb(struct cyclades_port *port, u32 reg, u8 val)
+{
+       struct cyclades_card *card = port->card;
+
+       cy_writeb(port->u.cyy.base_addr + (reg << card->bus_index), val);
+}
+
+static inline u8 cyy_readb(struct cyclades_port *port, u32 reg)
+{
+       struct cyclades_card *card = port->card;
+
+       return readb(port->u.cyy.base_addr + (reg << card->bus_index));
+}
+
 static inline bool cy_is_Z(struct cyclades_card *card)
 {
        return card->num_chips == (unsigned int)-1;
@@ -893,7 +335,7 @@ static inline bool cyz_is_loaded(struct cyclades_card *card)
 }
 
 static inline int serial_paranoia_check(struct cyclades_port *info,
-               char *name, const char *routine)
+               const char *name, const char *routine)
 {
 #ifdef SERIAL_PARANOIA_CHECK
        if (!info) {
@@ -909,7 +351,7 @@ static inline int serial_paranoia_check(struct cyclades_port *info,
        }
 #endif
        return 0;
-}                              /* serial_paranoia_check */
+}
 
 /***********************************************************/
 /********* Start of block of Cyclom-Y specific code ********/
@@ -921,13 +363,14 @@ static inline int serial_paranoia_check(struct cyclades_port *info,
 
    This function is only called from inside spinlock-protected code.
  */
-static int cyy_issue_cmd(void __iomem *base_addr, u_char cmd, int index)
+static int __cyy_issue_cmd(void __iomem *base_addr, u8 cmd, int index)
 {
+       void __iomem *ccr = base_addr + (CyCCR << index);
        unsigned int i;
 
        /* Check to see that the previous command has completed */
        for (i = 0; i < 100; i++) {
-               if (readb(base_addr + (CyCCR << index)) == 0)
+               if (readb(ccr) == 0)
                        break;
                udelay(10L);
        }
@@ -937,10 +380,16 @@ static int cyy_issue_cmd(void __iomem *base_addr, u_char cmd, int index)
                return -1;
 
        /* Issue the new command */
-       cy_writeb(base_addr + (CyCCR << index), cmd);
+       cy_writeb(ccr, cmd);
 
        return 0;
-}                              /* cyy_issue_cmd */
+}
+
+static inline int cyy_issue_cmd(struct cyclades_port *port, u8 cmd)
+{
+       return __cyy_issue_cmd(port->u.cyy.base_addr, cmd,
+                       port->card->bus_index);
+}
 
 #ifdef CONFIG_ISA
 /* ISA interrupt detection code */
@@ -960,12 +409,12 @@ static unsigned detect_isa_irq(void __iomem *address)
 
        irqs = probe_irq_on();
        /* Wait ... */
-       udelay(5000L);
+       msleep(5);
 
        /* Enable the Tx interrupts on the CD1400 */
        local_irq_save(flags);
        cy_writeb(address + (CyCAR << index), 0);
-       cyy_issue_cmd(address, CyCHAN_CTL | CyENB_XMTR, index);
+       __cyy_issue_cmd(address, CyCHAN_CTL | CyENB_XMTR, index);
 
        cy_writeb(address + (CyCAR << index), 0);
        cy_writeb(address + (CySRER << index),
@@ -973,7 +422,7 @@ static unsigned detect_isa_irq(void __iomem *address)
        local_irq_restore(flags);
 
        /* Wait ... */
-       udelay(5000L);
+       msleep(5);
 
        /* Check which interrupt is in use */
        irq = probe_irq_off(irqs);
@@ -999,7 +448,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
        struct cyclades_port *info;
        struct tty_struct *tty;
        int len, index = cinfo->bus_index;
-       u8 save_xir, channel, save_car, data, char_count;
+       u8 ivr, save_xir, channel, save_car, data, char_count;
 
 #ifdef CY_DEBUG_INTERRUPTS
        printk(KERN_DEBUG "cyy_interrupt: rcvd intr, chip %d\n", chip);
@@ -1008,26 +457,25 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
        save_xir = readb(base_addr + (CyRIR << index));
        channel = save_xir & CyIRChannel;
        info = &cinfo->ports[channel + chip * 4];
-       save_car = readb(base_addr + (CyCAR << index));
-       cy_writeb(base_addr + (CyCAR << index), save_xir);
+       save_car = cyy_readb(info, CyCAR);
+       cyy_writeb(info, CyCAR, save_xir);
+       ivr = cyy_readb(info, CyRIVR) & CyIVRMask;
 
+       tty = tty_port_tty_get(&info->port);
        /* if there is nowhere to put the data, discard it */
-       if (info->port.tty == NULL) {
-               if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
-                               CyIVRRxEx) {    /* exception */
-                       data = readb(base_addr + (CyRDSR << index));
+       if (tty == NULL) {
+               if (ivr == CyIVRRxEx) { /* exception */
+                       data = cyy_readb(info, CyRDSR);
                } else {        /* normal character reception */
-                       char_count = readb(base_addr + (CyRDCR << index));
+                       char_count = cyy_readb(info, CyRDCR);
                        while (char_count--)
-                               data = readb(base_addr + (CyRDSR << index));
+                               data = cyy_readb(info, CyRDSR);
                }
                goto end;
        }
        /* there is an open port for this data */
-       tty = info->port.tty;
-       if ((readb(base_addr + (CyRIVR << index)) & CyIVRMask) ==
-                       CyIVRRxEx) {    /* exception */
-               data = readb(base_addr + (CyRDSR << index));
+       if (ivr == CyIVRRxEx) { /* exception */
+               data = cyy_readb(info, CyRDSR);
 
                /* For statistics only */
                if (data & CyBREAK)
@@ -1041,28 +489,29 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
 
                if (data & info->ignore_status_mask) {
                        info->icount.rx++;
+                       tty_kref_put(tty);
                        return;
                }
                if (tty_buffer_request_room(tty, 1)) {
                        if (data & info->read_status_mask) {
                                if (data & CyBREAK) {
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_BREAK);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_BREAK);
                                        info->icount.rx++;
                                        if (info->port.flags & ASYNC_SAK)
                                                do_SAK(tty);
                                } else if (data & CyFRAME) {
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_FRAME);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_FRAME);
                                        info->icount.rx++;
                                        info->idle_stats.frame_errs++;
                                } else if (data & CyPARITY) {
                                        /* Pieces of seven... */
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_PARITY);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_PARITY);
                                        info->icount.rx++;
                                        info->idle_stats.parity_errs++;
                                } else if (data & CyOVERRUN) {
@@ -1074,8 +523,8 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                                           the next incoming character.
                                         */
                                        tty_insert_flip_char(tty,
-                                               readb(base_addr + (CyRDSR <<
-                                                       index)), TTY_FRAME);
+                                               cyy_readb(info, CyRDSR),
+                                               TTY_FRAME);
                                        info->icount.rx++;
                                        info->idle_stats.overruns++;
                                /* These two conditions may imply */
@@ -1099,7 +548,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                }
        } else {        /* normal character reception */
                /* load # chars available from the chip */
-               char_count = readb(base_addr + (CyRDCR << index));
+               char_count = cyy_readb(info, CyRDCR);
 
 #ifdef CY_ENABLE_MONITORING
                ++info->mon.int_count;
@@ -1110,7 +559,7 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
 #endif
                len = tty_buffer_request_room(tty, char_count);
                while (len--) {
-                       data = readb(base_addr + (CyRDSR << index));
+                       data = cyy_readb(info, CyRDSR);
                        tty_insert_flip_char(tty, data, TTY_NORMAL);
                        info->idle_stats.recv_bytes++;
                        info->icount.rx++;
@@ -1121,16 +570,18 @@ static void cyy_chip_rx(struct cyclades_card *cinfo, int chip,
                info->idle_stats.recv_idle = jiffies;
        }
        tty_schedule_flip(tty);
+       tty_kref_put(tty);
 end:
        /* end of service */
-       cy_writeb(base_addr + (CyRIR << index), save_xir & 0x3f);
-       cy_writeb(base_addr + (CyCAR << index), save_car);
+       cyy_writeb(info, CyRIR, save_xir & 0x3f);
+       cyy_writeb(info, CyCAR, save_car);
 }
 
 static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                void __iomem *base_addr)
 {
        struct cyclades_port *info;
+       struct tty_struct *tty;
        int char_count, index = cinfo->bus_index;
        u8 save_xir, channel, save_car, outch;
 
@@ -1154,9 +605,9 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                goto end;
        }
        info = &cinfo->ports[channel + chip * 4];
-       if (info->port.tty == NULL) {
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) & ~CyTxRdy);
+       tty = tty_port_tty_get(&info->port);
+       if (tty == NULL) {
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyTxRdy);
                goto end;
        }
 
@@ -1165,7 +616,7 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
 
        if (info->x_char) {     /* send special char */
                outch = info->x_char;
-               cy_writeb(base_addr + (CyTDR << index), outch);
+               cyy_writeb(info, CyTDR, outch);
                char_count--;
                info->icount.tx++;
                info->x_char = 0;
@@ -1173,14 +624,14 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
 
        if (info->breakon || info->breakoff) {
                if (info->breakon) {
-                       cy_writeb(base_addr + (CyTDR << index), 0);
-                       cy_writeb(base_addr + (CyTDR << index), 0x81);
+                       cyy_writeb(info, CyTDR, 0);
+                       cyy_writeb(info, CyTDR, 0x81);
                        info->breakon = 0;
                        char_count -= 2;
                }
                if (info->breakoff) {
-                       cy_writeb(base_addr + (CyTDR << index), 0);
-                       cy_writeb(base_addr + (CyTDR << index), 0x83);
+                       cyy_writeb(info, CyTDR, 0);
+                       cyy_writeb(info, CyTDR, 0x83);
                        info->breakoff = 0;
                        char_count -= 2;
                }
@@ -1188,27 +639,23 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
 
        while (char_count-- > 0) {
                if (!info->xmit_cnt) {
-                       if (readb(base_addr + (CySRER << index)) & CyTxMpty) {
-                               cy_writeb(base_addr + (CySRER << index),
-                                       readb(base_addr + (CySRER << index)) &
-                                               ~CyTxMpty);
+                       if (cyy_readb(info, CySRER) & CyTxMpty) {
+                               cyy_writeb(info, CySRER,
+                                       cyy_readb(info, CySRER) & ~CyTxMpty);
                        } else {
-                               cy_writeb(base_addr + (CySRER << index),
-                                       (readb(base_addr + (CySRER << index)) &
-                                               ~CyTxRdy) | CyTxMpty);
+                               cyy_writeb(info, CySRER, CyTxMpty |
+                                       (cyy_readb(info, CySRER) & ~CyTxRdy));
                        }
                        goto done;
                }
                if (info->port.xmit_buf == NULL) {
-                       cy_writeb(base_addr + (CySRER << index),
-                               readb(base_addr + (CySRER << index)) &
-                                       ~CyTxRdy);
+                       cyy_writeb(info, CySRER,
+                               cyy_readb(info, CySRER) & ~CyTxRdy);
                        goto done;
                }
-               if (info->port.tty->stopped || info->port.tty->hw_stopped) {
-                       cy_writeb(base_addr + (CySRER << index),
-                               readb(base_addr + (CySRER << index)) &
-                                       ~CyTxRdy);
+               if (tty->stopped || tty->hw_stopped) {
+                       cyy_writeb(info, CySRER,
+                               cyy_readb(info, CySRER) & ~CyTxRdy);
                        goto done;
                }
                /* Because the Embedded Transmit Commands have been enabled,
@@ -1225,15 +672,15 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
                        info->xmit_cnt--;
                        info->xmit_tail = (info->xmit_tail + 1) &
                                        (SERIAL_XMIT_SIZE - 1);
-                       cy_writeb(base_addr + (CyTDR << index), outch);
+                       cyy_writeb(info, CyTDR, outch);
                        info->icount.tx++;
                } else {
                        if (char_count > 1) {
                                info->xmit_cnt--;
                                info->xmit_tail = (info->xmit_tail + 1) &
                                        (SERIAL_XMIT_SIZE - 1);
-                               cy_writeb(base_addr + (CyTDR << index), outch);
-                               cy_writeb(base_addr + (CyTDR << index), 0);
+                               cyy_writeb(info, CyTDR, outch);
+                               cyy_writeb(info, CyTDR, 0);
                                info->icount.tx++;
                                char_count--;
                        }
@@ -1241,17 +688,19 @@ static void cyy_chip_tx(struct cyclades_card *cinfo, unsigned int chip,
        }
 
 done:
-       tty_wakeup(info->port.tty);
+       tty_wakeup(tty);
+       tty_kref_put(tty);
 end:
        /* end of service */
-       cy_writeb(base_addr + (CyTIR << index), save_xir & 0x3f);
-       cy_writeb(base_addr + (CyCAR << index), save_car);
+       cyy_writeb(info, CyTIR, save_xir & 0x3f);
+       cyy_writeb(info, CyCAR, save_car);
 }
 
 static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
                void __iomem *base_addr)
 {
        struct cyclades_port *info;
+       struct tty_struct *tty;
        int index = cinfo->bus_index;
        u8 save_xir, channel, save_car, mdm_change, mdm_status;
 
@@ -1259,13 +708,14 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
        save_xir = readb(base_addr + (CyMIR << index));
        channel = save_xir & CyIRChannel;
        info = &cinfo->ports[channel + chip * 4];
-       save_car = readb(base_addr + (CyCAR << index));
-       cy_writeb(base_addr + (CyCAR << index), save_xir);
+       save_car = cyy_readb(info, CyCAR);
+       cyy_writeb(info, CyCAR, save_xir);
 
-       mdm_change = readb(base_addr + (CyMISR << index));
-       mdm_status = readb(base_addr + (CyMSVR1 << index));
+       mdm_change = cyy_readb(info, CyMISR);
+       mdm_status = cyy_readb(info, CyMSVR1);
 
-       if (!info->port.tty)
+       tty = tty_port_tty_get(&info->port);
+       if (!tty)
                goto end;
 
        if (mdm_change & CyANY_DELTA) {
@@ -1279,35 +729,32 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
                if (mdm_change & CyRI)
                        info->icount.rng++;
 
-               wake_up_interruptible(&info->delta_msr_wait);
+               wake_up_interruptible(&info->port.delta_msr_wait);
        }
 
        if ((mdm_change & CyDCD) && (info->port.flags & ASYNC_CHECK_CD)) {
-               if (!(mdm_status & CyDCD)) {
-                       tty_hangup(info->port.tty);
-                       info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-               }
-               wake_up_interruptible(&info->port.open_wait);
+               if (mdm_status & CyDCD)
+                       wake_up_interruptible(&info->port.open_wait);
+               else
+                       tty_hangup(tty);
        }
        if ((mdm_change & CyCTS) && (info->port.flags & ASYNC_CTS_FLOW)) {
-               if (info->port.tty->hw_stopped) {
+               if (tty->hw_stopped) {
                        if (mdm_status & CyCTS) {
                                /* cy_start isn't used
                                   because... !!! */
-                               info->port.tty->hw_stopped = 0;
-                               cy_writeb(base_addr + (CySRER << index),
-                                       readb(base_addr + (CySRER << index)) |
-                                               CyTxRdy);
-                               tty_wakeup(info->port.tty);
+                               tty->hw_stopped = 0;
+                               cyy_writeb(info, CySRER,
+                                       cyy_readb(info, CySRER) | CyTxRdy);
+                               tty_wakeup(tty);
                        }
                } else {
                        if (!(mdm_status & CyCTS)) {
                                /* cy_stop isn't used
                                   because ... !!! */
-                               info->port.tty->hw_stopped = 1;
-                               cy_writeb(base_addr + (CySRER << index),
-                                       readb(base_addr + (CySRER << index)) &
-                                               ~CyTxRdy);
+                               tty->hw_stopped = 1;
+                               cyy_writeb(info, CySRER,
+                                       cyy_readb(info, CySRER) & ~CyTxRdy);
                        }
                }
        }
@@ -1315,10 +762,11 @@ static void cyy_chip_modem(struct cyclades_card *cinfo, int chip,
        }
        if (mdm_change & CyRI) {
        }*/
+       tty_kref_put(tty);
 end:
        /* end of service */
-       cy_writeb(base_addr + (CyMIR << index), save_xir & 0x3f);
-       cy_writeb(base_addr + (CyCAR << index), save_car);
+       cyy_writeb(info, CyMIR, save_xir & 0x3f);
+       cyy_writeb(info, CyCAR, save_car);
 }
 
 /* The real interrupt service routine is called
@@ -1389,6 +837,56 @@ static irqreturn_t cyy_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }                              /* cyy_interrupt */
 
+static void cyy_change_rts_dtr(struct cyclades_port *info, unsigned int set,
+               unsigned int clear)
+{
+       struct cyclades_card *card = info->card;
+       int channel = info->line - card->first_line;
+       u32 rts, dtr, msvrr, msvrd;
+
+       channel &= 0x03;
+
+       if (info->rtsdtr_inv) {
+               msvrr = CyMSVR2;
+               msvrd = CyMSVR1;
+               rts = CyDTR;
+               dtr = CyRTS;
+       } else {
+               msvrr = CyMSVR1;
+               msvrd = CyMSVR2;
+               rts = CyRTS;
+               dtr = CyDTR;
+       }
+       if (set & TIOCM_RTS) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrr, rts);
+       }
+       if (clear & TIOCM_RTS) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrr, ~rts);
+       }
+       if (set & TIOCM_DTR) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrd, dtr);
+#ifdef CY_DEBUG_DTR
+               printk(KERN_DEBUG "cyc:set_modem_info raising DTR\n");
+               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                       cyy_readb(info, CyMSVR1),
+                       cyy_readb(info, CyMSVR2));
+#endif
+       }
+       if (clear & TIOCM_DTR) {
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, msvrd, ~dtr);
+#ifdef CY_DEBUG_DTR
+               printk(KERN_DEBUG "cyc:set_modem_info dropping DTR\n");
+               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
+                       cyy_readb(info, CyMSVR1),
+                       cyy_readb(info, CyMSVR2));
+#endif
+       }
+}
+
 /***********************************************************/
 /********* End of block of Cyclom-Y specific code **********/
 /******** Start of block of Cyclades-Z specific code *******/
@@ -1398,15 +896,9 @@ static int
 cyz_fetch_msg(struct cyclades_card *cinfo,
                __u32 *channel, __u8 *cmd, __u32 *param)
 {
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
+       struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
        unsigned long loc_doorbell;
 
-       firm_id = cinfo->base_addr + ID_ADDRESS;
-       zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-       board_ctrl = &zfw_ctrl->board_ctrl;
-
        loc_doorbell = readl(&cinfo->ctl_addr.p9060->loc_doorbell);
        if (loc_doorbell) {
                *cmd = (char)(0xff & loc_doorbell);
@@ -1422,19 +914,13 @@ static int
 cyz_issue_cmd(struct cyclades_card *cinfo,
                __u32 channel, __u8 cmd, __u32 param)
 {
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
+       struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
        __u32 __iomem *pci_doorbell;
        unsigned int index;
 
-       firm_id = cinfo->base_addr + ID_ADDRESS;
        if (!cyz_is_loaded(cinfo))
                return -1;
 
-       zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-       board_ctrl = &zfw_ctrl->board_ctrl;
-
        index = 0;
        pci_doorbell = &cinfo->ctl_addr.p9060->pci_doorbell;
        while ((readl(pci_doorbell) & 0xff) != 0) {
@@ -1449,11 +935,10 @@ cyz_issue_cmd(struct cyclades_card *cinfo,
        return 0;
 }                              /* cyz_issue_cmd */
 
-static void cyz_handle_rx(struct cyclades_port *info,
-               struct BUF_CTRL __iomem *buf_ctrl)
+static void cyz_handle_rx(struct cyclades_port *info, struct tty_struct *tty)
 {
+       struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
        struct cyclades_card *cinfo = info->card;
-       struct tty_struct *tty = info->port.tty;
        unsigned int char_count;
        int len;
 #ifdef BLOCKMOVE
@@ -1542,11 +1027,10 @@ static void cyz_handle_rx(struct cyclades_port *info,
        }
 }
 
-static void cyz_handle_tx(struct cyclades_port *info,
-               struct BUF_CTRL __iomem *buf_ctrl)
+static void cyz_handle_tx(struct cyclades_port *info, struct tty_struct *tty)
 {
+       struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
        struct cyclades_card *cinfo = info->card;
-       struct tty_struct *tty = info->port.tty;
        u8 data;
        unsigned int char_count;
 #ifdef BLOCKMOVE
@@ -1621,34 +1105,24 @@ ztxdone:
 
 static void cyz_handle_cmd(struct cyclades_card *cinfo)
 {
+       struct BOARD_CTRL __iomem *board_ctrl = cinfo->board_ctrl;
        struct tty_struct *tty;
        struct cyclades_port *info;
-       static struct FIRM_ID __iomem *firm_id;
-       static struct ZFW_CTRL __iomem *zfw_ctrl;
-       static struct BOARD_CTRL __iomem *board_ctrl;
-       static struct CH_CTRL __iomem *ch_ctrl;
-       static struct BUF_CTRL __iomem *buf_ctrl;
        __u32 channel, param, fw_ver;
        __u8 cmd;
        int special_count;
        int delta_count;
 
-       firm_id = cinfo->base_addr + ID_ADDRESS;
-       zfw_ctrl = cinfo->base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-       board_ctrl = &zfw_ctrl->board_ctrl;
        fw_ver = readl(&board_ctrl->fw_version);
 
        while (cyz_fetch_msg(cinfo, &channel, &cmd, &param) == 1) {
                special_count = 0;
                delta_count = 0;
                info = &cinfo->ports[channel];
-               tty = info->port.tty;
+               tty = tty_port_tty_get(&info->port);
                if (tty == NULL)
                        continue;
 
-               ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
-               buf_ctrl = &(zfw_ctrl->buf_ctrl[channel]);
-
                switch (cmd) {
                case C_CM_PR_ERROR:
                        tty_insert_flip_char(tty, 0, TTY_PARITY);
@@ -1669,15 +1143,12 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        info->icount.dcd++;
                        delta_count++;
                        if (info->port.flags & ASYNC_CHECK_CD) {
-                               if ((fw_ver > 241 ? ((u_long) param) :
-                                               readl(&ch_ctrl->rs_status)) &
-                                               C_RS_DCD) {
+                               u32 dcd = fw_ver > 241 ? param :
+                                       readl(&info->u.cyz.ch_ctrl->rs_status);
+                               if (dcd & C_RS_DCD)
                                        wake_up_interruptible(&info->port.open_wait);
-                               } else {
-                                       tty_hangup(info->port.tty);
-                                       wake_up_interruptible(&info->port.open_wait);
-                                       info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-                               }
+                               else
+                                       tty_hangup(tty);
                        }
                        break;
                case C_CM_MCTS:
@@ -1706,7 +1177,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        printk(KERN_DEBUG "cyz_interrupt: rcvd intr, card %d, "
                                        "port %ld\n", info->card, channel);
 #endif
-                       cyz_handle_rx(info, buf_ctrl);
+                       cyz_handle_rx(info, tty);
                        break;
                case C_CM_TXBEMPTY:
                case C_CM_TXLOWWM:
@@ -1716,7 +1187,7 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        printk(KERN_DEBUG "cyz_interrupt: xmit intr, card %d, "
                                        "port %ld\n", info->card, channel);
 #endif
-                       cyz_handle_tx(info, buf_ctrl);
+                       cyz_handle_tx(info, tty);
                        break;
 #endif                         /* CONFIG_CYZ_INTR */
                case C_CM_FATAL:
@@ -1726,9 +1197,10 @@ static void cyz_handle_cmd(struct cyclades_card *cinfo)
                        break;
                }
                if (delta_count)
-                       wake_up_interruptible(&info->delta_msr_wait);
+                       wake_up_interruptible(&info->port.delta_msr_wait);
                if (special_count)
                        tty_schedule_flip(tty);
+               tty_kref_put(tty);
        }
 }
 
@@ -1774,10 +1246,6 @@ static void cyz_poll(unsigned long arg)
 {
        struct cyclades_card *cinfo;
        struct cyclades_port *info;
-       struct tty_struct *tty;
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BUF_CTRL __iomem *buf_ctrl;
        unsigned long expires = jiffies + HZ;
        unsigned int port, card;
 
@@ -1789,10 +1257,6 @@ static void cyz_poll(unsigned long arg)
                if (!cyz_is_loaded(cinfo))
                        continue;
 
-               firm_id = cinfo->base_addr + ID_ADDRESS;
-               zfw_ctrl = cinfo->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-
        /* Skip first polling cycle to avoid racing conditions with the FW */
                if (!cinfo->intr_enabled) {
                        cinfo->intr_enabled = 1;
@@ -1802,13 +1266,17 @@ static void cyz_poll(unsigned long arg)
                cyz_handle_cmd(cinfo);
 
                for (port = 0; port < cinfo->nports; port++) {
+                       struct tty_struct *tty;
+
                        info = &cinfo->ports[port];
-                       tty = info->port.tty;
-                       buf_ctrl = &(zfw_ctrl->buf_ctrl[port]);
+                       tty = tty_port_tty_get(&info->port);
+                       /* OK to pass NULL to the handle functions below.
+                          They need to drop the data in that case. */
 
                        if (!info->throttle)
-                               cyz_handle_rx(info, buf_ctrl);
-                       cyz_handle_tx(info, buf_ctrl);
+                               cyz_handle_rx(info, tty);
+                       cyz_handle_tx(info, tty);
+                       tty_kref_put(tty);
                }
                /* poll every 'cyz_polling_cycle' period */
                expires = jiffies + cyz_polling_cycle;
@@ -1824,13 +1292,12 @@ static void cyz_poll(unsigned long arg)
 /* This is called whenever a port becomes active;
    interrupts are enabled and DTR & RTS are turned on.
  */
-static int startup(struct cyclades_port *info)
+static int cy_startup(struct cyclades_port *info, struct tty_struct *tty)
 {
        struct cyclades_card *card;
        unsigned long flags;
        int retval = 0;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned long page;
 
        card = info->card;
@@ -1842,15 +1309,11 @@ static int startup(struct cyclades_port *info)
 
        spin_lock_irqsave(&card->card_lock, flags);
 
-       if (info->port.flags & ASYNC_INITIALIZED) {
-               free_page(page);
+       if (info->port.flags & ASYNC_INITIALIZED)
                goto errout;
-       }
 
        if (!info->type) {
-               if (info->port.tty)
-                       set_bit(TTY_IO_ERROR, &info->port.tty->flags);
-               free_page(page);
+               set_bit(TTY_IO_ERROR, &tty->flags);
                goto errout;
        }
 
@@ -1861,96 +1324,53 @@ static int startup(struct cyclades_port *info)
 
        spin_unlock_irqrestore(&card->card_lock, flags);
 
-       set_line_char(info);
+       cy_set_line_char(info, tty);
 
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
                channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
-#ifdef CY_DEBUG_OPEN
-               printk(KERN_DEBUG "cyc startup card %d, chip %d, channel %d, "
-                               "base_addr %p\n",
-                               card, chip, channel, base_addr);
-#endif
                spin_lock_irqsave(&card->card_lock, flags);
 
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
+               cyy_writeb(info, CyCAR, channel);
 
-               cy_writeb(base_addr + (CyRTPR << index),
+               cyy_writeb(info, CyRTPR,
                        (info->default_timeout ? info->default_timeout : 0x02));
                /* 10ms rx timeout */
 
-               cyy_issue_cmd(base_addr, CyCHAN_CTL | CyENB_RCVR | CyENB_XMTR,
-                               index);
-
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               cy_writeb(base_addr + (CyMSVR1 << index), CyRTS);
-               cy_writeb(base_addr + (CyMSVR2 << index), CyDTR);
-
-#ifdef CY_DEBUG_DTR
-               printk(KERN_DEBUG "cyc:startup raising DTR\n");
-               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                       readb(base_addr + (CyMSVR1 << index)),
-                       readb(base_addr + (CyMSVR2 << index)));
-#endif
-
-               cy_writeb(base_addr + (CySRER << index),
-                       readb(base_addr + (CySRER << index)) | CyRxData);
-               info->port.flags |= ASYNC_INITIALIZED;
-
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-               info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-               info->breakon = info->breakoff = 0;
-               memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
-               info->idle_stats.in_use =
-               info->idle_stats.recv_idle =
-               info->idle_stats.xmit_idle = jiffies;
+               cyy_issue_cmd(info, CyCHAN_CTL | CyENB_RCVR | CyENB_XMTR);
 
-               spin_unlock_irqrestore(&card->card_lock, flags);
+               cyy_change_rts_dtr(info, TIOCM_RTS | TIOCM_DTR, 0);
 
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyRxData);
        } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct BOARD_CTRL __iomem *board_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
 
-               base_addr = card->base_addr;
-
-               firm_id = base_addr + ID_ADDRESS;
                if (!cyz_is_loaded(card))
                        return -ENODEV;
 
-               zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               board_ctrl = &zfw_ctrl->board_ctrl;
-               ch_ctrl = zfw_ctrl->ch_ctrl;
-
 #ifdef CY_DEBUG_OPEN
                printk(KERN_DEBUG "cyc startup Z card %d, channel %d, "
-                       "base_addr %p\n", card, channel, base_addr);
+                       "base_addr %p\n", card, channel, card->base_addr);
 #endif
                spin_lock_irqsave(&card->card_lock, flags);
 
-               cy_writel(&ch_ctrl[channel].op_mode, C_CH_ENABLE);
+               cy_writel(&ch_ctrl->op_mode, C_CH_ENABLE);
 #ifdef Z_WAKE
 #ifdef CONFIG_CYZ_INTR
-               cy_writel(&ch_ctrl[channel].intr_enable,
+               cy_writel(&ch_ctrl->intr_enable,
                          C_IN_TXBEMPTY | C_IN_TXLOWWM | C_IN_RXHIWM |
                          C_IN_RXNNDT | C_IN_IOCTLW | C_IN_MDCD);
 #else
-               cy_writel(&ch_ctrl[channel].intr_enable,
+               cy_writel(&ch_ctrl->intr_enable,
                          C_IN_IOCTLW | C_IN_MDCD);
 #endif                         /* CONFIG_CYZ_INTR */
 #else
 #ifdef CONFIG_CYZ_INTR
-               cy_writel(&ch_ctrl[channel].intr_enable,
+               cy_writel(&ch_ctrl->intr_enable,
                          C_IN_TXBEMPTY | C_IN_TXLOWWM | C_IN_RXHIWM |
                          C_IN_RXNNDT | C_IN_MDCD);
 #else
-               cy_writel(&ch_ctrl[channel].intr_enable, C_IN_MDCD);
+               cy_writel(&ch_ctrl->intr_enable, C_IN_MDCD);
 #endif                         /* CONFIG_CYZ_INTR */
 #endif                         /* Z_WAKE */
 
@@ -1969,32 +1389,22 @@ static int startup(struct cyclades_port *info)
 
                /* set timeout !!! */
                /* set RTS and DTR !!! */
-               cy_writel(&ch_ctrl[channel].rs_control,
-                       readl(&ch_ctrl[channel].rs_control) | C_RS_RTS |
-                       C_RS_DTR);
-               retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
-               if (retval != 0) {
-                       printk(KERN_ERR "cyc:startup(3) retval on ttyC%d was "
-                               "%x\n", info->line, retval);
-               }
-#ifdef CY_DEBUG_DTR
-               printk(KERN_DEBUG "cyc:startup raising Z DTR\n");
-#endif
+               tty_port_raise_dtr_rts(&info->port);
 
                /* enable send, recv, modem !!! */
+       }
 
-               info->port.flags |= ASYNC_INITIALIZED;
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
-               info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
-               info->breakon = info->breakoff = 0;
-               memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
-               info->idle_stats.in_use =
-               info->idle_stats.recv_idle =
-               info->idle_stats.xmit_idle = jiffies;
+       info->port.flags |= ASYNC_INITIALIZED;
 
-               spin_unlock_irqrestore(&card->card_lock, flags);
-       }
+       clear_bit(TTY_IO_ERROR, &tty->flags);
+       info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
+       info->breakon = info->breakoff = 0;
+       memset((char *)&info->idle_stats, 0, sizeof(info->idle_stats));
+       info->idle_stats.in_use =
+       info->idle_stats.recv_idle =
+       info->idle_stats.xmit_idle = jiffies;
+
+       spin_unlock_irqrestore(&card->card_lock, flags);
 
 #ifdef CY_DEBUG_OPEN
        printk(KERN_DEBUG "cyc startup done\n");
@@ -2003,28 +1413,20 @@ static int startup(struct cyclades_port *info)
 
 errout:
        spin_unlock_irqrestore(&card->card_lock, flags);
+       free_page(page);
        return retval;
 }                              /* startup */
 
 static void start_xmit(struct cyclades_port *info)
 {
-       struct cyclades_card *card;
+       struct cyclades_card *card = info->card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel = info->line - card->first_line;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index), channel);
-               cy_writeb(base_addr + (CySRER << index),
-                       readb(base_addr + (CySRER << index)) | CyTxRdy);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyTxRdy);
                spin_unlock_irqrestore(&card->card_lock, flags);
        } else {
 #ifdef CONFIG_CYZ_INTR
@@ -2047,12 +1449,11 @@ static void start_xmit(struct cyclades_port *info)
  * This routine shuts down a serial port; interrupts are disabled,
  * and DTR is dropped if the hangup on close termio flag is on.
  */
-static void shutdown(struct cyclades_port *info)
+static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
 {
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
 
        if (!(info->port.flags & ASYNC_INITIALIZED))
                return;
@@ -2060,21 +1461,10 @@ static void shutdown(struct cyclades_port *info)
        card = info->card;
        channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
-#ifdef CY_DEBUG_OPEN
-               printk(KERN_DEBUG "cyc shutdown Y card %d, chip %d, "
-                               "channel %d, base_addr %p\n",
-                               card, chip, channel, base_addr);
-#endif
-
                spin_lock_irqsave(&card->card_lock, flags);
 
                /* Clear delta_msr_wait queue to avoid mem leaks. */
-               wake_up_interruptible(&info->delta_msr_wait);
+               wake_up_interruptible(&info->port.delta_msr_wait);
 
                if (info->port.xmit_buf) {
                        unsigned char *temp;
@@ -2082,47 +1472,25 @@ static void shutdown(struct cyclades_port *info)
                        info->port.xmit_buf = NULL;
                        free_page((unsigned long)temp);
                }
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) {
-                       cy_writeb(base_addr + (CyMSVR1 << index), ~CyRTS);
-                       cy_writeb(base_addr + (CyMSVR2 << index), ~CyDTR);
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc shutdown dropping DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
-#endif
-               }
-               cyy_issue_cmd(base_addr, CyCHAN_CTL | CyDIS_RCVR, index);
+               if (tty->termios->c_cflag & HUPCL)
+                       cyy_change_rts_dtr(info, 0, TIOCM_RTS | TIOCM_DTR);
+
+               cyy_issue_cmd(info, CyCHAN_CTL | CyDIS_RCVR);
                /* it may be appropriate to clear _XMIT at
                   some later date (after testing)!!! */
 
-               if (info->port.tty)
-                       set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               set_bit(TTY_IO_ERROR, &tty->flags);
                info->port.flags &= ~ASYNC_INITIALIZED;
                spin_unlock_irqrestore(&card->card_lock, flags);
        } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct BOARD_CTRL __iomem *board_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
-               int retval;
-
-               base_addr = card->base_addr;
 #ifdef CY_DEBUG_OPEN
                printk(KERN_DEBUG "cyc shutdown Z card %d, channel %d, "
-                       "base_addr %p\n", card, channel, base_addr);
+                       "base_addr %p\n", card, channel, card->base_addr);
 #endif
 
-               firm_id = base_addr + ID_ADDRESS;
                if (!cyz_is_loaded(card))
                        return;
 
-               zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               board_ctrl = &zfw_ctrl->board_ctrl;
-               ch_ctrl = zfw_ctrl->ch_ctrl;
-
                spin_lock_irqsave(&card->card_lock, flags);
 
                if (info->port.xmit_buf) {
@@ -2132,23 +1500,10 @@ static void shutdown(struct cyclades_port *info)
                        free_page((unsigned long)temp);
                }
 
-               if (!info->port.tty || (info->port.tty->termios->c_cflag & HUPCL)) {
-                       cy_writel(&ch_ctrl[channel].rs_control,
-                               (__u32)(readl(&ch_ctrl[channel].rs_control) &
-                                       ~(C_RS_RTS | C_RS_DTR)));
-                       retval = cyz_issue_cmd(info->card, channel,
-                                       C_CM_IOCTLM, 0L);
-                       if (retval != 0) {
-                               printk(KERN_ERR"cyc:shutdown retval on ttyC%d "
-                                       "was %x\n", info->line, retval);
-                       }
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:shutdown dropping Z DTR\n");
-#endif
-               }
+               if (tty->termios->c_cflag & HUPCL)
+                       tty_port_lower_dtr_rts(&info->port);
 
-               if (info->port.tty)
-                       set_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               set_bit(TTY_IO_ERROR, &tty->flags);
                info->port.flags &= ~ASYNC_INITIALIZED;
 
                spin_unlock_irqrestore(&card->card_lock, flags);
@@ -2165,199 +1520,6 @@ static void shutdown(struct cyclades_port *info)
  * ------------------------------------------------------------
  */
 
-static int
-block_til_ready(struct tty_struct *tty, struct file *filp,
-               struct cyclades_port *info)
-{
-       DECLARE_WAITQUEUE(wait, current);
-       struct cyclades_card *cinfo;
-       unsigned long flags;
-       int chip, channel, index;
-       int retval;
-       void __iomem *base_addr;
-
-       cinfo = info->card;
-       channel = info->line - cinfo->first_line;
-
-       /*
-        * If the device is in the middle of being closed, then block
-        * until it's done, and then try again.
-        */
-       if (tty_hung_up_p(filp) || (info->port.flags & ASYNC_CLOSING)) {
-               wait_event_interruptible(info->port.close_wait,
-                               !(info->port.flags & ASYNC_CLOSING));
-               return (info->port.flags & ASYNC_HUP_NOTIFY) ? -EAGAIN: -ERESTARTSYS;
-       }
-
-       /*
-        * If non-blocking mode is set, then make the check up front
-        * and then exit.
-        */
-       if ((filp->f_flags & O_NONBLOCK) ||
-                                       (tty->flags & (1 << TTY_IO_ERROR))) {
-               info->port.flags |= ASYNC_NORMAL_ACTIVE;
-               return 0;
-       }
-
-       /*
-        * Block waiting for the carrier detect and the line to become
-        * free (i.e., not in use by the callout).  While we are in
-        * this loop, info->port.count is dropped by one, so that
-        * cy_close() knows when to free things.  We restore it upon
-        * exit, either normal or abnormal.
-        */
-       retval = 0;
-       add_wait_queue(&info->port.open_wait, &wait);
-#ifdef CY_DEBUG_OPEN
-       printk(KERN_DEBUG "cyc block_til_ready before block: ttyC%d, "
-               "count = %d\n", info->line, info->port.count);
-#endif
-       spin_lock_irqsave(&cinfo->card_lock, flags);
-       if (!tty_hung_up_p(filp))
-               info->port.count--;
-       spin_unlock_irqrestore(&cinfo->card_lock, flags);
-#ifdef CY_DEBUG_COUNT
-       printk(KERN_DEBUG "cyc block_til_ready: (%d): decrementing count to "
-               "%d\n", current->pid, info->port.count);
-#endif
-       info->port.blocked_open++;
-
-       if (!cy_is_Z(cinfo)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = cinfo->bus_index;
-               base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
-
-               while (1) {
-                       spin_lock_irqsave(&cinfo->card_lock, flags);
-                       if ((tty->termios->c_cflag & CBAUD)) {
-                               cy_writeb(base_addr + (CyCAR << index),
-                                         (u_char) channel);
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-#ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:block_til_ready raising "
-                                       "DTR\n");
-                               printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                                       readb(base_addr + (CyMSVR1 << index)),
-                                       readb(base_addr + (CyMSVR2 << index)));
-#endif
-                       }
-                       spin_unlock_irqrestore(&cinfo->card_lock, flags);
-
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       if (tty_hung_up_p(filp) ||
-                                       !(info->port.flags & ASYNC_INITIALIZED)) {
-                               retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                                         -EAGAIN : -ERESTARTSYS);
-                               break;
-                       }
-
-                       spin_lock_irqsave(&cinfo->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (!(info->port.flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
-                                       (readb(base_addr +
-                                               (CyMSVR1 << index)) & CyDCD))) {
-                               spin_unlock_irqrestore(&cinfo->card_lock, flags);
-                               break;
-                       }
-                       spin_unlock_irqrestore(&cinfo->card_lock, flags);
-
-                       if (signal_pending(current)) {
-                               retval = -ERESTARTSYS;
-                               break;
-                       }
-#ifdef CY_DEBUG_OPEN
-                       printk(KERN_DEBUG "cyc block_til_ready blocking: "
-                               "ttyC%d, count = %d\n",
-                               info->line, info->port.count);
-#endif
-                       schedule();
-               }
-       } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct BOARD_CTRL __iomem *board_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
-
-               base_addr = cinfo->base_addr;
-               firm_id = base_addr + ID_ADDRESS;
-               if (!cyz_is_loaded(cinfo)) {
-                       __set_current_state(TASK_RUNNING);
-                       remove_wait_queue(&info->port.open_wait, &wait);
-                       return -EINVAL;
-               }
-
-               zfw_ctrl = base_addr + (readl(&firm_id->zfwctrl_addr)
-                                                               & 0xfffff);
-               board_ctrl = &zfw_ctrl->board_ctrl;
-               ch_ctrl = zfw_ctrl->ch_ctrl;
-
-               while (1) {
-                       if ((tty->termios->c_cflag & CBAUD)) {
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) |
-                                       C_RS_RTS | C_RS_DTR);
-                               retval = cyz_issue_cmd(cinfo,
-                                       channel, C_CM_IOCTLM, 0L);
-                               if (retval != 0) {
-                                       printk(KERN_ERR "cyc:block_til_ready "
-                                               "retval on ttyC%d was %x\n",
-                                               info->line, retval);
-                               }
-#ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:block_til_ready raising "
-                                       "Z DTR\n");
-#endif
-                       }
-
-                       set_current_state(TASK_INTERRUPTIBLE);
-                       if (tty_hung_up_p(filp) ||
-                                       !(info->port.flags & ASYNC_INITIALIZED)) {
-                               retval = ((info->port.flags & ASYNC_HUP_NOTIFY) ?
-                                         -EAGAIN : -ERESTARTSYS);
-                               break;
-                       }
-                       if (!(info->port.flags & ASYNC_CLOSING) && (C_CLOCAL(tty) ||
-                                       (readl(&ch_ctrl[channel].rs_status) &
-                                               C_RS_DCD))) {
-                               break;
-                       }
-                       if (signal_pending(current)) {
-                               retval = -ERESTARTSYS;
-                               break;
-                       }
-#ifdef CY_DEBUG_OPEN
-                       printk(KERN_DEBUG "cyc block_til_ready blocking: "
-                               "ttyC%d, count = %d\n",
-                               info->line, info->port.count);
-#endif
-                       schedule();
-               }
-       }
-       __set_current_state(TASK_RUNNING);
-       remove_wait_queue(&info->port.open_wait, &wait);
-       if (!tty_hung_up_p(filp)) {
-               info->port.count++;
-#ifdef CY_DEBUG_COUNT
-               printk(KERN_DEBUG "cyc:block_til_ready (%d): incrementing "
-                       "count to %d\n", current->pid, info->port.count);
-#endif
-       }
-       info->port.blocked_open--;
-#ifdef CY_DEBUG_OPEN
-       printk(KERN_DEBUG "cyc:block_til_ready after blocking: ttyC%d, "
-               "count = %d\n", info->line, info->port.count);
-#endif
-       if (retval)
-               return retval;
-       info->port.flags |= ASYNC_NORMAL_ACTIVE;
-       return 0;
-}                              /* block_til_ready */
-
 /*
  * This routine is called whenever a serial port is opened.  It
  * performs the serial-specific initialization for the tty structure.
@@ -2436,7 +1598,6 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
        printk(KERN_DEBUG "cyc:cy_open ttyC%d\n", info->line);
 #endif
        tty->driver_data = info;
-       info->port.tty = tty;
        if (serial_paranoia_check(info, tty->name, "cy_open"))
                return -ENODEV;
 
@@ -2462,11 +1623,11 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
        /*
         * Start up serial port
         */
-       retval = startup(info);
+       retval = cy_startup(info, tty);
        if (retval)
                return retval;
 
-       retval = block_til_ready(tty, filp, info);
+       retval = tty_port_block_til_ready(&info->port, tty, filp);
        if (retval) {
 #ifdef CY_DEBUG_OPEN
                printk(KERN_DEBUG "cyc:cy_open returning after block_til_ready "
@@ -2476,6 +1637,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
        }
 
        info->throttle = 0;
+       tty_port_tty_set(&info->port, tty);
 
 #ifdef CY_DEBUG_OPEN
        printk(KERN_DEBUG "cyc:cy_open done\n");
@@ -2490,8 +1652,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
 {
        struct cyclades_card *card;
        struct cyclades_port *info = tty->driver_data;
-       void __iomem *base_addr;
-       int chip, channel, index;
        unsigned long orig_jiffies;
        int char_time;
 
@@ -2535,13 +1695,8 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
                timeout, char_time, jiffies);
 #endif
        card = info->card;
-       channel = (info->line) - (card->first_line);
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-               while (readb(base_addr + (CySRER << index)) & CyTxRdy) {
+               while (cyy_readb(info, CySRER) & CyTxRdy) {
 #ifdef CY_DEBUG_WAIT_UNTIL_SENT
                        printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
 #endif
@@ -2595,103 +1750,37 @@ static void cy_flush_buffer(struct tty_struct *tty)
 }                              /* cy_flush_buffer */
 
 
-/*
- * This routine is called when a particular tty device is closed.
- */
-static void cy_close(struct tty_struct *tty, struct file *filp)
+static void cy_do_close(struct tty_port *port)
 {
-       struct cyclades_port *info = tty->driver_data;
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                                                               port);
        struct cyclades_card *card;
        unsigned long flags;
-
-#ifdef CY_DEBUG_OTHER
-       printk(KERN_DEBUG "cyc:cy_close ttyC%d\n", info->line);
-#endif
-
-       if (!info || serial_paranoia_check(info, tty->name, "cy_close"))
-               return;
+       int channel;
 
        card = info->card;
-
-       spin_lock_irqsave(&card->card_lock, flags);
-       /* If the TTY is being hung up, nothing to do */
-       if (tty_hung_up_p(filp)) {
-               spin_unlock_irqrestore(&card->card_lock, flags);
-               return;
-       }
-#ifdef CY_DEBUG_OPEN
-       printk(KERN_DEBUG "cyc:cy_close ttyC%d, count = %d\n", info->line,
-               info->port.count);
-#endif
-       if ((tty->count == 1) && (info->port.count != 1)) {
-               /*
-                * Uh, oh.  tty->count is 1, which means that the tty
-                * structure will be freed.  Info->count should always
-                * be one in these conditions.  If it's greater than
-                * one, we've got real problems, since it means the
-                * serial port won't be shutdown.
-                */
-               printk(KERN_ERR "cyc:cy_close: bad serial port count; "
-                       "tty->count is 1, info->port.count is %d\n", info->port.count);
-               info->port.count = 1;
-       }
-#ifdef CY_DEBUG_COUNT
-       printk(KERN_DEBUG  "cyc:cy_close at (%d): decrementing count to %d\n",
-               current->pid, info->port.count - 1);
-#endif
-       if (--info->port.count < 0) {
-#ifdef CY_DEBUG_COUNT
-               printk(KERN_DEBUG "cyc:cyc_close setting count to 0\n");
-#endif
-               info->port.count = 0;
-       }
-       if (info->port.count) {
-               spin_unlock_irqrestore(&card->card_lock, flags);
-               return;
-       }
-       info->port.flags |= ASYNC_CLOSING;
-
-       /*
-        * Now we wait for the transmit buffer to clear; and we notify
-        * the line discipline to only process XON/XOFF characters.
-        */
-       tty->closing = 1;
-       spin_unlock_irqrestore(&card->card_lock, flags);
-       if (info->port.closing_wait != CY_CLOSING_WAIT_NONE)
-               tty_wait_until_sent(tty, info->port.closing_wait);
-
+       channel = info->line - card->first_line;
        spin_lock_irqsave(&card->card_lock, flags);
 
        if (!cy_is_Z(card)) {
-               int channel = info->line - card->first_line;
-               int index = card->bus_index;
-               void __iomem *base_addr = card->base_addr +
-                       (cy_chip_offset[channel >> 2] << index);
                /* Stop accepting input */
-               channel &= 0x03;
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) & ~CyRxData);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyRxData);
                if (info->port.flags & ASYNC_INITIALIZED) {
                        /* Waiting for on-board buffers to be empty before
                           closing the port */
                        spin_unlock_irqrestore(&card->card_lock, flags);
-                       cy_wait_until_sent(tty, info->timeout);
+                       cy_wait_until_sent(port->tty, info->timeout);
                        spin_lock_irqsave(&card->card_lock, flags);
                }
        } else {
 #ifdef Z_WAKE
                /* Waiting for on-board buffers to be empty before closing
                   the port */
-               void __iomem *base_addr = card->base_addr;
-               struct FIRM_ID __iomem *firm_id = base_addr + ID_ADDRESS;
-               struct ZFW_CTRL __iomem *zfw_ctrl =
-                   base_addr + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               struct CH_CTRL __iomem *ch_ctrl = zfw_ctrl->ch_ctrl;
-               int channel = info->line - card->first_line;
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
                int retval;
 
-               if (readl(&ch_ctrl[channel].flow_status) != C_FS_TXIDLE) {
+               if (readl(&ch_ctrl->flow_status) != C_FS_TXIDLE) {
                        retval = cyz_issue_cmd(card, channel, C_CM_IOCTLW, 0L);
                        if (retval != 0) {
                                printk(KERN_DEBUG "cyc:cy_close retval on "
@@ -2703,32 +1792,19 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
                }
 #endif
        }
-
        spin_unlock_irqrestore(&card->card_lock, flags);
-       shutdown(info);
-       cy_flush_buffer(tty);
-       tty_ldisc_flush(tty);
-       spin_lock_irqsave(&card->card_lock, flags);
-
-       tty->closing = 0;
-       info->port.tty = NULL;
-       if (info->port.blocked_open) {
-               spin_unlock_irqrestore(&card->card_lock, flags);
-               if (info->port.close_delay) {
-                       msleep_interruptible(jiffies_to_msecs
-                                               (info->port.close_delay));
-               }
-               wake_up_interruptible(&info->port.open_wait);
-               spin_lock_irqsave(&card->card_lock, flags);
-       }
-       info->port.flags &= ~(ASYNC_NORMAL_ACTIVE | ASYNC_CLOSING);
-       wake_up_interruptible(&info->port.close_wait);
-
-#ifdef CY_DEBUG_OTHER
-       printk(KERN_DEBUG "cyc:cy_close done\n");
-#endif
+       cy_shutdown(info, port->tty);
+}
 
-       spin_unlock_irqrestore(&card->card_lock, flags);
+/*
+ * This routine is called when a particular tty device is closed.
+ */
+static void cy_close(struct tty_struct *tty, struct file *filp)
+{
+       struct cyclades_port *info = tty->driver_data;
+       if (!info || serial_paranoia_check(info, tty->name, "cy_close"))
+               return;
+       tty_port_close(&info->port, tty, filp);
 }                              /* cy_close */
 
 /* This routine gets called when tty_write has put something into
@@ -2871,18 +1947,13 @@ static int cy_write_room(struct tty_struct *tty)
 
 static int cy_chars_in_buffer(struct tty_struct *tty)
 {
-       struct cyclades_card *card;
        struct cyclades_port *info = tty->driver_data;
-       int channel;
 
        if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer"))
                return 0;
 
-       card = info->card;
-       channel = (info->line) - (card->first_line);
-
 #ifdef Z_EXT_CHARS_IN_BUFFER
-       if (!cy_is_Z(card)) {
+       if (!cy_is_Z(info->card)) {
 #endif                         /* Z_EXT_CHARS_IN_BUFFER */
 #ifdef CY_DEBUG_IO
                printk(KERN_DEBUG "cyc:cy_chars_in_buffer ttyC%d %d\n",
@@ -2891,20 +1962,11 @@ static int cy_chars_in_buffer(struct tty_struct *tty)
                return info->xmit_cnt;
 #ifdef Z_EXT_CHARS_IN_BUFFER
        } else {
-               static struct FIRM_ID *firm_id;
-               static struct ZFW_CTRL *zfw_ctrl;
-               static struct CH_CTRL *ch_ctrl;
-               static struct BUF_CTRL *buf_ctrl;
+               struct BUF_CTRL __iomem *buf_ctrl = info->u.cyz.buf_ctrl;
                int char_count;
                __u32 tx_put, tx_get, tx_bufsize;
 
                lock_kernel();
-               firm_id = card->base_addr + ID_ADDRESS;
-               zfw_ctrl = card->base_addr +
-                       (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
-               buf_ctrl = &(zfw_ctrl->buf_ctrl[channel]);
-
                tx_get = readl(&buf_ctrl->tx_get);
                tx_put = readl(&buf_ctrl->tx_put);
                tx_bufsize = readl(&buf_ctrl->tx_bufsize);
@@ -2957,48 +2019,44 @@ static void cyy_baud_calc(struct cyclades_port *info, __u32 baud)
  * This routine finds or computes the various line characteristics.
  * It used to be called config_setup
  */
-static void set_line_char(struct cyclades_port *info)
+static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty)
 {
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned cflag, iflag;
        int baud, baud_rate = 0;
        int i;
 
-       if (!info->port.tty || !info->port.tty->termios)
+       if (!tty->termios) /* XXX can this happen at all? */
                return;
 
        if (info->line == -1)
                return;
 
-       cflag = info->port.tty->termios->c_cflag;
-       iflag = info->port.tty->termios->c_iflag;
+       cflag = tty->termios->c_cflag;
+       iflag = tty->termios->c_iflag;
 
        /*
         * Set up the tty->alt_speed kludge
         */
-       if (info->port.tty) {
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                       info->port.tty->alt_speed = 57600;
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                       info->port.tty->alt_speed = 115200;
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                       info->port.tty->alt_speed = 230400;
-               if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                       info->port.tty->alt_speed = 460800;
-       }
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
+               tty->alt_speed = 57600;
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
+               tty->alt_speed = 115200;
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
+               tty->alt_speed = 230400;
+       if ((info->port.flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
+               tty->alt_speed = 460800;
 
        card = info->card;
        channel = info->line - card->first_line;
 
        if (!cy_is_Z(card)) {
-
-               index = card->bus_index;
+               u32 cflags;
 
                /* baud rate */
-               baud = tty_get_baud_rate(info->port.tty);
+               baud = tty_get_baud_rate(tty);
                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                ASYNC_SPD_CUST) {
                        if (info->custom_divisor)
@@ -3107,124 +2165,68 @@ static void set_line_char(struct cyclades_port *info)
            cable.  Contact Marcio Saito for details.
         ***********************************************/
 
-               chip = channel >> 2;
                channel &= 0x03;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
 
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
+               cyy_writeb(info, CyCAR, channel);
 
                /* tx and rx baud rate */
 
-               cy_writeb(base_addr + (CyTCOR << index), info->tco);
-               cy_writeb(base_addr + (CyTBPR << index), info->tbpr);
-               cy_writeb(base_addr + (CyRCOR << index), info->rco);
-               cy_writeb(base_addr + (CyRBPR << index), info->rbpr);
+               cyy_writeb(info, CyTCOR, info->tco);
+               cyy_writeb(info, CyTBPR, info->tbpr);
+               cyy_writeb(info, CyRCOR, info->rco);
+               cyy_writeb(info, CyRBPR, info->rbpr);
 
                /* set line characteristics  according configuration */
 
-               cy_writeb(base_addr + (CySCHR1 << index),
-                         START_CHAR(info->port.tty));
-               cy_writeb(base_addr + (CySCHR2 << index), STOP_CHAR(info->port.tty));
-               cy_writeb(base_addr + (CyCOR1 << index), info->cor1);
-               cy_writeb(base_addr + (CyCOR2 << index), info->cor2);
-               cy_writeb(base_addr + (CyCOR3 << index), info->cor3);
-               cy_writeb(base_addr + (CyCOR4 << index), info->cor4);
-               cy_writeb(base_addr + (CyCOR5 << index), info->cor5);
+               cyy_writeb(info, CySCHR1, START_CHAR(tty));
+               cyy_writeb(info, CySCHR2, STOP_CHAR(tty));
+               cyy_writeb(info, CyCOR1, info->cor1);
+               cyy_writeb(info, CyCOR2, info->cor2);
+               cyy_writeb(info, CyCOR3, info->cor3);
+               cyy_writeb(info, CyCOR4, info->cor4);
+               cyy_writeb(info, CyCOR5, info->cor5);
 
-               cyy_issue_cmd(base_addr, CyCOR_CHANGE | CyCOR1ch | CyCOR2ch |
-                               CyCOR3ch, index);
+               cyy_issue_cmd(info, CyCOR_CHANGE | CyCOR1ch | CyCOR2ch |
+                               CyCOR3ch);
 
                /* !!! Is this needed? */
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               cy_writeb(base_addr + (CyRTPR << index),
+               cyy_writeb(info, CyCAR, channel);
+               cyy_writeb(info, CyRTPR,
                        (info->default_timeout ? info->default_timeout : 0x02));
                /* 10ms rx timeout */
 
-               if (C_CLOCAL(info->port.tty)) {
-                       /* without modem intr */
-                       cy_writeb(base_addr + (CySRER << index),
-                               readb(base_addr + (CySRER << index)) | CyMdmCh);
-                       /* act on 1->0 modem transitions */
-                       if ((cflag & CRTSCTS) && info->rflow) {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         (CyCTS | rflow_thr[i]));
-                       } else {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         CyCTS);
-                       }
-                       /* act on 0->1 modem transitions */
-                       cy_writeb(base_addr + (CyMCOR2 << index), CyCTS);
-               } else {
-                       /* without modem intr */
-                       cy_writeb(base_addr + (CySRER << index),
-                                 readb(base_addr +
-                                          (CySRER << index)) | CyMdmCh);
-                       /* act on 1->0 modem transitions */
-                       if ((cflag & CRTSCTS) && info->rflow) {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         (CyDSR | CyCTS | CyRI | CyDCD |
-                                          rflow_thr[i]));
-                       } else {
-                               cy_writeb(base_addr + (CyMCOR1 << index),
-                                         CyDSR | CyCTS | CyRI | CyDCD);
-                       }
-                       /* act on 0->1 modem transitions */
-                       cy_writeb(base_addr + (CyMCOR2 << index),
-                                 CyDSR | CyCTS | CyRI | CyDCD);
-               }
+               cflags = CyCTS;
+               if (!C_CLOCAL(tty))
+                       cflags |= CyDSR | CyRI | CyDCD;
+               /* without modem intr */
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyMdmCh);
+               /* act on 1->0 modem transitions */
+               if ((cflag & CRTSCTS) && info->rflow)
+                       cyy_writeb(info, CyMCOR1, cflags | rflow_thr[i]);
+               else
+                       cyy_writeb(info, CyMCOR1, cflags);
+               /* act on 0->1 modem transitions */
+               cyy_writeb(info, CyMCOR2, cflags);
 
-               if (i == 0) {   /* baud rate is zero, turn off line */
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       }
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_line_char dropping DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
-#endif
-               } else {
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       }
-#ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_line_char raising DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
-#endif
-               }
+               if (i == 0)     /* baud rate is zero, turn off line */
+                       cyy_change_rts_dtr(info, 0, TIOCM_DTR);
+               else
+                       cyy_change_rts_dtr(info, TIOCM_DTR, 0);
 
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               clear_bit(TTY_IO_ERROR, &tty->flags);
                spin_unlock_irqrestore(&card->card_lock, flags);
 
        } else {
-               struct FIRM_ID __iomem *firm_id;
-               struct ZFW_CTRL __iomem *zfw_ctrl;
-               struct CH_CTRL __iomem *ch_ctrl;
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
                __u32 sw_flow;
                int retval;
 
-               firm_id = card->base_addr + ID_ADDRESS;
                if (!cyz_is_loaded(card))
                        return;
 
-               zfw_ctrl = card->base_addr +
-                       (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-               ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
-
                /* baud rate */
-               baud = tty_get_baud_rate(info->port.tty);
+               baud = tty_get_baud_rate(tty);
                if (baud == 38400 && (info->port.flags & ASYNC_SPD_MASK) ==
                                ASYNC_SPD_CUST) {
                        if (info->custom_divisor)
@@ -3335,45 +2337,38 @@ static void set_line_char(struct cyclades_port *info)
                                "was %x\n", info->line, retval);
                }
 
-               if (info->port.tty)
-                       clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
+               clear_bit(TTY_IO_ERROR, &tty->flags);
        }
 }                              /* set_line_char */
 
-static int
-get_serial_info(struct cyclades_port *info,
+static int cy_get_serial_info(struct cyclades_port *info,
                struct serial_struct __user *retinfo)
 {
-       struct serial_struct tmp;
        struct cyclades_card *cinfo = info->card;
-
-       if (!retinfo)
-               return -EFAULT;
-       memset(&tmp, 0, sizeof(tmp));
-       tmp.type = info->type;
-       tmp.line = info->line;
-       tmp.port = (info->card - cy_card) * 0x100 + info->line -
-               cinfo->first_line;
-       tmp.irq = cinfo->irq;
-       tmp.flags = info->port.flags;
-       tmp.close_delay = info->port.close_delay;
-       tmp.closing_wait = info->port.closing_wait;
-       tmp.baud_base = info->baud;
-       tmp.custom_divisor = info->custom_divisor;
-       tmp.hub6 = 0;           /*!!! */
+       struct serial_struct tmp = {
+               .type = info->type,
+               .line = info->line,
+               .port = (info->card - cy_card) * 0x100 + info->line -
+                       cinfo->first_line,
+               .irq = cinfo->irq,
+               .flags = info->port.flags,
+               .close_delay = info->port.close_delay,
+               .closing_wait = info->port.closing_wait,
+               .baud_base = info->baud,
+               .custom_divisor = info->custom_divisor,
+               .hub6 = 0,              /*!!! */
+       };
        return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
-}                              /* get_serial_info */
+}
 
 static int
-set_serial_info(struct cyclades_port *info,
+cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
                struct serial_struct __user *new_info)
 {
        struct serial_struct new_serial;
-       struct cyclades_port old_info;
 
        if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
                return -EFAULT;
-       old_info = *info;
 
        if (!capable(CAP_SYS_ADMIN)) {
                if (new_serial.close_delay != info->port.close_delay ||
@@ -3403,10 +2398,10 @@ set_serial_info(struct cyclades_port *info,
 
 check_and_exit:
        if (info->port.flags & ASYNC_INITIALIZED) {
-               set_line_char(info);
+               cy_set_line_char(info, tty);
                return 0;
        } else {
-               return startup(info);
+               return cy_startup(info, tty);
        }
 }                              /* set_serial_info */
 
@@ -3422,24 +2417,14 @@ check_and_exit:
  */
 static int get_lsr_info(struct cyclades_port *info, unsigned int __user *value)
 {
-       struct cyclades_card *card;
-       int chip, channel, index;
-       unsigned char status;
+       struct cyclades_card *card = info->card;
        unsigned int result;
        unsigned long flags;
-       void __iomem *base_addr;
+       u8 status;
 
-       card = info->card;
-       channel = (info->line) - (card->first_line);
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&card->card_lock, flags);
-               status = readb(base_addr + (CySRER << index)) &
-                               (CyTxRdy | CyTxMpty);
+               status = cyy_readb(info, CySRER) & (CyTxRdy | CyTxMpty);
                spin_unlock_irqrestore(&card->card_lock, flags);
                result = (status ? 0 : TIOCSER_TEMT);
        } else {
@@ -3453,34 +2438,23 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
 {
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
-       int chip, channel, index;
-       void __iomem *base_addr;
-       unsigned long flags;
-       unsigned char status;
-       unsigned long lstatus;
-       unsigned int result;
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
-       struct CH_CTRL __iomem *ch_ctrl;
+       int result;
 
        if (serial_paranoia_check(info, tty->name, __func__))
                return -ENODEV;
 
-       lock_kernel();
-
        card = info->card;
-       channel = info->line - card->first_line;
+
+       lock_kernel();
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
+               unsigned long flags;
+               int channel = info->line - card->first_line;
+               u8 status;
 
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index), (u_char) channel);
-               status = readb(base_addr + (CyMSVR1 << index));
-               status |= readb(base_addr + (CyMSVR2 << index));
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               status = cyy_readb(info, CyMSVR1);
+               status |= cyy_readb(info, CyMSVR2);
                spin_unlock_irqrestore(&card->card_lock, flags);
 
                if (info->rtsdtr_inv) {
@@ -3495,27 +2469,22 @@ static int cy_tiocmget(struct tty_struct *tty, struct file *file)
                        ((status & CyDSR) ? TIOCM_DSR : 0) |
                        ((status & CyCTS) ? TIOCM_CTS : 0);
        } else {
-               base_addr = card->base_addr;
-               firm_id = card->base_addr + ID_ADDRESS;
-               if (cyz_is_loaded(card)) {
-                       zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-                       board_ctrl = &zfw_ctrl->board_ctrl;
-                       ch_ctrl = zfw_ctrl->ch_ctrl;
-                       lstatus = readl(&ch_ctrl[channel].rs_status);
-                       result = ((lstatus & C_RS_RTS) ? TIOCM_RTS : 0) |
-                               ((lstatus & C_RS_DTR) ? TIOCM_DTR : 0) |
-                               ((lstatus & C_RS_DCD) ? TIOCM_CAR : 0) |
-                               ((lstatus & C_RS_RI) ? TIOCM_RNG : 0) |
-                               ((lstatus & C_RS_DSR) ? TIOCM_DSR : 0) |
-                               ((lstatus & C_RS_CTS) ? TIOCM_CTS : 0);
-               } else {
-                       result = 0;
-                       unlock_kernel();
-                       return -ENODEV;
+               u32 lstatus;
+
+               if (!cyz_is_loaded(card)) {
+                       result = -ENODEV;
+                       goto end;
                }
 
+               lstatus = readl(&info->u.cyz.ch_ctrl->rs_status);
+               result = ((lstatus & C_RS_RTS) ? TIOCM_RTS : 0) |
+                       ((lstatus & C_RS_DTR) ? TIOCM_DTR : 0) |
+                       ((lstatus & C_RS_DCD) ? TIOCM_CAR : 0) |
+                       ((lstatus & C_RS_RI) ? TIOCM_RNG : 0) |
+                       ((lstatus & C_RS_DSR) ? TIOCM_DSR : 0) |
+                       ((lstatus & C_RS_CTS) ? TIOCM_CTS : 0);
        }
+end:
        unlock_kernel();
        return result;
 }                              /* cy_tiomget */
@@ -3526,150 +2495,53 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
 {
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
-       int chip, channel, index;
-       void __iomem *base_addr;
        unsigned long flags;
-       struct FIRM_ID __iomem *firm_id;
-       struct ZFW_CTRL __iomem *zfw_ctrl;
-       struct BOARD_CTRL __iomem *board_ctrl;
-       struct CH_CTRL __iomem *ch_ctrl;
-       int retval;
 
        if (serial_paranoia_check(info, tty->name, __func__))
                return -ENODEV;
 
        card = info->card;
-       channel = (info->line) - (card->first_line);
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
+               spin_lock_irqsave(&card->card_lock, flags);
+               cyy_change_rts_dtr(info, set, clear);
+               spin_unlock_irqrestore(&card->card_lock, flags);
+       } else {
+               struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
+               int retval, channel = info->line - card->first_line;
+               u32 rs;
 
-               if (set & TIOCM_RTS) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       }
-                       spin_unlock_irqrestore(&card->card_lock, flags);
-               }
-               if (clear & TIOCM_RTS) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       }
-                       spin_unlock_irqrestore(&card->card_lock, flags);
-               }
+               if (!cyz_is_loaded(card))
+                       return -ENODEV;
+
+               spin_lock_irqsave(&card->card_lock, flags);
+               rs = readl(&ch_ctrl->rs_control);
+               if (set & TIOCM_RTS)
+                       rs |= C_RS_RTS;
+               if (clear & TIOCM_RTS)
+                       rs &= ~C_RS_RTS;
                if (set & TIOCM_DTR) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       }
+                       rs |= C_RS_DTR;
 #ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_modem_info raising DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
+                       printk(KERN_DEBUG "cyc:set_modem_info raising Z DTR\n");
 #endif
-                       spin_unlock_irqrestore(&card->card_lock, flags);
                }
                if (clear & TIOCM_DTR) {
-                       spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       }
-
+                       rs &= ~C_RS_DTR;
 #ifdef CY_DEBUG_DTR
-                       printk(KERN_DEBUG "cyc:set_modem_info dropping DTR\n");
-                       printk(KERN_DEBUG "     status: 0x%x, 0x%x\n",
-                               readb(base_addr + (CyMSVR1 << index)),
-                               readb(base_addr + (CyMSVR2 << index)));
+                       printk(KERN_DEBUG "cyc:set_modem_info clearing "
+                               "Z DTR\n");
 #endif
-                       spin_unlock_irqrestore(&card->card_lock, flags);
                }
-       } else {
-               base_addr = card->base_addr;
-
-               firm_id = card->base_addr + ID_ADDRESS;
-               if (cyz_is_loaded(card)) {
-                       zfw_ctrl = card->base_addr +
-                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
-                       board_ctrl = &zfw_ctrl->board_ctrl;
-                       ch_ctrl = zfw_ctrl->ch_ctrl;
-
-                       if (set & TIOCM_RTS) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) |
-                                       C_RS_RTS);
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-                       if (clear & TIOCM_RTS) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) &
-                                       ~C_RS_RTS);
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-                       if (set & TIOCM_DTR) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) |
-                                       C_RS_DTR);
-#ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:set_modem_info raising "
-                                       "Z DTR\n");
-#endif
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-                       if (clear & TIOCM_DTR) {
-                               spin_lock_irqsave(&card->card_lock, flags);
-                               cy_writel(&ch_ctrl[channel].rs_control,
-                                       readl(&ch_ctrl[channel].rs_control) &
-                                       ~C_RS_DTR);
-#ifdef CY_DEBUG_DTR
-                               printk(KERN_DEBUG "cyc:set_modem_info clearing "
-                                       "Z DTR\n");
-#endif
-                               spin_unlock_irqrestore(&card->card_lock, flags);
-                       }
-               } else {
-                       return -ENODEV;
-               }
-               spin_lock_irqsave(&card->card_lock, flags);
+               cy_writel(&ch_ctrl->rs_control, rs);
                retval = cyz_issue_cmd(card, channel, C_CM_IOCTLM, 0L);
+               spin_unlock_irqrestore(&card->card_lock, flags);
                if (retval != 0) {
                        printk(KERN_ERR "cyc:set_modem_info retval on ttyC%d "
                                "was %x\n", info->line, retval);
                }
-               spin_unlock_irqrestore(&card->card_lock, flags);
        }
        return 0;
-}                              /* cy_tiocmset */
+}
 
 /*
  * cy_break() --- routine which turns the break handling on or off
@@ -3734,41 +2606,18 @@ static int cy_break(struct tty_struct *tty, int break_state)
        return retval;
 }                              /* cy_break */
 
-static int get_mon_info(struct cyclades_port *info,
-                               struct cyclades_monitor __user *mon)
-{
-
-       if (copy_to_user(mon, &info->mon, sizeof(struct cyclades_monitor)))
-               return -EFAULT;
-       info->mon.int_count = 0;
-       info->mon.char_count = 0;
-       info->mon.char_max = 0;
-       info->mon.char_last = 0;
-       return 0;
-}                              /* get_mon_info */
-
 static int set_threshold(struct cyclades_port *info, unsigned long value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
+       struct cyclades_card *card = info->card;
        unsigned long flags;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr =
-                   card->base_addr + (cy_chip_offset[chip] << index);
-
                info->cor3 &= ~CyREC_FIFO;
                info->cor3 |= value & CyREC_FIFO;
 
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyCOR3 << index), info->cor3);
-               cyy_issue_cmd(base_addr, CyCOR_CHANGE | CyCOR3ch, index);
+               cyy_writeb(info, CyCOR3, info->cor3);
+               cyy_issue_cmd(info, CyCOR_CHANGE | CyCOR3ch);
                spin_unlock_irqrestore(&card->card_lock, flags);
        }
        return 0;
@@ -3777,55 +2626,23 @@ static int set_threshold(struct cyclades_port *info, unsigned long value)
 static int get_threshold(struct cyclades_port *info,
                                                unsigned long __user *value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
-       unsigned long tmp;
+       struct cyclades_card *card = info->card;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
-               tmp = readb(base_addr + (CyCOR3 << index)) & CyREC_FIFO;
+               u8 tmp = cyy_readb(info, CyCOR3) & CyREC_FIFO;
                return put_user(tmp, value);
        }
        return 0;
 }                              /* get_threshold */
 
-static int set_default_threshold(struct cyclades_port *info,
-                                                       unsigned long value)
-{
-       info->default_threshold = value & 0x0f;
-       return 0;
-}                              /* set_default_threshold */
-
-static int get_default_threshold(struct cyclades_port *info,
-                                               unsigned long __user *value)
-{
-       return put_user(info->default_threshold, value);
-}                              /* get_default_threshold */
-
 static int set_timeout(struct cyclades_port *info, unsigned long value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
+       struct cyclades_card *card = info->card;
        unsigned long flags;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&card->card_lock, flags);
-               cy_writeb(base_addr + (CyRTPR << index), value & 0xff);
+               cyy_writeb(info, CyRTPR, value & 0xff);
                spin_unlock_irqrestore(&card->card_lock, flags);
        }
        return 0;
@@ -3834,36 +2651,35 @@ static int set_timeout(struct cyclades_port *info, unsigned long value)
 static int get_timeout(struct cyclades_port *info,
                                                unsigned long __user *value)
 {
-       struct cyclades_card *card;
-       void __iomem *base_addr;
-       int channel, chip, index;
-       unsigned long tmp;
+       struct cyclades_card *card = info->card;
 
-       card = info->card;
-       channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               index = card->bus_index;
-               base_addr = card->base_addr + (cy_chip_offset[chip] << index);
-
-               tmp = readb(base_addr + (CyRTPR << index));
+               u8 tmp = cyy_readb(info, CyRTPR);
                return put_user(tmp, value);
        }
        return 0;
 }                              /* get_timeout */
 
-static int set_default_timeout(struct cyclades_port *info, unsigned long value)
+static int cy_cflags_changed(struct cyclades_port *info, unsigned long arg,
+               struct cyclades_icount *cprev)
 {
-       info->default_timeout = value & 0xff;
-       return 0;
-}                              /* set_default_timeout */
+       struct cyclades_icount cnow;
+       unsigned long flags;
+       int ret;
 
-static int get_default_timeout(struct cyclades_port *info,
-                                       unsigned long __user *value)
-{
-       return put_user(info->default_timeout, value);
-}                              /* get_default_timeout */
+       spin_lock_irqsave(&info->card->card_lock, flags);
+       cnow = info->icount;    /* atomic copy */
+       spin_unlock_irqrestore(&info->card->card_lock, flags);
+
+       ret =   ((arg & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
+               ((arg & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) ||
+               ((arg & TIOCM_CD)  && (cnow.dcd != cprev->dcd)) ||
+               ((arg & TIOCM_CTS) && (cnow.cts != cprev->cts));
+
+       *cprev = cnow;
+
+       return ret;
+}
 
 /*
  * This routine allows the tty driver to implement device-
@@ -3875,8 +2691,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
         unsigned int cmd, unsigned long arg)
 {
        struct cyclades_port *info = tty->driver_data;
-       struct cyclades_icount cprev, cnow;     /* kernel counter temps */
-       struct serial_icounter_struct __user *p_cuser;  /* user space */
+       struct cyclades_icount cnow;    /* kernel counter temps */
        int ret_val = 0;
        unsigned long flags;
        void __user *argp = (void __user *)arg;
@@ -3892,7 +2707,11 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
 
        switch (cmd) {
        case CYGETMON:
-               ret_val = get_mon_info(info, argp);
+               if (copy_to_user(argp, &info->mon, sizeof(info->mon))) {
+                       ret_val = -EFAULT;
+                       break;
+               }
+               memset(&info->mon, 0, sizeof(info->mon));
                break;
        case CYGETTHRESH:
                ret_val = get_threshold(info, argp);
@@ -3901,10 +2720,11 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                ret_val = set_threshold(info, arg);
                break;
        case CYGETDEFTHRESH:
-               ret_val = get_default_threshold(info, argp);
+               ret_val = put_user(info->default_threshold,
+                               (unsigned long __user *)argp);
                break;
        case CYSETDEFTHRESH:
-               ret_val = set_default_threshold(info, arg);
+               info->default_threshold = arg & 0x0f;
                break;
        case CYGETTIMEOUT:
                ret_val = get_timeout(info, argp);
@@ -3913,21 +2733,20 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                ret_val = set_timeout(info, arg);
                break;
        case CYGETDEFTIMEOUT:
-               ret_val = get_default_timeout(info, argp);
+               ret_val = put_user(info->default_timeout,
+                               (unsigned long __user *)argp);
                break;
        case CYSETDEFTIMEOUT:
-               ret_val = set_default_timeout(info, arg);
+               info->default_timeout = arg & 0xff;
                break;
        case CYSETRFLOW:
                info->rflow = (int)arg;
-               ret_val = 0;
                break;
        case CYGETRFLOW:
                ret_val = info->rflow;
                break;
        case CYSETRTSDTR_INV:
                info->rtsdtr_inv = (int)arg;
-               ret_val = 0;
                break;
        case CYGETRTSDTR_INV:
                ret_val = info->rtsdtr_inv;
@@ -3938,7 +2757,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
 #ifndef CONFIG_CYZ_INTR
        case CYZSETPOLLCYCLE:
                cyz_polling_cycle = (arg * HZ) / 1000;
-               ret_val = 0;
                break;
        case CYZGETPOLLCYCLE:
                ret_val = (cyz_polling_cycle * 1000) / HZ;
@@ -3946,16 +2764,15 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
 #endif                         /* CONFIG_CYZ_INTR */
        case CYSETWAIT:
                info->port.closing_wait = (unsigned short)arg * HZ / 100;
-               ret_val = 0;
                break;
        case CYGETWAIT:
                ret_val = info->port.closing_wait / (HZ / 100);
                break;
        case TIOCGSERIAL:
-               ret_val = get_serial_info(info, argp);
+               ret_val = cy_get_serial_info(info, argp);
                break;
        case TIOCSSERIAL:
-               ret_val = set_serial_info(info, argp);
+               ret_val = cy_set_serial_info(info, tty, argp);
                break;
        case TIOCSERGETLSR:     /* Get line status register */
                ret_val = get_lsr_info(info, argp);
@@ -3971,17 +2788,8 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                /* note the counters on entry */
                cnow = info->icount;
                spin_unlock_irqrestore(&info->card->card_lock, flags);
-               ret_val = wait_event_interruptible(info->delta_msr_wait, ({
-                       cprev = cnow;
-                       spin_lock_irqsave(&info->card->card_lock, flags);
-                       cnow = info->icount;    /* atomic copy */
-                       spin_unlock_irqrestore(&info->card->card_lock, flags);
-
-                       ((arg & TIOCM_RNG) && (cnow.rng != cprev.rng)) ||
-                       ((arg & TIOCM_DSR) && (cnow.dsr != cprev.dsr)) ||
-                       ((arg & TIOCM_CD)  && (cnow.dcd != cprev.dcd)) ||
-                       ((arg & TIOCM_CTS) && (cnow.cts != cprev.cts));
-               }));
+               ret_val = wait_event_interruptible(info->port.delta_msr_wait,
+                               cy_cflags_changed(info, arg, &cnow));
                break;
 
                /*
@@ -3990,46 +2798,29 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
                 * NB: both 1->0 and 0->1 transitions are counted except for
                 *     RI where only 0->1 is counted.
                 */
-       case TIOCGICOUNT:
+       case TIOCGICOUNT: {
+               struct serial_icounter_struct sic = { };
+
                spin_lock_irqsave(&info->card->card_lock, flags);
                cnow = info->icount;
                spin_unlock_irqrestore(&info->card->card_lock, flags);
-               p_cuser = argp;
-               ret_val = put_user(cnow.cts, &p_cuser->cts);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.dsr, &p_cuser->dsr);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.rng, &p_cuser->rng);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.dcd, &p_cuser->dcd);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.rx, &p_cuser->rx);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.tx, &p_cuser->tx);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.frame, &p_cuser->frame);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.overrun, &p_cuser->overrun);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.parity, &p_cuser->parity);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.brk, &p_cuser->brk);
-               if (ret_val)
-                       break;
-               ret_val = put_user(cnow.buf_overrun, &p_cuser->buf_overrun);
-               if (ret_val)
-                       break;
-               ret_val = 0;
+
+               sic.cts = cnow.cts;
+               sic.dsr = cnow.dsr;
+               sic.rng = cnow.rng;
+               sic.dcd = cnow.dcd;
+               sic.rx = cnow.rx;
+               sic.tx = cnow.tx;
+               sic.frame = cnow.frame;
+               sic.overrun = cnow.overrun;
+               sic.parity = cnow.parity;
+               sic.brk = cnow.brk;
+               sic.buf_overrun = cnow.buf_overrun;
+
+               if (copy_to_user(argp, &sic, sizeof(sic)))
+                       ret_val = -EFAULT;
                break;
+       }
        default:
                ret_val = -ENOIOCTLCMD;
        }
@@ -4055,7 +2846,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
        printk(KERN_DEBUG "cyc:cy_set_termios ttyC%d\n", info->line);
 #endif
 
-       set_line_char(info);
+       cy_set_line_char(info, tty);
 
        if ((old_termios->c_cflag & CRTSCTS) &&
                        !(tty->termios->c_cflag & CRTSCTS)) {
@@ -4112,8 +2903,6 @@ static void cy_throttle(struct tty_struct *tty)
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
 
 #ifdef CY_DEBUG_THROTTLE
        char buf[64];
@@ -4135,24 +2924,9 @@ static void cy_throttle(struct tty_struct *tty)
        }
 
        if (tty->termios->c_cflag & CRTSCTS) {
-               channel = info->line - card->first_line;
                if (!cy_is_Z(card)) {
-                       chip = channel >> 2;
-                       channel &= 0x03;
-                       index = card->bus_index;
-                       base_addr = card->base_addr +
-                               (cy_chip_offset[chip] << index);
-
                        spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         ~CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         ~CyRTS);
-                       }
+                       cyy_change_rts_dtr(info, 0, TIOCM_RTS);
                        spin_unlock_irqrestore(&card->card_lock, flags);
                } else {
                        info->throttle = 1;
@@ -4170,8 +2944,6 @@ static void cy_unthrottle(struct tty_struct *tty)
        struct cyclades_port *info = tty->driver_data;
        struct cyclades_card *card;
        unsigned long flags;
-       void __iomem *base_addr;
-       int chip, channel, index;
 
 #ifdef CY_DEBUG_THROTTLE
        char buf[64];
@@ -4192,24 +2964,9 @@ static void cy_unthrottle(struct tty_struct *tty)
 
        if (tty->termios->c_cflag & CRTSCTS) {
                card = info->card;
-               channel = info->line - card->first_line;
                if (!cy_is_Z(card)) {
-                       chip = channel >> 2;
-                       channel &= 0x03;
-                       index = card->bus_index;
-                       base_addr = card->base_addr +
-                               (cy_chip_offset[chip] << index);
-
                        spin_lock_irqsave(&card->card_lock, flags);
-                       cy_writeb(base_addr + (CyCAR << index),
-                                 (u_char) channel);
-                       if (info->rtsdtr_inv) {
-                               cy_writeb(base_addr + (CyMSVR2 << index),
-                                         CyDTR);
-                       } else {
-                               cy_writeb(base_addr + (CyMSVR1 << index),
-                                         CyRTS);
-                       }
+                       cyy_change_rts_dtr(info, TIOCM_RTS, 0);
                        spin_unlock_irqrestore(&card->card_lock, flags);
                } else {
                        info->throttle = 0;
@@ -4224,8 +2981,7 @@ static void cy_stop(struct tty_struct *tty)
 {
        struct cyclades_card *cinfo;
        struct cyclades_port *info = tty->driver_data;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned long flags;
 
 #ifdef CY_DEBUG_OTHER
@@ -4238,16 +2994,9 @@ static void cy_stop(struct tty_struct *tty)
        cinfo = info->card;
        channel = info->line - cinfo->first_line;
        if (!cy_is_Z(cinfo)) {
-               index = cinfo->bus_index;
-               chip = channel >> 2;
-               channel &= 0x03;
-               base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&cinfo->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index),
-                       (u_char)(channel & 0x0003)); /* index channel */
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) & ~CyTxRdy);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyTxRdy);
                spin_unlock_irqrestore(&cinfo->card_lock, flags);
        }
 }                              /* cy_stop */
@@ -4256,8 +3005,7 @@ static void cy_start(struct tty_struct *tty)
 {
        struct cyclades_card *cinfo;
        struct cyclades_port *info = tty->driver_data;
-       void __iomem *base_addr;
-       int chip, channel, index;
+       int channel;
        unsigned long flags;
 
 #ifdef CY_DEBUG_OTHER
@@ -4269,17 +3017,10 @@ static void cy_start(struct tty_struct *tty)
 
        cinfo = info->card;
        channel = info->line - cinfo->first_line;
-       index = cinfo->bus_index;
        if (!cy_is_Z(cinfo)) {
-               chip = channel >> 2;
-               channel &= 0x03;
-               base_addr = cinfo->base_addr + (cy_chip_offset[chip] << index);
-
                spin_lock_irqsave(&cinfo->card_lock, flags);
-               cy_writeb(base_addr + (CyCAR << index),
-                       (u_char) (channel & 0x0003));   /* index channel */
-               cy_writeb(base_addr + (CySRER << index),
-                         readb(base_addr + (CySRER << index)) | CyTxRdy);
+               cyy_writeb(info, CyCAR, channel & 0x03);
+               cyy_writeb(info, CySRER, cyy_readb(info, CySRER) | CyTxRdy);
                spin_unlock_irqrestore(&cinfo->card_lock, flags);
        }
 }                              /* cy_start */
@@ -4299,17 +3040,84 @@ static void cy_hangup(struct tty_struct *tty)
                return;
 
        cy_flush_buffer(tty);
-       shutdown(info);
-       info->port.count = 0;
-#ifdef CY_DEBUG_COUNT
-       printk(KERN_DEBUG "cyc:cy_hangup (%d): setting count to 0\n",
-               current->pid);
-#endif
-       info->port.tty = NULL;
-       info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-       wake_up_interruptible(&info->port.open_wait);
+       cy_shutdown(info, tty);
+       tty_port_hangup(&info->port);
 }                              /* cy_hangup */
 
+static int cyy_carrier_raised(struct tty_port *port)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+       struct cyclades_card *cinfo = info->card;
+       unsigned long flags;
+       int channel = info->line - cinfo->first_line;
+       u32 cd;
+
+       spin_lock_irqsave(&cinfo->card_lock, flags);
+       cyy_writeb(info, CyCAR, channel & 0x03);
+       cd = cyy_readb(info, CyMSVR1) & CyDCD;
+       spin_unlock_irqrestore(&cinfo->card_lock, flags);
+
+       return cd;
+}
+
+static void cyy_dtr_rts(struct tty_port *port, int raise)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+       struct cyclades_card *cinfo = info->card;
+       unsigned long flags;
+
+       spin_lock_irqsave(&cinfo->card_lock, flags);
+       cyy_change_rts_dtr(info, raise ? TIOCM_RTS | TIOCM_DTR : 0,
+                       raise ? 0 : TIOCM_RTS | TIOCM_DTR);
+       spin_unlock_irqrestore(&cinfo->card_lock, flags);
+}
+
+static int cyz_carrier_raised(struct tty_port *port)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+
+       return readl(&info->u.cyz.ch_ctrl->rs_status) & C_RS_DCD;
+}
+
+static void cyz_dtr_rts(struct tty_port *port, int raise)
+{
+       struct cyclades_port *info = container_of(port, struct cyclades_port,
+                       port);
+       struct cyclades_card *cinfo = info->card;
+       struct CH_CTRL __iomem *ch_ctrl = info->u.cyz.ch_ctrl;
+       int ret, channel = info->line - cinfo->first_line;
+       u32 rs;
+
+       rs = readl(&ch_ctrl->rs_control);
+       if (raise)
+               rs |= C_RS_RTS | C_RS_DTR;
+       else
+               rs &= ~(C_RS_RTS | C_RS_DTR);
+       cy_writel(&ch_ctrl->rs_control, rs);
+       ret = cyz_issue_cmd(cinfo, channel, C_CM_IOCTLM, 0L);
+       if (ret != 0)
+               printk(KERN_ERR "%s: retval on ttyC%d was %x\n",
+                               __func__, info->line, ret);
+#ifdef CY_DEBUG_DTR
+       printk(KERN_DEBUG "%s: raising Z DTR\n", __func__);
+#endif
+}
+
+static const struct tty_port_operations cyy_port_ops = {
+       .carrier_raised = cyy_carrier_raised,
+       .dtr_rts = cyy_dtr_rts,
+       .shutdown = cy_do_close,
+};
+
+static const struct tty_port_operations cyz_port_ops = {
+       .carrier_raised = cyz_carrier_raised,
+       .dtr_rts = cyz_dtr_rts,
+       .shutdown = cy_do_close,
+};
+
 /*
  * ---------------------------------------------------------------------
  * cy_init() and friends
@@ -4321,8 +3129,7 @@ static void cy_hangup(struct tty_struct *tty)
 static int __devinit cy_init_card(struct cyclades_card *cinfo)
 {
        struct cyclades_port *info;
-       unsigned int port;
-       unsigned short chip_number;
+       unsigned int channel, port;
 
        spin_lock_init(&cinfo->card_lock);
        cinfo->intr_enabled = 0;
@@ -4334,9 +3141,9 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
                return -ENOMEM;
        }
 
-       for (port = cinfo->first_line; port < cinfo->first_line + cinfo->nports;
-                       port++) {
-               info = &cinfo->ports[port - cinfo->first_line];
+       for (channel = 0, port = cinfo->first_line; channel < cinfo->nports;
+                       channel++, port++) {
+               info = &cinfo->ports[channel];
                tty_port_init(&info->port);
                info->magic = CYCLADES_MAGIC;
                info->card = cinfo;
@@ -4346,10 +3153,19 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
                info->port.close_delay = 5 * HZ / 10;
                info->port.flags = STD_COM_FLAGS;
                init_completion(&info->shutdown_wait);
-               init_waitqueue_head(&info->delta_msr_wait);
 
                if (cy_is_Z(cinfo)) {
+                       struct FIRM_ID *firm_id = cinfo->base_addr + ID_ADDRESS;
+                       struct ZFW_CTRL *zfw_ctrl;
+
+                       info->port.ops = &cyz_port_ops;
                        info->type = PORT_STARTECH;
+
+                       zfw_ctrl = cinfo->base_addr +
+                               (readl(&firm_id->zfwctrl_addr) & 0xfffff);
+                       info->u.cyz.ch_ctrl = &zfw_ctrl->ch_ctrl[channel];
+                       info->u.cyz.buf_ctrl = &zfw_ctrl->buf_ctrl[channel];
+
                        if (cinfo->hw_ver == ZO_V1)
                                info->xmit_fifo_size = CYZ_FIFO_SIZE;
                        else
@@ -4359,17 +3175,20 @@ static int __devinit cy_init_card(struct cyclades_card *cinfo)
                                cyz_rx_restart, (unsigned long)info);
 #endif
                } else {
+                       unsigned short chip_number;
                        int index = cinfo->bus_index;
+
+                       info->port.ops = &cyy_port_ops;
                        info->type = PORT_CIRRUS;
                        info->xmit_fifo_size = CyMAX_CHAR_FIFO;
                        info->cor1 = CyPARITY_NONE | Cy_1_STOP | Cy_8_BITS;
                        info->cor2 = CyETC;
                        info->cor3 = 0x08;      /* _very_ small rcv threshold */
 
-                       chip_number = (port - cinfo->first_line) / 4;
-                       info->chip_rev = readb(cinfo->base_addr +
-                                     (cy_chip_offset[chip_number] << index) +
-                                     (CyGFRCR << index));
+                       chip_number = channel / CyPORTS_PER_CHIP;
+                       info->u.cyy.base_addr = cinfo->base_addr +
+                               (cy_chip_offset[chip_number] << index);
+                       info->chip_rev = cyy_readb(info, CyGFRCR);
 
                        if (info->chip_rev >= CD1400_REV_J) {
                                /* It is a CD1400 rev. J or later */
@@ -5060,8 +3879,14 @@ static int __devinit cy_pci_probe(struct pci_dev *pdev,
                }
                cy_card[card_no].num_chips = nchan / CyPORTS_PER_CHIP;
        } else {
+               struct FIRM_ID __iomem *firm_id = addr2 + ID_ADDRESS;
+               struct ZFW_CTRL __iomem *zfw_ctrl;
+
+               zfw_ctrl = addr2 + (readl(&firm_id->zfwctrl_addr) & 0xfffff);
+
                cy_card[card_no].hw_ver = mailbox;
                cy_card[card_no].num_chips = (unsigned int)-1;
+               cy_card[card_no].board_ctrl = &zfw_ctrl->board_ctrl;
 #ifdef CONFIG_CYZ_INTR
                /* allocate IRQ only if board has an IRQ */
                if (irq != 0 && irq != 255) {
@@ -5191,18 +4016,30 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
                for (j = 0; j < cy_card[i].nports; j++) {
                        info = &cy_card[i].ports[j];
 
-                       if (info->port.count)
+                       if (info->port.count) {
+                               /* XXX is the ldisc num worth this? */
+                               struct tty_struct *tty;
+                               struct tty_ldisc *ld;
+                               int num = 0;
+                               tty = tty_port_tty_get(&info->port);
+                               if (tty) {
+                                       ld = tty_ldisc_ref(tty);
+                                       if (ld) {
+                                               num = ld->ops->num;
+                                               tty_ldisc_deref(ld);
+                                       }
+                                       tty_kref_put(tty);
+                               }
                                seq_printf(m, "%3d %8lu %10lu %8lu "
-                                       "%10lu %8lu %9lu %6ld\n", info->line,
+                                       "%10lu %8lu %9lu %6d\n", info->line,
                                        (cur_jifs - info->idle_stats.in_use) /
                                        HZ, info->idle_stats.xmit_bytes,
                                        (cur_jifs - info->idle_stats.xmit_idle)/
                                        HZ, info->idle_stats.recv_bytes,
                                        (cur_jifs - info->idle_stats.recv_idle)/
                                        HZ, info->idle_stats.overruns,
-                                       /* FIXME: double check locking */
-                                       (long)info->port.tty->ldisc->ops->num);
-                       else
+                                       num);
+                       } else
                                seq_printf(m, "%3d %8lu %10lu %8lu "
                                        "%10lu %8lu %9lu %6ld\n",
                                        info->line, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
index a5c59fc..b19d43c 100644 (file)
@@ -572,7 +572,7 @@ static void check_modem_status(struct esp_struct *info)
                        info->icount.dcd++;
                if (status & UART_MSR_DCTS)
                        info->icount.cts++;
-               wake_up_interruptible(&info->delta_msr_wait);
+               wake_up_interruptible(&info->port.delta_msr_wait);
        }
 
        if ((info->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
@@ -927,7 +927,7 @@ static void shutdown(struct esp_struct *info)
         * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
         * here so the queue might never be waken up
         */
-       wake_up_interruptible(&info->delta_msr_wait);
+       wake_up_interruptible(&info->port.delta_msr_wait);
        wake_up_interruptible(&info->break_wait);
 
        /* stop a DMA transfer on the port being closed */
@@ -1800,7 +1800,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file *file,
                spin_unlock_irqrestore(&info->lock, flags);
                while (1) {
                        /* FIXME: convert to new style wakeup */
-                       interruptible_sleep_on(&info->delta_msr_wait);
+                       interruptible_sleep_on(&info->port.delta_msr_wait);
                        /* see if a signal did it */
                        if (signal_pending(current))
                                return -ERESTARTSYS;
@@ -2452,7 +2452,6 @@ static int __init espserial_init(void)
                info->config.flow_off = flow_off;
                info->config.pio_threshold = pio_threshold;
                info->next_port = ports;
-               init_waitqueue_head(&info->delta_msr_wait);
                init_waitqueue_head(&info->break_wait);
                ports = info;
                printk(KERN_INFO "ttyP%d at 0x%04x (irq = %d) is an ESP ",
index fc93e2f..1573aeb 100644 (file)
@@ -153,7 +153,7 @@ static const struct file_operations rng_chrdev_ops = {
 static struct miscdevice rng_miscdev = {
        .minor          = RNG_MISCDEV_MINOR,
        .name           = RNG_MODULE_NAME,
-       .devnode        = "hwrng",
+       .nodename       = "hwrng",
        .fops           = &rng_chrdev_ops,
 };
 
index 4f1f4cd..426bfdd 100644 (file)
@@ -846,37 +846,53 @@ static int isicom_carrier_raised(struct tty_port *port)
        return (ip->status & ISI_DCD)?1 : 0;
 }
 
-static int isicom_open(struct tty_struct *tty, struct file *filp)
+static struct tty_port *isicom_find_port(struct tty_struct *tty)
 {
        struct isi_port *port;
        struct isi_board *card;
        unsigned int board;
-       int error, line;
+       int line = tty->index;
 
-       line = tty->index;
        if (line < 0 || line > PORT_COUNT-1)
-               return -ENODEV;
+               return NULL;
        board = BOARD(line);
        card = &isi_card[board];
 
        if (!(card->status & FIRMWARE_LOADED))
-               return -ENODEV;
+               return NULL;
 
        /*  open on a port greater than the port count for the card !!! */
        if (line > ((board * 16) + card->port_count - 1))
-               return -ENODEV;
+               return NULL;
 
        port = &isi_ports[line];
        if (isicom_paranoia_check(port, tty->name, "isicom_open"))
-               return -ENODEV;
+               return NULL;
 
+       return &port->port;
+}
+       
+static int isicom_open(struct tty_struct *tty, struct file *filp)
+{
+       struct isi_port *port;
+       struct isi_board *card;
+       struct tty_port *tport;
+       int error = 0;
+
+       tport = isicom_find_port(tty);
+       if (tport == NULL)
+               return -ENODEV;
+       port = container_of(tport, struct isi_port, port);
+       card = &isi_card[BOARD(tty->index)];
        isicom_setup_board(card);
 
        /* FIXME: locking on port.count etc */
        port->port.count++;
        tty->driver_data = port;
        tty_port_tty_set(&port->port, tty);
-       error = isicom_setup_port(tty);
+       /* FIXME: Locking on Initialized flag */
+       if (!test_bit(ASYNCB_INITIALIZED, &tport->flags))
+               error = isicom_setup_port(tty);
        if (error == 0)
                error = tty_port_block_til_ready(&port->port, tty, filp);
        return error;
@@ -952,19 +968,12 @@ static void isicom_flush_buffer(struct tty_struct *tty)
        tty_wakeup(tty);
 }
 
-static void isicom_close(struct tty_struct *tty, struct file *filp)
+static void isicom_close_port(struct tty_port *port)
 {
-       struct isi_port *ip = tty->driver_data;
-       struct tty_port *port = &ip->port;
-       struct isi_board *card;
+       struct isi_port *ip = container_of(port, struct isi_port, port);
+       struct isi_board *card = ip->card;
        unsigned long flags;
 
-       BUG_ON(!ip);
-
-       card = ip->card;
-       if (isicom_paranoia_check(ip, tty->name, "isicom_close"))
-               return;
-
        /* indicate to the card that no more data can be received
           on this port */
        spin_lock_irqsave(&card->card_lock, flags);
@@ -974,9 +983,19 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
        }
        isicom_shutdown_port(ip);
        spin_unlock_irqrestore(&card->card_lock, flags);
+}
+
+static void isicom_close(struct tty_struct *tty, struct file *filp)
+{
+       struct isi_port *ip = tty->driver_data;
+       struct tty_port *port = &ip->port;
+       if (isicom_paranoia_check(ip, tty->name, "isicom_close"))
+               return;
 
+       if (tty_port_close_start(port, tty, filp) == 0)
+               return;
+       isicom_close_port(port);
        isicom_flush_buffer(tty);
-       
        tty_port_close_end(port, tty);
 }
 
index 0491cdf..0aede1d 100644 (file)
@@ -866,24 +866,25 @@ static const struct file_operations kmsg_fops = {
 
 static const struct memdev {
        const char *name;
+       mode_t mode;
        const struct file_operations *fops;
        struct backing_dev_info *dev_info;
 } devlist[] = {
-       [ 1] = { "mem", &mem_fops, &directly_mappable_cdev_bdi },
+        [1] = { "mem", 0, &mem_fops, &directly_mappable_cdev_bdi },
 #ifdef CONFIG_DEVKMEM
-       [ 2] = { "kmem", &kmem_fops, &directly_mappable_cdev_bdi },
+        [2] = { "kmem", 0, &kmem_fops, &directly_mappable_cdev_bdi },
 #endif
-       [ 3] = {"null", &null_fops, NULL },
+        [3] = { "null", 0666, &null_fops, NULL },
 #ifdef CONFIG_DEVPORT
-       [ 4] = { "port", &port_fops, NULL },
+        [4] = { "port", 0, &port_fops, NULL },
 #endif
-       [ 5] = { "zero", &zero_fops, &zero_bdi },
-       [ 7] = { "full", &full_fops, NULL },
-       [ 8] = { "random", &random_fops, NULL },
-       [ 9] = { "urandom", &urandom_fops, NULL },
-       [11] = { "kmsg", &kmsg_fops, NULL },
+        [5] = { "zero", 0666, &zero_fops, &zero_bdi },
+        [7] = { "full", 0666, &full_fops, NULL },
+        [8] = { "random", 0666, &random_fops, NULL },
+        [9] = { "urandom", 0666, &urandom_fops, NULL },
+       [11] = { "kmsg", 0, &kmsg_fops, NULL },
 #ifdef CONFIG_CRASH_DUMP
-       [12] = { "oldmem", &oldmem_fops, NULL },
+       [12] = { "oldmem", 0, &oldmem_fops, NULL },
 #endif
 };
 
@@ -920,6 +921,13 @@ static const struct file_operations memory_fops = {
        .open           = memory_open,
 };
 
+static char *mem_devnode(struct device *dev, mode_t *mode)
+{
+       if (mode && devlist[MINOR(dev->devt)].mode)
+               *mode = devlist[MINOR(dev->devt)].mode;
+       return NULL;
+}
+
 static struct class *mem_class;
 
 static int __init chr_dev_init(void)
@@ -935,6 +943,7 @@ static int __init chr_dev_init(void)
                printk("unable to get major %d for memory devs\n", MEM_MAJOR);
 
        mem_class = class_create(THIS_MODULE, "mem");
+       mem_class->devnode = mem_devnode;
        for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) {
                if (!devlist[minor].name)
                        continue;
index 62c99fa..1ee27cc 100644 (file)
@@ -263,12 +263,14 @@ int misc_deregister(struct miscdevice *misc)
 EXPORT_SYMBOL(misc_register);
 EXPORT_SYMBOL(misc_deregister);
 
-static char *misc_nodename(struct device *dev)
+static char *misc_devnode(struct device *dev, mode_t *mode)
 {
        struct miscdevice *c = dev_get_drvdata(dev);
 
-       if (c->devnode)
-               return kstrdup(c->devnode, GFP_KERNEL);
+       if (mode && c->mode)
+               *mode = c->mode;
+       if (c->nodename)
+               return kstrdup(c->nodename, GFP_KERNEL);
        return NULL;
 }
 
@@ -287,7 +289,7 @@ static int __init misc_init(void)
        err = -EIO;
        if (register_chrdev(MISC_MAJOR,"misc",&misc_fops))
                goto fail_printk;
-       misc_class->nodename = misc_nodename;
+       misc_class->devnode = misc_devnode;
        return 0;
 
 fail_printk:
index dbf8d52..5e28d39 100644 (file)
@@ -48,7 +48,7 @@
 
 #include "mxser.h"
 
-#define        MXSER_VERSION   "2.0.4"         /* 1.12 */
+#define        MXSER_VERSION   "2.0.5"         /* 1.14 */
 #define        MXSERMAJOR       174
 
 #define MXSER_BOARDS           4       /* Max. boards */
@@ -69,6 +69,7 @@
 #define PCI_DEVICE_ID_POS104UL 0x1044
 #define PCI_DEVICE_ID_CB108    0x1080
 #define PCI_DEVICE_ID_CP102UF  0x1023
+#define PCI_DEVICE_ID_CP112UL  0x1120
 #define PCI_DEVICE_ID_CB114    0x1142
 #define PCI_DEVICE_ID_CP114UL  0x1143
 #define PCI_DEVICE_ID_CB134I   0x1341
@@ -139,7 +140,8 @@ static const struct mxser_cardinfo mxser_cards[] = {
        { "CP-138U series",     8, },
        { "POS-104UL series",   4, },
        { "CP-114UL series",    4, },
-/*30*/ { "CP-102UF series",    2, }
+/*30*/ { "CP-102UF series",    2, },
+       { "CP-112UL series",    2, },
 };
 
 /* driver_data correspond to the lines in the structure above
@@ -170,6 +172,7 @@ static struct pci_device_id mxser_pcibrds[] = {
        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_POS104UL),    .driver_data = 28 },
        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP114UL),     .driver_data = 29 },
        { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP102UF),     .driver_data = 30 },
+       { PCI_VDEVICE(MOXA, PCI_DEVICE_ID_CP112UL),     .driver_data = 31 },
        { }
 };
 MODULE_DEVICE_TABLE(pci, mxser_pcibrds);
@@ -258,7 +261,6 @@ struct mxser_port {
        struct mxser_mon mon_data;
 
        spinlock_t slock;
-       wait_queue_head_t delta_msr_wait;
 };
 
 struct mxser_board {
@@ -818,7 +820,7 @@ static void mxser_check_modem_status(struct tty_struct *tty,
        if (status & UART_MSR_DCTS)
                port->icount.cts++;
        port->mon_data.modem_status = status;
-       wake_up_interruptible(&port->delta_msr_wait);
+       wake_up_interruptible(&port->port.delta_msr_wait);
 
        if ((port->port.flags & ASYNC_CHECK_CD) && (status & UART_MSR_DDCD)) {
                if (status & UART_MSR_DCD)
@@ -973,7 +975,7 @@ static void mxser_shutdown(struct tty_struct *tty)
         * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
         * here so the queue might never be waken up
         */
-       wake_up_interruptible(&info->delta_msr_wait);
+       wake_up_interruptible(&info->port.delta_msr_wait);
 
        /*
         * Free the IRQ, if necessary
@@ -1073,34 +1075,17 @@ static void mxser_flush_buffer(struct tty_struct *tty)
 }
 
 
-/*
- * This routine is called when the serial port gets closed.  First, we
- * wait for the last remaining data to be sent.  Then, we unlink its
- * async structure from the interrupt chain if necessary, and we free
- * that IRQ if nothing is left in the chain.
- */
-static void mxser_close(struct tty_struct *tty, struct file *filp)
+static void mxser_close_port(struct tty_struct *tty, struct tty_port *port)
 {
-       struct mxser_port *info = tty->driver_data;
-       struct tty_port *port = &info->port;
-
+       struct mxser_port *info = container_of(port, struct mxser_port, port);
        unsigned long timeout;
-
-       if (tty->index == MXSER_PORTS)
-               return;
-       if (!info)
-               return;
-
-       if (tty_port_close_start(port, tty, filp) == 0)
-               return;
-
        /*
         * Save the termios structure, since this port may have
         * separate termios for callout and dialin.
         *
         * FIXME: Can this go ?
         */
-       if (info->port.flags & ASYNC_NORMAL_ACTIVE)
+       if (port->flags & ASYNC_NORMAL_ACTIVE)
                info->normal_termios = *tty->termios;
        /*
         * At this point we stop accepting input.  To do this, we
@@ -1112,7 +1097,7 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
        if (info->board->chip_flag)
                info->IER &= ~MOXA_MUST_RECV_ISR;
 
-       if (info->port.flags & ASYNC_INITIALIZED) {
+       if (port->flags & ASYNC_INITIALIZED) {
                outb(info->IER, info->ioaddr + UART_IER);
                /*
                 * Before we drop DTR, make sure the UART transmitter
@@ -1127,8 +1112,26 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
                }
        }
        mxser_shutdown(tty);
-       mxser_flush_buffer(tty);
 
+}
+
+/*
+ * This routine is called when the serial port gets closed.  First, we
+ * wait for the last remaining data to be sent.  Then, we unlink its
+ * async structure from the interrupt chain if necessary, and we free
+ * that IRQ if nothing is left in the chain.
+ */
+static void mxser_close(struct tty_struct *tty, struct file *filp)
+{
+       struct mxser_port *info = tty->driver_data;
+       struct tty_port *port = &info->port;
+
+       if (tty->index == MXSER_PORTS)
+               return;
+       if (tty_port_close_start(port, tty, filp) == 0)
+               return;
+       mxser_close_port(tty, port);
+       mxser_flush_buffer(tty);
        /* Right now the tty_port set is done outside of the close_end helper
           as we don't yet have everyone using refcounts */     
        tty_port_close_end(port, tty);
@@ -1761,7 +1764,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
                cnow = info->icount;    /* note the counters on entry */
                spin_unlock_irqrestore(&info->slock, flags);
 
-               return wait_event_interruptible(info->delta_msr_wait,
+               return wait_event_interruptible(info->port.delta_msr_wait,
                                mxser_cflags_changed(info, arg, &cnow));
        /*
         * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
@@ -1803,7 +1806,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
 
                lock_kernel();
                len = mxser_chars_in_buffer(tty);
-               lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT;
+               lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE;
                len += (lsr ? 0 : 1);
                unlock_kernel();
 
@@ -2413,7 +2416,6 @@ static int __devinit mxser_initbrd(struct mxser_board *brd,
                info->port.close_delay = 5 * HZ / 10;
                info->port.closing_wait = 30 * HZ;
                info->normal_termios = mxvar_sdriver->init_termios;
-               init_waitqueue_head(&info->delta_msr_wait);
                memset(&info->mon_data, 0, sizeof(struct mxser_mon));
                info->err_shadow = 0;
                spin_lock_init(&info->slock);
index 4e28b35..2e50f4d 100644 (file)
@@ -272,7 +272,8 @@ static inline int is_continuation(unsigned char c, struct tty_struct *tty)
  *
  *     This is a helper function that handles one output character
  *     (including special characters like TAB, CR, LF, etc.),
- *     putting the results in the tty driver's write buffer.
+ *     doing OPOST processing and putting the results in the
+ *     tty driver's write buffer.
  *
  *     Note that Linux currently ignores TABDLY, CRDLY, VTDLY, FFDLY
  *     and NLDLY.  They simply aren't relevant in the world today.
@@ -350,8 +351,9 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
  *     @c: character (or partial unicode symbol)
  *     @tty: terminal device
  *
- *     Perform OPOST processing.  Returns -1 when the output device is
- *     full and the character must be retried.
+ *     Output one character with OPOST processing.
+ *     Returns -1 when the output device is full and the character
+ *     must be retried.
  *
  *     Locking: output_lock to protect column state and space left
  *              (also, this is called from n_tty_write under the
@@ -377,8 +379,11 @@ static int process_output(unsigned char c, struct tty_struct *tty)
 /**
  *     process_output_block            -       block post processor
  *     @tty: terminal device
- *     @inbuf: user buffer
- *     @nr: number of bytes
+ *     @buf: character buffer
+ *     @nr: number of bytes to output
+ *
+ *     Output a block of characters with OPOST processing.
+ *     Returns the number of characters output.
  *
  *     This path is used to speed up block console writes, among other
  *     things when processing blocks of output data. It handles only
@@ -571,33 +576,23 @@ static void process_echoes(struct tty_struct *tty)
                                break;
 
                        default:
-                               if (iscntrl(op)) {
-                                       if (L_ECHOCTL(tty)) {
-                                               /*
-                                                * Ensure there is enough space
-                                                * for the whole ctrl pair.
-                                                */
-                                               if (space < 2) {
-                                                       no_space_left = 1;
-                                                       break;
-                                               }
-                                               tty_put_char(tty, '^');
-                                               tty_put_char(tty, op ^ 0100);
-                                               tty->column += 2;
-                                               space -= 2;
-                                       } else {
-                                               if (!space) {
-                                                       no_space_left = 1;
-                                                       break;
-                                               }
-                                               tty_put_char(tty, op);
-                                               space--;
-                                       }
-                               }
                                /*
-                                * If above falls through, this was an
-                                * undefined op.
+                                * If the op is not a special byte code,
+                                * it is a ctrl char tagged to be echoed
+                                * as "^X" (where X is the letter
+                                * representing the control char).
+                                * Note that we must ensure there is
+                                * enough space for the whole ctrl pair.
+                                *
                                 */
+                               if (space < 2) {
+                                       no_space_left = 1;
+                                       break;
+                               }
+                               tty_put_char(tty, '^');
+                               tty_put_char(tty, op ^ 0100);
+                               tty->column += 2;
+                               space -= 2;
                                cp += 2;
                                nr -= 2;
                        }
@@ -605,12 +600,18 @@ static void process_echoes(struct tty_struct *tty)
                        if (no_space_left)
                                break;
                } else {
-                       int retval;
-
-                       retval = do_output_char(c, tty, space);
-                       if (retval < 0)
-                               break;
-                       space -= retval;
+                       if (O_OPOST(tty) &&
+                           !(test_bit(TTY_HW_COOK_OUT, &tty->flags))) {
+                               int retval = do_output_char(c, tty, space);
+                               if (retval < 0)
+                                       break;
+                               space -= retval;
+                       } else {
+                               if (!space)
+                                       break;
+                               tty_put_char(tty, c);
+                               space -= 1;
+                       }
                        cp += 1;
                        nr -= 1;
                }
@@ -798,8 +799,8 @@ static void echo_char_raw(unsigned char c, struct tty_struct *tty)
  *     Echo user input back onto the screen. This must be called only when
  *     L_ECHO(tty) is true. Called from the driver receive_buf path.
  *
- *     This variant tags control characters to be possibly echoed as
- *     as "^X" (where X is the letter representing the control char).
+ *     This variant tags control characters to be echoed as "^X"
+ *     (where X is the letter representing the control char).
  *
  *     Locking: echo_lock to protect the echo buffer
  */
@@ -812,7 +813,7 @@ static void echo_char(unsigned char c, struct tty_struct *tty)
                add_echo_byte(ECHO_OP_START, tty);
                add_echo_byte(ECHO_OP_START, tty);
        } else {
-               if (iscntrl(c) && c != '\t')
+               if (L_ECHOCTL(tty) && iscntrl(c) && c != '\t')
                        add_echo_byte(ECHO_OP_START, tty);
                add_echo_byte(c, tty);
        }
index 40268db..64acd05 100644 (file)
@@ -261,7 +261,7 @@ static const struct file_operations raw_ctl_fops = {
 
 static struct cdev raw_cdev;
 
-static char *raw_nodename(struct device *dev)
+static char *raw_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "raw/%s", dev_name(dev));
 }
@@ -289,7 +289,7 @@ static int __init raw_init(void)
                ret = PTR_ERR(raw_class);
                goto error_region;
        }
-       raw_class->nodename = raw_nodename;
+       raw_class->devnode = raw_devnode;
        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
        return 0;
index 171711a..3cfa22d 100644 (file)
@@ -343,7 +343,7 @@ static void rc_receive_exc(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
 #ifdef RC_REPORT_OVERRUN
        status = rc_in(bp, CD180_RCSR);
@@ -355,18 +355,18 @@ static void rc_receive_exc(struct riscom_board const *bp)
 #endif
        ch = rc_in(bp, CD180_RDR);
        if (!status)
-               return;
+               goto out;
        if (status & RCSR_TOUT)  {
                printk(KERN_WARNING "rc%d: port %d: Receiver timeout. "
                                    "Hardware problems ?\n",
                       board_No(bp), port_No(port));
-               return;
+               goto out;
 
        } else if (status & RCSR_BREAK)  {
                printk(KERN_INFO "rc%d: port %d: Handling break...\n",
                       board_No(bp), port_No(port));
                flag = TTY_BREAK;
-               if (port->port.flags & ASYNC_SAK)
+               if (tty && (port->port.flags & ASYNC_SAK))
                        do_SAK(tty);
 
        } else if (status & RCSR_PE)
@@ -380,8 +380,12 @@ static void rc_receive_exc(struct riscom_board const *bp)
        else
                flag = TTY_NORMAL;
 
-       tty_insert_flip_char(tty, ch, flag);
-       tty_flip_buffer_push(tty);
+       if (tty) {
+               tty_insert_flip_char(tty, ch, flag);
+               tty_flip_buffer_push(tty);
+       }
+out:
+       tty_kref_put(tty);
 }
 
 static void rc_receive(struct riscom_board const *bp)
@@ -394,7 +398,7 @@ static void rc_receive(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
        count = rc_in(bp, CD180_RDCR);
 
@@ -403,15 +407,14 @@ static void rc_receive(struct riscom_board const *bp)
 #endif
 
        while (count--)  {
-               if (tty_buffer_request_room(tty, 1) == 0)  {
-                       printk(KERN_WARNING "rc%d: port %d: Working around "
-                                           "flip buffer overflow.\n",
-                              board_No(bp), port_No(port));
-                       break;
-               }
-               tty_insert_flip_char(tty, rc_in(bp, CD180_RDR), TTY_NORMAL);
+               u8 ch = rc_in(bp, CD180_RDR);
+               if (tty)
+                       tty_insert_flip_char(tty, ch, TTY_NORMAL);
+       }
+       if (tty) {
+               tty_flip_buffer_push(tty);
+               tty_kref_put(tty);
        }
-       tty_flip_buffer_push(tty);
 }
 
 static void rc_transmit(struct riscom_board const *bp)
@@ -424,22 +427,22 @@ static void rc_transmit(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
        if (port->IER & IER_TXEMPTY) {
                /* FIFO drained */
                rc_out(bp, CD180_CAR, port_No(port));
                port->IER &= ~IER_TXEMPTY;
                rc_out(bp, CD180_IER, port->IER);
-               return;
+               goto out;
        }
 
        if ((port->xmit_cnt <= 0 && !port->break_length)
-           || tty->stopped || tty->hw_stopped)  {
+           || (tty && (tty->stopped || tty->hw_stopped)))  {
                rc_out(bp, CD180_CAR, port_No(port));
                port->IER &= ~IER_TXRDY;
                rc_out(bp, CD180_IER, port->IER);
-               return;
+               goto out;
        }
 
        if (port->break_length)  {
@@ -464,7 +467,7 @@ static void rc_transmit(struct riscom_board const *bp)
                        rc_out(bp, CD180_CCR, CCR_CORCHG2);
                        port->break_length = 0;
                }
-               return;
+               goto out;
        }
 
        count = CD180_NFIFO;
@@ -480,8 +483,10 @@ static void rc_transmit(struct riscom_board const *bp)
                port->IER &= ~IER_TXRDY;
                rc_out(bp, CD180_IER, port->IER);
        }
-       if (port->xmit_cnt <= port->wakeup_chars)
+       if (tty && port->xmit_cnt <= port->wakeup_chars)
                tty_wakeup(tty);
+out:
+       tty_kref_put(tty);
 }
 
 static void rc_check_modem(struct riscom_board const *bp)
@@ -494,37 +499,43 @@ static void rc_check_modem(struct riscom_board const *bp)
        if (port == NULL)
                return;
 
-       tty = port->port.tty;
+       tty = tty_port_tty_get(&port->port);
 
        mcr = rc_in(bp, CD180_MCR);
        if (mcr & MCR_CDCHG) {
                if (rc_in(bp, CD180_MSVR) & MSVR_CD)
                        wake_up_interruptible(&port->port.open_wait);
-               else
+               else if (tty)
                        tty_hangup(tty);
        }
 
 #ifdef RISCOM_BRAIN_DAMAGED_CTS
        if (mcr & MCR_CTSCHG)  {
                if (rc_in(bp, CD180_MSVR) & MSVR_CTS)  {
-                       tty->hw_stopped = 0;
                        port->IER |= IER_TXRDY;
-                       if (port->xmit_cnt <= port->wakeup_chars)
-                               tty_wakeup(tty);
+                       if (tty) {
+                               tty->hw_stopped = 0;
+                               if (port->xmit_cnt <= port->wakeup_chars)
+                                       tty_wakeup(tty);
+                       }
                } else  {
-                       tty->hw_stopped = 1;
+                       if (tty)
+                               tty->hw_stopped = 1;
                        port->IER &= ~IER_TXRDY;
                }
                rc_out(bp, CD180_IER, port->IER);
        }
        if (mcr & MCR_DSRCHG)  {
                if (rc_in(bp, CD180_MSVR) & MSVR_DSR)  {
-                       tty->hw_stopped = 0;
                        port->IER |= IER_TXRDY;
-                       if (port->xmit_cnt <= port->wakeup_chars)
-                               tty_wakeup(tty);
+                       if (tty) {
+                               tty->hw_stopped = 0;
+                               if (port->xmit_cnt <= port->wakeup_chars)
+                                       tty_wakeup(tty);
+                       }
                } else  {
-                       tty->hw_stopped = 1;
+                       if (tty)
+                               tty->hw_stopped = 1;
                        port->IER &= ~IER_TXRDY;
                }
                rc_out(bp, CD180_IER, port->IER);
@@ -533,6 +544,7 @@ static void rc_check_modem(struct riscom_board const *bp)
 
        /* Clear change bits */
        rc_out(bp, CD180_MCR, 0);
+       tty_kref_put(tty);
 }
 
 /* The main interrupt processing routine */
@@ -632,9 +644,9 @@ static void rc_shutdown_board(struct riscom_board *bp)
  * Setting up port characteristics.
  * Must be called with disabled interrupts
  */
-static void rc_change_speed(struct riscom_board *bp, struct riscom_port *port)
+static void rc_change_speed(struct tty_struct *tty, struct riscom_board *bp,
+                                               struct riscom_port *port)
 {
-       struct tty_struct *tty = port->port.tty;
        unsigned long baud;
        long tmp;
        unsigned char cor1 = 0, cor3 = 0;
@@ -781,7 +793,8 @@ static void rc_change_speed(struct riscom_board *bp, struct riscom_port *port)
 }
 
 /* Must be called with interrupts enabled */
-static int rc_setup_port(struct riscom_board *bp, struct riscom_port *port)
+static int rc_setup_port(struct tty_struct *tty, struct riscom_board *bp,
+                                               struct riscom_port *port)
 {
        unsigned long flags;
 
@@ -793,11 +806,11 @@ static int rc_setup_port(struct riscom_board *bp, struct riscom_port *port)
 
        spin_lock_irqsave(&riscom_lock, flags);
 
-       clear_bit(TTY_IO_ERROR, &port->port.tty->flags);
+       clear_bit(TTY_IO_ERROR, &tty->flags);
        if (port->port.count == 1)
                bp->count++;
        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
-       rc_change_speed(bp, port);
+       rc_change_speed(tty, bp, port);
        port->port.flags |= ASYNC_INITIALIZED;
 
        spin_unlock_irqrestore(&riscom_lock, flags);
@@ -898,9 +911,9 @@ static int rc_open(struct tty_struct *tty, struct file *filp)
 
        port->port.count++;
        tty->driver_data = port;
-       port->port.tty = tty;
+       tty_port_tty_set(&port->port, tty);
 
-       error = rc_setup_port(bp, port);
+       error = rc_setup_port(tty, bp, port);
        if (error == 0)
                error = tty_port_block_til_ready(&port->port, tty, filp);
        return error;
@@ -921,20 +934,12 @@ static void rc_flush_buffer(struct tty_struct *tty)
        tty_wakeup(tty);
 }
 
-static void rc_close(struct tty_struct *tty, struct file *filp)
+static void rc_close_port(struct tty_port *port)
 {
-       struct riscom_port *port = tty->driver_data;
-       struct riscom_board *bp;
        unsigned long flags;
+       struct riscom_port *rp = container_of(port, struct riscom_port, port);
+       struct riscom_board *bp = port_Board(rp);
        unsigned long timeout;
-
-       if (!port || rc_paranoia_check(port, tty->name, "close"))
-               return;
-
-       bp = port_Board(port);
-       
-       if (tty_port_close_start(&port->port, tty, filp) == 0)
-               return;
        
        /*
         * At this point we stop accepting input.  To do this, we
@@ -944,31 +949,37 @@ static void rc_close(struct tty_struct *tty, struct file *filp)
         */
 
        spin_lock_irqsave(&riscom_lock, flags);
-       port->IER &= ~IER_RXD;
-       if (port->port.flags & ASYNC_INITIALIZED) {
-               port->IER &= ~IER_TXRDY;
-               port->IER |= IER_TXEMPTY;
-               rc_out(bp, CD180_CAR, port_No(port));
-               rc_out(bp, CD180_IER, port->IER);
+       rp->IER &= ~IER_RXD;
+       if (port->flags & ASYNC_INITIALIZED) {
+               rp->IER &= ~IER_TXRDY;
+               rp->IER |= IER_TXEMPTY;
+               rc_out(bp, CD180_CAR, port_No(rp));
+               rc_out(bp, CD180_IER, rp->IER);
                /*
                 * Before we drop DTR, make sure the UART transmitter
                 * has completely drained; this is especially
                 * important if there is a transmit FIFO!
                 */
                timeout = jiffies + HZ;
-               while (port->IER & IER_TXEMPTY) {
+               while (rp->IER & IER_TXEMPTY) {
                        spin_unlock_irqrestore(&riscom_lock, flags);
-                       msleep_interruptible(jiffies_to_msecs(port->timeout));
+                       msleep_interruptible(jiffies_to_msecs(rp->timeout));
                        spin_lock_irqsave(&riscom_lock, flags);
                        if (time_after(jiffies, timeout))
                                break;
                }
        }
-       rc_shutdown_port(tty, bp, port);
-       rc_flush_buffer(tty);
+       rc_shutdown_port(port->tty, bp, rp);
        spin_unlock_irqrestore(&riscom_lock, flags);
+}
+
+static void rc_close(struct tty_struct *tty, struct file *filp)
+{
+       struct riscom_port *port = tty->driver_data;
 
-       tty_port_close_end(&port->port, tty);
+       if (!port || rc_paranoia_check(port, tty->name, "close"))
+               return;
+       tty_port_close(&port->port, tty, filp);
 }
 
 static int rc_write(struct tty_struct *tty,
@@ -1170,7 +1181,7 @@ static int rc_send_break(struct tty_struct *tty, int length)
        return 0;
 }
 
-static int rc_set_serial_info(struct riscom_port *port,
+static int rc_set_serial_info(struct tty_struct *tty, struct riscom_port *port,
                                     struct serial_struct __user *newinfo)
 {
        struct serial_struct tmp;
@@ -1180,17 +1191,6 @@ static int rc_set_serial_info(struct riscom_port *port,
        if (copy_from_user(&tmp, newinfo, sizeof(tmp)))
                return -EFAULT;
 
-#if 0
-       if ((tmp.irq != bp->irq) ||
-           (tmp.port != bp->base) ||
-           (tmp.type != PORT_CIRRUS) ||
-           (tmp.baud_base != (RC_OSCFREQ + CD180_TPC/2) / CD180_TPC) ||
-           (tmp.custom_divisor != 0) ||
-           (tmp.xmit_fifo_size != CD180_NFIFO) ||
-           (tmp.flags & ~RISCOM_LEGAL_FLAGS))
-               return -EINVAL;
-#endif
-
        change_speed = ((port->port.flags & ASYNC_SPD_MASK) !=
                        (tmp.flags & ASYNC_SPD_MASK));
 
@@ -1212,7 +1212,7 @@ static int rc_set_serial_info(struct riscom_port *port,
                unsigned long flags;
 
                spin_lock_irqsave(&riscom_lock, flags);
-               rc_change_speed(bp, port);
+               rc_change_speed(tty, bp, port);
                spin_unlock_irqrestore(&riscom_lock, flags);
        }
        return 0;
@@ -1255,7 +1255,7 @@ static int rc_ioctl(struct tty_struct *tty, struct file *filp,
                break;
        case TIOCSSERIAL:
                lock_kernel();
-               retval = rc_set_serial_info(port, argp);
+               retval = rc_set_serial_info(tty, port, argp);
                unlock_kernel();
                break;
        default:
@@ -1350,21 +1350,12 @@ static void rc_start(struct tty_struct *tty)
 static void rc_hangup(struct tty_struct *tty)
 {
        struct riscom_port *port = tty->driver_data;
-       struct riscom_board *bp;
-       unsigned long flags;
 
        if (rc_paranoia_check(port, tty->name, "rc_hangup"))
                return;
 
-       bp = port_Board(port);
-
-       rc_shutdown_port(tty, bp, port);
-       spin_lock_irqsave(&port->port.lock, flags);
-       port->port.count = 0;
-       port->port.flags &= ~ASYNC_NORMAL_ACTIVE;
-       port->port.tty = NULL;
-       wake_up_interruptible(&port->port.open_wait);
-       spin_unlock_irqrestore(&port->port.lock, flags);
+       rc_shutdown_port(tty, port_Board(port), port);
+       tty_port_hangup(&port->port);
 }
 
 static void rc_set_termios(struct tty_struct *tty,
@@ -1377,7 +1368,7 @@ static void rc_set_termios(struct tty_struct *tty,
                return;
 
        spin_lock_irqsave(&riscom_lock, flags);
-       rc_change_speed(port_Board(port), port);
+       rc_change_speed(tty, port_Board(port), port);
        spin_unlock_irqrestore(&riscom_lock, flags);
 
        if ((old_termios->c_cflag & CRTSCTS) &&
@@ -1410,6 +1401,7 @@ static const struct tty_operations riscom_ops = {
 
 static const struct tty_port_operations riscom_port_ops = {
        .carrier_raised = carrier_raised,
+       .shutdown = rc_close_port,
 };
 
 
index a3afa0c..ea18a12 100644 (file)
@@ -1184,6 +1184,7 @@ int tty_init_termios(struct tty_struct *tty)
        tty->termios->c_ospeed = tty_termios_baud_rate(tty->termios);
        return 0;
 }
+EXPORT_SYMBOL_GPL(tty_init_termios);
 
 /**
  *     tty_driver_install_tty() - install a tty entry in the driver
@@ -1386,10 +1387,14 @@ EXPORT_SYMBOL(tty_shutdown);
  *             tty_mutex - sometimes only
  *             takes the file list lock internally when working on the list
  *     of ttys that the driver keeps.
+ *
+ *     This method gets called from a work queue so that the driver private
+ *     shutdown ops can sleep (needed for USB at least)
  */
-static void release_one_tty(struct kref *kref)
+static void release_one_tty(struct work_struct *work)
 {
-       struct tty_struct *tty = container_of(kref, struct tty_struct, kref);
+       struct tty_struct *tty =
+               container_of(work, struct tty_struct, hangup_work);
        struct tty_driver *driver = tty->driver;
 
        if (tty->ops->shutdown)
@@ -1407,6 +1412,15 @@ static void release_one_tty(struct kref *kref)
        free_tty_struct(tty);
 }
 
+static void queue_release_one_tty(struct kref *kref)
+{
+       struct tty_struct *tty = container_of(kref, struct tty_struct, kref);
+       /* The hangup queue is now free so we can reuse it rather than
+          waste a chunk of memory for each port */
+       INIT_WORK(&tty->hangup_work, release_one_tty);
+       schedule_work(&tty->hangup_work);
+}
+
 /**
  *     tty_kref_put            -       release a tty kref
  *     @tty: tty device
@@ -1418,7 +1432,7 @@ static void release_one_tty(struct kref *kref)
 void tty_kref_put(struct tty_struct *tty)
 {
        if (tty)
-               kref_put(&tty->kref, release_one_tty);
+               kref_put(&tty->kref, queue_release_one_tty);
 }
 EXPORT_SYMBOL(tty_kref_put);
 
@@ -2085,7 +2099,7 @@ static int tioccons(struct file *file)
  *     the generic functionality existed. This piece of history is preserved
  *     in the expected tty API of posix OS's.
  *
- *     Locking: none, the open fle handle ensures it won't go away.
+ *     Locking: none, the open file handle ensures it won't go away.
  */
 
 static int fionbio(struct file *file, int __user *p)
@@ -3056,11 +3070,22 @@ void __init console_init(void)
        }
 }
 
+static char *tty_devnode(struct device *dev, mode_t *mode)
+{
+       if (!mode)
+               return NULL;
+       if (dev->devt == MKDEV(TTYAUX_MAJOR, 0) ||
+           dev->devt == MKDEV(TTYAUX_MAJOR, 2))
+               *mode = 0666;
+       return NULL;
+}
+
 static int __init tty_class_init(void)
 {
        tty_class = class_create(THIS_MODULE, "tty");
        if (IS_ERR(tty_class))
                return PTR_ERR(tty_class);
+       tty_class->devnode = tty_devnode;
        return 0;
 }
 
index ad6ba4e..8e67d5c 100644 (file)
@@ -393,9 +393,7 @@ void tty_termios_encode_baud_rate(struct ktermios *termios,
                termios->c_cflag |= (BOTHER << IBSHIFT);
 #else
        if (ifound == -1 || ofound == -1) {
-               static int warned;
-               if (!warned++)
-                       printk(KERN_WARNING "tty: Unable to return correct "
+               printk_once(KERN_WARNING "tty: Unable to return correct "
                          "speed data as your architecture needs updating.\n");
        }
 #endif
index e48af9f..aafdbae 100644 (file)
@@ -145,48 +145,33 @@ int tty_unregister_ldisc(int disc)
 }
 EXPORT_SYMBOL(tty_unregister_ldisc);
 
-
-/**
- *     tty_ldisc_try_get       -       try and reference an ldisc
- *     @disc: ldisc number
- *
- *     Attempt to open and lock a line discipline into place. Return
- *     the line discipline refcounted or an error.
- */
-
-static struct tty_ldisc *tty_ldisc_try_get(int disc)
+static struct tty_ldisc_ops *get_ldops(int disc)
 {
        unsigned long flags;
-       struct tty_ldisc *ld;
-       struct tty_ldisc_ops *ldops;
-       int err = -EINVAL;
-
-       ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL);
-       if (ld == NULL)
-               return ERR_PTR(-ENOMEM);
+       struct tty_ldisc_ops *ldops, *ret;
 
        spin_lock_irqsave(&tty_ldisc_lock, flags);
-       ld->ops = NULL;
+       ret = ERR_PTR(-EINVAL);
        ldops = tty_ldiscs[disc];
-       /* Check the entry is defined */
        if (ldops) {
-               /* If the module is being unloaded we can't use it */
-               if (!try_module_get(ldops->owner))
-                       err = -EAGAIN;
-               else {
-                       /* lock it */
+               ret = ERR_PTR(-EAGAIN);
+               if (try_module_get(ldops->owner)) {
                        ldops->refcount++;
-                       ld->ops = ldops;
-                       atomic_set(&ld->users, 1);
-                       err = 0;
+                       ret = ldops;
                }
        }
        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
-       if (err) {
-               kfree(ld);
-               return ERR_PTR(err);
-       }
-       return ld;
+       return ret;
+}
+
+static void put_ldops(struct tty_ldisc_ops *ldops)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&tty_ldisc_lock, flags);
+       ldops->refcount--;
+       module_put(ldops->owner);
+       spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 }
 
 /**
@@ -205,14 +190,31 @@ static struct tty_ldisc *tty_ldisc_try_get(int disc)
 static struct tty_ldisc *tty_ldisc_get(int disc)
 {
        struct tty_ldisc *ld;
+       struct tty_ldisc_ops *ldops;
 
        if (disc < N_TTY || disc >= NR_LDISCS)
                return ERR_PTR(-EINVAL);
-       ld = tty_ldisc_try_get(disc);
-       if (IS_ERR(ld)) {
+
+       /*
+        * Get the ldisc ops - we may need to request them to be loaded
+        * dynamically and try again.
+        */
+       ldops = get_ldops(disc);
+       if (IS_ERR(ldops)) {
                request_module("tty-ldisc-%d", disc);
-               ld = tty_ldisc_try_get(disc);
+               ldops = get_ldops(disc);
+               if (IS_ERR(ldops))
+                       return ERR_CAST(ldops);
        }
+
+       ld = kmalloc(sizeof(struct tty_ldisc), GFP_KERNEL);
+       if (ld == NULL) {
+               put_ldops(ldops);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       ld->ops = ldops;
+       atomic_set(&ld->users, 1);
        return ld;
 }
 
@@ -234,13 +236,13 @@ static void tty_ldiscs_seq_stop(struct seq_file *m, void *v)
 static int tty_ldiscs_seq_show(struct seq_file *m, void *v)
 {
        int i = *(loff_t *)v;
-       struct tty_ldisc *ld;
+       struct tty_ldisc_ops *ldops;
 
-       ld = tty_ldisc_try_get(i);
-       if (IS_ERR(ld))
+       ldops = get_ldops(i);
+       if (IS_ERR(ldops))
                return 0;
-       seq_printf(m, "%-10s %2d\n", ld->ops->name ? ld->ops->name : "???", i);
-       put_ldisc(ld);
+       seq_printf(m, "%-10s %2d\n", ldops->name ? ldops->name : "???", i);
+       put_ldops(ldops);
        return 0;
 }
 
index 9769b11..a4bbb28 100644 (file)
@@ -23,6 +23,7 @@ void tty_port_init(struct tty_port *port)
        memset(port, 0, sizeof(*port));
        init_waitqueue_head(&port->open_wait);
        init_waitqueue_head(&port->close_wait);
+       init_waitqueue_head(&port->delta_msr_wait);
        mutex_init(&port->mutex);
        spin_lock_init(&port->lock);
        port->close_delay = (50 * HZ) / 100;
@@ -96,6 +97,14 @@ void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty)
 }
 EXPORT_SYMBOL(tty_port_tty_set);
 
+static void tty_port_shutdown(struct tty_port *port)
+{
+       if (port->ops->shutdown &&
+               test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags))
+                       port->ops->shutdown(port);
+
+}
+
 /**
  *     tty_port_hangup         -       hangup helper
  *     @port: tty port
@@ -116,6 +125,8 @@ void tty_port_hangup(struct tty_port *port)
        port->tty = NULL;
        spin_unlock_irqrestore(&port->lock, flags);
        wake_up_interruptible(&port->open_wait);
+       wake_up_interruptible(&port->delta_msr_wait);
+       tty_port_shutdown(port);
 }
 EXPORT_SYMBOL(tty_port_hangup);
 
@@ -296,15 +307,17 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
 
        if (port->count) {
                spin_unlock_irqrestore(&port->lock, flags);
+               if (port->ops->drop)
+                       port->ops->drop(port);
                return 0;
        }
-       port->flags |= ASYNC_CLOSING;
+       set_bit(ASYNCB_CLOSING, &port->flags);
        tty->closing = 1;
        spin_unlock_irqrestore(&port->lock, flags);
        /* Don't block on a stalled port, just pull the chain */
        if (tty->flow_stopped)
                tty_driver_flush_buffer(tty);
-       if (port->flags & ASYNC_INITIALIZED &&
+       if (test_bit(ASYNCB_INITIALIZED, &port->flags) &&
                        port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
                tty_wait_until_sent(tty, port->closing_wait);
        if (port->drain_delay) {
@@ -318,6 +331,9 @@ int tty_port_close_start(struct tty_port *port, struct tty_struct *tty, struct f
                        timeout = 2 * HZ;
                schedule_timeout_interruptible(timeout);
        }
+       /* Don't call port->drop for the last reference. Callers will want
+          to drop the last active reference in ->shutdown() or the tty
+          shutdown path */
        return 1;
 }
 EXPORT_SYMBOL(tty_port_close_start);
@@ -348,3 +364,14 @@ void tty_port_close_end(struct tty_port *port, struct tty_struct *tty)
        spin_unlock_irqrestore(&port->lock, flags);
 }
 EXPORT_SYMBOL(tty_port_close_end);
+
+void tty_port_close(struct tty_port *port, struct tty_struct *tty,
+                                                       struct file *filp)
+{
+       if (tty_port_close_start(port, tty, filp) == 0)
+               return;
+       tty_port_shutdown(port);
+       tty_port_close_end(port, tty);
+       tty_port_tty_set(port, NULL);
+}
+EXPORT_SYMBOL(tty_port_close);
index 6aa88f5..0c80c68 100644 (file)
@@ -252,7 +252,6 @@ static void notify_update(struct vc_data *vc)
        struct vt_notifier_param param = { .vc = vc };
        atomic_notifier_call_chain(&vt_notifier_list, VT_UPDATE, &param);
 }
-
 /*
  *     Low-Level Functions
  */
@@ -935,6 +934,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
 
        if (CON_IS_VISIBLE(vc))
                update_screen(vc);
+       vt_event_post(VT_EVENT_RESIZE, vc->vc_num, vc->vc_num);
        return err;
 }
 
@@ -2129,11 +2129,7 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
        currcons = vc->vc_num;
        if (!vc_cons_allocated(currcons)) {
            /* could this happen? */
-           static int error = 0;
-           if (!error) {
-               error = 1;
-               printk("con_write: tty %d not allocated\n", currcons+1);
-           }
+               printk_once("con_write: tty %d not allocated\n", currcons+1);
            release_console_sem();
            return 0;
        }
@@ -2910,6 +2906,9 @@ static const struct tty_operations con_ops = {
        .flush_chars = con_flush_chars,
        .chars_in_buffer = con_chars_in_buffer,
        .ioctl = vt_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl = vt_compat_ioctl,
+#endif
        .stop = con_stop,
        .start = con_start,
        .throttle = con_throttle,
@@ -2955,7 +2954,6 @@ int __init vty_init(const struct file_operations *console_fops)
 }
 
 #ifndef VT_SINGLE_DRIVER
-#include <linux/device.h>
 
 static struct class *vtconsole_class;
 
@@ -3638,6 +3636,7 @@ void do_blank_screen(int entering_gfx)
                blank_state = blank_vesa_wait;
                mod_timer(&console_timer, jiffies + vesa_off_interval);
        }
+       vt_event_post(VT_EVENT_BLANK, vc->vc_num, vc->vc_num);
 }
 EXPORT_SYMBOL(do_blank_screen);
 
@@ -3682,6 +3681,7 @@ void do_unblank_screen(int leaving_gfx)
                console_blank_hook(0);
        set_palette(vc);
        set_cursor(vc);
+       vt_event_post(VT_EVENT_UNBLANK, vc->vc_num, vc->vc_num);
 }
 EXPORT_SYMBOL(do_unblank_screen);
 
index 95189f2..29c651a 100644 (file)
@@ -16,6 +16,8 @@
 #include <linux/tty.h>
 #include <linux/timer.h>
 #include <linux/kernel.h>
+#include <linux/compat.h>
+#include <linux/module.h>
 #include <linux/kd.h>
 #include <linux/vt.h>
 #include <linux/string.h>
@@ -62,6 +64,133 @@ extern struct tty_driver *console_driver;
 static void complete_change_console(struct vc_data *vc);
 
 /*
+ *     User space VT_EVENT handlers
+ */
+
+struct vt_event_wait {
+       struct list_head list;
+       struct vt_event event;
+       int done;
+};
+
+static LIST_HEAD(vt_events);
+static DEFINE_SPINLOCK(vt_event_lock);
+static DECLARE_WAIT_QUEUE_HEAD(vt_event_waitqueue);
+
+/**
+ *     vt_event_post
+ *     @event: the event that occurred
+ *     @old: old console
+ *     @new: new console
+ *
+ *     Post an VT event to interested VT handlers
+ */
+
+void vt_event_post(unsigned int event, unsigned int old, unsigned int new)
+{
+       struct list_head *pos, *head;
+       unsigned long flags;
+       int wake = 0;
+
+       spin_lock_irqsave(&vt_event_lock, flags);
+       head = &vt_events;
+
+       list_for_each(pos, head) {
+               struct vt_event_wait *ve = list_entry(pos,
+                                               struct vt_event_wait, list);
+               if (!(ve->event.event & event))
+                       continue;
+               ve->event.event = event;
+               /* kernel view is consoles 0..n-1, user space view is
+                  console 1..n with 0 meaning current, so we must bias */
+               ve->event.old = old + 1;
+               ve->event.new = new + 1;
+               wake = 1;
+               ve->done = 1;
+       }
+       spin_unlock_irqrestore(&vt_event_lock, flags);
+       if (wake)
+               wake_up_interruptible(&vt_event_waitqueue);
+}
+
+/**
+ *     vt_event_wait           -       wait for an event
+ *     @vw: our event
+ *
+ *     Waits for an event to occur which completes our vt_event_wait
+ *     structure. On return the structure has wv->done set to 1 for success
+ *     or 0 if some event such as a signal ended the wait.
+ */
+
+static void vt_event_wait(struct vt_event_wait *vw)
+{
+       unsigned long flags;
+       /* Prepare the event */
+       INIT_LIST_HEAD(&vw->list);
+       vw->done = 0;
+       /* Queue our event */
+       spin_lock_irqsave(&vt_event_lock, flags);
+       list_add(&vw->list, &vt_events);
+       spin_unlock_irqrestore(&vt_event_lock, flags);
+       /* Wait for it to pass */
+       wait_event_interruptible(vt_event_waitqueue, vw->done);
+       /* Dequeue it */
+       spin_lock_irqsave(&vt_event_lock, flags);
+       list_del(&vw->list);
+       spin_unlock_irqrestore(&vt_event_lock, flags);
+}
+
+/**
+ *     vt_event_wait_ioctl     -       event ioctl handler
+ *     @arg: argument to ioctl
+ *
+ *     Implement the VT_WAITEVENT ioctl using the VT event interface
+ */
+
+static int vt_event_wait_ioctl(struct vt_event __user *event)
+{
+       struct vt_event_wait vw;
+
+       if (copy_from_user(&vw.event, event, sizeof(struct vt_event)))
+               return -EFAULT;
+       /* Highest supported event for now */
+       if (vw.event.event & ~VT_MAX_EVENT)
+               return -EINVAL;
+
+       vt_event_wait(&vw);
+       /* If it occurred report it */
+       if (vw.done) {
+               if (copy_to_user(event, &vw.event, sizeof(struct vt_event)))
+                       return -EFAULT;
+               return 0;
+       }
+       return -EINTR;
+}
+
+/**
+ *     vt_waitactive   -       active console wait
+ *     @event: event code
+ *     @n: new console
+ *
+ *     Helper for event waits. Used to implement the legacy
+ *     event waiting ioctls in terms of events
+ */
+
+int vt_waitactive(int n)
+{
+       struct vt_event_wait vw;
+       do {
+               if (n == fg_console + 1)
+                       break;
+               vw.event.event = VT_EVENT_SWITCH;
+               vt_event_wait(&vw);
+               if (vw.done == 0)
+                       return -EINTR;
+       } while (vw.event.new != n);
+       return 0;
+}
+
+/*
  * these are the valid i/o ports we're allowed to change. they map all the
  * video ports
  */
@@ -360,6 +489,8 @@ do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_
        return 0;
 }
 
+
+
 /*
  * We handle the console-specific ioctl's here.  We allow the
  * capability to modify any console, not just the fg_console. 
@@ -842,6 +973,41 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                }
                break;
 
+       case VT_SETACTIVATE:
+       {
+               struct vt_setactivate vsa;
+
+               if (!perm)
+                       goto eperm;
+
+               if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg,
+                                               sizeof(struct vt_setactivate)))
+                       return -EFAULT;
+               if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
+                       ret = -ENXIO;
+               else {
+                       vsa.console--;
+                       acquire_console_sem();
+                       ret = vc_allocate(vsa.console);
+                       if (ret == 0) {
+                               struct vc_data *nvc;
+                               /* This is safe providing we don't drop the
+                                  console sem between vc_allocate and
+                                  finishing referencing nvc */
+                               nvc = vc_cons[vsa.console].d;
+                               nvc->vt_mode = vsa.mode;
+                               nvc->vt_mode.frsig = 0;
+                               put_pid(nvc->vt_pid);
+                               nvc->vt_pid = get_pid(task_pid(current));
+                       }
+                       release_console_sem();
+                       if (ret)
+                               break;
+                       /* Commence switch and lock */
+                       set_console(arg);
+               }
+       }
+
        /*
         * wait until the specified VT has been activated
         */
@@ -851,7 +1017,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                if (arg == 0 || arg > MAX_NR_CONSOLES)
                        ret = -ENXIO;
                else
-                       ret = vt_waitactive(arg - 1);
+                       ret = vt_waitactive(arg);
                break;
 
        /*
@@ -1159,6 +1325,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                ret = put_user(vc->vc_hi_font_mask,
                                        (unsigned short __user *)arg);
                break;
+       case VT_WAITEVENT:
+               ret = vt_event_wait_ioctl((struct vt_event __user *)arg);
+               break;
        default:
                ret = -ENOIOCTLCMD;
        }
@@ -1170,54 +1339,6 @@ eperm:
        goto out;
 }
 
-/*
- * Sometimes we want to wait until a particular VT has been activated. We
- * do it in a very simple manner. Everybody waits on a single queue and
- * get woken up at once. Those that are satisfied go on with their business,
- * while those not ready go back to sleep. Seems overkill to add a wait
- * to each vt just for this - usually this does nothing!
- */
-static DECLARE_WAIT_QUEUE_HEAD(vt_activate_queue);
-
-/*
- * Sleeps until a vt is activated, or the task is interrupted. Returns
- * 0 if activation, -EINTR if interrupted by a signal handler.
- */
-int vt_waitactive(int vt)
-{
-       int retval;
-       DECLARE_WAITQUEUE(wait, current);
-
-       add_wait_queue(&vt_activate_queue, &wait);
-       for (;;) {
-               retval = 0;
-
-               /*
-                * Synchronize with redraw_screen(). By acquiring the console
-                * semaphore we make sure that the console switch is completed
-                * before we return. If we didn't wait for the semaphore, we
-                * could return at a point where fg_console has already been
-                * updated, but the console switch hasn't been completed.
-                */
-               acquire_console_sem();
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (vt == fg_console) {
-                       release_console_sem();
-                       break;
-               }
-               release_console_sem();
-               retval = -ERESTARTNOHAND;
-               if (signal_pending(current))
-                       break;
-               schedule();
-       }
-       remove_wait_queue(&vt_activate_queue, &wait);
-       __set_current_state(TASK_RUNNING);
-       return retval;
-}
-
-#define vt_wake_waitactive() wake_up(&vt_activate_queue)
-
 void reset_vc(struct vc_data *vc)
 {
        vc->vc_mode = KD_TEXT;
@@ -1256,12 +1377,216 @@ void vc_SAK(struct work_struct *work)
        release_console_sem();
 }
 
+#ifdef CONFIG_COMPAT
+
+struct compat_consolefontdesc {
+       unsigned short charcount;       /* characters in font (256 or 512) */
+       unsigned short charheight;      /* scan lines per character (1-32) */
+       compat_caddr_t chardata;        /* font data in expanded form */
+};
+
+static inline int
+compat_fontx_ioctl(int cmd, struct compat_consolefontdesc __user *user_cfd,
+                        int perm, struct console_font_op *op)
+{
+       struct compat_consolefontdesc cfdarg;
+       int i;
+
+       if (copy_from_user(&cfdarg, user_cfd, sizeof(struct compat_consolefontdesc)))
+               return -EFAULT;
+
+       switch (cmd) {
+       case PIO_FONTX:
+               if (!perm)
+                       return -EPERM;
+               op->op = KD_FONT_OP_SET;
+               op->flags = KD_FONT_FLAG_OLD;
+               op->width = 8;
+               op->height = cfdarg.charheight;
+               op->charcount = cfdarg.charcount;
+               op->data = compat_ptr(cfdarg.chardata);
+               return con_font_op(vc_cons[fg_console].d, op);
+       case GIO_FONTX:
+               op->op = KD_FONT_OP_GET;
+               op->flags = KD_FONT_FLAG_OLD;
+               op->width = 8;
+               op->height = cfdarg.charheight;
+               op->charcount = cfdarg.charcount;
+               op->data = compat_ptr(cfdarg.chardata);
+               i = con_font_op(vc_cons[fg_console].d, op);
+               if (i)
+                       return i;
+               cfdarg.charheight = op->height;
+               cfdarg.charcount = op->charcount;
+               if (copy_to_user(user_cfd, &cfdarg, sizeof(struct compat_consolefontdesc)))
+                       return -EFAULT;
+               return 0;
+       }
+       return -EINVAL;
+}
+
+struct compat_console_font_op {
+       compat_uint_t op;        /* operation code KD_FONT_OP_* */
+       compat_uint_t flags;     /* KD_FONT_FLAG_* */
+       compat_uint_t width, height;     /* font size */
+       compat_uint_t charcount;
+       compat_caddr_t data;    /* font data with height fixed to 32 */
+};
+
+static inline int
+compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
+                        int perm, struct console_font_op *op, struct vc_data *vc)
+{
+       int i;
+
+       if (copy_from_user(op, fontop, sizeof(struct compat_console_font_op)))
+               return -EFAULT;
+       if (!perm && op->op != KD_FONT_OP_GET)
+               return -EPERM;
+       op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
+       op->flags |= KD_FONT_FLAG_OLD;
+       i = con_font_op(vc, op);
+       if (i)
+               return i;
+       ((struct compat_console_font_op *)op)->data = (unsigned long)op->data;
+       if (copy_to_user(fontop, op, sizeof(struct compat_console_font_op)))
+               return -EFAULT;
+       return 0;
+}
+
+struct compat_unimapdesc {
+       unsigned short entry_ct;
+       compat_caddr_t entries;
+};
+
+static inline int
+compat_unimap_ioctl(unsigned int cmd, struct compat_unimapdesc __user *user_ud,
+                        int perm, struct vc_data *vc)
+{
+       struct compat_unimapdesc tmp;
+       struct unipair __user *tmp_entries;
+
+       if (copy_from_user(&tmp, user_ud, sizeof tmp))
+               return -EFAULT;
+       tmp_entries = compat_ptr(tmp.entries);
+       if (tmp_entries)
+               if (!access_ok(VERIFY_WRITE, tmp_entries,
+                               tmp.entry_ct*sizeof(struct unipair)))
+                       return -EFAULT;
+       switch (cmd) {
+       case PIO_UNIMAP:
+               if (!perm)
+                       return -EPERM;
+               return con_set_unimap(vc, tmp.entry_ct, tmp_entries);
+       case GIO_UNIMAP:
+               if (!perm && fg_console != vc->vc_num)
+                       return -EPERM;
+               return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp_entries);
+       }
+       return 0;
+}
+
+long vt_compat_ioctl(struct tty_struct *tty, struct file * file,
+            unsigned int cmd, unsigned long arg)
+{
+       struct vc_data *vc = tty->driver_data;
+       struct console_font_op op;      /* used in multiple places here */
+       struct kbd_struct *kbd;
+       unsigned int console;
+       void __user *up = (void __user *)arg;
+       int perm;
+       int ret = 0;
+
+       console = vc->vc_num;
+
+       lock_kernel();
+
+       if (!vc_cons_allocated(console)) {      /* impossible? */
+               ret = -ENOIOCTLCMD;
+               goto out;
+       }
+
+       /*
+        * To have permissions to do most of the vt ioctls, we either have
+        * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
+        */
+       perm = 0;
+       if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
+               perm = 1;
+
+       kbd = kbd_table + console;
+       switch (cmd) {
+       /*
+        * these need special handlers for incompatible data structures
+        */
+       case PIO_FONTX:
+       case GIO_FONTX:
+               ret = compat_fontx_ioctl(cmd, up, perm, &op);
+               break;
+
+       case KDFONTOP:
+               ret = compat_kdfontop_ioctl(up, perm, &op, vc);
+               break;
+
+       case PIO_UNIMAP:
+       case GIO_UNIMAP:
+               ret = do_unimap_ioctl(cmd, up, perm, vc);
+               break;
+
+       /*
+        * all these treat 'arg' as an integer
+        */
+       case KIOCSOUND:
+       case KDMKTONE:
+#ifdef CONFIG_X86
+       case KDADDIO:
+       case KDDELIO:
+#endif
+       case KDSETMODE:
+       case KDMAPDISP:
+       case KDUNMAPDISP:
+       case KDSKBMODE:
+       case KDSKBMETA:
+       case KDSKBLED:
+       case KDSETLED:
+       case KDSIGACCEPT:
+       case VT_ACTIVATE:
+       case VT_WAITACTIVE:
+       case VT_RELDISP:
+       case VT_DISALLOCATE:
+       case VT_RESIZE:
+       case VT_RESIZEX:
+               goto fallback;
+
+       /*
+        * the rest has a compatible data structure behind arg,
+        * but we have to convert it to a proper 64 bit pointer.
+        */
+       default:
+               arg = (unsigned long)compat_ptr(arg);
+               goto fallback;
+       }
+out:
+       unlock_kernel();
+       return ret;
+
+fallback:
+       unlock_kernel();
+       return vt_ioctl(tty, file, cmd, arg);
+}
+
+
+#endif /* CONFIG_COMPAT */
+
+
 /*
- * Performs the back end of a vt switch
+ * Performs the back end of a vt switch. Called under the console
+ * semaphore.
  */
 static void complete_change_console(struct vc_data *vc)
 {
        unsigned char old_vc_mode;
+       int old = fg_console;
 
        last_console = fg_console;
 
@@ -1325,7 +1650,7 @@ static void complete_change_console(struct vc_data *vc)
        /*
         * Wake anyone waiting for their VT to activate
         */
-       vt_wake_waitactive();
+       vt_event_post(VT_EVENT_SWITCH, old, vc->vc_num);
        return;
 }
 
@@ -1398,3 +1723,58 @@ void change_console(struct vc_data *new_vc)
 
        complete_change_console(new_vc);
 }
+
+/* Perform a kernel triggered VT switch for suspend/resume */
+
+static int disable_vt_switch;
+
+int vt_move_to_console(unsigned int vt, int alloc)
+{
+       int prev;
+
+       acquire_console_sem();
+       /* Graphics mode - up to X */
+       if (disable_vt_switch) {
+               release_console_sem();
+               return 0;
+       }
+       prev = fg_console;
+
+       if (alloc && vc_allocate(vt)) {
+               /* we can't have a free VC for now. Too bad,
+                * we don't want to mess the screen for now. */
+               release_console_sem();
+               return -ENOSPC;
+       }
+
+       if (set_console(vt)) {
+               /*
+                * We're unable to switch to the SUSPEND_CONSOLE.
+                * Let the calling function know so it can decide
+                * what to do.
+                */
+               release_console_sem();
+               return -EIO;
+       }
+       release_console_sem();
+       if (vt_waitactive(vt + 1)) {
+               pr_debug("Suspend: Can't switch VCs.");
+               return -EINTR;
+       }
+       return prev;
+}
+
+/*
+ * Normally during a suspend, we allocate a new console and switch to it.
+ * When we resume, we switch back to the original console.  This switch
+ * can be slow, so on systems where the framebuffer can handle restoration
+ * of video registers anyways, there's little point in doing the console
+ * switch.  This function allows you to disable it by passing it '0'.
+ */
+void pm_set_vt_switch(int do_switch)
+{
+       acquire_console_sem();
+       disable_vt_switch = !do_switch;
+       release_console_sem();
+}
+EXPORT_SYMBOL(pm_set_vt_switch);
index 8504a21..ad41f19 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/cpuidle.h>
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
+#include <trace/events/power.h>
 
 #include "cpuidle.h"
 
@@ -91,6 +92,7 @@ static void cpuidle_idle_call(void)
        /* give the governor an opportunity to reflect on the outcome */
        if (cpuidle_curr_governor->reflect)
                cpuidle_curr_governor->reflect(dev);
+       trace_power_end(0);
 }
 
 /**
index f7a615b..5301f22 100644 (file)
@@ -76,7 +76,7 @@ static ssize_t version_show(struct class *dev, char *buf)
                       CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
 }
 
-static char *drm_nodename(struct device *dev)
+static char *drm_devnode(struct device *dev, mode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "dri/%s", dev_name(dev));
 }