Skip to content

Commit dd3a8f3

Browse files
nathanchancenathanchance
committed
Merge 4.14.213 into kernel.lnx.4.14.r4-rel
Changes in 4.14.213: (241 commits) spi: bcm2835aux: Fix use-after-free on unbind spi: bcm2835aux: Restore err assignment in bcm2835aux_spi_probe iwlwifi: pcie: limit memory read spin time arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. iwlwifi: mvm: fix kernel panic in case of assert during CSA ARC: stack unwinding: don't assume non-current task is sleeping scsi: ufs: Make sure clk scaling happens only when HBA is runtime ACTIVE soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) platform/x86: acer-wmi: add automatic keyboard background light toggle key as KEY_LIGHTS_TOGGLE Input: cm109 - do not stomp on control URB Input: i8042 - add Acer laptops to the i8042 reset list pinctrl: amd: remove debounce filter setting in IRQ type setting kbuild: avoid static_assert for genksyms scsi: be2iscsi: Revert "Fix a theoretical leak in beiscsi_create_eqs()" x86/mm/mem_encrypt: Fix definition of PMD_FLAGS_DEC_WP PCI: qcom: Add missing reset for ipq806x net: stmmac: free tx skb buffer in stmmac_resume() tcp: fix cwnd-limited bug for TSO deferral where we send nothing net/mlx4_en: Avoid scheduling restart task if it is already running net/mlx4_en: Handle TX error CQE net: stmmac: delete the eee_ctrl_timer after napi disabled net: stmmac: dwmac-meson8b: fix mask definition of the m250_sel mux net: bridge: vlan: fix error return code in __vlan_add() mac80211: mesh: fix mesh_pathtbl_init() error path USB: dummy-hcd: Fix uninitialized array use in init() USB: add RESET_RESUME quirk for Snapscan 1212 ALSA: usb-audio: Fix potential out-of-bounds shift ALSA: usb-audio: Fix control 'access overflow' errors from chmap xhci: Give USB2 ports time to enter U3 in bus suspend USB: UAS: introduce a quirk to set no_write_same USB: sisusbvga: Make console support depend on BROKEN ALSA: pcm: oss: Fix potential out-of-bounds shift serial: 8250_omap: Avoid FIFO corruption caused by MDR1 access drm: fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi pinctrl: merrifield: Set default bias in case no particular value given pinctrl: baytrail: Avoid clearing debounce value when turning it off ARM: dts: sun8i: v3s: fix GIC node memory range gpio: mvebu: fix potential user-after-free on probe scsi: bnx2i: Requires MMU can: softing: softing_netdev_open(): fix error handling RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling drm/tegra: sor: Disable clocks on error in tegra_sor_init() vxlan: Add needed_headroom for lower device vxlan: Copy needed_tailroom from lowerdev scsi: mpt3sas: Increase IOCInit request timeout to 30s dm table: Remove BUG_ON(in_interrupt()) soc/tegra: fuse: Fix index bug in get_process_id USB: serial: option: add interface-number sanity check to flag handling USB: gadget: f_acm: add support for SuperSpeed Plus USB: gadget: f_midi: setup SuperSpeed Plus descriptors usb: gadget: f_fs: Re-use SS descriptors for SuperSpeedPlus USB: gadget: f_rndis: fix bitrate for SuperSpeed and above usb: chipidea: ci_hdrc_imx: Pass DISABLE_DEVICE_STREAMING flag to imx6ul ARM: dts: exynos: fix roles of USB 3.0 ports on Odroid XU ARM: dts: exynos: fix USB 3.0 VBUS control and over-current pins on Exynos5410 ARM: dts: exynos: fix USB 3.0 pins supply being turned off on Odroid XU HID: i2c-hid: add Vero K147 to descriptor override serial_core: Check for port state when tty is in error state quota: Sanity-check quota file headers on load media: msi2500: assign SPI bus number dynamically crypto: af_alg - avoid undefined behavior accessing salg_name md: fix a warning caused by a race between concurrent md_ioctl()s Bluetooth: Fix slab-out-of-bounds read in hci_le_direct_adv_report_evt() drm/gma500: fix double free of gma_connector soc: renesas: rmobile-sysc: Fix some leaks in rmobile_init_pm_domains() soc: mediatek: Check if power domains can be powered on at boot time RDMA/bnxt_re: Set queue pair state when being queried selinux: fix error initialization in inode_doinit_with_dentry() RDMA/rxe: Compute PSN windows correctly x86/mm/ident_map: Check for errors from ident_pud_init() ARM: p2v: fix handling of LPAE translation in BE mode sched/deadline: Fix sched_dl_global_validate() sched: Reenable interrupts in do_sched_yield() crypto: talitos - Fix return type of current_desc_hdr() spi: img-spfi: fix reference leak in img_spfi_resume ASoC: pcm: DRAIN support reactivation selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling arm64: dts: exynos: Correct psci compatible used on Exynos7 Bluetooth: Fix null pointer dereference in hci_event_packet() spi: spi-ti-qspi: fix reference leak in ti_qspi_setup spi: tegra20-slink: fix reference leak in slink ops of tegra20 spi: tegra20-sflash: fix reference leak in tegra_sflash_resume spi: tegra114: fix reference leak in tegra spi ops mwifiex: fix mwifiex_shutdown_sw() causing sw reset failure ASoC: wm8998: Fix PM disable depth imbalance on error ASoC: arizona: Fix a wrong free in wm8997_probe RDMa/mthca: Work around -Wenum-conversion warning MIPS: BCM47XX: fix kconfig dependency bug for BCM47XX_BCMA staging: greybus: codecs: Fix reference counter leak in error handling media: mtk-vcodec: add missing put_device() call in mtk_vcodec_release_dec_pm() scsi: core: Fix VPD LUN ID designator priorities media: solo6x10: fix missing snd_card_free in error handling case drm/omap: dmm_tiler: fix return error code in omap_dmm_probe() Input: ads7846 - fix race that causes missing releases Input: ads7846 - fix integer overflow on Rt calculation Input: ads7846 - fix unaligned access on 7845 powerpc/feature: Fix CPU_FTRS_ALWAYS by removing CPU_FTRS_GENERIC_32 crypto: omap-aes - Fix PM disable depth imbalance in omap_aes_probe soc: ti: knav_qmss: fix reference leak in knav_queue_probe soc: ti: Fix reference imbalance in knav_dma_probe drivers: soc: ti: knav_qmss_queue: Fix error return code in knav_queue_probe Input: omap4-keypad - fix runtime PM error handling RDMA/cxgb4: Validate the number of CQEs memstick: fix a double-free bug in memstick_check ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host orinoco: Move context allocation after processing the skb cw1200: fix missing destroy_workqueue() on error in cw1200_init_common media: siano: fix memory leak of debugfs members in smsdvb_hotplug samples: bpf: Fix lwt_len_hist reusing previous BPF map mips: cdmm: fix use-after-free in mips_cdmm_bus_discover media: max2175: fix max2175_set_csm_mode() error code HSI: omap_ssi: Don't jump to free ID in ssi_add_controller() ARM: dts: Remove non-existent i2c1 from 98dx3236 power: supply: bq24190_charger: fix reference leak genirq/irqdomain: Don't try to free an interrupt that has no mapping PCI: iproc: Fix out-of-bound array accesses ARM: dts: at91: at91sam9rl: fix ADC triggers ath10k: Fix an error handling path ath10k: Release some resources in an error handling path NFSv4.2: condition READDIR's mask for security label based on LSM state SUNRPC: xprt_load_transport() needs to support the netid "rdma6" lockd: don't use interval-based rebinding over TCP NFS: switch nfsiod to be an UNBOUND workqueue. vfio-pci: Use io_remap_pfn_range() for PCI IO memory media: saa7146: fix array overflow in vidioc_s_audio() clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent() ARM: dts: at91: sama5d2: map securam as device pinctrl: falcon: add missing put_device() call in pinctrl_falcon_probe() arm64: dts: rockchip: Fix UART pull-ups on rk3328 memstick: r592: Fix error return in r592_probe() net/mlx5: Properly convey driver version to firmware ASoC: jz4740-i2s: add missed checks for clk_get() dm ioctl: fix error return code in target_message clocksource/drivers/arm_arch_timer: Correct fault programming of CNTKCTL_EL1.EVNTI cpufreq: highbank: Add missing MODULE_DEVICE_TABLE cpufreq: mediatek: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS scsi: qedi: Fix missing destroy_workqueue() on error in __qedi_probe scsi: pm80xx: Fix error return in pm8001_pci_probe() seq_buf: Avoid type mismatch for seq_buf_init scsi: fnic: Fix error return code in fnic_probe() powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops powerpc/pseries/hibernation: remove redundant cacheinfo update usb: ehci-omap: Fix PM disable depth umbalance in ehci_hcd_omap_probe usb: oxu210hp-hcd: Fix memory leak in oxu_create speakup: fix uninitialized flush_lock nfsd: Fix message level for normal termination nfs_common: need lock during iterate through the list x86/kprobes: Restore BTF if the single-stepping is cancelled clk: tegra: Fix duplicated SE clock entry extcon: max77693: Fix modalias string ASoC: wm_adsp: remove "ctl" from list on error in wm_adsp_create_control() irqchip/alpine-msi: Fix freeing of interrupts on allocation error path watchdog: sirfsoc: Add missing dependency on HAS_IOMEM um: chan_xterm: Fix fd leak nfc: s3fwrn5: Release the nfc firmware powerpc/ps3: use dma_mapping_error() checkpatch: fix unescaped left brace net: bcmgenet: Fix a resource leak in an error handling path in the probe functin net: allwinner: Fix some resources leak in the error handling path of the probe and in the remove function net: korina: fix return value watchdog: qcom: Avoid context switch in restart handler watchdog: coh901327: add COMMON_CLK dependency clk: ti: Fix memleak in ti_fapll_synth_setup pwm: zx: Add missing cleanup in error path pwm: lp3943: Dynamically allocate PWM chip base perf record: Fix memory leak when using '--user-regs=?' to list registers qlcnic: Fix error code in probe clk: s2mps11: Fix a resource leak in error handling paths in the probe function clk: sunxi-ng: Make sure divider tables have sentinel cfg80211: initialize rekey_data fix namespaced fscaps when !CONFIG_SECURITY Input: cros_ec_keyb - send 'scancodes' in addition to key events Input: goodix - add upside-down quirk for Teclast X98 Pro tablet media: gspca: Fix memory leak in probe media: sunxi-cir: ensure IR is handled when it is continuous media: netup_unidvb: Don't leak SPI master in probe error path Input: cyapa_gen6 - fix out-of-bounds stack access PM: ACPI: PCI: Drop acpi_pm_set_bridge_wakeup() Revert "ACPI / resources: Use AE_CTRL_TERMINATE to terminate resources walks" ACPI: PNP: compare the string length in the matching_id() ALSA: hda/realtek - Enable headset mic of ASUS Q524UQK with ALC255 ALSA: pcm: oss: Fix a few more UBSAN fixes ALSA: usb-audio: Disable sample read check if firmware doesn't give back s390/smp: perform initial CPU reset also for SMT siblings s390/dasd: prevent inconsistent LCU device data s390/dasd: fix list corruption of pavgroup group list s390/dasd: fix list corruption of lcu list staging: comedi: mf6x4: Fix AI end-of-conversion detection powerpc/perf: Exclude kernel samples while counting events in user space. crypto: ecdh - avoid unaligned accesses in ecdh_set_secret() EDAC/amd64: Fix PCI component registration USB: serial: mos7720: fix parallel-port state restore USB: serial: keyspan_pda: fix dropped unthrottle interrupts USB: serial: keyspan_pda: fix write deadlock USB: serial: keyspan_pda: fix stalled writes USB: serial: keyspan_pda: fix write-wakeup use-after-free USB: serial: keyspan_pda: fix tx-unthrottle use-after-free USB: serial: keyspan_pda: fix write unthrottling Btrfs: fix selftests failure due to uninitialized i_mode in test inodes btrfs: fix return value mixup in btrfs_get_extent ext4: fix a memory leak of ext4_free_data ext4: fix deadlock with fs freezing and EA inodes KVM: arm64: Introduce handling of AArch32 TTBCR2 traps ARM: dts: at91: sama5d2: fix CAN message ram offset and size powerpc/rtas: Fix typo of ibm,open-errinjct in RTAS filter powerpc/xmon: Change printk() to pr_cont() powerpc/powernv/memtrace: Don't leak kernel memory to user space ima: Don't modify file descriptor mode on the fly ceph: fix race in concurrent __ceph_remove_cap invocations jffs2: Fix GC exit abnormally jfs: Fix array index bounds check in dbAdjTree drm/dp_aux_dev: check aux_dev before use in drm_dp_aux_dev_get_by_minor() spi: spi-sh: Fix use-after-free on unbind spi: davinci: Fix use-after-free on unbind spi: pic32: Don't leak DMA channels in probe error path spi: rb4xx: Don't leak SPI master in probe error path spi: sc18is602: Don't leak SPI master in probe error path spi: st-ssc4: Fix unbalanced pm_runtime_disable() in probe error path soc: qcom: smp2p: Safely acquire spinlock without IRQs mtd: parser: cmdline: Fix parsing of part-names with colons iio: buffer: Fix demux update iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume iio:light:rpr0521: Fix timestamp alignment and prevent data leak. iio:pressure:mpl3115: Force alignment of buffer iio:imu:bmi160: Fix too large a buffer. md/cluster: fix deadlock when node is doing resync job clk: mvebu: a3700: fix the XTAL MODE pin to MPP1_9 xen-blkback: set ring->xenblkd to NULL after kthread_stop() xen/xenbus: Allow watches discard events before queueing xen/xenbus: Add 'will_handle' callback support in xenbus_watch_path() xen/xenbus/xen_bus_type: Support will_handle watch callback xen/xenbus: Count pending messages for each watch xenbus/xenbus_backend: Disallow pending watch messages libnvdimm/namespace: Fix reaping of invalidated block-window-namespace labels PCI: Fix pci_slot_release() NULL pointer dereference Linux 4.14.213 Signed-off-by: Nathan Chancellor <[email protected]> Conflicts: drivers/scsi/ufs/ufshcd.c drivers/soc/qcom/smp2p.c drivers/usb/gadget/function/f_fs.c
2 parents 010dbba + 1752938 commit dd3a8f3

File tree

243 files changed

+1439
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+1439
-673
lines changed

Diff for: ‎Documentation/admin-guide/kernel-parameters.txt

+1
Original file line numberDiff line numberDiff line change
@@ -4774,6 +4774,7 @@
47744774
device);
47754775
j = NO_REPORT_LUNS (don't use report luns
47764776
command, uas only);
4777+
k = NO_SAME (do not use WRITE_SAME, uas only)
47774778
l = NOT_LOCKABLE (don't try to lock and
47784779
unlock ejectable media, not on uas);
47794780
m = MAX_SECTORS_64 (don't transfer more

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 14
4-
SUBLEVEL = 212
4+
SUBLEVEL = 213
55
EXTRAVERSION =
66
NAME = Petit Gorille
77

Diff for: ‎arch/arc/kernel/stacktrace.c

+15-8
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141

4242
#ifdef CONFIG_ARC_DW2_UNWIND
4343

44-
static void seed_unwind_frame_info(struct task_struct *tsk,
45-
struct pt_regs *regs,
46-
struct unwind_frame_info *frame_info)
44+
static int
45+
seed_unwind_frame_info(struct task_struct *tsk, struct pt_regs *regs,
46+
struct unwind_frame_info *frame_info)
4747
{
4848
/*
4949
* synchronous unwinding (e.g. dump_stack)
5050
* - uses current values of SP and friends
5151
*/
52-
if (tsk == NULL && regs == NULL) {
52+
if (regs == NULL && (tsk == NULL || tsk == current)) {
5353
unsigned long fp, sp, blink, ret;
5454
frame_info->task = current;
5555

@@ -68,11 +68,15 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
6868
frame_info->call_frame = 0;
6969
} else if (regs == NULL) {
7070
/*
71-
* Asynchronous unwinding of sleeping task
72-
* - Gets SP etc from task's pt_regs (saved bottom of kernel
73-
* mode stack of task)
71+
* Asynchronous unwinding of a likely sleeping task
72+
* - first ensure it is actually sleeping
73+
* - if so, it will be in __switch_to, kernel mode SP of task
74+
* is safe-kept and BLINK at a well known location in there
7475
*/
7576

77+
if (tsk->state == TASK_RUNNING)
78+
return -1;
79+
7680
frame_info->task = tsk;
7781

7882
frame_info->regs.r27 = TSK_K_FP(tsk);
@@ -106,6 +110,8 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
106110
frame_info->regs.r63 = regs->ret;
107111
frame_info->call_frame = 0;
108112
}
113+
114+
return 0;
109115
}
110116

111117
#endif
@@ -119,7 +125,8 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs,
119125
unsigned int address;
120126
struct unwind_frame_info frame_info;
121127

122-
seed_unwind_frame_info(tsk, regs, &frame_info);
128+
if (seed_unwind_frame_info(tsk, regs, &frame_info))
129+
return 0;
123130

124131
while (1) {
125132
address = UNW_PC(&frame_info);

Diff for: ‎arch/arm/boot/dts/armada-xp-98dx3236.dtsi

-5
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,6 @@
303303
reg = <0x11000 0x100>;
304304
};
305305

306-
&i2c1 {
307-
compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
308-
reg = <0x11100 0x100>;
309-
};
310-
311306
&mpic {
312307
reg = <0x20a00 0x2d0>, <0x21070 0x58>;
313308
};

Diff for: ‎arch/arm/boot/dts/at91-sama5d3_xplained.dts

+7
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,11 @@
231231
atmel,pins =
232232
<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PE9, conflicts with A9 */
233233
};
234+
pinctrl_usb_default: usb_default {
235+
atmel,pins =
236+
<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
237+
AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
238+
};
234239
};
235240
};
236241
};
@@ -248,6 +253,8 @@
248253
&pioE 3 GPIO_ACTIVE_LOW
249254
&pioE 4 GPIO_ACTIVE_LOW
250255
>;
256+
pinctrl-names = "default";
257+
pinctrl-0 = <&pinctrl_usb_default>;
251258
status = "okay";
252259
};
253260

Diff for: ‎arch/arm/boot/dts/at91-sama5d4_xplained.dts

+7
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@
158158
atmel,pins =
159159
<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
160160
};
161+
pinctrl_usb_default: usb_default {
162+
atmel,pins =
163+
<AT91_PIOE 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
164+
AT91_PIOE 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
165+
};
161166
pinctrl_key_gpio: key_gpio_0 {
162167
atmel,pins =
163168
<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
@@ -183,6 +188,8 @@
183188
&pioE 11 GPIO_ACTIVE_HIGH
184189
&pioE 14 GPIO_ACTIVE_HIGH
185190
>;
191+
pinctrl-names = "default";
192+
pinctrl-0 = <&pinctrl_usb_default>;
186193
status = "okay";
187194
};
188195

Diff for: ‎arch/arm/boot/dts/at91sam9rl.dtsi

+11-8
Original file line numberDiff line numberDiff line change
@@ -274,23 +274,26 @@
274274
atmel,adc-use-res = "highres";
275275

276276
trigger0 {
277-
trigger-name = "timer-counter-0";
277+
trigger-name = "external-rising";
278278
trigger-value = <0x1>;
279+
trigger-external;
279280
};
281+
280282
trigger1 {
281-
trigger-name = "timer-counter-1";
282-
trigger-value = <0x3>;
283+
trigger-name = "external-falling";
284+
trigger-value = <0x2>;
285+
trigger-external;
283286
};
284287

285288
trigger2 {
286-
trigger-name = "timer-counter-2";
287-
trigger-value = <0x5>;
289+
trigger-name = "external-any";
290+
trigger-value = <0x3>;
291+
trigger-external;
288292
};
289293

290294
trigger3 {
291-
trigger-name = "external";
292-
trigger-value = <0x13>;
293-
trigger-external;
295+
trigger-name = "continuous";
296+
trigger-value = <0x6>;
294297
};
295298
};
296299

Diff for: ‎arch/arm/boot/dts/exynos5410-odroidxu.dts

+4-2
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,8 @@
327327
regulator-name = "vddq_lcd";
328328
regulator-min-microvolt = <1800000>;
329329
regulator-max-microvolt = <1800000>;
330+
/* Supplies also GPK and GPJ */
331+
regulator-always-on;
330332
};
331333

332334
ldo8_reg: LDO8 {
@@ -629,11 +631,11 @@
629631
};
630632

631633
&usbdrd_dwc3_0 {
632-
dr_mode = "host";
634+
dr_mode = "peripheral";
633635
};
634636

635637
&usbdrd_dwc3_1 {
636-
dr_mode = "peripheral";
638+
dr_mode = "host";
637639
};
638640

639641
&usbdrd3_0 {

Diff for: ‎arch/arm/boot/dts/exynos5410-pinctrl.dtsi

+28
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,34 @@
563563
interrupt-controller;
564564
#interrupt-cells = <2>;
565565
};
566+
567+
usb3_1_oc: usb3-1-oc {
568+
samsung,pins = "gpk2-4", "gpk2-5";
569+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
570+
samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
571+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
572+
};
573+
574+
usb3_1_vbusctrl: usb3-1-vbusctrl {
575+
samsung,pins = "gpk2-6", "gpk2-7";
576+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
577+
samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
578+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
579+
};
580+
581+
usb3_0_oc: usb3-0-oc {
582+
samsung,pins = "gpk3-0", "gpk3-1";
583+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
584+
samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
585+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
586+
};
587+
588+
usb3_0_vbusctrl: usb3-0-vbusctrl {
589+
samsung,pins = "gpk3-2", "gpk3-3";
590+
samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
591+
samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
592+
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
593+
};
566594
};
567595

568596
&pinctrl_2 {

Diff for: ‎arch/arm/boot/dts/exynos5410.dtsi

+4
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,8 @@
381381
&usbdrd3_0 {
382382
clocks = <&clock CLK_USBD300>;
383383
clock-names = "usbdrd30";
384+
pinctrl-names = "default";
385+
pinctrl-0 = <&usb3_0_oc>, <&usb3_0_vbusctrl>;
384386
};
385387

386388
&usbdrd_phy0 {
@@ -392,6 +394,8 @@
392394
&usbdrd3_1 {
393395
clocks = <&clock CLK_USBD301>;
394396
clock-names = "usbdrd30";
397+
pinctrl-names = "default";
398+
pinctrl-0 = <&usb3_1_oc>, <&usb3_1_vbusctrl>;
395399
};
396400

397401
&usbdrd_dwc3_1 {

Diff for: ‎arch/arm/boot/dts/sama5d2.dtsi

+4-3
Original file line numberDiff line numberDiff line change
@@ -1243,6 +1243,7 @@
12431243
clocks = <&securam_clk>;
12441244
#address-cells = <1>;
12451245
#size-cells = <1>;
1246+
no-memory-wc;
12461247
ranges = <0 0xf8044000 0x1420>;
12471248
};
12481249

@@ -1293,7 +1294,7 @@
12931294

12941295
can0: can@f8054000 {
12951296
compatible = "bosch,m_can";
1296-
reg = <0xf8054000 0x4000>, <0x210000 0x4000>;
1297+
reg = <0xf8054000 0x4000>, <0x210000 0x1c00>;
12971298
reg-names = "m_can", "message_ram";
12981299
interrupts = <56 IRQ_TYPE_LEVEL_HIGH 7>,
12991300
<64 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -1484,7 +1485,7 @@
14841485

14851486
can1: can@fc050000 {
14861487
compatible = "bosch,m_can";
1487-
reg = <0xfc050000 0x4000>, <0x210000 0x4000>;
1488+
reg = <0xfc050000 0x4000>, <0x210000 0x3800>;
14881489
reg-names = "m_can", "message_ram";
14891490
interrupts = <57 IRQ_TYPE_LEVEL_HIGH 7>,
14901491
<65 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -1494,7 +1495,7 @@
14941495
assigned-clocks = <&can1_gclk>;
14951496
assigned-clock-parents = <&utmi>;
14961497
assigned-clock-rates = <40000000>;
1497-
bosch,mram-cfg = <0x1100 0 0 64 0 0 32 32>;
1498+
bosch,mram-cfg = <0x1c00 0 0 64 0 0 32 32>;
14981499
status = "disabled";
14991500
};
15001501

Diff for: ‎arch/arm/boot/dts/sun8i-v3s.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
gic: interrupt-controller@01c81000 {
420420
compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
421421
reg = <0x01c81000 0x1000>,
422-
<0x01c82000 0x1000>,
422+
<0x01c82000 0x2000>,
423423
<0x01c84000 0x2000>,
424424
<0x01c86000 0x2000>;
425425
interrupt-controller;

Diff for: ‎arch/arm/kernel/head.S

+1-5
Original file line numberDiff line numberDiff line change
@@ -674,12 +674,8 @@ ARM_BE8(rev16 ip, ip)
674674
ldrcc r7, [r4], #4 @ use branch for delay slot
675675
bcc 1b
676676
bx lr
677-
#else
678-
#ifdef CONFIG_CPU_ENDIAN_BE8
679-
moveq r0, #0x00004000 @ set bit 22, mov to mvn instruction
680677
#else
681678
moveq r0, #0x400000 @ set bit 22, mov to mvn instruction
682-
#endif
683679
b 2f
684680
1: ldr ip, [r7, r3]
685681
#ifdef CONFIG_CPU_ENDIAN_BE8
@@ -688,7 +684,7 @@ ARM_BE8(rev16 ip, ip)
688684
tst ip, #0x000f0000 @ check the rotation field
689685
orrne ip, ip, r6, lsl #24 @ mask in offset bits 31-24
690686
biceq ip, ip, #0x00004000 @ clear bit 22
691-
orreq ip, ip, r0 @ mask in offset bits 7-0
687+
orreq ip, ip, r0, ror #8 @ mask in offset bits 7-0
692688
#else
693689
bic ip, ip, #0x000000ff
694690
tst ip, #0xf00 @ check the rotation field

Diff for: ‎arch/arm/mach-shmobile/pm-rmobile.c

+1
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ static int __init rmobile_init_pm_domains(void)
336336

337337
pmd = of_get_child_by_name(np, "pm-domains");
338338
if (!pmd) {
339+
iounmap(base);
339340
pr_warn("%pOF lacks pm-domains node\n", np);
340341
continue;
341342
}

Diff for: ‎arch/arm64/boot/dts/exynos/exynos7.dtsi

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@
6565
};
6666

6767
psci {
68-
compatible = "arm,psci-0.2";
68+
compatible = "arm,psci";
6969
method = "smc";
70+
cpu_off = <0x84000002>;
71+
cpu_on = <0xC4000003>;
7072
};
7173

7274
soc: soc {

Diff for: ‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

+8-8
Original file line numberDiff line numberDiff line change
@@ -1062,8 +1062,8 @@
10621062

10631063
uart0 {
10641064
uart0_xfer: uart0-xfer {
1065-
rockchip,pins = <1 RK_PB1 1 &pcfg_pull_up>,
1066-
<1 RK_PB0 1 &pcfg_pull_none>;
1065+
rockchip,pins = <1 RK_PB1 1 &pcfg_pull_none>,
1066+
<1 RK_PB0 1 &pcfg_pull_up>;
10671067
};
10681068

10691069
uart0_cts: uart0-cts {
@@ -1081,8 +1081,8 @@
10811081

10821082
uart1 {
10831083
uart1_xfer: uart1-xfer {
1084-
rockchip,pins = <3 RK_PA4 4 &pcfg_pull_up>,
1085-
<3 RK_PA6 4 &pcfg_pull_none>;
1084+
rockchip,pins = <3 RK_PA4 4 &pcfg_pull_none>,
1085+
<3 RK_PA6 4 &pcfg_pull_up>;
10861086
};
10871087

10881088
uart1_cts: uart1-cts {
@@ -1100,15 +1100,15 @@
11001100

11011101
uart2-0 {
11021102
uart2m0_xfer: uart2m0-xfer {
1103-
rockchip,pins = <1 RK_PA0 2 &pcfg_pull_up>,
1104-
<1 RK_PA1 2 &pcfg_pull_none>;
1103+
rockchip,pins = <1 RK_PA0 2 &pcfg_pull_none>,
1104+
<1 RK_PA1 2 &pcfg_pull_up>;
11051105
};
11061106
};
11071107

11081108
uart2-1 {
11091109
uart2m1_xfer: uart2m1-xfer {
1110-
rockchip,pins = <2 RK_PA0 1 &pcfg_pull_up>,
1111-
<2 RK_PA1 1 &pcfg_pull_none>;
1110+
rockchip,pins = <2 RK_PA0 1 &pcfg_pull_none>,
1111+
<2 RK_PA1 1 &pcfg_pull_up>;
11121112
};
11131113
};
11141114

Diff for: ‎arch/arm64/boot/dts/rockchip/rk3399.dtsi

+3
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666
i2c6 = &i2c6;
6767
i2c7 = &i2c7;
6868
i2c8 = &i2c8;
69+
mmc0 = &sdio0;
70+
mmc1 = &sdmmc;
71+
mmc2 = &sdhci;
6972
serial0 = &uart0;
7073
serial1 = &uart1;
7174
serial2 = &uart2;

Diff for: ‎arch/arm64/include/asm/kvm_host.h

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ enum vcpu_sysreg {
158158
#define c2_TTBR1 (TTBR1_EL1 * 2) /* Translation Table Base Register 1 */
159159
#define c2_TTBR1_high (c2_TTBR1 + 1) /* TTBR1 top 32 bits */
160160
#define c2_TTBCR (TCR_EL1 * 2) /* Translation Table Base Control R. */
161+
#define c2_TTBCR2 (c2_TTBCR + 1) /* Translation Table Base Control R. 2 */
161162
#define c3_DACR (DACR32_EL2 * 2)/* Domain Access Control Register */
162163
#define c5_DFSR (ESR_EL1 * 2) /* Data Fault Status Register */
163164
#define c5_IFSR (IFSR32_EL2 * 2)/* Instruction Fault Status Register */

Diff for: ‎arch/arm64/kvm/sys_regs.c

+1
Original file line numberDiff line numberDiff line change
@@ -1286,6 +1286,7 @@ static const struct sys_reg_desc cp15_regs[] = {
12861286
{ Op1( 0), CRn( 2), CRm( 0), Op2( 0), access_vm_reg, NULL, c2_TTBR0 },
12871287
{ Op1( 0), CRn( 2), CRm( 0), Op2( 1), access_vm_reg, NULL, c2_TTBR1 },
12881288
{ Op1( 0), CRn( 2), CRm( 0), Op2( 2), access_vm_reg, NULL, c2_TTBCR },
1289+
{ Op1( 0), CRn( 2), CRm( 0), Op2( 3), access_vm_reg, NULL, c2_TTBCR2 },
12891290
{ Op1( 0), CRn( 3), CRm( 0), Op2( 0), access_vm_reg, NULL, c3_DACR },
12901291
{ Op1( 0), CRn( 5), CRm( 0), Op2( 0), access_vm_reg, NULL, c5_DFSR },
12911292
{ Op1( 0), CRn( 5), CRm( 0), Op2( 1), access_vm_reg, NULL, c5_IFSR },

0 commit comments

Comments
 (0)