mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
This is the 5.4.36 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl6pkDUACgkQONu9yGCS
aT7cRxAAgnedn6pSj8x/LcbtqeQv52CDVXF0j1xOeK+o8hbIbvkjqAB1ZpPwAXaK
PPiI34lzLBRo9i5nw/rOL7TR7q+uqLE/bT4Z8rrlbeq85SmP8PI2HwpPnRc3Iwhi
RReIq00q5gBqF6AL7+Of3dEytrpOtyzf3Ff/3vadJ2WZEcblFoemGDjMbubaoI9E
e2uE6WSe4tYk/pbLu5HduMQ46YGsWvTJAnN0RIefX4WsGmK0sCJRmJ78qIabWTct
rUxoqhNHshPam7Qm6xVXe1pHa3U7zMNNtG52aJwoDzZ32rOTpBJly0F5FYYYW01Z
zZbY/8eeGn4OIwGr+wvw/XmB0uYlBw35HH8f5OYpvSnfgjmT7wa8QmRJAS6um7dD
elNqO1QuLa8lA/Tm5O9lzNIc3Vko322XQmGlsIU2xVBX0EdTig4Io+xuJkMMkU7q
JJF4Ic4xOYa330TZBIKEoXgf4hGhNgKKRML00yhDNWROWXdB9W9tLbFELDiiiF+K
ooeTB4aCsS2PheS/kZFL2U1RKlnMzBhYeZzPAg4ulfaVMHo5Zp8mBv4L17j9yU0+
MtKtS9tSV0SiDe2SpDCRKSMx+m5jpmgXxuX4HlkbSJ4d/5oAwNKQOTQj9xt3UmbL
JUghr8OOyk6V2wwgW1tFkTcFnzqCqzmvSeJf6AvBSr7ZHnqH130=
=7Fsb
-----END PGP SIGNATURE-----
Merge 5.4.36 into android-5.4-stable
Changes in 5.4.36
ext4: fix extent_status fragmentation for plain files
f2fs: fix to avoid memory leakage in f2fs_listxattr
net, ip_tunnel: fix interface lookup with no key
arm64: errata: Hide CTR_EL0.DIC on systems affected by Neoverse-N1 #1542419
arm64: Fake the IminLine size on systems affected by Neoverse-N1 #1542419
arm64: compat: Workaround Neoverse-N1 #1542419 for compat user-space
arm64: Silence clang warning on mismatched value/register sizes
tools/testing/nvdimm: Fix compilation failure without CONFIG_DEV_DAX_PMEM_COMPAT
watchdog: reset last_hw_keepalive time at start
scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login
scsi: lpfc: Fix crash after handling a pci error
scsi: lpfc: Fix crash in target side cable pulls hitting WAIT_FOR_UNREG
scsi: libfc: If PRLI rejected, move rport to PLOGI state
ceph: return ceph_mdsc_do_request() errors from __get_parent()
ceph: don't skip updating wanted caps when cap is stale
pwm: rcar: Fix late Runtime PM enablement
nvme-tcp: fix possible crash in write_zeroes processing
scsi: iscsi: Report unbind session event when the target has been removed
tools/test/nvdimm: Fix out of tree build
ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
nvme: fix deadlock caused by ANA update wrong locking
drm/amd/display: Update stream adjust in dc_stream_adjust_vmin_vmax
dma-direct: fix data truncation in dma_direct_get_required_mask()
kernel/gcov/fs.c: gcov_seq_next() should increase position index
selftests: kmod: fix handling test numbers above 9
ipc/util.c: sysvipc_find_ipc() should increase position index
kconfig: qconf: Fix a few alignment issues
lib/raid6/test: fix build on distros whose /bin/sh is not bash
s390/cio: generate delayed uevent for vfio-ccw subchannels
s390/cio: avoid duplicated 'ADD' uevents
loop: Better discard support for block devices
Revert "powerpc/64: irq_work avoid interrupt when called with hardware irqs enabled"
powerpc/pseries: Fix MCE handling on pseries
nvme: fix compat address handling in several ioctls
pwm: renesas-tpu: Fix late Runtime PM enablement
pwm: bcm2835: Dynamically allocate base
perf/core: Disable page faults when getting phys address
drm/amd/display: Calculate scaling ratios on every medium/full update
ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN MPWIN895CL tablet
ALSA: usb-audio: Add Pioneer DJ DJM-250MK2 quirk
xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3
xhci: Wait until link state trainsits to U0 after setting USB_SS_PORT_LS_U0
xhci: Finetune host initiated USB3 rootport link suspend and resume
drm/amd/display: Not doing optimize bandwidth if flip pending.
PCI/PM: Add pcie_wait_for_link_delay()
libbpf: Fix readelf output parsing on powerpc with recent binutils
PCI: pciehp: Prevent deadlock on disconnect
ASoC: SOF: trace: fix unconditional free in trace release
tracing/selftests: Turn off timeout setting
virtio-blk: improve virtqueue error to BLK_STS
scsi: smartpqi: fix controller lockup observed during force reboot
scsi: smartpqi: fix call trace in device discovery
scsi: smartpqi: fix problem with unique ID for physical device
PCI/ASPM: Allow re-enabling Clock PM
PCI/PM: Add missing link delays required by the PCIe spec
cxgb4: fix adapter crash due to wrong MC size
cxgb4: fix large delays in PTP synchronization
ipv4: Update fib_select_default to handle nexthop objects
ipv6: fix restrict IPV6_ADDRFORM operation
macsec: avoid to set wrong mtu
macvlan: fix null dereference in macvlan_device_event()
mlxsw: Fix some IS_ERR() vs NULL bugs
net: bcmgenet: correct per TX/RX ring statistics
net/mlx4_en: avoid indirect call in TX completion
net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node
net: openvswitch: ovs_ct_exit to be done under ovs_lock
net: stmmac: dwmac-meson8b: Add missing boundary to RGMII TX clock array
net/x25: Fix x25_neigh refcnt leak when receiving frame
sched: etf: do not assume all sockets are full blown
selftests: Fix suppress test in fib_tests.sh
tcp: cache line align MAX_TCP_HEADER
team: fix hang in team_mode_get()
vrf: Fix IPv6 with qdisc and xfrm
net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled
net: dsa: b53: Fix valid setting for MDB entries
net: dsa: b53: Fix ARL register definitions
net: dsa: b53: Rework ARL bin logic
net: dsa: b53: b53_arl_rw_op() needs to select IVL or SVL
vxlan: use the correct nlattr array in NL_SET_ERR_MSG_ATTR
geneve: use the correct nlattr array in NL_SET_ERR_MSG_ATTR
xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish
vrf: Check skb for XFRM_TRANSFORMED flag
KEYS: Avoid false positive ENOMEM error on key read
ALSA: hda: Remove ASUS ROG Zenith from the blacklist
ALSA: usb-audio: Add static mapping table for ALC1220-VB-based mobos
ALSA: usb-audio: Add connector notifier delegation
iio: core: remove extra semi-colon from devm_iio_device_register() macro
iio: st_sensors: rely on odr mask to know if odr can be set
iio: adc: stm32-adc: fix sleep in atomic context
iio: adc: ti-ads8344: properly byte swap value
iio: xilinx-xadc: Fix ADC-B powerdown
iio: xilinx-xadc: Fix clearing interrupt when enabling trigger
iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode
iio: xilinx-xadc: Make sure not exceed maximum samplerate
USB: sisusbvga: Change port variable from signed to unsigned
USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE
USB: early: Handle AMD's spec-compliant identifiers, too
USB: core: Fix free-while-in-use bug in the USB S-Glibrary
USB: hub: Fix handling of connect changes during sleep
USB: hub: Revert commit bd0e6c9614 ("usb: hub: try old enumeration scheme first for high speed devices")
tty: serial: owl: add "much needed" clk_prepare_enable()
vmalloc: fix remap_vmalloc_range() bounds checks
staging: gasket: Fix incongruency in handling of sysfs entries creation
coredump: fix null pointer dereference on coredump
mm/hugetlb: fix a addressing exception caused by huge_pte_offset
mm/ksm: fix NULL pointer dereference when KSM zero page is enabled
tools/vm: fix cross-compile build
ALSA: usx2y: Fix potential NULL dereference
ALSA: hda/realtek - Fix unexpected init_amp override
ALSA: hda/realtek - Add new codec supported for ALC245
ALSA: hda/hdmi: Add module option to disable audio component binding
ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif
ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices
tpm/tpm_tis: Free IRQ if probing fails
tpm: fix wrong return value in tpm_pcr_extend
tpm: ibmvtpm: retry on H_CLOSED in tpm_ibmvtpm_send()
KVM: s390: Return last valid slot if approx index is out-of-bounds
KVM: Check validity of resolved slot when searching memslots
KVM: VMX: Enable machine check support for 32bit targets
tty: hvc: fix buffer overflow during hvc_alloc().
tty: rocket, avoid OOB access
usb-storage: Add unusual_devs entry for JMicron JMS566
signal: Avoid corrupting si_pid and si_uid in do_notify_parent
audit: check the length of userspace generated audit records
ASoC: dapm: fixup dapm kcontrol widget
mac80211: populate debugfs only after cfg80211 init
SUNRPC: Fix backchannel RPC soft lockups
iwlwifi: pcie: actually release queue memory in TVQM
iwlwifi: mvm: beacon statistics shouldn't go backwards
iwlwifi: mvm: limit maximum queue appropriately
iwlwifi: mvm: Do not declare support for ACK Enabled Aggregation
iwlwifi: mvm: fix inactive TID removal return value usage
cifs: fix uninitialised lease_key in open_shroot()
ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y
powerpc/setup_64: Set cache-line-size based on cache-block-size
staging: comedi: dt2815: fix writing hi byte of analog output
staging: comedi: Fix comedi_device refcnt leak in comedi_open
vt: don't hardcode the mem allocation upper bound
vt: don't use kmalloc() for the unicode screen buffer
staging: vt6656: Don't set RCR_MULTICAST or RCR_BROADCAST by default.
staging: vt6656: Fix calling conditions of vnt_set_bss_mode
staging: vt6656: Fix drivers TBTT timing counter.
staging: vt6656: Fix pairwise key entry save.
staging: vt6656: Power save stop wake_up_count wrap around.
cdc-acm: close race betrween suspend() and acm_softint
cdc-acm: introduce a cool down
UAS: no use logging any details in case of ENODEV
UAS: fix deadlock in error handling and PM flushing work
fpga: dfl: pci: fix return value of cci_pci_sriov_configure
usb: dwc3: gadget: Fix request completion check
usb: f_fs: Clear OS Extended descriptor counts to zero in ffs_data_reset()
usb: typec: tcpm: Ignore CC and vbus changes in PORT_RESET change
usb: typec: altmode: Fix typec_altmode_get_partner sometimes returning an invalid pointer
xhci: Fix handling halted endpoint even if endpoint ring appears empty
xhci: prevent bus suspend if a roothub port detected a over-current condition
xhci: Don't clear hub TT buffer on ep0 protocol stall
serial: sh-sci: Make sure status register SCxSR is read in correct sequence
Revert "serial: uartps: Fix uartps_major handling"
Revert "serial: uartps: Use the same dynamic major number for all ports"
Revert "serial: uartps: Fix error path when alloc failed"
Revert "serial: uartps: Do not allow use aliases >= MAX_UART_INSTANCES"
Revert "serial: uartps: Change uart ID port allocation"
Revert "serial: uartps: Move Port ID to device data structure"
Revert "serial: uartps: Register own uart console and driver structures"
powerpc/kuap: PPC_KUAP_DEBUG should depend on PPC_KUAP
powerpc/mm: Fix CONFIG_PPC_KUAP_DEBUG on PPC32
compat: ARM64: always include asm-generic/compat.h
s390/mm: fix page table upgrade vs 2ndary address mode accesses
Linux 5.4.36
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Change-Id: Idd8d97e7f00eb7389e184fc4186c4c0dd14f1704
This commit is contained in:
Greg Kroah-Hartman
commit
c736c6b27a
183 changed files with 1939 additions and 841 deletions
|
|
@ -302,10 +302,6 @@ int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
|
|||
vtermnos[index] = vtermno;
|
||||
cons_ops[index] = ops;
|
||||
|
||||
/* reserve all indices up to and including this index */
|
||||
if (last_hvc < index)
|
||||
last_hvc = index;
|
||||
|
||||
/* check if we need to re-register the kernel console */
|
||||
hvc_check_console(index);
|
||||
|
||||
|
|
@ -960,13 +956,22 @@ struct hvc_struct *hvc_alloc(uint32_t vtermno, int data,
|
|||
cons_ops[i] == hp->ops)
|
||||
break;
|
||||
|
||||
/* no matching slot, just use a counter */
|
||||
if (i >= MAX_NR_HVC_CONSOLES)
|
||||
i = ++last_hvc;
|
||||
if (i >= MAX_NR_HVC_CONSOLES) {
|
||||
|
||||
/* find 'empty' slot for console */
|
||||
for (i = 0; i < MAX_NR_HVC_CONSOLES && vtermnos[i] != -1; i++) {
|
||||
}
|
||||
|
||||
/* no matching slot, just use a counter */
|
||||
if (i == MAX_NR_HVC_CONSOLES)
|
||||
i = ++last_hvc + MAX_NR_HVC_CONSOLES;
|
||||
}
|
||||
|
||||
hp->index = i;
|
||||
cons_ops[i] = ops;
|
||||
vtermnos[i] = vtermno;
|
||||
if (i < MAX_NR_HVC_CONSOLES) {
|
||||
cons_ops[i] = ops;
|
||||
vtermnos[i] = vtermno;
|
||||
}
|
||||
|
||||
list_add_tail(&(hp->next), &hvc_structs);
|
||||
mutex_unlock(&hvc_structs_mutex);
|
||||
|
|
|
|||
|
|
@ -632,18 +632,21 @@ init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
|
|||
tty_port_init(&info->port);
|
||||
info->port.ops = &rocket_port_ops;
|
||||
info->flags &= ~ROCKET_MODE_MASK;
|
||||
switch (pc104[board][line]) {
|
||||
case 422:
|
||||
info->flags |= ROCKET_MODE_RS422;
|
||||
break;
|
||||
case 485:
|
||||
info->flags |= ROCKET_MODE_RS485;
|
||||
break;
|
||||
case 232:
|
||||
default:
|
||||
if (board < ARRAY_SIZE(pc104) && line < ARRAY_SIZE(pc104_1))
|
||||
switch (pc104[board][line]) {
|
||||
case 422:
|
||||
info->flags |= ROCKET_MODE_RS422;
|
||||
break;
|
||||
case 485:
|
||||
info->flags |= ROCKET_MODE_RS485;
|
||||
break;
|
||||
case 232:
|
||||
default:
|
||||
info->flags |= ROCKET_MODE_RS232;
|
||||
break;
|
||||
}
|
||||
else
|
||||
info->flags |= ROCKET_MODE_RS232;
|
||||
break;
|
||||
}
|
||||
|
||||
info->intmask = RXF_TRIG | TXFIFO_MT | SRC_INT | DELTA_CD | DELTA_CTS | DELTA_DSR;
|
||||
if (sInitChan(ctlp, &info->channel, aiop, chan) == 0) {
|
||||
|
|
|
|||
|
|
@ -680,6 +680,12 @@ static int owl_uart_probe(struct platform_device *pdev)
|
|||
return PTR_ERR(owl_port->clk);
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(owl_port->clk);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "could not enable clk\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
owl_port->port.dev = &pdev->dev;
|
||||
owl_port->port.line = pdev->id;
|
||||
owl_port->port.type = PORT_OWL;
|
||||
|
|
@ -712,6 +718,7 @@ static int owl_uart_remove(struct platform_device *pdev)
|
|||
|
||||
uart_remove_one_port(&owl_uart_driver, &owl_port->port);
|
||||
owl_uart_ports[pdev->id] = NULL;
|
||||
clk_disable_unprepare(owl_port->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -873,9 +873,16 @@ static void sci_receive_chars(struct uart_port *port)
|
|||
tty_insert_flip_char(tport, c, TTY_NORMAL);
|
||||
} else {
|
||||
for (i = 0; i < count; i++) {
|
||||
char c = serial_port_in(port, SCxRDR);
|
||||
char c;
|
||||
|
||||
status = serial_port_in(port, SCxSR);
|
||||
if (port->type == PORT_SCIF ||
|
||||
port->type == PORT_HSCIF) {
|
||||
status = serial_port_in(port, SCxSR);
|
||||
c = serial_port_in(port, SCxRDR);
|
||||
} else {
|
||||
c = serial_port_in(port, SCxRDR);
|
||||
status = serial_port_in(port, SCxSR);
|
||||
}
|
||||
if (uart_handle_sysrq_char(port, c)) {
|
||||
count--; i--;
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -30,13 +30,15 @@
|
|||
|
||||
#define CDNS_UART_TTY_NAME "ttyPS"
|
||||
#define CDNS_UART_NAME "xuartps"
|
||||
#define CDNS_UART_MAJOR 0 /* use dynamic node allocation */
|
||||
#define CDNS_UART_MINOR 0 /* works best with devtmpfs */
|
||||
#define CDNS_UART_NR_PORTS 16
|
||||
#define CDNS_UART_FIFO_SIZE 64 /* FIFO size */
|
||||
#define CDNS_UART_REGISTER_SPACE 0x1000
|
||||
#define TX_TIMEOUT 500000
|
||||
|
||||
/* Rx Trigger level */
|
||||
static int rx_trigger_level = 56;
|
||||
static int uartps_major;
|
||||
module_param(rx_trigger_level, uint, 0444);
|
||||
MODULE_PARM_DESC(rx_trigger_level, "Rx trigger level, 1-63 bytes");
|
||||
|
||||
|
|
@ -182,7 +184,6 @@ MODULE_PARM_DESC(rx_timeout, "Rx timeout, 1-255");
|
|||
* @pclk: APB clock
|
||||
* @cdns_uart_driver: Pointer to UART driver
|
||||
* @baud: Current baud rate
|
||||
* @id: Port ID
|
||||
* @clk_rate_change_nb: Notifier block for clock changes
|
||||
* @quirks: Flags for RXBS support.
|
||||
*/
|
||||
|
|
@ -192,7 +193,6 @@ struct cdns_uart {
|
|||
struct clk *pclk;
|
||||
struct uart_driver *cdns_uart_driver;
|
||||
unsigned int baud;
|
||||
int id;
|
||||
struct notifier_block clk_rate_change_nb;
|
||||
u32 quirks;
|
||||
bool cts_override;
|
||||
|
|
@ -1119,6 +1119,8 @@ static const struct uart_ops cdns_uart_ops = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static struct uart_driver cdns_uart_uart_driver;
|
||||
|
||||
#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
|
||||
/**
|
||||
* cdns_uart_console_putchar - write the character to the FIFO buffer
|
||||
|
|
@ -1258,6 +1260,16 @@ static int cdns_uart_console_setup(struct console *co, char *options)
|
|||
|
||||
return uart_set_options(port, co, baud, parity, bits, flow);
|
||||
}
|
||||
|
||||
static struct console cdns_uart_console = {
|
||||
.name = CDNS_UART_TTY_NAME,
|
||||
.write = cdns_uart_console_write,
|
||||
.device = uart_console_device,
|
||||
.setup = cdns_uart_console_setup,
|
||||
.flags = CON_PRINTBUFFER,
|
||||
.index = -1, /* Specified on the cmdline (e.g. console=ttyPS ) */
|
||||
.data = &cdns_uart_uart_driver,
|
||||
};
|
||||
#endif /* CONFIG_SERIAL_XILINX_PS_UART_CONSOLE */
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -1389,89 +1401,8 @@ static const struct of_device_id cdns_uart_of_match[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(of, cdns_uart_of_match);
|
||||
|
||||
/*
|
||||
* Maximum number of instances without alias IDs but if there is alias
|
||||
* which target "< MAX_UART_INSTANCES" range this ID can't be used.
|
||||
*/
|
||||
#define MAX_UART_INSTANCES 32
|
||||
|
||||
/* Stores static aliases list */
|
||||
static DECLARE_BITMAP(alias_bitmap, MAX_UART_INSTANCES);
|
||||
static int alias_bitmap_initialized;
|
||||
|
||||
/* Stores actual bitmap of allocated IDs with alias IDs together */
|
||||
static DECLARE_BITMAP(bitmap, MAX_UART_INSTANCES);
|
||||
/* Protect bitmap operations to have unique IDs */
|
||||
static DEFINE_MUTEX(bitmap_lock);
|
||||
|
||||
static int cdns_get_id(struct platform_device *pdev)
|
||||
{
|
||||
int id, ret;
|
||||
|
||||
mutex_lock(&bitmap_lock);
|
||||
|
||||
/* Alias list is stable that's why get alias bitmap only once */
|
||||
if (!alias_bitmap_initialized) {
|
||||
ret = of_alias_get_alias_list(cdns_uart_of_match, "serial",
|
||||
alias_bitmap, MAX_UART_INSTANCES);
|
||||
if (ret && ret != -EOVERFLOW) {
|
||||
mutex_unlock(&bitmap_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
alias_bitmap_initialized++;
|
||||
}
|
||||
|
||||
/* Make sure that alias ID is not taken by instance without alias */
|
||||
bitmap_or(bitmap, bitmap, alias_bitmap, MAX_UART_INSTANCES);
|
||||
|
||||
dev_dbg(&pdev->dev, "Alias bitmap: %*pb\n",
|
||||
MAX_UART_INSTANCES, bitmap);
|
||||
|
||||
/* Look for a serialN alias */
|
||||
id = of_alias_get_id(pdev->dev.of_node, "serial");
|
||||
if (id < 0) {
|
||||
dev_warn(&pdev->dev,
|
||||
"No serial alias passed. Using the first free id\n");
|
||||
|
||||
/*
|
||||
* Start with id 0 and check if there is no serial0 alias
|
||||
* which points to device which is compatible with this driver.
|
||||
* If alias exists then try next free position.
|
||||
*/
|
||||
id = 0;
|
||||
|
||||
for (;;) {
|
||||
dev_info(&pdev->dev, "Checking id %d\n", id);
|
||||
id = find_next_zero_bit(bitmap, MAX_UART_INSTANCES, id);
|
||||
|
||||
/* No free empty instance */
|
||||
if (id == MAX_UART_INSTANCES) {
|
||||
dev_err(&pdev->dev, "No free ID\n");
|
||||
mutex_unlock(&bitmap_lock);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
dev_dbg(&pdev->dev, "The empty id is %d\n", id);
|
||||
/* Check if ID is empty */
|
||||
if (!test_and_set_bit(id, bitmap)) {
|
||||
/* Break the loop if bit is taken */
|
||||
dev_dbg(&pdev->dev,
|
||||
"Selected ID %d allocation passed\n",
|
||||
id);
|
||||
break;
|
||||
}
|
||||
dev_dbg(&pdev->dev,
|
||||
"Selected ID %d allocation failed\n", id);
|
||||
/* if taking bit fails then try next one */
|
||||
id++;
|
||||
}
|
||||
}
|
||||
|
||||
mutex_unlock(&bitmap_lock);
|
||||
|
||||
return id;
|
||||
}
|
||||
/* Temporary variable for storing number of instances */
|
||||
static int instances;
|
||||
|
||||
/**
|
||||
* cdns_uart_probe - Platform driver probe
|
||||
|
|
@ -1481,16 +1412,11 @@ static int cdns_get_id(struct platform_device *pdev)
|
|||
*/
|
||||
static int cdns_uart_probe(struct platform_device *pdev)
|
||||
{
|
||||
int rc, irq;
|
||||
int rc, id, irq;
|
||||
struct uart_port *port;
|
||||
struct resource *res;
|
||||
struct cdns_uart *cdns_uart_data;
|
||||
const struct of_device_id *match;
|
||||
struct uart_driver *cdns_uart_uart_driver;
|
||||
char *driver_name;
|
||||
#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
|
||||
struct console *cdns_uart_console;
|
||||
#endif
|
||||
|
||||
cdns_uart_data = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_data),
|
||||
GFP_KERNEL);
|
||||
|
|
@ -1500,64 +1426,35 @@ static int cdns_uart_probe(struct platform_device *pdev)
|
|||
if (!port)
|
||||
return -ENOMEM;
|
||||
|
||||
cdns_uart_uart_driver = devm_kzalloc(&pdev->dev,
|
||||
sizeof(*cdns_uart_uart_driver),
|
||||
GFP_KERNEL);
|
||||
if (!cdns_uart_uart_driver)
|
||||
return -ENOMEM;
|
||||
/* Look for a serialN alias */
|
||||
id = of_alias_get_id(pdev->dev.of_node, "serial");
|
||||
if (id < 0)
|
||||
id = 0;
|
||||
|
||||
cdns_uart_data->id = cdns_get_id(pdev);
|
||||
if (cdns_uart_data->id < 0)
|
||||
return cdns_uart_data->id;
|
||||
|
||||
/* There is a need to use unique driver name */
|
||||
driver_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s%d",
|
||||
CDNS_UART_NAME, cdns_uart_data->id);
|
||||
if (!driver_name) {
|
||||
rc = -ENOMEM;
|
||||
goto err_out_id;
|
||||
if (id >= CDNS_UART_NR_PORTS) {
|
||||
dev_err(&pdev->dev, "Cannot get uart_port structure\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
cdns_uart_uart_driver->owner = THIS_MODULE;
|
||||
cdns_uart_uart_driver->driver_name = driver_name;
|
||||
cdns_uart_uart_driver->dev_name = CDNS_UART_TTY_NAME;
|
||||
cdns_uart_uart_driver->major = uartps_major;
|
||||
cdns_uart_uart_driver->minor = cdns_uart_data->id;
|
||||
cdns_uart_uart_driver->nr = 1;
|
||||
|
||||
if (!cdns_uart_uart_driver.state) {
|
||||
cdns_uart_uart_driver.owner = THIS_MODULE;
|
||||
cdns_uart_uart_driver.driver_name = CDNS_UART_NAME;
|
||||
cdns_uart_uart_driver.dev_name = CDNS_UART_TTY_NAME;
|
||||
cdns_uart_uart_driver.major = CDNS_UART_MAJOR;
|
||||
cdns_uart_uart_driver.minor = CDNS_UART_MINOR;
|
||||
cdns_uart_uart_driver.nr = CDNS_UART_NR_PORTS;
|
||||
#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
|
||||
cdns_uart_console = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_console),
|
||||
GFP_KERNEL);
|
||||
if (!cdns_uart_console) {
|
||||
rc = -ENOMEM;
|
||||
goto err_out_id;
|
||||
}
|
||||
|
||||
strncpy(cdns_uart_console->name, CDNS_UART_TTY_NAME,
|
||||
sizeof(cdns_uart_console->name));
|
||||
cdns_uart_console->index = cdns_uart_data->id;
|
||||
cdns_uart_console->write = cdns_uart_console_write;
|
||||
cdns_uart_console->device = uart_console_device;
|
||||
cdns_uart_console->setup = cdns_uart_console_setup;
|
||||
cdns_uart_console->flags = CON_PRINTBUFFER;
|
||||
cdns_uart_console->data = cdns_uart_uart_driver;
|
||||
cdns_uart_uart_driver->cons = cdns_uart_console;
|
||||
cdns_uart_uart_driver.cons = &cdns_uart_console;
|
||||
#endif
|
||||
|
||||
rc = uart_register_driver(cdns_uart_uart_driver);
|
||||
if (rc < 0) {
|
||||
dev_err(&pdev->dev, "Failed to register driver\n");
|
||||
goto err_out_id;
|
||||
rc = uart_register_driver(&cdns_uart_uart_driver);
|
||||
if (rc < 0) {
|
||||
dev_err(&pdev->dev, "Failed to register driver\n");
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
|
||||
cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver;
|
||||
|
||||
/*
|
||||
* Setting up proper name_base needs to be done after uart
|
||||
* registration because tty_driver structure is not filled.
|
||||
* name_base is 0 by default.
|
||||
*/
|
||||
cdns_uart_uart_driver->tty_driver->name_base = cdns_uart_data->id;
|
||||
cdns_uart_data->cdns_uart_driver = &cdns_uart_uart_driver;
|
||||
|
||||
match = of_match_node(cdns_uart_of_match, pdev->dev.of_node);
|
||||
if (match && match->data) {
|
||||
|
|
@ -1634,6 +1531,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
|
|||
port->flags = UPF_BOOT_AUTOCONF;
|
||||
port->ops = &cdns_uart_ops;
|
||||
port->fifosize = CDNS_UART_FIFO_SIZE;
|
||||
port->line = id;
|
||||
|
||||
/*
|
||||
* Register the port.
|
||||
|
|
@ -1665,7 +1563,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
|
|||
console_port = port;
|
||||
#endif
|
||||
|
||||
rc = uart_add_one_port(cdns_uart_uart_driver, port);
|
||||
rc = uart_add_one_port(&cdns_uart_uart_driver, port);
|
||||
if (rc) {
|
||||
dev_err(&pdev->dev,
|
||||
"uart_add_one_port() failed; err=%i\n", rc);
|
||||
|
|
@ -1675,13 +1573,15 @@ static int cdns_uart_probe(struct platform_device *pdev)
|
|||
#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
|
||||
/* This is not port which is used for console that's why clean it up */
|
||||
if (console_port == port &&
|
||||
!(cdns_uart_uart_driver->cons->flags & CON_ENABLED))
|
||||
!(cdns_uart_uart_driver.cons->flags & CON_ENABLED))
|
||||
console_port = NULL;
|
||||
#endif
|
||||
|
||||
uartps_major = cdns_uart_uart_driver->tty_driver->major;
|
||||
cdns_uart_data->cts_override = of_property_read_bool(pdev->dev.of_node,
|
||||
"cts-override");
|
||||
|
||||
instances++;
|
||||
|
||||
return 0;
|
||||
|
||||
err_out_pm_disable:
|
||||
|
|
@ -1697,12 +1597,8 @@ err_out_clk_disable:
|
|||
err_out_clk_dis_pclk:
|
||||
clk_disable_unprepare(cdns_uart_data->pclk);
|
||||
err_out_unregister_driver:
|
||||
uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
|
||||
err_out_id:
|
||||
mutex_lock(&bitmap_lock);
|
||||
if (cdns_uart_data->id < MAX_UART_INSTANCES)
|
||||
clear_bit(cdns_uart_data->id, bitmap);
|
||||
mutex_unlock(&bitmap_lock);
|
||||
if (!instances)
|
||||
uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1725,10 +1621,6 @@ static int cdns_uart_remove(struct platform_device *pdev)
|
|||
#endif
|
||||
rc = uart_remove_one_port(cdns_uart_data->cdns_uart_driver, port);
|
||||
port->mapbase = 0;
|
||||
mutex_lock(&bitmap_lock);
|
||||
if (cdns_uart_data->id < MAX_UART_INSTANCES)
|
||||
clear_bit(cdns_uart_data->id, bitmap);
|
||||
mutex_unlock(&bitmap_lock);
|
||||
clk_disable_unprepare(cdns_uart_data->uartclk);
|
||||
clk_disable_unprepare(cdns_uart_data->pclk);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
|
@ -1741,13 +1633,8 @@ static int cdns_uart_remove(struct platform_device *pdev)
|
|||
console_port = NULL;
|
||||
#endif
|
||||
|
||||
/* If this is last instance major number should be initialized */
|
||||
mutex_lock(&bitmap_lock);
|
||||
if (bitmap_empty(bitmap, MAX_UART_INSTANCES))
|
||||
uartps_major = 0;
|
||||
mutex_unlock(&bitmap_lock);
|
||||
|
||||
uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
|
||||
if (!--instances)
|
||||
uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@
|
|||
#include <linux/errno.h>
|
||||
#include <linux/kd.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/major.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/console.h>
|
||||
|
|
@ -350,7 +351,7 @@ static struct uni_screen *vc_uniscr_alloc(unsigned int cols, unsigned int rows)
|
|||
/* allocate everything in one go */
|
||||
memsize = cols * rows * sizeof(char32_t);
|
||||
memsize += rows * sizeof(char32_t *);
|
||||
p = kmalloc(memsize, GFP_KERNEL);
|
||||
p = vmalloc(memsize);
|
||||
if (!p)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -366,7 +367,7 @@ static struct uni_screen *vc_uniscr_alloc(unsigned int cols, unsigned int rows)
|
|||
|
||||
static void vc_uniscr_set(struct vc_data *vc, struct uni_screen *new_uniscr)
|
||||
{
|
||||
kfree(vc->vc_uni_screen);
|
||||
vfree(vc->vc_uni_screen);
|
||||
vc->vc_uni_screen = new_uniscr;
|
||||
}
|
||||
|
||||
|
|
@ -1206,7 +1207,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
|
|||
if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
|
||||
return 0;
|
||||
|
||||
if (new_screen_size > (4 << 20))
|
||||
if (new_screen_size > KMALLOC_MAX_SIZE)
|
||||
return -EINVAL;
|
||||
newscreen = kzalloc(new_screen_size, GFP_USER);
|
||||
if (!newscreen)
|
||||
|
|
|
|||
Loading…
Reference in a new issue