4.19.88-stable review
Subsystems (8)
Greg Kroah-Hartman
maintainercover 4.19.88-stable review
This is the start of the stable review cycle for the 4.19.88 release. There are 321 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 05 Dec 2019 22:30:32 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.88-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.88-rc1
Hans de Goede <[email protected]>
platform/x86: hp-wmi: Fix ACPI errors caused by passing 0 as input size
Hans de Goede <[email protected]>
platform/x86: hp-wmi: Fix ACPI errors caused by too small buffer
Pierre-Yves MORDRET <[email protected]>
dmaengine: stm32-dma: check whether length is aligned on FIFO threshold
Wen Yang <[email protected]>
ASoC: stm32: sai: add missing put_device()
Olivier Moysan <[email protected]>
ASoC: stm32: i2s: fix IRQ clearing
Olivier Moysan <[email protected]>
ASoC: stm32: i2s: fix 16 bit format support
Olivier Moysan <[email protected]>
ASoC: stm32: i2s: fix dma configuration
Alexandre Torgue <[email protected]>
pinctrl: stm32: fix memory leak issue
Fabien Dessenne <[email protected]>
mailbox: mailbox-test: fix null pointer if no mmio
Gabriel Fernandez <[email protected]>
clk: stm32mp1: parent clocks update
Gabriel Fernandez <[email protected]>
clk: stm32mp1: add CLK_SET_RATE_NO_REPARENT to Kernel clocks
Gabriel Fernandez <[email protected]>
clk: stm32mp1: fix mcu divider table
Gabriel Fernandez <[email protected]>
clk: stm32mp1: fix HSI divider flag
Lionel Debieve <[email protected]>
hwrng: stm32 - fix unbalanced pm_runtime_enable
Hugues Fruchet <[email protected]>
media: stm32-dcmi: fix check of pm_runtime_get_sync return value
Hugues Fruchet <[email protected]>
media: stm32-dcmi: fix DMA corruption when stopping streaming
Lionel Debieve <[email protected]>
crypto: stm32/hash - Fix hmac issue more than 256 bytes
Candle Sun <[email protected]>
HID: core: check whether Usage Page item is after Usage ID items
Yuchung Cheng <[email protected]>
tcp: exit if nothing to retransmit on RTO timeout
Arnaud Pouliquen <[email protected]>
mailbox: stm32_ipcc: add spinlock to fix channels concurrent access
Claudiu Beznea <[email protected]>
drm/atmel-hlcdc: revert shift by 8
huijin.park <[email protected]>
mtd: spi-nor: cast to u64 to avoid uint overflows
Wen Yang <[email protected]>
mtd: rawnand: atmel: fix possible object reference leak
Miquel Raynal <[email protected]>
mtd: rawnand: atmel: Fix spelling mistake in error message
Paul Thomas <[email protected]>
net: macb driver, check for SKBTX_HW_TSTAMP
Harini Katakam <[email protected]>
net: macb: Fix SUBNS increment and increase resolution
Eugen Hristev <[email protected]>
watchdog: sama5d4: fix WDD value to be always set to max
Theodore Ts'o <[email protected]>
ext4: add more paranoia checking in ext4_expand_extra_isize handling
Chuhong Yuan <[email protected]>
net: macb: add missed tasklet_kill
Dust Li <[email protected]>
net: sched: fix tc -s class show no bstats on class with nolock subqueues
Xin Long <[email protected]>
sctp: cache netns in sctp_ep_common
John Rutherford <[email protected]>
tipc: fix link name length check
Jakub Kicinski <[email protected]>
selftests: bpf: test_sockmap: handle file creation failures gracefully
Paolo Abeni <[email protected]>
openvswitch: remove another BUG_ON()
Paolo Abeni <[email protected]>
openvswitch: drop unneeded BUG_ON() in ovs_flow_cmd_build_info()
Jouni Hogander <[email protected]>
slip: Fix use-after-free Read in slip_open
Navid Emamdoost <[email protected]>
sctp: Fix memory leak in sctp_sf_do_5_2_4_dupcook
Paolo Abeni <[email protected]>
openvswitch: fix flow command message size
Nikolay Aleksandrov <[email protected]>
net: psample: fix skb_over_panic
Menglong Dong <[email protected]>
macvlan: schedule bc_work even if error
Eugen Hristev <[email protected]>
media: atmel: atmel-isc: fix INIT_WORK misplacement
Eugen Hristev <[email protected]>
media: atmel: atmel-isc: fix asd memory allocation
Uwe Kleine-König <[email protected]>
pwm: Clear chip_data in pwm_put()
Luca Ceresoli <[email protected]>
net: macb: fix error format in dev_err()
Eugen Hristev <[email protected]>
media: v4l2-ctrl: fix flags for DO_WHITE_BALANCE
Steffen Klassert <[email protected]>
xfrm: Fix memleak on xfrm state destroy
Mika Westerberg <[email protected]>
thunderbolt: Power cycle the router if NVM authentication fails
Alexander Usyskin <[email protected]>
mei: me: add comet point V device id
Alexander Usyskin <[email protected]>
mei: bus: prefix device names on bus with the bus name
Fabio D'Urso <[email protected]>
USB: serial: ftdi_sio: add device IDs for U-Blox C099-F9P
Hans de Goede <[email protected]>
staging: rtl8723bs: Add 024c:0525 to the list of SDIO device-ids
Hans de Goede <[email protected]>
staging: rtl8723bs: Drop ACPI device ids
Pan Bian <[email protected]>
staging: rtl8192e: fix potential use after free
Mathias Kresin <[email protected]>
usb: dwc2: use a longer core rest timeout in dwc2_core_reset()
Alexandre Belloni <[email protected]>
clk: at91: generated: set audio_pll_allowed in at91_clk_register_generated()
Eugen Hristev <[email protected]>
clk: at91: fix update bit maps on CFG_MOR write
Sean Christopherson <[email protected]>
KVM: nVMX: assimilate nested_vmx_entry_failure() into nested_vmx_enter_non_root_mode()
Sean Christopherson <[email protected]>
KVM: nVMX: rename enter_vmx_non_root_mode to nested_vmx_enter_non_root_mode
Vlastimil Babka <[email protected]>
mm, gup: add missing refcount overflow checks on s390
Boris Brezillon <[email protected]>
mtd: Remove a debug trace in mtdpart.c
Jesper Dangaard Brouer <[email protected]>
xdp: fix cpumap redirect SKB creation bug
Gen Zhang <[email protected]>
powerpc/pseries/dlpar: Fix a missing check in dlpar_parse_cc_property()
Hui Wang <[email protected]>
ASoC: rt5645: Headphone Jack sense inverts on the LattePanda board
YueHaibing <[email protected]>
RDMA/hns: Use GFP_ATOMIC in hns_roce_v2_modify_qp
Yixian Liu <[email protected]>
RDMA/hns: Fix the state of rereg mr
Lijun Ou <[email protected]>
RDMA/hns: Bugfix for the scene without receiver queue
Lijun Ou <[email protected]>
RDMA/hns: Fix the bug with updating rq head pointer when flush cqe
John Garry <[email protected]>
scsi: libsas: Check SMP PHY control function result
Xiang Chen <[email protected]>
scsi: hisi_sas: shutdown axi bus to avoid exception CQ returned
James Morse <[email protected]>
ACPI / APEI: Switch estatus pool to use vmalloc memory
James Morse <[email protected]>
ACPI / APEI: Don't wait to serialise with oops messages when panic()ing
John Garry <[email protected]>
scsi: libsas: Support SATA PHY connection rate unmatch fixing during discovery
Chris Coulson <[email protected]>
apparmor: delete the dentry in aafs_remove() to avoid a leak
Aaron Ma <[email protected]>
iommu/amd: Fix NULL dereference bug in match_hid_uid
Peng Li <[email protected]>
net: hns3: fix an issue for hns3_update_new_int_gl
Peng Li <[email protected]>
net: hns3: fix an issue for hclgevf_ae_get_hdev
Yunsheng Lin <[email protected]>
net: hns3: fix PFC not setting problem for DCB module
Yunsheng Lin <[email protected]>
net: hns3: Change fw error code NOT_EXEC to NOT_SUPPORTED
Peng Sun <[email protected]>
bpf: drop refcount if bpf_map_new_fd() fails in map_create()
Greg Kroah-Hartman <[email protected]>
kvm: properly check debugfs dentry before using it
Andy Shevchenko <[email protected]>
net: dev: Use unsigned integer as an argument to left-shift
Ming Lei <[email protected]>
mmc: core: align max segment size with logical block size
Peng Sun <[email protected]>
bpf: decrease usercnt if bpf_map_new_fd() fails in bpf_map_get_fd_by_id()
Maciej Kwiecien <[email protected]>
sctp: don't compare hb_timer expire date before starting it
Lorenzo Bianconi <[email protected]>
net: ip6_gre: do not report erspan_ver for ip6gre or ip6gretap
Lorenzo Bianconi <[email protected]>
net: ip_gre: do not report erspan_ver for gre or gretap
Eric Dumazet <[email protected]>
net: fix possible overflow in __sk_mem_raise_allocated()
Matteo Croce <[email protected]>
geneve: change NET_UDP_TUNNEL dependency to select
Bert Kenward <[email protected]>
sfc: initialise found bitmap in efx_ef10_mtd_probe
Sylwester Nawrocki <[email protected]>
ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI
Hoang Le <[email protected]>
tipc: fix skb may be leaky in tipc_link_input
Ursula Braun <[email protected]>
net/smc: fix byte_order for rx_curs_confirmed
Jan Kara <[email protected]>
blktrace: Show requests without sector
Ursula Braun <[email protected]>
net/smc: fix sender_free computation
Brian Foster <[email protected]>
xfs: end sync buffer I/O properly on shutdown error
Qian Cai <[email protected]>
mm/hotplug: invalid PFNs from pfn_to_online_page()
Karsten Graul <[email protected]>
net/smc: don't wait for send buffer space when data was already sent
Karsten Graul <[email protected]>
net/smc: prevent races between smc_lgr_terminate() and smc_conn_free()
Johannes Berg <[email protected]>
decnet: fix DN_IFREQ_SIZE
wenxu <[email protected]>
ip_tunnel: Make none-tunnel-dst tunnel port work with lwtunnel
Edward Cree <[email protected]>
sfc: suppress duplicate nvmem partition types in efx_ef10_mtd_probe
Lucas Stach <[email protected]>
gpu: ipu-v3: pre: don't trigger update if buffer address doesn't change
He Zhe <[email protected]>
serial: 8250: Fix serial8250 initialization crash
Konstantin Khlebnikov <[email protected]>
net/core/neighbour: fix kmemleak minimal reference count for hash tables
Ming Lei <[email protected]>
PCI/MSI: Return -ENOSPC from pci_alloc_irq_vectors_affinity()
Miquel Raynal <[email protected]>
ata: ahci: mvebu: do Armada 38x configuration only on relevant SoCs
Konstantin Khlebnikov <[email protected]>
net/core/neighbour: tell kmemleak about hash tables
Gustavo A. R. Silva <[email protected]>
tipc: fix memory leak in tipc_nl_compat_publ_dump
Boris Brezillon <[email protected]>
mtd: Check add_mtd_device() ret code
Olof Johansson <[email protected]>
lib/genalloc.c: include vmalloc.h
Qian Cai <[email protected]>
drivers/base/platform.c: kmemleak ignore a known leak
Yi Wang <[email protected]>
fork: fix some -Wmissing-prototypes warnings
Huang Shijie <[email protected]>
lib/genalloc.c: use vzalloc_node() to allocate the bitmap
Alexey Skidanov <[email protected]>
lib/genalloc.c: fix allocation of aligned buffer from non-aligned chunk
James Morse <[email protected]>
firmware: arm_sdei: Fix DT platform device creation
Nicolas Saenz Julienne <[email protected]>
firmware: arm_sdei: fix wrong of_node_put() in init function
Aditya Pakki <[email protected]>
infiniband/qedr: Potential null ptr dereference of qp
Aditya Pakki <[email protected]>
infiniband: bnxt_re: qplib: Check the return value of send_message
Chuck Lever <[email protected]>
xprtrdma: Prevent leak of rpcrdma_rep objects
Kangjie Lu <[email protected]>
netfilter: nf_tables: fix a missing check of nla_put_failure
Anthony Yznaga <[email protected]>
tools/vm/page-types.c: fix "kpagecount returned fewer pages than expected" failures
Wentao Wang <[email protected]>
mm/page_alloc.c: deduplicate __memblock_free_early() and memblock_free()
Aaron Lu <[email protected]>
mm/page_alloc.c: use a single function to free page
Aaron Lu <[email protected]>
mm/page_alloc.c: free order-0 pages through PCP in page_frag_free()
Wei Yang <[email protected]>
vmscan: return NODE_RECLAIM_NOSCAN in node_reclaim() when CONFIG_NUMA is n
Junxiao Bi <[email protected]>
ocfs2: clear journal dirty flag after shutdown journal
Wen Yang <[email protected]>
net/wan/fsl_ucc_hdlc: Avoid double free in ucc_hdlc_probe()
Kangjie Lu <[email protected]>
net: marvell: fix a missing check of acpi_match_device
Kangjie Lu <[email protected]>
tipc: fix a missing check of genlmsg_put
Kangjie Lu <[email protected]>
atl1e: checking the status of atl1e_write_phy_reg
Kangjie Lu <[email protected]>
net: dsa: bcm_sf2: Propagate error value from mdio_write
Kangjie Lu <[email protected]>
net: stmicro: fix a missing check of clk_prepare
Kangjie Lu <[email protected]>
net: (cpts) fix a missing check of clk_prepare
Richard Weinberger <[email protected]>
um: Make GCOV depend on !KCOV
Richard Weinberger <[email protected]>
um: Include sys/uio.h to have writev()
Chao Yu <[email protected]>
f2fs: fix to dirty inode synchronously
Qiuyang Sun <[email protected]>
f2fs: fix block address for __check_sit_bitmap
Aditya Pakki <[email protected]>
net/net_namespace: Check the return value of register_pernet_subsys()
Aditya Pakki <[email protected]>
net/netlink_compat: Fix a missing check of nla_parse_nested
Alexander Shiyan <[email protected]>
pwm: clps711x: Fix period calculation
Fabio Estevam <[email protected]>
crypto: mxc-scc - fix build warnings on ARM64
Benjamin Herrenschmidt <[email protected]>
powerpc: Fix HMIs on big-endian with CONFIG_RELOCATABLE=y
Michael Ellerman <[email protected]>
powerpc/pseries: Fix node leak in update_lmb_associativity_index()
Christophe Leroy <[email protected]>
powerpc/83xx: handle machine check caused by watchdog timer
Kangjie Lu <[email protected]>
regulator: tps65910: fix a missing check of return value
Jesper Dangaard Brouer <[email protected]>
bpf/cpumap: make sure frame_size for build_skb is aligned if headroom isn't
Parav Pandit <[email protected]>
IB/rxe: Make counters thread safe
Luc Van Oostenryck <[email protected]>
drbd: fix print_st_err()'s prototype to match the definition
Lars Ellenberg <[email protected]>
drbd: do not block when adjusting "disk-options" while IO is frozen
Lars Ellenberg <[email protected]>
drbd: reject attach of unsuitable uuids even if connected
Lars Ellenberg <[email protected]>
drbd: ignore "all zero" peer volume sizes in handshake
Alexey Kardashevskiy <[email protected]>
powerpc/powernv/eeh/npu: Fix uninitialized variables in opal_pci_eeh_freeze_status
Alexey Kardashevskiy <[email protected]>
vfio/spapr_tce: Get rid of possible infinite loop
Benjamin Herrenschmidt <[email protected]>
powerpc/44x/bamboo: Fix PCI range
Christophe Leroy <[email protected]>
powerpc/mm: Make NULL pointer deferences explicit on bad page faults.
Christophe Leroy <[email protected]>
powerpc/prom: fix early DEBUG messages
Joel Stanley <[email protected]>
powerpc/32: Avoid unsupported flags with clang
Madhavan Srinivasan <[email protected]>
powerpc/perf: Fix unit_sel/cache_sel checks
Kyle Roeschley <[email protected]>
ath6kl: Fix off by one error in scan completion
Kyle Roeschley <[email protected]>
ath6kl: Only use match sets when firmware supports it
Stefan Wahren <[email protected]>
brcmfmac: Fix access point mode
Varun Prakash <[email protected]>
scsi: csiostor: fix incorrect dma device in case of vport
Anatoliy Glagolev <[email protected]>
scsi: qla2xxx: deadlock by configfs_depend_item
Bart Van Assche <[email protected]>
RDMA/srp: Propagate ib_post_send() failures to the SCSI mid-layer
Geert Uytterhoeven <[email protected]>
openrisc: Fix broken paths to arch/or32
Alexander Shiyan <[email protected]>
serial: max310x: Fix tx_empty() callback
Jonathan Bakker <[email protected]>
Bluetooth: hci_bcm: Handle specific unknown packets after firmware loading
Kangjie Lu <[email protected]>
drivers/regulator: fix a missing check of return value
Christophe Leroy <[email protected]>
powerpc/xmon: fix dump_segments()
Christophe Leroy <[email protected]>
powerpc/book3s/32: fix number of bats in p/v_block_mapped()
Petr Machata <[email protected]>
vxlan: Fix error path in __vxlan_dev_create()
Tao Ren <[email protected]>
clocksource/drivers/fttmr010: Fix invalid interrupt register access
Dan Carpenter <[email protected]>
IB/qib: Fix an error code in qib_sdma_verbs_send()
Nick Bowler <[email protected]>
xfs: Fix bulkstat compat ioctls on x32 userspace.
Nick Bowler <[email protected]>
xfs: Align compat attrlist_by_handle with native implementation.
Heinz Mauelshagen <[email protected]>
dm raid: fix false -EBUSY when handling check/repair message
Bob Peterson <[email protected]>
gfs2: take jdata unstuff into account in do_grow
Sweet Tea <[email protected]>
dm flakey: Properly corrupt multi-page bios.
Peter Hutterer <[email protected]>
HID: doc: fix wrong data structure reference for UHID_OUTPUT
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7734: Fix shifted values in IPSR10
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7264: Fix PFCR3 and PFCR0 register configuration
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: r8a77990: Fix MOD_SEL0 SEL_I2C1 field width
Michael Mueller <[email protected]>
KVM: s390: unregister debug feature on failing arch init
Vasundhara Volam <[email protected]>
bnxt_en: query force speeds before disabling autoneg mode.
Michael Chan <[email protected]>
bnxt_en: Save ring statistics before reset.
Vasundhara Volam <[email protected]>
bnxt_en: Return linux standard errors in bnxt_ethtool.c
Al Viro <[email protected]>
exofs_mount(): fix leaks on failure exits
Alin Nastac <[email protected]>
netfilter: nf_nat_sip: fix RTP/RTCP source port translations
Leon Romanovsky <[email protected]>
net/mlx5: Continue driver initialization despite debugfs failure
Martin Schiller <[email protected]>
pinctrl: xway: fix gpio-hog related boot issues
Linus Walleij <[email protected]>
memory: omap-gpmc: Get the header of the enum
Nathan Chancellor <[email protected]>
vfio-mdev/samples: Use u8 instead of char for handle functions
Masami Hiramatsu <[email protected]>
kprobes/x86: Show x86-64 specific blacklisted symbols correctly
Masami Hiramatsu <[email protected]>
kprobes: Blacklist symbols in arch-defined prohibited area
Ross Lagerwall <[email protected]>
xen/pciback: Check dev_data before using it
Andrea Righi <[email protected]>
kprobes/x86/xen: blacklist non-attachable xen interrupt functions
Darwin Dingel <[email protected]>
serial: 8250: Rate limit serial port rx interrupts during input overruns
Nicolas Saenz Julienne <[email protected]>
gpio: raspberrypi-exp: decrease refcount on firmware dt node
Pan Bian <[email protected]>
HID: intel-ish-hid: fixes incorrect error handling
Geert Uytterhoeven <[email protected]>
serial: sh-sci: Fix crash in rx_timer_fn() on PIO fallback
Josef Bacik <[email protected]>
btrfs: only track ref_heads in delayed_ref_updates
Filipe Manana <[email protected]>
Btrfs: allow clear_extent_dirty() to receive a cached extent state record
Anand Jain <[email protected]>
btrfs: dev-replace: set result code of cancel by status of scrub
Hans van Kranenburg <[email protected]>
btrfs: fix ncopies raid_attr for RAID56
Nikolay Borisov <[email protected]>
btrfs: Check for missing device before bio submission in btrfs_map_bio
Roger Quadros <[email protected]>
usb: ehci-omap: Fix deferred probe for phy handling
Boris Brezillon <[email protected]>
mtd: rawnand: sunxi: Write pageprog related opcodes to WCMD_SET
Jerome Brunet <[email protected]>
mmc: meson-gx: make sure the descriptor is stopped on errors
Lepton Wu <[email protected]>
VSOCK: bind to random port for VMADDR_PORT_ANY
Atul Gupta <[email protected]>
crypto/chelsio/chtls: listen fails with multiadapt
Jim Mattson <[email protected]>
kvm: vmx: Set IA32_TSC_AUX for legacy mode guests
Krzysztof Kozlowski <[email protected]>
gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB
Marek Vasut <[email protected]>
gpio: pca953x: Fix AI overflow on PCAL6524
Sara Sharon <[email protected]>
iwlwifi: pcie: set cmd_len in the correct place
Sara Sharon <[email protected]>
iwlwifi: pcie: fix erroneous print
Avraham Stern <[email protected]>
iwlwifi: mvm: force TCM re-evaluation on TCM resume
Luca Coelho <[email protected]>
iwlwifi: move iwl_nvm_check_version() into dvm
Masahiro Yamada <[email protected]>
microblaze: fix multiple bugs in arch/microblaze/boot/Makefile
Masahiro Yamada <[email protected]>
microblaze: move "... is ready" messages to arch/microblaze/Makefile
Masahiro Yamada <[email protected]>
microblaze: adjust the help to the real behavior
Pan Bian <[email protected]>
ubi: Do not drop UBI device reference before using
Pan Bian <[email protected]>
ubi: Put MTD device after it is not used
Gabor Juhos <[email protected]>
ubifs: Fix default compression selection in ubifs
Sagi Grimberg <[email protected]>
nvme: fix kernel paging oops
Darrick J. Wong <[email protected]>
xfs: require both realtime inodes to mount
Shenghui Wang <[email protected]>
bcache: do not mark writeback_running too early
Shenghui Wang <[email protected]>
bcache: do not check if debug dentry is ERR or NULL explicitly on remove
Pan Bian <[email protected]>
rtl818x: fix potential use after free
Madhan Mohan R <[email protected]>
brcmfmac: set SDIO F1 MesBusyCtrl for CYW4373
Wright Feng <[email protected]>
brcmfmac: set F2 watermark to 256 for 4373
Brian Norris <[email protected]>
mwifiex: debugfs: correct histogram spacing, formatting
Pan Bian <[email protected]>
mwifiex: fix potential NULL dereference and use after free
Laurent Pinchart <[email protected]>
arm64: dts: renesas: draak: Fix CVBS input
Eric Biggers <[email protected]>
crypto: user - support incremental algorithm dumps
Harald Freudenberger <[email protected]>
s390/zcrypt: make sysfs reset attribute trigger queue reset
Jens Axboe <[email protected]>
nvme: provide fallback for discard alloc failure
Giridhar Malavali <[email protected]>
scsi: qla2xxx: Fix for FC-NVMe discovery for NPIV port
Himanshu Madhani <[email protected]>
scsi: qla2xxx: Fix NPIV handling for FC-NVMe
James Smart <[email protected]>
scsi: lpfc: Enable Management features for IF_TYPE=6
Hans de Goede <[email protected]>
ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
Arnd Bergmann <[email protected]>
ARM: ks8695: fix section mismatch warning
Dave Chinner <[email protected]>
xfs: zero length symlinks are not valid
Thomas Meyer <[email protected]>
PM / AVS: SmartReflex: NULL check before some freeing functions is not needed
Gal Pressman <[email protected]>
RDMA/vmw_pvrdma: Use atomic memory allocation in create AH
Will Deacon <[email protected]>
arm64: preempt: Fix big-endian when checking preempt count in assembly
Lijun Ou <[email protected]>
RDMA/hns: Fix the bug while use multi-hop of pbl
Aaro Koskinen <[email protected]>
ARM: OMAP1: fix USB configuration for device-only setups
Vadim Pasternak <[email protected]>
platform/x86: mlx-platform: Fix LED configuration
Tony Lindgren <[email protected]>
bus: ti-sysc: Check for no-reset and no-idle flags at the child level
Suzuki K Poulose <[email protected]>
arm64: smp: Handle errors reported by the firmware
Steve Capper <[email protected]>
arm64: mm: Prevent mismatched 52-bit VA support
Tony Lindgren <[email protected]>
ARM: dts: Fix hsi gdd range for omap4
Helge Deller <[email protected]>
parisc: Fix HP SDC hpa address output
Helge Deller <[email protected]>
parisc: Fix serio address output
Fabio Estevam <[email protected]>
ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx25: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx27: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx1: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx23: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx50: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx6sl: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx6sx: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx6ul: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx7: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx35: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx31: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx53: Fix memory node duplication
Fabio Estevam <[email protected]>
ARM: dts: imx51: Fix memory node duplication
Uwe Kleine-König <[email protected]>
ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed
Masami Hiramatsu <[email protected]>
tracing: Lock event_mutex before synth_event_mutex
Linus Walleij <[email protected]>
ARM: dts: Fix up SQ201 flash access
Ding Tao <[email protected]>
arm64: dts: marvell: armada-37xx: Enable emmc on espressobin
James Smart <[email protected]>
scsi: lpfc: Fix dif and first burst use in write commands
James Smart <[email protected]>
scsi: lpfc: Fix kernel Oops due to null pring pointers
Bart Van Assche <[email protected]>
scsi: target/tcmu: Fix queue_cmd_ring() declaration
Uwe Kleine-König <[email protected]>
pwm: bcm-iproc: Prevent unloading the driver module while in use
Dan Carpenter <[email protected]>
block: drbd: remove a stray unlock in __drbd_send_protocol()
Ahmed Zaki <[email protected]>
mac80211: fix station inactive_time shortly after boot
Toke Høiland-Jørgensen <[email protected]>
net/fq_impl: Switch to kvmalloc() for memory allocation
Jeff Layton <[email protected]>
ceph: return -EINVAL if given fsc mount option on kernel w/o support
Vladimir Oltean <[email protected]>
net: mscc: ocelot: fix __ocelot_rmw_ix prototype
Doug Berger <[email protected]>
net: bcmgenet: reapply manual settings to the PHY
Doug Berger <[email protected]>
net: bcmgenet: use RGMII loopback for MAC reset
Ilya Leoshkevich <[email protected]>
scripts/gdb: fix debugging modules compiled with hot/cold partitioning
Olivier Moysan <[email protected]>
ASoC: stm32: sai: add restriction on mmap support
Xingyu Chen <[email protected]>
watchdog: meson: Fix the wrong value of left time
Timo Schlüßler <[email protected]>
can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition
Marc Kleine-Budde <[email protected]>
can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails
Marc Kleine-Budde <[email protected]>
can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error
Jeroen Hofstee <[email protected]>
can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error
Marc Kleine-Budde <[email protected]>
can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors
Marc Kleine-Budde <[email protected]>
can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM
Marc Kleine-Budde <[email protected]>
can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max
Marc Kleine-Budde <[email protected]>
can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak
Jeroen Hofstee <[email protected]>
can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open
Jeroen Hofstee <[email protected]>
can: peak_usb: report bus recovery as well
Florian Westphal <[email protected]>
bridge: ebtables: don't crash when using dnat target in output chains
Chuhong Yuan <[email protected]>
net: fec: add missed clk_disable_unprepare in remove
Tony Lindgren <[email protected]>
clk: ti: clkctrl: Fix failed to enable error with double udelay timeout
Peter Ujfalusi <[email protected]>
clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call
Xiaochen Shen <[email protected]>
x86/resctrl: Prevent NULL pointer dereference when reading mondata
Matthew Wilcox (Oracle) <[email protected]>
idr: Fix idr_alloc_u32 on 32-bit systems
Matthew Wilcox (Oracle) <[email protected]>
idr: Fix integer overflow in idr_for_each_entry
Eric Dumazet <[email protected]>
powerpc/bpf: Fix tail call implementation
Björn Töpel <[email protected]>
samples/bpf: fix build by setting HAVE_ATTR_TEST to zero
Ondrej Jirman <[email protected]>
ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend
Colin Ian King <[email protected]>
clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18
Nathan Chancellor <[email protected]>
clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup
Alexandre Belloni <[email protected]>
clk: at91: avoid sleeping early
Randy Dunlap <[email protected]>
reset: fix reset_control_ops kerneldoc comment
Fabio Estevam <[email protected]>
ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts
Andy Shevchenko <[email protected]>
pinctrl: cherryview: Allocate IRQ chip dynamic
Marek Szyprowski <[email protected]>
clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume
Russell King <[email protected]>
ASoC: kirkwood: fix device remove ordering
Russell King <[email protected]>
ASoC: kirkwood: fix external clock probe defer
Marek Szyprowski <[email protected]>
clk: samsung: exynos5433: Fix error paths
Kishon Vijay Abraham I <[email protected]>
reset: Fix memory leak in reset_control_array_put()
Xiaojun Sang <[email protected]>
ASoC: compress: fix unsigned integer overflow check
Stephan Gerhold <[email protected]>
ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX
Fabien Parent <[email protected]>
clocksource/drivers/mediatek: Fix error handling
Martin Blumenstingl <[email protected]>
clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate
-------------
Diffstat:
Documentation/hid/uhid.txt | 2 +- Makefile | 4 +- arch/arm/Kconfig.debug | 28 +++---- arch/arm/boot/dts/gemini-sq201.dts | 37 ++------- arch/arm/boot/dts/imx1-ads.dts | 1 + arch/arm/boot/dts/imx1-apf9328.dts | 1 + arch/arm/boot/dts/imx1.dtsi | 2 - arch/arm/boot/dts/imx23-evk.dts | 1 + arch/arm/boot/dts/imx23-olinuxino.dts | 1 + arch/arm/boot/dts/imx23-sansa.dts | 1 + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 1 + arch/arm/boot/dts/imx23-xfi3.dts | 1 + arch/arm/boot/dts/imx23.dtsi | 2 - arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 1 + arch/arm/boot/dts/imx25-karo-tx25.dts | 1 + arch/arm/boot/dts/imx25-pdk.dts | 1 + arch/arm/boot/dts/imx25.dtsi | 2 - arch/arm/boot/dts/imx27-apf27.dts | 1 + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 1 + arch/arm/boot/dts/imx27-pdk.dts | 1 + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 + arch/arm/boot/dts/imx27.dtsi | 2 - arch/arm/boot/dts/imx31-bug.dts | 1 + arch/arm/boot/dts/imx31-lite.dts | 1 + arch/arm/boot/dts/imx31.dtsi | 2 - arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 1 + arch/arm/boot/dts/imx35-pdk.dts | 1 + arch/arm/boot/dts/imx35.dtsi | 2 - arch/arm/boot/dts/imx50-evk.dts | 1 + arch/arm/boot/dts/imx50.dtsi | 2 - arch/arm/boot/dts/imx51-apf51.dts | 1 + arch/arm/boot/dts/imx51-babbage.dts | 1 + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 1 + arch/arm/boot/dts/imx51-ts4800.dts | 1 + arch/arm/boot/dts/imx51-zii-rdu1.dts | 1 + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 1 + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 + arch/arm/boot/dts/imx51.dtsi | 2 - arch/arm/boot/dts/imx53-ard.dts | 1 + arch/arm/boot/dts/imx53-cx9020.dts | 1 + arch/arm/boot/dts/imx53-m53.dtsi | 1 + arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 + arch/arm/boot/dts/imx53-smd.dts | 1 + arch/arm/boot/dts/imx53-tqma53.dtsi | 1 + arch/arm/boot/dts/imx53-tx53.dtsi | 1 + arch/arm/boot/dts/imx53-usbarmory.dts | 1 + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 +- arch/arm/boot/dts/imx53.dtsi | 2 - arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 8 ++ arch/arm/boot/dts/imx6sl-evk.dts | 1 + arch/arm/boot/dts/imx6sl-warp.dts | 1 + arch/arm/boot/dts/imx6sl.dtsi | 2 - arch/arm/boot/dts/imx6sll-evk.dts | 1 + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 + arch/arm/boot/dts/imx6sx-sabreauto.dts | 1 + arch/arm/boot/dts/imx6sx-sdb.dtsi | 1 + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 1 + arch/arm/boot/dts/imx6sx.dtsi | 2 - arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 1 + arch/arm/boot/dts/imx6ul-geam.dts | 1 + arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 + arch/arm/boot/dts/imx6ul-litesom.dtsi | 1 + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 1 + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 1 + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 + arch/arm/boot/dts/imx6ul.dtsi | 2 - arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 1 + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 3 +- arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + arch/arm/boot/dts/imx7d-colibri.dtsi | 1 + arch/arm/boot/dts/imx7d-nitrogen7.dts | 1 + arch/arm/boot/dts/imx7d-pico.dtsi | 1 + arch/arm/boot/dts/imx7d-sdb.dts | 1 + arch/arm/boot/dts/imx7s-colibri.dtsi | 1 + arch/arm/boot/dts/imx7s-warp.dts | 1 + arch/arm/boot/dts/imx7s.dtsi | 2 - arch/arm/boot/dts/omap4-l4.dtsi | 4 +- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 + arch/arm/mach-ks8695/board-acs5k.c | 2 +- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/include/mach/usb.h | 2 +- .../boot/dts/marvell/armada-3720-espressobin.dts | 22 +++++ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 2 +- arch/arm64/include/asm/assembler.h | 8 +- arch/arm64/kernel/entry.S | 6 +- arch/arm64/kernel/head.S | 26 ++++++ arch/arm64/kernel/smp.c | 6 ++ arch/microblaze/Makefile | 14 ++-- arch/microblaze/boot/Makefile | 23 ++---- arch/openrisc/kernel/entry.S | 2 +- arch/openrisc/kernel/head.S | 2 +- arch/powerpc/Makefile | 9 +- arch/powerpc/boot/dts/bamboo.dts | 4 +- arch/powerpc/include/asm/cputable.h | 1 + arch/powerpc/include/asm/reg.h | 2 + arch/powerpc/kernel/cputable.c | 10 ++- arch/powerpc/kernel/exceptions-64s.S | 2 +- arch/powerpc/kernel/prom.c | 6 +- arch/powerpc/mm/fault.c | 17 ++-- arch/powerpc/mm/ppc_mmu_32.c | 4 +- arch/powerpc/net/bpf_jit_comp64.c | 13 +++ arch/powerpc/perf/isa207-common.c | 25 ++++-- arch/powerpc/perf/isa207-common.h | 4 +- arch/powerpc/platforms/83xx/misc.c | 17 ++++ arch/powerpc/platforms/powernv/eeh-powernv.c | 8 +- arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- arch/powerpc/platforms/powernv/pci.c | 4 +- arch/powerpc/platforms/pseries/dlpar.c | 4 + arch/powerpc/platforms/pseries/hotplug-memory.c | 1 + arch/powerpc/xmon/xmon.c | 2 +- arch/s390/kvm/kvm-s390.c | 17 +++- arch/s390/mm/gup.c | 9 +- arch/um/Kconfig.debug | 1 + arch/um/drivers/vector_user.c | 1 + arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 4 + arch/x86/kernel/kprobes/core.c | 6 ++ arch/x86/kvm/vmx.c | 86 +++++++++---------- arch/x86/xen/xen-asm_64.S | 2 + crypto/crypto_user.c | 37 +++++---- drivers/acpi/acpi_lpss.c | 7 +- drivers/acpi/apei/ghes.c | 32 ++++---- drivers/ata/ahci_mvebu.c | 68 +++++++++++---- drivers/base/platform.c | 3 + drivers/block/drbd/drbd_main.c | 1 - drivers/block/drbd/drbd_nl.c | 43 +++++++--- drivers/block/drbd/drbd_receiver.c | 52 +++++++++++- drivers/block/drbd/drbd_state.h | 2 +- drivers/bluetooth/hci_bcm.c | 22 +++++ drivers/bus/ti-sysc.c | 32 ++++++-- drivers/char/hw_random/stm32-rng.c | 8 ++ drivers/clk/at91/clk-generated.c | 28 +++---- drivers/clk/at91/clk-main.c | 7 +- drivers/clk/at91/sckc.c | 20 ++++- drivers/clk/clk-stm32mp1.c | 28 ++++--- drivers/clk/meson/gxbb.c | 1 + drivers/clk/samsung/clk-exynos5420.c | 6 ++ drivers/clk/samsung/clk-exynos5433.c | 14 +++- drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 2 +- drivers/clk/sunxi/clk-sunxi.c | 4 +- drivers/clk/ti/clk-dra7-atl.c | 6 -- drivers/clk/ti/clkctrl.c | 5 +- drivers/clocksource/timer-fttmr010.c | 73 +++++++++------- drivers/clocksource/timer-mediatek.c | 10 +-- drivers/crypto/chelsio/chtls/chtls.h | 5 ++ drivers/crypto/chelsio/chtls/chtls_main.c | 50 ++++++----- drivers/crypto/mxc-scc.c | 12 +-- drivers/crypto/stm32/stm32-hash.c | 2 +- drivers/dma/stm32-dma.c | 20 ++--- drivers/firmware/arm_sdei.c | 6 -- drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpio/gpio-raspberrypi-exp.c | 1 + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- drivers/gpu/ipu-v3/ipu-pre.c | 6 ++ drivers/hid/hid-core.c | 51 ++++++++++-- drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_sp.c | 5 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 15 +++- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 3 +- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 + drivers/infiniband/hw/qib/qib_sdma.c | 4 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 2 +- drivers/infiniband/sw/rxe/rxe_hw_counters.c | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.h | 6 +- drivers/infiniband/ulp/srp/ib_srp.c | 1 + drivers/input/serio/gscps2.c | 4 +- drivers/input/serio/hp_sdc.c | 4 +- drivers/iommu/amd_iommu.c | 8 +- drivers/mailbox/mailbox-test.c | 14 ++-- drivers/mailbox/stm32-ipcc.c | 37 ++++++--- drivers/md/bcache/debug.c | 3 +- drivers/md/bcache/super.c | 3 +- drivers/md/bcache/writeback.c | 3 +- drivers/md/dm-flakey.c | 33 +++++--- drivers/md/dm-raid.c | 3 +- drivers/media/platform/atmel/atmel-isc.c | 12 ++- drivers/media/platform/stm32/stm32-dcmi.c | 23 +++++- drivers/media/v4l2-core/v4l2-ctrls.c | 1 + drivers/memory/omap-gpmc.c | 1 + drivers/misc/mei/bus.c | 9 +- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + drivers/mmc/core/block.c | 6 -- drivers/mmc/core/queue.c | 9 +- drivers/mmc/host/meson-gx-mmc.c | 73 +++++++++++++--- drivers/mtd/mtdcore.h | 2 +- drivers/mtd/mtdpart.c | 35 ++++++-- drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- drivers/mtd/nand/raw/atmel/pmecc.c | 21 +++-- drivers/mtd/nand/raw/sunxi_nand.c | 2 +- drivers/mtd/spi-nor/spi-nor.c | 2 +- drivers/mtd/ubi/build.c | 2 +- drivers/mtd/ubi/kapi.c | 2 +- drivers/net/Kconfig | 4 +- drivers/net/can/c_can/c_can.c | 26 ++++++ drivers/net/can/flexcan.c | 10 ++- drivers/net/can/rx-offload.c | 96 ++++++++++++++++++---- drivers/net/can/spi/mcp251x.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb.c | 15 ++-- drivers/net/dsa/bcm_sf2.c | 7 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 57 +++++++++---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 78 ++++++++++++++---- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +- drivers/net/ethernet/broadcom/genet/bcmmii.c | 33 ++++++++ drivers/net/ethernet/cadence/macb.h | 6 +- drivers/net/ethernet/cadence/macb_main.c | 19 +++-- drivers/net/ethernet/cadence/macb_ptp.c | 5 +- drivers/net/ethernet/freescale/fec_main.c | 2 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 2 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 7 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 7 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- drivers/net/ethernet/mscc/ocelot.h | 2 +- drivers/net/ethernet/sfc/ef10.c | 29 +++++-- drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +- drivers/net/ethernet/ti/cpts.c | 4 +- drivers/net/macvlan.c | 3 +- drivers/net/slip/slip.c | 1 + drivers/net/vxlan.c | 13 ++- drivers/net/wan/fsl_ucc_hdlc.c | 1 - drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 10 +++ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 29 ++++++- .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 9 +- drivers/net/wireless/intel/iwlwifi/dvm/main.c | 17 ++++ .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 19 ----- .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 14 ++++ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 24 +++--- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 10 +-- drivers/net/wireless/marvell/mwifiex/debugfs.c | 14 ++-- drivers/net/wireless/marvell/mwifiex/scan.c | 18 ++-- drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 3 +- drivers/nvme/host/core.c | 41 +++++++-- drivers/nvme/host/nvme.h | 3 + drivers/pci/msi.c | 22 +++-- drivers/pinctrl/intel/pinctrl-cherryview.c | 24 +++--- drivers/pinctrl/pinctrl-xway.c | 39 ++++++--- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 2 +- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 16 ++-- drivers/pinctrl/stm32/pinctrl-stm32.c | 26 +++--- drivers/platform/x86/hp-wmi.c | 10 +-- drivers/platform/x86/mlx-platform.c | 4 +- drivers/power/avs/smartreflex.c | 3 +- drivers/pwm/core.c | 1 + drivers/pwm/pwm-bcm-iproc.c | 1 + drivers/pwm/pwm-berlin.c | 1 - drivers/pwm/pwm-clps711x.c | 4 +- drivers/pwm/pwm-pca9685.c | 1 - drivers/pwm/pwm-samsung.c | 1 - drivers/regulator/palmas-regulator.c | 5 +- drivers/regulator/tps65910-regulator.c | 4 +- drivers/reset/core.c | 1 + drivers/s390/crypto/ap_queue.c | 23 +++++- drivers/scsi/csiostor/csio_init.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 12 +++ drivers/scsi/libsas/sas_expander.c | 29 ++++++- drivers/scsi/lpfc/lpfc.h | 6 ++ drivers/scsi/lpfc/lpfc_attr.c | 4 +- drivers/scsi/lpfc/lpfc_bsg.c | 6 +- drivers/scsi/lpfc/lpfc_els.c | 4 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_init.c | 7 +- drivers/scsi/lpfc/lpfc_scsi.c | 18 ++++ drivers/scsi/lpfc/lpfc_sli.c | 2 + drivers/scsi/qla2xxx/qla_attr.c | 2 + drivers/scsi/qla2xxx/qla_init.c | 10 +-- drivers/scsi/qla2xxx/qla_nvme.c | 16 +--- drivers/scsi/qla2xxx/qla_os.c | 2 + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 48 ++--------- drivers/scsi/qla2xxx/tcm_qla2xxx.h | 3 - drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 7 +- drivers/target/target_core_user.c | 2 +- drivers/thunderbolt/switch.c | 54 +++++++++--- drivers/tty/serial/8250/8250_core.c | 26 ++++++ drivers/tty/serial/8250/8250_fsl.c | 23 +++++- drivers/tty/serial/8250/8250_of.c | 5 ++ drivers/tty/serial/max310x.c | 7 +- drivers/tty/serial/sh-sci.c | 2 +- drivers/usb/dwc2/core.c | 2 +- drivers/usb/host/ehci-omap.c | 7 +- drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio_ids.h | 7 ++ drivers/vfio/vfio_iommu_spapr_tce.c | 10 +-- drivers/watchdog/meson_gxbb_wdt.c | 4 +- drivers/watchdog/sama5d4_wdt.c | 4 +- drivers/xen/xen-pciback/pci_stub.c | 3 +- fs/btrfs/delayed-ref.c | 3 - fs/btrfs/dev-replace.c | 21 +++-- fs/btrfs/disk-io.c | 7 +- fs/btrfs/extent-tree.c | 7 +- fs/btrfs/extent_io.h | 4 +- fs/btrfs/volumes.c | 13 +-- fs/ceph/super.c | 11 ++- fs/exofs/super.c | 37 +++++++-- fs/ext4/inode.c | 15 ++++ fs/ext4/super.c | 21 +++-- fs/f2fs/file.c | 2 +- fs/f2fs/segment.c | 2 +- fs/gfs2/bmap.c | 2 + fs/ocfs2/journal.c | 6 +- fs/ubifs/sb.c | 13 ++- fs/xfs/libxfs/xfs_symlink_remote.c | 14 +++- fs/xfs/xfs_buf.c | 3 +- fs/xfs/xfs_ioctl32.c | 40 ++++++++- fs/xfs/xfs_rtalloc.c | 4 +- fs/xfs/xfs_symlink.c | 33 ++++---- include/linux/blktrace_api.h | 8 +- include/linux/genalloc.h | 13 +-- include/linux/gpio/consumer.h | 2 +- include/linux/idr.h | 2 +- include/linux/kprobes.h | 3 + include/linux/memory_hotplug.h | 18 ++-- include/linux/netdevice.h | 2 +- include/linux/reset-controller.h | 2 +- include/linux/sched/task.h | 2 + include/linux/serial_8250.h | 4 + include/linux/swap.h | 6 -- include/linux/trace_events.h | 2 + include/net/fq_impl.h | 4 +- include/net/sctp/structs.h | 3 + include/net/sock.h | 2 +- include/trace/events/rpcrdma.h | 28 +++++++ init/main.c | 1 - kernel/bpf/cpumap.c | 13 ++- kernel/bpf/syscall.c | 6 +- kernel/fork.c | 5 -- kernel/kprobes.c | 67 +++++++++++---- kernel/trace/trace_events.c | 34 ++++++-- kernel/trace/trace_events_hist.c | 24 +++--- lib/genalloc.c | 25 +++--- lib/radix-tree.c | 2 +- mm/internal.h | 10 +++ mm/memblock.c | 7 +- mm/page_alloc.c | 29 +++---- net/bridge/netfilter/ebt_dnat.c | 19 ++++- net/core/neighbour.c | 13 ++- net/core/net_namespace.c | 3 +- net/core/sock.c | 2 +- net/decnet/dn_dev.c | 2 +- net/ipv4/ip_gre.c | 33 ++++---- net/ipv4/ip_tunnel.c | 8 +- net/ipv4/tcp_timer.c | 6 +- net/ipv6/ip6_gre.c | 36 ++++---- net/mac80211/sta_info.c | 3 +- net/netfilter/nf_nat_sip.c | 39 ++++++++- net/netfilter/nf_tables_api.c | 2 + net/openvswitch/datapath.c | 17 +++- net/psample/psample.c | 2 +- net/sched/sch_mq.c | 3 +- net/sched/sch_mqprio.c | 4 +- net/sched/sch_multiq.c | 2 +- net/sched/sch_prio.c | 2 +- net/sctp/associola.c | 1 + net/sctp/endpointola.c | 1 + net/sctp/input.c | 4 +- net/sctp/sm_statefuns.c | 4 +- net/sctp/transport.c | 3 +- net/smc/smc_cdc.c | 7 +- net/smc/smc_cdc.h | 45 +++++++--- net/smc/smc_core.c | 4 + net/smc/smc_tx.c | 10 +-- net/sunrpc/xprtrdma/rpc_rdma.c | 4 + net/tipc/link.c | 2 +- net/tipc/netlink_compat.c | 15 +++- net/vmw_vsock/af_vsock.c | 7 +- net/xfrm/xfrm_state.c | 2 + samples/bpf/Makefile | 1 + samples/vfio-mdev/mtty.c | 26 +++--- scripts/gdb/linux/symbols.py | 3 +- security/apparmor/apparmorfs.c | 1 + sound/core/compress_offload.c | 2 +- sound/soc/codecs/msm8916-wcd-analog.c | 4 +- sound/soc/codecs/rt5645.c | 14 ++++ sound/soc/kirkwood/kirkwood-i2s.c | 11 +-- sound/soc/samsung/i2s.c | 8 +- sound/soc/stm/stm32_i2s.c | 29 ++++--- sound/soc/stm/stm32_sai.c | 11 ++- sound/soc/stm/stm32_sai_sub.c | 12 ++- tools/testing/selftests/bpf/test_sockmap.c | 9 ++ tools/vm/page-types.c | 2 +- virt/kvm/kvm_main.c | 2 +- 398 files changed, 2626 insertions(+), 1216 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/321 clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate
From: Martin Blumenstingl <[email protected]>
[ Upstream commit 44b09b11b813b8550e6b976ea51593bc23bba8d1 ]
The meson-saradc driver manually sets the input clock for sar_adc_clk_sel. Update the GXBB clock driver (which is used on GXBB, GXL and GXM) so the rate settings on sar_adc_clk_div are propagated up to sar_adc_clk_sel which will let the common clock framework select the best matching parent clock if we want that.
This makes sar_adc_clk_div consistent with the axg-aoclk and g12a-aoclk drivers, which both also specify CLK_SET_RATE_PARENT.
--- drivers/clk/meson/gxbb.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/meson/gxbb.c +1 -0
@@ -836,6 +836,7 @@ static struct clk_regmap gxbb_sar_adc_clk_div = { .ops = &clk_regmap_divider_ops, .parent_names = (const char *[]){ "sar_adc_clk_sel" }, .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/321 clocksource/drivers/mediatek: Fix error handling
In reply to Greg Kroah-HartmanFrom: Fabien Parent <[email protected]>
[ Upstream commit 41d49e7939de5ec532d86494185b2ca2e99c848a ]
When timer_of_init fails, it cleans up after itself by undoing everything it did during the initialization function.
mtk_syst_init and mtk_gpt_init both call timer_of_cleanup if timer_of_init fails. timer_of_cleanup try to release the resource taken. Since these resources have already been cleaned up by timer_of_init, we end up getting a few warnings printed:
[ 0.001935] WARNING: CPU: 0 PID: 0 at __clk_put+0xe8/0x128 [ 0.002650] Modules linked in: [ 0.003058] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.19.67+ #1 [ 0.003852] Hardware name: MediaTek MT8183 (DT) [ 0.004446] pstate: 20400085 (nzCv daIf +PAN -UAO) [ 0.005073] pc : __clk_put+0xe8/0x128 [ 0.005555] lr : clk_put+0xc/0x14 [ 0.005988] sp : ffffff80090b3ea0 [ 0.006422] x29: ffffff80090b3ea0 x28: 0000000040e20018 [ 0.007121] x27: ffffffc07bfff780 x26: 0000000000000001 [ 0.007819] x25: ffffff80090bda80 x24: ffffff8008ec5828 [ 0.008517] x23: ffffff80090bd000 x22: ffffff8008d8b2e8 [ 0.009216] x21: 0000000000000001 x20: fffffffffffffdfb [ 0.009914] x19: ffffff8009166180 x18: 00000000002bffa8 [ 0.010612] x17: ffffffc012996980 x16: 0000000000000000 [ 0.011311] x15: ffffffbf004a6800 x14: 3536343038393334 [ 0.012009] x13: 2079726576652073 x12: 7eb9c62c5c38f100 [ 0.012707] x11: ffffff80090b3ba0 x10: ffffff80090b3ba0 [ 0.013405] x9 : 0000000000000004 x8 : 0000000000000040 [ 0.014103] x7 : ffffffc079400270 x6 : 0000000000000000 [ 0.014801] x5 : ffffffc079400248 x4 : 0000000000000000 [ 0.015499] x3 : 0000000000000000 x2 : 0000000000000000 [ 0.016197] x1 : ffffff80091661c0 x0 : fffffffffffffdfb [ 0.016896] Call trace: [ 0.017218] __clk_put+0xe8/0x128 [ 0.017654] clk_put+0xc/0x14 [ 0.018048] timer_of_cleanup+0x60/0x7c [ 0.018551] mtk_syst_init+0x8c/0x9c [ 0.019020] timer_probe+0x6c/0xe0 [ 0.019469] time_init+0x14/0x44 [ 0.019893] start_kernel+0x2d0/0x46c [ 0.020378] ---[ end trace 8c1efabea1267649 ]--- [ 0.020982] ------------[ cut here ]------------ [ 0.021586] Trying to vfree() nonexistent vm area ((____ptrval____)) [ 0.022427] WARNING: CPU: 0 PID: 0 at __vunmap+0xd0/0xd8 [ 0.023119] Modules linked in: [ 0.023524] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 4.19.67+ #1 [ 0.024498] Hardware name: MediaTek MT8183 (DT) [ 0.025091] pstate: 60400085 (nZCv daIf +PAN -UAO) [ 0.025718] pc : __vunmap+0xd0/0xd8 [ 0.026176] lr : __vunmap+0xd0/0xd8 [ 0.026632] sp : ffffff80090b3e90 [ 0.027066] x29: ffffff80090b3e90 x28: 0000000040e20018 [ 0.027764] x27: ffffffc07bfff780 x26: 0000000000000001 [ 0.028462] x25: ffffff80090bda80 x24: ffffff8008ec5828 [ 0.029160] x23: ffffff80090bd000 x22: ffffff8008d8b2e8 [ 0.029858] x21: 0000000000000000 x20: 0000000000000000 [ 0.030556] x19: ffffff800800d000 x18: 00000000002bffa8 [ 0.031254] x17: 0000000000000000 x16: 0000000000000000 [ 0.031952] x15: ffffffbf004a6800 x14: 3536343038393334 [ 0.032651] x13: 2079726576652073 x12: 7eb9c62c5c38f100 [ 0.033349] x11: ffffff80090b3b40 x10: ffffff80090b3b40 [ 0.034047] x9 : 0000000000000005 x8 : 5f5f6c6176727470 [ 0.034745] x7 : 5f5f5f5f28282061 x6 : ffffff80091c86ef [ 0.035443] x5 : ffffff800852b690 x4 : 0000000000000000 [ 0.036141] x3 : 0000000000000002 x2 : 0000000000000002 [ 0.036839] x1 : 7eb9c62c5c38f100 x0 : 7eb9c62c5c38f100 [ 0.037536] Call trace: [ 0.037859] __vunmap+0xd0/0xd8 [ 0.038271] vunmap+0x24/0x30 [ 0.038664] __iounmap+0x2c/0x34 [ 0.039088] timer_of_cleanup+0x70/0x7c [ 0.039591] mtk_syst_init+0x8c/0x9c [ 0.040060] timer_probe+0x6c/0xe0 [ 0.040507] time_init+0x14/0x44 [ 0.040932] start_kernel+0x2d0/0x46c
This commit remove the calls to timer_of_cleanup when timer_of_init fails since it is unnecessary and actually cause warnings to be printed.
--- drivers/clocksource/timer-mediatek.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/clocksource/timer-mediatek.c +2 -8
@@ -277,15 +277,12 @@ static int __init mtk_syst_init(struct device_node *node) ret =timer_of_init (node, &to);if (ret) - goto err; +return ret;clockevents_config_and_register (&to.clkevt,timer_of_rate (&to),TIMER_SYNC_TICKS ,0xffffffff );return 0 ; -err: -timer_of_cleanup (&to); -return ret; }static int __init mtk_gpt_init (struct device_node *node)
@@ -302,7 +299,7 @@ static int __init mtk_gpt_init(struct device_node *node) ret =timer_of_init (node, &to);if (ret) - goto err; +return ret;/* Configure clock source */ mtk_gpt_setup (&to,TIMER_CLK_SRC ,GPT_CTRL_OP_FREERUN );
@@ -320,9 +317,6 @@ static int __init mtk_gpt_init(struct device_node *node)mtk_gpt_enable_irq (&to,TIMER_CLK_EVT );return 0 ; -err: -timer_of_cleanup (&to); -return ret; }TIMER_OF_DECLARE (mtk_mt6577,"mediatek,mt6577-timer" , mtk_gpt_init);TIMER_OF_DECLARE (mtk_mt6765,"mediatek,mt6765-timer" , mtk_syst_init);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/321 ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 9110d1b0e229cebb1ffce0c04db2b22beffd513d ]
According to the PM8916 Hardware Register Description, CDC_D_CDC_CONN_HPHR_DAC_CTL has only a single bit (RX_SEL) to switch between RX1 (0) and RX2 (1). It is not possible to disable it entirely to achieve the "ZERO" state.
However, at the moment the "RDAC2 MUX" mixer defines three possible values ("ZERO", "RX2" and "RX1"). Setting the mixer to "ZERO" actually configures it to RX1. Setting the mixer to "RX1" has (seemingly) no effect.
Remove "ZERO" and replace it with "RX1" to fix this.
--- sound/soc/codecs/msm8916-wcd-analog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/msm8916-wcd-analog.c +2 -2
@@ -303,7 +303,7 @@ struct pm8916_wcd_analog_priv { };static const char *const adc2_mux_text[] = {"ZERO" ,"INP2" ,"INP3" }; -static const char *const rdac2_mux_text[] = {"ZERO" ,"RX2" ,"RX1" }; +static const char *const rdac2_mux_text[] = {"RX1" ,"RX2" };static const char *const hph_text[] = {"ZERO" ,"Switch" , }; static const struct soc_enum hph_enum = SOC_ENUM_SINGLE_VIRT(
@@ -318,7 +318,7 @@ static const struct soc_enum adc2_enum = SOC_ENUM_SINGLE_VIRT(/* RDAC2 MUX */ static const struct soc_enum rdac2_mux_enum =SOC_ENUM_SINGLE ( -CDC_D_CDC_CONN_HPHR_DAC_CTL ,0 ,3 , rdac2_mux_text); +CDC_D_CDC_CONN_HPHR_DAC_CTL ,0 ,2 , rdac2_mux_text);static const struct snd_kcontrol_new spkr_switch[] = {SOC_DAPM_SINGLE ("Switch" ,CDC_A_SPKR_DAC_CTL ,7 ,1 ,0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/321 ASoC: compress: fix unsigned integer overflow check
In reply to Greg Kroah-HartmanFrom: Xiaojun Sang <[email protected]>
[ Upstream commit d3645b055399538415586ebaacaedebc1e5899b0 ]
Parameter fragments and fragment_size are type of u32. U32_MAX is the correct check.
--- sound/core/compress_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/compress_offload.c +1 -1
@@ -529,7 +529,7 @@ static int snd_compress_check_input(struct snd_compr_params *params) {/* first let's check the buffer parameter's */ if (params->buffer.fragment_size ==0 || - params->buffer.fragments >INT_MAX / params->buffer.fragment_size || + params->buffer.fragments >U32_MAX / params->buffer.fragment_size || params->buffer.fragments ==0 )return -EINVAL ;
Signature · 1 line
2.20.1
Re: [PATCH 4.19 004/321] ASoC: compress: fix unsigned integer overflow check
Quoted 6 lines · Greg Kroah-Hartman
From: Xiaojun Sang <[email protected]>
[ Upstream commit
d3645b055399538415586ebaacaedebc1e5899b0]Parameter fragments and
fragment_sizeare type of u32.U32_MAXis the correct check.
Why is this in stable? I doubt raising limit from 2GB to 4GB can be called bugfix... kmalloc() will have problems allocating huge ammount of memory, anyway.
Best regards,
Pavel
Quoted 10 lines
+++
b/sound/core/compress_offload.csound/core/compress_offload.c +1
-1@@ -529,7 +529,7 @@ static int snd_compress_check_input(struct snd_compr_params *params) {/* first let's check the buffer parameter's */ if (params->buffer.fragment_size ==0 || - params->buffer.fragments >INT_MAX / params->buffer.fragment_size || + params->buffer.fragments >U32_MAX / params->buffer.fragment_size || params->buffer.fragments ==0 )return -EINVAL ;
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 5/321 reset: Fix memory leak in reset_control_array_put()
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit 532f9cd6ee994ed10403e856ca27501428048597 ]
Memory allocated for 'struct reset_control_array' in of_reset_control_array_get() is never freed in reset_control_array_put() resulting in kmemleak showing the following backtrace.
backtrace:
[<00000000c5f17595>] __kmalloc+0x1b0/0x2b0
[<00000000bd499e13>] of_reset_control_array_get+0xa4/0x180
[<000000004cc02754>] 0xffff800008c669e4
[<0000000050a83b24>] platform_drv_probe+0x50/0xa0
[<00000000d3a0b0bc>] really_probe+0x108/0x348
[<000000005aa458ac>] driver_probe_device+0x58/0x100
[<000000008853626c>] device_driver_attach+0x6c/0x90
[<0000000085308d19>] __driver_attach+0x84/0xc8
[<00000000080d35f2>] bus_for_each_dev+0x74/0xc8
[<00000000dd7f015b>] driver_attach+0x20/0x28
[<00000000923ba6e6>] bus_add_driver+0x148/0x1f0
[<0000000061473b66>] driver_register+0x60/0x110
[<00000000c5bec167>] __platform_driver_register+0x40/0x48
[<000000007c764b4f>] 0xffff800008c6c020
[<0000000047ec2e8c>] do_one_initcall+0x5c/0x1b0
[<0000000093d4b50d>] do_init_module+0x54/0x1d0--- drivers/reset/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/reset/core.c +1 -0
@@ -607,6 +607,7 @@ static void reset_control_array_put(struct reset_control_array *resets)for (i =0 ; i < resets->num_rstcs; i++)__reset_control_put_internal (resets->rstc[i]);mutex_unlock (&reset_list_mutex); +kfree (resets); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/321 clk: samsung: exynos5433: Fix error paths
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit faac3604d05e8015567124e5ee79edc3f1568a89 ]
Add checking the value returned by samsung_clk_alloc_reg_dump() and devm_kcalloc(). While fixing this, also release all gathered clocks.
--- drivers/clk/samsung/clk-exynos5433.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/clk/samsung/clk-exynos5433.c +12 -2
@@ -16,6 +16,7 @@#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/slab.h> #include <dt-bindings/clock/exynos5433.h>
@@ -5527,6 +5528,8 @@ static int __init exynos5433_cmu_probe(struct platform_device *pdev) data->clk_save =samsung_clk_alloc_reg_dump (info->clk_regs, info->nr_clk_regs); +if (!data->clk_save) +return -ENOMEM ; data->nr_clk_save = info->nr_clk_regs; data->clk_suspend = info->suspend_regs; data->nr_clk_suspend = info->nr_suspend_regs;
@@ -5535,12 +5538,19 @@ static int __init exynos5433_cmu_probe(struct platform_device *pdev)if (data->nr_pclks >0 ) { data->pclks =devm_kcalloc (dev,sizeof (struct clk *), data->nr_pclks,GFP_KERNEL ); - +if (!data->pclks) { +kfree (data->clk_save); +return -ENOMEM ; + }for (i =0 ; i < data->nr_pclks; i++) {struct clk *clk =of_clk_get (dev->of_node, i); -if (IS_ERR (clk)) +if (IS_ERR (clk)) { +kfree (data->clk_save); +while (--i >=0 ) +clk_put (data->pclks[i]);return PTR_ERR (clk); + } data->pclks[i] = clk; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/321 ASoC: kirkwood: fix external clock probe defer
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit 4523817d51bc3b2ef38da768d004fda2c8bc41de ]
When our call to get the external clock fails, we forget to clean up the enabled internal clock correctly. Enable the clock after we have obtained all our resources.
--- sound/soc/kirkwood/kirkwood-i2s.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/kirkwood/kirkwood-i2s.c +4 -4
@@ -563,10 +563,6 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)return PTR_ERR (priv->clk); } - err =clk_prepare_enable (priv->clk); -if (err <0 ) -return err; - priv->extclk =devm_clk_get (&pdev->dev,"extclk" );if (IS_ERR (priv->extclk)) {if (PTR_ERR (priv->extclk) == -EPROBE_DEFER )
@@ -582,6 +578,10 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) } } + err =clk_prepare_enable (priv->clk); +if (err <0 ) +return err; +/* Some sensible defaults - this reflects the powerup values */ priv->ctl_play =KIRKWOOD_PLAYCTL_SIZE_24 ; priv->ctl_rec =KIRKWOOD_RECCTL_SIZE_24 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/321 ASoC: kirkwood: fix device remove ordering
In reply to Greg Kroah-HartmanFrom: Russell King <[email protected]>
[ Upstream commit dc39596a906d5b604f4e64597b6e904fc14625e8 ]
The devm conversion of kirkwood was incorrect; on removal, devm takes effect after the "remove" function has returned. So, the effect of the conversion was to change the order during remove from:
- snd_soc_unregister_component() (unpublishes interfaces)
- clk_disable_unprepare()
- cleanup resources
After the conversion, this became:
- clk_disable_unprepare() - while the device may still be active
- snd_soc_unregister_component()
- cleanup resources
Hence, it introduces a bug, where the internal clock for the device may be shut down before the device itself has been shut down. It is known that Marvell SoCs, including Dove, locks up if registers for a peripheral that has its clocks disabled are accessed.
--- sound/soc/kirkwood/kirkwood-i2s.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/kirkwood/kirkwood-i2s.c +2 -1
@@ -595,7 +595,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec |=KIRKWOOD_RECCTL_BURST_128 ; } - err =devm_snd_soc_register_component (&pdev->dev, &kirkwood_soc_component, + err =snd_soc_register_component (&pdev->dev, &kirkwood_soc_component, soc_dai,2 );if (err) {dev_err (&pdev->dev,"snd_soc_register_component failed\n" );
@@ -618,6 +618,7 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) {struct kirkwood_dma_data *priv =dev_get_drvdata (&pdev->dev); +snd_soc_unregister_component (&pdev->dev);if (!IS_ERR (priv->extclk))clk_disable_unprepare (priv->extclk);clk_disable_unprepare (priv->clk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/321 clk: samsung: exynos5420: Preserve PLL configuration during suspend/resume
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit e9323b664ce29547d996195e8a6129a351c39108 ]
Properly save and restore all top PLL related configuration registers during suspend/resume cycle. So far driver only handled EPLL and RPLL clocks, all other were reset to default values after suspend/resume cycle. This caused for example lower G3D (MALI Panfrost) performance after system resume, even if performance governor has been selected.
--- drivers/clk/samsung/clk-exynos5420.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/samsung/clk-exynos5420.c +6 -0
@@ -171,12 +171,18 @@ static const unsigned long exynos5x_clk_regs[] __initconst = {GATE_BUS_CPU ,GATE_SCLK_CPU ,CLKOUT_CMU_CPU , +CPLL_CON0 , +DPLL_CON0 ,EPLL_CON0 ,EPLL_CON1 ,EPLL_CON2 ,RPLL_CON0 ,RPLL_CON1 ,RPLL_CON2 , +IPLL_CON0 , +SPLL_CON0 , +VPLL_CON0 , +MPLL_CON0 ,SRC_TOP0 ,SRC_TOP1 , SRC_TOP2,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/321 pinctrl: cherryview: Allocate IRQ chip dynamic
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 67d33aecd030226f0a577eb683aaa6853ecf8f91 ]
Keeping the IRQ chip definition static shares it with multiple instances of the GPIO chip in the system. This is bad and now we get this warning from GPIO library:
"detected irqchip that is shared with multiple gpiochips: please fix the driver."
Hence, move the IRQ chip definition from being driver static into the struct intel_pinctrl. So a unique IRQ chip is used for each GPIO chip instance.
This patch is heavily based on the attachment to the bug by Christoph Marz.
Depends-on: 83b9dc11312f ("pinctrl: cherryview: Associate IRQ descriptors to irqdomain")
--- drivers/pinctrl/intel/pinctrl-cherryview.c | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/pinctrl/intel/pinctrl-cherryview.c +12 -12
@@ -157,6 +157,7 @@ struct chv_pin_context {* @pctldesc: Pin controller description * @pctldev: Pointer to the pin controller device * @chip: GPIO chip in this pin controller +* @irqchip: IRQ chip in this pin controller * @regs: MMIO registers * @intr_lines: Stores mapping between 16 HW interrupt wires and GPIO * offset (in GPIO number space)
@@ -170,6 +171,7 @@ struct chv_pinctrl {struct pinctrl_desc pctldesc;struct pinctrl_dev *pctldev;struct gpio_chip chip; +struct irq_chip irqchip;void __iomem *regs;unsigned intr_lines[16 ];const struct chv_community *community;
@@ -1477,16 +1479,6 @@ static int chv_gpio_irq_type(struct irq_data *d, unsigned type)return 0 ; } -static struct irq_chip chv_gpio_irqchip = { - .name ="chv-gpio" , - .irq_startup = chv_gpio_irq_startup, - .irq_ack = chv_gpio_irq_ack, - .irq_mask = chv_gpio_irq_mask, - .irq_unmask = chv_gpio_irq_unmask, - .irq_set_type = chv_gpio_irq_type, - .flags =IRQCHIP_SKIP_SET_WAKE , -}; -static void chv_gpio_irq_handler (struct irq_desc *desc) {struct gpio_chip *gc =irq_desc_get_handler_data (desc);
@@ -1626,7 +1618,15 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) } } - ret =gpiochip_irqchip_add (chip, &chv_gpio_irqchip,0 , + pctrl->irqchip.name ="chv-gpio" ; + pctrl->irqchip.irq_startup = chv_gpio_irq_startup; + pctrl->irqchip.irq_ack = chv_gpio_irq_ack; + pctrl->irqchip.irq_mask = chv_gpio_irq_mask; + pctrl->irqchip.irq_unmask = chv_gpio_irq_unmask; + pctrl->irqchip.irq_set_type = chv_gpio_irq_type; + pctrl->irqchip.flags =IRQCHIP_SKIP_SET_WAKE ; + + ret =gpiochip_irqchip_add (chip, &pctrl->irqchip,0 , handle_bad_irq,IRQ_TYPE_NONE );if (ret) {dev_err (pctrl->dev,"failed to add IRQ chip\n" );
@@ -1643,7 +1643,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) } } -gpiochip_set_chained_irqchip (chip, &chv_gpio_irqchip, irq, +gpiochip_set_chained_irqchip (chip, &pctrl->irqchip, irq, chv_gpio_irq_handler);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/321 ARM: dts: imx6qdl-sabreauto: Fix storm of accelerometer interrupts
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 7e5d0bf6afcc7bd72f78e7f33570e2e0945624f0 ]
Since commit a211b8c55f3c ("ARM: dts: imx6qdl-sabreauto: Add sensors") a storm of accelerometer interrupts is seen:
[ 114.211283] irq 260: nobody cared (try booting with the "irqpoll" option) [ 114.218108] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.3.4 #1 [ 114.223960] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) [ 114.230531] [<c0112858>] (unwind_backtrace) from [<c010cdc8>] (show_stack+0x10/0x14) [ 114.238301] [<c010cdc8>] (show_stack) from [<c0c1aa1c>] (dump_stack+0xd8/0x110) [ 114.245644] [<c0c1aa1c>] (dump_stack) from [<c0193594>] (__report_bad_irq+0x30/0xc0) [ 114.253417] [<c0193594>] (__report_bad_irq) from [<c01933ac>] (note_interrupt+0x108/0x298) [ 114.261707] [<c01933ac>] (note_interrupt) from [<c018ffe4>] (handle_irq_event_percpu+0x70/0x80) [ 114.270433] [<c018ffe4>] (handle_irq_event_percpu) from [<c019002c>] (handle_irq_event+0x38/0x5c) [ 114.279326] [<c019002c>] (handle_irq_event) from [<c019438c>] (handle_level_irq+0xc8/0x154) [ 114.287701] [<c019438c>] (handle_level_irq) from [<c018eda0>] (generic_handle_irq+0x20/0x34) [ 114.296166] [<c018eda0>] (generic_handle_irq) from [<c0534214>] (mxc_gpio_irq_handler+0x30/0xf0) [ 114.304975] [<c0534214>] (mxc_gpio_irq_handler) from [<c0534334>] (mx3_gpio_irq_handler+0x60/0xb0) [ 114.313955] [<c0534334>] (mx3_gpio_irq_handler) from [<c018eda0>] (generic_handle_irq+0x20/0x34) [ 114.322762] [<c018eda0>] (generic_handle_irq) from [<c018f3ac>] (__handle_domain_irq+0x64/0xe0) [ 114.331485] [<c018f3ac>] (__handle_domain_irq) from [<c05215a8>] (gic_handle_irq+0x4c/0xa8) [ 114.339862] [<c05215a8>] (gic_handle_irq) from [<c0101a70>] (__irq_svc+0x70/0x98) [ 114.347361] Exception stack(0xc1301ec0 to 0xc1301f08) [ 114.352435] 1ec0: 00000001 00000006 00000000 c130c340 00000001 c130f688 9785636d c13ea2e8 [ 114.360635] 1ee0: 9784907d 0000001a eaf99d78 0000001a 00000000 c1301f10 c0182b00 c0878de4 [ 114.368830] 1f00: 20000013 ffffffff [ 114.372349] [<c0101a70>] (__irq_svc) from [<c0878de4>] (cpuidle_enter_state+0x168/0x5f4) [ 114.380464] [<c0878de4>] (cpuidle_enter_state) from [<c08792ac>] (cpuidle_enter+0x28/0x38) [ 114.388751] [<c08792ac>] (cpuidle_enter) from [<c015ef9c>] (do_idle+0x224/0x2a8) [ 114.396168] [<c015ef9c>] (do_idle) from [<c015f3b8>] (cpu_startup_entry+0x18/0x20) [ 114.403765] [<c015f3b8>] (cpu_startup_entry) from [<c1200e54>] (start_kernel+0x43c/0x500) [ 114.411958] handlers: [ 114.414302] [<a01028b8>] irq_default_primary_handler threaded [<fd7a3b08>] mma8452_interrupt [ 114.422974] Disabling IRQ #260
CPU0 CPU1
....
260: 100001 0 gpio-mxc 31 Level mma8451
The MMA8451 interrupt triggers as low level, so the GPIO6_IO31 pin needs to activate its pull up, otherwise it will stay always at low level generating multiple interrupts.
The current device tree does not configure the IOMUX for this pin, so it uses whathever comes configured from the bootloader.
The IOMUXC_SW_PAD_CTL_PAD_EIM_BCLK register value comes as 0x8000 from the bootloader, which has PKE bit cleared, hence disabling the pull-up.
Instead of relying on a previous configuration from the bootloader, configure the GPIO6_IO31 pin with pull-up enabled in order to fix this problem.
--- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +8 -0
@@ -177,6 +177,8 @@ accelerometer@1c { compatible = "fsl,mma8451"; reg = <0x1c>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mma8451_int>; interrupt-parent = <&gpio6>; interrupts = <31 IRQ_TYPE_LEVEL_LOW>; };
@@ -522,6 +524,12 @@ >; }; + pinctrl_mma8451_int: mma8451intgrp { + fsl,pins = < + MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0xb0b1 + >; + }; + pinctrl_pwm3: pwm1grp { fsl,pins = < MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/321 reset: fix reset_control_ops kerneldoc comment
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f430c7ed8bc22992ed528b518da465b060b9223f ]
Add a missing short description to the reset_control_ops documentation.
--- include/linux/reset-controller.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/reset-controller.h +1 -1
@@ -7,7 +7,7 @@struct reset_controller_dev ;/** -* struct reset_control_ops +* struct reset_control_ops - reset controller driver callbacks * * @reset: for self-deasserting resets, does all necessary * things to reset the device
Signature · 1 line
2.20.1
Re: [PATCH 4.19 012/321] reset: fix reset_control_ops kerneldoc comment
Quoted 6 lines · Greg Kroah-Hartman
From: Randy Dunlap <[email protected]>
[ Upstream commit
f430c7ed8bc22992ed528b518da465b060b9223f]Add a missing short description to the
reset_control_opsdocumentation.
Why is it pending for stable? It does not break anything, but neither it fixes anything, it adds to reviewer load...
Sasha, what is your process for selecting commits for stable?
Best regards,
Pavel
Quoted 10 lines
+++
b/include/linux/reset-controller.hinclude/linux/reset-controller.h +1
-1@@ -7,7 +7,7 @@struct reset_controller_dev ;/** -* struct reset_control_ops +* struct reset_control_ops - reset controller driver callbacks * * @reset: for self-deasserting resets, does all necessary * things to reset the device
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 13/321 clk: at91: avoid sleeping early
In reply to Greg Kroah-HartmanFrom: Alexandre Belloni <[email protected]>
[ Upstream commit 658fd65cf0b0d511de1718e48d9a28844c385ae0 ]
It is not allowed to sleep to early in the boot process and this may lead to kernel issues if the bootloader didn't prepare the slow clock and main clock.
This results in the following error and dump stack on the AriettaG25:
bad: scheduling from the idle thread!
Ensure it is possible to sleep, else simply have a delay.
--- drivers/clk/at91/clk-main.c | 5 ++++- drivers/clk/at91/sckc.c | 20 ++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-)
drivers/clk/at91/clk-main.c +4 -1
@@ -354,7 +354,10 @@ static int clk_main_probe_frequency(struct regmap *regmap)regmap_read (regmap,AT91_CKGR_MCFR , &mcfr);if (mcfr &AT91_PMC_MAINRDY )return 0 ; -usleep_range (MAINF_LOOP_MIN_WAIT ,MAINF_LOOP_MAX_WAIT ); +if (system_state <SYSTEM_RUNNING ) +udelay (MAINF_LOOP_MIN_WAIT ); +else +usleep_range (MAINF_LOOP_MIN_WAIT ,MAINF_LOOP_MAX_WAIT ); }while (time_before (prep_time, timeout));return -ETIMEDOUT ;
drivers/clk/at91/sckc.c +16 -4
@@ -74,7 +74,10 @@ static int clk_slow_osc_prepare(struct clk_hw *hw)writel (tmp |AT91_SCKC_OSC32EN , sckcr); -usleep_range (osc->startup_usec, osc->startup_usec +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (osc->startup_usec); +else +usleep_range (osc->startup_usec, osc->startup_usec +1 );return 0 ; }
@@ -197,7 +200,10 @@ static int clk_slow_rc_osc_prepare(struct clk_hw *hw)writel (readl (sckcr) |AT91_SCKC_RCEN , sckcr); -usleep_range (osc->startup_usec, osc->startup_usec +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (osc->startup_usec); +else +usleep_range (osc->startup_usec, osc->startup_usec +1 );return 0 ; }
@@ -310,7 +316,10 @@ static int clk_sam9x5_slow_set_parent(struct clk_hw *hw, u8 index)writel (tmp, sckcr); -usleep_range (SLOWCK_SW_TIME_USEC ,SLOWCK_SW_TIME_USEC +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (SLOWCK_SW_TIME_USEC ); +else +usleep_range (SLOWCK_SW_TIME_USEC ,SLOWCK_SW_TIME_USEC +1 );return 0 ; }
@@ -443,7 +452,10 @@ static int clk_sama5d4_slow_osc_prepare(struct clk_hw *hw)return 0 ; } -usleep_range (osc->startup_usec, osc->startup_usec +1 ); +if (system_state <SYSTEM_RUNNING ) +udelay (osc->startup_usec); +else +usleep_range (osc->startup_usec, osc->startup_usec +1 ); osc->prepared = true;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/321 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit afdc74ed2d57e86c10b1d6831339770a802bab9a ]
r375326 in Clang exposes an issue with operator precedence in sunxi_div_clk_setup:
drivers/clk/sunxi/clk-sunxi.c:1083:30: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]
data->div[i].critical ?
~~~~~~~~~~~~~~~~~~~~~ ^
drivers/clk/sunxi/clk-sunxi.c:1083:30: note: place parentheses around
the '|' expression to silence this warning
data->div[i].critical ?
^
)
drivers/clk/sunxi/clk-sunxi.c:1083:30: note: place parentheses around
the '?:' expression to evaluate it first
data->div[i].critical ?
^
(1 warning generated.
It appears that the intention was for ?: to be evaluated first so that CLK_IS_CRITICAL could be added to clkflags if the critical boolean was set; right now, | is being evaluated first. Add parentheses around the ?: block to have it be evaluated first.
--- drivers/clk/sunxi/clk-sunxi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/sunxi/clk-sunxi.c +2 -2
@@ -1086,8 +1086,8 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node, rate_hw, rate_ops, gate_hw, &clk_gate_ops, clkflags | - data->div[i].critical ? - CLK_IS_CRITICAL : 0); + (data->div[i].critical ? + CLK_IS_CRITICAL : 0));WARN_ON (IS_ERR (clk_data->clks[i])); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/321 clk: sunxi-ng: a80: fix the zeroing of bits 16 and 18
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit cdfc2e2086bf9c465f44e2db25561373b084a113 ]
The zero'ing of bits 16 and 18 is incorrect. Currently the code is masking with the bitwise-and of BIT(16) & BIT(18) which is 0, so the updated value for val is always zero. Fix this by bitwise and-ing value with the correct mask that will zero bits 16 and 18.
Addresses-Coverity: (" Suspicious &= or |= constant expression")
--- drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu-sun9i-a80.c +1 -1
@@ -1231,7 +1231,7 @@ static int sun9i_a80_ccu_probe(struct platform_device *pdev)/* Enforce d1 = 0, d2 = 0 for Audio PLL */ val =readl (reg +SUN9I_A80_PLL_AUDIO_REG ); - val &= (BIT (16 ) &BIT (18 )); + val &= ~(BIT (16 ) |BIT (18 ));writel (val, reg +SUN9I_A80_PLL_AUDIO_REG );/* Enforce P = 1 for both CPU cluster PLLs */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/321 ARM: dts: sun8i-a83t-tbs-a711: Fix WiFi resume from suspend
In reply to Greg Kroah-HartmanFrom: Ondrej Jirman <[email protected]>
[ Upstream commit e614f341253f8541baf0230a8dc6a016b544b1e2 ]
Without enabling keep-power-in-suspend, we can't wake the device up using WOL packet, and the log is flooded with these messages on resume:
sunxi-mmc 1c10000.mmc: send stop command failed sunxi-mmc 1c10000.mmc: data error, sending stop command sunxi-mmc 1c10000.mmc: send stop command failed sunxi-mmc 1c10000.mmc: data error, sending stop command
So to make the WiFi really a wakeup-source, we need to keep it powered during suspend.
--- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts +1 -0
@@ -171,6 +171,7 @@ vqmmc-supply = <®_dldo1>; non-removable; wakeup-source; + keep-power-in-suspend; status = "okay"; brcmf: wifi@1 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/321 samples/bpf: fix build by setting HAVE_ATTR_TEST to zero
In reply to Greg Kroah-HartmanFrom: Björn Töpel <[email protected]>
[ Upstream commit 04ec044b7d30800296824783df7d9728d16d7567 ]
To remove that test_attr__{enabled/open} are used by perf-sys.h, we set HAVE_ATTR_TEST to zero.
--- samples/bpf/Makefile | 1 + 1 file changed, 1 insertion(+)
samples/bpf/Makefile +1 -0
@@ -172,6 +172,7 @@ KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ KBUILD_HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/perf +KBUILD_HOSTCFLAGS += -DHAVE_ATTR_TEST=0 HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable HOSTCFLAGS_trace_helpers.o += -I$(srctree)/tools/lib/bpf/
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/321 powerpc/bpf: Fix tail call implementation
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 7de086909365cd60a5619a45af3f4152516fd75c ]
We have seen many crashes on powerpc hosts while loading bpf programs.
The problem here is that bpf_int_jit_compile() does a first pass to compute the program length.
Then it allocates memory to store the generated program and calls bpf_jit_build_body() a second time (and a third time later)
What I have observed is that the second bpf_jit_build_body() could end up using few more words than expected.
If bpf_jit_binary_alloc() put the space for the program at the end of the allocated page, we then write on a non mapped memory.
It appears that bpf_jit_emit_tail_call() calls bpf_jit_emit_common_epilogue() while ctx->seen might not be stable.
Only after the second pass we can be sure ctx->seen wont be changed.
Trying to avoid a second pass seems quite complex and probably not worth it.
--- arch/powerpc/net/bpf_jit_comp64.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/powerpc/net/bpf_jit_comp64.c +13 -0
@@ -949,6 +949,19 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) goto out_addrs; } +/* +* If we have seen a tail call, we need a second pass. +* This is because bpf_jit_emit_common_epilogue() is called +* from bpf_jit_emit_tail_call() with a not yet stable ctx->seen. +*/ +if (cgctx.seen &SEEN_TAILCALL ) { + cgctx.idx =0 ; +if (bpf_jit_build_body (fp,0 , &cgctx, addrs, false)) { + fp = org_fp; + goto out_addrs; + } + } +/* * Pretend to build prologue, given the features we've seen. This will * update ctgtx.idx as it pretends to output instructions, then we can
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/321 idr: Fix integer overflow in idr_for_each_entry
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit f6341c5af4e6e15041be39976d16deca789555fa ]
If there is an entry at INT_MAX then idr_for_each_entry() will increment id after handling it. This is undefined behaviour, and is caught by UBSAN. Adding 1U to id forces the operation to be carried out as an unsigned addition which (when assigned to id) will result in INT_MIN. Since there is never an entry stored at INT_MIN, idr_get_next() will return NULL, ending the loop as expected.
--- include/linux/idr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/idr.h +1 -1
@@ -185,7 +185,7 @@ static inline void idr_preload_end(void)* is convenient for a "not found" value. */ #define idr_for_each_entry (idr, entry, id) \ - for (id = 0; ((entry) = idr_get_next(idr, &(id))) != NULL; ++id) + for (id = 0; ((entry) = idr_get_next(idr, &(id))) != NULL; id += 1U)/** * idr_for_each_entry_ul() - Iterate over an IDR's elements of a given type.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/321 idr: Fix idr_alloc_u32 on 32-bit systems
In reply to Greg Kroah-HartmanFrom: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit b7e9728f3d7fc5c5c8508d99f1675212af5cfd49 ]
Attempting to allocate an entry at 0xffffffff when one is already present would succeed in allocating one at 2^32, which would confuse everything. Return -ENOSPC in this case, as expected.
--- lib/radix-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/radix-tree.c +1 -1
@@ -2172,7 +2172,7 @@ void __rcu **idr_get_free(struct radix_tree_root *root, offset =radix_tree_find_next_bit (node,IDR_FREE , offset +1 ); start =next_index (start, node, offset); -if (start > max) +if (start > max || start ==0 )return ERR_PTR (-ENOSPC );while (offset ==RADIX_TREE_MAP_SIZE ) { offset = node->offset +1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/321 x86/resctrl: Prevent NULL pointer dereference when reading mondata
In reply to Greg Kroah-HartmanFrom: Xiaochen Shen <[email protected]>
[ Upstream commit 26467b0f8407cbd628fa5b7bcfd156e772004155 ]
When a mon group is being deleted, rdtgrp->flags is set to RDT_DELETED in rdtgroup_rmdir_mon() firstly. The structure of rdtgrp will be freed until rdtgrp->waitcount is dropped to 0 in rdtgroup_kn_unlock() later.
During the window of deleting a mon group, if an application calls rdtgroup_mondata_show() to read mondata under this mon group, 'rdtgrp' returned from rdtgroup_kn_lock_live() is a NULL pointer when rdtgrp->flags is RDT_DELETED. And then 'rdtgrp' is passed in this path:rdtgroup_mondata_show() --> mon_event_read() --> mon_event_count(). Thus it results in NULL pointer dereference in mon_event_count().
Check 'rdtgrp' in rdtgroup_mondata_show(), and return -ENOENT immediately when reading mondata during the window of deleting a mon group.
--- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +4 -0
@@ -459,6 +459,10 @@ int rdtgroup_mondata_show(struct seq_file *m, void *arg)int ret =0 ; rdtgrp =rdtgroup_kn_lock_live (of->kn); +if (!rdtgrp) { + ret = -ENOENT ; + goto out; + } md.priv = of->kn->priv; resid = md.u.rid;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/321 clk: ti: dra7-atl-clock: Remove ti_clk_add_alias call
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit 9982b0f69b49931b652d35f86f519be2ccfc7027 ]
ti_clk_register() calls it already so the driver should not create duplicated alias.
--- drivers/clk/ti/clk-dra7-atl.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/clk/ti/clk-dra7-atl.c +0 -6
@@ -174,7 +174,6 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node)struct clk_init_data init = {NULL };const char **parent_names =NULL ;struct clk *clk; -int ret; clk_hw =kzalloc (sizeof (*clk_hw),GFP_KERNEL );if (!clk_hw) {
@@ -207,11 +206,6 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node) clk =ti_clk_register (NULL , &clk_hw->hw, node->name);if (!IS_ERR (clk)) { - ret =ti_clk_add_alias (NULL , clk, node->name); -if (ret) { -clk_unregister (clk); - goto cleanup; - }of_clk_add_provider (node, of_clk_src_simple_get, clk);kfree (parent_names);return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/321 clk: ti: clkctrl: Fix failed to enable error with double udelay timeout
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 81a41901ffd46bac6df4c95b8290ac259e0feda8 ]
Commit 3d8598fb9c5a ("clk: ti: clkctrl: use fallback udelay approach if timekeeping is suspended") added handling for cases when timekeeping is suspended. But looks like we can still get occasional "failed to enable" errors on the PM runtime resume path with udelay() returning faster than expected.
With ti-sysc interconnect target module driver this leads into device failure with PM runtime failing with "failed to enable" clkctrl error.
Let's fix the issue with a delay of two times the desired delay as in often done for udelay() to account for the inaccuracy.
--- drivers/clk/ti/clkctrl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/ti/clkctrl.c +3 -2
@@ -100,11 +100,12 @@ static bool _omap4_is_timeout(union omap4_timeout *time, u32 timeout)* can be from a timer that requires pm_runtime access, which * will eventually bring us here with timekeeping_suspended, * during both suspend entry and resume paths. This happens -* at least on am43xx platform. +* at least on am43xx platform. Account for flakeyness +* with udelay() by multiplying the timeout value by 2. */ if (unlikely (_early_timeout || timekeeping_suspended)) {if (time->cycles++ < timeout) { -udelay (1 ); +udelay (1 *2 );return false; } }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/321 net: fec: add missed clk_disable_unprepare in remove
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit c43eab3eddb4c6742ac20138659a9b701822b274 ]
This driver forgets to disable and unprepare clks when remove. Add calls to clk_disable_unprepare to fix it.
--- drivers/net/ethernet/freescale/fec_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/freescale/fec_main.c +2 -0
@@ -3606,6 +3606,8 @@ fec_drv_remove(struct platform_device *pdev)regulator_disable (fep->reg_phy);pm_runtime_put (&pdev->dev);pm_runtime_disable (&pdev->dev); +clk_disable_unprepare (fep->clk_ahb); +clk_disable_unprepare (fep->clk_ipg);if (of_phy_is_fixed_link (np))of_phy_deregister_fixed_link (np);of_node_put (fep->phy_node);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 024/321] net: fec: add missed clk_disable_unprepare in remove
Hi,
Quoted 10 lines · Greg Kroah-Hartman
From: Chuhong Yuan <[email protected]>
[ Upstream commit
c43eab3eddb4c6742ac20138659a9b701822b274]This driver forgets to disable and unprepare clks when remove. Add calls to
clk_disable_unprepareto fix it.Signed-off-by Chuhong Yuan <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>
This commit also requires the following commit:
commit a31eda65ba210741b598044d045480494d0ed52a
Author: Chuhong Yuan <[email protected]> Date: Wed Nov 20 09:25:13 2019 +0800
net: fec: fix clock count mis-match
pm_runtime_put_autosuspend in probe will call runtime suspend to disable clks automatically if CONFIG_PM is defined. (If CONFIG_PM is not defined, its implementation will be empty, then runtime suspend will not be called.)
Therefore, we can call pm_runtime_get_sync to runtime resume it first to enable clks, which matches the runtime suspend. (Only when CONFIG_PM is defined, otherwise pm_runtime_get_sync will also be empty, then runtime resume will not be called.)
Then it is fine to disable clks without causing clock count mis-match.
And this should also apply to 5.3.
Best regards,
Nobuhiro
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 024/321] net: fec: add missed clk_disable_unprepare in remove
Quoted 35 lines · Nobuhiro Iwamatsu
Hi,
Quoted 10 lines · Greg Kroah-Hartman
From: Chuhong Yuan <[email protected]>
[ Upstream commit
c43eab3eddb4c6742ac20138659a9b701822b274]This driver forgets to disable and unprepare clks when remove. Add calls to
clk_disable_unprepareto fix it.Signed-off-by Chuhong Yuan <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>This commit also requires the following commit:
commit
a31eda65ba210741b598044d045480494d0ed52aAuthor: Chuhong Yuan <[email protected]> Date: Wed Nov 20 09:25:13 2019 +0800net: fec: fix clock count mis-match
pm_runtime_put_autosuspendin probe will call runtime suspend to disable clks automatically ifCONFIG_PMis defined. (IfCONFIG_PMis not defined, its implementation will be empty, then runtime suspend will not be called.)Therefore, we can call
pm_runtime_get_syncto runtime resume it first to enable clks, which matches the runtime suspend. (Only whenCONFIG_PMis defined, otherwisepm_runtime_get_syncwill also be empty, then runtime resume will not be called.)Then it is fine to disable clks without causing clock count mis-match.
Quoted 7 lines
Fixes c43eab3eddb4 ("net: fec: add missed clk_disable_unprepare in remove")Signed-off-by Chuhong Yuan <[email protected]>Acked-by Fugang Duan <[email protected]>Signed-off-by David S. Miller <[email protected]>And this should also apply to 5.3.
Thanks, now queued up.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 25/321 bridge: ebtables: dont crash when using dnat target in output chains
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit b23c0742c2ce7e33ed79d10e451f70fdb5ca85d1 ]
xt_in() returns NULL in the output hook, skip the pkt_type change for that case, redirection only makes sense in broute/prerouting hooks.
--- net/bridge/netfilter/ebt_dnat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
net/bridge/netfilter/ebt_dnat.c +15 -4
@@ -19,7 +19,6 @@ static unsigned int ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par) { const struct ebt_nat_info *info = par->targinfo; -struct net_device *dev;if (!skb_make_writable (skb,0 ))return EBT_DROP ;
@@ -32,10 +31,22 @@ ebt_dnat_tg(struct sk_buff *skb, const struct xt_action_param *par)else skb->pkt_type =PACKET_MULTICAST ; }else { -if (xt_hooknum (par) !=NF_BR_BROUTING ) - dev =br_port_get_rcu (xt_in (par))->br->dev; -else +const struct net_device *dev; + +switch (xt_hooknum (par)) { +case NF_BR_BROUTING : dev =xt_in (par); +break ; +case NF_BR_PRE_ROUTING : + dev =br_port_get_rcu (xt_in (par))->br->dev; +break ; +default : + dev =NULL ; +break ; + } + +if (!dev)/* NF_BR_LOCAL_OUT */ +return info->target;if (ether_addr_equal (info->mac, dev->dev_addr)) skb->pkt_type =PACKET_HOST ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/321 can: peak_usb: report bus recovery as well
In reply to Greg Kroah-HartmanFrom: Jeroen Hofstee <[email protected]>
[ Upstream commit 128a1b87d3ceb2ba449d5aadb222fe22395adeb0 ]
While the state changes are reported when the error counters increase and decrease, there is no event when the bus recovers and the error counters decrease again. So add those as well.
Change the state going downward to be ERROR_PASSIVE -> ERROR_WARNING -> ERROR_ACTIVE instead of directly to ERROR_ACTIVE again.
--- drivers/net/can/usb/peak_usb/pcan_usb.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/can/usb/peak_usb/pcan_usb.c +10 -5
@@ -444,8 +444,8 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n, }if ((n &PCAN_USB_ERROR_BUS_LIGHT ) ==0 ) {/* no error (back to active state) */ - mc->pdev->dev.can.state =CAN_STATE_ERROR_ACTIVE ; -return 0 ; + new_state =CAN_STATE_ERROR_ACTIVE ; +break ; }break ;
@@ -468,9 +468,9 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n, }if ((n &PCAN_USB_ERROR_BUS_HEAVY ) ==0 ) { -/* no error (back to active state) */ - mc->pdev->dev.can.state =CAN_STATE_ERROR_ACTIVE ; -return 0 ; +/* no error (back to warning state) */ + new_state =CAN_STATE_ERROR_WARNING ; +break ; }break ;
@@ -509,6 +509,11 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n, mc->pdev->dev.can.can_stats.error_warning++;break ; +case CAN_STATE_ERROR_ACTIVE : + cf->can_id |=CAN_ERR_CRTL ; + cf->data[1 ] =CAN_ERR_CRTL_ACTIVE ; +break ; +default :/* CAN_STATE_MAX (trick to handle other errors) */ cf->can_id |=CAN_ERR_CRTL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/321 can: c_can: D_CAN: c_can_chip_config(): perform a sofware reset on open
In reply to Greg Kroah-HartmanFrom: Jeroen Hofstee <[email protected]>
[ Upstream commit 23c5a9488f076bab336177cd1d1a366bd8ddf087 ]
When the CAN interface is closed it the hardwre is put in power down mode, but does not reset the error counters / state. Reset the D_CAN on open, so the reported state and the actual state match.
According to [1], the C_CAN module doesn't have the software reset.
--- drivers/net/can/c_can/c_can.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/net/can/c_can/c_can.c +26 -0
@@ -52,6 +52,7 @@#define CONTROL_EX_PDR BIT(8)/* control register */ +#define CONTROL_SWR BIT(15)#define CONTROL_TEST BIT(7)#define CONTROL_CCE BIT(6)#define CONTROL_DISABLE_AR BIT(5)
@@ -572,6 +573,26 @@ static void c_can_configure_msg_objects(struct net_device *dev) IF_MCONT_RCV_EOB); } +static int c_can_software_reset (struct net_device *dev) +{ +struct c_can_priv *priv =netdev_priv (dev); +int retry =0 ; + +if (priv->type !=BOSCH_D_CAN ) +return 0 ; + + priv->write_reg (priv,C_CAN_CTRL_REG ,CONTROL_SWR |CONTROL_INIT ); +while (priv->read_reg (priv,C_CAN_CTRL_REG ) &CONTROL_SWR ) { +msleep (20 ); +if (retry++ >100 ) { +netdev_err (dev,"CCTRL: software reset failed\n" ); +return -EIO ; + } + } + +return 0 ; +} +/* * Configure C_CAN chip: * - enable/disable auto-retransmission
@@ -581,6 +602,11 @@ static void c_can_configure_msg_objects(struct net_device *dev)static int c_can_chip_config (struct net_device *dev) {struct c_can_priv *priv =netdev_priv (dev); +int err; + + err =c_can_software_reset (dev); +if (err) +return err;/* enable automatic retransmission */ priv->write_reg (priv,C_CAN_CTRL_REG ,CONTROL_ENABLE_AR );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/321 can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
[ Upstream commit 6caf8a6d6586d44fd72f4aa1021d14aa82affafb ]
If the rx-offload skb_queue is full can_rx_offload_queue_tail() will not queue the skb and return with an error.
This patch frees the skb in case of a full queue, which brings can_rx_offload_queue_tail() in line with the can_rx_offload_queue_sorted() function, which has been adjusted in the previous patch.
The return value is adjusted to -ENOBUFS to better reflect the actual problem.
The device stats handling is left to the caller.
--- drivers/net/can/rx-offload.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/can/rx-offload.c +4 -2
@@ -261,8 +261,10 @@ int can_rx_offload_queue_tail(struct can_rx_offload *offload, struct sk_buff *skb) {if (skb_queue_len (&offload->skb_queue) > - offload->skb_queue_len_max) -return -ENOMEM ; + offload->skb_queue_len_max) { +kfree_skb (skb); +return -ENOBUFS ; + }skb_queue_tail (&offload->skb_queue, skb);can_rx_offload_schedule (offload);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/321 can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
[ Upstream commit a2dc3f5e1022a5ede8af9ab89a144f1e69db8636 ]
The skb_queue is a linked list, holding the skb to be processed in the next NAPI call.
Without this patch, the queue length in can_rx_offload_offload_one() is limited to skb_queue_len_max + 1. As the skb_queue is a linked list, no array or other resources are accessed out-of-bound, however this behaviour is counterintuitive.
This patch limits the rx-offload skb_queue length to skb_queue_len_max.
--- drivers/net/can/rx-offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/rx-offload.c +1 -1
@@ -124,7 +124,7 @@ static struct sk_buff *can_rx_offload_offload_one(struct can_rx_offload *offloadint ret;/* If queue is full or skb not available, read to discard mailbox */ -if (likely (skb_queue_len (&offload->skb_queue) <= +if (likely (skb_queue_len (&offload->skb_queue) < offload->skb_queue_len_max)) skb =alloc_can_skb (offload->dev, &cf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/321 can: rx-offload: can_rx_offload_offload_one(): increment rx_fifo_errors on queue overflow or OOM
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
[ Upstream commit 4e9016bee3bf0c24963097edace034ff205b565c ]
If the rx-offload skb_queue is full or the skb allocation fails (due to OOM), the mailbox contents is discarded.
This patch adds the incrementing of the rx_fifo_errors statistics counter.
--- drivers/net/can/rx-offload.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/can/rx-offload.c +3 -1
@@ -134,8 +134,10 @@ static struct sk_buff *can_rx_offload_offload_one(struct can_rx_offload *offload ret = offload->mailbox_read (offload, &cf_overflow, ×tamp, n); -if (ret) +if (ret) { offload->dev->stats.rx_dropped++; + offload->dev->stats.rx_fifo_errors++; + }return NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/321 can: rx-offload: can_rx_offload_offload_one(): use ERR_PTR() to propagate error value in case of errors
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
[ Upstream commit d763ab3044f0bf50bd0e6179f6b2cf1c125d1d94 ]
Before this patch can_rx_offload_offload_one() returns a pointer to a skb containing the read CAN frame or a NULL pointer.
However the meaning of the NULL pointer is ambiguous, it can either mean the requested mailbox is empty or there was an error.
This patch fixes this situation by returning:
- pointer to skb on success
- NULL pointer if mailbox is empty
- ERR_PTR() in case of an error
All users of can_rx_offload_offload_one() have been adopted, no functional change intended.
--- drivers/net/can/rx-offload.c | 86 ++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 13 deletions(-)
drivers/net/can/rx-offload.c +73 -13
@@ -116,39 +116,95 @@ static int can_rx_offload_compare(struct sk_buff *a, struct sk_buff *b)return cb_b->timestamp - cb_a->timestamp; } -static struct sk_buff *can_rx_offload_offload_one (struct can_rx_offload *offload,unsigned int n) +/** +* can_rx_offload_offload_one() - Read one CAN frame from HW +* @offload: pointer to rx_offload context +* @n: number of mailbox to read +* +* The task of this function is to read a CAN frame from mailbox @n +* from the device and return the mailbox's content as a struct +* sk_buff. +* +* If the struct can_rx_offload::skb_queue exceeds the maximal queue +* length (struct can_rx_offload::skb_queue_len_max) or no skb can be +* allocated, the mailbox contents is discarded by reading it into an +* overflow buffer. This way the mailbox is marked as free by the +* driver. +* +* Return: A pointer to skb containing the CAN frame on success. +* +* NULL if the mailbox @n is empty. +* +* ERR_PTR() in case of an error +*/ +static struct sk_buff * +can_rx_offload_offload_one (struct can_rx_offload *offload,unsigned int n) { -struct sk_buff *skb =NULL ; +struct sk_buff *skb =NULL , *skb_error =NULL ;struct can_rx_offload_cb *cb;struct can_frame *cf;int ret; -/* If queue is full or skb not available, read to discard mailbox */ if (likely (skb_queue_len (&offload->skb_queue) < - offload->skb_queue_len_max)) + offload->skb_queue_len_max)) { skb =alloc_can_skb (offload->dev, &cf); +if (unlikely (!skb)) + skb_error =ERR_PTR (-ENOMEM );/* skb alloc failed */ + }else { + skb_error =ERR_PTR (-ENOBUFS );/* skb_queue is full */ + } -if (!skb) { +/* If queue is full or skb not available, drop by reading into +* overflow buffer. +*/ +if (unlikely (skb_error)) {struct can_frame cf_overflow;u32 timestamp; ret = offload->mailbox_read (offload, &cf_overflow, ×tamp, n); -if (ret) { - offload->dev->stats.rx_dropped++; - offload->dev->stats.rx_fifo_errors++; - } -return NULL ; +/* Mailbox was empty. */ +if (unlikely (!ret)) +return NULL ; + +/* Mailbox has been read and we're dropping it or +* there was a problem reading the mailbox. +* +* Increment error counters in any case. +*/ + offload->dev->stats.rx_dropped++; + offload->dev->stats.rx_fifo_errors++; + +/* There was a problem reading the mailbox, propagate +* error value. +*/ +if (unlikely (ret <0 )) +return ERR_PTR (ret); + +return skb_error; } cb =can_rx_offload_get_cb (skb); ret = offload->mailbox_read (offload, cf, &cb->timestamp, n); -if (!ret) { + +/* Mailbox was empty. */ +if (unlikely (!ret)) {kfree_skb (skb);return NULL ; } +/* There was a problem reading the mailbox, propagate error value. */ +if (unlikely (ret <0 )) { +kfree_skb (skb); + + offload->dev->stats.rx_dropped++; + offload->dev->stats.rx_fifo_errors++; + +return ERR_PTR (ret); + } + +/* Mailbox was read. */ return skb; }
@@ -168,7 +224,7 @@ int can_rx_offload_irq_offload_timestamp(struct can_rx_offload *offload, u64 pencontinue ; skb =can_rx_offload_offload_one (offload, i); -if (!skb) +if (IS_ERR_OR_NULL (skb))break ;__skb_queue_add_sort (&skb_queue, skb, can_rx_offload_compare);
@@ -199,7 +255,11 @@ int can_rx_offload_irq_offload_fifo(struct can_rx_offload *offload)struct sk_buff *skb;int received =0 ; -while ((skb =can_rx_offload_offload_one (offload,0 ))) { +while (1 ) { + skb =can_rx_offload_offload_one (offload,0 ); +if (IS_ERR_OR_NULL (skb)) +break ; +skb_queue_tail (&offload->skb_queue, skb); received++; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/321 can: rx-offload: can_rx_offload_irq_offload_timestamp(): continue on error
In reply to Greg Kroah-HartmanFrom: Jeroen Hofstee <[email protected]>
[ Upstream commit c2a9f74c9d18acfdcabd3361adc7eac82c537a66 ]
In case of a resource shortage, i.e. the rx_offload queue will overflow or a skb fails to be allocated (due to OOM), can_rx_offload_offload_one() will call mailbox_read() to discard the mailbox and return an ERR_PTR.
However can_rx_offload_irq_offload_timestamp() bails out in the error case. In case of a resource shortage all mailboxes should be discarded, to avoid an IRQ storm and give the system some time to recover.
Since can_rx_offload_irq_offload_timestamp() is typically called from a while loop, all message will eventually be discarded. So let's continue on error instead to discard them directly.
--- drivers/net/can/rx-offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/rx-offload.c +1 -1
@@ -225,7 +225,7 @@ int can_rx_offload_irq_offload_timestamp(struct can_rx_offload *offload, u64 pen skb =can_rx_offload_offload_one (offload, i);if (IS_ERR_OR_NULL (skb)) -break ; +continue ;__skb_queue_add_sort (&skb_queue, skb, can_rx_offload_compare); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/321 can: rx-offload: can_rx_offload_irq_offload_fifo(): continue on error
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
[ Upstream commit 1f7f504dcd9d1262437bdcf4fa071e41dec1af03 ]
In case of a resource shortage, i.e. the rx_offload queue will overflow or a skb fails to be allocated (due to OOM), can_rx_offload_offload_one() will call mailbox_read() to discard the mailbox and return an ERR_PTR.
If the hardware FIFO is empty can_rx_offload_offload_one() will return NULL.
In case a CAN frame was read from the hardware, can_rx_offload_offload_one() returns the skb containing it.
Without this patch can_rx_offload_irq_offload_fifo() bails out if no skb returned, regardless of the reason.
Similar to can_rx_offload_irq_offload_timestamp() in case of a resource shortage the whole FIFO should be discarded, to avoid an IRQ storm and give the system some time to recover. However if the FIFO is empty the loop can be left.
With this patch the loop is left in case of empty FIFO, but not on errors.
--- drivers/net/can/rx-offload.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/can/rx-offload.c +3 -1
@@ -257,7 +257,9 @@ int can_rx_offload_irq_offload_fifo(struct can_rx_offload *offload)while (1 ) { skb =can_rx_offload_offload_one (offload,0 ); -if (IS_ERR_OR_NULL (skb)) +if (IS_ERR (skb)) +continue ; +if (!skb)break ;skb_queue_tail (&offload->skb_queue, skb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/321 can: flexcan: increase error counters if skb enqueueing via can_rx_offload_queue_sorted() fails
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
[ Upstream commit 758124335a9dd649ab820bfb5b328170919ee7dc ]
The call to can_rx_offload_queue_sorted() may fail and return an error (in the current implementation due to resource shortage). The passed skb is consumed.
This patch adds incrementing of the appropriate error counters to let the device statistics reflect that there's a problem.
--- drivers/net/can/flexcan.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/can/flexcan.c +8 -2
@@ -566,6 +566,7 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr)struct can_frame *cf;bool rx_errors = false, tx_errors = false;u32 timestamp; +int err; timestamp = priv->read (®s->timer) <<16 ;
@@ -614,7 +615,9 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr)if (tx_errors) dev->stats.tx_errors++; -can_rx_offload_queue_sorted (&priv->offload, skb, timestamp); + err =can_rx_offload_queue_sorted (&priv->offload, skb, timestamp); +if (err) + dev->stats.rx_fifo_errors++; }static void flexcan_irq_state (struct net_device *dev,u32 reg_esr)
@@ -627,6 +630,7 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)int flt;struct can_berr_counter bec;u32 timestamp; +int err; timestamp = priv->read (®s->timer) <<16 ;
@@ -658,7 +662,9 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)if (unlikely (new_state ==CAN_STATE_BUS_OFF ))can_bus_off (dev); -can_rx_offload_queue_sorted (&priv->offload, skb, timestamp); + err =can_rx_offload_queue_sorted (&priv->offload, skb, timestamp); +if (err) + dev->stats.rx_fifo_errors++; }static inline struct flexcan_priv *rx_offload_to_priv (struct can_rx_offload *offload)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/321 can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition
In reply to Greg Kroah-HartmanFrom: Timo Schlüßler <[email protected]>
[ Upstream commit 27a0e54bae09d2dd023a01254db506d61cc50ba1 ]
In mcp251x_restart_work_handler() the variable to stop the interrupt handler (priv->force_quit) is reset after the chip is restarted and thus a interrupt might occur.
This patch fixes the potential race condition by resetting force_quit before enabling interrupts.
--- drivers/net/can/spi/mcp251x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/spi/mcp251x.c +1 -1
@@ -773,6 +773,7 @@ static void mcp251x_restart_work_handler(struct work_struct *ws)if (priv->after_suspend) {mcp251x_hw_reset (spi);mcp251x_setup (net, spi); + priv->force_quit =0 ;if (priv->after_suspend &AFTER_SUSPEND_RESTART ) {mcp251x_set_normal_mode (spi); }else if (priv->after_suspend &AFTER_SUSPEND_UP ) {
@@ -784,7 +785,6 @@ static void mcp251x_restart_work_handler(struct work_struct *ws)mcp251x_hw_sleep (spi); } priv->after_suspend =0 ; - priv->force_quit =0 ; }if (priv->restart_tx) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/321 watchdog: meson: Fix the wrong value of left time
In reply to Greg Kroah-HartmanFrom: Xingyu Chen <[email protected]>
[ Upstream commit 2c77734642d52448aca673e889b39f981110828b ]
The left time value is wrong when we get it by sysfs. The left time value should be equal to preset timeout value minus elapsed time value. According to the Meson-GXB/GXL datasheets which can be found at [0], the timeout value is saved to BIT[0-15] of the WATCHDOG_TCNT, and elapsed time value is saved to BIT[16-31] of the WATCHDOG_TCNT.
--- drivers/watchdog/meson_gxbb_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/meson_gxbb_wdt.c +2 -2
@@ -89,8 +89,8 @@ static unsigned int meson_gxbb_wdt_get_timeleft(struct watchdog_device *wdt_dev) reg =readl (data->reg_base +GXBB_WDT_TCNT_REG ); -return ((reg >>GXBB_WDT_TCNT_CNT_SHIFT ) - - (reg &GXBB_WDT_TCNT_SETUP_MASK )) /1000 ; +return ((reg &GXBB_WDT_TCNT_SETUP_MASK ) - + (reg >>GXBB_WDT_TCNT_CNT_SHIFT )) /1000 ; }static const struct watchdog_ops meson_gxbb_wdt_ops = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/321 ASoC: stm32: sai: add restriction on mmap support
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
[ Upstream commit eaf072e512d54c95b0977eda06cbca3151ace1e5 ]
Do not support mmap in S/PDIF mode. In S/PDIF mode the buffer has to be copied, to allow the channel status bits insertion.
--- sound/soc/stm/stm32_sai_sub.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
sound/soc/stm/stm32_sai_sub.c +11 -1
@@ -994,6 +994,16 @@ static int stm32_sai_pcm_process_spdif(struct snd_pcm_substream *substream,return 0 ; } +/* No support of mmap in S/PDIF mode */ +static const struct snd_pcm_hardware stm32_sai_pcm_hw_spdif = { + .info =SNDRV_PCM_INFO_INTERLEAVED , + .buffer_bytes_max =8 *PAGE_SIZE , + .period_bytes_min =1024 , + .period_bytes_max =PAGE_SIZE , + .periods_min =2 , + .periods_max =8 , +}; +static const struct snd_pcm_hardware stm32_sai_pcm_hw = { .info =SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_MMAP , .buffer_bytes_max =8 *PAGE_SIZE ,
@@ -1050,7 +1060,7 @@ static const struct snd_dmaengine_pcm_config stm32_sai_pcm_config = { };static const struct snd_dmaengine_pcm_config stm32_sai_pcm_config_spdif = { - .pcm_hardware = &stm32_sai_pcm_hw, + .pcm_hardware = &stm32_sai_pcm_hw_spdif, .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, .process = stm32_sai_pcm_process_spdif, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/321 scripts/gdb: fix debugging modules compiled with hot/cold partitioning
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 8731acc5068eb3f422a45c760d32198175c756f8 ]
gcc's -freorder-blocks-and-partition option makes it group frequently and infrequently used code in .text.hot and .text.unlikely sections respectively. At least when building modules on s390, this option is used by default.
gdb assumes that all code is located in .text section, and that .text section is located at module load address. With such modules this is no longer the case: there is code in .text.hot and .text.unlikely, and either of them might precede .text.
Fix by explicitly telling gdb the addresses of code sections.
It might be tempting to do this for all sections, not only the ones in the white list. Unfortunately, gdb appears to have an issue, when telling it about e.g. loadable .note.gnu.build-id section causes it to think that non-loadable .note.Linux section is loaded at address 0, which in turn causes NULL pointers to be resolved to bogus symbols. So keep using the white list approach for the time being.
--- scripts/gdb/linux/symbols.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/gdb/linux/symbols.py +2 -1
@@ -99,7 +99,8 @@ lx-symbols command.""" attrs[n]['name'].string(): attrs[n]['address'] for n in range(int(sect_attrs['nsections']))} args = [] - for section_name in [".data", ".data..read_mostly", ".rodata", ".bss"]: + for section_name in [".data", ".data..read_mostly", ".rodata", ".bss", + ".text", ".text.hot", ".text.unlikely"]: address = section_name_to_address.get(section_name) if address: args.append(" -s {name} {addr}".format(
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/321 net: bcmgenet: use RGMII loopback for MAC reset
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
[ Upstream commit 3a55402c93877d291b0a612d25edb03d1b4b93ac ]
As noted in commit 28c2d1a7a0bf ("net: bcmgenet: enable loopback during UniMAC sw_reset") the UniMAC must be clocked while sw_reset is asserted for its state machines to reset cleanly.
The transmit and receive clocks used by the UniMAC are derived from the signals used on its PHY interface. The bcmgenet MAC can be configured to work with different PHY interfaces including MII, GMII, RGMII, and Reverse MII on internal and external interfaces. Unfortunately for the UniMAC, when configured for MII the Tx clock is always driven from the PHY which places it outside of the direct control of the MAC.
The earlier commit enabled a local loopback mode within the UniMAC so that the receive clock would be derived from the transmit clock which addressed the observed issue with an external GPHY disabling it's Rx clock. However, when a Tx clock is not available this loopback is insufficient.
This commit implements a workaround that leverages the fact that the MAC can reliably generate all of its necessary clocking by enterring the external GPHY RGMII interface mode with the UniMAC in local loopback during the sw_reset interval. Unfortunately, this has the undesirable side efect of the RGMII GTXCLK signal being driven during the same window.
In most configurations this is a benign side effect as the signal is either not routed to a pin or is already expected to drive the pin. The one exception is when an external MII PHY is expected to drive the same pin with its TX_CLK output creating output driver contention.
This commit exploits the IEEE 802.3 clause 22 standard defined isolate mode to force an external MII PHY to present a high impedance on its TX_CLK output during the window to prevent any contention at the pin.
The MII interface is used internally with the 40nm internal EPHY which agressively disables its clocks for power savings leading to incomplete resets of the UniMAC and many instabilities observed over the years. The workaround of this commit is expected to put an end to those problems.
--- .../net/ethernet/broadcom/genet/bcmgenet.c | 2 -- drivers/net/ethernet/broadcom/genet/bcmmii.c | 33 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +0 -2
@@ -1998,8 +1998,6 @@ static void reset_umac(struct bcmgenet_priv *priv)/* issue soft reset with (rg)mii loopback to ensure a stable rxclk */ bcmgenet_umac_writel (priv,CMD_SW_RESET |CMD_LCL_LOOP_EN ,UMAC_CMD ); -udelay (2 ); -bcmgenet_umac_writel (priv,0 ,UMAC_CMD ); }static void bcmgenet_intr_disable (struct bcmgenet_priv *priv)
drivers/net/ethernet/broadcom/genet/bcmmii.c +33 -0
@@ -184,8 +184,38 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)const char *phy_name =NULL ;u32 id_mode_dis =0 ;u32 port_ctrl; +int bmcr =-1 ; +int ret;u32 reg; +/* MAC clocking workaround during reset of umac state machines */ + reg =bcmgenet_umac_readl (priv,UMAC_CMD ); +if (reg &CMD_SW_RESET ) { +/* An MII PHY must be isolated to prevent TXC contention */ +if (priv->phy_interface ==PHY_INTERFACE_MODE_MII ) { + ret =phy_read (phydev,MII_BMCR ); +if (ret >=0 ) { + bmcr = ret; + ret =phy_write (phydev,MII_BMCR , + bmcr |BMCR_ISOLATE ); + } +if (ret) { +netdev_err (dev,"failed to isolate PHY\n" ); +return ret; + } + } +/* Switch MAC clocking to RGMII generated clock */ +bcmgenet_sys_writel (priv,PORT_MODE_EXT_GPHY ,SYS_PORT_CTRL ); +/* Ensure 5 clks with Rx disabled +* followed by 5 clks with Reset asserted +*/ +udelay (4 ); + reg &= ~(CMD_SW_RESET |CMD_LCL_LOOP_EN ); +bcmgenet_umac_writel (priv, reg,UMAC_CMD ); +/* Ensure 5 more clocks before Rx is enabled */ +udelay (2 ); + } + priv->ext_phy = !priv->internal_phy && (priv->phy_interface !=PHY_INTERFACE_MODE_MOCA );
@@ -217,6 +247,9 @@ int bcmgenet_mii_config(struct net_device *dev, bool init) phydev->supported &=PHY_BASIC_FEATURES ;bcmgenet_sys_writel (priv,PORT_MODE_EXT_EPHY ,SYS_PORT_CTRL ); +/* Restore the MII PHY after isolation */ +if (bmcr >=0 ) +phy_write (phydev,MII_BMCR , bmcr);break ;case PHY_INTERFACE_MODE_REVMII :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/321 net: bcmgenet: reapply manual settings to the PHY
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
[ Upstream commit 0686bd9d5e6863f60e4bb1e78e6fe7bb217a0890 ]
The phy_init_hw() function may reset the PHY to a configuration that does not match manual network settings stored in the phydev structure. If the phy state machine is polled rather than event driven this can create a timing hazard where the phy state machine might alter the settings stored in the phydev structure from the value read from the BMCR.
This commit follows invocations of phy_init_hw() by the bcmgenet driver with invocations of the genphy_config_aneg() function to ensure that the BMCR is written to match the settings held in the phydev structure. This prevents the risk of manual settings being accidentally altered.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +4 -1
@@ -2619,8 +2619,10 @@ static void bcmgenet_irq_task(struct work_struct *work)spin_unlock_irq (&priv->lock);if (status &UMAC_IRQ_PHY_DET_R && - priv->dev->phydev->autoneg !=AUTONEG_ENABLE ) + priv->dev->phydev->autoneg !=AUTONEG_ENABLE ) {phy_init_hw (priv->dev->phydev); +genphy_config_aneg (priv->dev->phydev); + }/* Link UP/DOWN event */ if (status &UMAC_IRQ_LINK_EVENT )
@@ -3673,6 +3675,7 @@ static int bcmgenet_resume(struct device *d)phy_init_hw (dev->phydev);/* Speed settings must be restored */ +genphy_config_aneg (dev->phydev);bcmgenet_mii_config (priv->dev, false);bcmgenet_set_hw_addr (priv, dev->dev_addr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/321 net: mscc: ocelot: fix __ocelot_rmw_ix prototype
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 17fdd7638cb687cd7f15a48545f25d738f0101e0 ]
The "read-modify-write register index" function is declared with a confusing prototype: the "mask" and "reg" arguments are swapped.
Fortunately, this does not affect callers so far. Both arguments are u32, and the wrapper macros (ocelot_rmw_ix etc) have the arguments in the correct order (the one from ocelot_io.c).
--- drivers/net/ethernet/mscc/ocelot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mscc/ocelot.h +1 -1
@@ -541,7 +541,7 @@ void __ocelot_write_ix(struct ocelot *ocelot, u32 val, u32 reg, u32 offset);#define ocelot_write_rix (ocelot, val, reg, ri) __ocelot_write_ix(ocelot, val, reg, reg##_RSZ * (ri))#define ocelot_write (ocelot, val, reg) __ocelot_write_ix(ocelot, val, reg, 0) -void __ocelot_rmw_ix (struct ocelot *ocelot,u32 val,u32 reg,u32 mask, +void __ocelot_rmw_ix (struct ocelot *ocelot,u32 val,u32 mask,u32 reg,u32 offset);#define ocelot_rmw_ix (ocelot, val, m, reg, gi, ri) __ocelot_rmw_ix(ocelot, val, m, reg, reg##_GSZ * (gi) + reg##_RSZ * (ri))#define ocelot_rmw_gix (ocelot, val, m, reg, gi) __ocelot_rmw_ix(ocelot, val, m, reg, reg##_GSZ * (gi))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/321 ceph: return -EINVAL if given fsc mount option on kernel w/o support
In reply to Greg Kroah-HartmanFrom: Jeff Layton <[email protected]>
[ Upstream commit ff29fde84d1fc82f233c7da0daa3574a3942bec7 ]
If someone requests fscache on the mount, and the kernel doesn't support it, it should fail the mount.
[ Drop ceph prefix -- it's provided by pr_err. ]
--- fs/ceph/super.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ceph/super.c +10 -1
@@ -248,6 +248,7 @@ static int parse_fsopt_token(char *c, void *private)return -ENOMEM ;break ;case Opt_fscache_uniq: +#ifdef CONFIG_CEPH_FSCACHE kfree (fsopt->fscache_uniq); fsopt->fscache_uniq = kstrndup(argstr[0].from, argstr[0].to-argstr[0].from,
@@ -256,7 +257,10 @@ static int parse_fsopt_token(char *c, void *private)return -ENOMEM ; fsopt->flags |=CEPH_MOUNT_OPT_FSCACHE ;break ; -/* misc */ +#else +pr_err ("fscache support is disabled\n" ); +return -EINVAL ; +#endif case Opt_wsize:if (intval < (int )PAGE_SIZE || intval >CEPH_MAX_WRITE_SIZE )return -EINVAL ;
@@ -328,10 +332,15 @@ static int parse_fsopt_token(char *c, void *private) fsopt->flags &= ~CEPH_MOUNT_OPT_INO32 ;break ;case Opt_fscache: +#ifdef CONFIG_CEPH_FSCACHE fsopt->flags |=CEPH_MOUNT_OPT_FSCACHE ;kfree (fsopt->fscache_uniq); fsopt->fscache_uniq =NULL ;break ; +#else +pr_err ("fscache support is disabled\n" ); +return -EINVAL ; +#endif case Opt_nofscache: fsopt->flags &= ~CEPH_MOUNT_OPT_FSCACHE ;kfree (fsopt->fscache_uniq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/321 net/fq_impl: Switch to kvmalloc() for memory allocation
In reply to Greg Kroah-HartmanFrom: Toke Høiland-Jørgensen <[email protected]>
[ Upstream commit 71e67c3bd127cfe7863f54e4b087eba1cc8f9a7a ]
The FQ implementation used by mac80211 allocates memory using kmalloc(), which can fail; and Johannes reported that this actually happens in practice.
To avoid this, switch the allocation to kvmalloc() instead; this also brings fq_impl in line with all the FQ qdiscs.
--- include/net/fq_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/fq_impl.h +2 -2
@@ -312,7 +312,7 @@ static int fq_init(struct fq *fq, int flows_cnt) fq->limit =8192 ; fq->memory_limit =16 <<20 ;/* 16 MBytes */ - fq->flows =kcalloc (fq->flows_cnt,sizeof (fq->flows[0 ]),GFP_KERNEL ); + fq->flows =kvcalloc (fq->flows_cnt,sizeof (fq->flows[0 ]),GFP_KERNEL );if (!fq->flows)return -ENOMEM ;
@@ -330,7 +330,7 @@ static void fq_reset(struct fq *fq,for (i =0 ; i < fq->flows_cnt; i++)fq_flow_reset (fq, &fq->flows[i], free_func); -kfree (fq->flows); +kvfree (fq->flows); fq->flows =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/321 mac80211: fix station inactive_time shortly after boot
In reply to Greg Kroah-HartmanFrom: Ahmed Zaki <[email protected]>
[ Upstream commit 285531f9e6774e3be71da6673d475ff1a088d675 ]
In the first 5 minutes after boot (time of INITIAL_JIFFIES), ieee80211_sta_last_active() returns zero if last_ack is zero. This leads to "inactive time" showing jiffies_to_msecs(jiffies).
# iw wlan0 station get fc:ec:da:64:a6:dd Station fc:ec:da:64:a6:dd (on wlan0) inactive time: 4294894049 ms . . connected time: 70 seconds
Fix by returning last_rx if last_ack == 0.
--- net/mac80211/sta_info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/sta_info.c +2 -1
@@ -2356,7 +2356,8 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta) {struct ieee80211_sta_rx_stats *stats =sta_get_last_rx_stats (sta); -if (time_after (stats->last_rx, sta->status_stats.last_ack)) +if (!sta->status_stats.last_ack || +time_after (stats->last_rx, sta->status_stats.last_ack))return stats->last_rx;return sta->status_stats.last_ack; }
Signature · 1 line
2.20.1
Re: [PATCH 4.19 044/321] mac80211: fix station inactive_time shortly after boot
Quoted 8 lines · Greg Kroah-Hartman
From: Ahmed Zaki <[email protected]>
[ Upstream commit
285531f9e6774e3be71da6673d475ff1a088d675]In the first 5 minutes after boot (time of
INITIAL_JIFFIES),ieee80211_sta_last_active()returns zero iflast_ackis zero. This leads to "inactive time" showingjiffies_to_msecs(jiffies).
Quoted 8 lines
# iw wlan0 station get fc:ec:da:64:a6:dd Station fc:ec:da:64:a6:dd (on wlan0) inactive time: 4294894049 ms . . connected time: 70 secondsFix by returning
last_rxiflast_ack== 0.
I guess it fixes the message, but is it right fix?
Quoted 5 lines
net/mac80211/sta_info.c +0
-0
net/mac80211/sta_info.c unsigned long ieee80211_sta_last_active(struct sta_info *sta) · line 2363
Quoted 9 lines
net/mac80211/sta_info.c +2
-1@@ -2356,7 +2356,8 @@ unsigned long ieee80211_sta_last_active(struct sta_info *sta) {struct ieee80211_sta_rx_stats *stats =sta_get_last_rx_stats (sta); -if (time_after (stats->last_rx, sta->status_stats.last_ack)) +if (!sta->status_stats.last_ack || +time_after (stats->last_rx, sta->status_stats.last_ack))return stats->last_rx;return sta->status_stats.last_ack; }
I mean, jiffies do wrapraound periodically, so eventually we'll have sta->status_stats.last_ack == 0 even through it is not short after boot, no?
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 044/321] mac80211: fix station inactive_time shortly after boot
Quoted 10 lines · Pavel Machek
net/mac80211/sta_info.c unsigned long ieee80211_sta_last_active(struct sta_info *sta) · line 2363
Quoted 6 lines
net/mac80211/sta_info.c +2
-1-if (time_after (stats->last_rx, sta->status_stats.last_ack)) +if (!sta->status_stats.last_ack || +time_after (stats->last_rx, sta->status_stats.last_ack))return stats->last_rx;return sta->status_stats.last_ack; }I mean, jiffies do wrapraound periodically, so eventually we'll have
sta->status_stats.last_ack== 0 even through it is not short after boot, no?
Yeah. I contemplated that when I applied the original patch - it's a bit complicated otherwise, you have to track "is this valid" etc.
Since this is updated on pretty much every frame, it's highly unlikely you'll go without the value for long, so I figured this was good enough.
johannes
Re: [PATCH 4.19 044/321] mac80211: fix station inactive_time shortly after boot
Quoted 14 lines · Johannes Berg
Quoted 10 lines · Pavel Machek
net/mac80211/sta_info.c unsigned long ieee80211_sta_last_active(struct sta_info *sta) · line 2363
Quoted 6 lines
net/mac80211/sta_info.c +2
-1-if (time_after (stats->last_rx, sta->status_stats.last_ack)) +if (!sta->status_stats.last_ack || +time_after (stats->last_rx, sta->status_stats.last_ack))return stats->last_rx;return sta->status_stats.last_ack; }I mean, jiffies do wrapraound periodically, so eventually we'll have
sta->status_stats.last_ack== 0 even through it is not short after boot, no?
Quoted 8 lines
Yeah. I contemplated that when I applied the original patch - it's a bit complicated otherwise, you have to track "is this valid" etc.
Since this is updated on pretty much every frame, it's highly unlikely you'll go without the value for long, so I figured this was good enough.
johannes
That happened when I was testing an IBSS network, so a unit would have last_ack = 0
for some neighbours for extended period of time, but last_rx was always valid (from
broadcasts and beacons I guess). In this case, it makes sense to use last_rx, no matter
jiffies had wrapped around or not.
For STA/AP situations, last_ack should pretty much be valid and non-zero.
Ahmed
Greg Kroah-Hartman
maintainerPATCH 45/321 block: drbd: remove a stray unlock in __drbd_send_protocol()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 8e9c523016cf9983b295e4bc659183d1fa6ef8e0 ]
There are two callers of this function and they both unlock the mutex so this ends up being a double unlock.
--- drivers/block/drbd/drbd_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/block/drbd/drbd_main.c +0 -1
@@ -796,7 +796,6 @@ int __drbd_send_protocol(struct drbd_connection *connection, enum drbd_packet cmif (nc->tentative && connection->agreed_pro_version <92 ) {rcu_read_unlock (); -mutex_unlock (&sock->mutex);drbd_err (connection,"--dry-run is not supported by peer" );return -EOPNOTSUPP ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/321 pwm: bcm-iproc: Prevent unloading the driver module while in use
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 24906a41eecb73d51974ade0847c21e429beec60 ]
The owner member of struct pwm_ops must be set to THIS_MODULE to increase the reference count of the module such that the module cannot be removed while its code is in use.
--- drivers/pwm/pwm-bcm-iproc.c | 1 + 1 file changed, 1 insertion(+)
drivers/pwm/pwm-bcm-iproc.c +1 -0
@@ -187,6 +187,7 @@ static int iproc_pwmc_apply(struct pwm_chip *chip, struct pwm_device *pwm,static const struct pwm_ops iproc_pwm_ops = { .apply = iproc_pwmc_apply, .get_state = iproc_pwmc_get_state, + .owner =THIS_MODULE , };static int iproc_pwmc_probe (struct platform_device *pdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/321 scsi: target/tcmu: Fix queue_cmd_ring() declaration
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit e7f411049f5164ee6db6c3434c07302846f09990 ]
This patch does not change any functionality but avoids that sparse complains about the queue_cmd_ring() function and its callers.
--- drivers/target/target_core_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_user.c +1 -1
@@ -962,7 +962,7 @@ static int add_to_qfull_queue(struct tcmu_cmd *tcmu_cmd)* 0 success * 1 internally queued to wait for ring memory to free. */ -static sense_reason_t queue_cmd_ring (struct tcmu_cmd *tcmu_cmd,int *scsi_err) +static int queue_cmd_ring (struct tcmu_cmd *tcmu_cmd,sense_reason_t *scsi_err) {struct tcmu_dev *udev = tcmu_cmd->tcmu_dev;struct se_cmd *se_cmd = tcmu_cmd->se_cmd;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/321 scsi: lpfc: Fix kernel Oops due to null pring pointers
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 5a9eeff57f340238c39c95d8e7e54c96fc722de7 ]
Driver is hitting null pring pointers in lpfc_do_work().
Pointer assignment occurs based on SLI-revision. If recovering after an error, its possible the sli revision for the port was cleared, making the lpfc_phba_elsring() not return a ring pointer, thus the null pointer.
Add SLI revision checking to lpfc_phba_elsring() and status checking to all callers.
--- drivers/scsi/lpfc/lpfc.h | 6 ++++++ drivers/scsi/lpfc/lpfc_els.c | 2 ++ drivers/scsi/lpfc/lpfc_init.c | 7 ++++++- drivers/scsi/lpfc/lpfc_sli.c | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc.h +6 -0
@@ -1236,6 +1236,12 @@ lpfc_sli_read_hs(struct lpfc_hba *phba)static inline struct lpfc_sli_ring *lpfc_phba_elsring (struct lpfc_hba *phba) { +/* Return NULL if sli_rev has become invalid due to bad fw */ +if (phba->sli_rev !=LPFC_SLI_REV4 && + phba->sli_rev !=LPFC_SLI_REV3 && + phba->sli_rev !=LPFC_SLI_REV2 ) +return NULL ; +if (phba->sli_rev ==LPFC_SLI_REV4 ) {if (phba->sli4_hba.els_wq)return phba->sli4_hba.els_wq->pring;
drivers/scsi/lpfc/lpfc_els.c +2 -0
@@ -1343,6 +1343,8 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba) Fabric_DID); pring =lpfc_phba_elsring (phba); +if (unlikely (!pring)) +return -EIO ;/* * Check the txcmplq for an iocb that matches the nport the driver is
drivers/scsi/lpfc/lpfc_init.c +6 -1
@@ -1801,7 +1801,12 @@ lpfc_sli4_port_sta_fn_reset(struct lpfc_hba *phba, int mbx_action,lpfc_offline (phba);/* release interrupt for possible resource change */ lpfc_sli4_disable_intr (phba); -lpfc_sli_brdrestart (phba); + rc =lpfc_sli_brdrestart (phba); +if (rc) { +lpfc_printf_log (phba,KERN_ERR ,LOG_INIT , +"6309 Failed to restart board\n" ); +return rc; + }/* request and enable interrupt */ intr_mode =lpfc_sli4_enable_intr (phba, phba->intr_mode);if (intr_mode ==LPFC_INTR_ERROR ) {
drivers/scsi/lpfc/lpfc_sli.c +2 -0
@@ -4640,6 +4640,8 @@ lpfc_sli_brdrestart_s4(struct lpfc_hba *phba) hba_aer_enabled = phba->hba_flag &HBA_AER_ENABLED ; rc =lpfc_sli4_brdreset (phba); +if (rc) +return rc;spin_lock_irq (&phba->hbalock); phba->pport->stopped =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/321 scsi: lpfc: Fix dif and first burst use in write commands
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 7c4042a4d0b7532cfbc90478fd3084b2dab5849e ]
When dif and first burst is used in a write command wqe, the driver was not properly setting fields in the io command request. This resulted in no dif bytes being sent and invalid xfer_rdy's, resulting in the io being aborted by the hardware.
Correct the wqe initializaton when both dif and first burst are used.
--- drivers/scsi/lpfc/lpfc_scsi.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/scsi/lpfc/lpfc_scsi.c +18 -0
@@ -2732,6 +2732,7 @@ lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba,int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction;int prot_group_type =0 ;int fcpdl; +struct lpfc_vport *vport = phba->pport;/* * Start the lpfc command prep by bumping the bpl beyond fcp_cmnd
@@ -2837,6 +2838,14 @@ lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba,*/ iocb_cmd->un.fcpi.fcpi_parm = fcpdl; +/* +* For First burst, we may need to adjust the initial transfer +* length for DIF +*/ +if (iocb_cmd->un.fcpi.fcpi_XRdy && + (fcpdl < vport->cfg_first_burst_size)) + iocb_cmd->un.fcpi.fcpi_XRdy = fcpdl; +return 0 ; err:if (lpfc_cmd->seg_cnt)
@@ -3401,6 +3410,7 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba,int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction;int prot_group_type =0 ;int fcpdl; +struct lpfc_vport *vport = phba->pport;/* * Start the lpfc command prep by bumping the sgl beyond fcp_cmnd
@@ -3516,6 +3526,14 @@ lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba,*/ iocb_cmd->un.fcpi.fcpi_parm = fcpdl; +/* +* For First burst, we may need to adjust the initial transfer +* length for DIF +*/ +if (iocb_cmd->un.fcpi.fcpi_XRdy && + (fcpdl < vport->cfg_first_burst_size)) + iocb_cmd->un.fcpi.fcpi_XRdy = fcpdl; +/* * If the OAS driver feature is enabled and the lun is enabled for * OAS, set the oas iocb related flags.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/321 arm64: dts: marvell: armada-37xx: Enable emmc on espressobin
In reply to Greg Kroah-HartmanFrom: Ding Tao <[email protected]>
[ Upstream commit 43ebc7c1b3ed8198b9acf3019eca16e722f7331c ]
The ESPRESSObin board has a emmc interface available on U11: declare it and let the bootloader enable it if the emmc is present.
--- .../dts/marvell/armada-3720-espressobin.dts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +22 -0
@@ -60,9 +60,31 @@ cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>; marvell,pad-type = "sd"; vqmmc-supply = <&vcc_sd_reg1>; + + pinctrl-names = "default"; + pinctrl-0 = <&sdio_pins>; status = "okay"; }; +/* U11 */ +&sdhci0 { + non-removable; + bus-width = <8>; + mmc-ddr-1_8v; + mmc-hs400-1_8v; + marvell,xenon-emmc; + marvell,xenon-tun-count = <9>; + marvell,pad-type = "fixed-1-8v"; + + pinctrl-names = "default"; + pinctrl-0 = <&mmc_pins>; +/* + * This eMMC is not populated on all boards, so disable it by + * default and let the bootloader enable it, if it is present + */ + status = "disabled"; +}; + &spi0 { status = "okay";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/321 ARM: dts: Fix up SQ201 flash access
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit d88b11ef91b15d0af9c0676cbf4f441a0dff0c56 ]
This sets the partition information on the SQ201 to be read out from the RedBoot partition table, removes the static partition table and sets our boot options to mount root from /dev/mtdblock2 where the squashfs+JFFS2 resides.
--- arch/arm/boot/dts/gemini-sq201.dts | 37 ++++-------------------------- 1 file changed, 5 insertions(+), 32 deletions(-)
arch/arm/boot/dts/gemini-sq201.dts +5 -32
@@ -20,7 +20,7 @@ }; chosen { - bootargs = "console=ttyS0,115200n8"; + bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait"; stdout-path = &uart0; };
@@ -138,37 +138,10 @@ /* 16MB of flash */ reg = <0x30000000 0x01000000>; - partition@0 { - label = "RedBoot"; - reg = <0x00000000 0x00120000>; - read-only; - }; - partition@120000 { - label = "Kernel"; - reg = <0x00120000 0x00200000>; - }; - partition@320000 { - label = "Ramdisk"; - reg = <0x00320000 0x00600000>; - }; - partition@920000 { - label = "Application"; - reg = <0x00920000 0x00600000>; - }; - partition@f20000 { - label = "VCTL"; - reg = <0x00f20000 0x00020000>; - read-only; - }; - partition@f40000 { - label = "CurConf"; - reg = <0x00f40000 0x000a0000>; - read-only; - }; - partition@fe0000 { - label = "FIS directory"; - reg = <0x00fe0000 0x00020000>; - read-only; + partitions { + compatible = "redboot-fis"; + /* Eraseblock at 0xfe0000 */ + fis-index-block = <0x1fc>; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/321 tracing: Lock event_mutex before synth_event_mutex
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit fc800a10be26017f8f338bc8e500d48e3e6429d9 ]
synthetic event is using synth_event_mutex for protecting synth_event_list, and event_trigger_write() path acquires locks as below order.
event_trigger_write(event_mutex)
->trigger_process_regex(trigger_cmd_mutex)
->event_hist_trigger_func(synth_event_mutex)
On the other hand, synthetic event creation and deletion paths call trace_add_event_call() and trace_remove_event_call() which acquires event_mutex. In that case, if we keep the synth_event_mutex locked while registering/unregistering synthetic events, its dependency will be inversed.
To avoid this issue, current synthetic event is using a 2 phase process to create/delete events. For example, it searches existing events under synth_event_mutex to check for event-name conflicts, and unlocks synth_event_mutex, then registers a new event under event_mutex locked. Finally, it locks synth_event_mutex and tries to add the new event to the list. But it can introduce complexity and a chance for name conflicts.
To solve this simpler, this introduces trace_add_event_call_nolock() and trace_remove_event_call_nolock() which don't acquire event_mutex inside. synthetic event can lock event_mutex before synth_event_mutex to solve the lock dependency issue simpler.
--- include/linux/trace_events.h | 2 ++ kernel/trace/trace_events.c | 34 ++++++++++++++++++++++++++------ kernel/trace/trace_events_hist.c | 24 ++++++++++------------ 3 files changed, 40 insertions(+), 20 deletions(-)
include/linux/trace_events.h +2 -0
@@ -529,6 +529,8 @@ extern int trace_event_raw_init(struct trace_event_call *call);extern int trace_define_field (struct trace_event_call *call,const char *type,const char *name,int offset,int size,int is_signed,int filter_type); +extern int trace_add_event_call_nolock (struct trace_event_call *call); +extern int trace_remove_event_call_nolock (struct trace_event_call *call);extern int trace_add_event_call (struct trace_event_call *call);extern int trace_remove_event_call (struct trace_event_call *call);extern int trace_event_get_offsets (struct trace_event_call *call);
kernel/trace/trace_events.c +28 -6
@@ -2302,11 +2302,11 @@ __trace_early_add_new_event(struct trace_event_call *call,struct ftrace_module_file_ops ;static void __add_event_to_tracers (struct trace_event_call *call); -/* Add an additional event_call dynamically */ -int trace_add_event_call (struct trace_event_call *call) +int trace_add_event_call_nolock (struct trace_event_call *call) {int ret; -mutex_lock (&event_mutex); +lockdep_assert_held (&event_mutex); +mutex_lock (&trace_types_lock); ret =__register_event (call,NULL );
@@ -2314,6 +2314,16 @@ int trace_add_event_call(struct trace_event_call *call)__add_event_to_tracers (call);mutex_unlock (&trace_types_lock); +return ret; +} + +/* Add an additional event_call dynamically */ +int trace_add_event_call (struct trace_event_call *call) +{ +int ret; + +mutex_lock (&event_mutex); + ret =trace_add_event_call_nolock (call);mutex_unlock (&event_mutex);return ret; }
@@ -2363,17 +2373,29 @@ static int probe_remove_event_call(struct trace_event_call *call)return 0 ; } -/* Remove an event_call */ -int trace_remove_event_call (struct trace_event_call *call) +/* no event_mutex version */ +int trace_remove_event_call_nolock (struct trace_event_call *call) {int ret; -mutex_lock (&event_mutex); +lockdep_assert_held (&event_mutex); +mutex_lock (&trace_types_lock);down_write (&trace_event_sem); ret =probe_remove_event_call (call);up_write (&trace_event_sem);mutex_unlock (&trace_types_lock); + +return ret; +} + +/* Remove an event_call */ +int trace_remove_event_call (struct trace_event_call *call) +{ +int ret; + +mutex_lock (&event_mutex); + ret =trace_remove_event_call_nolock (call);mutex_unlock (&event_mutex);return ret;
kernel/trace/trace_events_hist.c +10 -14
@@ -914,7 +914,7 @@ static int register_synth_event(struct synth_event *event) call->data = event; call->tp = event->tp; - ret =trace_add_event_call (call); + ret =trace_add_event_call_nolock (call);if (ret) {pr_warn ("Failed to register synthetic event: %s\n" ,trace_event_name (call));
@@ -938,7 +938,7 @@ static int unregister_synth_event(struct synth_event *event)struct trace_event_call *call = &event->call;int ret; - ret =trace_remove_event_call (call); + ret =trace_remove_event_call_nolock (call);return ret; }
@@ -1015,12 +1015,10 @@ static void add_or_delete_synth_event(struct synth_event *event, int delete)if (delete)free_synth_event (event);else { -mutex_lock (&synth_event_mutex);if (!find_synth_event (event->name))list_add (&event->list, &synth_event_list);else free_synth_event (event); -mutex_unlock (&synth_event_mutex); } }
@@ -1032,6 +1030,7 @@ static int create_synth_event(int argc, char **argv)int i, consumed =0 , n_fields =0 , ret =0 ;char *name; +mutex_lock (&event_mutex);mutex_lock (&synth_event_mutex);/*
@@ -1104,8 +1103,6 @@ static int create_synth_event(int argc, char **argv) goto err; } out: -mutex_unlock (&synth_event_mutex); -if (event) {if (delete_event) { ret =unregister_synth_event (event);
@@ -1115,10 +1112,13 @@ static int create_synth_event(int argc, char **argv)add_or_delete_synth_event (event, ret); } } +mutex_unlock (&synth_event_mutex); +mutex_unlock (&event_mutex);return ret; err:mutex_unlock (&synth_event_mutex); +mutex_unlock (&event_mutex);for (i =0 ; i < n_fields; i++)free_synth_field (fields[i]);
@@ -1129,12 +1129,10 @@ static int create_synth_event(int argc, char **argv)static int release_all_synth_events (void ) { -struct list_head release_events;struct synth_event *event, *e;int ret =0 ; -INIT_LIST_HEAD (&release_events); - +mutex_lock (&event_mutex);mutex_lock (&synth_event_mutex);list_for_each_entry (event, &synth_event_list, list) {
@@ -1144,16 +1142,14 @@ static int release_all_synth_events(void) } } -list_splice_init (&event->list, &release_events); - -mutex_unlock (&synth_event_mutex); - -list_for_each_entry_safe (event, e, &release_events, list) { +list_for_each_entry_safe (event, e, &synth_event_list, list) {list_del (&event->list); ret =unregister_synth_event (event);add_or_delete_synth_event (event, !ret); } +mutex_unlock (&synth_event_mutex); +mutex_unlock (&event_mutex);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/321 ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 7c41ea57beb2aee96fa63091a457b1a2826f3c42 ]
If debugging on i.MX is enabled DEBUG_IMX_UART_PORT defines which UART is used for the debug output. If however debugging is off don't only hide the then unused config item but drop it completely by using a dependency instead of a conditional prompt.
This fixes DEBUG_IMX_UART_PORT being present in the kernel config even if DEBUG_LL is disabled.
--- arch/arm/Kconfig.debug | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm/Kconfig.debug +14 -14
@@ -1432,21 +1432,21 @@ config DEBUG_OMAP2PLUS_UART depends on ARCH_OMAP2PLUS config DEBUG_IMX_UART_PORT - int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \ - DEBUG_IMX25_UART || \ - DEBUG_IMX21_IMX27_UART || \ - DEBUG_IMX31_UART || \ - DEBUG_IMX35_UART || \ - DEBUG_IMX50_UART || \ - DEBUG_IMX51_UART || \ - DEBUG_IMX53_UART || \ - DEBUG_IMX6Q_UART || \ - DEBUG_IMX6SL_UART || \ - DEBUG_IMX6SX_UART || \ - DEBUG_IMX6UL_UART || \ - DEBUG_IMX7D_UART + int "i.MX Debug UART Port Selection" + depends on DEBUG_IMX1_UART || \ + DEBUG_IMX25_UART || \ + DEBUG_IMX21_IMX27_UART || \ + DEBUG_IMX31_UART || \ + DEBUG_IMX35_UART || \ + DEBUG_IMX50_UART || \ + DEBUG_IMX51_UART || \ + DEBUG_IMX53_UART || \ + DEBUG_IMX6Q_UART || \ + DEBUG_IMX6SL_UART || \ + DEBUG_IMX6SX_UART || \ + DEBUG_IMX6UL_UART || \ + DEBUG_IMX7D_UART default 1 - depends on ARCH_MXC help Choose UART port on which kernel low-level debug messages should be output.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/321 ARM: dts: imx51: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 6a9681168b83c62abfa457c709f2f4b126bd6b92 ]
Boards based on imx51 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx51.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx51-apf51.dts | 1 + arch/arm/boot/dts/imx51-babbage.dts | 1 + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 + arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 1 + arch/arm/boot/dts/imx51-ts4800.dts | 1 + arch/arm/boot/dts/imx51-zii-rdu1.dts | 1 + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 1 + arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 + arch/arm/boot/dts/imx51.dtsi | 2 -- 9 files changed, 8 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx51-apf51.dts +1 -0
@@ -22,6 +22,7 @@ compatible = "armadeus,imx51-apf51", "fsl,imx51"; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x20000000>; };
arch/arm/boot/dts/imx51-babbage.dts +1 -0
@@ -15,6 +15,7 @@ }; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x20000000>; };
arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi +1 -0
@@ -17,6 +17,7 @@ compatible = "digi,connectcore-ccxmx51-som", "fsl,imx51"; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x08000000>; }; };
arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi +1 -0
@@ -23,6 +23,7 @@ compatible = "eukrea,cpuimx51", "fsl,imx51"; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x10000000>; /* 256M */ }; };
arch/arm/boot/dts/imx51-ts4800.dts +1 -0
@@ -18,6 +18,7 @@ }; memory@90000000 { + device_type = "memory"; reg = <0x90000000 0x10000000>; };
arch/arm/boot/dts/imx51-zii-rdu1.dts +1 -0
@@ -53,6 +53,7 @@ /* Will be filled by the bootloader */ memory@90000000 { + device_type = "memory"; reg = <0x90000000 0>; };
arch/arm/boot/dts/imx51-zii-scu2-mezz.dts +1 -0
@@ -18,6 +18,7 @@ /* Will be filled by the bootloader */ memory@90000000 { + device_type = "memory"; reg = <0x90000000 0>; };
arch/arm/boot/dts/imx51-zii-scu3-esb.dts +1 -0
@@ -18,6 +18,7 @@ /* Will be filled by the bootloader */ memory@90000000 { + device_type = "memory"; reg = <0x90000000 0>; };
arch/arm/boot/dts/imx51.dtsi +0 -2
@@ -16,10 +16,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/321 ARM: dts: imx53: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit e8fd17b900a4a1e3a8bef7b44727cbad35db05a7 ]
Boards based on imx53 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx53.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx53-ard.dts | 1 + arch/arm/boot/dts/imx53-cx9020.dts | 1 + arch/arm/boot/dts/imx53-m53.dtsi | 1 + arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 + arch/arm/boot/dts/imx53-smd.dts | 1 + arch/arm/boot/dts/imx53-tqma53.dtsi | 1 + arch/arm/boot/dts/imx53-tx53.dtsi | 1 + arch/arm/boot/dts/imx53-usbarmory.dts | 1 + arch/arm/boot/dts/imx53.dtsi | 2 -- 9 files changed, 8 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx53-ard.dts +1 -0
@@ -19,6 +19,7 @@ compatible = "fsl,imx53-ard", "fsl,imx53"; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x40000000>; };
arch/arm/boot/dts/imx53-cx9020.dts +1 -0
@@ -22,6 +22,7 @@ }; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x20000000>, <0xb0000000 0x20000000>; };
arch/arm/boot/dts/imx53-m53.dtsi +1 -0
@@ -16,6 +16,7 @@ compatible = "aries,imx53-m53", "denx,imx53-m53", "fsl,imx53"; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x20000000>, <0xb0000000 0x20000000>; };
arch/arm/boot/dts/imx53-qsb-common.dtsi +1 -0
@@ -11,6 +11,7 @@ }; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x20000000>, <0xb0000000 0x20000000>; };
arch/arm/boot/dts/imx53-smd.dts +1 -0
@@ -12,6 +12,7 @@ compatible = "fsl,imx53-smd", "fsl,imx53"; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x40000000>; };
arch/arm/boot/dts/imx53-tqma53.dtsi +1 -0
@@ -17,6 +17,7 @@ compatible = "tq,tqma53", "fsl,imx53"; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x40000000>; /* Up to 1GiB */ };
arch/arm/boot/dts/imx53-tx53.dtsi +1 -0
@@ -51,6 +51,7 @@ /* Will be filled by the bootloader */ memory@70000000 { + device_type = "memory"; reg = <0x70000000 0>; };
arch/arm/boot/dts/imx53-usbarmory.dts +1 -0
@@ -58,6 +58,7 @@ }; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x20000000>; };
arch/arm/boot/dts/imx53.dtsi +0 -2
@@ -23,10 +23,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/321 ARM: dts: imx31: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 013d37e4707e24c7b9bc3fc55aeda55ce9c2b262 ]
Boards based on imx31 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx31.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx31-bug.dts | 1 + arch/arm/boot/dts/imx31-lite.dts | 1 + arch/arm/boot/dts/imx31.dtsi | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx31-bug.dts +1 -0
@@ -17,6 +17,7 @@ compatible = "buglabs,imx31-bug", "fsl,imx31"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x8000000>; /* 128M */ }; };
arch/arm/boot/dts/imx31-lite.dts +1 -0
@@ -18,6 +18,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x8000000>; };
arch/arm/boot/dts/imx31.dtsi +0 -2
@@ -10,10 +10,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { gpio0 = &gpio1;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/321 ARM: dts: imx35: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 8721610a6c2b8c42fc57819d8c3bfbb9166f95a3 ]
Boards based on imx35 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx35.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 1 + arch/arm/boot/dts/imx35-pdk.dts | 1 + arch/arm/boot/dts/imx35.dtsi | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi +1 -0
@@ -18,6 +18,7 @@ compatible = "eukrea,cpuimx35", "fsl,imx35"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x8000000>; /* 128M */ }; };
arch/arm/boot/dts/imx35-pdk.dts +1 -0
@@ -11,6 +11,7 @@ compatible = "fsl,imx35-pdk", "fsl,imx35"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x8000000>, <0x90000000 0x8000000>; };
arch/arm/boot/dts/imx35.dtsi +0 -2
@@ -13,10 +13,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/321 ARM: dts: imx7: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 29988e867cb17de7119e971f9acfad2c3fccdb47 ]
Boards based on imx7 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx7s.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 3 ++- arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + arch/arm/boot/dts/imx7d-colibri.dtsi | 1 + arch/arm/boot/dts/imx7d-nitrogen7.dts | 1 + arch/arm/boot/dts/imx7d-pico.dtsi | 1 + arch/arm/boot/dts/imx7d-sdb.dts | 1 + arch/arm/boot/dts/imx7s-colibri.dtsi | 1 + arch/arm/boot/dts/imx7s-warp.dts | 1 + arch/arm/boot/dts/imx7s.dtsi | 2 -- 9 files changed, 9 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +2 -1
@@ -19,6 +19,7 @@ compatible = "compulab,cl-som-imx7", "fsl,imx7d"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */ };
@@ -284,4 +285,4 @@ MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */ >; }; -}; +};
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +1 -0
@@ -8,6 +8,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; };
arch/arm/boot/dts/imx7d-colibri.dtsi +1 -0
@@ -45,6 +45,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; };
arch/arm/boot/dts/imx7d-nitrogen7.dts +1 -0
@@ -12,6 +12,7 @@ compatible = "boundary,imx7d-nitrogen7", "fsl,imx7d"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/imx7d-pico.dtsi +1 -0
@@ -49,6 +49,7 @@ compatible = "technexion,imx7d-pico", "fsl,imx7d"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; };
arch/arm/boot/dts/imx7d-sdb.dts +1 -0
@@ -15,6 +15,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; };
arch/arm/boot/dts/imx7s-colibri.dtsi +1 -0
@@ -45,6 +45,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x10000000>; }; };
arch/arm/boot/dts/imx7s-warp.dts +1 -0
@@ -51,6 +51,7 @@ compatible = "warp,imx7s-warp", "fsl,imx7s"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/imx7s.dtsi +0 -2
@@ -17,10 +17,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { gpio0 = &gpio1;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/321 ARM: dts: imx6ul: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 750d8df6e7b269b828f66631a1d39ea027afc92a ]
Boards based on imx6ul have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6ul.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 1 + arch/arm/boot/dts/imx6ul-geam.dts | 1 + arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 + arch/arm/boot/dts/imx6ul-litesom.dtsi | 1 + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 1 + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 1 + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 + arch/arm/boot/dts/imx6ul.dtsi | 2 -- arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 1 + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 + 10 files changed, 9 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +1 -0
@@ -12,6 +12,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/imx6ul-geam.dts +1 -0
@@ -51,6 +51,7 @@ compatible = "engicam,imx6ul-geam", "fsl,imx6ul"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x08000000>; };
arch/arm/boot/dts/imx6ul-isiot.dtsi +1 -0
@@ -46,6 +46,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/imx6ul-litesom.dtsi +1 -0
@@ -48,6 +48,7 @@ compatible = "grinn,imx6ul-litesom", "fsl,imx6ul"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; };
arch/arm/boot/dts/imx6ul-opos6ul.dtsi +1 -0
@@ -49,6 +49,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0>; /* will be filled by U-Boot */ };
arch/arm/boot/dts/imx6ul-pico-hobbit.dts +1 -0
@@ -53,6 +53,7 @@ /* Will be filled by the bootloader */ memory@80000000 { + device_type = "memory"; reg = <0x80000000 0>; };
arch/arm/boot/dts/imx6ul-tx6ul.dtsi +1 -0
@@ -71,6 +71,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0>; /* will be filled by U-Boot */ };
arch/arm/boot/dts/imx6ul.dtsi +0 -2
@@ -15,10 +15,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec1;
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +1 -0
@@ -7,6 +7,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x10000000>; }; };
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +1 -0
@@ -7,6 +7,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/321 ARM: dts: imx6sx: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 216f35fedd8688c8b654ebfbad18c6e64713fad7 ]
Boards based on imx6sx have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6sx.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 + arch/arm/boot/dts/imx6sx-sabreauto.dts | 1 + arch/arm/boot/dts/imx6sx-sdb.dtsi | 1 + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 1 + arch/arm/boot/dts/imx6sx.dtsi | 2 -- 8 files changed, 7 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6sx-nitrogen6sx.dts +1 -0
@@ -12,6 +12,7 @@ compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/imx6sx-sabreauto.dts +1 -0
@@ -11,6 +11,7 @@ compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; };
arch/arm/boot/dts/imx6sx-sdb.dtsi +1 -0
@@ -21,6 +21,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/imx6sx-softing-vining-2000.dts +1 -0
@@ -21,6 +21,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts +1 -0
@@ -49,6 +49,7 @@ compatible = "udoo,neobasic", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; };
arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +1 -0
@@ -49,6 +49,7 @@ compatible = "udoo,neoextended", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; };
arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +1 -0
@@ -49,6 +49,7 @@ compatible = "udoo,neofull", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; };
arch/arm/boot/dts/imx6sx.dtsi +0 -2
@@ -15,10 +15,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { can0 = &flexcan1;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/321 ARM: dts: imx6sl: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 7fa8ab65ee15e386558ac5e971004712da91e2dd ]
Boards based on imx6sl have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx6sl.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx6sl-evk.dts | 1 + arch/arm/boot/dts/imx6sl-warp.dts | 1 + arch/arm/boot/dts/imx6sl.dtsi | 2 -- arch/arm/boot/dts/imx6sll-evk.dts | 1 + 4 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6sl-evk.dts +1 -0
@@ -17,6 +17,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/imx6sl-warp.dts +1 -0
@@ -55,6 +55,7 @@ compatible = "warp,imx6sl-warp", "fsl,imx6sl"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/imx6sl.dtsi +0 -2
@@ -13,10 +13,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
arch/arm/boot/dts/imx6sll-evk.dts +1 -0
@@ -20,6 +20,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/321 ARM: dts: imx50: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit aab5e3ea95b958cf22a24e756a84e635bdb081c1 ]
imx50-evk has duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx50.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx50-evk.dts | 1 + arch/arm/boot/dts/imx50.dtsi | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/imx50-evk.dts +1 -0
@@ -12,6 +12,7 @@ compatible = "fsl,imx50-evk", "fsl,imx50"; memory@70000000 { + device_type = "memory"; reg = <0x70000000 0x80000000>; }; };
arch/arm/boot/dts/imx50.dtsi +0 -2
@@ -22,10 +22,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/321 ARM: dts: imx23: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit b629e83520fafe6f4c2f3e8c88c78a496fc4987c ]
Boards based on imx23 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx23.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx23-evk.dts | 1 + arch/arm/boot/dts/imx23-olinuxino.dts | 1 + arch/arm/boot/dts/imx23-sansa.dts | 1 + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 1 + arch/arm/boot/dts/imx23-xfi3.dts | 1 + arch/arm/boot/dts/imx23.dtsi | 2 -- 6 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx23-evk.dts +1 -0
@@ -10,6 +10,7 @@ compatible = "fsl,imx23-evk", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; };
arch/arm/boot/dts/imx23-olinuxino.dts +1 -0
@@ -20,6 +20,7 @@ compatible = "olimex,imx23-olinuxino", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; };
arch/arm/boot/dts/imx23-sansa.dts +1 -0
@@ -50,6 +50,7 @@ compatible = "sandisk,sansa_fuze_plus", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; };
arch/arm/boot/dts/imx23-stmp378x_devb.dts +1 -0
@@ -17,6 +17,7 @@ compatible = "fsl,stmp378x-devb", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; };
arch/arm/boot/dts/imx23-xfi3.dts +1 -0
@@ -49,6 +49,7 @@ compatible = "creative,x-fi3", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; };
arch/arm/boot/dts/imx23.dtsi +0 -2
@@ -13,10 +13,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { gpio0 = &gpio0;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/321 ARM: dts: imx1: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 62864d5665c4fc636d3021f829b3ac00fa058e30 ]
Boards based on imx1 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx1.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx1-ads.dts | 1 + arch/arm/boot/dts/imx1-apf9328.dts | 1 + arch/arm/boot/dts/imx1.dtsi | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx1-ads.dts +1 -0
@@ -21,6 +21,7 @@ }; memory@8000000 { + device_type = "memory"; reg = <0x08000000 0x04000000>; }; };
arch/arm/boot/dts/imx1-apf9328.dts +1 -0
@@ -21,6 +21,7 @@ }; memory@8000000 { + device_type = "memory"; reg = <0x08000000 0x00800000>; }; };
arch/arm/boot/dts/imx1.dtsi +0 -2
@@ -15,10 +15,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { gpio0 = &gpio1;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/321 ARM: dts: imx27: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 38715dcd49b4430ac5b6bc1293278d91a4d32bd5 ]
Boards based on imx27 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx27.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx27-apf27.dts | 1 + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 1 + arch/arm/boot/dts/imx27-pdk.dts | 1 + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 + arch/arm/boot/dts/imx27.dtsi | 2 -- 6 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx27-apf27.dts +1 -0
@@ -20,6 +20,7 @@ compatible = "armadeus,imx27-apf27", "fsl,imx27"; memory@a0000000 { + device_type = "memory"; reg = <0xa0000000 0x04000000>; }; };
arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi +1 -0
@@ -17,6 +17,7 @@ compatible = "eukrea,cpuimx27", "fsl,imx27"; memory@a0000000 { + device_type = "memory"; reg = <0xa0000000 0x04000000>; };
arch/arm/boot/dts/imx27-pdk.dts +1 -0
@@ -10,6 +10,7 @@ compatible = "fsl,imx27-pdk", "fsl,imx27"; memory@a0000000 { + device_type = "memory"; reg = <0xa0000000 0x08000000>; };
arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi +1 -0
@@ -18,6 +18,7 @@ compatible = "phytec,imx27-pca100", "fsl,imx27"; memory@a0000000 { + device_type = "memory"; reg = <0xa0000000 0x08000000>; /* 128MB */ }; };
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi +1 -0
@@ -17,6 +17,7 @@ compatible = "phytec,imx27-pcm038", "fsl,imx27"; memory@a0000000 { + device_type = "memory"; reg = <0xa0000000 0x08000000>; };
arch/arm/boot/dts/imx27.dtsi +0 -2
@@ -16,10 +16,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/321 ARM: dts: imx25: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 59d8bb363f563e4a147a291037bf979cb8ff9a59 ]
Boards based on imx25 have duplicate memory nodes:
- One coming from the board dts file: memory@
- One coming from the imx25.dtsi file.
Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts.
--- arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 1 + arch/arm/boot/dts/imx25-karo-tx25.dts | 1 + arch/arm/boot/dts/imx25-pdk.dts | 1 + arch/arm/boot/dts/imx25.dtsi | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi +1 -0
@@ -18,6 +18,7 @@ compatible = "eukrea,cpuimx25", "fsl,imx25"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x4000000>; /* 64M */ }; };
arch/arm/boot/dts/imx25-karo-tx25.dts +1 -0
@@ -37,6 +37,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x02000000 0x90000000 0x02000000>; }; };
arch/arm/boot/dts/imx25-pdk.dts +1 -0
@@ -12,6 +12,7 @@ compatible = "fsl,imx25-pdk", "fsl,imx25"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x4000000>; };
arch/arm/boot/dts/imx25.dtsi +0 -2
@@ -12,10 +12,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/321 ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 998a84c27a7f3f9133d32af64e19c05cec161a1a ]
imx53-voipac-dmm-668 has two memory nodes, but the correct representation would be to use a single one with two reg entries - one for each RAM chip select, so fix it accordingly.
--- arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi +2 -6
@@ -17,12 +17,8 @@ memory@70000000 { device_type = "memory"; - reg = <0x70000000 0x20000000>; - }; - - memory@b0000000 { - device_type = "memory"; - reg = <0xb0000000 0x20000000>; + reg = <0x70000000 0x20000000>, + <0xb0000000 0x20000000>; }; regulators {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/321 parisc: Fix serio address output
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit 785145171d17af2554128becd6a7c8f89e101141 ]
We want the hpa addresses printed in the serio modules, not some virtual ioremap()ed address, e.g.:
serio: gsc-ps2-keyboard port at 0xf0108000 irq 22 @ 2:0:11
serio: gsc-ps2-mouse port at 0xf0108100 irq 22 @ 2:0:12
--- drivers/input/serio/gscps2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/serio/gscps2.c +2 -2
@@ -381,9 +381,9 @@ static int __init gscps2_probe(struct parisc_device *dev) goto fail;#endif -printk (KERN_INFO "serio: %s port at 0x%p irq %d @ %s\n" , +pr_info ("serio: %s port at 0x%08lx irq %d @ %s\n" , ps2port->port->name, - ps2port->addr, + hpa, ps2port->padev->irq, ps2port->port->phys);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/321 parisc: Fix HP SDC hpa address output
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
[ Upstream commit c4bff35ca1bfba886da6223c9fed76a2b1382b8e ]
Show the hpa address of the HP SDC instead of a hashed value, e.g.:
HP SDC: HP SDC at 0xf0201000, IRQ 23 (NMI IRQ 24)
--- drivers/input/serio/hp_sdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/serio/hp_sdc.c +2 -2
@@ -884,8 +884,8 @@ static int __init hp_sdc_init(void) "HP SDC NMI", &hp_sdc)) goto err2; - printk(KERN_INFO PREFIX "HP SDC at 0x%p, IRQ %d (NMI IRQ %d)\n", - (void *)hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi); +pr_info (PREFIX "HP SDC at 0x%08lx, IRQ %d (NMI IRQ %d)\n" , + hp_sdc.base_io, hp_sdc.irq, hp_sdc.nmi);hp_sdc_status_in8 ();hp_sdc_data_in8 ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/321 ARM: dts: Fix hsi gdd range for omap4
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit e9e685480b74aef3f3d0967dadb52eea3ff625d2 ]
While reviewing the missing mcasp ranges I noticed omap4 hsi range for gdd is wrong so let's fix it.
I'm not aware of any omap4 devices in mainline kernel though that use hsi though.
them with ti-sysc")
--- arch/arm/boot/dts/omap4-l4.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap4-l4.dtsi +2 -2
@@ -196,12 +196,12 @@ clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x58000 0x4000>; + ranges = <0x0 0x58000 0x5000>; hsi: hsi@0 { compatible = "ti,omap4-hsi"; reg = <0x0 0x4000>, - <0x4a05c000 0x1000>; + <0x5000 0x1000>; reg-names = "sys", "gdd"; clocks = <&l3_init_clkctrl OMAP4_HSI_CLKCTRL 0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/321 arm64: mm: Prevent mismatched 52-bit VA support
In reply to Greg Kroah-HartmanFrom: Steve Capper <[email protected]>
[ Upstream commit a96a33b1ca57dbea4285893dedf290aeb8eb090b ]
For cases where there is a mismatch in ARMv8.2-LVA support between CPUs we have to be careful in allowing secondary CPUs to boot if 52-bit virtual addresses have already been enabled on the boot CPU.
This patch adds code to the secondary startup path. If the boot CPU has enabled 52-bit VAs then ID_AA64MMFR2_EL1 is checked to see if the secondary can also enable 52-bit support. If not, the secondary is prevented from booting and an error message is displayed indicating why.
Technically this patch could be implemented using the cpufeature code when considering 52-bit userspace support. However, we employ low level checks here as the cpufeature code won't be able to run if we have mismatched 52-bit kernel va support.
--- arch/arm64/kernel/head.S | 26 ++++++++++++++++++++++++++ arch/arm64/kernel/smp.c | 5 +++++ 2 files changed, 31 insertions(+)
arch/arm64/kernel/head.S +26 -0
@@ -703,6 +703,7 @@ secondary_startup: /* * Common entry point for secondary CPUs. */ + bl __cpu_secondary_check52bitva bl __cpu_setup // initialise processor bl __enable_mmu ldr x8, =__secondary_switched
@@ -779,6 +780,31 @@ ENTRY(__enable_mmu) ret ENDPROC(__enable_mmu) +ENTRY(__cpu_secondary_check52bitva) +#ifdef CONFIG_ARM64_52BIT_VA + ldr_l x0, vabits_user + cmp x0, #52 + b.ne 2f + + mrs_s x0, SYS_ID_AA64MMFR2_EL1 + and x0, x0, #(0xf << ID_AA64MMFR2_LVA_SHIFT) + cbnz x0, 2f + + adr_l x0, va52mismatch + mov w1, #1 + strb w1, [x0] + dmb sy + dc ivac, x0 // Invalidate potentially stale cache line + + update_early_cpu_boot_status CPU_STUCK_IN_KERNEL, x0, x1 +1: wfe + wfi + b 1b + +#endif +2: ret +ENDPROC(__cpu_secondary_check52bitva) + __no_granule_support: /* Indicate that this CPU can't boot and is stuck in the kernel */ update_early_cpu_boot_status CPU_STUCK_IN_KERNEL, x1, x2
arch/arm64/kernel/smp.c +5 -0
@@ -108,6 +108,7 @@ static int boot_secondary(unsigned int cpu, struct task_struct *idle) }static DECLARE_COMPLETION (cpu_running); +bool va52mismatch__ro_after_init ;int __cpu_up (unsigned int cpu,struct task_struct *idle) {
@@ -137,6 +138,10 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle)if (!cpu_online (cpu)) {pr_crit ("CPU%u: failed to come online\n" , cpu); + +if (IS_ENABLED (CONFIG_ARM64_52BIT_VA ) && va52mismatch) +pr_crit ("CPU%u: does not support 52-bit VAs\n" , cpu); + ret = -EIO ; } }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/321 arm64: smp: Handle errors reported by the firmware
In reply to Greg Kroah-HartmanFrom: Suzuki K Poulose <[email protected]>
[ Upstream commit f357b3a7e17af7736d67d8267edc1ed3d1dd9391 ]
The __cpu_up() routine ignores the errors reported by the firmware for a CPU bringup operation and looks for the error status set by the booting CPU. If the CPU never entered the kernel, we could end up in assuming stale error status, which otherwise would have been set/cleared appropriately by the booting CPU.
--- arch/arm64/kernel/smp.c | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kernel/smp.c +1 -0
@@ -146,6 +146,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) } }else {pr_err ("CPU%u: failed to boot: %d\n" , cpu, ret); +return ret; } secondary_data.task =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/321 bus: ti-sysc: Check for no-reset and no-idle flags at the child level
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 4014c08ba39476a18af546186da625a6833a1529 ]
With ti-sysc, we need to now have the device tree properties for ti,no-reset-on-init and ti,no-idle-on-init at the module level instead of the child device level.
Let's check for these properties at the child device level to enable quirks, and warn about moving the properties to the module level.
Otherwise am335x-evm based boards tagging gpio1 with ti,no-reset-on-init will have their DDR power disabled if wired up in such a tricky way.
Note that this should not be an issue for earlier kernels as we don't rely on this until the dts files have been updated to probe with ti-sysc interconnect target driver.
--- drivers/bus/ti-sysc.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
drivers/bus/ti-sysc.c +25 -7
@@ -91,6 +91,9 @@ struct sysc {struct delayed_work idle_work; }; +static void sysc_parse_dts_quirks (struct sysc *ddata,struct device_node *np, +bool is_child); +void sysc_write (struct sysc *ddata,int offset,u32 value) {writel_relaxed (value, ddata->module_va + offset);
@@ -374,6 +377,7 @@ static int sysc_check_one_child(struct sysc *ddata,dev_warn (ddata->dev,"really a child ti,hwmods property?" );sysc_check_quirk_stdout (ddata, np); +sysc_parse_dts_quirks (ddata, np, true);return 0 ; }
@@ -1343,23 +1347,37 @@ static const struct sysc_dts_quirk sysc_dts_quirks[] = { .mask = SYSC_QUIRK_NO_RESET_ON_INIT, }, }; -static int sysc_init_dts_quirks (struct sysc *ddata) +static void sysc_parse_dts_quirks (struct sysc *ddata,struct device_node *np, +bool is_child) { -struct device_node *np = ddata->dev->of_node;const struct property *prop; -int i, len, error; -u32 val; - - ddata->legacy_mode =of_get_property (np,"ti,hwmods" ,NULL ); +int i, len;for (i =0 ; i <ARRAY_SIZE (sysc_dts_quirks); i++) { - prop =of_get_property (np, sysc_dts_quirks[i].name, &len); +const char *name = sysc_dts_quirks[i].name; + + prop =of_get_property (np, name, &len);if (!prop)continue ; ddata->cfg.quirks |= sysc_dts_quirks[i].mask; +if (is_child) { +dev_warn (ddata->dev, +"dts flag should be at module level for %s\n" , + name); + } } +} + +static int sysc_init_dts_quirks (struct sysc *ddata) +{ +struct device_node *np = ddata->dev->of_node; +int error; +u32 val; + + ddata->legacy_mode =of_get_property (np,"ti,hwmods" ,NULL ); +sysc_parse_dts_quirks (ddata, np, false); error =of_property_read_u32 (np,"ti,sysc-delay-us" , &val);if (!error) {if (val >255 ) {
Signature · 1 line
2.20.1
Re: [PATCH 4.19 073/321] bus: ti-sysc: Check for no-reset and no-idle flags at the child level
Quoted 11 lines · Greg Kroah-Hartman
From: Tony Lindgren <[email protected]>
[ Upstream commit
4014c08ba39476a18af546186da625a6833a1529]With ti-sysc, we need to now have the device tree properties for ti,no-reset-on-init and ti,no-idle-on-init at the module level instead of the child device level.
Let's check for these properties at the child device level to enable quirks, and warn about moving the properties to the module level.
Quoted 6 lines
Otherwise am335x-evm based boards tagging gpio1 with ti,no-reset-on-init will have their DDR power disabled if wired up in such a tricky way.
Note that this should not be an issue for earlier kernels as we don't rely on this until the dts files have been updated to probe with ti-sysc interconnect target driver.
This is queued for 4.19-stable, but the comment seems to say it is not needed in the older kernels.
Tony, do we want this in 4.19?
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 073/321] bus: ti-sysc: Check for no-reset and no-idle flags at the child level
Quoted 15 lines · Pavel Machek
Quoted 14 lines · Greg Kroah-Hartman
From: Tony Lindgren <[email protected]>
[ Upstream commit
4014c08ba39476a18af546186da625a6833a1529]With ti-sysc, we need to now have the device tree properties for ti,no-reset-on-init and ti,no-idle-on-init at the module level instead of the child device level.
Let's check for these properties at the child device level to enable quirks, and warn about moving the properties to the module level.
Otherwise am335x-evm based boards tagging gpio1 with ti,no-reset-on-init will have their DDR power disabled if wired up in such a tricky way.
Quoted 8 lines
Quoted 3 lines
Note that this should not be an issue for earlier kernels as we don't rely on this until the dts files have been updated to probe with ti-sysc interconnect target driver.
This is queued for 4.19-stable, but the comment seems to say it is not needed in the older kernels.
Tony, do we want this in 4.19?
Correct, it should not be needed as the related devicetree are not in earlier kernels and I doubt anybody is going to use a newer devicetree with v4.19.
I guess one usecase could be to enable more of the accelerators for v4.19, but that work is still ongoing in the mainline kernel and would require quite a bit backporting with the reset and clock driver changes.
So yeah this one can be dropped for earlier kernels.
Regards,
Tony
Greg Kroah-Hartman
maintainerPATCH 74/321 platform/x86: mlx-platform: Fix LED configuration
In reply to Greg Kroah-HartmanFrom: Vadim Pasternak <[email protected]>
[ Upstream commit 440f343df1996302d9a3904647ff11b689bf27bc ]
Exchange LED configuration between msn201x and next generation systems types.
Bug was introduced when LED driver activation was added to mlx-platform. LED configuration for the three new system MQMB7, MSN37, MSN34 was assigned to MSN21 and vice versa. This bug affects MSN21 only and likely requires backport to v4.19.
--- drivers/platform/x86/mlx-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/mlx-platform.c +2 -2
@@ -1421,7 +1421,7 @@ static int __init mlxplat_dmi_msn201x_matched(const struct dmi_system_id *dmi) mlxplat_hotplug = &mlxplat_mlxcpld_msn201x_data; mlxplat_hotplug->deferred_nr = mlxplat_default_channels[i -1 ][MLXPLAT_CPLD_GRP_CHNL_NUM -1 ]; - mlxplat_led = &mlxplat_default_ng_led_data; + mlxplat_led = &mlxplat_msn21xx_led_data; mlxplat_regs_io = &mlxplat_msn21xx_regs_io_data;return 1 ;
@@ -1439,7 +1439,7 @@ static int __init mlxplat_dmi_qmb7xx_matched(const struct dmi_system_id *dmi) mlxplat_hotplug = &mlxplat_mlxcpld_default_ng_data; mlxplat_hotplug->deferred_nr = mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM -1 ]; - mlxplat_led = &mlxplat_msn21xx_led_data; + mlxplat_led = &mlxplat_default_ng_led_data; mlxplat_fan = &mlxplat_default_fan_data;return 1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/321 ARM: OMAP1: fix USB configuration for device-only setups
In reply to Greg Kroah-HartmanFrom: Aaro Koskinen <[email protected]>
[ Upstream commit c7b7b5cbd0c859b1546a5a3455d457708bdadf4c ]
Currently we do USB configuration only if the host mode (CONFIG_USB) is enabled. But it should be done also in the case of device-only setups, so change the condition to CONFIG_USB_SUPPORT. This allows to use omap_udc on Palm Tungsten E.
--- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/include/mach/usb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap1/Makefile +1 -1
@@ -25,7 +25,7 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) led-y := leds.o -usb-fs-$(CONFIG_USB) := usb.o +usb-fs-$(CONFIG_USB_SUPPORT) := usb.o obj-y += $(usb-fs-m) $(usb-fs-y) # Specific board support
arch/arm/mach-omap1/include/mach/usb.h +1 -1
@@ -11,7 +11,7 @@#include <linux/platform_data/usb-omap1.h> -#if IS_ENABLED (CONFIG_USB ) +#if IS_ENABLED (CONFIG_USB_SUPPORT )void omap1_usb_init (struct omap_usb_config *pdata);#else static inline void omap1_usb_init (struct omap_usb_config *pdata)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/321 RDMA/hns: Fix the bug while use multi-hop of pbl
In reply to Greg Kroah-HartmanFrom: Lijun Ou <[email protected]>
[ Upstream commit 4af07f01f7a787ba5158352b98c9e3cb74995a1c ]
It will prevent multiply overflow when defines the pbl for u64 type.
--- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_mr.c +2 -2
@@ -1017,14 +1017,14 @@ struct ib_mr *hns_roce_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, goto err_umem; } }else { -int pbl_size =1 ; +u64 pbl_size =1 ; bt_size = (1 << (hr_dev->caps.pbl_ba_pg_sz +PAGE_SHIFT )) /8 ;for (i =0 ; i < hr_dev->caps.pbl_hop_num; i++) pbl_size *= bt_size;if (n > pbl_size) {dev_err (dev, -" MR len %lld err. MR page num is limited to %d!\n" , +" MR len %lld err. MR page num is limited to %lld!\n" , length, pbl_size); ret = -EINVAL ; goto err_umem;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/321 arm64: preempt: Fix big-endian when checking preempt count in assembly
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
[ Upstream commit 7faa313f05cad184e8b17750f0cbe5216ac6debb ]
Commit 396244692232 ("arm64: preempt: Provide our own implementation of asm/preempt.h") extended the preempt count field in struct thread_info to 64 bits, so that it consists of a 32-bit count plus a 32-bit flag indicating whether or not the current task needs rescheduling.
Whilst the asm-offsets definition of TSK_TI_PREEMPT was updated to point to this new field, the assembly usage was left untouched meaning that a 32-bit load from TSK_TI_PREEMPT on a big-endian machine actually returns the reschedule flag instead of the count.
Whilst we could fix this by pointing TSK_TI_PREEMPT at the count field, we're actually better off reworking the two assembly users so that they operate on the whole 64-bit value in favour of inspecting the thread flags separately in order to determine whether a reschedule is needed.
--- arch/arm64/include/asm/assembler.h | 8 +++----- arch/arm64/kernel/entry.S | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-)
arch/arm64/include/asm/assembler.h +3 -5
@@ -683,11 +683,9 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU .macro if_will_cond_yield_neon#ifdef CONFIG_PREEMPT get_thread_info x0 - ldr w1, [x0, #TSK_TI_PREEMPT] - ldr x0, [x0, #TSK_TI_FLAGS] - cmp w1, #PREEMPT_DISABLE_OFFSET - csel x0, x0, xzr, eq - tbnz x0, #TIF_NEED_RESCHED, .Lyield_\@ // needs rescheduling? + ldr x0, [x0, #TSK_TI_PREEMPT] + sub x0, x0, #PREEMPT_DISABLE_OFFSET + cbz x0, .Lyield_\@ /* fall through to endif_yield_neon */ .subsection 1 .Lyield_\@ :
arch/arm64/kernel/entry.S +2 -4
@@ -622,10 +622,8 @@ el1_irq: irq_handler #ifdef CONFIG_PREEMPT - ldr w24, [tsk, #TSK_TI_PREEMPT] // get preempt count - cbnz w24, 1f // preempt count != 0 - ldr x0, [tsk, #TSK_TI_FLAGS] // get flags - tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling? + ldr x24, [tsk, #TSK_TI_PREEMPT] // get preempt count + cbnz x24, 1f // preempt count != 0 bl el1_preempt 1: #endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/321 RDMA/vmw_pvrdma: Use atomic memory allocation in create AH
In reply to Greg Kroah-HartmanFrom: Gal Pressman <[email protected]>
[ Upstream commit a276a4d93bf1580d737f38d1810e5f4b166f3edd ]
Create address handle callback should not sleep, use GFP_ATOMIC instead of GFP_KERNEL for memory allocation.
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c +1 -1
@@ -555,7 +555,7 @@ struct ib_ah *pvrdma_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr,if (!atomic_add_unless (&dev->num_ahs,1 , dev->dsr->caps.max_ah))return ERR_PTR (-ENOMEM ); - ah =kzalloc (sizeof (*ah),GFP_KERNEL ); + ah =kzalloc (sizeof (*ah),GFP_ATOMIC );if (!ah) {atomic_dec (&dev->num_ahs);return ERR_PTR (-ENOMEM );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/321 PM / AVS: SmartReflex: NULL check before some freeing functions is not needed
In reply to Greg Kroah-HartmanFrom: Thomas Meyer <[email protected]>
[ Upstream commit 14d338a857f05f894ba3badd9e6d3039c68b8180 ]
NULL check before some freeing functions is not needed.
--- drivers/power/avs/smartreflex.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/power/avs/smartreflex.c +1 -2
@@ -1010,8 +1010,7 @@ static int omap_sr_remove(struct platform_device *pdev)if (sr_info->autocomp_active)sr_stop_vddautocomp (sr_info); -if (sr_info->dbg_dir) -debugfs_remove_recursive (sr_info->dbg_dir); +debugfs_remove_recursive (sr_info->dbg_dir);pm_runtime_disable (&pdev->dev);list_del (&sr_info->node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/321 xfs: zero length symlinks are not valid
In reply to Greg Kroah-HartmanFrom: Dave Chinner <[email protected]>
[ Upstream commit 43feeea88c9cb2955b9f7ba8152ec5abeea42810 ]
A log recovery failure has been reproduced where a symlink inode has a zero length in extent form. It was caused by a shutdown during a combined fstress+fsmark workload.
The underlying problem is the issue in xfs_inactive_symlink(): the inode is unlocked between the symlink inactivation/truncation and the inode being freed. This opens a window for the inode to be written to disk before it xfs_ifree() removes it from the unlinked list, marks it free in the inobt and zeros the mode.
For shortform inodes, the fix is simple. xfs_ifree() clears the data fork state, so there's no need to do it in xfs_inactive_symlink(). This means the shortform fork verifier will not see a zero length data fork as it mirrors the inode size through to xfs_ifree()), and hence if the inode gets written back and the fork verifiers are run they will still see a fork that matches the on-disk inode size.
For extent form (remote) symlinks, it is a little more tricky. Here we explicitly set the inode size to zero, so the above race can lead to zero length symlinks on disk. Because the inode is unlinked at this point (i.e. on the unlinked list) and unreferenced, it can never be seen again by a user. Hence when we set the inode size to zeor, also change the type to S_IFREG. xfs_ifree() expects S_IFREG inodes to be of zero length, and so this avoids all the problems of zero length symlinks ever hitting the disk. It also avoids the problem of needing to handle zero length symlink inodes in log recovery to replay the extent free intents and the remaining deferops to free the extents the symlink used.
Also add a couple of asserts to warn us if zero length symlinks end up in either the symlink create or inactivation paths.
--- fs/xfs/libxfs/xfs_symlink_remote.c | 14 +++++++++---- fs/xfs/xfs_symlink.c | 33 +++++++++++++++--------------- 2 files changed, 27 insertions(+), 20 deletions(-)
fs/xfs/libxfs/xfs_symlink_remote.c +10 -4
@@ -199,7 +199,10 @@ xfs_symlink_local_to_remote( ifp->if_bytes - 1); } -/* Verify the consistency of an inline symlink. */ +/* +* Verify the in-memory consistency of an inline symlink data fork. This +* does not do on-disk format checks. +*/ xfs_failaddr_t xfs_symlink_shortform_verify (struct xfs_inode *ip)
@@ -215,9 +218,12 @@ xfs_symlink_shortform_verify( size = ifp->if_bytes; endp = sfp + size; -/* Zero length symlinks can exist while we're deleting a remote one. */ -if (size ==0 ) -return NULL ; +/* +* Zero length symlinks should never occur in memory as they are +* never alllowed to exist on disk. +*/ +if (!size) +return __this_address;/* No negative sizes or overly long symlink targets. */ if (size <0 || size >XFS_SYMLINK_MAXLEN )
fs/xfs/xfs_symlink.c +17 -16
@@ -192,6 +192,7 @@ xfs_symlink( pathlen =strlen (target_path);if (pathlen >=XFS_SYMLINK_MAXLEN )/* total string too long */ return -ENAMETOOLONG ; +ASSERT (pathlen >0 ); udqp = gdqp =NULL ; prid =xfs_get_initial_prid (dp);
@@ -378,6 +379,12 @@ out_release_inode:/* * Free a symlink that has blocks associated with it. +* +* Note: zero length symlinks are not allowed to exist. When we set the size to +* zero, also change it to a regular file so that it does not get written to +* disk as a zero length symlink. The inode is on the unlinked list already, so +* userspace cannot find this inode anymore, so this change is not user visible +* but allows us to catch corrupt zero-length symlinks in the verifiers. */ STATIC int xfs_inactive_symlink_rmt(
@@ -412,13 +419,14 @@ xfs_inactive_symlink_rmt(xfs_trans_ijoin (tp, ip,0 );/* -* Lock the inode, fix the size, and join it to the transaction. -* Hold it so in the normal path, we still have it locked for -* the second transaction. In the error paths we need it +* Lock the inode, fix the size, turn it into a regular file and join it +* to the transaction. Hold it so in the normal path, we still have it +* locked for the second transaction. In the error paths we need it * held so the cancel won't rele it, see below. */ size = (int )ip->i_d.di_size; ip->i_d.di_size =0 ; +VFS_I (ip)->i_mode = (VFS_I (ip)->i_mode & ~S_IFMT ) |S_IFREG ;xfs_trans_log_inode (tp, ip,XFS_ILOG_CORE );/* * Find the block(s) so we can inval and unmap them.
@@ -494,17 +502,10 @@ xfs_inactive_symlink(return -EIO ;xfs_ilock (ip,XFS_ILOCK_EXCL ); - -/* -* Zero length symlinks _can_ exist. -*/ pathlen = (int )ip->i_d.di_size; -if (!pathlen) { -xfs_iunlock (ip,XFS_ILOCK_EXCL ); -return 0 ; - } +ASSERT (pathlen); -if (pathlen <0 || pathlen >XFS_SYMLINK_MAXLEN ) { +if (pathlen <=0 || pathlen >XFS_SYMLINK_MAXLEN ) {xfs_alert (mp,"%s: inode (0x%llx) bad symlink length (%d)" , __func__, (unsigned long long )ip->i_ino, pathlen);xfs_iunlock (ip,XFS_ILOCK_EXCL );
@@ -512,12 +513,12 @@ xfs_inactive_symlink(return -EFSCORRUPTED ; } +/* +* Inline fork state gets removed by xfs_difree() so we have nothing to +* do here in that case. +*/ if (ip->i_df.if_flags &XFS_IFINLINE ) { -if (ip->i_df.if_bytes >0 ) -xfs_idata_realloc (ip, -(ip->i_df.if_bytes), -XFS_DATA_FORK );xfs_iunlock (ip,XFS_ILOCK_EXCL ); -ASSERT (ip->i_df.if_bytes ==0 );return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/321 ARM: ks8695: fix section mismatch warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 4aa64677330beeeed721b4b122884dabad845d66 ]
WARNING: vmlinux.o(.text+0x13250): Section mismatch in reference from the function acs5k_i2c_init() to the (unknown reference) .init.data:(unknown) The function acs5k_i2c_init() references
the (unknown reference) __initdata (unknown).
This is often because acs5k_i2c_init lacks a __initdata
annotation or the annotation of (unknown) is wrong.
--- arch/arm/mach-ks8695/board-acs5k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-ks8695/board-acs5k.c +1 -1
@@ -100,7 +100,7 @@ static struct i2c_board_info acs5k_i2c_devs[] __initdata = { }, }; -static void acs5k_i2c_init (void ) +static void __init acs5k_i2c_init (void ) {/* The gpio interface */ gpiod_add_lookup_table (&acs5k_i2c_gpiod_table);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/321 ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 1a2fa02f7489dc4d746f2a15fb77b3ce1affade8 ]
Ignore acpi_device_fix_up_power() return value. If we return an error we end up with acpi_default_enumeration() still creating a platform- device for the device and we end up with the device still being used but without the special LPSS related handling which is not useful.
Specicifically ignoring the error fixes the touchscreen no longer working after a suspend/resume on a Prowise PT301 tablet.
This tablet has a broken _PS0 method on the touchscreen's I2C controller, causing acpi_device_fix_up_power() to fail, causing fallback to standard platform-dev handling and specifically causing acpi_lpss_save/restore_ctx to not run.
The I2C controllers _PS0 method does actually turn on the device, but then does some more nonsense which fails when run during early boot trying to use I2C opregion handling on another not-yet registered I2C controller.
--- drivers/acpi/acpi_lpss.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/acpi/acpi_lpss.c +1 -6
@@ -665,12 +665,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,* have _PS0 and _PS3 without _PSC (and no power resources), so * acpi_bus_init_power() will assume that the BIOS has put them into D0. */ - ret =acpi_device_fix_up_power (adev); -if (ret) { -/* Skip the device, but continue the namespace scan. */ - ret =0 ; - goto err_out; - } +acpi_device_fix_up_power (adev); adev->driver_data = pdata; pdev =acpi_create_platform_device (adev, dev_desc->properties);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 082/321] ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
Hi!
Quoted 11 lines
From: Hans de Goede <[email protected]>
[ Upstream commit
1a2fa02f7489dc4d746f2a15fb77b3ce1affade8]Ignore
acpi_device_fix_up_power()return value. If we return an error we end up withacpi_default_enumeration()still creating a platform- device for the device and we end up with the device still being used but without the special LPSS related handling which is not useful.Specicifically ignoring the error fixes the touchscreen no longer working after a suspend/resume on a Prowise PT301 tablet.
I'm pretty sure it does, but:
a) do you believe this is right patch for -stable? Should it get lot more testing in mainline as it.... may change things in a wrong way for someone else?
b) if we are ignoring errors now, should we at least printk() to let the user know that something is wrong with the ACPI tables?
Best regards,
Pavel
Quoted 20 lines
drivers/acpi/acpi_lpss.c +1
-6@@ -665,12 +665,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,* have _PS0 and _PS3 without _PSC (and no power resources), so * acpi_bus_init_power() will assume that the BIOS has put them into D0. */ - ret =acpi_device_fix_up_power (adev); -if (ret) { -/* Skip the device, but continue the namespace scan. */ - ret =0 ; - goto err_out; - } +acpi_device_fix_up_power (adev);drivers/acpi/acpi_lpss.c +0
-0adev->driver_data = pdata; pdev =acpi_create_platform_device (adev, dev_desc->properties);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 082/321] ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
Quoted 11 lines · Pavel Machek
Hi!
Quoted 9 lines
From: Hans de Goede <[email protected]>
[ Upstream commit
1a2fa02f7489dc4d746f2a15fb77b3ce1affade8]Ignore
acpi_device_fix_up_power()return value. If we return an error we end up withacpi_default_enumeration()still creating a platform- device for the device and we end up with the device still being used but without the special LPSS related handling which is not useful.
Quoted 5 lines
Quoted 2 lines
Specicifically ignoring the error fixes the touchscreen no longer working after a suspend/resume on a Prowise PT301 tablet.
I'm pretty sure it does, but:
a) do you believe this is right patch for -stable?
Yes.
Quoted 1 line
Should it get lot more testing in mainline
It's been in the mainline since 5.0 and I'm not aware of any bug reports against it.
Quoted 5 lines
as it.... may change things in a wrong way
for someone else?b) if we are ignoring errors now, should we at least
printk()to let the user know that something is wrong with the ACPI tables?
The question whether or not to print a message is orthogonal to this patch. Perhaps it would be useful to print a message on an error regardless of whether or not the error is ignored, but then users would need to know what to do about that error message.
Quoted 19 lines
Quoted 19 lines
drivers/acpi/acpi_lpss.c +1
-6@@ -665,12 +665,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,* have _PS0 and _PS3 without _PSC (and no power resources), so * acpi_bus_init_power() will assume that the BIOS has put them into D0. */ - ret =acpi_device_fix_up_power (adev); -if (ret) { -/* Skip the device, but continue the namespace scan. */ - ret =0 ; - goto err_out; - } +acpi_device_fix_up_power (adev); adev->driver_data = pdata;pdev = acpi_create_platform_device(adev, dev_desc->properties);
Re: [PATCH 4.19 082/321] ACPI / LPSS: Ignore acpi_device_fix_up_power() return value
In reply to Pavel MachekHi,
Quoted 11 lines · Pavel Machek
Hi!
Quoted 9 lines
From: Hans de Goede <[email protected]>
[ Upstream commit
1a2fa02f7489dc4d746f2a15fb77b3ce1affade8]Ignore
acpi_device_fix_up_power()return value. If we return an error we end up withacpi_default_enumeration()still creating a platform- device for the device and we end up with the device still being used but without the special LPSS related handling which is not useful.
Quoted 8 lines
Quoted 2 lines
Specicifically ignoring the error fixes the touchscreen no longer working after a suspend/resume on a Prowise PT301 tablet.
I'm pretty sure it does, but:
a) do you believe this is right patch for -stable? Should it get lot more testing in mainline as it.... may change things in a wrong way for someone else?
This has already been answered by Rafael.
Quoted 2 lines
b) if we are ignoring errors now, should we at least
printk()to let the user know that something is wrong with the ACPI tables?
acpi_device_fix_up_power() fails when the ACPI _PS0 method fails and when there are errors while executing an ACPI method the ACPI subsystem already is pretty verbose about this.
Regards,
Hans
Quoted 25 lines
Best regards,
PavelQuoted 20 lines
drivers/acpi/acpi_lpss.c +1
-6@@ -665,12 +665,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,* have _PS0 and _PS3 without _PSC (and no power resources), so * acpi_bus_init_power() will assume that the BIOS has put them into D0. */ - ret =acpi_device_fix_up_power (adev); -if (ret) { -/* Skip the device, but continue the namespace scan. */ - ret =0 ; - goto err_out; - } +acpi_device_fix_up_power (adev);adev->driver_data = pdata; pdev = acpi_create_platform_device(adev, dev_desc->properties);
Greg Kroah-Hartman
maintainerPATCH 83/321 scsi: lpfc: Enable Management features for IF_TYPE=6
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 719162bd5bb968203397b9b1d0dd30a9797bbd09 ]
Addition of support for if_type=6 missed several checks for interface type, resulting in the failure of several key management features such as firmware dump and loopback testing.
Correct the checks on the if_type so that both SLI4 IF_TYPE's 2 and 6 are supported.
--- drivers/scsi/lpfc/lpfc_attr.c | 4 ++-- drivers/scsi/lpfc/lpfc_bsg.c | 6 +++--- drivers/scsi/lpfc/lpfc_els.c | 2 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/lpfc/lpfc_attr.c +2 -2
@@ -1332,7 +1332,7 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode)return -EACCES ;if ((phba->sli_rev <LPFC_SLI_REV4 ) || - (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) != + (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) <LPFC_SLI_INTF_IF_TYPE_2 ))return -EPERM ;
@@ -4264,7 +4264,7 @@ lpfc_link_speed_store(struct device *dev, struct device_attribute *attr,uint32_t prev_val, if_type; if_type =bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf); -if (if_type ==LPFC_SLI_INTF_IF_TYPE_2 && +if (if_type >=LPFC_SLI_INTF_IF_TYPE_2 && phba->hba_flag &HBA_FORCED_LINK_SPEED )return -EPERM ;
drivers/scsi/lpfc/lpfc_bsg.c +3 -3
@@ -2221,7 +2221,7 @@ lpfc_bsg_diag_loopback_mode(struct bsg_job *job)if (phba->sli_rev <LPFC_SLI_REV4 ) rc =lpfc_sli3_bsg_diag_loopback_mode (phba, job); -else if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) == +else if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) >=LPFC_SLI_INTF_IF_TYPE_2 ) rc =lpfc_sli4_bsg_diag_loopback_mode (phba, job);else
@@ -2261,7 +2261,7 @@ lpfc_sli4_bsg_diag_mode_end(struct bsg_job *job)if (phba->sli_rev <LPFC_SLI_REV4 )return -ENODEV ; -if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) != +if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) <LPFC_SLI_INTF_IF_TYPE_2 )return -ENODEV ;
@@ -2353,7 +2353,7 @@ lpfc_sli4_bsg_link_diag_test(struct bsg_job *job) rc = -ENODEV ; goto job_error; } -if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) != +if (bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) <LPFC_SLI_INTF_IF_TYPE_2 ) { rc = -ENODEV ; goto job_error;
drivers/scsi/lpfc/lpfc_els.c +1 -1
@@ -5559,7 +5559,7 @@ lpfc_els_rcv_rdp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,struct ls_rjt stat;if (phba->sli_rev <LPFC_SLI_REV4 || -bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) != +bf_get (lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) <LPFC_SLI_INTF_IF_TYPE_2 ) { rjt_err =LSRJT_UNABLE_TPC ; rjt_expl =LSEXP_REQ_UNSUPPORTED ;
drivers/scsi/lpfc/lpfc_hbadisc.c +1 -1
@@ -4780,7 +4780,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)if (phba->sli_rev ==LPFC_SLI_REV4 && (!(vport->load_flag &FC_UNLOADING )) && (bf_get (lpfc_sli_intf_if_type, - &phba->sli4_hba.sli_intf) == + &phba->sli4_hba.sli_intf) >=LPFC_SLI_INTF_IF_TYPE_2 ) && (kref_read (&ndlp->kref) >0 )) { mbox->context1 =lpfc_nlp_get (ndlp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/321 scsi: qla2xxx: Fix NPIV handling for FC-NVMe
In reply to Greg Kroah-HartmanFrom: Himanshu Madhani <[email protected]>
[ Upstream commit 5e6803b409ba3c18434de6693062d98a470bcb1e ]
This patch fixes issues with NPIV port with FC-NVMe. Clean up code for remoteport delete and also call nvme_delete when deleting VPs.
--- drivers/scsi/qla2xxx/qla_nvme.c | 16 +++------------- drivers/scsi/qla2xxx/qla_os.c | 2 ++ 2 files changed, 5 insertions(+), 13 deletions(-)
drivers/scsi/qla2xxx/qla_nvme.c +3 -13
@@ -474,21 +474,10 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,int rval = -ENODEV ;srb_t *sp;struct qla_qpair *qpair = hw_queue_handle; -struct nvme_private *priv; +struct nvme_private *priv = fd->private;struct qla_nvme_rport *qla_rport = rport->private; -if (!fd || !qpair) { -ql_log (ql_log_warn,NULL ,0x2134 , -"NO NVMe request or Queue Handle\n" ); -return rval; - } - - priv = fd->private; fcport = qla_rport->fcport; -if (!fcport) { -ql_log (ql_log_warn,NULL ,0x210e ,"No fcport ptr\n" ); -return rval; - } vha = fcport->vha;
@@ -517,6 +506,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport, sp->name ="nvme_cmd" ; sp->done = qla_nvme_sp_done; sp->qpair = qpair; + sp->vha = vha; nvme = &sp->u.iocb_cmd; nvme->u.nvme.desc = fd;
@@ -564,7 +554,7 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)schedule_work (&fcport->free_work); } - fcport->nvme_flag &= ~(NVME_FLAG_REGISTERED |NVME_FLAG_DELETING ); + fcport->nvme_flag &= ~NVME_FLAG_DELETING ;ql_log (ql_log_info, fcport->vha,0x2110 ,"remoteport_delete of %p completed.\n" , fcport); }
drivers/scsi/qla2xxx/qla_os.c +2 -0
@@ -3538,6 +3538,8 @@ qla2x00_delete_all_vps(struct qla_hw_data *ha, scsi_qla_host_t *base_vha)spin_unlock_irqrestore (&ha->vport_slock, flags);mutex_unlock (&ha->vport_lock); +qla_nvme_delete (vha); +fc_vport_terminate (vha->fc_vport);scsi_host_put (vha->host);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 084/321] scsi: qla2xxx: Fix NPIV handling for FC-NVMe
Hi!
Quoted 8 lines
From: Himanshu Madhani <[email protected]>
[ Upstream commit
5e6803b409ba3c18434de6693062d98a470bcb1e]This patch fixes issues with NPIV port with FC-NVMe. Clean up code for remoteport delete and also call
nvme_deletewhen deleting VPs.
drivers/scsi/qla2xxx/qla_nvme.c static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport) · line 560
Quoted 8 lines
drivers/scsi/qla2xxx/qla_nvme.c +1
-1@@ -564,7 +554,7 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)schedule_work (&fcport->free_work); } - fcport->nvme_flag &= ~(NVME_FLAG_REGISTERED |NVME_FLAG_DELETING ); + fcport->nvme_flag &= ~NVME_FLAG_DELETING ;ql_log (ql_log_info, fcport->vha,0x2110 ,"remoteport_delete of %p completed.\n" , fcport); }
Current -next-20191204 contains
fcport->nvme_flag &= ~NVME_FLAG_REGISTERED;
fcport->nvme_flag &= ~NVME_FLAG_DELETING;
... and there's no explanation in changelog why removing NVME_FLAG_REGISTERED is good idea.
Are you sure this change is correct and suitable for -stable?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 084/321] scsi: qla2xxx: Fix NPIV handling for FC-NVMe
Hello,
On 12/4/19, 3:48 PM, "Pavel Machek" <[email protected] on behalf of [email protected]> wrote:
Hi!
> From: Himanshu Madhani <[email protected]>
>
> [ Upstream commit 5e6803b409ba3c18434de6693062d98a470bcb1e ]
>
> This patch fixes issues with NPIV port with FC-NVMe. Clean up code for
> remoteport delete and also call nvme_delete when deleting VPs.
> @@ -564,7 +554,7 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)
> schedule_work(&fcport->free_work);
> }
>
> - fcport->nvme_flag &= ~(NVME_FLAG_REGISTERED | NVME_FLAG_DELETING);
> + fcport->nvme_flag &= ~NVME_FLAG_DELETING;
> ql_log(ql_log_info, fcport->vha, 0x2110,
> "remoteport_delete of %p completed.\n", fcport);
> }
Current -next-20191204 contains
fcport->nvme_flag &= ~NVME_FLAG_REGISTERED;
fcport->nvme_flag &= ~ NVME_FLAG_DELETING;
... and there's no explanation in changelog why removing
NVME_FLAG_REGISTERED is good idea.This patch was mostly cleanup and if you notice on line 541 we are already clearing up NVME_FLAG_REGISTERED flag.
e84067d743010 (Duane Grigsby 2017-06-21 13:48:43 -0700 541) fcport->nvme_flag &= ~NVME_FLAG_REGISTERED;
so this patch is just removing duplicate clearing. At some point we will need to fix double line of clearing NVME_FLAG_REGISTERED and NVME_FLAG_DELETING in one line. I'll send patch to fix that for net-next.
Thanks,
Himanshu
Are you sure this change is correct and suitable for -stable?
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 85/321 scsi: qla2xxx: Fix for FC-NVMe discovery for NPIV port
In reply to Greg Kroah-HartmanFrom: Giridhar Malavali <[email protected]>
[ Upstream commit 835aa4f2691e4ed4ed16de81f3cabf17a87a164f ]
This patch fixes NVMe discovery by setting SKIP_PRLI flag, so that PRLI is driven by driver and is retried when the NPIV port is detected to have NVMe capability.
--- drivers/scsi/qla2xxx/qla_attr.c | 2 ++ drivers/scsi/qla2xxx/qla_init.c | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +2 -0
@@ -2161,6 +2161,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))msleep (1000 ); +qla_nvme_delete (vha); +qla24xx_disable_vp (vha);qla2x00_wait_for_sess_deletion (vha);
drivers/scsi/qla2xxx/qla_init.c +4 -6
@@ -242,15 +242,13 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,qla2x00_init_timer (sp,qla2x00_get_async_timeout (vha) +2 ); sp->done = qla2x00_async_login_sp_done; -if (N2N_TOPO (fcport->vha->hw) &&fcport_is_bigger (fcport)) { +if (N2N_TOPO (fcport->vha->hw) &&fcport_is_bigger (fcport)) lio->u.logio.flags |=SRB_LOGIN_PRLI_ONLY ; - }else { +else lio->u.logio.flags |=SRB_LOGIN_COND_PLOGI ; -if (fcport->fc4f_nvme) - lio->u.logio.flags |=SRB_LOGIN_SKIP_PRLI ; - - } +if (fcport->fc4f_nvme) + lio->u.logio.flags |=SRB_LOGIN_SKIP_PRLI ;ql_dbg (ql_dbg_disc, vha,0x2072 , "Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x "
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/321 nvme: provide fallback for discard alloc failure
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
[ Upstream commit cb5b7262b011cfb793519bf97e54dff5282da23c ]
When boxes are run near (or to) OOM, we have a problem with the discard page allocation in nvme. If we fail allocating the special page, we return busy, and it'll get retried. But since ordering is honored for dispatch requests, we can keep retrying this same IO and failing. Behind that IO could be requests that want to free memory, but they never get the chance.
Allocate a fixed discard page per controller for a safe fallback, and use that if the initial allocation fails.
--- drivers/nvme/host/core.c | 41 ++++++++++++++++++++++++++++++++++------ drivers/nvme/host/nvme.h | 3 +++ 2 files changed, 38 insertions(+), 6 deletions(-)
drivers/nvme/host/core.c +35 -6
@@ -551,9 +551,19 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req,struct nvme_dsm_range *range;struct bio *bio; - range =kmalloc_array (segments,sizeof (*range),GFP_ATOMIC ); -if (!range) -return BLK_STS_RESOURCE ; + range =kmalloc_array (segments,sizeof (*range), +GFP_ATOMIC | __GFP_NOWARN); +if (!range) { +/* +* If we fail allocation our range, fallback to the controller +* discard page. If that's also busy, it's safe to return +* busy, as we know we can make progress once that's freed. +*/ +if (test_and_set_bit_lock (0 , &ns->ctrl->discard_page_busy)) +return BLK_STS_RESOURCE ; + + range =page_address (ns->ctrl->discard_page); + }__rq_for_each_bio (bio, req) {u64 slba =nvme_block_nr (ns, bio->bi_iter.bi_sector);
@@ -568,7 +578,10 @@ static blk_status_t nvme_setup_discard(struct nvme_ns *ns, struct request *req, }if (WARN_ON_ONCE (n != segments)) { -kfree (range); +if (virt_to_page (range) == ns->ctrl->discard_page) +clear_bit_unlock (0 , &ns->ctrl->discard_page_busy); +else +kfree (range);return BLK_STS_IOERR ; }
@@ -653,8 +666,13 @@ void nvme_cleanup_cmd(struct request *req) blk_rq_bytes(req) >> ns->lba_shift); }if (req->rq_flags &RQF_SPECIAL_PAYLOAD ) { -kfree (page_address (req->special_vec.bv_page) + - req->special_vec.bv_offset); +struct nvme_ns *ns = req->rq_disk->private_data; +struct page *page = req->special_vec.bv_page; + +if (page == ns->ctrl->discard_page) +clear_bit_unlock (0 , &ns->ctrl->discard_page_busy); +else +kfree (page_address (page) + req->special_vec.bv_offset); } }EXPORT_SYMBOL_GPL (nvme_cleanup_cmd);
@@ -3551,6 +3569,7 @@ static void nvme_free_ctrl(struct device *dev)ida_simple_remove (&nvme_instance_ida, ctrl->instance);kfree (ctrl->effects);nvme_mpath_uninit (ctrl); +kfree (ctrl->discard_page);if (subsys) {mutex_lock (&subsys->lock);
@@ -3592,6 +3611,14 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,memset (&ctrl->ka_cmd,0 ,sizeof (ctrl->ka_cmd)); ctrl->ka_cmd.common.opcode = nvme_admin_keep_alive; +BUILD_BUG_ON (NVME_DSM_MAX_RANGES *sizeof (struct nvme_dsm_range ) > +PAGE_SIZE ); + ctrl->discard_page =alloc_page (GFP_KERNEL ); +if (!ctrl->discard_page) { + ret = -ENOMEM ; + goto out; + } + ret =ida_simple_get (&nvme_instance_ida,0 ,0 ,GFP_KERNEL );if (ret <0 ) goto out;
@@ -3629,6 +3656,8 @@ out_free_name: out_release_instance:ida_simple_remove (&nvme_instance_ida, ctrl->instance); out: +if (ctrl->discard_page) +__free_page (ctrl->discard_page);return ret; }EXPORT_SYMBOL_GPL (nvme_init_ctrl);
drivers/nvme/host/nvme.h +3 -0
@@ -238,6 +238,9 @@ struct nvme_ctrl {u16 maxcmd;int nr_reconnects;struct nvmf_ctrl_options *opts; + +struct page *discard_page; +unsigned long discard_page_busy; };struct nvme_subsystem {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/321 s390/zcrypt: make sysfs reset attribute trigger queue reset
In reply to Greg Kroah-HartmanFrom: Harald Freudenberger <[email protected]>
[ Upstream commit 42a87d4103ae365e18c3be1333592ab583b8ad9d ]
Until now there is no way to reset a AP queue or card. Driving a card or queue offline and online again does only toggle the 'software' online state. The only way to trigger a (hardware) reset is by running hot-unplug/hot-plug for example on the HMC.
This patch makes the queue reset attribute in sysfs writable. Writing into this attribute triggers a reset on the AP queue's state machine. So the AP queue is flushed and state machine runs through the initial states which cause a reset (PQAP(RAPQ)) and a re-registration to interrupts (PQAP(AQIC)) if available.
The reset sysfs attribute is writable by root only. So only an administrator is allowed to initiate a reset of AP queues. Please note that the queue's counter values are left untouched by the reset.
--- drivers/s390/crypto/ap_queue.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/s390/crypto/ap_queue.c +22 -1
@@ -14,6 +14,9 @@#include <asm/facility.h> #include "ap_bus.h" +#include "ap_debug.h" + +static void __ap_flush_queue (struct ap_queue *aq);/** * ap_queue_enable_interruption(): Enable interruption on an AP queue.
@@ -541,7 +544,25 @@ static ssize_t reset_show(struct device *dev,return rc; } -static DEVICE_ATTR_RO (reset); +static ssize_t reset_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct ap_queue *aq =to_ap_queue (dev); + +spin_lock_bh (&aq->lock); +__ap_flush_queue (aq); + aq->state =AP_STATE_RESET_START ; +ap_wait (ap_sm_event (aq,AP_EVENT_POLL )); +spin_unlock_bh (&aq->lock); + +AP_DBF (DBF_INFO ,"reset queue=%02x.%04x triggered by user\n" , +AP_QID_CARD (aq->qid),AP_QID_QUEUE (aq->qid)); + +return count; +} + +static DEVICE_ATTR_RW (reset);static ssize_t interrupt_show (struct device *dev,struct device_attribute *attr,char *buf)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/321 crypto: user - support incremental algorithm dumps
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 0ac6b8fb23c724b015d9ca70a89126e8d1563166 ]
CRYPTO_MSG_GETALG in NLM_F_DUMP mode sometimes doesn't return all registered crypto algorithms, because it doesn't support incremental dumps. crypto_dump_report() only permits itself to be called once, yet the netlink subsystem allocates at most ~64 KiB for the skb being dumped to. Thus only the first recvmsg() returns data, and it may only include a subset of the crypto algorithms even if the user buffer passed to recvmsg() is large enough to hold all of them.
Fix this by using one of the arguments in the netlink_callback structure to keep track of the current position in the algorithm list. Then userspace can do multiple recvmsg() on the socket after sending the dump request. This is the way netlink dumps work elsewhere in the kernel; it's unclear why this was different (probably just an oversight).
Also fix an integer overflow when calculating the dump buffer size hint.
--- crypto/crypto_user.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
crypto/crypto_user.c +20 -17
@@ -296,30 +296,33 @@ drop_alg:static int crypto_dump_report (struct sk_buff *skb,struct netlink_callback *cb) { -struct crypto_alg *alg; +const size_t start_pos = cb->args[0 ]; +size_t pos =0 ;struct crypto_dump_info info; -int err; - -if (cb->args[0 ]) - goto out; - - cb->args[0 ] =1 ; +struct crypto_alg *alg; +int res; info.in_skb = cb->skb; info.out_skb = skb; info.nlmsg_seq = cb->nlh->nlmsg_seq; info.nlmsg_flags =NLM_F_MULTI ; +down_read (&crypto_alg_sem);list_for_each_entry (alg, &crypto_alg_list, cra_list) { - err =crypto_report_alg (alg, &info); -if (err) - goto out_err; +if (pos >= start_pos) { + res =crypto_report_alg (alg, &info); +if (res == -EMSGSIZE ) +break ; +if (res) + goto out; + } + pos++; } - + cb->args[0 ] = pos; + res = skb->len; out: -return skb->len; -out_err: -return err; +up_read (&crypto_alg_sem); +return res; }static int crypto_dump_report_done (struct netlink_callback *cb)
@@ -503,7 +506,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,if ((type == (CRYPTO_MSG_GETALG -CRYPTO_MSG_BASE ) && (nlh->nlmsg_flags &NLM_F_DUMP ))) {struct crypto_alg *alg; -u16 dump_alloc =0 ; +unsigned long dump_alloc =0 ;if (link->dump ==NULL )return -EINVAL ;
@@ -511,16 +514,16 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,down_read (&crypto_alg_sem);list_for_each_entry (alg, &crypto_alg_list, cra_list) dump_alloc +=CRYPTO_REPORT_MAXSIZE ; +up_read (&crypto_alg_sem); {struct netlink_dump_control c = { .dump = link->dump, .done = link->done, - .min_dump_alloc = dump_alloc, + .min_dump_alloc =min (dump_alloc,65535UL ), }; err =netlink_dump_start (crypto_nlsk, skb, nlh, &c); } -up_read (&crypto_alg_sem);return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/321 arm64: dts: renesas: draak: Fix CVBS input
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 6f61a2c8f1f6163c7e08c77c5f71df0427e4d2f6 ]
A typo in the adv7180 DT node prevents successful probing of the VIN. Fix it.
--- arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a77995-draak.dts +1 -1
@@ -188,7 +188,7 @@ compatible = "adi,adv7180cp"; reg = <0x20>; - port { + ports { #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/321 mwifiex: fix potential NULL dereference and use after free
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit 1dcd9429212b98bea87fc6ec92fb50bf5953eb47 ]
There are two defects: (1) passing a NULL bss to mwifiex_save_hidden_ssid_channels will result in NULL dereference,
(2) using bss after dropping the reference to it via cfg80211_put_bss. To fix them, the patch moves the buggy code to the branch that bss is not NULL and puts it before cfg80211_put_bss.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/net/wireless/marvell/mwifiex/scan.c +10 -8
@@ -1906,15 +1906,17 @@ mwifiex_parse_single_response_buf(struct mwifiex_private *priv, u8 **bss_info, ETH_ALEN))mwifiex_update_curr_bss_params (priv ,bss ); -cfg80211_put_bss (priv->wdev.wiphy, bss); - } -if ((chan->flags &IEEE80211_CHAN_RADAR ) || - (chan->flags &IEEE80211_CHAN_NO_IR )) { -mwifiex_dbg (adapter,INFO , -"radar or passive channel %d\n" , - channel); -mwifiex_save_hidden_ssid_channels (priv, bss); +if ((chan->flags &IEEE80211_CHAN_RADAR ) || + (chan->flags &IEEE80211_CHAN_NO_IR )) { +mwifiex_dbg (adapter,INFO , +"radar or passive channel %d\n" , + channel); +mwifiex_save_hidden_ssid_channels (priv, + bss); + } + +cfg80211_put_bss (priv->wdev.wiphy, bss); } } }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/321 mwifiex: debugfs: correct histogram spacing, formatting
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
[ Upstream commit 4cb777c64e030778c569f605398d7604d8aabc0f ]
Currently, snippets of this file look like:
rx rates (in Mbps): 0=1M 1=2M2=5.5M 3=11M 4=6M 5=9M 6=12M
7=18M 8=24M 9=36M 10=48M 11=54M12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40) 44-53=MCS0-9(VHT:BW20)54-63=MCS0-9(VHT:BW40)64-73=MCS0-9(VHT:BW80)
...
noise_flr[--96dBm] = 22
noise_flr[--95dBm] = 149
noise_flr[--94dBm] = 9
noise_flr[--93dBm] = 2
We're missing some spaces, and we're adding a minus sign ('-') on values that are already negative signed integers.
--- drivers/net/wireless/marvell/mwifiex/debugfs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/net/wireless/marvell/mwifiex/debugfs.c +6 -8
@@ -273,15 +273,13 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,"total samples = %d\n" , atomic_read(&phist_data->num_samples)); - p +=sprintf (p,"rx rates (in Mbps): 0=1M 1=2M" ); - p +=sprintf (p,"2=5.5M 3=11M 4=6M 5=9M 6=12M\n" ); - p +=sprintf (p,"7=18M 8=24M 9=36M 10=48M 11=54M" ); - p +=sprintf (p,"12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40)\n" ); + p +=sprintf (p, +"rx rates (in Mbps): 0=1M 1=2M 2=5.5M 3=11M 4=6M 5=9M 6=12M\n" +"7=18M 8=24M 9=36M 10=48M 11=54M 12-27=MCS0-15(BW20) 28-43=MCS0-15(BW40)\n" );if (ISSUPP_11ACENABLED (priv->adapter->fw_cap_info)) { - p +=sprintf (p,"44-53=MCS0-9(VHT:BW20)" ); - p +=sprintf (p,"54-63=MCS0-9(VHT:BW40)" ); - p +=sprintf (p,"64-73=MCS0-9(VHT:BW80)\n\n" ); + p +=sprintf (p, +"44-53=MCS0-9(VHT:BW20) 54-63=MCS0-9(VHT:BW40) 64-73=MCS0-9(VHT:BW80)\n\n" ); }else { p +=sprintf (p,"\n" ); }
@@ -310,7 +308,7 @@ mwifiex_histogram_read(struct file *file, char __user *ubuf,for (i =0 ; i <MWIFIEX_MAX_NOISE_FLR ; i++) { value =atomic_read (&phist_data->noise_flr[i]);if (value) - p +=sprintf (p,"noise_flr[-%02ddBm] = %d\n" , + p +=sprintf (p,"noise_flr[%02ddBm] = %d\n" , (int )(i-128 ), value); }for (i =0 ; i <MWIFIEX_MAX_SIG_STRENGTH ; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/321 brcmfmac: set F2 watermark to 256 for 4373
In reply to Greg Kroah-HartmanFrom: Wright Feng <[email protected]>
[ Upstream commit e1a08730eeb0bad4d82c3bc40e74854872de618d ]
We got SDIO_CRC_ERROR with 4373 on SDR104 when doing bi-directional throughput test. Enable watermark to 256 to guarantee the operation stability.
--- .../broadcom/brcm80211/brcmfmac/sdio.c | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +24 -2
@@ -49,6 +49,10 @@#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)#define CTL_DONE_TIMEOUT msecs_to_jiffies(2500) +/* watermark expressed in number of words */ +#define DEFAULT_F2_WATERMARK 0x8 +#define CY_4373_F2_WATERMARK 0x40 +#ifdef DEBUG #define BRCMF_TRAP_INFO_SIZE 80
@@ -138,6 +142,8 @@ struct rte_console {/* 1: isolate internal sdio signals, put external pads in tri-state; requires * sdio bus power cycle to clear (rev 9) */ #define SBSDIO_DEVCTL_PADS_ISO 0x08 +/* 1: enable F2 Watermark */ +#define SBSDIO_DEVCTL_F2WM_ENAB 0x10/* Force SD->SB reset mapping (rev 11) */ #define SBSDIO_DEVCTL_SB_RST_CTL 0x30/* Determined by CoreControl bit */
@@ -4060,6 +4066,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,void *nvram;u32 nvram_len;u8 saveclk; +u8 devctl;brcmf_dbg (TRACE ,"Enter: dev=%s, err=%d\n" ,dev_name (dev), err);
@@ -4115,8 +4122,23 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,brcmf_sdiod_writel (sdiod, core->base +SD_REG (hostintmask), bus->hostintmask,NULL ); - -brcmf_sdiod_writeb (sdiod,SBSDIO_WATERMARK ,8 , &err); +switch (sdiod->func1->device) { +case SDIO_DEVICE_ID_CYPRESS_4373 : +brcmf_dbg (INFO ,"set F2 watermark to 0x%x*4 bytes\n" , +CY_4373_F2_WATERMARK ); +brcmf_sdiod_writeb (sdiod,SBSDIO_WATERMARK , +CY_4373_F2_WATERMARK , &err); + devctl =brcmf_sdiod_readb (sdiod,SBSDIO_DEVICE_CTL , + &err); + devctl |=SBSDIO_DEVCTL_F2WM_ENAB ; +brcmf_sdiod_writeb (sdiod,SBSDIO_DEVICE_CTL , devctl, + &err); +break ; +default : +brcmf_sdiod_writeb (sdiod,SBSDIO_WATERMARK , +DEFAULT_F2_WATERMARK , &err); +break ; + } }else {/* Disable F2 again */ sdio_disable_func (sdiod->func2);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/321 brcmfmac: set SDIO F1 MesBusyCtrl for CYW4373
In reply to Greg Kroah-HartmanFrom: Madhan Mohan R <[email protected]>
[ Upstream commit 58e4bbea0c1d9b5ace11df968c5dc096ce052a73 ]
Along with F2 watermark (existing) configuration, F1 MesBusyCtrl should be enabled & sdio device RX FIFO watermark should be configured to avoid overflow errors.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 +++ drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +3 -0
@@ -4133,6 +4133,9 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, devctl |=SBSDIO_DEVCTL_F2WM_ENAB ;brcmf_sdiod_writeb (sdiod,SBSDIO_DEVICE_CTL , devctl, &err); +brcmf_sdiod_writeb (sdiod,SBSDIO_FUNC1_MESBUSYCTRL , +CY_4373_F2_WATERMARK | +SBSDIO_MESBUSYCTRL_ENAB , &err);break ;default : brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h +8 -1
@@ -77,7 +77,7 @@#define SBSDIO_GPIO_OUT 0x10006/* gpio enable */ #define SBSDIO_GPIO_EN 0x10007 -/* rev < 7, watermark for sdio device */ +/* rev < 7, watermark for sdio device TX path */ #define SBSDIO_WATERMARK 0x10008/* control busy signal generation */ #define SBSDIO_DEVICE_CTL 0x10009
@@ -104,6 +104,13 @@#define SBSDIO_FUNC1_RFRAMEBCHI 0x1001C/* MesBusyCtl (rev 11) */ #define SBSDIO_FUNC1_MESBUSYCTRL 0x1001D +/* Watermark for sdio device RX path */ +#define SBSDIO_MESBUSY_RXFIFO_WM_MASK 0x7F +#define SBSDIO_MESBUSY_RXFIFO_WM_SHIFT 0 +/* Enable busy capability for MES access */ +#define SBSDIO_MESBUSYCTRL_ENAB 0x80 +#define SBSDIO_MESBUSYCTRL_ENAB_SHIFT 7 +/* Sdio Core Rev 12 */ #define SBSDIO_FUNC1_WAKEUPCTRL 0x1001E#define SBSDIO_FUNC1_WCTRL_ALPWAIT_MASK 0x1
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/321 rtl818x: fix potential use after free
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit afbb1947db94eacc5a13302eee88a9772fb78935 ]
entry is released via usb_put_urb just after calling usb_submit_urb. However, entry is used if the submission fails, resulting in a use after free bug. The patch fixes this.
--- drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c +2 -1
@@ -444,12 +444,13 @@ static int rtl8187_init_urbs(struct ieee80211_hw *dev)skb_queue_tail (&priv->rx_queue, skb);usb_anchor_urb (entry, &priv->anchored); ret =usb_submit_urb (entry,GFP_KERNEL ); -usb_put_urb (entry);if (ret) {skb_unlink (skb, &priv->rx_queue);usb_unanchor_urb (entry); +usb_put_urb (entry); goto err; } +usb_put_urb (entry); }return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/321 bcache: do not check if debug dentry is ERR or NULL explicitly on remove
In reply to Greg Kroah-HartmanFrom: Shenghui Wang <[email protected]>
[ Upstream commit ae17102316550b4b230a283febe31b2a9ff30084 ]
debugfs_remove and debugfs_remove_recursive will check if the dentry pointer is NULL or ERR, and will do nothing in that case.
Remove the check in cache_set_free and bch_debug_init.
--- drivers/md/bcache/debug.c | 3 +-- drivers/md/bcache/super.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/md/bcache/debug.c +1 -2
@@ -249,8 +249,7 @@ void bch_debug_init_cache_set(struct cache_set *c)void bch_debug_exit (void ) { -if (!IS_ERR_OR_NULL (bcache_debug)) -debugfs_remove_recursive (bcache_debug); +debugfs_remove_recursive (bcache_debug); }void __init bch_debug_init (struct kobject *kobj)
drivers/md/bcache/super.c +1 -2
@@ -1491,8 +1491,7 @@ static void cache_set_free(struct closure *cl)struct cache *ca;unsigned int i; -if (!IS_ERR_OR_NULL (c->debug)) -debugfs_remove (c->debug); +debugfs_remove (c->debug);bch_open_buckets_free (c);bch_btree_cache_free (c);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/321 bcache: do not mark writeback_running too early
In reply to Greg Kroah-HartmanFrom: Shenghui Wang <[email protected]>
[ Upstream commit 79b791466e525c98f6aeee9acf5726e7b27f4231 ]
A fresh backing device is not attached to any cache_set, and has no writeback kthread created until first attached to some cache_set.
But bch_cached_dev_writeback_init run
"
dc->writeback_running = true; WARN_ON(test_and_clear_bit(BCACHE_DEV_WB_RUNNING, &dc->disk.flags));
"
for any newly formatted backing devices.
For a fresh standalone backing device, we can get something like following even if no writeback kthread created:
------------------------
/sys/block/bcache0/bcache# cat writeback_running
1
/sys/block/bcache0/bcache# cat writeback_rate_debug
rate: 512.0k/sec
dirty: 0.0k
target: 0.0k
proportional: 0.0k
integral: 0.0k
change: 0.0k/sec
next io: -15427384ms
The none ZERO fields are misleading as no alive writeback kthread yet.
Set dc->writeback_running false as no writeback thread created in bch_cached_dev_writeback_init().
We have writeback thread created and woken up in bch_cached_dev_writeback _start(). Set dc->writeback_running true before bch_writeback_queue() called, as a writeback thread will check if dc->writeback_running is true before writing back dirty data, and hung if false detected.
After the change, we can get the following output for a fresh standalone backing device:
-----------------------/sys/block/bcache0/bcache$ cat writeback_running
0
/sys/block/bcache0/bcache# cat writeback_rate_debug
rate: 0.0k/sec
dirty: 0.0k
target: 0.0k
proportional: 0.0k
integral: 0.0k
change: 0.0k/sec
next io: 0ms
v1 -> v2:
Set dc->writeback_running before bch_writeback_queue() called,
--- drivers/md/bcache/writeback.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/bcache/writeback.c +2 -1
@@ -781,7 +781,7 @@ void bch_cached_dev_writeback_init(struct cached_dev *dc)bch_keybuf_init (&dc->writeback_keys); dc->writeback_metadata = true; - dc->writeback_running = true; + dc->writeback_running = false; dc->writeback_percent =10 ; dc->writeback_delay =30 ;atomic_long_set (&dc->writeback_rate.rate,1024 );
@@ -810,6 +810,7 @@ int bch_cached_dev_writeback_start(struct cached_dev *dc)destroy_workqueue (dc->writeback_write_wq);return PTR_ERR (dc->writeback_thread); } + dc->writeback_running = true;WARN_ON (test_and_set_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags)); schedule_delayed_work(&dc->writeback_rate_update,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/321 xfs: require both realtime inodes to mount
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
[ Upstream commit 64bafd2f1e484e27071e7584642005d56516cb77 ]
Since mkfs always formats the filesystem with the realtime bitmap and summary inodes immediately after the root directory, we should expect that both of them are present and loadable, even if there isn't a realtime volume attached. There's no reason to skip this if rbmino == NULLFSINO; in fact, this causes an immediate crash if the there /is/ a realtime volume and someone writes to it.
--- fs/xfs/xfs_rtalloc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/xfs/xfs_rtalloc.c +1 -3
@@ -1198,13 +1198,11 @@ xfs_rtmount_inodes(xfs_sb_t *sbp; sbp = &mp->m_sb; -if (sbp->sb_rbmino ==NULLFSINO ) -return 0 ; error =xfs_iget (mp,NULL , sbp->sb_rbmino,0 ,0 , &mp->m_rbmip);if (error)return error;ASSERT (mp->m_rbmip !=NULL ); -ASSERT (sbp->sb_rsumino !=NULLFSINO ); + error =xfs_iget (mp,NULL , sbp->sb_rsumino,0 ,0 , &mp->m_rsumip);if (error) {xfs_irele (mp->m_rbmip);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/321 nvme: fix kernel paging oops
In reply to Greg Kroah-HartmanFrom: Sagi Grimberg <[email protected]>
[ Upstream commit 092ff0520070fad8407b196f3bb6156ce77a6f98 ]
free the controller discard_page correctly.
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -3569,7 +3569,7 @@ static void nvme_free_ctrl(struct device *dev)ida_simple_remove (&nvme_instance_ida, ctrl->instance);kfree (ctrl->effects);nvme_mpath_uninit (ctrl); -kfree (ctrl->discard_page); +__free_page (ctrl->discard_page);if (subsys) {mutex_lock (&subsys->lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/321 ubifs: Fix default compression selection in ubifs
In reply to Greg Kroah-HartmanFrom: Gabor Juhos <[email protected]>
[ Upstream commit d62e98ed1efcaa94caa004f622944afdce5f1c3c ]
When ubifs is build without the LZO compressor and no compressor is given the creation of the default file system will fail. before selection the LZO compressor check if it is present and if not fall back to the zlib or none.
--- fs/ubifs/sb.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
fs/ubifs/sb.c +12 -1
@@ -63,6 +63,17 @@/* Default time granularity in nanoseconds */ #define DEFAULT_TIME_GRAN 1000000000 +static int get_default_compressor (struct ubifs_info *c) +{ +if (ubifs_compr_present (c,UBIFS_COMPR_LZO )) +return UBIFS_COMPR_LZO ; + +if (ubifs_compr_present (c,UBIFS_COMPR_ZLIB )) +return UBIFS_COMPR_ZLIB ; + +return UBIFS_COMPR_NONE ; +} +/** * create_default_filesystem - format empty UBI volume. * @c: UBIFS file-system description object
@@ -186,7 +197,7 @@ static int create_default_filesystem(struct ubifs_info *c)if (c->mount_opts.override_compr) sup->default_compr =cpu_to_le16 (c->mount_opts.compr_type);else - sup->default_compr =cpu_to_le16 (UBIFS_COMPR_LZO ); + sup->default_compr =cpu_to_le16 (get_default_compressor (c));generate_random_uuid (sup->uuid);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/321 ubi: Put MTD device after it is not used
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit b95f83ab762dd6211351b9140f99f43644076ca8 ]
The MTD device reference is dropped via put_mtd_device, however its field ->index is read and passed to ubi_msg. To fix this, the patch moves the reference dropping after calling ubi_msg.
--- drivers/mtd/ubi/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/ubi/build.c +1 -1
@@ -1101,10 +1101,10 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)ubi_wl_close (ubi);ubi_free_internal_volumes (ubi);vfree (ubi->vtbl); -put_mtd_device (ubi->mtd);vfree (ubi->peb_buf);vfree (ubi->fm_buf);ubi_msg (ubi,"mtd%d is detached" , ubi->mtd->index); +put_mtd_device (ubi->mtd);put_device (&ubi->dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/321 ubi: Do not drop UBI device reference before using
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit e542087701f09418702673631a908429feb3eae0 ]
The UBI device reference is dropped but then the device is used as a parameter of ubi_err. The bug is introduced in changing ubi_err's behavior. The old ubi_err does not require a UBI device as its first parameter, but the new one does.
--- drivers/mtd/ubi/kapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/ubi/kapi.c +1 -1
@@ -227,9 +227,9 @@ out_unlock: out_free:kfree (desc); out_put_ubi: -ubi_put_device (ubi);ubi_err (ubi,"cannot open device %d, volume %d, error %d" , ubi_num, vol_id, err); +ubi_put_device (ubi);return ERR_PTR (err); }EXPORT_SYMBOL_GPL (ubi_open_volume);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/321 microblaze: adjust the help to the real behavior
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit bafcc61d998c1ca18f556d92a0e95335ac68c7da ]
"make ARCH=microblaze help" mentions simpleImage.<dt>.unstrip, but it is not a real Make target. It does not work because Makefile assumes "system.unstrip" is the name of DT.
$ make ARCH=microblaze CROSS_COMPILE=microblaze-linux- simpleImage.system.unstrip [ snip ] make[1]: *** No rule to make target 'arch/microblaze/boot/dts/system.unstrip.dtb', needed by 'arch/microblaze/boot/dts/system.dtb'. Stop. make: *** [Makefile;1060: arch/microblaze/boot/dts] Error 2 make: *** Waiting for unfinished jobs....
simpleImage.<dt> works like a phony target that generates multiple images. Reflect the real behavior. I removed the DT directory path information because it is already explained a few lines below.
While I am here, I deleted the redundant *_defconfig explanation.
The top-level Makefile caters to list available defconfig files:
mmu_defconfig - Build for mmu
nommu_defconfig - Build for nommu
--- arch/microblaze/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/microblaze/Makefile +5 -5
@@ -91,11 +91,11 @@ define archhelp echo '* linux.bin - Create raw binary' echo ' linux.bin.gz - Create compressed raw binary' echo ' linux.bin.ub - Create U-Boot wrapped raw binary' - echo ' simpleImage.<dt> - ELF image with $(arch)/boot/dts/<dt>.dts linked in' - echo ' - stripped elf with fdt blob' - echo ' simpleImage.<dt>.unstrip - full ELF image with fdt blob' - echo ' *_defconfig - Select default config from arch/microblaze/configs' - echo '' + echo ' simpleImage.<dt> - Create the following images with <dt>.dtb linked in' + echo ' simpleImage.<dt> : raw image' + echo ' simpleImage.<dt>.ub : raw image with U-Boot header' + echo ' simpleImage.<dt>.unstrip: ELF (identical to vmlinux)' + echo ' simpleImage.<dt>.strip : stripped ELF' echo ' Targets with <dt> embed a device tree blob inside the image' echo ' These targets support board with firmware that does not' echo ' support passing a device tree directly. Replace <dt> with the'
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/321 microblaze: move "... is ready" messages to arch/microblaze/Makefile
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 2e14f94cf4bc2f15ca5362e81ca3a987c79e3062 ]
To prepare for more fixes, move this to arch/microblaze/Makefile. Otherwise, the same "... is ready" would be printed multiple times.
--- arch/microblaze/Makefile | 2 ++ arch/microblaze/boot/Makefile | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)
arch/microblaze/Makefile +2 -0
@@ -83,9 +83,11 @@ archclean: linux.bin linux.bin.gz linux.bin.ub: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' simpleImage.%: vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp echo '* linux.bin - Create raw binary'
arch/microblaze/boot/Makefile +0 -4
@@ -9,15 +9,12 @@ OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary $(obj)/linux.bin: vmlinux FORCE $(call if_changed,objcopy) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE $(call if_changed,uimage) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE $(call if_changed,gzip) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)
@@ -35,6 +32,5 @@ $(obj)/simpleImage.%: vmlinux FORCE $(call if_changed,objcopy) $(call if_changed,uimage) $(call if_changed,strip,.strip) - @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')' clean-files += simpleImage.*.unstrip linux.bin.ub
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/321 microblaze: fix multiple bugs in arch/microblaze/boot/Makefile
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 4722a3e6b716d9d4594c3cf3856b03bbd24a59a8 ]
This commit fixes some build issues.
The first issue is the breakage of linux.bin.ub target since commit ece97f3a5fb5 ("microblaze: Fix simpleImage format generation") because the addition of UIMAGE_{IN,OUT} affected it.
make ARCH=microblaze CROSS_COMPILE=microblaze-linux- linux.bin.ub
[ snip ]
OBJCOPY arch/microblaze/boot/linux.bin
UIMAGE arch/microblaze/boot/linux.bin.ub.ub/usr/bin/mkimage: Can't open arch/microblaze/boot/linux.bin.ub: No such file or directory make[1]: *** [arch/microblaze/boot/Makefile;14: arch/microblaze/boot/linux.bin.ub] Error 1
make: *** [arch/microblaze/Makefile;83: linux.bin.ub] Error 2
The second issue is the use of the "if_changed" multiple times for the same target.
As commit 92a4728608a8 ("x86/boot: Fix if_changed build flip/flop bug") pointed out, this never works properly. Moreover, generating multiple images as a side-effect is confusing.
Let's split the build recipe for each image.
simpleImage.<dt>*.unstrip is just a copy of vmlinux.
simpleImage.<dt> and simpleImage.<dt>.ub are created in the same way as linux.bin and linux.bin.ub, respectively.
I kept simpleImage.* recipes independent of linux.bin.* ones to not change the behavior.
Lastly, this commit fixes "make ARCH=microblaze clean". Previously, it only cleaned up the unstrip image. Now, all the simpleImage files are cleaned.
--- arch/microblaze/Makefile | 2 +- arch/microblaze/boot/Makefile | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-)
arch/microblaze/Makefile +1 -1
@@ -86,7 +86,7 @@ linux.bin linux.bin.gz linux.bin.ub: vmlinux @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' simpleImage.%: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot) $(addprefix $(boot)/$@., ub unstrip strip) @echo 'Kernel: $(boot)/$@ is ready' ' (#'`cat .version`')' define archhelp
arch/microblaze/boot/Makefile +9 -10
@@ -3,7 +3,7 @@ # arch/microblaze/boot/Makefile # -targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.% +targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.* OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary
@@ -16,21 +16,20 @@ $(obj)/linux.bin.ub: $(obj)/linux.bin FORCE $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE $(call if_changed,gzip) -quiet_cmd_cp = CP $< $@$2 - cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) - quiet_cmd_strip = STRIP $< $@$2 cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \ -K _fdt_start $< -o $@$2 UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR) -UIMAGE_IN = $@ -UIMAGE_OUT = [email protected] -$(obj)/simpleImage.%: vmlinux FORCE - $(call if_changed,cp,.unstrip) +$(obj)/simpleImage.$(DTB): vmlinux FORCE $(call if_changed,objcopy) + +$(obj)/simpleImage.$(DTB).ub: $(obj)/simpleImage.$(DTB) FORCE $(call if_changed,uimage) - $(call if_changed,strip,.strip) -clean-files += simpleImage.*.unstrip linux.bin.ub +$(obj)/simpleImage.$(DTB).unstrip: vmlinux FORCE + $(call if_changed,shipped) + +$(obj)/simpleImage.$(DTB).strip: vmlinux FORCE + $(call if_changed,strip)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/321 iwlwifi: move iwl_nvm_check_version() into dvm
In reply to Greg Kroah-HartmanFrom: Luca Coelho <[email protected]>
[ Upstream commit 64866e5da1eabd0c52ff45029b245f5465920031 ]
This function is only half-used by mvm (i.e. only the nvm_version part matters, since the calibration version is irrelevant), so it's pointless to export it from iwlwifi. If mvm uses this function, it has the additional complexity of setting the calib version to a bogus value on all cfg structs.
To avoid this, move the function to dvm and make a simple comparison of the nvm_version in mvm instead.
--- drivers/net/wireless/intel/iwlwifi/dvm/main.c | 17 +++++++++++++++++ .../wireless/intel/iwlwifi/iwl-eeprom-parse.c | 19 ------------------- .../wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 ++--- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +++- 4 files changed, 22 insertions(+), 23 deletions(-)
drivers/net/wireless/intel/iwlwifi/dvm/main.c +17 -0
@@ -1227,6 +1227,23 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)return 0 ; } +static int iwl_nvm_check_version (struct iwl_nvm_data *data, +struct iwl_trans *trans) +{ +if (data->nvm_version >= trans->cfg->nvm_ver || + data->calib_version >= trans->cfg->nvm_calib_ver) { +IWL_DEBUG_INFO (trans,"device EEPROM VER=0x%x, CALIB=0x%x\n" , + data->nvm_version, data->calib_version); +return 0 ; + } + +IWL_ERR (trans, +"Unsupported (too old) EEPROM VER=0x%x < 0x%x CALIB=0x%x < 0x%x\n" , + data->nvm_version, trans->cfg->nvm_ver, + data->calib_version, trans->cfg->nvm_calib_ver); +return -EINVAL ; +} + static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, const struct iwl_fw *fw,
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c +0 -19
@@ -928,22 +928,3 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,return NULL ; }IWL_EXPORT_SYMBOL (iwl_parse_eeprom_data); - -/* helper functions */ -int iwl_nvm_check_version (struct iwl_nvm_data *data, -struct iwl_trans *trans) -{ -if (data->nvm_version >= trans->cfg->nvm_ver || - data->calib_version >= trans->cfg->nvm_calib_ver) { -IWL_DEBUG_INFO (trans,"device EEPROM VER=0x%x, CALIB=0x%x\n" , - data->nvm_version, data->calib_version); -return 0 ; - } - -IWL_ERR (trans, -"Unsupported (too old) EEPROM VER=0x%x < 0x%x CALIB=0x%x < 0x%x\n" , - data->nvm_version, trans->cfg->nvm_ver, - data->calib_version, trans->cfg->nvm_calib_ver); -return -EINVAL ; -} -IWL_EXPORT_SYMBOL (iwl_nvm_check_version);
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h +2 -3
@@ -7,6 +7,7 @@* * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2015 Intel Mobile Communications GmbH +* Copyright (C) 2018 Intel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of version 2 of the GNU General Public License as
@@ -33,6 +34,7 @@* * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2015 Intel Mobile Communications GmbH +* Copyright (C) 2018 Intel Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@@ -122,9 +124,6 @@ struct iwl_nvm_data * iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg, const u8 *eeprom, size_t eeprom_size); -int iwl_nvm_check_version (struct iwl_nvm_data *data, -struct iwl_trans *trans); -int iwl_init_sband_channels (struct iwl_nvm_data *data,struct ieee80211_supported_band *sband,int n_channels,enum nl80211_band band);
drivers/net/wireless/intel/iwlwifi/mvm/fw.c +3 -1
@@ -547,7 +547,9 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)if (mvm->nvm_file_name)iwl_mvm_load_nvm_to_nic (mvm); -WARN_ON (iwl_nvm_check_version (mvm->nvm_data, mvm->trans)); +WARN_ONCE (mvm->nvm_data->nvm_version < mvm->trans->cfg->nvm_ver, +"Too old NVM version (0x%0x, required = 0x%0x)" , + mvm->nvm_data->nvm_version, mvm->trans->cfg->nvm_ver);/* * abort after reading the nvm in case RF Kill is on, we will complete
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/321 iwlwifi: mvm: force TCM re-evaluation on TCM resume
In reply to Greg Kroah-HartmanFrom: Avraham Stern <[email protected]>
[ Upstream commit 7bc2468277033e05401d5f8fd48a772f407338c2 ]
When traffic load is not low or low latency is active, TCM schedules re-evaluation work so in case traffic stops TCM will detect that traffic load has become low or that low latency is no longer active. However, if TCM is paused when the re-evaluation work runs, it does not re-evaluate and the re-evaluation work is no longer scheduled. As a result, TCM will not indicate that low latency is no longer active or that traffic load is low when traffic stops.
Fix this by forcing TCM re-evaluation when TCM is resumed in case low latency is active or traffic load is not low.
--- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/utils.c +14 -0
@@ -1804,6 +1804,7 @@ void iwl_mvm_pause_tcm(struct iwl_mvm *mvm, bool with_cancel)void iwl_mvm_resume_tcm (struct iwl_mvm *mvm) {int mac; +bool low_latency = false;spin_lock_bh (&mvm->tcm.lock); mvm->tcm.ts = jiffies;
@@ -1815,10 +1816,23 @@ void iwl_mvm_resume_tcm(struct iwl_mvm *mvm)memset (&mdata->tx.pkts,0 ,sizeof (mdata->tx.pkts));memset (&mdata->rx.airtime,0 ,sizeof (mdata->rx.airtime));memset (&mdata->tx.airtime,0 ,sizeof (mdata->tx.airtime)); + +if (mvm->tcm.result.low_latency[mac]) + low_latency = true; }/* The TCM data needs to be reset before "paused" flag changes */ smp_mb (); mvm->tcm.paused = false; + +/* +* if the current load is not low or low latency is active, force +* re-evaluation to cover the case of no traffic. +*/ +if (mvm->tcm.result.global_load >IWL_MVM_TRAFFIC_LOW ) +schedule_delayed_work (&mvm->tcm.work,MVM_TCM_PERIOD ); +else if (low_latency) +schedule_delayed_work (&mvm->tcm.work,MVM_LL_PERIOD ); +spin_unlock_bh (&mvm->tcm.lock); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/321 iwlwifi: pcie: fix erroneous print
In reply to Greg Kroah-HartmanFrom: Sara Sharon <[email protected]>
[ Upstream commit 0916224eaa77bff0fbbc747961d550ff8db45457 ]
When removing the driver, the following flow can happen:
1. host command is in progress, for example at index 68.
2. RX interrupt is received with the response.
3. Before it is processed, the remove flow kicks in, and calls iwl_pcie_txq_unmap. The function cleans all DMA, and promotes the read pointer to 69.
4. RX thread proceeds with the processing, and is calling iwl_pcie_cmdq_reclaim, which will print this error:
iwl_pcie_cmdq_reclaim: Read index for DMA queue txq id (0), index 4 is out of range [0-256] 69 69.
Detect this situation, and avoid the print. Change it to warning while at it, to make such issues more noticeable in the future.
--- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/tx.c +5 -5
@@ -1247,11 +1247,11 @@ static void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx)if (idx >= trans->cfg->base_params->max_tfd_queue_size || (!iwl_queue_used (txq, idx))) { -IWL_ERR (trans, -"%s: Read index for DMA queue txq id (%d), index %d is out of range [0-%d] %d %d.\n" , - __func__, txq_id, idx, - trans->cfg->base_params->max_tfd_queue_size, - txq->write_ptr, txq->read_ptr); +WARN_ONCE (test_bit (txq_id, trans_pcie->queue_used), +"%s: Read index for DMA queue txq id (%d), index %d is out of range [0-%d] %d %d.\n" , + __func__, txq_id, idx, + trans->cfg->base_params->max_tfd_queue_size, + txq->write_ptr, txq->read_ptr);return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/321 iwlwifi: pcie: set cmd_len in the correct place
In reply to Greg Kroah-HartmanFrom: Sara Sharon <[email protected]>
[ Upstream commit 956343a61226e1af3d146386f70a059feb567d0c ]
command len is set too early in the code, since when building AMSDU, the size changes. This causes the byte count table to have the wrong size.
--- .../net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +12 -12
@@ -560,18 +560,6 @@ int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,spin_lock (&txq->lock); -if (trans->cfg->device_family >=IWL_DEVICE_FAMILY_22560 ) { -struct iwl_tx_cmd_gen3 *tx_cmd_gen3 = - (void *)dev_cmd->payload; - - cmd_len =le16_to_cpu (tx_cmd_gen3->len); - }else { -struct iwl_tx_cmd_gen2 *tx_cmd_gen2 = - (void *)dev_cmd->payload; - - cmd_len =le16_to_cpu (tx_cmd_gen2->len); - } -if (iwl_queue_space (trans, txq) < txq->high_mark) {iwl_stop_queue (trans, txq);
@@ -609,6 +597,18 @@ int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,return -1 ; } +if (trans->cfg->device_family >=IWL_DEVICE_FAMILY_22560 ) { +struct iwl_tx_cmd_gen3 *tx_cmd_gen3 = + (void *)dev_cmd->payload; + + cmd_len =le16_to_cpu (tx_cmd_gen3->len); + }else { +struct iwl_tx_cmd_gen2 *tx_cmd_gen2 = + (void *)dev_cmd->payload; + + cmd_len =le16_to_cpu (tx_cmd_gen2->len); + } +/* Set up entry for this TFD in Tx byte-count array */ iwl_pcie_gen2_update_byte_tbl (trans_pcie, txq, cmd_len,iwl_pcie_gen2_get_num_tbs (trans, tfd));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/321 gpio: pca953x: Fix AI overflow on PCAL6524
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 92f45ebe68181c2d7f76633ffae55bc9447d62cd ]
The PCAL_PINCTRL_MASK is too large. The extended register block on PCAL6524, which is the largest chip with this block, has the block limited to address range 0x40..0x7f. This is because the bit 7 in the command register is used for the Address Increment functionality.
Trim the mask to 0x60 to match the datasheet and to prevent accidental overwrite of the AI bit.
--- drivers/gpio/gpio-pca953x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-pca953x.c +1 -1
@@ -58,7 +58,7 @@#define PCA_GPIO_MASK 0x00FF#define PCAL_GPIO_MASK 0x1f -#define PCAL_PINCTRL_MASK 0xe0 +#define PCAL_PINCTRL_MASK 0x60#define PCA_INT 0x0100#define PCA_PCAL 0x0200
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/321 gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit c5510b8dafce5f3f5a039c9b262ebcae0092c462 ]
If CONFIG_GPOILIB is not set, the stub of gpio_to_desc() should return the same type of error as regular version: NULL. All the callers compare the return value of gpio_to_desc() against NULL, so returned ERR_PTR would be treated as non-error case leading to dereferencing of error value.
--- include/linux/gpio/consumer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/gpio/consumer.h +1 -1
@@ -475,7 +475,7 @@ static inline int gpiod_set_consumer_name(struct gpio_desc *desc,static inline struct gpio_desc *gpio_to_desc (unsigned gpio) { -return ERR_PTR (-EINVAL ); +return NULL ; }static inline int desc_to_gpio (const struct gpio_desc *desc)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/321 kvm: vmx: Set IA32_TSC_AUX for legacy mode guests
In reply to Greg Kroah-HartmanFrom: Jim Mattson <[email protected]>
[ Upstream commit 0023ef39dc35c773c436eaa46ca539a26b308b55 ]
RDTSCP is supported in legacy mode as well as long mode. The IA32_TSC_AUX MSR should be set to the correct guest value before entering any guest that supports RDTSCP.
--- arch/x86/kvm/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx.c +3 -3
@@ -3404,9 +3404,6 @@ static void setup_msrs(struct vcpu_vmx *vmx) index =__find_msr_index (vmx,MSR_CSTAR );if (index >=0 )move_msr_up (vmx, index, save_nmsrs++); - index =__find_msr_index (vmx,MSR_TSC_AUX ); -if (index >=0 &&guest_cpuid_has (&vmx->vcpu,X86_FEATURE_RDTSCP )) -move_msr_up (vmx, index, save_nmsrs++);/* * MSR_STAR is only needed on long mode guests, and only * if efer.sce is enabled.
@@ -3419,6 +3416,9 @@ static void setup_msrs(struct vcpu_vmx *vmx) index =__find_msr_index (vmx,MSR_EFER );if (index >=0 &&update_transition_efer (vmx, index))move_msr_up (vmx, index, save_nmsrs++); + index =__find_msr_index (vmx,MSR_TSC_AUX ); +if (index >=0 &&guest_cpuid_has (&vmx->vcpu,X86_FEATURE_RDTSCP )) +move_msr_up (vmx, index, save_nmsrs++); vmx->save_nmsrs = save_nmsrs; vmx->guest_msrs_dirty = true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/321 crypto/chelsio/chtls: listen fails with multiadapt
In reply to Greg Kroah-HartmanFrom: Atul Gupta <[email protected]>
[ Upstream commit 6422ccc5fbefbd219f3fab133f698e58f5aa44eb ]
listen fails when more than one tls capable device is registered. tls_hw_hash is called for each dev which loops again for each cdev_list causing listen failure. Hence call chtls_listen_start/stop for specific device than loop over all devices.
--- drivers/crypto/chelsio/chtls/chtls.h | 5 +++ drivers/crypto/chelsio/chtls/chtls_main.c | 50 ++++++++++++++--------- 2 files changed, 36 insertions(+), 19 deletions(-)
drivers/crypto/chelsio/chtls/chtls.h +5 -0
@@ -153,6 +153,11 @@ struct chtls_dev {unsigned int cdev_state; }; +struct chtls_listen { +struct chtls_dev *cdev; +struct sock *sk; +}; +struct chtls_hws {struct sk_buff_head sk_recv_queue;u8 txqid;
drivers/crypto/chelsio/chtls/chtls_main.c +31 -19
99 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/321 VSOCK: bind to random port for VMADDR_PORT_ANY
In reply to Greg Kroah-HartmanFrom: Lepton Wu <[email protected]>
[ Upstream commit 8236b08cf50f85bbfaf48910a0b3ee68318b7c4b ]
The old code always starts from fixed port for VMADDR_PORT_ANY. Sometimes when VMM crashed, there is still orphaned vsock which is waiting for close timer, then it could cause connection time out for new started VM if they are trying to connect to same port with same guest cid since the new packets could hit that orphaned vsock. We could also fix this by doing more in vhost_vsock_reset_orphans, but any way, it should be better to start from a random local port instead of a fixed one.
--- net/vmw_vsock/af_vsock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/vmw_vsock/af_vsock.c +6 -1
@@ -107,6 +107,7 @@#include <linux/mutex.h> #include <linux/net.h> #include <linux/poll.h> +#include <linux/random.h> #include <linux/skbuff.h> #include <linux/smp.h> #include <linux/socket.h>
@@ -480,9 +481,13 @@ out:static int __vsock_bind_stream (struct vsock_sock *vsk,struct sockaddr_vm *addr) { -static u32 port =LAST_RESERVED_PORT +1 ; +static u32 port =0 ;struct sockaddr_vm new_addr; +if (!port) + port =LAST_RESERVED_PORT +1 + +prandom_u32_max (U32_MAX -LAST_RESERVED_PORT ); +vsock_addr_init (&new_addr, addr->svm_cid, addr->svm_port);if (addr->svm_port ==VMADDR_PORT_ANY ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/321 mmc: meson-gx: make sure the descriptor is stopped on errors
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
[ Upstream commit 18f92bc02f1739b5c4d5b70009fbb7eada45bca3 ]
On errors, if we don't stop the descriptor chain, it may continue to run and raise IRQ after we have called mmc_request_done(). This is bad because we won't be able to get cmd anymore and properly deal with the IRQ.
This patch makes sure the descriptor chain is stopped before calling mmc_request_done()
--- drivers/mmc/host/meson-gx-mmc.c | 73 ++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 10 deletions(-)
drivers/mmc/host/meson-gx-mmc.c +63 -10
@@ -21,6 +21,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -90,9 +91,11 @@#define CFG_CLK_ALWAYS_ON BIT(18)#define CFG_CHK_DS BIT(20)#define CFG_AUTO_CLK BIT(23) +#define CFG_ERR_ABORT BIT(27)#define SD_EMMC_STATUS 0x48#define STATUS_BUSY BIT(31) +#define STATUS_DESC_BUSY BIT(30)#define STATUS_DATI GENMASK(23, 16)#define SD_EMMC_IRQ_EN 0x4c
@@ -930,6 +933,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) cmd_cfg |=FIELD_PREP (CMD_CFG_CMD_INDEX_MASK , cmd->opcode); cmd_cfg |=CMD_CFG_OWNER ;/* owned by CPU */ + cmd_cfg |=CMD_CFG_ERROR ;/* stop in case of error */ meson_mmc_set_response_bits (cmd, &cmd_cfg);
@@ -1024,6 +1028,17 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)u32 irq_en, status, raw_status;irqreturn_t ret =IRQ_NONE ; + irq_en =readl (host->regs +SD_EMMC_IRQ_EN ); + raw_status =readl (host->regs +SD_EMMC_STATUS ); + status = raw_status & irq_en; + +if (!status) { +dev_dbg (host->dev, +"Unexpected IRQ! irq_en 0x%08x - status 0x%08x\n" , + irq_en, raw_status); +return IRQ_NONE ; + } +if (WARN_ON (!host) ||WARN_ON (!host->cmd))return IRQ_NONE ;
@@ -1031,22 +1046,18 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) cmd = host->cmd; data = cmd->data; - irq_en =readl (host->regs +SD_EMMC_IRQ_EN ); - raw_status =readl (host->regs +SD_EMMC_STATUS ); - status = raw_status & irq_en; - cmd->error =0 ;if (status &IRQ_CRC_ERR ) {dev_dbg (host->dev,"CRC Error - status 0x%08x\n" , status); cmd->error = -EILSEQ ; - ret =IRQ_HANDLED ; + ret =IRQ_WAKE_THREAD ; goto out; }if (status &IRQ_TIMEOUTS ) {dev_dbg (host->dev,"Timeout - status 0x%08x\n" , status); cmd->error = -ETIMEDOUT ; - ret =IRQ_HANDLED ; + ret =IRQ_WAKE_THREAD ; goto out; }
@@ -1071,17 +1082,49 @@ out:/* ack all enabled interrupts */ writel (irq_en, host->regs +SD_EMMC_STATUS ); +if (cmd->error) { +/* Stop desc in case of errors */ +u32 start =readl (host->regs +SD_EMMC_START ); + + start &= ~START_DESC_BUSY ; +writel (start, host->regs +SD_EMMC_START ); + } +if (ret ==IRQ_HANDLED )meson_mmc_request_done (host->mmc, cmd->mrq); -else if (ret ==IRQ_NONE ) -dev_warn (host->dev, -"Unexpected IRQ! status=0x%08x, irq_en=0x%08x\n" , - raw_status, irq_en);spin_unlock (&host->lock);return ret; } +static int meson_mmc_wait_desc_stop (struct meson_host *host) +{ +int loop; +u32 status; + +/* +* It may sometimes take a while for it to actually halt. Here, we +* are giving it 5ms to comply +* +* If we don't confirm the descriptor is stopped, it might raise new +* IRQs after we have called mmc_request_done() which is bad. +*/ +for (loop =50 ; loop; loop--) { + status =readl (host->regs +SD_EMMC_STATUS ); +if (status & (STATUS_BUSY |STATUS_DESC_BUSY )) +udelay (100 ); +else +break ; + } + +if (status & (STATUS_BUSY |STATUS_DESC_BUSY )) { +dev_err (host->dev,"Timed out waiting for host to stop\n" ); +return -ETIMEDOUT ; + } + +return 0 ; +} +static irqreturn_t meson_mmc_irq_thread (int irq,void *dev_id) {struct meson_host *host = dev_id;
@@ -1092,6 +1135,13 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)if (WARN_ON (!cmd))return IRQ_NONE ; +if (cmd->error) { +meson_mmc_wait_desc_stop (host); +meson_mmc_request_done (host->mmc, cmd->mrq); + +return IRQ_HANDLED ; + } + data = cmd->data;if (meson_mmc_bounce_buf_read (data)) { xfer_bytes = data->blksz * data->blocks;
@@ -1132,6 +1182,9 @@ static void meson_mmc_cfg_init(struct meson_host *host) cfg |=FIELD_PREP (CFG_RC_CC_MASK ,ilog2 (SD_EMMC_CFG_CMD_GAP )); cfg |=FIELD_PREP (CFG_BLK_LEN_MASK ,ilog2 (SD_EMMC_CFG_BLK_SIZE )); +/* abort chain on R/W errors */ + cfg |=CFG_ERR_ABORT ; +writel (cfg, host->regs +SD_EMMC_CFG ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/321 mtd: rawnand: sunxi: Write pageprog related opcodes to WCMD_SET
In reply to Greg Kroah-HartmanFrom: Boris Brezillon <[email protected]>
[ Upstream commit 732774437ae01d9882e60314e303898e63c7f038 ]
The opcodes used by the controller when doing batched page prog should be written in NFC_REG_WCMD_SET not FC_REG_RCMD_SET. Luckily, the default NFC_REG_WCMD_SET value matches the one we set in the driver which explains why we didn't notice the problem.
--- drivers/mtd/nand/raw/sunxi_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/sunxi_nand.c +1 -1
@@ -1397,7 +1397,7 @@ static int sunxi_nfc_hw_ecc_write_page_dma(struct mtd_info *mtd,sunxi_nfc_randomizer_enable (mtd);writel ((NAND_CMD_RNDIN <<8 ) |NAND_CMD_PAGEPROG , - nfc->regs +NFC_REG_RCMD_SET ); + nfc->regs +NFC_REG_WCMD_SET );dma_async_issue_pending (nfc->dmac);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/321 usb: ehci-omap: Fix deferred probe for phy handling
In reply to Greg Kroah-HartmanFrom: Roger Quadros <[email protected]>
[ Upstream commit 8dc7623bf608495b6e6743e805807c7840673573 ]
PHY model is being used on omap5 platforms even if port mode is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required or not based on PHY mode.
If PHY is provided in device tree, it must be required. So, if devm_usb_get_phy_by_phandle() gives us an error code other than -ENODEV (no PHY) then error out.
This fixes USB Ethernet on omap5-uevm if PHY happens to probe after EHCI thus causing a -EPROBE_DEFER.
--- drivers/usb/host/ehci-omap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/host/ehci-omap.c +4 -3
@@ -159,11 +159,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)/* get the PHY device */ phy =devm_usb_get_phy_by_phandle (dev,"phys" , i);if (IS_ERR (phy)) { -/* Don't bail out if PHY is not absolutely necessary */ -if (pdata->port_mode[i] !=OMAP_EHCI_PORT_MODE_PHY ) + ret =PTR_ERR (phy); +if (ret == -ENODEV ) {/* no PHY */ + phy =NULL ;continue ; + } - ret =PTR_ERR (phy);if (ret != -EPROBE_DEFER )dev_err (dev,"Can't get PHY for port %d: %d\n" , i, ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/321 btrfs: Check for missing device before bio submission in btrfs_map_bio
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
[ Upstream commit fc8a168aa9ab1680c2bd52bf9db7c994e0f2524f ]
Before btrfs_map_bio submits all stripe bios it does a number of checks to ensure the device for every stripe is present. However, it doesn't do a DEV_STATE_MISSING check, instead this is relegated to the lower level btrfs_schedule_bio (in the async submission case, sync submission doesn't check DEV_STATE_MISSING at all). Additionally btrfs_schedule_bios does the duplicate device->bdev check which has already been performed in btrfs_map_bio.
This patch moves the DEV_STATE_MISSING check in btrfs_map_bio and removes the duplicate device->bdev check. Doing so ensures that no bio cloning/submission happens for both async/sync requests in the face of missing device. This makes the async io submission path slightly shorter in terms of instruction count. No functional changes.
--- fs/btrfs/volumes.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
fs/btrfs/volumes.c +2 -7
@@ -6106,12 +6106,6 @@ static noinline void btrfs_schedule_bio(struct btrfs_device *device,int should_queue =1 ;struct btrfs_pending_bios *pending_bios; -if (test_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state) || - !device->bdev) { -bio_io_error (bio); -return ; - } -/* don't bother with additional async steps for reads, right now */ if (bio_op (bio) ==REQ_OP_READ ) {btrfsic_submit_bio (bio);
@@ -6240,7 +6234,8 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,for (dev_nr =0 ; dev_nr < total_devs; dev_nr++) { dev = bbio->stripes[dev_nr].dev; -if (!dev || !dev->bdev || +if (!dev || !dev->bdev ||test_bit (BTRFS_DEV_STATE_MISSING , + &dev->dev_state) || (bio_op (first_bio) ==REQ_OP_WRITE && !test_bit (BTRFS_DEV_STATE_WRITEABLE , &dev->dev_state))) {bbio_error (bbio, first_bio, logical);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/321 btrfs: fix ncopies raid_attr for RAID56
In reply to Greg Kroah-HartmanFrom: Hans van Kranenburg <[email protected]>
[ Upstream commit da612e31aee51bd13231c78a47c714b543bd3ad8 ]
RAID5 and RAID6 profile store one copy of the data, not 2 or 3. These values are not yet used anywhere so there's no change.
--- fs/btrfs/volumes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/volumes.c +2 -2
@@ -96,7 +96,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .devs_min = 2, .tolerated_failures = 1, .devs_increment = 1, - .ncopies = 2, + .ncopies = 1, .raid_name = "raid5", .bg_flag = BTRFS_BLOCK_GROUP_RAID5, .mindev_error = BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET,
@@ -108,7 +108,7 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { .devs_min = 3, .tolerated_failures = 2, .devs_increment = 1, - .ncopies = 3, + .ncopies = 1, .raid_name = "raid6", .bg_flag = BTRFS_BLOCK_GROUP_RAID6, .mindev_error = BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/321 btrfs: dev-replace: set result code of cancel by status of scrub
In reply to Greg Kroah-HartmanFrom: Anand Jain <[email protected]>
[ Upstream commit b47dda2ef6d793b67fd5979032dcd106e3f0a5c9 ]
The device-replace needs to check the result code of the scrub workers in btrfs_dev_replace_cancel and distinguish if successful cancel operation and when the there was no operation running.
If btrfs_scrub_cancel() fails, return BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED so that user can try to cancel the replace again.
--- fs/btrfs/dev-replace.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
fs/btrfs/dev-replace.c +14 -7
@@ -810,16 +810,23 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info)btrfs_dev_replace_write_unlock (dev_replace);break ;case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED : - result =BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR ; tgt_device = dev_replace->tgtdev; src_device = dev_replace->srcdev;btrfs_dev_replace_write_unlock (dev_replace); -btrfs_scrub_cancel (fs_info); -/* btrfs_dev_replace_finishing() will handle the cleanup part */ -btrfs_info_in_rcu (fs_info, -"dev_replace from %s (devid %llu) to %s canceled" , -btrfs_dev_name (src_device), src_device->devid, -btrfs_dev_name (tgt_device)); + ret =btrfs_scrub_cancel (fs_info); +if (ret <0 ) { + result =BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED ; + }else { + result =BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR ; +/* +* btrfs_dev_replace_finishing() will handle the +* cleanup part +*/ +btrfs_info_in_rcu (fs_info, +"dev_replace from %s (devid %llu) to %s canceled" , +btrfs_dev_name (src_device), src_device->devid, +btrfs_dev_name (tgt_device)); + }break ;case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED :/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/321 Btrfs: allow clear_extent_dirty() to receive a cached extent state record
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 0e6ec385b55f6001da8c6b1532494241e52c550d ]
We can have a lot freed extents during the life span of transaction, so the red black tree that keeps track of the ranges of each freed extent (fs_info->freed_extents[]) can get quite big. When finishing a transaction commit we find each range, process it (discard the extents, unpin them) and then remove it from the red black tree.
We can use an extent state record as a cache when searching for a range, so that when we clean the range we can use the cached extent state we passed to the search function instead of iterating the red black tree again. Doing things as fast as possible when finishing a transaction (in state TRANS_STATE_UNBLOCKED) is convenient as it reduces the time we block another task that wants to commit the next transaction.
So change clear_extent_dirty() to allow an optional extent state record to be passed as an argument, which will be passed down to __clear_extent_bit.
--- fs/btrfs/disk-io.c | 7 +++++-- fs/btrfs/extent-tree.c | 7 +++++-- fs/btrfs/extent_io.h | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-)
fs/btrfs/disk-io.c +5 -2
@@ -4350,6 +4350,8 @@ static int btrfs_destroy_pinned_extent(struct btrfs_fs_info *fs_info, unpin = pinned_extents; again:while (1 ) { +struct extent_state *cached_state =NULL ; +/* * The btrfs_finish_extent_commit() may get the same range as * ours between find_first_extent_bit and clear_extent_dirty.
@@ -4358,13 +4360,14 @@ again:*/ mutex_lock (&fs_info->unused_bg_unpin_mutex); ret =find_first_extent_bit (unpin,0 , &start, &end, -EXTENT_DIRTY ,NULL ); +EXTENT_DIRTY , &cached_state);if (ret) {mutex_unlock (&fs_info->unused_bg_unpin_mutex);break ; } -clear_extent_dirty (unpin, start, end); +clear_extent_dirty (unpin, start, end, &cached_state); +free_extent_state (cached_state);btrfs_error_unpin_extent_range (fs_info, start, end);mutex_unlock (&fs_info->unused_bg_unpin_mutex);cond_resched ();
fs/btrfs/extent-tree.c +5 -2
@@ -6618,9 +6618,11 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans) unpin = &fs_info->freed_extents[0 ];while (!trans->aborted) { +struct extent_state *cached_state =NULL ; +mutex_lock (&fs_info->unused_bg_unpin_mutex); ret =find_first_extent_bit (unpin,0 , &start, &end, -EXTENT_DIRTY ,NULL ); +EXTENT_DIRTY , &cached_state);if (ret) {mutex_unlock (&fs_info->unused_bg_unpin_mutex);break ;
@@ -6630,9 +6632,10 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans) ret =btrfs_discard_extent (fs_info, start, end +1 - start,NULL ); -clear_extent_dirty (unpin, start, end); +clear_extent_dirty (unpin, start, end, &cached_state);unpin_extent_range (fs_info, start, end, true);mutex_unlock (&fs_info->unused_bg_unpin_mutex); +free_extent_state (cached_state);cond_resched (); }
fs/btrfs/extent_io.h +2 -2
@@ -348,11 +348,11 @@ static inline int set_extent_dirty(struct extent_io_tree *tree, u64 start, }static inline int clear_extent_dirty (struct extent_io_tree *tree,u64 start, -u64 end) +u64 end,struct extent_state **cached) {return clear_extent_bit (tree, start, end,EXTENT_DIRTY |EXTENT_DELALLOC | -EXTENT_DO_ACCOUNTING ,0 ,0 ,NULL ); +EXTENT_DO_ACCOUNTING ,0 ,0 , cached); } int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/321 btrfs: only track ref_heads in delayed_ref_updates
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 158ffa364bf723fa1ef128060646d23dc3942994 ]
We use this number to figure out how many delayed refs to run, but __btrfs_run_delayed_refs really only checks every time we need a new delayed ref head, so we always run at least one ref head completely no matter what the number of items on it. Fix the accounting to only be adjusted when we add/remove a ref head.
In addition to using this number to limit the number of delayed refs run, a future patch is also going to use it to calculate the amount of space required for delayed refs space reservation.
--- fs/btrfs/delayed-ref.c | 3 --- 1 file changed, 3 deletions(-)
fs/btrfs/delayed-ref.c +0 -3
@@ -234,8 +234,6 @@ static inline void drop_delayed_ref(struct btrfs_trans_handle *trans, ref->in_tree =0 ;btrfs_put_delayed_ref (ref);atomic_dec (&delayed_refs->num_entries); -if (trans->delayed_ref_updates) - trans->delayed_ref_updates--; } static bool merge_ref(struct btrfs_trans_handle *trans,
@@ -446,7 +444,6 @@ inserted:if (ref->action ==BTRFS_ADD_DELAYED_REF )list_add_tail (&ref->add_list, &href->ref_add_list);atomic_inc (&root->num_entries); - trans->delayed_ref_updates++;spin_unlock (&href->lock);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/321 serial: sh-sci: Fix crash in rx_timer_fn() on PIO fallback
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2e948218b7c1262a3830823d6620eb227e3d4e3a ]
When falling back to PIO, active_rx must be set to a different value than cookie_rx[i], else sci_dma_rx_find_active() will incorrectly find a match, leading to a NULL pointer dereference in rx_timer_fn() later.
Use zero instead, which is the same value as after driver initialization.
--- drivers/tty/serial/sh-sci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/sh-sci.c +1 -1
@@ -1359,7 +1359,7 @@ fail:dmaengine_terminate_async (chan);for (i =0 ; i <2 ; i++) s->cookie_rx[i] = -EINVAL ; - s->active_rx = -EINVAL ; + s->active_rx =0 ; s->chan_rx =NULL ;sci_start_rx (port);if (!port_lock_held)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/321 HID: intel-ish-hid: fixes incorrect error handling
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
[ Upstream commit 6e0856d317440a950b17c00a9283114f025e5699 ]
The memory chunk allocated by hid_allocate_device() should be released by hid_destroy_device(), not kfree().
--- drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/intel-ish-hid/ishtp-hid.c +1 -1
@@ -222,7 +222,7 @@ int ishtp_hid_probe(unsigned int cur_hid_dev, err_hid_device:kfree (hid_data); err_hid_data: -kfree (hid); +hid_destroy_device (hid);return rv; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/321 gpio: raspberrypi-exp: decrease refcount on firmware dt node
In reply to Greg Kroah-HartmanFrom: Nicolas Saenz Julienne <[email protected]>
[ Upstream commit 85af74c474b21940e88483fd48f6094145c89d97 ]
We're getting a reference RPi's firmware node in order to be able to communicate with it's driver. We should decrease the reference count on the dt node after being done with it.
--- drivers/gpio/gpio-raspberrypi-exp.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpio-raspberrypi-exp.c +1 -0
@@ -206,6 +206,7 @@ static int rpi_exp_gpio_probe(struct platform_device *pdev) } fw =rpi_firmware_get (fw_node); +of_node_put (fw_node);if (!fw)return -EPROBE_DEFER ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/321 serial: 8250: Rate limit serial port rx interrupts during input overruns
In reply to Greg Kroah-HartmanFrom: Darwin Dingel <[email protected]>
[ Upstream commit 6d7f677a2afa1c82d7fc7af7f9159cbffd5dc010 ]
When a serial port gets faulty or gets flooded with inputs, its interrupt handler starts to work double time to get the characters to the workqueue for the tty layer to handle them. When this busy time on the serial/tty subsystem happens during boot, where it is also busy on the userspace trying to initialise, some processes can continuously get preempted and will be on hold until the interrupts subside.
The fix is to backoff on processing received characters for a specified amount of time when an input overrun is seen (received a new character before the previous one is processed). This only stops receive and will continue to transmit characters to serial port. After the backoff period is done, it receive will be re-enabled. This is optional and will only be enabled by setting 'overrun-throttle-ms' in the dts.
--- drivers/tty/serial/8250/8250_core.c | 25 +++++++++++++++++++++++++ drivers/tty/serial/8250/8250_fsl.c | 23 ++++++++++++++++++++++- drivers/tty/serial/8250/8250_of.c | 5 +++++ include/linux/serial_8250.h | 4 ++++ 4 files changed, 56 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_core.c +25 -0
@@ -946,6 +946,21 @@ static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port *return NULL ; } +static void serial_8250_overrun_backoff_work (struct work_struct *work) +{ +struct uart_8250_port *up = + container_of(to_delayed_work(work), struct uart_8250_port, + overrun_backoff); +struct uart_port *port = &up->port; +unsigned long flags; + +spin_lock_irqsave (&port->lock, flags); + up->ier |=UART_IER_RLSI |UART_IER_RDI ; + up->port.read_status_mask |=UART_LSR_DR ; +serial_out (up,UART_IER , up->ier); +spin_unlock_irqrestore (&port->lock, flags); +} +/** * serial8250_register_8250_port - register a serial port * @up: serial port template
@@ -1060,6 +1075,16 @@ int serial8250_register_8250_port(struct uart_8250_port *up) ret =0 ; } } + +/* Initialise interrupt backoff work if required */ +if (up->overrun_backoff_time_ms >0 ) { + uart->overrun_backoff_time_ms = up->overrun_backoff_time_ms; +INIT_DELAYED_WORK (&uart->overrun_backoff, + serial_8250_overrun_backoff_work); + }else { + uart->overrun_backoff_time_ms =0 ; + } +mutex_unlock (&serial_mutex);return ret;
drivers/tty/serial/8250/8250_fsl.c +22 -1
@@ -45,8 +45,29 @@ int fsl8250_handle_irq(struct uart_port *port) lsr = orig_lsr = up->port.serial_in (&up->port,UART_LSR ); -if (lsr & (UART_LSR_DR |UART_LSR_BI )) +/* Process incoming characters first */ +if ((lsr & (UART_LSR_DR |UART_LSR_BI )) && + (up->ier & (UART_IER_RLSI |UART_IER_RDI ))) { lsr =serial8250_rx_chars (up, lsr); + } + +/* Stop processing interrupts on input overrun */ +if ((orig_lsr &UART_LSR_OE ) && (up->overrun_backoff_time_ms >0 )) { +unsigned long delay; + + up->ier = port->serial_in (port,UART_IER ); +if (up->ier & (UART_IER_RLSI |UART_IER_RDI )) { + port->ops->stop_rx (port); + }else { +/* Keep restarting the timer until +* the input overrun subsides. +*/ +cancel_delayed_work (&up->overrun_backoff); + } + + delay =msecs_to_jiffies (up->overrun_backoff_time_ms); +schedule_delayed_work (&up->overrun_backoff, delay); + }serial8250_modem_status (up);
drivers/tty/serial/8250/8250_of.c +5 -0
@@ -244,6 +244,11 @@ static int of_platform_serial_probe(struct platform_device *ofdev)if (of_property_read_bool (ofdev->dev.of_node,"auto-flow-control" )) port8250.capabilities |=UART_CAP_AFE ; +if (of_property_read_u32 (ofdev->dev.of_node, +"overrun-throttle-ms" , + &port8250.overrun_backoff_time_ms) !=0 ) + port8250.overrun_backoff_time_ms =0 ; + ret =serial8250_register_8250_port (&port8250);if (ret <0 ) goto err_dispose;
include/linux/serial_8250.h +4 -0
@@ -134,6 +134,10 @@ struct uart_8250_port {void (*dl_write)(struct uart_8250_port *,int );struct uart_8250_em485 *em485; + +/* Serial port overrun backoff */ +struct delayed_work overrun_backoff; +u32 overrun_backoff_time_ms; };static inline struct uart_8250_port *up_to_u8250p (struct uart_port *up)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/321 kprobes/x86/xen: blacklist non-attachable xen interrupt functions
In reply to Greg Kroah-HartmanFrom: Andrea Righi <[email protected]>
[ Upstream commit bf9445a33ae6ac2f0822d2f1ce1365408387d568 ]
Blacklist symbols in Xen probe-prohibited areas, so that user can see these prohibited symbols in debugfs.
See also: a50480cb6d61.
--- arch/x86/xen/xen-asm_64.S | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/xen/xen-asm_64.S +2 -0
@@ -12,6 +12,7 @@ #include <asm/segment.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> +#include <asm/asm.h> #include <xen/interface/xen.h>
@@ -24,6 +25,7 @@ ENTRY(xen_\name) pop %r11 jmp \name END(xen_\name) +_ASM_NOKPROBE(xen_\name) .endm xen_pv_trap divide_error
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/321 xen/pciback: Check dev_data before using it
In reply to Greg Kroah-HartmanFrom: Ross Lagerwall <[email protected]>
[ Upstream commit 1669907e3d1abfa3f7586e2d55dbbc117b5adba2 ]
If pcistub_init_device fails, the release function will be called with dev_data set to NULL. Check it before using it to avoid a NULL pointer dereference.
--- drivers/xen/xen-pciback/pci_stub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/xen/xen-pciback/pci_stub.c +2 -1
@@ -106,7 +106,8 @@ static void pcistub_device_release(struct kref *kref)* is called from "unbind" which takes a device_lock mutex. */ __pci_reset_function_locked (dev); -if (pci_load_and_free_saved_state (dev, &dev_data->pci_saved_state)) +if (dev_data && +pci_load_and_free_saved_state (dev, &dev_data->pci_saved_state))dev_info (&dev->dev,"Could not reload PCI state\n" );else pci_restore_state (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/321 kprobes: Blacklist symbols in arch-defined prohibited area
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit fb1a59fae8baa3f3c69b72a87ff94fc4fa5683ec ]
Blacklist symbols in arch-defined probe-prohibited areas. With this change, user can see all symbols which are prohibited to probe in debugfs.
All archtectures which have custom prohibit areas should define its own arch_populate_kprobe_blacklist() function, but unless that, all symbols marked __kprobes are blacklisted.
--- include/linux/kprobes.h | 3 ++ kernel/kprobes.c | 67 ++++++++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 14 deletions(-)
include/linux/kprobes.h +3 -0
@@ -243,10 +243,13 @@ extern int arch_init_kprobes(void);extern void show_registers (struct pt_regs *regs);extern void kprobes_inc_nmissed_count (struct kprobe *p);extern bool arch_within_kprobe_blacklist (unsigned long addr); +extern int arch_populate_kprobe_blacklist (void );extern bool arch_kprobe_on_func_entry (unsigned long offset);extern bool kprobe_on_func_entry (kprobe_opcode_t *addr,const char *sym,unsigned long offset);extern bool within_kprobe_blacklist (unsigned long addr); +extern int kprobe_add_ksym_blacklist (unsigned long entry); +extern int kprobe_add_area_blacklist (unsigned long start,unsigned long end);struct kprobe_insn_cache {struct mutex mutex;
kernel/kprobes.c +53 -14
85 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/321 kprobes/x86: Show x86-64 specific blacklisted symbols correctly
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit fe6e65615415987629a2dda583b4495677d8c388 ]
Show x86-64 specific blacklisted symbols in debugfs.
Since x86-64 prohibits probing on symbols which are in entry text, those should be shown.
--- arch/x86/kernel/kprobes/core.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kernel/kprobes/core.c +6 -0
@@ -1140,6 +1140,12 @@ bool arch_within_kprobe_blacklist(unsigned long addr) is_in_entry_trampoline_section; } +int __init arch_populate_kprobe_blacklist (void ) +{ +return kprobe_add_area_blacklist ((unsigned long )__entry_text_start, + (unsigned long )__entry_text_end); +} +int __init arch_init_kprobes (void ) {return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/321 vfio-mdev/samples: Use u8 instead of char for handle functions
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 8ba35b3a0046d6573c98f00461d9bd1b86250d35 ]
Clang warns:
samples/vfio-mdev/mtty.c:592:39: warning: implicit conversion from 'int' to 'char' changes value from 162 to -94 [-Wconstant-conversion]
*buf = UART_MSR_DSR | UART_MSR_DDSR | UART_MSR_DCD;
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~1 warning generated.
Turns out that all uses of buf in this function ultimately end up stored or cast to an unsigned type. Just use u8, which has the same number of bits but can store this larger number so Clang no longer warns.
--- samples/vfio-mdev/mtty.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
samples/vfio-mdev/mtty.c +13 -13
@@ -171,7 +171,7 @@ static struct mdev_state *find_mdev_state_by_uuid(uuid_le uuid)return NULL ; } -void dump_buffer (char *buf,uint32_t count) +void dump_buffer (u8 *buf,uint32_t count) {#if defined(DEBUG )int i;
@@ -250,7 +250,7 @@ static void mtty_create_config_space(struct mdev_state *mdev_state) }static void handle_pci_cfg_write (struct mdev_state *mdev_state,u16 offset, -char *buf,u32 count) +u8 *buf,u32 count) {u32 cfg_addr, bar_mask, bar_index =0 ;
@@ -304,7 +304,7 @@ static void handle_pci_cfg_write(struct mdev_state *mdev_state, u16 offset, }static void handle_bar_write (unsigned int index,struct mdev_state *mdev_state, -u16 offset,char *buf,u32 count) +u16 offset,u8 *buf,u32 count) {u8 data = *buf;
@@ -475,7 +475,7 @@ static void handle_bar_write(unsigned int index, struct mdev_state *mdev_state, }static void handle_bar_read (unsigned int index,struct mdev_state *mdev_state, -u16 offset,char *buf,u32 count) +u16 offset,u8 *buf,u32 count) {/* Handle read requests by guest */ switch (offset) {
@@ -650,7 +650,7 @@ static void mdev_read_base(struct mdev_state *mdev_state) } } -static ssize_t mdev_access (struct mdev_device *mdev,char *buf,size_t count, +static ssize_t mdev_access (struct mdev_device *mdev,u8 *buf,size_t count,loff_t pos,bool is_write) {struct mdev_state *mdev_state;
@@ -698,7 +698,7 @@ static ssize_t mdev_access(struct mdev_device *mdev, char *buf, size_t count,#if defined(DEBUG_REGS )pr_info ("%s: BAR%d WR @0x%llx %s val:0x%02x dlab:%d\n" , __func__, index, offset, wr_reg[offset], - (u8)*buf, mdev_state->s[index].dlab); + *buf, mdev_state->s[index].dlab);#endif handle_bar_write (index, mdev_state, offset, buf, count); }else {
@@ -708,7 +708,7 @@ static ssize_t mdev_access(struct mdev_device *mdev, char *buf, size_t count,#if defined(DEBUG_REGS )pr_info ("%s: BAR%d RD @0x%llx %s val:0x%02x dlab:%d\n" , __func__, index, offset, rd_reg[offset], - (u8)*buf, mdev_state->s[index].dlab); + *buf, mdev_state->s[index].dlab);#endif }break ;
@@ -827,7 +827,7 @@ ssize_t mtty_read(struct mdev_device *mdev, char __user *buf, size_t count,if (count >=4 && !(*ppos %4 )) {u32 val; - ret =mdev_access (mdev, (char *)&val,sizeof (val), + ret =mdev_access (mdev, (u8 *)&val,sizeof (val), *ppos, false);if (ret <=0 ) goto read_err;
@@ -839,7 +839,7 @@ ssize_t mtty_read(struct mdev_device *mdev, char __user *buf, size_t count, }else if (count >=2 && !(*ppos %2 )) {u16 val; - ret =mdev_access (mdev, (char *)&val,sizeof (val), + ret =mdev_access (mdev, (u8 *)&val,sizeof (val), *ppos, false);if (ret <=0 ) goto read_err;
@@ -851,7 +851,7 @@ ssize_t mtty_read(struct mdev_device *mdev, char __user *buf, size_t count, }else {u8 val; - ret =mdev_access (mdev, (char *)&val,sizeof (val), + ret =mdev_access (mdev, (u8 *)&val,sizeof (val), *ppos, false);if (ret <=0 ) goto read_err;
@@ -889,7 +889,7 @@ ssize_t mtty_write(struct mdev_device *mdev, const char __user *buf,if (copy_from_user (&val, buf,sizeof (val))) goto write_err; - ret =mdev_access (mdev, (char *)&val,sizeof (val), + ret =mdev_access (mdev, (u8 *)&val,sizeof (val), *ppos, true);if (ret <=0 ) goto write_err;
@@ -901,7 +901,7 @@ ssize_t mtty_write(struct mdev_device *mdev, const char __user *buf,if (copy_from_user (&val, buf,sizeof (val))) goto write_err; - ret =mdev_access (mdev, (char *)&val,sizeof (val), + ret =mdev_access (mdev, (u8 *)&val,sizeof (val), *ppos, true);if (ret <=0 ) goto write_err;
@@ -913,7 +913,7 @@ ssize_t mtty_write(struct mdev_device *mdev, const char __user *buf,if (copy_from_user (&val, buf,sizeof (val))) goto write_err; - ret =mdev_access (mdev, (char *)&val,sizeof (val), + ret =mdev_access (mdev, (u8 *)&val,sizeof (val), *ppos, true);if (ret <=0 ) goto write_err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/321 memory: omap-gpmc: Get the header of the enum
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit a0752e9c3097b2c4fccd618802938e0951038dfa ]
Commit 21abf103818a
("gpio: Pass a flag to gpiochip_request_own_desc()") started to pass an enum gpiod_flags but this file is not including the header file that defines that enum and the compiler spits:
drivers/memory/omap-gpmc.c: In function
'gpmc_probe_generic_child':drivers/memory/omap-gpmc.c:2174:9: error: type of formal
parameter 4 is incomplete
0);
^--- drivers/memory/omap-gpmc.c | 1 + 1 file changed, 1 insertion(+)
drivers/memory/omap-gpmc.c +1 -0
@@ -21,6 +21,7 @@#include <linux/spinlock.h> #include <linux/io.h> #include <linux/gpio/driver.h> +#include <linux/gpio/consumer.h> /* GPIO descriptor enum */ #include <linux/interrupt.h> #include <linux/irqdomain.h> #include <linux/platform_device.h>
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/321 pinctrl: xway: fix gpio-hog related boot issues
In reply to Greg Kroah-HartmanFrom: Martin Schiller <[email protected]>
[ Upstream commit 9b4924da4711674e62d97d4f5360446cc78337af ]
This patch is based on commit a86caa9ba5d7 ("pinctrl: msm: fix gpio-hog related boot issues").
It fixes the issue that the gpio ranges needs to be defined before gpiochip_add().
Therefore, we also have to swap the order of registering the pinctrl driver and registering the gpio chip.
You also have to add the "gpio-ranges" property to the pinctrl device node to get it finally working.
--- drivers/pinctrl/pinctrl-xway.c | 39 +++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 12 deletions(-)
drivers/pinctrl/pinctrl-xway.c +27 -12
@@ -1746,14 +1746,6 @@ static int pinmux_xway_probe(struct platform_device *pdev) } xway_pctrl_desc.pins = xway_info.pads; -/* register the gpio chip */ - xway_chip.parent = &pdev->dev; - ret =devm_gpiochip_add_data (&pdev->dev, &xway_chip,NULL ); -if (ret) { -dev_err (&pdev->dev,"Failed to register gpio chip\n" ); -return ret; - } -/* setup the data needed by pinctrl */ xway_pctrl_desc.name =dev_name (&pdev->dev); xway_pctrl_desc.npins = xway_chip.ngpio;
@@ -1775,10 +1767,33 @@ static int pinmux_xway_probe(struct platform_device *pdev)return ret; } -/* finish with registering the gpio range in pinctrl */ - xway_gpio_range.npins = xway_chip.ngpio; - xway_gpio_range.base = xway_chip.base; -pinctrl_add_gpio_range (xway_info.pctrl, &xway_gpio_range); +/* register the gpio chip */ + xway_chip.parent = &pdev->dev; + xway_chip.owner =THIS_MODULE ; + xway_chip.of_node = pdev->dev.of_node; + ret =devm_gpiochip_add_data (&pdev->dev, &xway_chip,NULL ); +if (ret) { +dev_err (&pdev->dev,"Failed to register gpio chip\n" ); +return ret; + } + +/* +* For DeviceTree-supported systems, the gpio core checks the +* pinctrl's device node for the "gpio-ranges" property. +* If it is present, it takes care of adding the pin ranges +* for the driver. In this case the driver can skip ahead. +* +* In order to remain compatible with older, existing DeviceTree +* files which don't set the "gpio-ranges" property or systems that +* utilize ACPI the driver has to call gpiochip_add_pin_range(). +*/ +if (!of_property_read_bool (pdev->dev.of_node,"gpio-ranges" )) { +/* finish with registering the gpio range in pinctrl */ + xway_gpio_range.npins = xway_chip.ngpio; + xway_gpio_range.base = xway_chip.base; +pinctrl_add_gpio_range (xway_info.pctrl, &xway_gpio_range); + } +dev_info (&pdev->dev,"Init done\n" );return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/321 net/mlx5: Continue driver initialization despite debugfs failure
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 199fa087dc6b503baad06712716fac645a983e8a ]
The failure to create debugfs entry is unpleasant event, but not enough to abort drier initialization. Align the mlx5_core code to debugfs design and continue execution whenever debugfs_create_dir() successes or not.
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +3 -5
@@ -859,11 +859,9 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv) priv->numa_node =dev_to_node (&dev->pdev->dev); - priv->dbg_root =debugfs_create_dir (dev_name (&pdev->dev), mlx5_debugfs_root); -if (!priv->dbg_root) { -dev_err (&pdev->dev,"Cannot create debugfs dir, aborting\n" ); -return -ENOMEM ; - } +if (mlx5_debugfs_root) + priv->dbg_root = +debugfs_create_dir (pci_name (pdev), mlx5_debugfs_root); err =mlx5_pci_enable_device (dev);if (err) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/321 netfilter: nf_nat_sip: fix RTP/RTCP source port translations
In reply to Greg Kroah-HartmanFrom: Alin Nastac <[email protected]>
[ Upstream commit 8294059931448aa1ca112615bdffa3eab552c382 ]
Each media stream negotiation between 2 SIP peers will trigger creation of 4 different expectations (2 RTP and 2 RTCP):
- INVITE will create expectations for the media packets sent by the called peer
- reply to the INVITE will create expectations for media packets sent by the caller
The dport used by these expectations usually match the ones selected by the SIP peers, but they might get translated due to conflicts with another expectation. When such event occur, it is important to do this translation in both directions, dport translation on the receiving path and sport translation on the sending path.
This commit fixes the sport translation when the peer requiring it is also the one that starts the media stream. In this scenario, first media stream packet is forwarded from LAN to WAN and will rely on nf_nat_sip_expected() to do the necessary sport translation. However, the expectation matched by this packet does not contain the necessary information for doing SNAT, this data being stored in the paired expectation created by the sender's SIP message (INVITE or reply to it).
--- net/netfilter/nf_nat_sip.c | 39 ++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-)
net/netfilter/nf_nat_sip.c +35 -4
@@ -18,6 +18,7 @@#include <net/netfilter/nf_nat.h> #include <net/netfilter/nf_nat_helper.h> +#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_helper.h> #include <net/netfilter/nf_conntrack_expect.h> #include <net/netfilter/nf_conntrack_seqadj.h>
@@ -316,6 +317,9 @@ static void nf_nat_sip_seq_adjust(struct sk_buff *skb, unsigned int protoff,static void nf_nat_sip_expected (struct nf_conn *ct,struct nf_conntrack_expect *exp) { +struct nf_conn_help *help =nfct_help (ct->master); +struct nf_conntrack_expect *pair_exp; +int range_set_for_snat =0 ;struct nf_nat_range2 range;/* This must be a fresh one. */
@@ -327,15 +331,42 @@ static void nf_nat_sip_expected(struct nf_conn *ct, range.min_addr = range.max_addr = exp->saved_addr;nf_nat_setup_info (ct, &range,NF_NAT_MANIP_DST ); -/* Change src to where master sends to, but only if the connection -* actually came from the same source. */ -if (nf_inet_addr_cmp (&ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.src.u3, +/* Do media streams SRC manip according with the parameters +* found in the paired expectation. +*/ +if (exp->class !=SIP_EXPECT_SIGNALLING ) { +spin_lock_bh (&nf_conntrack_expect_lock); +hlist_for_each_entry (pair_exp, &help->expectations, lnode) { +if (pair_exp->tuple.src.l3num ==nf_ct_l3num (ct) && + pair_exp->tuple.dst.protonum == ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.dst.protonum && +nf_inet_addr_cmp (&ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.src.u3, &pair_exp->saved_addr) && + ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.src.u.all == pair_exp->saved_proto.all) { + range.flags = (NF_NAT_RANGE_MAP_IPS |NF_NAT_RANGE_PROTO_SPECIFIED ); + range.min_proto.all = range.max_proto.all = pair_exp->tuple.dst.u.all; + range.min_addr = range.max_addr = pair_exp->tuple.dst.u3; + range_set_for_snat =1 ; +break ; + } + } +spin_unlock_bh (&nf_conntrack_expect_lock); + } + +/* When no paired expectation has been found, change src to +* where master sends to, but only if the connection actually came +* from the same source. +*/ +if (!range_set_for_snat && +nf_inet_addr_cmp (&ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple.src.u3, &ct->master->tuplehash[exp->dir].tuple.src.u3)) { range.flags =NF_NAT_RANGE_MAP_IPS ; range.min_addr = range.max_addr = ct->master->tuplehash[!exp->dir].tuple.dst.u3; -nf_nat_setup_info (ct, &range,NF_NAT_MANIP_SRC ); + range_set_for_snat =1 ; } + +/* Perform SRC manip. */ +if (range_set_for_snat) +nf_nat_setup_info (ct, &range,NF_NAT_MANIP_SRC ); } static unsigned int nf_nat_sip_expect(struct sk_buff *skb, unsigned int protoff,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/321 exofs_mount(): fix leaks on failure exits
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
[ Upstream commit 26cb5a328c6b2bda9e859307ce4cfc60df3a2c28 ]
... and don't abuse mount_nodev(), while we are at it.
--- fs/exofs/super.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-)
fs/exofs/super.c +29 -8
@@ -705,21 +705,18 @@ out:/* * Read the superblock from the OSD and fill in the fields */ -static int exofs_fill_super (struct super_block *sb,void *data,int silent) +static int exofs_fill_super (struct super_block *sb, +struct exofs_mountopt *opts, +struct exofs_sb_info *sbi, +int silent) {struct inode *root; -struct exofs_mountopt *opts = data; -struct exofs_sb_info *sbi;/*extended info */ struct osd_dev *od;/* Master device */ struct exofs_fscb fscb;/*on-disk superblock info */ struct ore_comp comp;unsigned table_count;int ret; - sbi =kzalloc (sizeof (*sbi),GFP_KERNEL ); -if (!sbi) -return -ENOMEM ; -/* use mount options to fill superblock */ if (opts->is_osdname) {struct osd_dev_info odi = {.systemid_len =0 };
@@ -863,7 +860,9 @@ static struct dentry *exofs_mount(struct file_system_type *type, int flags, const char *dev_name, void *data) { + struct super_block *s;struct exofs_mountopt opts; +struct exofs_sb_info *sbi;int ret; ret =parse_options (data, &opts);
@@ -872,9 +871,31 @@ static struct dentry *exofs_mount(struct file_system_type *type,return ERR_PTR (ret); } + sbi =kzalloc (sizeof (*sbi),GFP_KERNEL ); +if (!sbi) { +kfree (opts.dev_name); +return ERR_PTR (-ENOMEM ); + } + + s =sget (type,NULL , set_anon_super, flags,NULL ); + +if (IS_ERR (s)) { +kfree (opts.dev_name); +kfree (sbi); +return ERR_CAST (s); + } +if (!opts.dev_name) opts.dev_name = dev_name; -return mount_nodev (type, flags, &opts, exofs_fill_super); + + + ret =exofs_fill_super (s, &opts, sbi, flags &SB_SILENT ?1 :0 ); +if (ret) { +deactivate_locked_super (s); +return ERR_PTR (ret); + } + s->s_flags |=SB_ACTIVE ; +return dget (s->s_root); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/321 bnxt_en: Return linux standard errors in bnxt_ethtool.c
In reply to Greg Kroah-HartmanFrom: Vasundhara Volam <[email protected]>
[ Upstream commit 7c675421afef18253a86ffc383f57bc15ef32ea8 ]
Currently firmware specific errors are returned directly in flash_device and reset ethtool hooks. Modify it to return linux standard errors to userspace when flashing operations fail.
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 56 +++++++++++++------ 1 file changed, 39 insertions(+), 17 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +39 -17
@@ -1444,14 +1444,22 @@ static int bnxt_flash_nvram(struct net_device *dev, rc =hwrm_send_message (bp, &req,sizeof (req),FLASH_NVRAM_TIMEOUT );dma_free_coherent (&bp->pdev->dev, data_len, kmem, dma_handle); +if (rc ==HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED ) { +netdev_info (dev, +"PF does not have admin privileges to flash the device\n" ); + rc = -EACCES ; + }else if (rc) { + rc = -EIO ; + }return rc; }static int bnxt_firmware_reset (struct net_device *dev,u16 dir_type) { -struct bnxt *bp =netdev_priv (dev);struct hwrm_fw_reset_input req = {0 }; +struct bnxt *bp =netdev_priv (dev); +int rc;bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_FW_RESET ,-1 ,-1 );
@@ -1491,7 +1499,15 @@ static int bnxt_firmware_reset(struct net_device *dev,return -EINVAL ; } -return hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); + rc =hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); +if (rc ==HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED ) { +netdev_info (dev, +"PF does not have admin privileges to reset the device\n" ); + rc = -EACCES ; + }else if (rc) { + rc = -EIO ; + } +return rc; } static int bnxt_flash_firmware(struct net_device *dev,
@@ -1698,9 +1714,9 @@ static int bnxt_flash_package_from_file(struct net_device *dev,struct hwrm_nvm_install_update_output *resp = bp->hwrm_cmd_resp_addr;struct hwrm_nvm_install_update_input install = {0 };const struct firmware *fw; +int rc, hwrm_err =0 ;u32 item_len;u16 index; -int rc;bnxt_hwrm_fw_set_time (bp);
@@ -1743,15 +1759,16 @@ static int bnxt_flash_package_from_file(struct net_device *dev,memcpy (kmem, fw->data, fw->size); modify.host_src_addr =cpu_to_le64 (dma_handle); - rc =hwrm_send_message (bp, &modify,sizeof (modify), -FLASH_PACKAGE_TIMEOUT ); + hwrm_err =hwrm_send_message (bp, &modify, +sizeof (modify), +FLASH_PACKAGE_TIMEOUT );dma_free_coherent (&bp->pdev->dev, fw->size, kmem, dma_handle); } }release_firmware (fw); -if (rc) -return rc; +if (rc || hwrm_err) + goto err_exit;if ((install_type &0xffff ) ==0 ) install_type >>=16 ;
@@ -1759,12 +1776,10 @@ static int bnxt_flash_package_from_file(struct net_device *dev, install.install_type =cpu_to_le32 (install_type);mutex_lock (&bp->hwrm_cmd_lock); - rc =_hwrm_send_message (bp, &install,sizeof (install), -INSTALL_PACKAGE_TIMEOUT ); -if (rc) { - rc = -EOPNOTSUPP ; + hwrm_err =_hwrm_send_message (bp, &install,sizeof (install), +INSTALL_PACKAGE_TIMEOUT ); +if (hwrm_err) goto flash_pkg_exit; - }if (resp->error_code) {u8 error_code = ((struct hwrm_err_output *)resp)->cmd_err;
@@ -1772,12 +1787,11 @@ static int bnxt_flash_package_from_file(struct net_device *dev,if (error_code ==NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR ) { install.flags |=cpu_to_le16 (NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG ); - rc =_hwrm_send_message (bp, &install,sizeof (install), -INSTALL_PACKAGE_TIMEOUT ); -if (rc) { - rc = -EOPNOTSUPP ; + hwrm_err =_hwrm_send_message (bp, &install, +sizeof (install), +INSTALL_PACKAGE_TIMEOUT ); +if (hwrm_err) goto flash_pkg_exit; - } } }
@@ -1788,6 +1802,14 @@ static int bnxt_flash_package_from_file(struct net_device *dev, } flash_pkg_exit:mutex_unlock (&bp->hwrm_cmd_lock); +err_exit: +if (hwrm_err ==HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED ) { +netdev_info (dev, +"PF does not have admin privileges to flash the device\n" ); + rc = -EACCES ; + }else if (hwrm_err) { + rc = -EOPNOTSUPP ; + }return rc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/321 bnxt_en: Save ring statistics before reset.
In reply to Greg Kroah-HartmanFrom: Michael Chan <[email protected]>
[ Upstream commit b8875ca356f1c0b17ec68be6666269373a62288e ]
With the current driver, the statistics reported by .ndo_get_stats64() are reset when the device goes down. Store a snapshot of the rtnl_link_stats64 before shutdown. This snapshot is added to the current counters in .ndo_get_stats64() so that the counters will not get reset when the device is down.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 57 +++++++++++++++++------ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 44 insertions(+), 14 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +43 -14
@@ -7148,6 +7148,9 @@ static bool bnxt_drv_busy(struct bnxt *bp) test_bit(BNXT_STATE_READ_STATS, &bp->state)); } +static void bnxt_get_ring_stats (struct bnxt *bp, +struct rtnl_link_stats64 *stats); +static void __bnxt_close_nic (struct bnxt *bp,bool irq_re_init,bool link_re_init) {
@@ -7173,6 +7176,9 @@ static void __bnxt_close_nic(struct bnxt *bp, bool irq_re_init,del_timer_sync (&bp->timer);bnxt_free_skbs (bp); +/* Save ring stats before shutdown */ +if (bp->bnapi) +bnxt_get_ring_stats (bp, &bp->net_stats_prev);if (irq_re_init) {bnxt_free_irq (bp);bnxt_del_napi (bp);
@@ -7234,23 +7240,12 @@ static int bnxt_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return -EOPNOTSUPP ; } -static void -bnxt_get_stats64 (struct net_device *dev,struct rtnl_link_stats64 *stats) +static void bnxt_get_ring_stats (struct bnxt *bp, +struct rtnl_link_stats64 *stats) { -u32 i; -struct bnxt *bp =netdev_priv (dev); +int i; -set_bit (BNXT_STATE_READ_STATS , &bp->state); -/* Make sure bnxt_close_nic() sees that we are reading stats before -* we check the BNXT_STATE_OPEN flag. -*/ -smp_mb__after_atomic (); -if (!test_bit (BNXT_STATE_OPEN , &bp->state)) { -clear_bit (BNXT_STATE_READ_STATS , &bp->state); -return ; - } -/* TODO check if we need to synchronize with bnxt_close path */ for (i =0 ; i < bp->cp_nr_rings; i++) {struct bnxt_napi *bnapi = bp->bnapi[i];struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
@@ -7279,6 +7274,40 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) stats->tx_dropped +=le64_to_cpu (hw_stats->tx_drop_pkts); } +} + +static void bnxt_add_prev_stats (struct bnxt *bp, +struct rtnl_link_stats64 *stats) +{ +struct rtnl_link_stats64 *prev_stats = &bp->net_stats_prev; + + stats->rx_packets += prev_stats->rx_packets; + stats->tx_packets += prev_stats->tx_packets; + stats->rx_bytes += prev_stats->rx_bytes; + stats->tx_bytes += prev_stats->tx_bytes; + stats->rx_missed_errors += prev_stats->rx_missed_errors; + stats->multicast += prev_stats->multicast; + stats->tx_dropped += prev_stats->tx_dropped; +} + +static void +bnxt_get_stats64 (struct net_device *dev,struct rtnl_link_stats64 *stats) +{ +struct bnxt *bp =netdev_priv (dev); + +set_bit (BNXT_STATE_READ_STATS , &bp->state); +/* Make sure bnxt_close_nic() sees that we are reading stats before +* we check the BNXT_STATE_OPEN flag. +*/ +smp_mb__after_atomic (); +if (!test_bit (BNXT_STATE_OPEN , &bp->state)) { +clear_bit (BNXT_STATE_READ_STATS , &bp->state); + *stats = bp->net_stats_prev; +return ; + } + +bnxt_get_ring_stats (bp, stats); +bnxt_add_prev_stats (bp, stats);if (bp->flags &BNXT_FLAG_PORT_STATS ) {struct rx_port_stats *rx = bp->hw_rx_port_stats;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1302,6 +1302,7 @@ struct bnxt {void *hwrm_cmd_resp_addr;dma_addr_t hwrm_cmd_resp_dma_addr; +struct rtnl_link_stats64 net_stats_prev;struct rx_port_stats *hw_rx_port_stats;struct tx_port_stats *hw_tx_port_stats;struct rx_port_stats_ext *hw_rx_port_stats_ext;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/321 bnxt_en: query force speeds before disabling autoneg mode.
In reply to Greg Kroah-HartmanFrom: Vasundhara Volam <[email protected]>
[ Upstream commit 56d374624778652d2a999e18c87a25338b127b41 ]
With autoneg enabled, PHY loopback test fails. To disable autoneg, driver needs to send a valid forced speed to FW. FW is not sending async event for invalid speeds. To fix this, query forced speeds and send the correct speed when disabling autoneg mode.
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +21 -1
@@ -2390,17 +2390,37 @@ static int bnxt_hwrm_mac_loopback(struct bnxt *bp, bool enable)return hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); } +static int bnxt_query_force_speeds (struct bnxt *bp,u16 *force_speeds) +{ +struct hwrm_port_phy_qcaps_output *resp = bp->hwrm_cmd_resp_addr; +struct hwrm_port_phy_qcaps_input req = {0 }; +int rc; + +bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_PORT_PHY_QCAPS ,-1 ,-1 ); +mutex_lock (&bp->hwrm_cmd_lock); + rc =_hwrm_send_message (bp, &req,sizeof (req),HWRM_CMD_TIMEOUT ); +if (!rc) + *force_speeds =le16_to_cpu (resp->supported_speeds_force_mode); + +mutex_unlock (&bp->hwrm_cmd_lock); +return rc; +} +static int bnxt_disable_an_for_lpbk (struct bnxt *bp,struct hwrm_port_phy_cfg_input *req) {struct bnxt_link_info *link_info = &bp->link_info; -u16 fw_advertising = link_info->advertising; +u16 fw_advertising;u16 fw_speed;int rc;if (!link_info->autoneg)return 0 ; + rc =bnxt_query_force_speeds (bp, &fw_advertising); +if (rc) +return rc; + fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB ;if (netif_carrier_ok (bp->dev)) fw_speed = bp->link_info.link_speed;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/321 KVM: s390: unregister debug feature on failing arch init
In reply to Greg Kroah-HartmanFrom: Michael Mueller <[email protected]>
[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ]
Make sure the debug feature and its allocated resources get released upon unsuccessful architecture initialization.
A related indication of the issue will be reported as kernel message.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +14 -3
@@ -416,19 +416,30 @@ static void kvm_s390_cpu_feat_init(void)int kvm_arch_init (void *opaque) { +int rc; + kvm_s390_dbf =debug_register ("kvm-trace" ,32 ,1 ,7 *sizeof (long ));if (!kvm_s390_dbf)return -ENOMEM ;if (debug_register_view (kvm_s390_dbf, &debug_sprintf_view)) { -debug_unregister (kvm_s390_dbf); -return -ENOMEM ; + rc = -ENOMEM ; + goto out_debug_unreg; }kvm_s390_cpu_feat_init ();/* Register floating interrupt controller interface. */ -return kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); + rc =kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); +if (rc) { +pr_err ("Failed to register FLIC rc=%d\n" , rc); + goto out_debug_unreg; + } +return 0 ; + +out_debug_unreg: +debug_unregister (kvm_s390_dbf); +return rc; }void kvm_arch_exit (void )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/321 pinctrl: sh-pfc: r8a77990: Fix MOD_SEL0 SEL_I2C1 field width
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 755a5b805fa7ff22e2934d67501efd92109f41ea ]
The SEL_I2C1 (MOD_SEL0[21:20]) field in Module Select Register 0 has a width of 2 bits, i.e. it allows programming one out of 4 different configurations.
However, the MOD_SEL0_21_20 macro contains 8 values instead of 4, overflowing into the subsequent fields in the register, and thus breaking the configuration of the latter.
Fix this by dropping the bogus last 4 values, including the non-existent SEL_I2C1_4 configuration.
--- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/sh-pfc/pfc-r8a77990.c +1 -1
@@ -395,7 +395,7 @@ FM(IP12_31_28) IP12_31_28 FM(IP13_31_28) IP13_31_28 FM(IP14_31_28) IP14_31_28 FM#define MOD_SEL0_24 FM(SEL_HSCIF0_0) FM(SEL_HSCIF0_1)#define MOD_SEL0_23 FM(SEL_HSCIF1_0) FM(SEL_HSCIF1_1)#define MOD_SEL0_22 FM(SEL_HSCIF2_0) FM(SEL_HSCIF2_1) -#define MOD_SEL0_21_20 FM(SEL_I2C1_0) FM(SEL_I2C1_1) FM(SEL_I2C1_2) FM(SEL_I2C1_3) FM(SEL_I2C1_4) F_(0, 0) F_(0, 0) F_(0, 0) +#define MOD_SEL0_21_20 FM(SEL_I2C1_0) FM(SEL_I2C1_1) FM(SEL_I2C1_2) FM(SEL_I2C1_3)#define MOD_SEL0_19_18_17 FM(SEL_I2C2_0) FM(SEL_I2C2_1) FM(SEL_I2C2_2) FM(SEL_I2C2_3) FM(SEL_I2C2_4) F_(0, 0) F_(0, 0) F_(0, 0)#define MOD_SEL0_16 FM(SEL_NDFC_0) FM(SEL_NDFC_1)#define MOD_SEL0_15 FM(SEL_PWM0_0) FM(SEL_PWM0_1)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/321 pinctrl: sh-pfc: sh7264: Fix PFCR3 and PFCR0 register configuration
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 1b99d0c80bbe1810572c2cb77b90f67886adfa8d ]
The Port F Control Register 3 (PFCR3) contains only a single field. However, counting from left to right, it is the fourth field, not the first field.
Insert the missing dummy configuration values (3 fields of 16 values) to fix this.
The descriptor for the Port F Control Register 0 (PFCR0) lacks the description for the 4th field (PF0 Mode, PF0MD[2:0]). Add the missing configuration values to fix this.
--- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pinctrl/sh-pfc/pfc-sh7264.c +7 -2
@@ -1716,6 +1716,9 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { }, { PINMUX_CFG_REG("PFCR3", 0xfffe38a8, 16, 4) { +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,PF12MD_000 ,PF12MD_001 ,0 ,PF12MD_011 ,PF12MD_100 ,PF12MD_101 ,0 ,0 , 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -1759,8 +1762,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,PF1MD_000 ,PF1MD_001 ,PF1MD_010 ,PF1MD_011 ,PF1MD_100 ,PF1MD_101 ,0 ,0 , -0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 - } +0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , +PF0MD_000 ,PF0MD_001 ,PF0MD_010 ,PF0MD_011 , +PF0MD_100 ,PF0MD_101 ,0 ,0 , + 0, 0, 0, 0, 0, 0, 0, 0 } }, { PINMUX_CFG_REG("PFIOR0", 0xfffe38b2, 16, 1) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/321 pinctrl: sh-pfc: sh7734: Fix shifted values in IPSR10
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 054f2400f706327f96770219c3065b5131f8f154 ]
Some values in the Peripheral Function Select Register 10 descriptor are shifted by one position, which may cause a peripheral function to be programmed incorrectly.
Fixing this makes all HSCIF0 pins use Function 4 (value 3), like was already the case for the HSCK0 pin in field IP10[5:3].
--- drivers/pinctrl/sh-pfc/pfc-sh7734.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pinctrl/sh-pfc/pfc-sh7734.c +8 -8
@@ -2213,22 +2213,22 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {/* IP10_22 [1] */ FN_CAN_CLK_A ,FN_RX4_D ,/* IP10_21_19 [3] */ -FN_AUDIO_CLKOUT ,FN_TX1_E ,FN_HRTS0_C ,FN_FSE_B , -FN_LCD_M_DISP_B ,0 ,0 ,0 , +FN_AUDIO_CLKOUT ,FN_TX1_E ,0 ,FN_HRTS0_C ,FN_FSE_B , +FN_LCD_M_DISP_B ,0 ,0 ,/* IP10_18_16 [3] */ -FN_AUDIO_CLKC ,FN_SCK1_E ,FN_HCTS0_C ,FN_FRB_B , -FN_LCD_VEPWC_B ,0 ,0 ,0 , +FN_AUDIO_CLKC ,FN_SCK1_E ,0 ,FN_HCTS0_C ,FN_FRB_B , +FN_LCD_VEPWC_B ,0 ,0 ,/* IP10_15 [1] */ FN_AUDIO_CLKB_A ,FN_LCD_CLK_B ,/* IP10_14_12 [3] */ FN_AUDIO_CLKA_A ,FN_VI1_CLK_B ,FN_SCK1_D ,FN_IECLK_B ,FN_LCD_FLM_B ,0 ,0 ,0 ,/* IP10_11_9 [3] */ -FN_SSI_SDATA3 ,FN_VI1_7_B ,FN_HTX0_C ,FN_FWE_B , -FN_LCD_CL2_B ,0 ,0 ,0 , +FN_SSI_SDATA3 ,FN_VI1_7_B ,0 ,FN_HTX0_C ,FN_FWE_B , +FN_LCD_CL2_B ,0 ,0 ,/* IP10_8_6 [3] */ -FN_SSI_SDATA2 ,FN_VI1_6_B ,FN_HRX0_C ,FN_FRE_B , -FN_LCD_CL1_B ,0 ,0 ,0 , +FN_SSI_SDATA2 ,FN_VI1_6_B ,0 ,FN_HRX0_C ,FN_FRE_B , +FN_LCD_CL1_B ,0 ,0 ,/* IP10_5_3 [3] */ FN_SSI_WS23 ,FN_VI1_5_B ,FN_TX1_D ,FN_HSCK0_C ,FN_FALE_B , FN_LCD_DON_B, 0, 0, 0,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/321 HID: doc: fix wrong data structure reference for UHID_OUTPUT
In reply to Greg Kroah-HartmanFrom: Peter Hutterer <[email protected]>
[ Upstream commit 46b14eef59a8157138dc02f916a7f97c73b3ec53 ]
--- Documentation/hid/uhid.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/hid/uhid.txt +1 -1
@@ -160,7 +160,7 @@ them but you should handle them according to your needs. UHID_OUTPUT: This is sent if the HID device driver wants to send raw data to the I/O device on the interrupt channel. You should read the payload and forward it to - the device. The payload is of type "struct uhid_data_req". + the device. The payload is of type "struct uhid_output_req". This may be received even though you haven't received UHID_OPEN, yet. UHID_GET_REPORT:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/321 dm flakey: Properly corrupt multi-page bios.
In reply to Greg Kroah-HartmanFrom: Sweet Tea <[email protected]>
[ Upstream commit a00f5276e26636cbf72f24f79831026d2e2868e7 ]
The flakey target is documented to be able to corrupt the Nth byte in a bio, but does not corrupt byte indices after the first biovec in the bio. Change the corrupting function to actually corrupt the Nth byte no matter in which biovec that index falls.
A test device generating two-page bios, atop a flakey device configured to corrupt a byte index on the second page, verified both the failure to corrupt before this patch and the expected corruption after this change.
--- drivers/md/dm-flakey.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/md/dm-flakey.c +22 -11
@@ -287,20 +287,31 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio)static void corrupt_bio_data (struct bio *bio,struct flakey_c *fc) { -unsigned bio_bytes =bio_cur_bytes (bio); -char *data =bio_data (bio); +unsigned int corrupt_bio_byte = fc->corrupt_bio_byte -1 ; + +struct bvec_iter iter; +struct bio_vec bvec; + +if (!bio_has_data (bio)) +return ;/* -* Overwrite the Nth byte of the data returned. +* Overwrite the Nth byte of the bio's data, on whichever page +* it falls. */ -if (data && bio_bytes >= fc->corrupt_bio_byte) { - data[fc->corrupt_bio_byte -1 ] = fc->corrupt_bio_value; - -DMDEBUG ("Corrupting data bio=%p by writing %u to byte %u " -"(rw=%c bi_opf=%u bi_sector=%llu cur_bytes=%u)\n" , - bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, - (bio_data_dir (bio) ==WRITE ) ?'w' :'r' , bio->bi_opf, - (unsigned long long )bio->bi_iter.bi_sector, bio_bytes); +bio_for_each_segment (bvec, bio, iter) { +if (bio_iter_len (bio, iter) > corrupt_bio_byte) { +char *segment = (page_address (bio_iter_page (bio, iter)) + +bio_iter_offset (bio, iter)); + segment[corrupt_bio_byte] = fc->corrupt_bio_value; +DMDEBUG ("Corrupting data bio=%p by writing %u to byte %u " +"(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n" , + bio, fc->corrupt_bio_value, fc->corrupt_bio_byte, + (bio_data_dir (bio) ==WRITE ) ?'w' :'r' , bio->bi_opf, + (unsigned long long )bio->bi_iter.bi_sector, bio->bi_iter.bi_size); +break ; + } + corrupt_bio_byte -=bio_iter_len (bio, iter); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/321 gfs2: take jdata unstuff into account in do_grow
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit bc0205612bbd4dd4026d4ba6287f5643c37366ec ]
Before this patch, function do_grow would not reserve enough journal blocks in the transaction to unstuff jdata files while growing them. This patch adds the logic to add one more block if the file to grow is jdata.
--- fs/gfs2/bmap.c | 2 ++ 1 file changed, 2 insertions(+)
fs/gfs2/bmap.c +2 -0
@@ -2122,6 +2122,8 @@ static int do_grow(struct inode *inode, u64 size) } error =gfs2_trans_begin (sdp,RES_DINODE +RES_STATFS +RES_RG_BIT + + (unstuff && +gfs2_is_jdata (ip) ?RES_JDATA :0 ) + (sdp->sd_args.ar_quota ==GFS2_QUOTA_OFF ?0 :RES_QUOTA ),0 );if (error)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/321 dm raid: fix false -EBUSY when handling check/repair message
In reply to Greg Kroah-HartmanFrom: Heinz Mauelshagen <[email protected]>
[ Upstream commit 74694bcbdf7e28a5ad548cdda9ac56d30be00d13 ]
Sending a check/repair message infrequently leads to -EBUSY instead of properly identifying an active resync. This occurs because raid_message() is testing recovery bits in a racy way.
Fix by calling decipher_sync_action() from raid_message() to properly identify the idle state of the RAID device.
--- drivers/md/dm-raid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/md/dm-raid.c +1 -2
@@ -3690,8 +3690,7 @@ static int raid_message(struct dm_target *ti, unsigned int argc, char **argv,set_bit (MD_RECOVERY_INTR , &mddev->recovery);md_reap_sync_thread (mddev); } - }else if (test_bit (MD_RECOVERY_RUNNING , &mddev->recovery) || -test_bit (MD_RECOVERY_NEEDED , &mddev->recovery)) + }else if (decipher_sync_action (mddev, mddev->recovery) != st_idle)return -EBUSY ;else if (!strcasecmp (argv[0 ],"resync" )) ;/* MD_RECOVERY_NEEDED set below */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/321 xfs: Align compat attrlist_by_handle with native implementation.
In reply to Greg Kroah-HartmanFrom: Nick Bowler <[email protected]>
[ Upstream commit c456d64449efe37da50832b63d91652a85ea1d20 ]
While inspecting the ioctl implementations, I noticed that the compat implementation of XFS_IOC_ATTRLIST_BY_HANDLE does not do exactly the same thing as the native implementation. Specifically, the "cursor" does not appear to be written out to userspace on the compat path, like it is on the native path.
This adjusts the compat implementation to copy out the cursor just like the native implementation does. The attrlist cursor does not require any special compat handling. This fixes xfstests xfs/269 on both IA-32 and x32 userspace, when running on an amd64 kernel.
--- fs/xfs/xfs_ioctl32.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/xfs/xfs_ioctl32.c +6 -0
@@ -336,6 +336,7 @@ xfs_compat_attrlist_by_handle( {int error;attrlist_cursor_kern_t *cursor; +compat_xfs_fsop_attrlist_handlereq_t __user *p = arg;compat_xfs_fsop_attrlist_handlereq_t al_hreq;struct dentry *dentry;char *kbuf;
@@ -370,6 +371,11 @@ xfs_compat_attrlist_by_handle(if (error) goto out_kfree; +if (copy_to_user (&p->pos, cursor,sizeof (attrlist_cursor_kern_t))) { + error = -EFAULT ; + goto out_kfree; + } +if (copy_to_user (compat_ptr (al_hreq.buffer), kbuf, al_hreq.buflen)) error = -EFAULT ;
Signature · 1 line
2.20.1