Changes in 4.9.283 ext4: fix race writing to an inline_data file while its xattrs are changing mtd: nand: atmel_nand: remove build warning in atmel_nand_remove() xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG qed: Fix the VF msix vectors flow qede: Fix memset corruption perf/x86/amd/ibs: Work around erratum #1197 cryptoloop: add a deprecation warning ARM: 8918/2: only build return_address() if needed ALSA: pcm: fix divide error in snd_pcm_lib_ioctl ath: Use safer key clearing with key cache entries ath9k: Clear key cache explicitly on disabling hardware ath: Export ath_hw_keysetmac() ath: Modify ath_key_delete() to not need full key entry ath9k: Postpone key cache entry deletion for TXQ frames reference it media: stkwebcam: fix memory leak in stk_camera_probe igmp: Add ip_mc_list lock in ip_check_mc_rcu usb: phy: isp1301: Fix build warning when CONFIG_OF is disabled USB: serial: mos7720: improve OOM-handling in read_mos_reg() net/sched: cls_flower: Use mask for addr_type PM / wakeirq: Enable dedicated wakeirq for suspend tc358743: fix register i2c_rd/wr function fix nvme-pci: Fix an error handling path in 'nvme_probe()' gfs2: Don't clear SGID when inheriting ACLs ipv4/icmp: l3mdev: Perform icmp error route lookup on source device routing table (v2) s390/disassembler: correct disassembly lines alignment mm/kmemleak.c: make cond_resched() rate-limiting more efficient crypto: talitos - reduce max key size for SEC1 powerpc/module64: Fix comment in R_PPC64_ENTRY handling powerpc/boot: Delete unneeded .globl _zimage_start net: ll_temac: Remove left-over debug message mm/page_alloc: speed up the iteration of max_order Revert "btrfs: compression: don't try to compress if we don't have enough pages" x86/reboot: Limit Dell Optiplex 990 quirk to early BIOS versions PCI: Call Max Payload Size-related fixup quirks early regmap: fix the offset of register error log crypto: mxs-dcp - Check for DMA mapping errors power: supply: axp288_fuel_gauge: Report register-address on readb / writeb errors crypto: omap-sham - clear dma flags only after omap_sham_update_dma_stop() udf: Check LVID earlier power: supply: max17042_battery: fix typo in MAx17042_TOFF libata: fix ata_host_start() crypto: qat - do not ignore errors from enable_vf2pf_comms() crypto: qat - handle both source of interrupt in VF ISR crypto: qat - fix reuse of completion variable crypto: qat - fix naming for init/shutdown VF to PF notifications crypto: qat - do not export adf_iov_putmsg() udf_get_extendedattr() had no boundary checks. m68k: emu: Fix invalid free in nfeth_cleanup() spi: spi-pic32: Fix issue with uninitialized dma_slave_config crypto: qat - use proper type for vf_mask certs: Trigger creation of RSA module signing key if it's not an RSA key media: dvb-usb: fix uninit-value in dvb_usb_adapter_dvb_init media: dvb-usb: fix uninit-value in vp702x_read_mac_addr media: go7007: remove redundant initialization Bluetooth: sco: prevent information leak in sco_conn_defer_accept() tcp: seq_file: Avoid skipping sk during tcp_seek_last_pos net: cipso: fix warnings in netlbl_cipsov4_add_std i2c: highlander: add IRQ check PCI: PM: Enable PME if it can be signaled from D3cold soc: qcom: smsm: Fix missed interrupts if state changes while masked Bluetooth: increase BTNAMSIZ to 21 chars to fix potential buffer overflow arm64: dts: exynos: correct GIC CPU interfaces address range on Exynos7 Bluetooth: fix repeated calls to sco_sock_kill drm/msm/dsi: Fix some reference counted resource leaks usb: gadget: udc: at91: add IRQ check usb: phy: fsl-usb: add IRQ check usb: phy: twl6030: add IRQ checks Bluetooth: Move shutdown callback before flushing tx and rx queue usb: host: ohci-tmio: add IRQ check usb: phy: tahvo: add IRQ check usb: gadget: mv_u3d: request_irq() after initializing UDC Bluetooth: add timeout sanity check to hci_inquiry i2c: iop3xx: fix deferred probing i2c: s3c2410: fix IRQ check mmc: dw_mmc: Fix issue with uninitialized dma_slave_config mmc: moxart: Fix issue with uninitialized dma_slave_config CIFS: Fix a potencially linear read overflow i2c: mt65xx: fix IRQ check usb: ehci-orion: Handle errors of clk_prepare_enable() in probe ath6kl: wmi: fix an error code in ath6kl_wmi_sync_point() bcma: Fix memory leak for internally-handled cores ipv4: make exception cache less predictible tty: Fix data race between tiocsti() and flush_to_ldisc() KVM: x86: Update vCPU's hv_clock before back to guest when tsc_offset is adjusted IMA: remove -Wmissing-prototypes warning clk: kirkwood: Fix a clocking boot regression fbmem: don't allow too huge resolutions rtc: tps65910: Correct driver module alias PCI/MSI: Skip masking MSI-X on Xen PV powerpc/perf/hv-gpci: Fix counter value parsing xen: fix setting of max_pfn in shared_info crypto: public_key: fix overflow during implicit conversion power: supply: max17042: handle fails of reading status register VMCI: fix NULL pointer dereference when unmapping queue pair media: uvc: don't do DMA on stack media: rc-loopback: return number of emitters rather than error libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs ARM: 9105/1: atags_to_fdt: don't warn about stack size PCI: Restrict ASMedia ASM1062 SATA Max Payload Size Supported PCI: Return ~0 data on pciconfig_read() CAP_SYS_ADMIN failure vfio: Use config not menuconfig for VFIO_NOIOMMU openrisc: don't printk() unconditionally pinctrl: single: Fix error return code in pcs_parse_bits_in_pinctrl_entry() MIPS: Malta: fix alignment of the devicetree buffer crypto: mxs-dcp - Use sg_mapping_iter to copy data PCI: Use pci_update_current_state() in pci_enable_device_flags() iio: dac: ad5624r: Fix incorrect handling of an optional regulator. video: fbdev: kyro: fix a DoS bug by restricting user input netlink: Deal with ESRCH error in nlmsg_notify() Smack: Fix wrong semantics in smk_access_entry() usb: host: fotg210: fix the endpoint's transactional opportunities calculation usb: host: fotg210: fix the actual_length of an iso packet usb: gadget: u_ether: fix a potential null pointer dereference usb: gadget: composite: Allow bMaxPower=0 if self-powered staging: board: Fix uninitialized spinlock when attaching genpd tty: serial: jsm: hold port lock when reporting modem line changes bpf/tests: Fix copy-and-paste error in double word test bpf/tests: Do not PASS tests without actually testing the result video: fbdev: asiliantfb: Error out if 'pixclock' equals zero video: fbdev: kyro: Error out if 'pixclock' equals zero video: fbdev: riva: Error out if 'pixclock' equals zero ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs() flow_dissector: Fix out-of-bounds warnings s390/jump_label: print real address in a case of a jump label bug serial: 8250: Define RX trigger levels for OxSemi 950 devices xtensa: ISS: don't panic in rs_init hvsi: don't panic on tty_register_driver failure serial: 8250_pci: make setup_port() parameters explicitly unsigned staging: ks7010: Fix the initialization of the 'sleep_status' structure ata: sata_dwc_460ex: No need to call phy_exit() befre phy_init() Bluetooth: skip invalid hci_sync_conn_complete_evt ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe() Bluetooth: avoid circular locks in sco_sock_connect gpu: drm: amd: amdgpu: amdgpu_i2c: fix possible uninitialized-variable access in amdgpu_i2c_router_select_ddc_port() ARM: tegra: tamonten: Fix UART pad setting rpc: fix gss_svc_init cleanup on failure gfs2: Don't call dlm after protocol is unmounted mmc: rtsx_pci: Fix long reads when clock is prescaled cifs: fix wrong release in sess_alloc_buffer() failed path Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set" usbip: give back URBs for unsent unlink requests during cleanup parport: remove non-zero check on count ath9k: fix OOB read ar9300_eeprom_restore_internal ath9k: fix sleeping in atomic context net: fix NULL pointer reference in cipso_v4_doi_free net: w5100: check return value after calling platform_get_resource() parisc: fix crash with signals and alloca scsi: BusLogic: Fix missing pr_cont() use mm/hugetlb: initialize hugetlb_usage in mm_init memcg: enable accounting for pids in nested pid namespaces platform/chrome: cros_ec_proto: Send command again when timeout occurs xen: reset legacy rtc flag for PV domU bnx2x: Fix enabling network interfaces without VFs net-caif: avoid user-triggerable WARN_ON(1) ptp: dp83640: don't define PAGE0 dccp: don't duplicate ccid when cloning dccp sock net/l2tp: Fix reference count leak in l2tp_udp_recv_core r6040: Restore MDIO clock frequency after MAC reset tipc: increase timeout in tipc_sk_enqueue() events: Reuse value read using READ_ONCE instead of re-reading it net/af_unix: fix a data-race in unix_dgram_poll tcp: fix tp->undo_retrans accounting in tcp_sacktag_one() x86/mm: Fix kern_addr_valid() to cope with existing but not present entries dt-bindings: mtd: gpmc: Fix the ECC bytes vs. OOB bytes equation mfd: Don't use irq_create_mapping() to resolve a mapping net: usb: cdc_mbim: avoid altsetting toggling for Telit LN920 ethtool: Fix an error code in cxgb2.c PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()' ARC: export clear_user_page() for modules net: dsa: b53: Fix calculating number of switch ports qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom net: renesas: sh_eth: Fix freeing wrong tx descriptor s390/bpf: Fix 64-bit subtraction of the -0x80000000 constant Linux 4.9.283 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I9e2017cce36805d71566ea1f265974a43bae33d1
283 lines
6.4 KiB
C
283 lines
6.4 KiB
C
/*
|
|
* arch/xtensa/platforms/iss/console.c
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 2001-2005 Tensilica Inc.
|
|
* Authors Christian Zankel, Joe Taylor
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/console.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/major.h>
|
|
#include <linux/param.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/serial.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/irq.h>
|
|
|
|
#include <platform/simcall.h>
|
|
|
|
#include <linux/tty.h>
|
|
#include <linux/tty_flip.h>
|
|
|
|
#define SERIAL_MAX_NUM_LINES 1
|
|
#define SERIAL_TIMER_VALUE (HZ / 10)
|
|
|
|
static struct tty_driver *serial_driver;
|
|
static struct tty_port serial_port;
|
|
static struct timer_list serial_timer;
|
|
|
|
static DEFINE_SPINLOCK(timer_lock);
|
|
|
|
static char *serial_version = "0.1";
|
|
static char *serial_name = "ISS serial driver";
|
|
|
|
/*
|
|
* This routine is called whenever a serial port is opened. It
|
|
* enables interrupts for a serial port, linking in its async structure into
|
|
* the IRQ chain. It also performs the serial-specific
|
|
* initialization for the tty structure.
|
|
*/
|
|
|
|
static void rs_poll(unsigned long);
|
|
|
|
static int rs_open(struct tty_struct *tty, struct file * filp)
|
|
{
|
|
tty->port = &serial_port;
|
|
spin_lock_bh(&timer_lock);
|
|
if (tty->count == 1) {
|
|
setup_timer(&serial_timer, rs_poll,
|
|
(unsigned long)&serial_port);
|
|
mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
|
|
}
|
|
spin_unlock_bh(&timer_lock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
* ------------------------------------------------------------
|
|
* iss_serial_close()
|
|
*
|
|
* 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 rs_close(struct tty_struct *tty, struct file * filp)
|
|
{
|
|
spin_lock_bh(&timer_lock);
|
|
if (tty->count == 1)
|
|
del_timer_sync(&serial_timer);
|
|
spin_unlock_bh(&timer_lock);
|
|
}
|
|
|
|
|
|
static int rs_write(struct tty_struct * tty,
|
|
const unsigned char *buf, int count)
|
|
{
|
|
/* see drivers/char/serialX.c to reference original version */
|
|
|
|
simc_write(1, buf, count);
|
|
return count;
|
|
}
|
|
|
|
static void rs_poll(unsigned long priv)
|
|
{
|
|
struct tty_port *port = (struct tty_port *)priv;
|
|
int i = 0;
|
|
int rd = 1;
|
|
unsigned char c;
|
|
|
|
spin_lock(&timer_lock);
|
|
|
|
while (simc_poll(0)) {
|
|
rd = simc_read(0, &c, 1);
|
|
if (rd <= 0)
|
|
break;
|
|
tty_insert_flip_char(port, c, TTY_NORMAL);
|
|
i++;
|
|
}
|
|
|
|
if (i)
|
|
tty_flip_buffer_push(port);
|
|
if (rd)
|
|
mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE);
|
|
spin_unlock(&timer_lock);
|
|
}
|
|
|
|
|
|
static int rs_put_char(struct tty_struct *tty, unsigned char ch)
|
|
{
|
|
return rs_write(tty, &ch, 1);
|
|
}
|
|
|
|
static void rs_flush_chars(struct tty_struct *tty)
|
|
{
|
|
}
|
|
|
|
static int rs_write_room(struct tty_struct *tty)
|
|
{
|
|
/* Let's say iss can always accept 2K characters.. */
|
|
return 2 * 1024;
|
|
}
|
|
|
|
static int rs_chars_in_buffer(struct tty_struct *tty)
|
|
{
|
|
/* the iss doesn't buffer characters */
|
|
return 0;
|
|
}
|
|
|
|
static void rs_hangup(struct tty_struct *tty)
|
|
{
|
|
/* Stub, once again.. */
|
|
}
|
|
|
|
static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
|
|
{
|
|
/* Stub, once again.. */
|
|
}
|
|
|
|
static int rs_proc_show(struct seq_file *m, void *v)
|
|
{
|
|
seq_printf(m, "serinfo:1.0 driver:%s\n", serial_version);
|
|
return 0;
|
|
}
|
|
|
|
static int rs_proc_open(struct inode *inode, struct file *file)
|
|
{
|
|
return single_open(file, rs_proc_show, NULL);
|
|
}
|
|
|
|
static const struct file_operations rs_proc_fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = rs_proc_open,
|
|
.read = seq_read,
|
|
.llseek = seq_lseek,
|
|
.release = single_release,
|
|
};
|
|
|
|
static const struct tty_operations serial_ops = {
|
|
.open = rs_open,
|
|
.close = rs_close,
|
|
.write = rs_write,
|
|
.put_char = rs_put_char,
|
|
.flush_chars = rs_flush_chars,
|
|
.write_room = rs_write_room,
|
|
.chars_in_buffer = rs_chars_in_buffer,
|
|
.hangup = rs_hangup,
|
|
.wait_until_sent = rs_wait_until_sent,
|
|
.proc_fops = &rs_proc_fops,
|
|
};
|
|
|
|
int __init rs_init(void)
|
|
{
|
|
int ret;
|
|
|
|
serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES);
|
|
if (!serial_driver)
|
|
return -ENOMEM;
|
|
|
|
tty_port_init(&serial_port);
|
|
|
|
printk ("%s %s\n", serial_name, serial_version);
|
|
|
|
/* Initialize the tty_driver structure */
|
|
|
|
serial_driver->driver_name = "iss_serial";
|
|
serial_driver->name = "ttyS";
|
|
serial_driver->major = TTY_MAJOR;
|
|
serial_driver->minor_start = 64;
|
|
serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
|
|
serial_driver->subtype = SERIAL_TYPE_NORMAL;
|
|
serial_driver->init_termios = tty_std_termios;
|
|
serial_driver->init_termios.c_cflag =
|
|
B9600 | CS8 | CREAD | HUPCL | CLOCAL;
|
|
serial_driver->flags = TTY_DRIVER_REAL_RAW;
|
|
|
|
tty_set_operations(serial_driver, &serial_ops);
|
|
tty_port_link_device(&serial_port, serial_driver, 0);
|
|
|
|
ret = tty_register_driver(serial_driver);
|
|
if (ret) {
|
|
pr_err("Couldn't register serial driver\n");
|
|
tty_driver_kref_put(serial_driver);
|
|
tty_port_destroy(&serial_port);
|
|
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static __exit void rs_exit(void)
|
|
{
|
|
int error;
|
|
|
|
if ((error = tty_unregister_driver(serial_driver)))
|
|
printk("ISS_SERIAL: failed to unregister serial driver (%d)\n",
|
|
error);
|
|
put_tty_driver(serial_driver);
|
|
tty_port_destroy(&serial_port);
|
|
}
|
|
|
|
|
|
/* We use `late_initcall' instead of just `__initcall' as a workaround for
|
|
* the fact that (1) simcons_tty_init can't be called before tty_init,
|
|
* (2) tty_init is called via `module_init', (3) if statically linked,
|
|
* module_init == device_init, and (4) there's no ordering of init lists.
|
|
* We can do this easily because simcons is always statically linked, but
|
|
* other tty drivers that depend on tty_init and which must use
|
|
* `module_init' to declare their init routines are likely to be broken.
|
|
*/
|
|
|
|
late_initcall(rs_init);
|
|
|
|
|
|
#ifdef CONFIG_SERIAL_CONSOLE
|
|
|
|
static void iss_console_write(struct console *co, const char *s, unsigned count)
|
|
{
|
|
int len = strlen(s);
|
|
|
|
if (s != 0 && *s != 0)
|
|
simc_write(1, s, count < len ? count : len);
|
|
}
|
|
|
|
static struct tty_driver* iss_console_device(struct console *c, int *index)
|
|
{
|
|
*index = c->index;
|
|
return serial_driver;
|
|
}
|
|
|
|
|
|
static struct console sercons = {
|
|
.name = "ttyS",
|
|
.write = iss_console_write,
|
|
.device = iss_console_device,
|
|
.flags = CON_PRINTBUFFER,
|
|
.index = -1
|
|
};
|
|
|
|
static int __init iss_console_init(void)
|
|
{
|
|
register_console(&sercons);
|
|
return 0;
|
|
}
|
|
|
|
console_initcall(iss_console_init);
|
|
|
|
#endif /* CONFIG_SERIAL_CONSOLE */
|
|
|