5.3.17-stable review
Subsystems (10)
Greg Kroah-Hartman
maintainercover 5.3.17-stable review
This is the start of the stable review cycle for the 5.3.17 release. There are 180 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 Wed, 18 Dec 2019 17:41:25 +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/v5.x/stable-review/patch-5.3.17-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-5.3.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.3.17-rc1
yangerkun <[email protected]>
ext4: fix a bug in ext4_wait_for_tail_page_commit
Darrick J. Wong <[email protected]>
splice: only read in as much information as there is pipe buffer space
Alexandre Belloni <[email protected]>
rtc: disable uie before setting time and enable after
Chen Jun <[email protected]>
mm/shmem.c: cast the type of unmap_start to u64
Gerald Schaefer <[email protected]>
s390/kaslr: store KASLR offset for early dumps
Heiko Carstens <[email protected]>
s390/smp,vdso: fix ASCE handling
Will Deacon <[email protected]>
firmware: qcom: scm: Ensure 'a0' status code is treated as signed
Theodore Ts'o <[email protected]>
ext4: work around deleting a file with i_nlink == 0 safely
Roman Gushchin <[email protected]>
mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction
Daniel Schultz <[email protected]>
mfd: rk808: Fix RK818 ID template
Nicolas Geoffray <[email protected]>
mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings
Vincenzo Frascino <[email protected]>
powerpc: Fix vDSO clock_getres()
Nathan Chancellor <[email protected]>
powerpc: Avoid clang warnings around setjmp and longjmp
H. Nikolaus Schaller <[email protected]>
omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
H. Nikolaus Schaller <[email protected]>
omap: pdata-quirks: revert pandora specific gpiod additions
Andrea Merello <[email protected]>
iio: ad7949: fix channels mixups
Andrea Merello <[email protected]>
iio: ad7949: kill pointless "readback"-handling code
Lorenzo Bianconi <[email protected]>
iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw
Lorenzo Bianconi <[email protected]>
iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
Bart Van Assche <[email protected]>
scsi: qla2xxx: Introduce the function qla2xxx_init_sp()
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix double scsi_done for abort path
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix a race condition between aborting and completing a SCSI command
Martin K. Petersen <[email protected]>
Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix a dma_pool_free() call
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix SRB leak on switch command timeout
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix stale session
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix stuck login session
Himanshu Madhani <[email protected]>
scsi: qla2xxx: Fix driver reload for ISP82xx
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix flash read for Qlogic ISPs
Himanshu Madhani <[email protected]>
scsi: qla2xxx: Fix message indicating vectors used by driver
Martin Wilck <[email protected]>
scsi: qla2xxx: qla2x00_alloc_fw_dump: set ha->eft
Bart Van Assche <[email protected]>
scsi: qla2xxx: Make sure that aborted commands are freed
Bart Van Assche <[email protected]>
scsi: qla2xxx: Check secondary image if reading the primary image fails
Bart Van Assche <[email protected]>
scsi: qla2xxx: Always check the qla2x00_wait_for_hba_online() return value
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix qla24xx_process_bidir_cmd()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix session lookup in qlt_abort_work()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Really fix qla2xxx_eh_abort()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Make qla2x00_abort_srb() again decrease the sp reference count
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix hang in fcport delete path
Arun Easi <[email protected]>
scsi: qla2xxx: Fix NVMe port discovery after a short device port loss
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix different size DMA Alloc/Unmap
Himanshu Madhani <[email protected]>
scsi: qla2xxx: Fix DMA unmap leak
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix premature timer expiration
Quinn Tran <[email protected]>
scsi: qla2xxx: Do command completion on abort timeout
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix abort timeout race condition.
James Smart <[email protected]>
scsi: lpfc: Fix bad ndlp ptr in xri aborted handling
Jeff Mahoney <[email protected]>
reiserfs: fix extended attributes on the root directory
Jan Kara <[email protected]>
ext4: Fix credit estimate for final inode freeing
Dmitry Monakhov <[email protected]>
quota: fix livelock in dquot_writeback_dquots
Christian Brauner <[email protected]>
seccomp: avoid overflow in implicit constant conversion
Chengguang Xu <[email protected]>
ext2: check err when partial != NULL
Dmitry Monakhov <[email protected]>
quota: Check that quota is not dirty before release
Ville Syrjälä <[email protected]>
video/hdmi: Fix AVI bar unpack
Cédric Le Goater <[email protected]>
powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts
Alastair D'Silva <[email protected]>
powerpc: Allow flush_icache_range to work across ranges >4GB
Cédric Le Goater <[email protected]>
powerpc/xive: Prevent page fault issues in the machine crash handler
Alastair D'Silva <[email protected]>
powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB
Yabin Cui <[email protected]>
coresight: Serialize enabling/disabling a link device.
Alexander Shishkin <[email protected]>
stm class: Lose the protocol driver when dropping its reference
Arnd Bergmann <[email protected]>
ppdev: fix PPGETTIME/PPSETTIME ioctls
Bart Van Assche <[email protected]>
RDMA/core: Fix ib_dma_max_seg_size()
Jarkko Nikula <[email protected]>
ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity
H. Nikolaus Schaller <[email protected]>
mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: Fix device node refcount leaks in init code
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init
Nishka Dasgupta <[email protected]>
pinctrl: samsung: Add of_node_put() before return in error path
Gregory CLEMENT <[email protected]>
pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type()
Chris Brandt <[email protected]>
pinctrl: rza2: Fix gpio name typos
Rafael J. Wysocki <[email protected]>
ACPI: PM: Avoid attaching ACPI PM domain to certain devices
Vamshi K Sthambamkadi <[email protected]>
ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data()
Francesco Ruggeri <[email protected]>
ACPI: OSL: only free map once in osl.c
Mika Westerberg <[email protected]>
ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge
Hans de Goede <[email protected]>
ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links
Hans de Goede <[email protected]>
ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links
Hans de Goede <[email protected]>
ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links
Andy Shevchenko <[email protected]>
ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI
Takashi Sakamoto <[email protected]>
ALSA: oxfw: fix return value in error path of isochronous resources reservation
Takashi Sakamoto <[email protected]>
ALSA: fireface: fix return value in error path of isochronous resources reservation
John Hubbard <[email protected]>
cpufreq: powernv: fix stack bloat and hard limit on number of CPUs
Leonard Crestez <[email protected]>
PM / devfreq: Lock devfreq in trans_stat_show
Alexander Shishkin <[email protected]>
intel_th: pci: Add Tiger Lake CPU support
Alexander Shishkin <[email protected]>
intel_th: pci: Add Ice Lake CPU support
Alexander Shishkin <[email protected]>
intel_th: Fix a double put_device() in error path
Madhavan Srinivasan <[email protected]>
powerpc/perf: Disable trace_imc pmu
Gao Xiang <[email protected]>
erofs: zero out when listxattr is called with no xattr
Rafael J. Wysocki <[email protected]>
cpuidle: teo: Fix "early hits" handling for disabled idle states
Rafael J. Wysocki <[email protected]>
cpuidle: teo: Consider hits and misses metrics of disabled states
Rafael J. Wysocki <[email protected]>
cpuidle: teo: Rename local variable in teo_select()
Rafael J. Wysocki <[email protected]>
cpuidle: teo: Ignore disabled idle states that are too deep
Zhenzhong Duan <[email protected]>
cpuidle: Do not unset the driver if it is there already
Hans Verkuil <[email protected]>
media: cec.h: CEC_OP_REC_FLAG_ values were swapped
Johan Hovold <[email protected]>
media: radio: wl1273: fix interrupt masking on release
Johan Hovold <[email protected]>
media: bdisp: fix memleak on release
Ezequiel Garcia <[email protected]>
media: hantro: Fix s_fmt for dynamic resolution changes
Gerald Schaefer <[email protected]>
s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported
Denis Efremov <[email protected]>
ar5523: check NULL before memcpy() in ar5523_cmd()
Denis Efremov <[email protected]>
wil6210: check len before memcpy() calls
Aleksa Sarai <[email protected]>
cgroup: pids: use atomic64_t for pids->limit
Ming Lei <[email protected]>
blk-mq: avoid sysfs buffer overflow with too many CPU cores
David Jeffery <[email protected]>
md: improve handling of bio with REQ_PREFLUSH in md_flush_request()
Shengjiu Wang <[email protected]>
ASoC: fsl_audmix: Add spin lock to protect tdms
Pawel Harlozinski <[email protected]>
ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report
Jacob Rasmussen <[email protected]>
ASoC: rt5645: Fixed typo for buddy jack support.
Jacob Rasmussen <[email protected]>
ASoC: rt5645: Fixed buddy jack support.
Tejun Heo <[email protected]>
workqueue: Fix pwq ref leak in rescuer_thread()
Tejun Heo <[email protected]>
workqueue: Fix spurious sanity check failures in destroy_workqueue()
Dmitry Fomichev <[email protected]>
dm zoned: reduce overhead of backing device checks
Maged Mokhtar <[email protected]>
dm writecache: handle REQ_FUA
Sumit Garg <[email protected]>
hwrng: omap - Fix RNG wait loop timeout
Amir Goldstein <[email protected]>
ovl: relax WARN_ON() on rename to self
Amir Goldstein <[email protected]>
ovl: fix corner case of non-unique st_dev;st_ino
Amir Goldstein <[email protected]>
ovl: fix lookup failure on multi lower squashfs
Greg Kroah-Hartman <[email protected]>
lib: raid6: fix awk build warnings
Larry Finger <[email protected]>
rtlwifi: rtl8192de: Fix missing enable interrupt flag
Larry Finger <[email protected]>
rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer
Larry Finger <[email protected]>
rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address
Josef Bacik <[email protected]>
btrfs: record all roots for rename exchange on a subvol
Filipe Manana <[email protected]>
Btrfs: send, skip backreference walking for extents with many references
Qu Wenruo <[email protected]>
btrfs: Remove btrfs_bio::flags member
Tejun Heo <[email protected]>
btrfs: Avoid getting stuck during cyclic writebacks
Filipe Manana <[email protected]>
Btrfs: fix negative subv_writers counter and data space leak after buffered write
Filipe Manana <[email protected]>
Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc
Josef Bacik <[email protected]>
btrfs: use refcount_inc_not_zero in kill_all_nodes
Josef Bacik <[email protected]>
btrfs: check page->mapping when loading free space cache
Johannes Berg <[email protected]>
iwlwifi: pcie: fix support for transmitting SKBs with fraglist
Wen Yang <[email protected]>
usb: typec: fix use after free in typec_register_port()
Yoshihiro Shimoda <[email protected]>
phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role"
Thinh Nguyen <[email protected]>
usb: dwc3: ep0: Clear started flag on completion
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Clear started flag for non-IOC
Tejas Joglekar <[email protected]>
usb: dwc3: gadget: Fix logical condition
Heikki Krogerus <[email protected]>
usb: dwc3: pci: add ID for the Intel Comet Lake -H variant
David Hildenbrand <[email protected]>
virtio-balloon: fix managed page counts when migrating pages between zones
Taehee Yoo <[email protected]>
virt_wifi: fix use-after-free in virt_wifi_newlink()
Piotr Sroka <[email protected]>
mtd: rawnand: Change calculating of position page containing BBM
Miquel Raynal <[email protected]>
mtd: spear_smi: Fix Write Burst mode
Rafał Miłecki <[email protected]>
brcmfmac: disable PCIe interrupts before bus reset
Meng Li <[email protected]>
EDAC/altera: Use fast register IO for S10 IRQs
Tadeusz Struk <[email protected]>
tpm: add check after commands attribs tab allocation
Pete Zaitcev <[email protected]>
usb: mon: Fix a deadlock in usbmon between mmap and read
Emiliano Ingrassia <[email protected]>
usb: core: urb: fix URB structure initialization function
Johan Hovold <[email protected]>
USB: adutux: fix interface sanity check
Wen Yang <[email protected]>
usb: roles: fix a potential use after free
Johan Hovold <[email protected]>
USB: serial: io_edgeport: fix epic endpoint lookup
Johan Hovold <[email protected]>
USB: idmouse: fix interface sanity checks
Johan Hovold <[email protected]>
USB: atm: ueagle-atm: add missing endpoint check
Mircea Caprioru <[email protected]>
iio: adc: ad7124: Enable internal reference
Beniamin Bia <[email protected]>
iio: adc: ad7606: fix reading unnecessary data from device
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_mpu6050: fix temperature reporting using bad unit
Chris Lesiak <[email protected]>
iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting
Nuno Sá <[email protected]>
iio: adis16480: Fix scales factors
Nuno Sá <[email protected]>
iio: adis16480: Add debugfs_reg_access entry
H. Nikolaus Schaller <[email protected]>
ARM: dts: pandora-common: define wl1251 as child node of mmc3
Georgi Djakov <[email protected]>
interconnect: qcom: sdm845: Walk the list safely on node removal
Mathias Nyman <[email protected]>
xhci: make sure interrupts are restored to correct state
Mathias Nyman <[email protected]>
xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour.
Kai-Heng Feng <[email protected]>
xhci: Increase STS_HALT timeout in xhci_suspend()
Mathias Nyman <[email protected]>
xhci: fix USB3 device initiated resume race with roothub autosuspend
Mika Westerberg <[email protected]>
xhci: Fix memory leak in xhci_add_in_port()
Henry Lin <[email protected]>
usb: xhci: only set D3hot for pci device
Johan Hovold <[email protected]>
staging: gigaset: add endpoint-type sanity check
Johan Hovold <[email protected]>
staging: gigaset: fix illegal free on probe errors
Johan Hovold <[email protected]>
staging: gigaset: fix general protection fault on probe
Marcelo Diop-Gonzalez <[email protected]>
staging: vchiq: call unregister_chrdev_region() when driver registration fails
Johan Hovold <[email protected]>
staging: rtl8712: fix interface sanity check
Johan Hovold <[email protected]>
staging: rtl8188eu: fix interface sanity check
Todd Kjos <[email protected]>
binder: fix incorrect calculation for num_valid
Nagarjuna Kristam <[email protected]>
usb: host: xhci-tegra: Correct phy enable sequence
Kai-Heng Feng <[email protected]>
usb: Allow USB device to be warm reset in suspended state
Oliver Neukum <[email protected]>
USB: documentation: flags on usb-storage versus UAS
Oliver Neukum <[email protected]>
USB: uas: heed CAPACITY_HEURISTICS
Oliver Neukum <[email protected]>
USB: uas: honor flag to avoid CAPACITY16
Arnd Bergmann <[email protected]>
media: venus: remove invalid compat_ioctl32 handler
Arun Easi <[email protected]>
scsi: qla2xxx: Fix memory leak when sending I/O fails
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix driver unload hang
Steffen Maier <[email protected]>
scsi: zfcp: trace channel log even for FCP command responses
Jian-Hong Pan <[email protected]>
Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
Gustavo A. R. Silva <[email protected]>
usb: gadget: pch_udc: fix use after free
Wei Yongjun <[email protected]>
usb: gadget: configfs: Fix missing spin_lock_init()
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 22 ++- Makefile | 4 +- arch/arm/boot/dts/omap3-pandora-common.dtsi | 36 +++- arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- arch/arm/mach-omap2/pdata-quirks.c | 104 ----------- arch/powerpc/include/asm/vdso_datapage.h | 2 + arch/powerpc/kernel/Makefile | 4 +- arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/kernel/misc_64.S | 4 +- arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +- arch/powerpc/kernel/vdso64/cacheflush.S | 4 +- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +- arch/powerpc/platforms/powernv/opal-imc.c | 9 +- arch/powerpc/sysdev/xive/common.c | 9 + arch/powerpc/sysdev/xive/spapr.c | 12 +- arch/powerpc/xmon/Makefile | 4 +- arch/s390/boot/startup.c | 5 + arch/s390/include/asm/pgtable.h | 4 +- arch/s390/kernel/machine_kexec.c | 2 +- arch/s390/kernel/smp.c | 5 + block/blk-mq-sysfs.c | 15 +- drivers/acpi/acpi_lpss.c | 27 ++- drivers/acpi/bus.c | 2 +- drivers/acpi/device_pm.c | 12 +- drivers/acpi/osl.c | 28 +-- drivers/android/binder.c | 4 +- drivers/char/hw_random/omap-rng.c | 9 +- drivers/char/ppdev.c | 16 +- drivers/char/tpm/tpm2-cmd.c | 4 + drivers/cpufreq/powernv-cpufreq.c | 17 +- drivers/cpuidle/driver.c | 15 +- drivers/cpuidle/governors/teo.c | 78 ++++++-- drivers/devfreq/devfreq.c | 12 +- drivers/edac/altera_edac.c | 1 + drivers/firmware/qcom_scm-64.c | 2 +- drivers/hwtracing/coresight/coresight-funnel.c | 36 +++- drivers/hwtracing/coresight/coresight-replicator.c | 35 +++- drivers/hwtracing/coresight/coresight-tmc-etf.c | 26 ++- drivers/hwtracing/coresight/coresight.c | 45 ++--- drivers/hwtracing/intel_th/core.c | 8 +- drivers/hwtracing/intel_th/pci.c | 10 + drivers/hwtracing/stm/policy.c | 4 + drivers/iio/adc/ad7124.c | 7 +- drivers/iio/adc/ad7606.c | 2 +- drivers/iio/adc/ad7949.c | 49 ++--- drivers/iio/humidity/hdc100x.c | 2 +- drivers/iio/imu/adis16480.c | 78 ++++---- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 23 +-- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 16 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 205 +++++++++++++++++---- drivers/interconnect/qcom/sdm845.c | 4 +- drivers/md/dm-writecache.c | 3 +- drivers/md/dm-zoned-metadata.c | 29 ++- drivers/md/dm-zoned-reclaim.c | 8 +- drivers/md/dm-zoned-target.c | 54 ++++-- drivers/md/dm-zoned.h | 2 + drivers/md/md-linear.c | 5 +- drivers/md/md-multipath.c | 5 +- drivers/md/md.c | 11 +- drivers/md/md.h | 4 +- drivers/md/raid0.c | 5 +- drivers/md/raid1.c | 5 +- drivers/md/raid10.c | 5 +- drivers/md/raid5.c | 4 +- drivers/media/platform/qcom/venus/vdec.c | 3 - drivers/media/platform/qcom/venus/venc.c | 3 - drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +- drivers/media/radio/radio-wl1273.c | 3 +- drivers/mmc/host/omap_hsmmc.c | 30 +++ drivers/mtd/devices/spear_smi.c | 38 +++- drivers/mtd/nand/raw/nand_base.c | 8 +- drivers/mtd/nand/raw/nand_micron.c | 4 +- drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- drivers/net/wireless/ath/wil6210/wmi.c | 6 +- .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 14 ++ .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 +- .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 1 + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 25 ++- .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 2 + drivers/net/wireless/virt_wifi.c | 4 +- drivers/nvme/host/core.c | 10 - drivers/pci/hotplug/acpiphp_glue.c | 12 +- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 5 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 6 +- drivers/pinctrl/pinctrl-rza2.c | 4 +- drivers/pinctrl/samsung/pinctrl-exynos.c | 14 +- drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +- drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +- drivers/pinctrl/samsung/pinctrl-samsung.c | 10 +- drivers/rtc/interface.c | 19 +- drivers/s390/scsi/zfcp_dbf.c | 8 +- drivers/scsi/lpfc/lpfc_scsi.c | 11 +- drivers/scsi/lpfc/lpfc_sli.c | 5 +- drivers/scsi/lpfc/lpfc_sli.h | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 15 +- drivers/scsi/qla2xxx/qla_def.h | 9 +- drivers/scsi/qla2xxx/qla_gs.c | 9 +- drivers/scsi/qla2xxx/qla_init.c | 93 ++++++---- drivers/scsi/qla2xxx/qla_inline.h | 28 +-- drivers/scsi/qla2xxx/qla_iocb.c | 5 +- drivers/scsi/qla2xxx/qla_isr.c | 11 +- drivers/scsi/qla2xxx/qla_mbx.c | 20 +- drivers/scsi/qla2xxx/qla_mid.c | 11 +- drivers/scsi/qla2xxx/qla_nvme.c | 4 +- drivers/scsi/qla2xxx/qla_nx.c | 4 +- drivers/scsi/qla2xxx/qla_os.c | 144 ++++++++------- drivers/scsi/qla2xxx/qla_sup.c | 8 +- drivers/scsi/qla2xxx/qla_target.c | 24 ++- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 + drivers/staging/erofs/xattr.c | 2 + drivers/staging/isdn/gigaset/usb-gigaset.c | 23 ++- drivers/staging/media/hantro/hantro_v4l2.c | 28 ++- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 2 +- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- drivers/usb/atm/ueagle-atm.c | 18 +- drivers/usb/core/hub.c | 5 +- drivers/usb/core/urb.c | 1 + drivers/usb/dwc3/dwc3-pci.c | 6 +- drivers/usb/dwc3/ep0.c | 8 + drivers/usb/dwc3/gadget.c | 5 +- drivers/usb/gadget/configfs.c | 1 + drivers/usb/gadget/udc/pch_udc.c | 1 - drivers/usb/host/xhci-hub.c | 22 ++- drivers/usb/host/xhci-mem.c | 4 + drivers/usb/host/xhci-pci.c | 13 ++ drivers/usb/host/xhci-ring.c | 6 +- drivers/usb/host/xhci-tegra.c | 25 +-- drivers/usb/host/xhci.c | 9 +- drivers/usb/host/xhci.h | 1 + drivers/usb/misc/adutux.c | 2 +- drivers/usb/misc/idmouse.c | 2 +- drivers/usb/mon/mon_bin.c | 32 ++-- drivers/usb/roles/class.c | 2 +- drivers/usb/serial/io_edgeport.c | 10 +- drivers/usb/storage/uas.c | 10 + drivers/usb/typec/class.c | 6 +- drivers/video/hdmi.c | 8 +- drivers/virtio/virtio_balloon.c | 11 ++ fs/btrfs/delayed-inode.c | 13 +- fs/btrfs/extent_io.c | 12 +- fs/btrfs/file.c | 2 +- fs/btrfs/free-space-cache.c | 6 + fs/btrfs/inode.c | 9 +- fs/btrfs/send.c | 25 ++- fs/btrfs/volumes.h | 1 - fs/ext2/inode.c | 7 +- fs/ext4/inode.c | 25 ++- fs/ext4/namei.c | 11 +- fs/ocfs2/quota_global.c | 2 +- fs/overlayfs/dir.c | 2 +- fs/overlayfs/inode.c | 8 +- fs/overlayfs/namei.c | 8 + fs/overlayfs/ovl_entry.h | 2 + fs/overlayfs/super.c | 24 ++- fs/quota/dquot.c | 11 +- fs/reiserfs/inode.c | 12 +- fs/reiserfs/namei.c | 7 +- fs/reiserfs/reiserfs.h | 2 + fs/reiserfs/super.c | 2 + fs/reiserfs/xattr.c | 19 +- fs/reiserfs/xattr_acl.c | 4 +- fs/splice.c | 14 +- include/acpi/acpi_bus.h | 6 +- include/linux/mfd/rk808.h | 2 +- include/linux/quotaops.h | 10 + include/rdma/ib_verbs.h | 4 +- include/uapi/linux/cec.h | 4 +- kernel/cgroup/pids.c | 11 +- kernel/workqueue.c | 37 +++- lib/raid6/unroll.awk | 2 +- mm/shmem.c | 13 +- mm/slab_common.c | 12 ++ sound/firewire/fireface/ff-pcm.c | 2 +- sound/firewire/oxfw/oxfw-pcm.c | 2 +- sound/soc/codecs/rt5645.c | 6 +- sound/soc/fsl/fsl_audmix.c | 6 + sound/soc/fsl/fsl_audmix.h | 1 + sound/soc/soc-jack.c | 3 +- tools/testing/selftests/seccomp/seccomp_bpf.c | 3 +- 184 files changed, 1622 insertions(+), 849 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/180 usb: gadget: configfs: Fix missing spin_lock_init()
From: Wei Yongjun <[email protected]>
commit 093edc2baad2c258b1f55d1ab9c63c2b5ae67e42 upstream.
The driver allocates the spinlock but not initialize it. Use spin_lock_init() on it to initialize it correctly.
This is detected by Coccinelle semantic patch.
--- drivers/usb/gadget/configfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/configfs.c +1 -0
@@ -1544,6 +1544,7 @@ static struct config_group *gadgets_make gi->composite.resume =NULL ; gi->composite.max_speed =USB_SPEED_SUPER ; +spin_lock_init (&gi->spinlock);mutex_init (&gi->lock);INIT_LIST_HEAD (&gi->string_list);INIT_LIST_HEAD (&gi->available_func);
Greg Kroah-Hartman
maintainerPATCH 2/180 usb: gadget: pch_udc: fix use after free
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
commit 66d1b0c0580b7f1b1850ee4423f32ac42afa2e92 upstream.
Remove pointer dereference after free.
pci_pool_free doesn't care about contents of td.
It's just a void* for it
Addresses-Coverity-ID: 1091173 ("Use after free")
--- drivers/usb/gadget/udc/pch_udc.c | 1 - 1 file changed, 1 deletion(-)
drivers/usb/gadget/udc/pch_udc.c +0 -1
@@ -1519,7 +1519,6 @@ static void pch_udc_free_dma_chain(struc td =phys_to_virt (addr); addr2 = (dma_addr_t )td->next;dma_pool_free (dev->data_requests, td, addr); - td->next =0x00 ; addr = addr2; } req->chain_len =1 ;
Greg Kroah-Hartman
maintainerPATCH 3/180 Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
In reply to Greg Kroah-HartmanFrom: Jian-Hong Pan <[email protected]>
commit 655e7aee1f0398602627a485f7dca6c29cc96cae upstream.
Since e045fa29e893 ("PCI/MSI: Fix incorrect MSI-X masking on resume") is merged, we can revert the previous quirk now.
This reverts commit 19ea025e1d28c629b369c3532a85b3df478cc5c6.
--- drivers/nvme/host/core.c | 10 ---------- 1 file changed, 10 deletions(-)
drivers/nvme/host/core.c +0 -10
@@ -2270,16 +2270,6 @@ static const struct nvme_core_quirk_entr .vid = 0x14a4, .fr = "22301111", .quirks = NVME_QUIRK_SIMPLE_SUSPEND, - }, - { -/* -* This Kingston E8FK11.T firmware version has no interrupt -* after resume with actions related to suspend to idle -* https://bugzilla.kernel.org/show_bug.cgi?id=204887 -*/ - .vid = 0x2646, - .fr = "E8FK11.T", - .quirks = NVME_QUIRK_SIMPLE_SUSPEND, } };
Greg Kroah-Hartman
maintainerPATCH 4/180 scsi: zfcp: trace channel log even for FCP command responses
In reply to Greg Kroah-HartmanFrom: Steffen Maier <[email protected]>
commit 100843f176109af94600e500da0428e21030ca7f upstream.
While v2.6.26 commit b75db73159cc ("[SCSI] zfcp: Add qtcb dump to hba debug trace") is right that we don't want to flood the (payload) trace ring buffer, we don't trace successful FCP command responses by default. So we can include the channel log for problem determination with failed responses of any FSF request type.
--- drivers/s390/scsi/zfcp_dbf.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/s390/scsi/zfcp_dbf.c +3 -5
@@ -95,11 +95,9 @@ void zfcp_dbf_hba_fsf_res(char *tag, intmemcpy (rec->u.res.fsf_status_qual, &q_head->fsf_status_qual,FSF_STATUS_QUALIFIER_SIZE ); -if (q_head->fsf_command !=FSF_QTCB_FCP_CMND ) { - rec->pl_len = q_head->log_length; -zfcp_dbf_pl_write (dbf, (char *)q_pref + q_head->log_start, - rec->pl_len,"fsf_res" , req->req_id); - } + rec->pl_len = q_head->log_length; +zfcp_dbf_pl_write (dbf, (char *)q_pref + q_head->log_start, + rec->pl_len,"fsf_res" , req->req_id);debug_event (dbf->hba, level, rec,sizeof (*rec));spin_unlock_irqrestore (&dbf->hba_lock, flags);
Greg Kroah-Hartman
maintainerPATCH 5/180 scsi: qla2xxx: Fix driver unload hang
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit dd322b7f3efc8cda085bb60eadc4aee6324eadd8 upstream.
This patch fixes driver unload hang by removing msleep()
--- drivers/scsi/qla2xxx/qla_init.c | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +0 -2
@@ -9092,8 +9092,6 @@ int qla2xxx_delete_qpair(struct scsi_qlastruct qla_hw_data *ha = qpair->hw; qpair->delete_in_progress =1 ; -while (atomic_read (&qpair->ref_count)) -msleep (500 ); ret =qla25xx_delete_req_que (vha, qpair->req);if (ret !=QLA_SUCCESS )
Greg Kroah-Hartman
maintainerPATCH 6/180 scsi: qla2xxx: Fix memory leak when sending I/O fails
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 2f856d4e8c23f5ad5221f8da4a2f22d090627f19 upstream.
On heavy loads, a memory leak of the srb_t structure is observed. This would make the qla2xxx_srbs cache gobble up memory.
--- drivers/scsi/qla2xxx/qla_os.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/qla2xxx/qla_os.c +4 -0
@@ -947,6 +947,8 @@ qla2xxx_queuecommand(struct Scsi_Host *h qc24_host_busy_free_sp: sp->free (sp); +CMD_SP (cmd) =NULL ; +qla2x00_rel_sp (sp); qc24_host_busy:return SCSI_MLQUEUE_HOST_BUSY ;
@@ -1036,6 +1038,8 @@ qla2xxx_mqueuecommand(struct Scsi_Host * qc24_host_busy_free_sp: sp->free (sp); +CMD_SP (cmd) =NULL ; +qla2xxx_rel_qpair_sp (sp->qpair, sp); qc24_host_busy:return SCSI_MLQUEUE_HOST_BUSY ;
Greg Kroah-Hartman
maintainerPATCH 7/180 media: venus: remove invalid compat_ioctl32 handler
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 4adc0423de92cf850d1ef5c0e7cb28fd7a38219e upstream.
v4l2_compat_ioctl32() is the function that calls into v4l2_file_operations->compat_ioctl32(), so setting that back to the same function leads to a trivial endless loop, followed by a kernel stack overrun.
Remove the incorrect assignment.
--- drivers/media/platform/qcom/venus/vdec.c | 3 --- drivers/media/platform/qcom/venus/venc.c | 3 --- 2 files changed, 6 deletions(-)
drivers/media/platform/qcom/venus/vdec.c +0 -3
@@ -1104,9 +1104,6 @@ static const struct v4l2_file_operations .unlocked_ioctl = video_ioctl2, .poll = v4l2_m2m_fop_poll, .mmap = v4l2_m2m_fop_mmap, -#ifdef CONFIG_COMPAT - .compat_ioctl32 = v4l2_compat_ioctl32, -#endif };static int vdec_probe (struct platform_device *pdev)
drivers/media/platform/qcom/venus/venc.c +0 -3
@@ -1230,9 +1230,6 @@ static const struct v4l2_file_operations .unlocked_ioctl = video_ioctl2, .poll = v4l2_m2m_fop_poll, .mmap = v4l2_m2m_fop_mmap, -#ifdef CONFIG_COMPAT - .compat_ioctl32 = v4l2_compat_ioctl32, -#endif };static int venc_probe (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 8/180 USB: uas: honor flag to avoid CAPACITY16
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit bff000cae1eec750d62e265c4ba2db9af57b17e1 upstream.
Copy the support over from usb-storage to get feature parity
--- drivers/usb/storage/uas.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/storage/uas.c +4 -0
@@ -825,6 +825,10 @@ static int uas_slave_configure(struct sc sdev->wce_default_on =1 ; } +/* Some disks cannot handle READ_CAPACITY_16 */ +if (devinfo->flags &US_FL_NO_READ_CAPACITY_16 ) + sdev->no_read_capacity_16 =1 ; +/* * Some disks return the total number of blocks in response * to READ CAPACITY rather than the highest block number.
Greg Kroah-Hartman
maintainerPATCH 9/180 USB: uas: heed CAPACITY_HEURISTICS
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f upstream.
There is no need to ignore this flag. We should be as close to storage in that regard as makes sense, so honor flags whose cost is tiny.
--- drivers/usb/storage/uas.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/storage/uas.c +6 -0
@@ -838,6 +838,12 @@ static int uas_slave_configure(struct sc sdev->fix_capacity =1 ;/* +* in some cases we have to guess +*/ +if (devinfo->flags &US_FL_CAPACITY_HEURISTICS ) + sdev->guess_capacity =1 ; + +/* * Some devices don't like MODE SENSE with page=0x3f, * which is the command used for checking if a device * is write-protected. Now that we tell the sd driver
Greg Kroah-Hartman
maintainerPATCH 10/180 USB: documentation: flags on usb-storage versus UAS
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 65cc8bf99349f651a0a2cee69333525fe581f306 upstream.
Document which flags work storage, UAS or both
--- Documentation/admin-guide/kernel-parameters.txt | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +12 -10
@@ -5066,13 +5066,13 @@ Flags is a set of characters, each corresponding to a common usb-storage quirk flag as follows: a = SANE_SENSE (collect more than 18 bytes - of sense data); + of sense data, not on uas); b = BAD_SENSE (don't collect more than 18 - bytes of sense data); + bytes of sense data, not on uas); c = FIX_CAPACITY (decrease the reported device capacity by one sector); d = NO_READ_DISC_INFO (don't use - READ_DISC_INFO command); + READ_DISC_INFO command, not on uas); e = NO_READ_CAPACITY_16 (don't use READ_CAPACITY_16 command); f = NO_REPORT_OPCODES (don't use report opcodes
@@ -5087,17 +5087,18 @@ j = NO_REPORT_LUNS (don't use report luns command, uas only); l = NOT_LOCKABLE (don't try to lock and - unlock ejectable media); + unlock ejectable media, not on uas); m = MAX_SECTORS_64 (don't transfer more - than 64 sectors = 32 KB at a time); + than 64 sectors = 32 KB at a time, + not on uas); n = INITIAL_READ10 (force a retry of the - initial READ(10) command); + initial READ(10) command, not on uas); o = CAPACITY_OK (accept the capacity - reported by the device); + reported by the device, not on uas); p = WRITE_CACHE (the device cache is ON - by default); + by default, not on uas); r = IGNORE_RESIDUE (the device reports - bogus residue values); + bogus residue values, not on uas); s = SINGLE_LUN (the device has only one Logical Unit); t = NO_ATA_1X (don't allow ATA(12) and ATA(16)
@@ -5106,7 +5107,8 @@ w = NO_WP_DETECT (don't test whether the medium is write-protected). y = ALWAYS_SYNC (issue a SYNCHRONIZE_CACHE - even if the device claims no cache) + even if the device claims no cache, + not on uas) Example: quirks=0419:aaf5:rl,0421:0433:rc user_debug= [KNL,ARM]
Greg Kroah-Hartman
maintainerPATCH 11/180 usb: Allow USB device to be warm reset in suspended state
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit e76b3bf7654c3c94554c24ba15a3d105f4006c80 upstream.
On Dell WD15 dock, sometimes USB ethernet cannot be detected after plugging cable to the ethernet port, the hub and roothub get runtime resumed and runtime suspended immediately:
...
[ 433.315169] xhci_hcd 0000:3a:00.0: hcd_pci_runtime_resume: 0 [ 433.315204] usb usb4: usb auto-resume [ 433.315226] hub 4-0:1.0: hub_resume [ 433.315239] xhci_hcd 0000:3a:00.0: Get port status 4-1 read: 0x10202e2, return 0x10343 [ 433.315264] usb usb4-port1: status 0343 change 0001 [ 433.315279] xhci_hcd 0000:3a:00.0: clear port1 connect change, portsc: 0x10002e2 [ 433.315293] xhci_hcd 0000:3a:00.0: Get port status 4-2 read: 0x2a0, return 0x2a0 [ 433.317012] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. [ 433.422282] xhci_hcd 0000:3a:00.0: Get port status 4-1 read: 0x10002e2, return 0x343 [ 433.422307] usb usb4-port1: do warm reset [ 433.422311] usb 4-1: device reset not allowed in state 8 [ 433.422339] hub 4-0:1.0: state 7 ports 2 chg 0002 evt 0000 [ 433.422346] xhci_hcd 0000:3a:00.0: Get port status 4-1 read: 0x10002e2, return 0x343 [ 433.422356] usb usb4-port1: do warm reset [ 433.422358] usb 4-1: device reset not allowed in state 8 [ 433.422428] xhci_hcd 0000:3a:00.0: set port remote wake mask, actual port 0 status = 0xf0002e2 [ 433.422455] xhci_hcd 0000:3a:00.0: set port remote wake mask, actual port 1 status = 0xe0002a0 [ 433.422465] hub 4-0:1.0: hub_suspend [ 433.422475] usb usb4: bus auto-suspend, wakeup 1 [ 433.426161] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. [ 433.466209] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.510204] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.554051] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.598235] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.642154] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.686204] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.730205] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.774203] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.818207] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.862040] xhci_hcd 0000:3a:00.0: port 0 polling in bus suspend, waiting [ 433.862053] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. [ 433.862077] xhci_hcd 0000:3a:00.0: xhci_suspend: stopping port polling. [ 433.862096] xhci_hcd 0000:3a:00.0: // Setting command ring address to 0x8578fc001 [ 433.862312] xhci_hcd 0000:3a:00.0: hcd_pci_runtime_suspend: 0 [ 433.862445] xhci_hcd 0000:3a:00.0: PME# enabled [ 433.902376] xhci_hcd 0000:3a:00.0: restoring config space at offset 0xc (was 0x0, writing 0x20) [ 433.902395] xhci_hcd 0000:3a:00.0: restoring config space at offset 0x4 (was 0x100000, writing 0x100403) [ 433.902490] xhci_hcd 0000:3a:00.0: PME# disabled [ 433.902504] xhci_hcd 0000:3a:00.0: enabling bus mastering [ 433.902547] xhci_hcd 0000:3a:00.0: // Setting command ring address to 0x8578fc001 [ 433.902649] pcieport 0000:00:1b.0: PME: Spurious native interrupt! [ 433.902839] xhci_hcd 0000:3a:00.0: Port change event, 4-1, id 3, portsc: 0xb0202e2 [ 433.902842] xhci_hcd 0000:3a:00.0: resume root hub [ 433.902845] xhci_hcd 0000:3a:00.0: handle_port_status: starting port polling. [ 433.902877] xhci_hcd 0000:3a:00.0: xhci_resume: starting port polling. [ 433.902889] xhci_hcd 0000:3a:00.0: xhci_hub_status_data: stopping port polling. [ 433.902891] xhci_hcd 0000:3a:00.0: hcd_pci_runtime_resume: 0 [ 433.902919] usb usb4: usb wakeup-resume [ 433.902942] usb usb4: usb auto-resume [ 433.902966] hub 4-0:1.0: hub_resume
...
As Mathias pointed out, the hub enters Cold Attach Status state and requires a warm reset. However usb_reset_device() bails out early when the device is in suspended state, as its callers port_event() and hub_event() don't always resume the device.
Since there's nothing wrong to reset a suspended device, allow usb_reset_device() to do so to solve the issue.
--- drivers/usb/core/hub.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/core/hub.c +2 -3
@@ -5814,7 +5814,7 @@ re_enumerate_no_bos:/** * usb_reset_device - warn interface drivers and perform a USB port reset -* @udev: device to reset (not in SUSPENDED or NOTATTACHED state) +* @udev: device to reset (not in NOTATTACHED state) * * Warns all drivers bound to registered interfaces (using their pre_reset * method), performs the port reset, and then lets the drivers know that
@@ -5842,8 +5842,7 @@ int usb_reset_device(struct usb_device *struct usb_host_config *config = udev->actconfig;struct usb_hub *hub =usb_hub_to_struct_hub (udev->parent); -if (udev->state ==USB_STATE_NOTATTACHED || - udev->state ==USB_STATE_SUSPENDED ) { +if (udev->state ==USB_STATE_NOTATTACHED ) {dev_dbg (&udev->dev,"device reset not allowed in state %d\n" , udev->state);return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 12/180 usb: host: xhci-tegra: Correct phy enable sequence
In reply to Greg Kroah-HartmanFrom: Nagarjuna Kristam <[email protected]>
commit 6351653febbb784d86fdf83afe41f7523a61b392 upstream.
XUSB phy needs to be enabled before un-powergating the power partitions. However in the current sequence, it happens opposite. Correct the phy enable and powergating partition sequence to avoid any boot hangs.
--- drivers/usb/host/xhci-tegra.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/usb/host/xhci-tegra.c +13 -12
@@ -755,7 +755,6 @@ static int tegra_xusb_runtime_suspend(st {struct tegra_xusb *tegra =dev_get_drvdata (dev); -tegra_xusb_phy_disable (tegra);regulator_bulk_disable (tegra->soc->num_supplies, tegra->supplies);tegra_xusb_clk_disable (tegra);
@@ -779,16 +778,8 @@ static int tegra_xusb_runtime_resume(str goto disable_clk; } - err =tegra_xusb_phy_enable (tegra); -if (err <0 ) { -dev_err (dev,"failed to enable PHYs: %d\n" , err); - goto disable_regulator; - } -return 0 ; -disable_regulator: -regulator_bulk_disable (tegra->soc->num_supplies, tegra->supplies); disable_clk:tegra_xusb_clk_disable (tegra);return err;
@@ -1181,6 +1172,12 @@ static int tegra_xusb_probe(struct platf*/ platform_set_drvdata (pdev, tegra); + err =tegra_xusb_phy_enable (tegra); +if (err <0 ) { +dev_err (&pdev->dev,"failed to enable PHYs: %d\n" , err); + goto put_hcd; + } +pm_runtime_enable (&pdev->dev);if (pm_runtime_enabled (&pdev->dev)) err =pm_runtime_get_sync (&pdev->dev);
@@ -1189,7 +1186,7 @@ static int tegra_xusb_probe(struct platfif (err <0 ) {dev_err (&pdev->dev,"failed to enable device: %d\n" , err); - goto disable_rpm; + goto disable_phy; }tegra_xusb_config (tegra, regs);
@@ -1275,9 +1272,11 @@ remove_usb2: put_rpm:if (!pm_runtime_status_suspended (&pdev->dev))tegra_xusb_runtime_suspend (&pdev->dev); -disable_rpm: -pm_runtime_disable (&pdev->dev); +put_hcd:usb_put_hcd (tegra->hcd); +disable_phy: +tegra_xusb_phy_disable (tegra); +pm_runtime_disable (&pdev->dev); put_powerdomains:if (!of_property_read_bool (pdev->dev.of_node,"power-domains" )) {tegra_powergate_power_off (TEGRA_POWERGATE_XUSBC );
@@ -1314,6 +1313,8 @@ static int tegra_xusb_remove(struct plattegra_xusb_powerdomain_remove (&pdev->dev, tegra); } +tegra_xusb_phy_disable (tegra); +tegra_xusb_padctl_put (tegra->padctl);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 13/180 binder: fix incorrect calculation for num_valid
In reply to Greg Kroah-HartmanFrom: Todd Kjos <[email protected]>
commit 16981742717b04644a41052570fb502682a315d2 upstream.
For BINDER_TYPE_PTR and BINDER_TYPE_FDA transactions, the num_valid local was calculated incorrectly causing the range check in binder_validate_ptr() to miss out-of-bounds offsets.
--- drivers/android/binder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/android/binder.c +2 -2
@@ -3332,7 +3332,7 @@ static void binder_transaction(struct bibinder_size_t parent_offset;struct binder_fd_array_object *fda =to_binder_fd_array_object (hdr); -size_t num_valid = (buffer_offset - off_start_offset) * +size_t num_valid = (buffer_offset - off_start_offset) /sizeof (binder_size_t);struct binder_buffer_object *parent = binder_validate_ptr(target_proc, t->buffer,
@@ -3406,7 +3406,7 @@ static void binder_transaction(struct bi t->buffer->user_data + sg_buf_offset; sg_buf_offset +=ALIGN (bp->length,sizeof (u64)); - num_valid = (buffer_offset - off_start_offset) * + num_valid = (buffer_offset - off_start_offset) /sizeof (binder_size_t); ret = binder_fixup_parent(t, thread, bp, off_start_offset,
Greg Kroah-Hartman
maintainerPATCH 14/180 staging: rtl8188eu: fix interface sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 74ca34118a0e05793935d804ccffcedd6eb56596 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -1
@@ -70,7 +70,7 @@ static struct dvobj_priv *usb_dvobj_init phost_conf = pusbd->actconfig; pconf_desc = &phost_conf->desc; - phost_iface = &usb_intf->altsetting[0 ]; + phost_iface = usb_intf->cur_altsetting; piface_desc = &phost_iface->desc; pdvobjpriv->NumInterfaces = pconf_desc->bNumInterfaces;
Greg Kroah-Hartman
maintainerPATCH 15/180 staging: rtl8712: fix interface sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c724f776f048538ecfdf53a52b7a522309f5c504 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/staging/rtl8712/usb_intf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8712/usb_intf.c +1 -1
@@ -247,7 +247,7 @@ static uint r8712_usb_dvobj_init(struct pdvobjpriv->padapter = padapter; padapter->eeprom_address_size =6 ; - phost_iface = &pintf->altsetting[0 ]; + phost_iface = pintf->cur_altsetting; piface_desc = &phost_iface->desc; pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;if (pusbd->speed ==USB_SPEED_HIGH ) {
Greg Kroah-Hartman
maintainerPATCH 16/180 staging: vchiq: call unregister_chrdev_region() when driver registration fails
In reply to Greg Kroah-HartmanFrom: Marcelo Diop-Gonzalez <[email protected]>
commit d2cdb20507fe2079a146459f9718b45d78cbbe61 upstream.
This undoes the previous call to alloc_chrdev_region() on failure, and is probably what was meant originally given the label name.
--- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +1 -1
@@ -3300,7 +3300,7 @@ static int __init vchiq_driver_init(voidreturn 0 ; region_unregister: -platform_driver_unregister (&vchiq_driver); +unregister_chrdev_region (vchiq_devid,1 ); class_destroy:class_destroy (vchiq_class);
Greg Kroah-Hartman
maintainerPATCH 17/180 staging: gigaset: fix general protection fault on probe
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 53f35a39c3860baac1e5ca80bf052751cfb24a99 upstream.
Fix a general protection fault when accessing the endpoint descriptors which could be triggered by a malicious device due to missing sanity checks on the number of endpoints.
--- drivers/staging/isdn/gigaset/usb-gigaset.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/isdn/gigaset/usb-gigaset.c +5 -0
@@ -685,6 +685,11 @@ static int gigaset_probe(struct usb_intereturn -ENODEV ; } +if (hostif->desc.bNumEndpoints <2 ) { +dev_err (&interface->dev,"missing endpoints\n" ); +return -ENODEV ; + } +dev_info (&udev->dev,"%s: Device matched ... !\n" , __func__);/* allocate memory for our device state and initialize it */
Greg Kroah-Hartman
maintainerPATCH 18/180 staging: gigaset: fix illegal free on probe errors
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 84f60ca7b326ed8c08582417493982fe2573a9ad upstream.
The driver failed to initialise its receive-buffer pointer, something which could lead to an illegal free on late probe errors.
Fix this by making sure to clear all driver data at allocation.
--- drivers/staging/isdn/gigaset/usb-gigaset.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/staging/isdn/gigaset/usb-gigaset.c +1 -5
@@ -571,8 +571,7 @@ static int gigaset_initcshw(struct cards {struct usb_cardstate *ucs; - cs->hw.usb = ucs = -kmalloc (sizeof (struct usb_cardstate ),GFP_KERNEL ); + cs->hw.usb = ucs =kzalloc (sizeof (struct usb_cardstate ),GFP_KERNEL );if (!ucs) {pr_err ("out of memory\n" );return -ENOMEM ;
@@ -584,9 +583,6 @@ static int gigaset_initcshw(struct cards ucs->bchars[3 ] =0 ; ucs->bchars[4 ] =0x11 ; ucs->bchars[5 ] =0x13 ; - ucs->bulk_out_buffer =NULL ; - ucs->bulk_out_urb =NULL ; - ucs->read_urb =NULL ;tasklet_init (&cs->write_tasklet, gigaset_modem_fill, (unsigned long ) cs);
Greg Kroah-Hartman
maintainerPATCH 19/180 staging: gigaset: add endpoint-type sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit ed9ed5a89acba51b82bdff61144d4e4a4245ec8a upstream.
Add missing endpoint-type sanity checks to probe.
This specifically prevents a warning in USB core on URB submission when fuzzing USB descriptors.
--- drivers/staging/isdn/gigaset/usb-gigaset.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/staging/isdn/gigaset/usb-gigaset.c +12 -0
@@ -705,6 +705,12 @@ static int gigaset_probe(struct usb_inte endpoint = &hostif->endpoint[0 ].desc; +if (!usb_endpoint_is_bulk_out (endpoint)) { +dev_err (&interface->dev,"missing bulk-out endpoint\n" ); + retval = -ENODEV ; + goto error; + } + buffer_size =le16_to_cpu (endpoint->wMaxPacketSize); ucs->bulk_out_size = buffer_size; ucs->bulk_out_epnum =usb_endpoint_num (endpoint);
@@ -724,6 +730,12 @@ static int gigaset_probe(struct usb_inte endpoint = &hostif->endpoint[1 ].desc; +if (!usb_endpoint_is_int_in (endpoint)) { +dev_err (&interface->dev,"missing int-in endpoint\n" ); + retval = -ENODEV ; + goto error; + } + ucs->busy =0 ; ucs->read_urb =usb_alloc_urb (0 ,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 20/180 usb: xhci: only set D3hot for pci device
In reply to Greg Kroah-HartmanFrom: Henry Lin <[email protected]>
commit f2c710f7dca8457e88b4ac9de2060f011254f9dd upstream.
Xhci driver cannot call pci_set_power_state() on non-pci xhci host controllers. For example, NVIDIA Tegra XHCI host controller which acts as platform device with XHCI_SPURIOUS_WAKEUP quirk set in some platform hits this issue during shutdown.
--- drivers/usb/host/xhci-pci.c | 13 +++++++++++++ drivers/usb/host/xhci.c | 7 ++----- drivers/usb/host/xhci.h | 1 + 3 files changed, 16 insertions(+), 5 deletions(-)
drivers/usb/host/xhci-pci.c +13 -0
@@ -519,6 +519,18 @@ static int xhci_pci_resume(struct usb_hc }#endif /* CONFIG_PM */ +static void xhci_pci_shutdown (struct usb_hcd *hcd) +{ +struct xhci_hcd *xhci =hcd_to_xhci (hcd); +struct pci_dev *pdev =to_pci_dev (hcd->self.controller); + +xhci_shutdown (hcd); + +/* Yet another workaround for spurious wakeups at shutdown with HSW */ +if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) +pci_set_power_state (pdev, PCI_D3hot); +} +/*-------------------------------------------------------------------------*/ /* PCI driver selection metadata; PCI hotplugging uses this */
@@ -554,6 +566,7 @@ static int __init xhci_pci_init(void)#ifdef CONFIG_PM xhci_pci_hc_driver.pci_suspend = xhci_pci_suspend; xhci_pci_hc_driver.pci_resume = xhci_pci_resume; + xhci_pci_hc_driver.shutdown = xhci_pci_shutdown;#endif return pci_register_driver (&xhci_pci_driver); }
drivers/usb/host/xhci.c +2 -5
@@ -770,7 +770,7 @@ static void xhci_stop(struct usb_hcd *hc* * This will only ever be called with the main usb_hcd (the USB3 roothub). */ -static void xhci_shutdown (struct usb_hcd *hcd) +void xhci_shutdown (struct usb_hcd *hcd) {struct xhci_hcd *xhci =hcd_to_xhci (hcd);
@@ -789,11 +789,8 @@ static void xhci_shutdown(struct usb_hcdxhci_dbg_trace (xhci, trace_xhci_dbg_init,"xhci_shutdown completed - status = %x" ,readl (&xhci->op_regs->status)); - -/* Yet another workaround for spurious wakeups at shutdown with HSW */ -if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) -pci_set_power_state (to_pci_dev (hcd->self.sysdev), PCI_D3hot); } +EXPORT_SYMBOL_GPL (xhci_shutdown);#ifdef CONFIG_PM static void xhci_save_registers (struct xhci_hcd *xhci)
drivers/usb/host/xhci.h +1 -0
@@ -2050,6 +2050,7 @@ int xhci_start(struct xhci_hcd *xhci);int xhci_reset (struct xhci_hcd *xhci);int xhci_run (struct usb_hcd *hcd);int xhci_gen_setup (struct usb_hcd *hcd,xhci_get_quirks_t get_quirks); +void xhci_shutdown (struct usb_hcd *hcd);void xhci_init_driver (struct hc_driver *drv,const struct xhci_driver_overrides *over);int xhci_disable_slot (struct xhci_hcd *xhci,u32 slot_id);
Greg Kroah-Hartman
maintainerPATCH 21/180 xhci: Fix memory leak in xhci_add_in_port()
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit ce91f1a43b37463f517155bdfbd525eb43adbd1a upstream.
When xHCI is part of Alpine or Titan Ridge Thunderbolt controller and the xHCI device is hot-removed as a result of unplugging a dock for example, the driver leaks memory it allocates for xhci->usb3_rhub.psi and xhci->usb2_rhub.psi in xhci_add_in_port() as reported by kmemleak:
unreferenced object 0xffff922c24ef42f0 (size 16):
comm "kworker/u16:2", pid 178, jiffies 4294711640 (age 956.620s) hex dump (first 16 bytes):
21 00 0c 00 12 00 dc 05 23 00 e0 01 00 00 00 00 !.......#.......
backtrace:
[<000000007ac80914>] xhci_mem_init+0xcf8/0xeb7
[<0000000001b6d775>] xhci_init+0x7c/0x160
[<00000000db443fe3>] xhci_gen_setup+0x214/0x340
[<00000000fdffd320>] xhci_pci_setup+0x48/0x110
[<00000000541e1e03>] usb_add_hcd.cold+0x265/0x747
[<00000000ca47a56b>] usb_hcd_pci_probe+0x219/0x3b4
[<0000000021043861>] xhci_pci_probe+0x24/0x1c0
[<00000000b9231f25>] local_pci_probe+0x3d/0x70
[<000000006385c9d7>] pci_device_probe+0xd0/0x150
[<0000000070241068>] really_probe+0xf5/0x3c0
[<0000000061f35c0a>] driver_probe_device+0x58/0x100
[<000000009da11198>] bus_for_each_drv+0x79/0xc0
[<000000009ce45f69>] __device_attach+0xda/0x160
[<00000000df201aaf>] pci_bus_add_device+0x46/0x70
[<0000000088a1bc48>] pci_bus_add_devices+0x27/0x60
[<00000000ad9ee708>] pci_bus_add_devices+0x52/0x60
unreferenced object 0xffff922c24ef3318 (size 8):
comm "kworker/u16:2", pid 178, jiffies 4294711640 (age 956.620s)
hex dump (first 8 bytes):
34 01 05 00 35 41 0a 00 4...5A..
backtrace:
[<000000007ac80914>] xhci_mem_init+0xcf8/0xeb7
[<0000000001b6d775>] xhci_init+0x7c/0x160
[<00000000db443fe3>] xhci_gen_setup+0x214/0x340
[<00000000fdffd320>] xhci_pci_setup+0x48/0x110
[<00000000541e1e03>] usb_add_hcd.cold+0x265/0x747
[<00000000ca47a56b>] usb_hcd_pci_probe+0x219/0x3b4
[<0000000021043861>] xhci_pci_probe+0x24/0x1c0
[<00000000b9231f25>] local_pci_probe+0x3d/0x70
[<000000006385c9d7>] pci_device_probe+0xd0/0x150
[<0000000070241068>] really_probe+0xf5/0x3c0
[<0000000061f35c0a>] driver_probe_device+0x58/0x100
[<000000009da11198>] bus_for_each_drv+0x79/0xc0
[<000000009ce45f69>] __device_attach+0xda/0x160
[<00000000df201aaf>] pci_bus_add_device+0x46/0x70
[<0000000088a1bc48>] pci_bus_add_devices+0x27/0x60
[<00000000ad9ee708>] pci_bus_add_devices+0x52/0x60Fix this by calling kfree() for the both psi objects in xhci_mem_cleanup().
--- drivers/usb/host/xhci-mem.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/host/xhci-mem.c +4 -0
@@ -1909,13 +1909,17 @@ no_bw: xhci->usb3_rhub.num_ports =0 ; xhci->num_active_eps =0 ;kfree (xhci->usb2_rhub.ports); +kfree (xhci->usb2_rhub.psi);kfree (xhci->usb3_rhub.ports); +kfree (xhci->usb3_rhub.psi);kfree (xhci->hw_ports);kfree (xhci->rh_bw);kfree (xhci->ext_caps); xhci->usb2_rhub.ports =NULL ; + xhci->usb2_rhub.psi =NULL ; xhci->usb3_rhub.ports =NULL ; + xhci->usb3_rhub.psi =NULL ; xhci->hw_ports =NULL ; xhci->rh_bw =NULL ; xhci->ext_caps =NULL ;
Greg Kroah-Hartman
maintainerPATCH 22/180 xhci: fix USB3 device initiated resume race with roothub autosuspend
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 057d476fff778f1d3b9f861fdb5437ea1a3cfc99 upstream.
A race in xhci USB3 remote wake handling may force device back to suspend after it initiated resume siganaling, causing a missed resume event or warm reset of device.
When a USB3 link completes resume signaling and goes to enabled (UO) state a interrupt is issued and the interrupt handler will clear the bus_state->port_remote_wakeup resume flag, allowing bus suspend.
If the USB3 roothub thread just finished reading port status before the interrupt, finding ports still in suspended (U3) state, but hasn't yet started suspending the hub, then the xhci interrupt handler will clear the flag that prevented roothub suspend and allow bus to suspend, forcing all port links back to suspended (U3) state.
Example case:usb_runtime_suspend() # because all ports still show suspended U3
usb_suspend_both()
hub_suspend(); # successful as hub->wakeup_bits not set yet
==> INTERRUPT
xhci_irq()
handle_port_status()
clear bus_state->port_remote_wakeup
usb_wakeup_notification()
sets hub->wakeup_bits;
kick_hub_wq()<== END INTERRUPT
hcd_bus_suspend()
xhci_bus_suspend() # success as port_remote_wakeup bits cleared
Fix this by increasing roothub usage count during port resume to prevent roothub autosuspend, and by making sure bus_state->port_remote_wakeup flag is only cleared after resume completion is visible, i.e. after xhci roothub returned U0 or other non-U3 link state link on a get port status request.
Issue rootcaused by Chiasheng Lee
--- drivers/usb/host/xhci-hub.c | 10 ++++++++++ drivers/usb/host/xhci-ring.c | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-hub.c +10 -0
@@ -920,11 +920,13 @@ static void xhci_get_usb3_port_status(st {struct xhci_bus_state *bus_state;struct xhci_hcd *xhci; +struct usb_hcd *hcd;u32 link_state;u32 portnum; bus_state = &port->rhub->bus_state; xhci =hcd_to_xhci (port->rhub->hcd); + hcd = port->rhub->hcd; link_state = portsc &PORT_PLS_MASK ; portnum = port->hcd_portnum;
@@ -952,6 +954,14 @@ static void xhci_get_usb3_port_status(st bus_state->suspended_ports &= ~(1 << portnum); } +/* remote wake resume signaling complete */ +if (bus_state->port_remote_wakeup & (1 << portnum) && + link_state !=XDEV_RESUME && + link_state !=XDEV_RECOVERY ) { + bus_state->port_remote_wakeup &= ~(1 << portnum); +usb_hcd_end_port_resume (&hcd->self, portnum); + } +xhci_hub_report_usb3_link_state (xhci, status, portsc);xhci_del_comp_mod_timer (xhci, portsc, portnum); }
drivers/usb/host/xhci-ring.c +1 -2
@@ -1624,7 +1624,6 @@ static void handle_port_status(struct xh slot_id =xhci_find_slot_id_by_port (hcd, xhci, hcd_portnum +1 );if (slot_id && xhci->devs[slot_id]) xhci->devs[slot_id]->flags |=VDEV_PORT_ERROR ; - bus_state->port_remote_wakeup &= ~(1 << hcd_portnum); }if ((portsc &PORT_PLC ) && (portsc &PORT_PLS_MASK ) ==XDEV_RESUME ) {
@@ -1644,6 +1643,7 @@ static void handle_port_status(struct xh*/ bus_state->port_remote_wakeup |=1 << hcd_portnum;xhci_test_and_clear_bit (xhci, port,PORT_PLC ); +usb_hcd_start_port_resume (&hcd->self, hcd_portnum);xhci_set_link_state (xhci, port,XDEV_U0 );/* Need to wait until the next link state change * indicates the device is actually in U0.
@@ -1684,7 +1684,6 @@ static void handle_port_status(struct xhif (slot_id && xhci->devs[slot_id])xhci_ring_device (xhci, slot_id);if (bus_state->port_remote_wakeup & (1 << hcd_portnum)) { - bus_state->port_remote_wakeup &= ~(1 << hcd_portnum);xhci_test_and_clear_bit (xhci, port,PORT_PLC );usb_wakeup_notification (hcd->self.root_hub, hcd_portnum +1 );
Greg Kroah-Hartman
maintainerPATCH 23/180 xhci: Increase STS_HALT timeout in xhci_suspend()
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 7c67cf6658cec70d8a43229f2ce74ca1443dc95e upstream.
I've recently observed failed xHCI suspend attempt on AMD Raven Ridge system:
kernel: xhci_hcd 0000:04:00.4: WARN: xHC CMD_RUN timeout
kernel: PM: suspend_common(): xhci_pci_suspend+0x0/0xd0 returns -110
kernel: PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x30 returns -110
kernel: PM: dpm_run_callback(): pci_pm_suspend+0x0/0x150 returns -110
kernel: PM: Device 0000:04:00.4 failed to suspend async: error -110
Similar to commit ac343366846a ("xhci: Increase STS_SAVE timeout in xhci_suspend()") we also need to increase the HALT timeout to make it be able to suspend again.
--- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci.c +1 -1
@@ -970,7 +970,7 @@ static bool xhci_pending_portevent(strucint xhci_suspend (struct xhci_hcd *xhci,bool do_wakeup) {int rc =0 ; -unsigned int delay =XHCI_MAX_HALT_USEC ; +unsigned int delay =XHCI_MAX_HALT_USEC *2 ;struct usb_hcd *hcd =xhci_to_hcd (xhci);u32 command;u32 res;
Greg Kroah-Hartman
maintainerPATCH 24/180 xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour.
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 7ff11162808cc2ec66353fc012c58bb449c892c3 upstream.
xhci driver claims it needs XHCI_TRUST_TX_LENGTH quirk for both Broadcom/Cavium and a Renesas xHC controllers.
The quirk was inteded for handling false "success" complete event for transfers that had data left untransferred.
These transfers should complete with "short packet" events instead.
In these two new cases the false "success" completion is reported after a "short packet" if the TD consists of several TRBs. xHCI specs 4.10.1.1.2 say remaining TRBs should report "short packet" as well after the first short packet in a TD, but this issue seems so common it doesn't make sense to add the quirk for all vendors.
Turn these events into short packets automatically instead.
This gets rid of the "The WARN Successful completion on short TX for slot 1 ep 1: needs XHCI_TRUST_TX_LENGTH quirk" warning in many cases.
--- drivers/usb/host/xhci-ring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-ring.c +2 -1
@@ -2377,7 +2377,8 @@ static int handle_tx_event(struct xhci_hcase COMP_SUCCESS :if (EVENT_TRB_LEN (le32_to_cpu (event->transfer_len)) ==0 )break ; -if (xhci->quirks &XHCI_TRUST_TX_LENGTH ) +if (xhci->quirks &XHCI_TRUST_TX_LENGTH || + ep_ring->last_td_was_short) trb_comp_code =COMP_SHORT_PACKET ;else xhci_warn_ratelimited(xhci,
Greg Kroah-Hartman
maintainerPATCH 25/180 xhci: make sure interrupts are restored to correct state
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit bd82873f23c9a6ad834348f8b83f3b6a5bca2c65 upstream.
spin_unlock_irqrestore() might be called with stale flags after reading port status, possibly restoring interrupts to a incorrect state.
If a usb2 port just finished resuming while the port status is read the spin lock will be temporary released and re-acquired in a separate function. The flags parameter is passed as value instead of a pointer, not updating flags properly before the final spin_unlock_irqrestore() is called.
--- drivers/usb/host/xhci-hub.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/usb/host/xhci-hub.c +6 -6
@@ -806,7 +806,7 @@ static void xhci_del_comp_mod_timer(strustatic int xhci_handle_usb2_port_link_resume (struct xhci_port *port,u32 *status,u32 portsc, -unsigned long flags) +unsigned long *flags) {struct xhci_bus_state *bus_state;struct xhci_hcd *xhci;
@@ -860,11 +860,11 @@ static int xhci_handle_usb2_port_link_rexhci_test_and_clear_bit (xhci, port,PORT_PLC );xhci_set_link_state (xhci, port,XDEV_U0 ); -spin_unlock_irqrestore (&xhci->lock, flags); +spin_unlock_irqrestore (&xhci->lock, *flags); time_left =wait_for_completion_timeout ( &bus_state->rexit_done[wIndex],msecs_to_jiffies (XHCI_MAX_REXIT_TIMEOUT_MS )); -spin_lock_irqsave (&xhci->lock, flags); +spin_lock_irqsave (&xhci->lock, *flags);if (time_left) { slot_id = xhci_find_slot_id_by_port(hcd, xhci,
@@ -967,7 +967,7 @@ static void xhci_get_usb3_port_status(st }static void xhci_get_usb2_port_status (struct xhci_port *port,u32 *status, -u32 portsc,unsigned long flags) +u32 portsc,unsigned long *flags) {struct xhci_bus_state *bus_state;u32 link_state;
@@ -1017,7 +1017,7 @@ static void xhci_get_usb2_port_status(ststatic u32 xhci_get_port_status (struct usb_hcd *hcd,struct xhci_bus_state *bus_state,u16 wIndex,u32 raw_port_status, -unsigned long flags) +unsigned long *flags) __releases(&xhci->lock) __acquires(&xhci->lock) {
@@ -1140,7 +1140,7 @@ int xhci_hub_control(struct usb_hcd *hcd }trace_xhci_get_port_status (wIndex, temp); status =xhci_get_port_status (hcd, bus_state, wIndex, temp, - flags); + &flags);if (status ==0xffffffff ) goto error;
Greg Kroah-Hartman
maintainerPATCH 26/180 interconnect: qcom: sdm845: Walk the list safely on node removal
In reply to Greg Kroah-HartmanFrom: Georgi Djakov <[email protected]>
commit b29b8113bb41285eb7ed55ce0c65017b5c0240f7 upstream.
As we will remove items off the list using list_del(), we need to use the safe version of list_for_each_entry().
--- drivers/interconnect/qcom/sdm845.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/interconnect/qcom/sdm845.c +2 -2
@@ -807,9 +807,9 @@ static int qnoc_remove(struct platform_d {struct qcom_icc_provider *qp =platform_get_drvdata (pdev);struct icc_provider *provider = &qp->provider; -struct icc_node *n; +struct icc_node *n, *tmp; -list_for_each_entry (n, &provider->nodes, node_list) { +list_for_each_entry_safe (n, tmp, &provider->nodes, node_list) {icc_node_del (n);icc_node_destroy (n->id); }
Greg Kroah-Hartman
maintainerPATCH 27/180 ARM: dts: pandora-common: define wl1251 as child node of mmc3
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
commit 4f9007d692017cef38baf2a9b82b7879d5b2407b upstream.
Since v4.7 the dma initialization requires that there is a device tree property for "rx" and "tx" channels which is not provided by the pdata-quirks initialization.
By conversion of the mmc3 setup to device tree this will finally allows to remove the OpenPandora wlan specific omap3 data-quirks.
--- arch/arm/boot/dts/omap3-pandora-common.dtsi | 36 ++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap3-pandora-common.dtsi +34 -2
@@ -226,6 +226,17 @@ gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* GPIO_164 */ }; + /* wl1251 wifi+bt module */ + wlan_en: fixed-regulator-wg7210_en { + compatible = "regulator-fixed"; + regulator-name = "vwlan"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + startup-delay-us = <50000>; + enable-active-high; + gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>; + }; + /* wg7210 (wifi+bt module) 32k clock buffer */ wg7210_32k: fixed-regulator-wg7210_32k { compatible = "regulator-fixed";
@@ -522,9 +533,30 @@ /*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/ /* GPIO_127 */ }; -/* mmc3 is probed using pdata-quirks to pass wl1251 card data */ &mmc3 { - status = "disabled"; + vmmc-supply = <&wlan_en>; + + bus-width = <4>; + non-removable; + ti,non-removable; + cap-power-off-card; + + pinctrl-names = "default"; + pinctrl-0 = <&mmc3_pins>; + + #address-cells = <1>; + #size-cells = <0>; + + wlan: wifi@1 { + compatible = "ti,wl1251"; + + reg = <1>; + + interrupt-parent = <&gpio1>; + interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_21 */ + + ti,wl1251-has-eeprom; + }; }; /* bluetooth*/
Greg Kroah-Hartman
maintainerPATCH 28/180 iio: adis16480: Add debugfs_reg_access entry
In reply to Greg Kroah-HartmanFrom: Nuno Sá <[email protected]>
commit 4c35b7a51e2f291471f7221d112c6a45c63e83bc upstream.
The driver is defining debugfs entries by calling adis16480_debugfs_init(). However, those entries are attached to the iio_dev debugfs entry which won't exist if no debugfs_reg_access callback is provided.
--- drivers/iio/imu/adis16480.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/imu/adis16480.c +1 -0
@@ -919,6 +919,7 @@ static const struct iio_info adis16480_i .read_raw = &adis16480_read_raw, .write_raw = &adis16480_write_raw, .update_scan_mode = adis_update_scan_mode, + .debugfs_reg_access = adis_debugfs_reg_access, };static int adis16480_stop_device (struct iio_dev *indio_dev)
Greg Kroah-Hartman
maintainerPATCH 29/180 iio: adis16480: Fix scales factors
In reply to Greg Kroah-HartmanFrom: Nuno Sá <[email protected]>
commit 49549cb23a2926eba70bb634e361daea0f319794 upstream.
This patch fixes the scales for the gyroscope, accelerometer and barometer. The pressure scale was just wrong. For the others, the scale factors were not taking into account that a 32bit word is being read from the device.
--- drivers/iio/imu/adis16480.c | 77 +++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 36 deletions(-)
drivers/iio/imu/adis16480.c +41 -36
@@ -623,9 +623,13 @@ static int adis16480_read_raw(struct iio *val2 = (st->chip_info->temp_scale %1000 ) *1000 ;return IIO_VAL_INT_PLUS_MICRO ;case IIO_PRESSURE : - *val =0 ; - *val2 =4000 ;/* 40ubar = 0.004 kPa */ -return IIO_VAL_INT_PLUS_MICRO ; +/* +* max scale is 1310 mbar +* max raw value is 32767 shifted for 32bits +*/ + *val =131 ;/* 1310mbar = 131 kPa */ + *val2 =32767 <<16 ; +return IIO_VAL_FRACTIONAL ;default :return -EINVAL ; }
@@ -786,13 +790,14 @@ static const struct adis16480_chip_info .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels),/* -* storing the value in rad/degree and the scale in degree -* gives us the result in rad and better precession than -* storing the scale directly in rad. +* Typically we do IIO_RAD_TO_DEGREE in the denominator, which +* is exactly the same as IIO_DEGREE_TO_RAD in numerator, since +* it gives better approximation. However, in this case we +* cannot do it since it would not fit in a 32bit variable. */ - .gyro_max_val = IIO_RAD_TO_DEGREE(22887), - .gyro_max_scale = 300, - .accel_max_val = IIO_M_S_2_TO_G(21973), + .gyro_max_val = 22887 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(300), + .accel_max_val = IIO_M_S_2_TO_G(21973 << 16), .accel_max_scale = 18, .temp_scale = 5650, /* 5.65 milli degree Celsius */ .int_clk = 2460000,
@@ -802,9 +807,9 @@ static const struct adis16480_chip_info [ADIS16480] = { .channels = adis16480_channels, .num_channels = ARRAY_SIZE(adis16480_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(22500), - .gyro_max_scale = 450, - .accel_max_val = IIO_M_S_2_TO_G(12500), + .gyro_max_val = 22500 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(450), + .accel_max_val = IIO_M_S_2_TO_G(12500 << 16), .accel_max_scale = 10, .temp_scale = 5650, /* 5.65 milli degree Celsius */ .int_clk = 2460000,
@@ -814,9 +819,9 @@ static const struct adis16480_chip_info [ADIS16485] = { .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(22500), - .gyro_max_scale = 450, - .accel_max_val = IIO_M_S_2_TO_G(20000), + .gyro_max_val = 22500 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(450), + .accel_max_val = IIO_M_S_2_TO_G(20000 << 16), .accel_max_scale = 5, .temp_scale = 5650, /* 5.65 milli degree Celsius */ .int_clk = 2460000,
@@ -826,9 +831,9 @@ static const struct adis16480_chip_info [ADIS16488] = { .channels = adis16480_channels, .num_channels = ARRAY_SIZE(adis16480_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(22500), - .gyro_max_scale = 450, - .accel_max_val = IIO_M_S_2_TO_G(22500), + .gyro_max_val = 22500 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(450), + .accel_max_val = IIO_M_S_2_TO_G(22500 << 16), .accel_max_scale = 18, .temp_scale = 5650, /* 5.65 milli degree Celsius */ .int_clk = 2460000,
@@ -838,9 +843,9 @@ static const struct adis16480_chip_info [ADIS16495_1] = { .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(20000), - .gyro_max_scale = 125, - .accel_max_val = IIO_M_S_2_TO_G(32000), + .gyro_max_val = 20000 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(125), + .accel_max_val = IIO_M_S_2_TO_G(32000 << 16), .accel_max_scale = 8, .temp_scale = 12500, /* 12.5 milli degree Celsius */ .int_clk = 4250000,
@@ -851,9 +856,9 @@ static const struct adis16480_chip_info [ADIS16495_2] = { .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(18000), - .gyro_max_scale = 450, - .accel_max_val = IIO_M_S_2_TO_G(32000), + .gyro_max_val = 18000 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(450), + .accel_max_val = IIO_M_S_2_TO_G(32000 << 16), .accel_max_scale = 8, .temp_scale = 12500, /* 12.5 milli degree Celsius */ .int_clk = 4250000,
@@ -864,9 +869,9 @@ static const struct adis16480_chip_info [ADIS16495_3] = { .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(20000), - .gyro_max_scale = 2000, - .accel_max_val = IIO_M_S_2_TO_G(32000), + .gyro_max_val = 20000 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(2000), + .accel_max_val = IIO_M_S_2_TO_G(32000 << 16), .accel_max_scale = 8, .temp_scale = 12500, /* 12.5 milli degree Celsius */ .int_clk = 4250000,
@@ -877,9 +882,9 @@ static const struct adis16480_chip_info [ADIS16497_1] = { .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(20000), - .gyro_max_scale = 125, - .accel_max_val = IIO_M_S_2_TO_G(32000), + .gyro_max_val = 20000 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(125), + .accel_max_val = IIO_M_S_2_TO_G(32000 << 16), .accel_max_scale = 40, .temp_scale = 12500, /* 12.5 milli degree Celsius */ .int_clk = 4250000,
@@ -890,9 +895,9 @@ static const struct adis16480_chip_info [ADIS16497_2] = { .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(18000), - .gyro_max_scale = 450, - .accel_max_val = IIO_M_S_2_TO_G(32000), + .gyro_max_val = 18000 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(450), + .accel_max_val = IIO_M_S_2_TO_G(32000 << 16), .accel_max_scale = 40, .temp_scale = 12500, /* 12.5 milli degree Celsius */ .int_clk = 4250000,
@@ -903,9 +908,9 @@ static const struct adis16480_chip_info [ADIS16497_3] = { .channels = adis16485_channels, .num_channels = ARRAY_SIZE(adis16485_channels), - .gyro_max_val = IIO_RAD_TO_DEGREE(20000), - .gyro_max_scale = 2000, - .accel_max_val = IIO_M_S_2_TO_G(32000), + .gyro_max_val = 20000 << 16, + .gyro_max_scale = IIO_DEGREE_TO_RAD(2000), + .accel_max_val = IIO_M_S_2_TO_G(32000 << 16), .accel_max_scale = 40, .temp_scale = 12500, /* 12.5 milli degree Celsius */ .int_clk = 4250000,
Greg Kroah-Hartman
maintainerPATCH 30/180 iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting
In reply to Greg Kroah-HartmanFrom: Chris Lesiak <[email protected]>
commit 342a6928bd5017edbdae376042d8ad6af3d3b943 upstream.
The IIO_HUMIDITYRELATIVE channel was being incorrectly reported back as percent when it should have been milli percent. This is via an incorrect scale value being returned to userspace.
--- drivers/iio/humidity/hdc100x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/humidity/hdc100x.c +1 -1
@@ -229,7 +229,7 @@ static int hdc100x_read_raw(struct iio_d *val2 =65536 ;return IIO_VAL_FRACTIONAL ; }else { - *val =100 ; + *val =100000 ; *val2 =65536 ;return IIO_VAL_FRACTIONAL ; }
Greg Kroah-Hartman
maintainerPATCH 31/180 iio: imu: inv_mpu6050: fix temperature reporting using bad unit
In reply to Greg Kroah-HartmanFrom: Jean-Baptiste Maneyrol <[email protected]>
commit 53eaa9c27fdc01b4f4d885223e29f97393409e7e upstream.
Temperature should be reported in milli-degrees, not degrees. Fix scale and offset values to use the correct unit.
This is a fix for an issue that has been present for a long time. The fixes tag reflects the point at which the code last changed in a fashion that would make this fix patch no longer apply. Backports will be necessary to fix those elements that predate that patch.
--- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 23 ++++++++++++----------- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 15 deletions(-)
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +12 -11
@@ -115,6 +115,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6050, .config = &chip_config_6050, .fifo_size = 1024, + .temp = {INV_MPU6050_TEMP_OFFSET, INV_MPU6050_TEMP_SCALE}, }, { .whoami = INV_MPU6500_WHOAMI_VALUE,
@@ -122,6 +123,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6500, .config = &chip_config_6050, .fifo_size = 512, + .temp = {INV_MPU6500_TEMP_OFFSET, INV_MPU6500_TEMP_SCALE}, }, { .whoami = INV_MPU6515_WHOAMI_VALUE,
@@ -129,6 +131,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6500, .config = &chip_config_6050, .fifo_size = 512, + .temp = {INV_MPU6500_TEMP_OFFSET, INV_MPU6500_TEMP_SCALE}, }, { .whoami = INV_MPU6000_WHOAMI_VALUE,
@@ -136,6 +139,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6050, .config = &chip_config_6050, .fifo_size = 1024, + .temp = {INV_MPU6050_TEMP_OFFSET, INV_MPU6050_TEMP_SCALE}, }, { .whoami = INV_MPU9150_WHOAMI_VALUE,
@@ -143,6 +147,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6050, .config = &chip_config_6050, .fifo_size = 1024, + .temp = {INV_MPU6050_TEMP_OFFSET, INV_MPU6050_TEMP_SCALE}, }, { .whoami = INV_MPU9250_WHOAMI_VALUE,
@@ -150,6 +155,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6500, .config = &chip_config_6050, .fifo_size = 512, + .temp = {INV_MPU6500_TEMP_OFFSET, INV_MPU6500_TEMP_SCALE}, }, { .whoami = INV_MPU9255_WHOAMI_VALUE,
@@ -157,6 +163,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6500, .config = &chip_config_6050, .fifo_size = 512, + .temp = {INV_MPU6500_TEMP_OFFSET, INV_MPU6500_TEMP_SCALE}, }, { .whoami = INV_ICM20608_WHOAMI_VALUE,
@@ -164,6 +171,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_6500, .config = &chip_config_6050, .fifo_size = 512, + .temp = {INV_ICM20608_TEMP_OFFSET, INV_ICM20608_TEMP_SCALE}, }, { .whoami = INV_ICM20602_WHOAMI_VALUE,
@@ -171,6 +179,7 @@ static const struct inv_mpu6050_hw hw_in .reg = ®_set_icm20602, .config = &chip_config_6050, .fifo_size = 1008, + .temp = {INV_ICM20608_TEMP_OFFSET, INV_ICM20608_TEMP_SCALE}, }, };
@@ -471,12 +480,8 @@ inv_mpu6050_read_raw(struct iio_dev *indreturn IIO_VAL_INT_PLUS_MICRO ;case IIO_TEMP : - *val =0 ; -if (st->chip_type ==INV_ICM20602 ) - *val2 =INV_ICM20602_TEMP_SCALE ; -else - *val2 =INV_MPU6050_TEMP_SCALE ; - + *val = st->hw->temp.scale /1000000 ; + *val2 = st->hw->temp.scale %1000000 ;return IIO_VAL_INT_PLUS_MICRO ;default :return -EINVAL ;
@@ -484,11 +489,7 @@ inv_mpu6050_read_raw(struct iio_dev *indcase IIO_CHAN_INFO_OFFSET :switch (chan->type) {case IIO_TEMP : -if (st->chip_type ==INV_ICM20602 ) - *val =INV_ICM20602_TEMP_OFFSET ; -else - *val =INV_MPU6050_TEMP_OFFSET ; - + *val = st->hw->temp.offset;return IIO_VAL_INT ;default :return -EINVAL ;
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +12 -4
@@ -101,6 +101,7 @@ struct inv_mpu6050_chip_config {* @reg: register map of the chip. * @config: configuration of the chip. * @fifo_size: size of the FIFO in bytes. +* @temp: offset and scale to apply to raw temperature. */ struct inv_mpu6050_hw {u8 whoami;
@@ -108,6 +109,10 @@ struct inv_mpu6050_hw {const struct inv_mpu6050_reg_map *reg;const struct inv_mpu6050_chip_config *config;size_t fifo_size; +struct { +int offset; +int scale; + } temp; };/*
@@ -218,16 +223,19 @@ struct inv_mpu6050_state {#define INV_MPU6050_REG_UP_TIME_MIN 5000#define INV_MPU6050_REG_UP_TIME_MAX 10000 -#define INV_MPU6050_TEMP_OFFSET 12421 -#define INV_MPU6050_TEMP_SCALE 2941 +#define INV_MPU6050_TEMP_OFFSET 12420 +#define INV_MPU6050_TEMP_SCALE 2941176#define INV_MPU6050_MAX_GYRO_FS_PARAM 3#define INV_MPU6050_MAX_ACCL_FS_PARAM 3#define INV_MPU6050_THREE_AXIS 3#define INV_MPU6050_GYRO_CONFIG_FSR_SHIFT 3#define INV_MPU6050_ACCL_CONFIG_FSR_SHIFT 3 -#define INV_ICM20602_TEMP_OFFSET 8170 -#define INV_ICM20602_TEMP_SCALE 3060 +#define INV_MPU6500_TEMP_OFFSET 7011 +#define INV_MPU6500_TEMP_SCALE 2995178 + +#define INV_ICM20608_TEMP_OFFSET 8170 +#define INV_ICM20608_TEMP_SCALE 3059976/* 6 + 6 round up and plus 8 */ #define INV_MPU6050_OUTPUT_DATA_SIZE 24
Greg Kroah-Hartman
maintainerPATCH 32/180 iio: adc: ad7606: fix reading unnecessary data from device
In reply to Greg Kroah-HartmanFrom: Beniamin Bia <[email protected]>
commit 341826a065660d1b77d89e6335b6095cd654271c upstream.
When a conversion result is being read from ADC, the driver reads the number of channels + 1 because it thinks that IIO_CHAN_SOFT_TIMESTAMP is also a physical channel. This patch fixes this issue.
--- drivers/iio/adc/ad7606.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7606.c +1 -1
@@ -57,7 +57,7 @@ static int ad7606_reset(struct ad7606_ststatic int ad7606_read_samples (struct ad7606_state *st) { -unsigned int num = st->chip_info->num_channels; +unsigned int num = st->chip_info->num_channels -1 ;u16 *data = st->data;int ret;
Greg Kroah-Hartman
maintainerPATCH 33/180 iio: adc: ad7124: Enable internal reference
In reply to Greg Kroah-HartmanFrom: Mircea Caprioru <[email protected]>
commit 11d7c8d3b1259c303fb52789febed58f0bc35ad1 upstream.
When the internal reference was selected by a channel it was not enabled. This patch fixes that and enables it.
--- drivers/iio/adc/ad7124.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/iio/adc/ad7124.c +6 -1
@@ -39,6 +39,8 @@#define AD7124_STATUS_POR_FLAG_MSK BIT(4)/* AD7124_ADC_CONTROL */ +#define AD7124_ADC_CTRL_REF_EN_MSK BIT(8) +#define AD7124_ADC_CTRL_REF_EN (x) FIELD_PREP(AD7124_ADC_CTRL_REF_EN_MSK, x)#define AD7124_ADC_CTRL_PWR_MSK GENMASK(7, 6)#define AD7124_ADC_CTRL_PWR (x) FIELD_PREP(AD7124_ADC_CTRL_PWR_MSK, x)#define AD7124_ADC_CTRL_MODE_MSK GENMASK(5, 2)
@@ -424,7 +426,10 @@ static int ad7124_init_channel_vref(strubreak ;case AD7124_INT_REF : st->channel_config[channel_number].vref_mv =2500 ; -break ; + st->adc_control &= ~AD7124_ADC_CTRL_REF_EN_MSK ; + st->adc_control |=AD7124_ADC_CTRL_REF_EN (1 ); +return ad_sd_write_reg (&st->sd,AD7124_ADC_CONTROL , +2 , st->adc_control);default :dev_err (&st->sd.spi->dev,"Invalid reference %d\n" , refsel);return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 34/180 USB: atm: ueagle-atm: add missing endpoint check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 09068c1ad53fb077bdac288869dec2435420bdc4 upstream.
Make sure that the interrupt interface has an endpoint before trying to access its endpoint descriptors to avoid dereferencing a NULL pointer.
The driver binds to the interrupt interface with interface number 0, but must not assume that this interface or its current alternate setting are the first entries in the corresponding configuration arrays.
--- drivers/usb/atm/ueagle-atm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/usb/atm/ueagle-atm.c +12 -6
@@ -2124,10 +2124,11 @@ resubmit:/* * Start the modem : init the data and start kernel thread */ -static int uea_boot (struct uea_softc *sc) +static int uea_boot (struct uea_softc *sc,struct usb_interface *intf) { -int ret, size;struct intr_pkt *intr; +int ret = -ENOMEM ; +int size;uea_enters (INS_TO_USBDEV (sc));
@@ -2152,6 +2153,11 @@ static int uea_boot(struct uea_softc *scif (UEA_CHIP_VERSION (sc) ==ADI930 )load_XILINX_firmware (sc); +if (intf->cur_altsetting->desc.bNumEndpoints <1 ) { + ret = -ENODEV ; + goto err0; + } + intr =kmalloc (size,GFP_KERNEL );if (!intr) goto err0;
@@ -2163,8 +2169,7 @@ static int uea_boot(struct uea_softc *scusb_fill_int_urb (sc->urb_int, sc->usb_dev,usb_rcvintpipe (sc->usb_dev,UEA_INTR_PIPE ), intr, size, uea_intr, sc, - sc->usb_dev->actconfig->interface[0 ]->altsetting[0 ]. - endpoint[0 ].desc.bInterval); + intf->cur_altsetting->endpoint[0 ].desc.bInterval); ret =usb_submit_urb (sc->urb_int,GFP_KERNEL );if (ret <0 ) {
@@ -2179,6 +2184,7 @@ static int uea_boot(struct uea_softc *sc sc->kthread =kthread_create (uea_kthread, sc,"ueagle-atm" );if (IS_ERR (sc->kthread)) {uea_err (INS_TO_USBDEV (sc),"failed to create thread\n" ); + ret =PTR_ERR (sc->kthread); goto err2; }
@@ -2193,7 +2199,7 @@ err1:kfree (intr); err0:uea_leaves (INS_TO_USBDEV (sc)); -return -ENOMEM ; +return ret; }/*
@@ -2554,7 +2560,7 @@ static int uea_bind(struct usbatm_data *if (ret <0 ) goto error; - ret =uea_boot (sc); + ret =uea_boot (sc, intf);if (ret <0 ) goto error_rm_grp;
Greg Kroah-Hartman
maintainerPATCH 35/180 USB: idmouse: fix interface sanity checks
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 59920635b89d74b9207ea803d5e91498d39e8b69 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/usb/misc/idmouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/idmouse.c +1 -1
@@ -337,7 +337,7 @@ static int idmouse_probe(struct usb_inteint result;/* check if we have gotten the data or the hid interface */ - iface_desc = &interface->altsetting[0 ]; + iface_desc = interface->cur_altsetting;if (iface_desc->desc.bInterfaceClass !=0x0A )return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 36/180 USB: serial: io_edgeport: fix epic endpoint lookup
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 7c5a2df3367a2c4984f1300261345817d95b71f8 upstream.
Make sure to use the current alternate setting when looking up the endpoints on epic devices to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/usb/serial/io_edgeport.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/serial/io_edgeport.c +6 -4
@@ -2901,16 +2901,18 @@ static int edge_startup(struct usb_seria response =0 ;if (edge_serial->is_epic) { +struct usb_host_interface *alt; + + alt = serial->interface->cur_altsetting; +/* EPIC thing, set up our interrupt polling now and our read * urb, so that the device knows it really is connected. */ interrupt_in_found = bulk_in_found = bulk_out_found = false; -for (i =0 ; i < serial->interface->altsetting[0 ] - .desc.bNumEndpoints; ++i) { +for (i =0 ; i < alt->desc.bNumEndpoints; ++i) {struct usb_endpoint_descriptor *endpoint;int buffer_size; - endpoint = &serial->interface->altsetting[0 ]. - endpoint[i].desc; + endpoint = &alt->endpoint[i].desc; buffer_size =usb_endpoint_maxp (endpoint);if (!interrupt_in_found && (usb_endpoint_is_int_in (endpoint))) {
Greg Kroah-Hartman
maintainerPATCH 37/180 usb: roles: fix a potential use after free
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
commit 1848a543191ae32e558bb0a5974ae7c38ebd86fc upstream.
Free the sw structure only after we are done using it. This patch just moves the put_device() down a bit to avoid the use after free.
--- drivers/usb/roles/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/roles/class.c +1 -1
@@ -144,8 +144,8 @@ EXPORT_SYMBOL_GPL(usb_role_switch_get);void usb_role_switch_put (struct usb_role_switch *sw) {if (!IS_ERR_OR_NULL (sw)) { -put_device (&sw->dev);module_put (sw->dev.parent->driver->owner); +put_device (&sw->dev); } }EXPORT_SYMBOL_GPL (usb_role_switch_put);
Greg Kroah-Hartman
maintainerPATCH 38/180 USB: adutux: fix interface sanity check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 3c11c4bed02b202e278c0f5c319ae435d7fb9815 upstream.
Make sure to use the current alternate setting when verifying the interface descriptors to avoid binding to an invalid interface.
Failing to do so could cause the driver to misbehave or trigger a WARN() in usb_submit_urb() that kernels with panic_on_warn set would choke on.
--- drivers/usb/misc/adutux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/adutux.c +1 -1
@@ -669,7 +669,7 @@ static int adu_probe(struct usb_interfacinit_waitqueue_head (&dev->read_wait);init_waitqueue_head (&dev->write_wait); - res =usb_find_common_endpoints_reverse (&interface->altsetting[0 ], + res =usb_find_common_endpoints_reverse (interface->cur_altsetting,NULL ,NULL , &dev->interrupt_in_endpoint, &dev->interrupt_out_endpoint);
Greg Kroah-Hartman
maintainerPATCH 39/180 usb: core: urb: fix URB structure initialization function
In reply to Greg Kroah-HartmanFrom: Emiliano Ingrassia <[email protected]>
commit 1cd17f7f0def31e3695501c4f86cd3faf8489840 upstream.
Explicitly initialize URB structure urb_list field in usb_init_urb(). This field can be potentially accessed uninitialized and its initialization is coherent with the usage of list_del_init() in usb_hcd_unlink_urb_from_ep() and usb_giveback_urb_bh() and its explicit initialization in usb_hcd_submit_urb() error path.
--- drivers/usb/core/urb.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/core/urb.c +1 -0
@@ -45,6 +45,7 @@ void usb_init_urb(struct urb *urb)if (urb) {memset (urb,0 ,sizeof (*urb));kref_init (&urb->kref); +INIT_LIST_HEAD (&urb->urb_list);INIT_LIST_HEAD (&urb->anchor_list); } }
Greg Kroah-Hartman
maintainerPATCH 40/180 usb: mon: Fix a deadlock in usbmon between mmap and read
In reply to Greg Kroah-HartmanFrom: Pete Zaitcev <[email protected]>
commit 19e6317d24c25ee737c65d1ffb7483bdda4bb54a upstream.
The problem arises because our read() function grabs a lock of the circular buffer, finds something of interest, then invokes copy_to_user() straight from the buffer, which in turn takes mm->mmap_sem. In the same time, the callback mon_bin_vma_fault() is invoked under mm->mmap_sem. It attempts to take the fetch lock and deadlocks.
This patch does away with protecting of our page list with any semaphores, and instead relies on the kernel not close the device while mmap is active in a process.
In addition, we prohibit re-sizing of a buffer while mmap is active. This way, when (now unlocked) fault is processed, it works with the page that is intended to be mapped-in, and not some other random page. Note that this may have an ABI impact, but hopefully no legitimate program is this wrong.
--- drivers/usb/mon/mon_bin.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-)
drivers/usb/mon/mon_bin.c +21 -11
@@ -1039,12 +1039,18 @@ static long mon_bin_ioctl(struct file *fmutex_lock (&rp->fetch_lock);spin_lock_irqsave (&rp->b_lock, flags); -mon_free_buff (rp->b_vec, rp->b_size/CHUNK_SIZE ); -kfree (rp->b_vec); - rp->b_vec = vec; - rp->b_size = size; - rp->b_read = rp->b_in = rp->b_out = rp->b_cnt =0 ; - rp->cnt_lost =0 ; +if (rp->mmap_active) { +mon_free_buff (vec, size/CHUNK_SIZE ); +kfree (vec); + ret = -EBUSY ; + }else { +mon_free_buff (rp->b_vec, rp->b_size/CHUNK_SIZE ); +kfree (rp->b_vec); + rp->b_vec = vec; + rp->b_size = size; + rp->b_read = rp->b_in = rp->b_out = rp->b_cnt =0 ; + rp->cnt_lost =0 ; + }spin_unlock_irqrestore (&rp->b_lock, flags);mutex_unlock (&rp->fetch_lock); }
@@ -1216,13 +1222,21 @@ mon_bin_poll(struct file *file, struct pstatic void mon_bin_vma_open (struct vm_area_struct *vma) {struct mon_reader_bin *rp = vma->vm_private_data; +unsigned long flags; + +spin_lock_irqsave (&rp->b_lock, flags); rp->mmap_active++; +spin_unlock_irqrestore (&rp->b_lock, flags); }static void mon_bin_vma_close (struct vm_area_struct *vma) { +unsigned long flags; +struct mon_reader_bin *rp = vma->vm_private_data; +spin_lock_irqsave (&rp->b_lock, flags); rp->mmap_active--; +spin_unlock_irqrestore (&rp->b_lock, flags); }/*
@@ -1234,16 +1248,12 @@ static vm_fault_t mon_bin_vma_fault(struunsigned long offset, chunk_idx;struct page *pageptr; -mutex_lock (&rp->fetch_lock); offset = vmf->pgoff <<PAGE_SHIFT ; -if (offset >= rp->b_size) { -mutex_unlock (&rp->fetch_lock); +if (offset >= rp->b_size)return VM_FAULT_SIGBUS ; - } chunk_idx = offset /CHUNK_SIZE ; pageptr = rp->b_vec[chunk_idx].pg;get_page (pageptr); -mutex_unlock (&rp->fetch_lock); vmf->page = pageptr;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 41/180 tpm: add check after commands attribs tab allocation
In reply to Greg Kroah-HartmanFrom: Tadeusz Struk <[email protected]>
commit f1689114acc5e89a196fec6d732dae3e48edb6ad upstream.
devm_kcalloc() can fail and return NULL so we need to check for that.
--- drivers/char/tpm/tpm2-cmd.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/char/tpm/tpm2-cmd.c +4 -0
@@ -939,6 +939,10 @@ static int tpm2_get_cc_attrs_tbl(struct chip->cc_attrs_tbl =devm_kcalloc (&chip->dev,4 , nr_commands,GFP_KERNEL ); +if (!chip->cc_attrs_tbl) { + rc = -ENOMEM ; + goto out; + } rc =tpm_buf_init (&buf,TPM2_ST_NO_SESSIONS ,TPM2_CC_GET_CAPABILITY );if (rc)
Greg Kroah-Hartman
maintainerPATCH 42/180 EDAC/altera: Use fast register IO for S10 IRQs
In reply to Greg Kroah-HartmanFrom: Meng Li <[email protected]>
commit 56d9e7bd3fa0f105b6670021d167744bc50ae4fe upstream.
When an IRQ occurs, regmap_{read,write,...}() is invoked in atomic context. Regmap must indicate register IO is fast so that a spinlock is used instead of a mutex to avoid sleeping in atomic context:
lock_acquire
__mutex_lock
mutex_lock_nested
regmap_lock_mutex
regmap_write
a10_eccmgr_irq_unmask
unmask_irq.part.0
irq_enable
__irq_startup
irq_startup
__setup_irq
request_threaded_irq
devm_request_threaded_irq
altr_sdram_probe
Mark it so.
[ bp: Massage. ]
--- drivers/edac/altera_edac.c | 1 + 1 file changed, 1 insertion(+)
drivers/edac/altera_edac.c +1 -0
@@ -561,6 +561,7 @@ static const struct regmap_config s10_sd .reg_write = s10_protected_reg_write, .use_single_read = true, .use_single_write = true, + .fast_io = true, };/************** </Stratix10 EDAC Memory Controller Functions> ***********/
Greg Kroah-Hartman
maintainerPATCH 43/180 brcmfmac: disable PCIe interrupts before bus reset
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
commit 5d26a6a6150c486f51ea2aaab33af04db02f63b8 upstream.
Keeping interrupts on could result in brcmfmac freeing some resources and then IRQ handlers trying to use them. That was obviously a straight path for crashing a kernel.
Example:
CPU0 CPU1
---- ----brcmf_pcie_reset
brcmf_pcie_bus_console_read
brcmf_detach
...
brcmf_fweh_detach
brcmf_proto_detach
brcmf_pcie_isr_thread
...
brcmf_proto_msgbuf_rx_trigger
...
drvr->proto->pd
brcmf_pcie_release_irq[ 363.789218] Unable to handle kernel NULL pointer dereference at virtual address 00000038 [ 363.797339] pgd = c0004000 [ 363.800050] [00000038] *pgd=00000000 [ 363.803635] Internal error: Oops: 17 [#1] SMP ARM (...) [ 364.029209] Backtrace: [ 364.031725] [<bf243838>] (brcmf_proto_msgbuf_rx_trigger [brcmfmac]) from [<bf2471dc>] (brcmf_pcie_isr_thread+0x228/0x274 [brcmfmac]) [ 364.043662] r7:00000001 r6:c8ca0000 r5:00010000 r4:c7b4f800
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2 -0
@@ -1426,6 +1426,8 @@ static int brcmf_pcie_reset(struct devicstruct brcmf_fw_request *fwreq;int err; +brcmf_pcie_intr_disable (devinfo); +brcmf_pcie_bus_console_read (devinfo, true);brcmf_detach (dev);
Greg Kroah-Hartman
maintainerPATCH 44/180 mtd: spear_smi: Fix Write Burst mode
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 69c7f4618c16b4678f8a4949b6bb5ace259c0033 upstream.
Any write with either dd or flashcp to a device driven by the spear_smi.c driver will pass through the spear_smi_cpy_toio() function. This function will get called for chunks of up to 256 bytes. If the amount of data is smaller, we may have a problem if the data length is not 4-byte aligned. In this situation, the kernel panics during the memcpy:
# dd if=/dev/urandom bs=1001 count=1 of=/dev/mtd6
spear_smi_cpy_toio [620] dest c9070000, src c7be8800, len 256
spear_smi_cpy_toio [620] dest c9070100, src c7be8900, len 256
spear_smi_cpy_toio [620] dest c9070200, src c7be8a00, len 256
spear_smi_cpy_toio [620] dest c9070300, src c7be8b00, len 233
Unhandled fault: external abort on non-linefetch (0x808) at 0xc90703e8
[...]
PC is at memcpy+0xcc/0x330The above error occurs because the implementation of memcpy_toio() tries to optimize the number of I/O by writing 4 bytes at a time as much as possible, until there are less than 4 bytes left and then switches to word or byte writes.
Unfortunately, the specification states about the Write Burst mode:
"the next AHB Write request should point to the next incremented address and should have the same size (byte, half-word or word)"
This means ARM architecture implementation of memcpy_toio() cannot reliably be used blindly here. Workaround this situation by update the write path to stick to byte access when the burst length is not multiple of 4.
--- drivers/mtd/devices/spear_smi.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)
drivers/mtd/devices/spear_smi.c +37 -1
@@ -592,6 +592,26 @@ static int spear_mtd_read(struct mtd_infreturn 0 ; } +/* +* The purpose of this function is to ensure a memcpy_toio() with byte writes +* only. Its structure is inspired from the ARM implementation of _memcpy_toio() +* which also does single byte writes but cannot be used here as this is just an +* implementation detail and not part of the API. Not mentioning the comment +* stating that _memcpy_toio() should be optimized. +*/ +static void spear_smi_memcpy_toio_b (volatile void __iomem *dest, +const void *src,size_t len) +{ +const unsigned char *from = src; + +while (len) { + len--; +writeb (*from, dest); + from++; + dest++; + } +} +static inline int spear_smi_cpy_toio (struct spear_smi *dev,u32 bank,void __iomem *dest,const void *src,size_t len) {
@@ -614,7 +634,23 @@ static inline int spear_smi_cpy_toio(str ctrlreg1 =readl (dev->io_base +SMI_CR1 );writel ((ctrlreg1 |WB_MODE ) & ~SW_MODE , dev->io_base +SMI_CR1 ); -memcpy_toio (dest, src, len); +/* +* In Write Burst mode (WB_MODE), the specs states that writes must be: +* - incremental +* - of the same size +* The ARM implementation of memcpy_toio() will optimize the number of +* I/O by using as much 4-byte writes as possible, surrounded by +* 2-byte/1-byte access if: +* - the destination is not 4-byte aligned +* - the length is not a multiple of 4-byte. +* Avoid this alternance of write access size by using our own 'byte +* access' helper if at least one of the two conditions above is true. +*/ +if (IS_ALIGNED (len,sizeof (u32)) && +IS_ALIGNED ((uintptr_t )dest,sizeof (u32))) +memcpy_toio (dest, src, len); +else +spear_smi_memcpy_toio_b (dest, src, len);writel (ctrlreg1, dev->io_base +SMI_CR1 );
Greg Kroah-Hartman
maintainerPATCH 45/180 mtd: rawnand: Change calculating of position page containing BBM
In reply to Greg Kroah-HartmanFrom: Piotr Sroka <[email protected]>
commit a3c4c2339f8948b0f578e938970303a7372e60c0 upstream.
Change calculating of position page containing BBM
If none of BBM flags are set then function nand_bbm_get_next_page reports EINVAL. It causes that BBM is not read at all during scanning factory bad blocks. The result is that the BBT table is build without checking factory BBM at all. For Micron flash memories none of these flags are set if page size is different than 2048 bytes.
Address this regression by:
- adding NAND_BBM_FIRSTPAGE chip flag without any condition. It solves issue only for Micron devices.
- changing the nand_bbm_get_next_page_function. It will return 0 if no of BBM flag is set and page parameter is 0. After that modification way of discovering factory bad blocks will work similar as in kernel version 5.1.
--- drivers/mtd/nand/raw/nand_base.c | 8 ++++++-- drivers/mtd/nand/raw/nand_micron.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/nand_base.c +6 -2
@@ -292,12 +292,16 @@ int nand_bbm_get_next_page(struct nand_cstruct mtd_info *mtd =nand_to_mtd (chip);int last_page = ((mtd->erasesize - mtd->writesize) >> chip->page_shift) & chip->pagemask; +unsigned int bbm_flags =NAND_BBM_FIRSTPAGE |NAND_BBM_SECONDPAGE + |NAND_BBM_LASTPAGE ; +if (page ==0 && !(chip->options & bbm_flags)) +return 0 ;if (page ==0 && chip->options &NAND_BBM_FIRSTPAGE )return 0 ; -else if (page <=1 && chip->options &NAND_BBM_SECONDPAGE ) +if (page <=1 && chip->options &NAND_BBM_SECONDPAGE )return 1 ; -else if (page <= last_page && chip->options &NAND_BBM_LASTPAGE ) +if (page <= last_page && chip->options &NAND_BBM_LASTPAGE )return last_page;return -EINVAL ;
drivers/mtd/nand/raw/nand_micron.c +3 -1
@@ -446,8 +446,10 @@ static int micron_nand_init(struct nand_if (ret) goto err_free_manuf_data; + chip->options |=NAND_BBM_FIRSTPAGE ; +if (mtd->writesize ==2048 ) - chip->options |=NAND_BBM_FIRSTPAGE |NAND_BBM_SECONDPAGE ; + chip->options |=NAND_BBM_SECONDPAGE ; ondie =micron_supports_on_die_ecc (chip);
Greg Kroah-Hartman
maintainerPATCH 46/180 virt_wifi: fix use-after-free in virt_wifi_newlink()
In reply to Greg Kroah-HartmanFrom: Taehee Yoo <[email protected]>
commit bc71d8b580ba81b55b6e15b1c0320632515b4bac upstream.
When virt_wifi interface is created, virt_wifi_newlink() is called and it calls register_netdevice().
if register_netdevice() fails, it internally would call ->priv_destructor(), which is virt_wifi_net_device_destructor() and it frees netdev. but virt_wifi_newlink() still use netdev. So, use-after-free would occur in virt_wifi_newlink().
Test commands:
ip link add dummy0 type dummy
modprobe bonding
ip link add bonding_masters link dummy0 type virt_wifi
Splat looks like:
[ 202.220554] BUG: KASAN: use-after-free in virt_wifi_newlink+0x88b/0x9a0 [virt_wifi] [ 202.221659] Read of size 8 at addr ffff888061629cb8 by task ip/852
[ 202.222896] CPU: 1 PID: 852 Comm: ip Not tainted 5.4.0-rc5 #3 [ 202.223765] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [ 202.225073] Call Trace: [ 202.225532] dump_stack+0x7c/0xbb [ 202.226869] print_address_description.constprop.5+0x1be/0x360 [ 202.229362] __kasan_report+0x12a/0x16f [ 202.230714] kasan_report+0xe/0x20 [ 202.232595] virt_wifi_newlink+0x88b/0x9a0 [virt_wifi] [ 202.233370] __rtnl_newlink+0xb9f/0x11b0 [ 202.244909] rtnl_newlink+0x65/0x90
[ ... ]
--- drivers/net/wireless/virt_wifi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/virt_wifi.c +2 -2
@@ -450,7 +450,6 @@ static void virt_wifi_net_device_destruc*/ kfree (dev->ieee80211_ptr); dev->ieee80211_ptr =NULL ; -free_netdev (dev); }/* No lock interaction. */
@@ -458,7 +457,7 @@ static void virt_wifi_setup(struct net_d {ether_setup (dev); dev->netdev_ops = &virt_wifi_ops; - dev->priv_destructor = virt_wifi_net_device_destructor; + dev->needs_free_netdev = true; }/* Called in a RCU read critical section from netif_receive_skb */
@@ -544,6 +543,7 @@ static int virt_wifi_newlink(struct net goto unregister_netdev; } + dev->priv_destructor = virt_wifi_net_device_destructor; priv->being_deleted = false; priv->is_connected = false; priv->is_up = false;
Greg Kroah-Hartman
maintainerPATCH 47/180 virtio-balloon: fix managed page counts when migrating pages between zones
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit 63341ab03706e11a31e3dd8ccc0fbc9beaf723f0 upstream.
In case we have to migrate a ballon page to a newpage of another zone, the managed page count of both zones is wrong. Paired with memory offlining (which will adjust the managed page count), we can trigger kernel crashes and all kinds of different symptoms.
One way to reproduce:
1. Start a QEMU guest with 4GB, no NUMA
2. Hotplug a 1GB DIMM and online the memory to ZONE_NORMAL
3. Inflate the balloon to 1GB
4. Unplug the DIMM (be quick, otherwise unmovable data ends up on it)
5. Observe /proc/zoneinfo
Node 0, zone Normal
pages free 16810
min 24848885473806
low 18471592959183339
high 36918337032892872
spanned 262144
present 262144
managed 18446744073709533486
6. Do anything that requires some memory (e.g., inflate the balloon some
more). The OOM goes crazy and the system crashes
[ 238.324946] Out of memory: Killed process 537 (login) total-vm:27584kB, anon-rss:860kB, file-rss:0kB, shmem-rss:00
[ 238.338585] systemd invoked oom-killer: gfp_mask=0x100cca(GFP_HIGHUSER_MOVABLE), order=0, oom_score_adj=0
[ 238.339420] CPU: 0 PID: 1 Comm: systemd Tainted: G D W 5.4.0-next-20191204+ #75
[ 238.340139] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba5276e321-prebuilt.qemu4
[ 238.341121] Call Trace:
[ 238.341337] dump_stack+0x8f/0xd0
[ 238.341630] dump_header+0x61/0x5ea
[ 238.341942] oom_kill_process.cold+0xb/0x10
[ 238.342299] out_of_memory+0x24d/0x5a0
[ 238.342625] __alloc_pages_slowpath+0xd12/0x1020
[ 238.343024] __alloc_pages_nodemask+0x391/0x410
[ 238.343407] pagecache_get_page+0xc3/0x3a0
[ 238.343757] filemap_fault+0x804/0xc30
[ 238.344083] ? ext4_filemap_fault+0x28/0x42
[ 238.344444] ext4_filemap_fault+0x30/0x42
[ 238.344789] __do_fault+0x37/0x1a0
[ 238.345087] __handle_mm_fault+0x104d/0x1ab0
[ 238.345450] handle_mm_fault+0x169/0x360
[ 238.345790] do_user_addr_fault+0x20d/0x490
[ 238.346154] do_page_fault+0x31/0x210
[ 238.346468] async_page_fault+0x43/0x50
[ 238.346797] RIP: 0033:0x7f47eba4197e
[ 238.347110] Code: Bad RIP value.
[ 238.347387] RSP: 002b:00007ffd7c0c1890 EFLAGS: 00010293
[ 238.347834] RAX: 0000000000000002 RBX: 000055d196a20a20 RCX: 00007f47eba4197e
[ 238.348437] RDX: 0000000000000033 RSI: 00007ffd7c0c18c0 RDI: 0000000000000004
[ 238.349047] RBP: 00007ffd7c0c1c20 R08: 0000000000000000 R09: 0000000000000033
[ 238.349660] R10: 00000000ffffffff R11: 0000000000000293 R12: 0000000000000001
[ 238.350261] R13: ffffffffffffffff R14: 0000000000000000 R15: 00007ffd7c0c18c0
[ 238.350878] Mem-Info:
[ 238.351085] active_anon:3121 inactive_anon:51 isolated_anon:0
[ 238.351085] active_file:12 inactive_file:7 isolated_file:0
[ 238.351085] unevictable:0 dirty:0 writeback:0 unstable:0
[ 238.351085] slab_reclaimable:5565 slab_unreclaimable:10170
[ 238.351085] mapped:3 shmem:111 pagetables:155 bounce:0
[ 238.351085] free:720717 free_pcp:2 free_cma:0
[ 238.353757] Node 0 active_anon:12484kB inactive_anon:204kB active_file:48kB inactive_file:28kB unevictable:0kB iss
[ 238.355979] Node 0 DMA free:11556kB min:36kB low:48kB high:60kB reserved_highatomic:0KB active_anon:152kB inactivB
[ 238.358345] lowmem_reserve[]: 0 2955 2884 2884 2884
[ 238.358761] Node 0 DMA32 free:2677864kB min:7004kB low:10028kB high:13052kB reserved_highatomic:0KB active_anon:0B
[ 238.361202] lowmem_reserve[]: 0 0 72057594037927865 72057594037927865 72057594037927865
[ 238.361888] Node 0 Normal free:193448kB min:99395541895224kB low:73886371836733356kB high:147673348131571488kB reB
[ 238.364765] lowmem_reserve[]: 0 0 0 0 0
[ 238.365101] Node 0 DMA: 7*4kB (U) 5*8kB (UE) 6*16kB (UME) 2*32kB (UM) 1*64kB (U) 2*128kB (UE) 3*256kB (UME) 2*512B
[ 238.366379] Node 0 DMA32: 0*4kB 1*8kB (U) 2*16kB (UM) 2*32kB (UM) 2*64kB (UM) 1*128kB (U) 1*256kB (U) 1*512kB (U)B
[ 238.367654] Node 0 Normal: 1985*4kB (UME) 1321*8kB (UME) 844*16kB (UME) 524*32kB (UME) 300*64kB (UME) 138*128kB (B
[ 238.369184] Node 0 hugepages_total=0 hugepages_free=0 hugepages_surp=0 hugepages_size=2048kB
[ 238.369915] 130 total pagecache pages
[ 238.370241] 0 pages in swap cache
[ 238.370533] Swap cache stats: add 0, delete 0, find 0/0
[ 238.370981] Free swap = 0kB
[ 238.371239] Total swap = 0kB
[ 238.371488] 1048445 pages RAM
[ 238.371756] 0 pages HighMem/MovableOnly
[ 238.372090] 306992 pages reserved
[ 238.372376] 0 pages cma reserved
[ 238.372661] 0 pages hwpoisonedIn another instance (older kernel), I was able to observe this (negative page count :/):
[ 180.896971] Offlined Pages 32768 [ 182.667462] Offlined Pages 32768 [ 184.408117] Offlined Pages 32768 [ 186.026321] Offlined Pages 32768 [ 187.684861] Offlined Pages 32768 [ 189.227013] Offlined Pages 32768 [ 190.830303] Offlined Pages 32768 [ 190.833071] Built 1 zonelists, mobility grouping on. Total pages: -36920272750453009
In another instance (older kernel), I was no longer able to start any process:
[root@vm ~]# [ 214.348068] Offlined Pages 32768
[ 215.973009] Offlined Pages 32768 cat /proc/meminfo -bash: fork: Cannot allocate memory [root@vm ~]# cat /proc/meminfo -bash: fork: Cannot allocate memory
Fix it by properly adjusting the managed page count when migrating if the zone changed. The managed page count of the zones now looks after unplug of the DIMM (and after deflating the balloon) just like before inflating the balloon (and plugging+onlining the DIMM).
We'll temporarily modify the totalram page count. If this ever becomes a problem, we can fine tune by providing helpers that don't touch the totalram pages (e.g., adjust_zone_managed_page_count()).
Please note that fixing up the managed page count is only necessary when we adjusted the managed page count when inflating - only if we don't have VIRTIO_BALLOON_F_DEFLATE_ON_OOM. With that feature, the managed page count is not touched when inflating/deflating.
--- drivers/virtio/virtio_balloon.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/virtio/virtio_balloon.c +11 -0
@@ -721,6 +721,17 @@ static int virtballoon_migratepage(strucget_page (newpage);/* balloon reference */ +/* +* When we migrate a page to a different zone and adjusted the +* managed page count when inflating, we have to fixup the count of +* both involved zones. +*/ +if (!virtio_has_feature (vb->vdev,VIRTIO_BALLOON_F_DEFLATE_ON_OOM ) && +page_zone (page) !=page_zone (newpage)) { +adjust_managed_page_count (page,1 ); +adjust_managed_page_count (newpage,-1 ); + } +/* balloon's page migration 1st step -- inflate "newpage" */ spin_lock_irqsave (&vb_dev_info->pages_lock, flags);balloon_page_insert (vb_dev_info, newpage);
Greg Kroah-Hartman
maintainerPATCH 48/180 usb: dwc3: pci: add ID for the Intel Comet Lake -H variant
In reply to Greg Kroah-HartmanFrom: Heikki Krogerus <[email protected]>
commit 3c3caae4cd6e122472efcf64759ff6392fb6bce2 upstream.
The original ID that was added for Comet Lake PCH was actually for the -LP (low power) variant even though the constant for it said CMLH. Changing that while at it.
--- drivers/usb/dwc3/dwc3-pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-pci.c +5 -1
@@ -29,7 +29,8 @@#define PCI_DEVICE_ID_INTEL_BXT_M 0x1aaa#define PCI_DEVICE_ID_INTEL_APL 0x5aaa#define PCI_DEVICE_ID_INTEL_KBP 0xa2b0 -#define PCI_DEVICE_ID_INTEL_CMLH 0x02ee +#define PCI_DEVICE_ID_INTEL_CMLLP 0x02ee +#define PCI_DEVICE_ID_INTEL_CMLH 0x06ee#define PCI_DEVICE_ID_INTEL_GLK 0x31aa#define PCI_DEVICE_ID_INTEL_CNPLP 0x9dee#define PCI_DEVICE_ID_INTEL_CNPH 0xa36e
@@ -308,6 +309,9 @@ static const struct pci_device_id dwc3_p {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_MRFLD ), (kernel_ulong_t) &dwc3_pci_mrfld_properties, }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLLP), + (kernel_ulong_t) &dwc3_pci_intel_properties, }, + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH), (kernel_ulong_t) &dwc3_pci_intel_properties, },
Greg Kroah-Hartman
maintainerPATCH 49/180 usb: dwc3: gadget: Fix logical condition
In reply to Greg Kroah-HartmanFrom: Tejas Joglekar <[email protected]>
commit 8c7d4b7b3d43c54c0b8c1e4adb917a151c754196 upstream.
This patch corrects the condition to kick the transfer without giving back the requests when either request has remaining data or when there are pending SGs. The && check was introduced during spliting up the dwc3_gadget_ep_cleanup_completed_requests() function.
--- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +1 -1
@@ -2471,7 +2471,7 @@ static int dwc3_gadget_ep_cleanup_comple req->request.actual = req->request.length - req->remaining; -if (!dwc3_gadget_ep_request_completed (req) && +if (!dwc3_gadget_ep_request_completed (req) || req->num_pending_sgs) {__dwc3_gadget_kick_transfer (dep); goto out;
Greg Kroah-Hartman
maintainerPATCH 50/180 usb: dwc3: gadget: Clear started flag for non-IOC
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit d3abda5a98a18e524e17fd4085c9f4bd53e9ef53 upstream.
Normally the END_TRANSFER command completion handler will clear the DWC3_EP_TRANSFER_STARTED flag. However, if the command was sent without interrupt on completion, then the flag will not be cleared. Make sure to clear the flag in this case.
--- drivers/usb/dwc3/gadget.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/dwc3/gadget.c +3 -0
@@ -2699,6 +2699,9 @@ static void dwc3_stop_active_transfer(stWARN_ON_ONCE (ret); dep->resource_index =0 ; +if (!interrupt) + dep->flags &= ~DWC3_EP_TRANSFER_STARTED ; +if (dwc3_is_usb31 (dwc) || dwc->revision <DWC3_REVISION_310A )udelay (100 ); }
Greg Kroah-Hartman
maintainerPATCH 51/180 usb: dwc3: ep0: Clear started flag on completion
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 2d7b78f59e020b07fc6338eefe286f54ee2d6773 upstream.
Clear ep0's DWC3_EP_TRANSFER_STARTED flag if the END_TRANSFER command is completed. Otherwise, we can't start control transfer again after END_TRANSFER.
--- drivers/usb/dwc3/ep0.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/usb/dwc3/ep0.c +8 -0
@@ -1117,6 +1117,9 @@ static void dwc3_ep0_xfernotready(structvoid dwc3_ep0_interrupt (struct dwc3 *dwc,const struct dwc3_event_depevt *event) { +struct dwc3_ep *dep = dwc->eps[event->endpoint_number]; +u8 cmd; +switch (event->endpoint_event) {case DWC3_DEPEVT_XFERCOMPLETE :dwc3_ep0_xfer_complete (dwc, event);
@@ -1129,7 +1132,12 @@ void dwc3_ep0_interrupt(struct dwc3 *dwccase DWC3_DEPEVT_XFERINPROGRESS :case DWC3_DEPEVT_RXTXFIFOEVT :case DWC3_DEPEVT_STREAMEVT : +break ;case DWC3_DEPEVT_EPCMDCMPLT : + cmd =DEPEVT_PARAMETER_CMD (event->parameters); + +if (cmd ==DWC3_DEPCMD_ENDTRANSFER ) + dep->flags &= ~DWC3_EP_TRANSFER_STARTED ;break ; } }
Greg Kroah-Hartman
maintainerPATCH 52/180 phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role"
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
commit 4bd5ead82d4b877ebe41daf95f28cda53205b039 upstream.
Since the role_store() uses strncmp(), it's possible to refer out-of-memory if the sysfs data size is smaller than strlen("host"). This patch fixes it by using sysfs_streq() instead of strncmp().
--- drivers/phy/renesas/phy-rcar-gen3-usb2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/phy/renesas/phy-rcar-gen3-usb2.c +3 -2
@@ -21,6 +21,7 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> +#include <linux/string.h> #include <linux/usb/of.h> #include <linux/workqueue.h>
@@ -320,9 +321,9 @@ static ssize_t role_store(struct deviceif (!ch->is_otg_channel || !rcar_gen3_is_any_rphy_initialized (ch))return -EIO ; -if (!strncmp (buf,"host" ,strlen ("host" ))) +if (sysfs_streq (buf,"host" )) new_mode =PHY_MODE_USB_HOST ; -else if (!strncmp (buf,"peripheral" ,strlen ("peripheral" ))) +else if (sysfs_streq (buf,"peripheral" )) new_mode =PHY_MODE_USB_DEVICE ;else return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 53/180 usb: typec: fix use after free in typec_register_port()
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
commit 5c388abefda0d92355714010c0199055c57ab6c7 upstream.
We can't use "port->sw" and/or "port->mux" after it has been freed.
--- drivers/usb/typec/class.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/typec/class.c +4 -2
@@ -1604,14 +1604,16 @@ struct typec_port *typec_register_port(s port->sw =typec_switch_get (&port->dev);if (IS_ERR (port->sw)) { + ret =PTR_ERR (port->sw);put_device (&port->dev); -return ERR_CAST (port->sw); +return ERR_PTR (ret); } port->mux =typec_mux_get (&port->dev,NULL );if (IS_ERR (port->mux)) { + ret =PTR_ERR (port->mux);put_device (&port->dev); -return ERR_CAST (port->mux); +return ERR_PTR (ret); } ret =device_add (&port->dev);
Greg Kroah-Hartman
maintainerPATCH 54/180 iwlwifi: pcie: fix support for transmitting SKBs with fraglist
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 4f4925a7b23428d5719af5a2816586b2a0e6fd19 upstream.
When the implementation of SKBs with fraglist was sent upstream, a merge-damage occurred and half the patch was not applied.
This causes problems in high-throughput situations with AX200 devices, including low throughput and FW crashes.
Introduce the part that was missing from the original patch.
[ This patch was created by me, but the original author of this code
is Johannes, so his s-o-b is here and he's marked as the author of the patch. ]
--- drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +14 -0
@@ -469,6 +469,7 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx(strudma_addr_t tb_phys;int len, tb1_len, tb2_len;void *tb1_addr; +struct sk_buff *frag; tb_phys =iwl_pcie_get_first_tb_dma (txq, idx);
@@ -517,6 +518,19 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx(struif (iwl_pcie_gen2_tx_add_frags (trans, skb, tfd, out_meta)) goto out_err; + skb_walk_frags(skb, frag) { + tb_phys =dma_map_single (trans->dev, frag->data, +skb_headlen (frag),DMA_TO_DEVICE ); +if (unlikely (dma_mapping_error (trans->dev, tb_phys))) + goto out_err; +iwl_pcie_gen2_set_tb (trans, tfd, tb_phys,skb_headlen (frag)); +trace_iwlwifi_dev_tx_tb (trans->dev, skb, + frag->data, +skb_headlen (frag)); +if (iwl_pcie_gen2_tx_add_frags (trans, frag, tfd, out_meta)) + goto out_err; + } +return tfd; out_err:
Greg Kroah-Hartman
maintainerPATCH 55/180 btrfs: check page->mapping when loading free space cache
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 3797136b626ad4b6582223660c041efdea8f26b2 upstream.
While testing 5.2 we ran into the following panic
[52238.017028] BUG: kernel NULL pointer dereference, address: 0000000000000001 [52238.105608] RIP: 0010:drop_buffers+0x3d/0x150 [52238.304051] Call Trace: [52238.308958] try_to_free_buffers+0x15b/0x1b0 [52238.317503] shrink_page_list+0x1164/0x1780 [52238.325877] shrink_inactive_list+0x18f/0x3b0 [52238.334596] shrink_node_memcg+0x23e/0x7d0 [52238.342790] ? do_shrink_slab+0x4f/0x290 [52238.350648] shrink_node+0xce/0x4a0 [52238.357628] balance_pgdat+0x2c7/0x510 [52238.365135] kswapd+0x216/0x3e0 [52238.371425] ? wait_woken+0x80/0x80 [52238.378412] ? balance_pgdat+0x510/0x510 [52238.386265] kthread+0x111/0x130 [52238.392727] ? kthread_create_on_node+0x60/0x60 [52238.401782] ret_from_fork+0x1f/0x30
The page we were trying to drop had a page->private, but had no page->mapping and so called drop_buffers, assuming that we had a buffer_head on the page, and then panic'ed trying to deref 1, which is our page->private for data pages.
This is happening because we're truncating the free space cache while we're trying to load the free space cache. This isn't supposed to happen, and I'll fix that in a followup patch. However we still shouldn't allow those sort of mistakes to result in messing with pages that do not belong to us. So add the page->mapping check to verify that we still own this page after dropping and re-acquiring the page lock.
This page being unlocked as:btrfs_readpage
extent_read_full_page
__extent_read_full_page
__do_readpage
if (!nr)
unlock_page <-- nr can be 0 only if submit_extent_page
returns an error
--- fs/btrfs/free-space-cache.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/btrfs/free-space-cache.c +6 -0
@@ -384,6 +384,12 @@ static int io_ctl_prepare_pages(struct bif (uptodate && !PageUptodate (page)) {btrfs_readpage (NULL , page);lock_page (page); +if (page->mapping != inode->i_mapping) { +btrfs_err (BTRFS_I (inode)->root->fs_info, +"free space cache page truncated" ); +io_ctl_drop_pages (io_ctl); +return -EIO ; + }if (!PageUptodate (page)) {btrfs_err (BTRFS_I (inode)->root->fs_info,"error reading free space cache" );
Greg Kroah-Hartman
maintainerPATCH 56/180 btrfs: use refcount_inc_not_zero in kill_all_nodes
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit baf320b9d531f1cfbf64c60dd155ff80a58b3796 upstream.
We hit the following warning while running down a different problem
[ 6197.175850] ------------[ cut here ]------------ [ 6197.185082] refcount_t: underflow; use-after-free. [ 6197.194704] WARNING: CPU: 47 PID: 966 at lib/refcount.c:190 refcount_sub_and_test_checked+0x53/0x60 [ 6197.521792] Call Trace: [ 6197.526687] __btrfs_release_delayed_node+0x76/0x1c0 [ 6197.536615] btrfs_kill_all_delayed_nodes+0xec/0x130 [ 6197.546532] ? __btrfs_btree_balance_dirty+0x60/0x60 [ 6197.556482] btrfs_clean_one_deleted_snapshot+0x71/0xd0 [ 6197.566910] cleaner_kthread+0xfa/0x120 [ 6197.574573] kthread+0x111/0x130 [ 6197.581022] ? kthread_create_on_node+0x60/0x60 [ 6197.590086] ret_from_fork+0x1f/0x30 [ 6197.597228] ---[ end trace 424bb7ae00509f56 ]---
This is because the free side drops the ref without the lock, and then takes the lock if our refcount is 0. So you can have nodes on the tree that have a refcount of 0. Fix this by zero'ing out that element in our temporary array so we don't try to kill it again.
--- fs/btrfs/delayed-inode.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
fs/btrfs/delayed-inode.c +10 -3
@@ -1948,12 +1948,19 @@ void btrfs_kill_all_delayed_nodes(struct } inode_id = delayed_nodes[n -1 ]->inode_id +1 ; - -for (i =0 ; i < n; i++) -refcount_inc (&delayed_nodes[i]->refs); +for (i =0 ; i < n; i++) { +/* +* Don't increase refs in case the node is dead and +* about to be removed from the tree in the loop below +*/ +if (!refcount_inc_not_zero (&delayed_nodes[i]->refs)) + delayed_nodes[i] =NULL ; + }spin_unlock (&root->inode_lock);for (i =0 ; i < n; i++) { +if (!delayed_nodes[i]) +continue ;__btrfs_kill_delayed_node (delayed_nodes[i]);btrfs_release_delayed_node (delayed_nodes[i]); }
Greg Kroah-Hartman
maintainerPATCH 57/180 Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 536870071dbc4278264f59c9a2f5f447e584d139 upstream.
In the fixup worker, if we fail to mark the range as delalloc in the io tree, we must release the previously reserved metadata, as well as update the outstanding extents counter for the inode, otherwise we leak metadata space.
In pratice we can't return an error from btrfs_set_extent_delalloc(), which is just a wrapper around __set_extent_bit(), as for most errors __set_extent_bit() does a BUG_ON() (or panics which hits a BUG_ON() as well) and returning an -EEXIST error doesn't happen in this case since the exclusive bits parameter always has a value of 0 through this code path. Nevertheless, just fix the error handling in the fixup worker, in case one day __set_extent_bit() can return an error to this code path.
--- fs/btrfs/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +5 -1
@@ -2175,12 +2175,16 @@ again:mapping_set_error (page->mapping, ret);end_extent_writepage (page, ret, page_start, page_end);ClearPageChecked (page); - goto out; + goto out_reserved; }ClearPageChecked (page);set_page_dirty (page); +out_reserved:btrfs_delalloc_release_extents (BTRFS_I (inode),PAGE_SIZE ); +if (ret) +btrfs_delalloc_release_space (inode, data_reserved, page_start, +PAGE_SIZE , true); out:unlock_extent_cached (&BTRFS_I (inode)->io_tree, page_start, page_end, &cached_state);
Greg Kroah-Hartman
maintainerPATCH 58/180 Btrfs: fix negative subv_writers counter and data space leak after buffered write
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit a0e248bb502d5165b3314ac3819e888fdcdf7d9f upstream.
When doing a buffered write it's possible to leave the subv_writers counter of the root, used for synchronization between buffered nocow writers and snapshotting. This happens in an exceptional case like the following:
1) We fail to allocate data space for the write, since there's not enough available data space nor enough unallocated space for allocating a new data block group;
2) Because of that failure, we try to go to NOCOW mode, which succeeds and therefore we set the local variable 'only_release_metadata' to true and set the root's sub_writers counter to 1 through the call to btrfs_start_write_no_snapshotting() made by check_can_nocow();
3) The call to btrfs_copy_from_user() returns zero, which is very unlikely to happen but not impossible;
4) No pages are copied because btrfs_copy_from_user() returned zero;
5) We call btrfs_end_write_no_snapshotting() which decrements the root's subv_writers counter to 0;
6) We don't set 'only_release_metadata' back to 'false' because we do it only if 'copied', the value returned by btrfs_copy_from_user(), is greater than zero;
7) On the next iteration of the while loop, which processes the same page range, we are now able to allocate data space for the write (we got enough data space released in the meanwhile);
8) After this if we fail at btrfs_delalloc_reserve_metadata(), because now there isn't enough free metadata space, or in some other place further below (prepare_pages(), lock_and_cleanup_extent_if_need(), btrfs_dirty_pages()), we break out of the while loop with 'only_release_metadata' having a value of 'true';
9) Because 'only_release_metadata' is 'true' we end up decrementing the root's subv_writers counter to -1 (through a call to btrfs_end_write_no_snapshotting()), and we also end up not releasing the data space previously reserved through btrfs_check_data_free_space(). As a consequence the mechanism for synchronizing NOCOW buffered writes with snapshotting gets broken.
Fix this by always setting 'only_release_metadata' to false at the start of each iteration.
--- fs/btrfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/file.c +1 -1
@@ -1636,6 +1636,7 @@ static noinline ssize_t btrfs_buffered_wbreak ; } + only_release_metadata = false; sector_offset = pos & (fs_info->sectorsize -1 ); reserve_bytes =round_up (write_bytes + sector_offset, fs_info->sectorsize);
@@ -1791,7 +1792,6 @@ again:set_extent_bit (&BTRFS_I (inode)->io_tree, lockstart, lockend,EXTENT_NORESERVE ,NULL ,NULL ,GFP_NOFS ); - only_release_metadata = false; }btrfs_drop_pages (pages, num_pages);
Greg Kroah-Hartman
maintainerPATCH 59/180 btrfs: Avoid getting stuck during cyclic writebacks
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit f7bddf1e27d18fbc7d3e3056ba449cfbe4e20b0a upstream.
During a cyclic writeback, extent_write_cache_pages() uses done_index to update the writeback_index after the current run is over. However, instead of current index + 1, it gets to to the current index itself.
Unfortunately, this, combined with returning on EOF instead of looping back, can lead to the following pathlogical behavior.
1. There is a single file which has accumulated enough dirty pages to trigger balance_dirty_pages() and the writer appending to the file with a series of short writes.
2. balance_dirty_pages kicks in, wakes up background writeback and sleeps.
3. Writeback kicks in and the cursor is on the last page of the dirty file. Writeback is started or skipped if already in progress. As it's EOF, extent_write_cache_pages() returns and the cursor is set to done_index which is pointing to the last page.
4. Writeback is done. Nothing happens till balance_dirty_pages finishes, at which point we go back to #1.
This can almost completely stall out writing back of the file and keep the system over dirty threshold for a long time which can mess up the whole system. We encountered this issue in production with a package handling application which can reliably reproduce the issue when running under tight memory limits.
Reading the comment in the error handling section, this seems to be to avoid accidentally skipping a page in case the write attempt on the page doesn't succeed. However, this concern seems bogus.
On each page, the code either:
* Skips and moves onto the next page.
* Fails issue and sets done_index to index + 1.
* Successfully issues and continue to the next page if budget allows and not EOF.
IOW, as long as it's not EOF and there's budget, the code never retries writing back the same page. Only when a page happens to be the last page of a particular run, we end up retrying the page, which can't possibly guarantee anything data integrity related. Besides, cyclic writes are only used for non-syncing writebacks meaning that there's no data integrity implication to begin with.
Fix it by always setting done_index past the current page being processed.
Note that this problem exists in other writepages too.
--- fs/btrfs/extent_io.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
fs/btrfs/extent_io.c +1 -11
@@ -4117,7 +4117,7 @@ retry:for (i =0 ; i < nr_pages; i++) {struct page *page = pvec.pages[i]; - done_index = page->index; + done_index = page->index +1 ;/* * At this point we hold neither the i_pages lock nor * the page lock: the page may be truncated or
@@ -4152,16 +4152,6 @@ retry: ret =__extent_writepage (page, wbc, epd);if (ret <0 ) { -/* -* done_index is set past this page, -* so media errors will not choke -* background writeout for the entire -* file. This has consequences for -* range_cyclic semantics (ie. it may -* not be suitable for data integrity -* writeout). -*/ - done_index = page->index +1 ; done =1 ;break ; }
Greg Kroah-Hartman
maintainerPATCH 60/180 btrfs: Remove btrfs_bio::flags member
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit 34b127aecd4fe8e6a3903e10f204a7b7ffddca22 upstream.
The last user of btrfs_bio::flags was removed in commit 326e1dbb5736 ("block: remove management of bi_remaining when restoring original bi_end_io"), remove it.
(Tagged for stable as the structure is heavily used and space savings are desirable.)
--- fs/btrfs/volumes.h | 1 - 1 file changed, 1 deletion(-)
fs/btrfs/volumes.h +0 -1
@@ -331,7 +331,6 @@ struct btrfs_bio {u64 map_type;/* get from map_lookup->type */ bio_end_io_t *end_io;struct bio *orig_bio; -unsigned long flags;void *private;atomic_t error;int max_errors;
Greg Kroah-Hartman
maintainerPATCH 61/180 Btrfs: send, skip backreference walking for extents with many references
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit fd0ddbe2509568b00df364156f47561e9f469f15 upstream.
Backreference walking, which is used by send to figure if it can issue clone operations instead of write operations, can be very slow and use too much memory when extents have many references. This change simply skips backreference walking when an extent has more than 64 references, in which case we fallback to a write operation instead of a clone operation. This limit is conservative and in practice I observed no signicant slowdown with up to 100 references and still low memory usage up to that limit.
This is a temporary workaround until there are speedups in the backref walking code, and as such it does not attempt to add extra interfaces or knobs to tweak the threshold.
--- fs/btrfs/send.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
fs/btrfs/send.c +24 -1
@@ -25,6 +25,14 @@#include "compression.h" /* +* Maximum number of references an extent can have in order for us to attempt to +* issue clone operations instead of write operations. This currently exists to +* avoid hitting limitations of the backreference walking code (taking a lot of +* time and using too much memory for extents with large number of references). +*/ +#define SEND_MAX_EXTENT_REFS 64 + +/* * A fs_path is a helper to dynamically build path names with unknown size. * It reallocates the internal buffer on demand. * It allows fast adding of path elements on the right side (normal path) and
@@ -1287,6 +1295,7 @@ static int find_extent_clone(struct sendstruct clone_root *cur_clone_root;struct btrfs_key found_key;struct btrfs_path *tmp_path; +struct btrfs_extent_item *ei;int compressed;u32 i;
@@ -1334,7 +1343,6 @@ static int find_extent_clone(struct send ret =extent_from_logical (fs_info, disk_byte, tmp_path, &found_key, &flags);up_read (&fs_info->commit_root_sem); -btrfs_release_path (tmp_path);if (ret <0 ) goto out;
@@ -1343,6 +1351,21 @@ static int find_extent_clone(struct send goto out; } + ei =btrfs_item_ptr (tmp_path->nodes[0 ], tmp_path->slots[0 ], + struct btrfs_extent_item); +/* +* Backreference walking (iterate_extent_inodes() below) is currently +* too expensive when an extent has a large number of references, both +* in time spent and used memory. So for now just fallback to write +* operations instead of clone operations when an extent has more than +* a certain amount of references. +*/ +if (btrfs_extent_refs (tmp_path->nodes[0 ], ei) >SEND_MAX_EXTENT_REFS ) { + ret = -ENOENT ; + goto out; + } +btrfs_release_path (tmp_path); +/* * Setup the clone roots. */
Greg Kroah-Hartman
maintainerPATCH 62/180 btrfs: record all roots for rename exchange on a subvol
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 3e1740993e43116b3bc71b0aad1e6872f6ccf341 upstream.
Testing with the new fsstress support for subvolumes uncovered a pretty bad problem with rename exchange on subvolumes. We're modifying two different subvolumes, but we only start the transaction on one of them, so the other one is not added to the dirty root list. This is caught by btrfs_cow_block() with a warning because the root has not been updated, however if we do not modify this root again we'll end up pointing at an invalid root because the root item is never updated.
Fix this by making sure we add the destination root to the trans list, the same as we do with normal renames. This fixes the corruption.
--- fs/btrfs/inode.c | 3 +++ 1 file changed, 3 insertions(+)
fs/btrfs/inode.c +3 -0
@@ -9533,6 +9533,9 @@ static int btrfs_rename_exchange(struct goto out_notrans; } +if (dest != root) +btrfs_record_root_in_trans (trans, dest); +/* * We need to find a free sequence number both in the source and * in the destination directory for the exchange.
Greg Kroah-Hartman
maintainerPATCH 63/180 rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 0e531cc575c4e9e3dd52ad287b49d3c2dc74c810 upstream.
In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), a callback to get the RX buffer address was added to the PCI driver. Unfortunately, driver rtl8192de was not modified appropriately and the code runs into a WARN_ONCE() call. The use of an incorrect array is also fixed.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +5 -3
@@ -818,13 +818,15 @@ u64 rtl92de_get_desc(struct ieee80211_hwbreak ; } }else { -struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;switch (desc_name) {case HW_DESC_OWN : - ret =GET_RX_DESC_OWN (pdesc); + ret =GET_RX_DESC_OWN (p_desc);break ;case HW_DESC_RXPKT_LEN : - ret =GET_RX_DESC_PKT_LEN (pdesc); + ret =GET_RX_DESC_PKT_LEN (p_desc); +break ; +case HW_DESC_RXBUFF_ADDR : + ret =GET_RX_DESC_BUFF_ADDR (p_desc);break ;default : WARN_ONCE(true, "rtl8192de: ERR rxdesc :%d not processed\n",
Greg Kroah-Hartman
maintainerPATCH 64/180 rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 3155db7613edea8fb943624062baf1e4f9cfbfd6 upstream.
In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), a callback needed to check if the hardware has released a buffer indicating that a DMA operation is completed was not added.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 1 + drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 17 +++++++++++++++++ drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 2 ++ 3 files changed, 20 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c +1 -0
@@ -216,6 +216,7 @@ static struct rtl_hal_ops rtl8192de_hal_ .led_control = rtl92de_led_control, .set_desc = rtl92de_set_desc, .get_desc = rtl92de_get_desc, + .is_tx_desc_closed = rtl92de_is_tx_desc_closed, .tx_polling = rtl92de_tx_polling, .enable_hw_sec = rtl92de_enable_hw_security_config, .set_key = rtl92de_set_key,
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c +17 -0
@@ -837,6 +837,23 @@ u64 rtl92de_get_desc(struct ieee80211_hwreturn ret; } +bool rtl92de_is_tx_desc_closed (struct ieee80211_hw *hw, +u8 hw_queue,u16 index) +{ +struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw)); +struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[hw_queue]; +u8 *entry = (u8 *)(&ring->desc[ring->idx]); +u8 own = (u8 )rtl92de_get_desc (hw, entry, true,HW_DESC_OWN ); + +/* a beacon packet will only use the first +* descriptor by defaut, and the own bit may not +* be cleared by the hardware +*/ +if (own) +return false; +return true; +} +void rtl92de_tx_polling (struct ieee80211_hw *hw,u8 hw_queue) {struct rtl_priv *rtlpriv =rtl_priv (hw);
drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h +2 -0
@@ -715,6 +715,8 @@ void rtl92de_set_desc(struct ieee80211_h u8 desc_name, u8 *val);u64 rtl92de_get_desc (struct ieee80211_hw *hw,u8 *p_desc,bool istx,u8 desc_name); +bool rtl92de_is_tx_desc_closed (struct ieee80211_hw *hw, +u8 hw_queue,u16 index);void rtl92de_tx_polling (struct ieee80211_hw *hw,u8 hw_queue); void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, bool b_firstseg, bool b_lastseg,
Greg Kroah-Hartman
maintainerPATCH 65/180 rtlwifi: rtl8192de: Fix missing enable interrupt flag
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit 330bb7117101099c687e9c7f13d48068670b9c62 upstream.
In commit 38506ecefab9 ("rtlwifi: rtl_pci: Start modification for new drivers"), the flag that indicates that interrupts are enabled was never set.
In addition, there are several places when enable/disable interrupts were commented out are restored. A sychronize_interrupts() call is removed.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c +5 -4
@@ -1176,6 +1176,7 @@ void rtl92de_enable_interrupt(struct ieertl_write_dword (rtlpriv,REG_HIMR , rtlpci->irq_mask[0 ] &0xFFFFFFFF );rtl_write_dword (rtlpriv,REG_HIMRE , rtlpci->irq_mask[1 ] &0xFFFFFFFF ); + rtlpci->irq_enabled = true; }void rtl92de_disable_interrupt (struct ieee80211_hw *hw)
@@ -1185,7 +1186,7 @@ void rtl92de_disable_interrupt(struct iertl_write_dword (rtlpriv,REG_HIMR ,IMR8190_DISABLED );rtl_write_dword (rtlpriv,REG_HIMRE ,IMR8190_DISABLED ); -synchronize_irq (rtlpci->pdev->irq); + rtlpci->irq_enabled = false; }static void _rtl92de_poweroff_adapter (struct ieee80211_hw *hw)
@@ -1351,7 +1352,7 @@ void rtl92de_set_beacon_related_register bcn_interval = mac->beacon_interval; atim_window =2 ; -/*rtl92de_disable_interrupt(hw); */ +rtl92de_disable_interrupt (hw);rtl_write_word (rtlpriv,REG_ATIMWND , atim_window);rtl_write_word (rtlpriv,REG_BCN_INTERVAL , bcn_interval);rtl_write_word (rtlpriv,REG_BCNTCFG ,0x660f );
@@ -1371,9 +1372,9 @@ void rtl92de_set_beacon_interval(structRT_TRACE (rtlpriv,COMP_BEACON ,DBG_DMESG ,"beacon_interval:%d\n" , bcn_interval); -/* rtl92de_disable_interrupt(hw); */ +rtl92de_disable_interrupt (hw);rtl_write_word (rtlpriv,REG_BCN_INTERVAL , bcn_interval); -/* rtl92de_enable_interrupt(hw); */ +rtl92de_enable_interrupt (hw); } void rtl92de_update_interrupt_mask(struct ieee80211_hw *hw,
Greg Kroah-Hartman
maintainerPATCH 66/180 lib: raid6: fix awk build warnings
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 702600eef73033ddd4eafcefcbb6560f3e3a90f7 upstream.
Newer versions of awk spit out these fun warnings:
awk: ../lib/raid6/unroll.awk:16: warning: regexp escape sequence `\#' is not a known regexp operator
As commit 700c1018b86d ("x86/insn: Fix awk regexp warnings") showed, it turns out that there are a number of awk strings that do not need to be escaped and newer versions of awk now warn about this.
Fix the string up so that no warning is produced. The exact same kernel module gets created before and after this patch, showing that it wasn't needed.
--- lib/raid6/unroll.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/raid6/unroll.awk +1 -1
@@ -13,7 +13,7 @@ BEGIN { for (i = 0; i < rep; ++i) { tmp = $0 gsub(/\$\$/, i, tmp) - gsub(/\$\#/, n, tmp) + gsub(/\$#/, n, tmp) gsub(/\$\*/, "$", tmp) print tmp }
Greg Kroah-Hartman
maintainerPATCH 67/180 ovl: fix lookup failure on multi lower squashfs
In reply to Greg Kroah-HartmanFrom: Amir Goldstein <[email protected]>
commit 7e63c87fc2dcf3be9d3aab82d4a0ea085880bdca upstream.
In the past, overlayfs required that lower fs have non null uuid in order to support nfs export and decode copy up origin file handles.
Commit 9df085f3c9a2 ("ovl: relax requirement for non null uuid of lower fs") relaxed this requirement for nfs export support, as long as uuid (even if null) is unique among all lower fs.
However, said commit unintentionally also relaxed the non null uuid requirement for decoding copy up origin file handles, regardless of the unique uuid requirement.
Amend this mistake by disabling decoding of copy up origin file handle from lower fs with a conflicting uuid.
We still encode copy up origin file handles from those fs, because file handles like those already exist in the wild and because they might provide useful information in the future.
There is an unhandled corner case described by Miklos this way:
- two filesystems, A and B, both have null uuid
- upper layer is on A
- lower layer 1 is also on A
- lower layer 2 is on B
In this case bad_uuid won't be set for B, because the check only involves the list of lower fs. Hence we'll try to decode a layer 2 origin on layer 1 and fail.
We will deal with this corner case later.
--- fs/overlayfs/namei.c | 8 ++++++++ fs/overlayfs/ovl_entry.h | 2 ++ fs/overlayfs/super.c | 24 +++++++++++++++++------- 3 files changed, 27 insertions(+), 7 deletions(-)
fs/overlayfs/namei.c +8 -0
@@ -325,6 +325,14 @@ int ovl_check_origin_fh(struct ovl_fs *oint i;for (i =0 ; i < ofs->numlower; i++) { +/* +* If lower fs uuid is not unique among lower fs we cannot match +* fh->uuid to layer. +*/ +if (ofs->lower_layers[i].fsid && + ofs->lower_layers[i].fs->bad_uuid) +continue ; + origin =ovl_decode_real_fh (fh, ofs->lower_layers[i].mnt, connected);if (origin)
fs/overlayfs/ovl_entry.h +2 -0
@@ -22,6 +22,8 @@ struct ovl_config {struct ovl_sb {struct super_block *sb;dev_t pseudo_dev; +/* Unusable (conflicting) uuid */ +bool bad_uuid; };struct ovl_layer {
fs/overlayfs/super.c +17 -7
@@ -1255,7 +1255,7 @@ static bool ovl_lower_uuid_ok(struct ovl {unsigned int i; -if (!ofs->config.nfs_export && !(ofs->config.index && ofs->upper_mnt)) +if (!ofs->config.nfs_export && !ofs->upper_mnt)return true;for (i =0 ; i < ofs->numlowerfs; i++) {
@@ -1263,9 +1263,13 @@ static bool ovl_lower_uuid_ok(struct ovl* We use uuid to associate an overlay lower file handle with a * lower layer, so we can accept lower fs with null uuid as long * as all lower layers with null uuid are on the same fs. +* if we detect multiple lower fs with the same uuid, we +* disable lower file handle decoding on all of them. */ -if (uuid_equal (&ofs->lower_fs[i].sb->s_uuid, uuid)) +if (uuid_equal (&ofs->lower_fs[i].sb->s_uuid, uuid)) { + ofs->lower_fs[i].bad_uuid = true;return false; + } }return true; }
@@ -1277,6 +1281,7 @@ static int ovl_get_fsid(struct ovl_fs *ounsigned int i;dev_t dev;int err; +bool bad_uuid = false;/* fsid 0 is reserved for upper fs even with non upper overlay */ if (ofs->upper_mnt && ofs->upper_mnt->mnt_sb == sb)
@@ -1288,11 +1293,15 @@ static int ovl_get_fsid(struct ovl_fs *o }if (!ovl_lower_uuid_ok (ofs, &sb->s_uuid)) { - ofs->config.index = false; - ofs->config.nfs_export = false; -pr_warn ("overlayfs: %s uuid detected in lower fs '%pd2', falling back to index=off,nfs_export=off.\n" , -uuid_is_null (&sb->s_uuid) ?"null" :"conflicting" , - path->dentry); + bad_uuid = true; +if (ofs->config.index || ofs->config.nfs_export) { + ofs->config.index = false; + ofs->config.nfs_export = false; +pr_warn ("overlayfs: %s uuid detected in lower fs '%pd2', falling back to index=off,nfs_export=off.\n" , +uuid_is_null (&sb->s_uuid) ?"null" : +"conflicting" , + path->dentry); + } } err =get_anon_bdev (&dev);
@@ -1303,6 +1312,7 @@ static int ovl_get_fsid(struct ovl_fs *o ofs->lower_fs[ofs->numlowerfs].sb = sb; ofs->lower_fs[ofs->numlowerfs].pseudo_dev = dev; + ofs->lower_fs[ofs->numlowerfs].bad_uuid = bad_uuid; ofs->numlowerfs++;return ofs->numlowerfs;
Greg Kroah-Hartman
maintainerPATCH 68/180 ovl: fix corner case of non-unique st_dev;st_ino
In reply to Greg Kroah-HartmanFrom: Amir Goldstein <[email protected]>
commit 9c6d8f13e9da10a26ad7f0a020ef86e8ef142835 upstream.
On non-samefs overlay without xino, non pure upper inodes should use a pseudo_dev assigned to each unique lower fs and pure upper inodes use the real upper st_dev.
It is fine for an overlay pure upper inode to use the same st_dev;st_ino values as the real upper inode, because the content of those two different filesystem objects is always the same.
In this case, however:
- two filesystems, A and B
- upper layer is on A
- lower layer 1 is also on A
- lower layer 2 is on B
Non pure upper overlay inode, whose origin is in layer 1 will have the same st_dev;st_ino values as the real lower inode. This may result with a false positive results of 'diff' between the real lower and copied up overlay inode.
Fix this by using the upper st_dev;st_ino values in this case. This breaks the property of constant st_dev;st_ino across copy up of this case. This breakage will be fixed by a later patch.
--- fs/overlayfs/inode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/overlayfs/inode.c +7 -1
@@ -200,8 +200,14 @@ int ovl_getattr(const struct path *path,if (ovl_test_flag (OVL_INDEX ,d_inode (dentry)) || (!ovl_verify_lower (dentry->d_sb) && (is_dir || lowerstat.nlink ==1 ))) { - stat->ino = lowerstat.ino; lower_layer =ovl_layer_lower (dentry); +/* +* Cannot use origin st_dev;st_ino because +* origin inode content may differ from overlay +* inode content. +*/ +if (samefs || lower_layer->fsid) + stat->ino = lowerstat.ino; }/*
Greg Kroah-Hartman
maintainerPATCH 69/180 ovl: relax WARN_ON() on rename to self
In reply to Greg Kroah-HartmanFrom: Amir Goldstein <[email protected]>
commit 6889ee5a53b8d969aa542047f5ac8acdc0e79a91 upstream.
In ovl_rename(), if new upper is hardlinked to old upper underneath overlayfs before upper dirs are locked, user will get an ESTALE error and a WARN_ON will be printed.
Changes to underlying layers while overlayfs is mounted may result in unexpected behavior, but it shouldn't crash the kernel and it shouldn't trigger WARN_ON() either, so relax this WARN_ON().
--- fs/overlayfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/overlayfs/dir.c +1 -1
@@ -1170,7 +1170,7 @@ static int ovl_rename(struct inode *olddif (newdentry == trap) goto out_dput; -if (WARN_ON (olddentry->d_inode == newdentry->d_inode)) +if (olddentry->d_inode == newdentry->d_inode) goto out_dput; err =0 ;
Greg Kroah-Hartman
maintainerPATCH 70/180 hwrng: omap - Fix RNG wait loop timeout
In reply to Greg Kroah-HartmanFrom: Sumit Garg <[email protected]>
commit be867f987a4e1222114dd07a01838a17c26f3fff upstream.
Existing RNG data read timeout is 200us but it doesn't cover EIP76 RNG data rate which takes approx. 700us to produce 16 bytes of output data as per testing results. So configure the timeout as 1000us to also take account of lack of udelay()'s reliability.
--- drivers/char/hw_random/omap-rng.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/char/hw_random/omap-rng.c +8 -1
@@ -66,6 +66,13 @@#define OMAP4_RNG_OUTPUT_SIZE 0x8#define EIP76_RNG_OUTPUT_SIZE 0x10 +/* +* EIP76 RNG takes approx. 700us to produce 16 bytes of output data +* as per testing results. And to account for the lack of udelay()'s +* reliability, we keep the timeout as 1000us. +*/ +#define RNG_DATA_FILL_TIMEOUT 100 +enum {RNG_OUTPUT_0_REG =0 ,RNG_OUTPUT_1_REG ,
@@ -176,7 +183,7 @@ static int omap_rng_do_read(struct hwrngif (max < priv->pdata->data_size)return 0 ; -for (i =0 ; i <20 ; i++) { +for (i =0 ; i <RNG_DATA_FILL_TIMEOUT ; i++) { present = priv->pdata->data_present (priv);if (present || !wait)break ;
Greg Kroah-Hartman
maintainerPATCH 71/180 dm writecache: handle REQ_FUA
In reply to Greg Kroah-HartmanFrom: Maged Mokhtar <[email protected]>
commit c1005322ff02110a4df7f0033368ea015062b583 upstream.
Call writecache_flush() on REQ_FUA in writecache_map().
--- drivers/md/dm-writecache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/dm-writecache.c +2 -1
@@ -1218,7 +1218,8 @@ bio_copy: } }while (bio->bi_iter.bi_size); -if (unlikely (wc->uncommitted_blocks >= wc->autocommit_blocks)) +if (unlikely (bio->bi_opf &REQ_FUA || + wc->uncommitted_blocks >= wc->autocommit_blocks))writecache_flush (wc);else writecache_schedule_autocommit (wc);
Greg Kroah-Hartman
maintainerPATCH 72/180 dm zoned: reduce overhead of backing device checks
In reply to Greg Kroah-HartmanFrom: Dmitry Fomichev <[email protected]>
commit e7fad909b68aa37470d9f2d2731b5bec355ee5d6 upstream.
Commit 75d66ffb48efb3 added backing device health checks and as a part of these checks, check_events() block ops template call is invoked in dm-zoned mapping path as well as in reclaim and flush path. Calling check_events() with ATA or SCSI backing devices introduces a blocking scsi_test_unit_ready() call being made in sd_check_events(). Even though the overhead of calling scsi_test_unit_ready() is small for ATA zoned devices, it is much larger for SCSI and it affects performance in a very negative way.
Fix this performance regression by executing check_events() only in case of any I/O errors. The function dmz_bdev_is_dying() is modified to call only blk_queue_dying(), while calls to check_events() are made in a new helper function, dmz_check_bdev().
--- drivers/md/dm-zoned-metadata.c | 29 ++++++++++++++-------- drivers/md/dm-zoned-reclaim.c | 8 +----- drivers/md/dm-zoned-target.c | 54 ++++++++++++++++++++++++++++------------- drivers/md/dm-zoned.h | 2 + 4 files changed, 61 insertions(+), 32 deletions(-)
drivers/md/dm-zoned-metadata.c +19 -10
@@ -554,6 +554,7 @@ static struct dmz_mblock *dmz_get_mblock TASK_UNINTERRUPTIBLE);if (test_bit (DMZ_META_ERROR , &mblk->state)) {dmz_release_mblock (zmd, mblk); +dmz_check_bdev (zmd->dev);return ERR_PTR (-EIO ); }
@@ -625,6 +626,8 @@ static int dmz_rdwr_block(struct dmz_met ret =submit_bio_wait (bio);bio_put (bio); +if (ret) +dmz_check_bdev (zmd->dev);return ret; }
@@ -691,6 +694,7 @@ static int dmz_write_dirty_mblocks(struc TASK_UNINTERRUPTIBLE);if (test_bit (DMZ_META_ERROR , &mblk->state)) {clear_bit (DMZ_META_ERROR , &mblk->state); +dmz_check_bdev (zmd->dev); ret = -EIO ; } nr_mblks_submitted--;
@@ -768,7 +772,7 @@ int dmz_flush_metadata(struct dmz_metada/* If there are no dirty metadata blocks, just flush the device cache */ if (list_empty (&write_list)) { ret =blkdev_issue_flush (zmd->dev->bdev,GFP_NOIO ,NULL ); - goto out; + goto err; }/*
@@ -778,7 +782,7 @@ int dmz_flush_metadata(struct dmz_metada*/ ret =dmz_log_dirty_mblocks (zmd, &write_list);if (ret) - goto out; + goto err;/* * The log is on disk. It is now safe to update in place
@@ -786,11 +790,11 @@ int dmz_flush_metadata(struct dmz_metada*/ ret =dmz_write_dirty_mblocks (zmd, &write_list, zmd->mblk_primary);if (ret) - goto out; + goto err; ret =dmz_write_sb (zmd, zmd->mblk_primary);if (ret) - goto out; + goto err;while (!list_empty (&write_list)) { mblk = list_first_entry(&write_list, struct dmz_mblock, link);
@@ -805,16 +809,20 @@ int dmz_flush_metadata(struct dmz_metada zmd->sb_gen++; out: -if (ret && !list_empty (&write_list)) { -spin_lock (&zmd->mblk_lock); -list_splice (&write_list, &zmd->mblk_dirty_list); -spin_unlock (&zmd->mblk_lock); - } -dmz_unlock_flush (zmd);up_write (&zmd->mblk_sem);return ret; + +err: +if (!list_empty (&write_list)) { +spin_lock (&zmd->mblk_lock); +list_splice (&write_list, &zmd->mblk_dirty_list); +spin_unlock (&zmd->mblk_lock); + } +if (!dmz_check_bdev (zmd->dev)) + ret = -EIO ; + goto out; }/*
@@ -1244,6 +1252,7 @@ static int dmz_update_zone(struct dmz_meif (ret) {dmz_dev_err (zmd->dev,"Get zone %u report failed" ,dmz_id (zmd, zone)); +dmz_check_bdev (zmd->dev);return ret; }
drivers/md/dm-zoned-reclaim.c +2 -6
@@ -82,6 +82,7 @@ static int dmz_reclaim_align_wp(struct d"Align zone %u wp %llu to %llu (wp+%u) blocks failed %d" ,dmz_id (zmd, zone), (unsigned long long )wp_block, (unsigned long long)block, nr_blocks, ret); +dmz_check_bdev (zrc->dev);return ret; }
@@ -489,12 +490,7 @@ static void dmz_reclaim_work(struct work ret =dmz_do_reclaim (zrc);if (ret) {dmz_dev_debug (zrc->dev,"Reclaim error %d\n" , ret); -if (ret == -EIO ) -/* -* LLD might be performing some error handling sequence -* at the underlying device. To not interfere, do not -* attempt to schedule the next reclaim run immediately. -*/ +if (!dmz_check_bdev (zrc->dev))return ; }
drivers/md/dm-zoned-target.c +38 -16
84 lines not on this page · raw message
drivers/md/dm-zoned.h +2 -0
@@ -72,6 +72,7 @@ struct dmz_dev {/* Device flags. */ #define DMZ_BDEV_DYING (1 << 0) +#define DMZ_CHECK_BDEV (2 << 0)/* * Zone descriptor.
@@ -255,5 +256,6 @@ void dmz_schedule_reclaim(struct dmz_rec* Functions defined in dm-zoned-target.c */ bool dmz_bdev_is_dying (struct dmz_dev *dmz_dev); +bool dmz_check_bdev (struct dmz_dev *dmz_dev);#endif /* DM_ZONED_H */
Greg Kroah-Hartman
maintainerPATCH 73/180 workqueue: Fix spurious sanity check failures in destroy_workqueue()
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit def98c84b6cdf2eeea19ec5736e90e316df5206b upstream.
Before actually destrying a workqueue, destroy_workqueue() checks whether it's actually idle. If it isn't, it prints out a bunch of warning messages and leaves the workqueue dangling. It unfortunately has a couple issues.
* Mayday list queueing increments pwq's refcnts which gets detected as busy and fails the sanity checks. However, because mayday list queueing is asynchronous, this condition can happen without any actual work items left in the workqueue.
* Sanity check failure leaves the sysfs interface behind too which can lead to init failure of newer instances of the workqueue.
This patch fixes the above two by
* If a workqueue has a rescuer, disable and kill the rescuer before sanity checks. Disabling and killing is guaranteed to flush the existing mayday list.
* Remove sysfs interface before sanity checks.
--- kernel/workqueue.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
kernel/workqueue.c +19 -5
@@ -4316,9 +4316,28 @@ void destroy_workqueue(struct workqueue_struct pool_workqueue *pwq;int node; +/* +* Remove it from sysfs first so that sanity check failure doesn't +* lead to sysfs name conflicts. +*/ +workqueue_sysfs_unregister (wq); +/* drain it before proceeding with destruction */ drain_workqueue (wq); +/* kill rescuer, if sanity checks fail, leave it w/o rescuer */ +if (wq->rescuer) { +struct worker *rescuer = wq->rescuer; + +/* this prevents new queueing */ +spin_lock_irq (&wq_mayday_lock); + wq->rescuer =NULL ; +spin_unlock_irq (&wq_mayday_lock); + +/* rescuer will empty maydays list before exiting */ +kthread_stop (rescuer->task); + } +/* sanity checks */ mutex_lock (&wq->mutex);for_each_pwq (pwq, wq) {
@@ -4350,11 +4369,6 @@ void destroy_workqueue(struct workqueue_list_del_rcu (&wq->list);mutex_unlock (&wq_pool_mutex); -workqueue_sysfs_unregister (wq); - -if (wq->rescuer) -kthread_stop (wq->rescuer->task); -if (!(wq->flags &WQ_UNBOUND )) {wq_unregister_lockdep (wq);/*
Greg Kroah-Hartman
maintainerPATCH 74/180 workqueue: Fix pwq ref leak in rescuer_thread()
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit e66b39af00f426b3356b96433d620cb3367ba1ff upstream.
008847f66c3 ("workqueue: allow rescuer thread to do more work.") made the rescuer worker requeue the pwq immediately if there may be more work items which need rescuing instead of waiting for the next mayday timer expiration. Unfortunately, it doesn't check whether the pwq is already on the mayday list and unconditionally gets the ref and moves it onto the list. This doesn't corrupt the list but creates an additional reference to the pwq. It got queued twice but will only be removed once.
This leak later can trigger pwq refcnt warning on workqueue destruction and prevent freeing of the workqueue.
--- kernel/workqueue.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
kernel/workqueue.c +10 -3
@@ -2532,8 +2532,14 @@ repeat:*/ if (need_to_create_worker (pool)) {spin_lock (&wq_mayday_lock); -get_pwq (pwq); -list_move_tail (&pwq->mayday_node, &wq->maydays); +/* +* Queue iff we aren't racing destruction +* and somebody else hasn't queued it already. +*/ +if (wq->rescuer &&list_empty (&pwq->mayday_node)) { +get_pwq (pwq); +list_add_tail (&pwq->mayday_node, &wq->maydays); + }spin_unlock (&wq_mayday_lock); } }
@@ -4643,7 +4649,8 @@ static void show_pwq(struct pool_workquepr_info (" pwq %d:" , pool->id);pr_cont_pool_info (pool); -pr_cont (" active=%d/%d%s\n" , pwq->nr_active, pwq->max_active, +pr_cont (" active=%d/%d refcnt=%d%s\n" , + pwq->nr_active, pwq->max_active, pwq->refcnt, !list_empty (&pwq->mayday_node) ?" MAYDAY" :"" );hash_for_each (pool->busy_hash, bkt, worker, hentry) {
Greg Kroah-Hartman
maintainerPATCH 75/180 ASoC: rt5645: Fixed buddy jack support.
In reply to Greg Kroah-HartmanFrom: Jacob Rasmussen <[email protected]>
commit e7cfd867fd9842f346688f28412eb83dec342900 upstream.
The headphone jack on buddy was broken with the following commit:
commit 6b5da66322c5 ("ASoC: rt5645: read jd1_1 status for jd detection").
This changes the jd_mode for buddy to 4 so buddy can read from the same register that was used in the working version of this driver without affecting any other devices that might use this, since no other device uses jd_mode = 4. To test this I plugged and uplugged the headphone jack, verifying audio works.
--- sound/soc/codecs/rt5645.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/codecs/rt5645.c +5 -1
@@ -3270,6 +3270,9 @@ static void rt5645_jack_detect_work(strusnd_soc_jack_report (rt5645->mic_jack, report,SND_JACK_MICROPHONE );return ; +case 4 : + val =snd_soc_component_read32 (rt5645->component,RT5645_A_JD_CTRL1 ) &0x002 ; +break ;default :/* read rt5645 jd1_1 status */ val =snd_soc_component_read32 (rt5645->component,RT5645_INT_IRQ_ST ) &0x1000 ;break ;
@@ -3603,7 +3606,7 @@ static const struct rt5645_platform_datastatic const struct rt5645_platform_data buddy_platform_data = { .dmic1_data_pin =RT5645_DMIC_DATA_GPIO5 , .dmic2_data_pin =RT5645_DMIC_DATA_IN2P , - .jd_mode =3 , + .jd_mode =4 , .level_trigger_irq = true, };
@@ -3999,6 +4002,7 @@ static int rt5645_i2c_probe(struct i2c_c RT5645_JD1_MODE_1);break ;case 3 : +case 4 :regmap_update_bits (rt5645->regmap,RT5645_A_JD_CTRL1 ,RT5645_JD1_MODE_MASK ,RT5645_JD1_MODE_2 );
Greg Kroah-Hartman
maintainerPATCH 76/180 ASoC: rt5645: Fixed typo for buddy jack support.
In reply to Greg Kroah-HartmanFrom: Jacob Rasmussen <[email protected]>
commit fe23be2d85b05f561431d75acddec726ea807d2a upstream.
Had a typo in e7cfd867fd98 that resulted in buddy jack support not being fixed.
--- sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5645.c +1 -1
@@ -3271,7 +3271,7 @@ static void rt5645_jack_detect_work(stru report, SND_JACK_MICROPHONE);return ;case 4 : - val =snd_soc_component_read32 (rt5645->component,RT5645_A_JD_CTRL1 ) &0x002 ; + val =snd_soc_component_read32 (rt5645->component,RT5645_A_JD_CTRL1 ) &0x0020 ;break ;default :/* read rt5645 jd1_1 status */ val =snd_soc_component_read32 (rt5645->component,RT5645_INT_IRQ_ST ) &0x1000 ;
Greg Kroah-Hartman
maintainerPATCH 77/180 ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report
In reply to Greg Kroah-HartmanFrom: Pawel Harlozinski <[email protected]>
commit 8f157d4ff039e03e2ed4cb602eeed2fd4687a58f upstream.
Check for existance of jack before tracing.
NULL pointer dereference has been reported by KASAN while unloading machine driver (snd_soc_cnl_rt274).
--- sound/soc/soc-jack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-jack.c +1 -2
@@ -100,10 +100,9 @@ void snd_soc_jack_report(struct snd_soc_unsigned int sync =0 ;int enable; -trace_snd_soc_jack_report (jack, mask, status); -if (!jack)return ; +trace_snd_soc_jack_report (jack, mask, status); dapm = &jack->card->dapm;
Greg Kroah-Hartman
maintainerPATCH 78/180 ASoC: fsl_audmix: Add spin lock to protect tdms
In reply to Greg Kroah-HartmanFrom: Shengjiu Wang <[email protected]>
commit fe965096c9495ddcf78ec163348105e2baf8d185 upstream.
Audmix support two substream, When two substream start to run, the trigger function may be called by two substream in same time, that the priv->tdms may be updated wrongly.
The expected priv->tdms is 0x3, but sometimes the
result is 0x2, or 0x1.
--- sound/soc/fsl/fsl_audmix.c | 6 ++++++ sound/soc/fsl/fsl_audmix.h | 1 + 2 files changed, 7 insertions(+)
sound/soc/fsl/fsl_audmix.c +6 -0
@@ -286,6 +286,7 @@ static int fsl_audmix_dai_trigger(struct struct snd_soc_dai *dai) {struct fsl_audmix *priv =snd_soc_dai_get_drvdata (dai); +unsigned long lock_flags;/* Capture stream shall not be handled */ if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE )
@@ -295,12 +296,16 @@ static int fsl_audmix_dai_trigger(structcase SNDRV_PCM_TRIGGER_START :case SNDRV_PCM_TRIGGER_RESUME :case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : +spin_lock_irqsave (&priv->lock, lock_flags); priv->tdms |=BIT (dai->driver->id); +spin_unlock_irqrestore (&priv->lock, lock_flags);break ;case SNDRV_PCM_TRIGGER_STOP :case SNDRV_PCM_TRIGGER_SUSPEND :case SNDRV_PCM_TRIGGER_PAUSE_PUSH : +spin_lock_irqsave (&priv->lock, lock_flags); priv->tdms &= ~BIT (dai->driver->id); +spin_unlock_irqrestore (&priv->lock, lock_flags);break ;default :return -EINVAL ;
@@ -493,6 +498,7 @@ static int fsl_audmix_probe(struct platfreturn PTR_ERR (priv->ipg_clk); } +spin_lock_init (&priv->lock);platform_set_drvdata (pdev, priv);pm_runtime_enable (dev);
sound/soc/fsl/fsl_audmix.h +1 -0
@@ -96,6 +96,7 @@ struct fsl_audmix {struct platform_device *pdev;struct regmap *regmap;struct clk *ipg_clk; +spinlock_t lock;/* Protect tdms */ u8 tdms; };
Greg Kroah-Hartman
maintainerPATCH 79/180 md: improve handling of bio with REQ_PREFLUSH in md_flush_request()
In reply to Greg Kroah-HartmanFrom: David Jeffery <[email protected]>
commit 775d78319f1ceb32be8eb3b1202ccdc60e9cb7f1 upstream.
If pers->make_request fails in md_flush_request(), the bio is lost. To fix this, pass back a bool to indicate if the original make_request call should continue to handle the I/O and instead of assuming the flush logic will push it to completion.
Convert md_flush_request to return a bool and no longer calls the raid driver's make_request function. If the return is true, then the md flush logic has or will complete the bio and the md make_request call is done. If false, then the md make_request function needs to keep processing like it is a normal bio. Let the original call to md_handle_request handle any need to retry sending the bio to the raid driver's make_request function should it be needed.
Also mark md_flush_request and the make_request function pointer as __must_check to issue warnings should these critical return values be ignored.
--- drivers/md/md-linear.c | 5 ++--- drivers/md/md-multipath.c | 5 ++--- drivers/md/md.c | 11 +++++++++-- drivers/md/md.h | 4 ++-- drivers/md/raid0.c | 5 ++--- drivers/md/raid1.c | 5 ++--- drivers/md/raid10.c | 5 ++--- drivers/md/raid5.c | 4 ++-- 8 files changed, 23 insertions(+), 21 deletions(-)
drivers/md/md-linear.c +2 -3
@@ -244,10 +244,9 @@ static bool linear_make_request(struct msector_t start_sector, end_sector, data_offset;sector_t bio_sector = bio->bi_iter.bi_sector; -if (unlikely (bio->bi_opf &REQ_PREFLUSH )) { -md_flush_request (mddev, bio); +if (unlikely (bio->bi_opf &REQ_PREFLUSH ) + &&md_flush_request (mddev, bio))return true; - } tmp_dev =which_dev (mddev, bio_sector); start_sector = tmp_dev->end_sector - tmp_dev->rdev->sectors;
drivers/md/md-multipath.c +2 -3
@@ -104,10 +104,9 @@ static bool multipath_make_request(strucstruct multipath_bh * mp_bh;struct multipath_info *multipath; -if (unlikely (bio->bi_opf &REQ_PREFLUSH )) { -md_flush_request (mddev, bio); +if (unlikely (bio->bi_opf &REQ_PREFLUSH ) + &&md_flush_request (mddev, bio))return true; - } mp_bh =mempool_alloc (&conf->pool,GFP_NOIO );
drivers/md/md.c +9 -2
@@ -545,7 +545,13 @@ static void md_submit_flush_data(struct } } -void md_flush_request (struct mddev *mddev,struct bio *bio) +/* +* Manages consolidation of flushes and submitting any flushes needed for +* a bio with REQ_PREFLUSH. Returns true if the bio is finished or is +* being finished in another context. Returns false if the flushing is +* complete but still needs the I/O portion of the bio to be processed. +*/ +bool md_flush_request (struct mddev *mddev,struct bio *bio) {ktime_t start =ktime_get_boottime ();spin_lock_irq (&mddev->lock);
@@ -570,9 +576,10 @@ void md_flush_request(struct mddev *mddebio_endio (bio); else { bio->bi_opf &= ~REQ_PREFLUSH ; - mddev->pers->make_request (mddev, bio); +return false; } } +return true; }EXPORT_SYMBOL (md_flush_request);
drivers/md/md.h +2 -2
@@ -546,7 +546,7 @@ struct md_personalityint level;struct list_head list;struct module *owner; -bool (*make_request)(struct mddev *mddev,struct bio *bio); +bool __must_check (*make_request)(struct mddev *mddev,struct bio *bio);/* * start up works that do NOT require md_thread. tasks that * requires md_thread should go into start()
@@ -699,7 +699,7 @@ extern void md_error(struct mddev *mddevextern void md_finish_reshape (struct mddev *mddev);extern int mddev_congested (struct mddev *mddev,int bits); -extern void md_flush_request (struct mddev *mddev,struct bio *bio); +extern bool __must_check md_flush_request (struct mddev *mddev,struct bio *bio);extern void md_super_write (struct mddev *mddev,struct md_rdev *rdev,sector_t sector,int size,struct page *page);extern int md_super_wait (struct mddev *mddev);
drivers/md/raid0.c +2 -3
@@ -572,10 +572,9 @@ static bool raid0_make_request(struct mdunsigned chunk_sects;unsigned sectors; -if (unlikely (bio->bi_opf &REQ_PREFLUSH )) { -md_flush_request (mddev, bio); +if (unlikely (bio->bi_opf &REQ_PREFLUSH ) + &&md_flush_request (mddev, bio))return true; - }if (unlikely ((bio_op (bio) ==REQ_OP_DISCARD ))) {raid0_handle_discard (mddev, bio);
drivers/md/raid1.c +2 -3
@@ -1564,10 +1564,9 @@ static bool raid1_make_request(struct md {sector_t sectors; -if (unlikely (bio->bi_opf &REQ_PREFLUSH )) { -md_flush_request (mddev, bio); +if (unlikely (bio->bi_opf &REQ_PREFLUSH ) + &&md_flush_request (mddev, bio))return true; - }/* * There is a limit to the maximum size, but
drivers/md/raid10.c +2 -3
@@ -1523,10 +1523,9 @@ static bool raid10_make_request(struct mint chunk_sects = chunk_mask +1 ;int sectors =bio_sectors (bio); -if (unlikely (bio->bi_opf &REQ_PREFLUSH )) { -md_flush_request (mddev, bio); +if (unlikely (bio->bi_opf &REQ_PREFLUSH ) + &&md_flush_request (mddev, bio))return true; - }if (!md_write_start (mddev, bio))return false;
drivers/md/raid5.c +2 -2
@@ -5587,8 +5587,8 @@ static bool raid5_make_request(struct mdif (ret ==0 )return true;if (ret == -ENODEV ) { -md_flush_request (mddev, bi); -return true; +if (md_flush_request (mddev, bi)) +return true; }/* ret == -EAGAIN, fallback */ /*
Greg Kroah-Hartman
maintainerPATCH 80/180 blk-mq: avoid sysfs buffer overflow with too many CPU cores
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
commit 8962842ca5abdcf98e22ab3b2b45a103f0408b95 upstream.
It is reported that sysfs buffer overflow can be triggered if the system has too many CPU cores(>841 on 4K PAGE_SIZE) when showing CPUs of hctx via /sys/block/$DEV/mq/$N/cpu_list.
Use snprintf to avoid the potential buffer overflow.
This version doesn't change the attribute format, and simply stops showing CPU numbers if the buffer is going to overflow.
--- block/blk-mq-sysfs.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
block/blk-mq-sysfs.c +10 -5
@@ -166,20 +166,25 @@ static ssize_t blk_mq_hw_sysfs_nr_reservstatic ssize_t blk_mq_hw_sysfs_cpus_show (struct blk_mq_hw_ctx *hctx,char *page) { +const size_t size =PAGE_SIZE -1 ;unsigned int i, first =1 ; -ssize_t ret =0 ; +int ret =0 , pos =0 ;for_each_cpu (i, hctx->cpumask) {if (first) - ret +=sprintf (ret + page,"%u" , i); + ret =snprintf (pos + page, size - pos,"%u" , i);else - ret +=sprintf (ret + page,", %u" , i); + ret =snprintf (pos + page, size - pos,", %u" , i); + +if (ret >= size - pos) +break ; first =0 ; + pos += ret; } - ret +=sprintf (ret + page,"\n" ); -return ret; + ret =snprintf (pos + page, size - pos,"\n" ); +return pos + ret; }static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_nr_tags = {
Greg Kroah-Hartman
maintainerPATCH 81/180 cgroup: pids: use atomic64_t for pids->limit
In reply to Greg Kroah-HartmanFrom: Aleksa Sarai <[email protected]>
commit a713af394cf382a30dd28a1015cbe572f1b9ca75 upstream.
Because pids->limit can be changed concurrently (but we don't want to take a lock because it would be needlessly expensive), use atomic64_ts instead.
--- kernel/cgroup/pids.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
kernel/cgroup/pids.c +6 -5
@@ -45,7 +45,7 @@ struct pids_cgroup {* %PIDS_MAX = (%PID_MAX_LIMIT + 1). */ atomic64_t counter; -int64_t limit; +atomic64_t limit;/* Handle for "pids.events" */ struct cgroup_file events_file;
@@ -73,8 +73,8 @@ pids_css_alloc(struct cgroup_subsys_statif (!pids)return ERR_PTR (-ENOMEM ); - pids->limit =PIDS_MAX ;atomic64_set (&pids->counter,0 ); +atomic64_set (&pids->limit,PIDS_MAX );atomic64_set (&pids->events_limit,0 );return &pids->css; }
@@ -146,13 +146,14 @@ static int pids_try_charge(struct pids_cfor (p = pids;parent_pids (p); p =parent_pids (p)) {int64_t new =atomic64_add_return (num, &p->counter); +int64_t limit =atomic64_read (&p->limit);/* * Since new is capped to the maximum number of pid_t, if * p->limit is %PIDS_MAX then we know that this test will never * fail. */ -if (new > p->limit) +if (new > limit) goto revert; }
@@ -277,7 +278,7 @@ set_limit:* Limit updates don't need to be mutex'd, since it isn't * critical that any racing fork()s follow the new limit. */ - pids->limit = limit; +atomic64_set (&pids->limit, limit);return nbytes; }
@@ -285,7 +286,7 @@ static int pids_max_show(struct seq_file {struct cgroup_subsys_state *css =seq_css (sf);struct pids_cgroup *pids =css_pids (css); -int64_t limit = pids->limit; +int64_t limit =atomic64_read (&pids->limit);if (limit >=PIDS_MAX )seq_printf (sf,"%s\n" ,PIDS_MAX_STR );
Greg Kroah-Hartman
maintainerPATCH 82/180 wil6210: check len before memcpy() calls
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit 2c840676be8ffc624bf9bb4490d944fd13c02d71 upstream.
memcpy() in wmi_set_ie() and wmi_update_ft_ies() is called with src == NULL and len == 0. This is an undefined behavior. Fix it by checking "ie_len > 0" before the memcpy() calls.
As suggested by GCC documentation:
"The pointers passed to memmove (and similar functions in <string.h>) must be non-null even when nbytes==0, so GCC can use that information to remove the check after the memmove call." [1]
[1] https://gcc.gnu.org/gcc-4.9/porting_to.html
--- drivers/net/wireless/ath/wil6210/wmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/wil6210/wmi.c +4 -2
@@ -2478,7 +2478,8 @@ int wmi_set_ie(struct wil6210_vif *vif, cmd->mgmt_frm_type = type;/* BUG: FW API define ieLen as u8. Will fix FW */ cmd->ie_len =cpu_to_le16 (ie_len); -memcpy (cmd->ie_info, ie, ie_len); +if (ie_len) +memcpy (cmd->ie_info, ie, ie_len); rc =wmi_send (wil,WMI_SET_APPIE_CMDID , vif->mid, cmd, len);kfree (cmd); out:
@@ -2514,7 +2515,8 @@ int wmi_update_ft_ies(struct wil6210_vif } cmd->ie_len =cpu_to_le16 (ie_len); -memcpy (cmd->ie_info, ie, ie_len); +if (ie_len) +memcpy (cmd->ie_info, ie, ie_len); rc =wmi_send (wil,WMI_UPDATE_FT_IES_CMDID , vif->mid, cmd, len);kfree (cmd);
Greg Kroah-Hartman
maintainerPATCH 83/180 ar5523: check NULL before memcpy() in ar5523_cmd()
In reply to Greg Kroah-HartmanFrom: Denis Efremov <[email protected]>
commit 315cee426f87658a6799815845788fde965ddaad upstream.
memcpy() call with "idata == NULL && ilen == 0" results in undefined behavior in ar5523_cmd(). For example, NULL is passed in callchain "ar5523_stat_work() -> ar5523_cmd_write() -> ar5523_cmd()". This patch adds ilen check before memcpy() call in ar5523_cmd() to prevent an undefined behavior.
--- drivers/net/wireless/ath/ar5523/ar5523.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ar5523/ar5523.c +2 -1
@@ -255,7 +255,8 @@ static int ar5523_cmd(struct ar5523 *ar,if (flags &AR5523_CMD_FLAG_MAGIC ) hdr->magic =cpu_to_be32 (1 <<24 ); -memcpy (hdr +1 , idata, ilen); +if (ilen) +memcpy (hdr +1 , idata, ilen); cmd->odata = odata; cmd->olen = olen;
Greg Kroah-Hartman
maintainerPATCH 84/180 s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported
In reply to Greg Kroah-HartmanFrom: Gerald Schaefer <[email protected]>
commit ab874f22d35a8058d8fdee5f13eb69d8867efeae upstream.
On older HW or under a hypervisor, w/o the instruction-execution- protection (IEP) facility, and also w/o EDAT-1, a translation-specification exception may be recognized when bit 55 of a pte is one (_PAGE_NOEXEC).
The current code tries to prevent setting _PAGE_NOEXEC in such cases, by removing it within set_pte_at(). However, ptep_set_access_flags() will modify a pte directly, w/o using set_pte_at(). There is at least one scenario where this can result in an active pte with _PAGE_NOEXEC set, which would then lead to a panic due to a translation-specification exception (write to swapped out page):
do_swap_page
pte = mk_pte (with _PAGE_NOEXEC bit)
set_pte_at (will remove _PAGE_NOEXEC bit in page table, but keep it
in local variable pte)
vmf->orig_pte = pte (pte still contains _PAGE_NOEXEC bit) do_wp_page
wp_page_reuse
entry = vmf->orig_pte (still with _PAGE_NOEXEC bit) ptep_set_access_flags (writes entry with _PAGE_NOEXEC bit)
Fix this by clearing _PAGE_NOEXEC already in mk_pte_phys(), where the pgprot value is applied, so that no pte with _PAGE_NOEXEC will ever be visible, if it is not supported. The check in set_pte_at() can then also be removed.
--- arch/s390/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/include/asm/pgtable.h +2 -2
@@ -1172,8 +1172,6 @@ void gmap_pmdp_idte_global(struct mm_strstatic inline void set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t entry) { -if (!MACHINE_HAS_NX ) -pte_val (entry) &= ~_PAGE_NOEXEC;if (pte_present (entry))pte_val (entry) &= ~_PAGE_UNUSED;if (mm_has_pgste (mm))
@@ -1190,6 +1188,8 @@ static inline pte_t mk_pte_phys(unsigned {pte_t __pte;pte_val (__pte) = physpage +pgprot_val (pgprot); +if (!MACHINE_HAS_NX ) +pte_val (__pte) &= ~_PAGE_NOEXEC;return pte_mkyoung (__pte); }
Greg Kroah-Hartman
maintainerPATCH 85/180 media: hantro: Fix s_fmt for dynamic resolution changes
In reply to Greg Kroah-HartmanFrom: Ezequiel Garcia <[email protected]>
commit ae02d49493b5d32bb3e035fdeb1655346f5e1ea5 upstream.
Commit 953aaa1492c53 ("media: rockchip/vpu: Prepare things to support decoders") changed the conditions under S_FMT was allowed for OUTPUT
CAPTURE buffers.
However, and according to the mem-to-mem stateless decoder specification, in order to support dynamic resolution changes, S_FMT should be allowed even if OUTPUT buffers have been allocated.
Relax decoder S_FMT restrictions on OUTPUT buffers, allowing a resolution modification, provided the pixel format stays the same.
Tested on RK3288 platforms using ChromiumOS Video Decode/Encode Accelerator Unittests.
[hverkuil: fix typo: In other -> In order]
--- drivers/staging/media/hantro/hantro_v4l2.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/staging/media/hantro/hantro_v4l2.c +19 -9
@@ -356,20 +356,27 @@ vidioc_s_fmt_out_mplane(struct file *fil {struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;struct hantro_ctx *ctx =fh_to_ctx (priv); +struct vb2_queue *vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, f->type);const struct hantro_fmt *formats;unsigned int num_fmts; -struct vb2_queue *vq;int ret; -/* Change not allowed if queue is busy. */ - vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, f->type); -if (vb2_is_busy (vq)) -return -EBUSY ; + ret =vidioc_try_fmt_out_mplane (file, priv, f); +if (ret) +return ret;if (!hantro_is_encoder_ctx (ctx)) {struct vb2_queue *peer_vq;/* +* In order to support dynamic resolution change, +* the decoder admits a resolution change, as long +* as the pixelformat remains. Can't be done if streaming. +*/ +if (vb2_is_streaming (vq) || (vb2_is_busy (vq) && + pix_mp->pixelformat != ctx->src_fmt.pixelformat)) +return -EBUSY ; +/* * Since format change on the OUTPUT queue will reset * the CAPTURE queue, we can't allow doing so * when the CAPTURE queue has buffers allocated.
@@ -378,12 +385,15 @@ vidioc_s_fmt_out_mplane(struct file *fil V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);if (vb2_is_busy (peer_vq))return -EBUSY ; + }else { +/* +* The encoder doesn't admit a format change if +* there are OUTPUT buffers allocated. +*/ +if (vb2_is_busy (vq)) +return -EBUSY ; } - ret =vidioc_try_fmt_out_mplane (file, priv, f); -if (ret) -return ret; - formats =hantro_get_formats (ctx, &num_fmts); ctx->vpu_src_fmt =hantro_find_format (formats, num_fmts, pix_mp->pixelformat);
Greg Kroah-Hartman
maintainerPATCH 86/180 media: bdisp: fix memleak on release
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 11609a7e21f8cea42630350aa57662928fa4dc63 upstream.
If a process is interrupted while accessing the video device and the device lock is contended, release() could return early and fail to free related resources.
Note that the return value of the v4l2 release file operation is ignored.
--- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/platform/sti/bdisp/bdisp-v4l2.c +1 -2
@@ -651,8 +651,7 @@ static int bdisp_release(struct file *fidev_dbg (bdisp->dev,"%s\n" , __func__); -if (mutex_lock_interruptible (&bdisp->lock)) -return -ERESTARTSYS ; +mutex_lock (&bdisp->lock);v4l2_m2m_ctx_release (ctx->fh.m2m_ctx);
Greg Kroah-Hartman
maintainerPATCH 87/180 media: radio: wl1273: fix interrupt masking on release
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 1091eb830627625dcf79958d99353c2391f41708 upstream.
If a process is interrupted while accessing the radio device and the core lock is contended, release() could return early and fail to update the interrupt mask.
Note that the return value of the v4l2 release file operation is ignored.
--- drivers/media/radio/radio-wl1273.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/radio/radio-wl1273.c +1 -2
@@ -1148,8 +1148,7 @@ static int wl1273_fm_fops_release(structif (radio->rds_users >0 ) { radio->rds_users--;if (radio->rds_users ==0 ) { -if (mutex_lock_interruptible (&core->lock)) -return -EINTR ; +mutex_lock (&core->lock); radio->irq_flags &= ~WL1273_RDS_EVENT ;
Greg Kroah-Hartman
maintainerPATCH 88/180 media: cec.h: CEC_OP_REC_FLAG_ values were swapped
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
commit 806e0cdfee0b99efbb450f9f6e69deb7118602fc upstream.
CEC_OP_REC_FLAG_NOT_USED is 0 and CEC_OP_REC_FLAG_USED is 1, not the other way around.
--- include/uapi/linux/cec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/cec.h +2 -2
@@ -768,8 +768,8 @@ struct cec_event {#define CEC_MSG_SELECT_DIGITAL_SERVICE 0x93#define CEC_MSG_TUNER_DEVICE_STATUS 0x07/* Recording Flag Operand (rec_flag) */ -#define CEC_OP_REC_FLAG_USED 0 -#define CEC_OP_REC_FLAG_NOT_USED 1 +#define CEC_OP_REC_FLAG_NOT_USED 0 +#define CEC_OP_REC_FLAG_USED 1/* Tuner Display Info Operand (tuner_display_info) */ #define CEC_OP_TUNER_DISPLAY_INFO_DIGITAL 0#define CEC_OP_TUNER_DISPLAY_INFO_NONE 1
Greg Kroah-Hartman
maintainerPATCH 89/180 cpuidle: Do not unset the driver if it is there already
In reply to Greg Kroah-HartmanFrom: Zhenzhong Duan <[email protected]>
commit 918c1fe9fbbe46fcf56837ff21f0ef96424e8b29 upstream.
Fix __cpuidle_set_driver() to check if any of the CPUs in the mask has a driver different from drv already and, if so, return -EBUSY before updating any cpuidle_drivers per-CPU pointers.
--- drivers/cpuidle/driver.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/cpuidle/driver.c +7 -8
@@ -62,24 +62,23 @@ static inline void __cpuidle_unset_drive* __cpuidle_set_driver - set per CPU driver variables for the given driver. * @drv: a valid pointer to a struct cpuidle_driver * -* For each CPU in the driver's cpumask, unset the registered driver per CPU -* to @drv. -* -* Returns 0 on success, -EBUSY if the CPUs have driver(s) already. +* Returns 0 on success, -EBUSY if any CPU in the cpumask have a driver +* different from drv already. */ static inline int __cpuidle_set_driver (struct cpuidle_driver *drv) {int cpu;for_each_cpu (cpu, drv->cpumask) { +struct cpuidle_driver *old_drv; -if (__cpuidle_get_cpu_driver (cpu)) { -__cpuidle_unset_driver (drv); + old_drv =__cpuidle_get_cpu_driver (cpu); +if (old_drv && old_drv != drv)return -EBUSY ; - } + } +for_each_cpu (cpu, drv->cpumask)per_cpu (cpuidle_drivers, cpu) = drv; - }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 90/180 cpuidle: teo: Ignore disabled idle states that are too deep
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 069ce2ef1a6dd84cbd4d897b333e30f825e021f0 upstream.
Prevent disabled CPU idle state with target residencies beyond the anticipated idle duration from being taken into account by the TEO governor.
--- drivers/cpuidle/governors/teo.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/cpuidle/governors/teo.c +7 -0
@@ -266,6 +266,13 @@ static int teo_select(struct cpuidle_driif (s->disabled || su->disable) {/* +* Ignore disabled states with target residencies beyond +* the anticipated idle duration. +*/ +if (s->target_residency > duration_us) +continue ; + +/* * If the "early hits" metric of a disabled state is * greater than the current maximum, it should be taken * into account, because it would be a mistake to select
Greg Kroah-Hartman
maintainerPATCH 91/180 cpuidle: teo: Rename local variable in teo_select()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 4f690bb8ce4cc5d3fabe3a8e9c2401de1554cdc1 upstream.
Rename a local variable in teo_select() in preparation for subsequent code modifications, no intentional impact.
--- drivers/cpuidle/governors/teo.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/cpuidle/governors/teo.c +9 -10
@@ -241,7 +241,7 @@ static int teo_select(struct cpuidle_dri {struct teo_cpu *cpu_data =per_cpu_ptr (&teo_cpus, dev->cpu);int latency_req =cpuidle_governor_latency_req (dev->cpu); -unsigned int duration_us, count; +unsigned int duration_us, early_hits;int max_early_idx, constraint_idx, idx, i;ktime_t delta_tick;
@@ -255,7 +255,7 @@ static int teo_select(struct cpuidle_dri cpu_data->sleep_length_ns =tick_nohz_get_sleep_length (&delta_tick); duration_us =ktime_to_us (cpu_data->sleep_length_ns); - count =0 ; + early_hits =0 ; max_early_idx =-1 ; constraint_idx = drv->state_count; idx =-1 ;
@@ -278,12 +278,12 @@ static int teo_select(struct cpuidle_dri* into account, because it would be a mistake to select * a deeper state with lower "early hits" metric. The * index cannot be changed to point to it, however, so -* just increase the max count alone and let the index -* still point to a shallower idle state. +* just increase the "early hits" count alone and let +* the index still point to a shallower idle state. */ if (max_early_idx >=0 && - count < cpu_data->states[i].early_hits) - count = cpu_data->states[i].early_hits; + early_hits < cpu_data->states[i].early_hits) + early_hits = cpu_data->states[i].early_hits;continue ; }
@@ -299,10 +299,10 @@ static int teo_select(struct cpuidle_dri idx = i; -if (count < cpu_data->states[i].early_hits && +if (early_hits < cpu_data->states[i].early_hits && !(tick_nohz_tick_stopped () && drv->states[i].target_residency <TICK_USEC )) { - count = cpu_data->states[i].early_hits; + early_hits = cpu_data->states[i].early_hits; max_early_idx = i; } }
@@ -331,10 +331,9 @@ static int teo_select(struct cpuidle_driif (idx <0 ) { idx =0 ;/* No states enabled. Must use 0. */ }else if (idx >0 ) { +unsigned int count =0 ;u64 sum =0 ; - count =0 ; -/* * Count and sum the most recent idle duration values less than * the current expected idle duration value.
Greg Kroah-Hartman
maintainerPATCH 92/180 cpuidle: teo: Consider hits and misses metrics of disabled states
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit e43dcf20215f0287ea113102617ca04daa76b70e upstream.
The TEO governor uses idle duration "bins" defined in accordance with the CPU idle states table provided by the driver, so that each "bin" covers the idle duration range between the target residency of the idle state corresponding to it and the target residency of the closest deeper idle state. The governor collects statistics for each bin regardless of whether or not the idle state corresponding to it is currently enabled.
In particular, the "hits" and "misses" metrics measure the likelihood of a situation in which both the time till the next timer (sleep length) and the idle duration measured after wakeup fall into the given bin. Namely, if the "hits" value is greater than the "misses" one, that situation is more likely than the one in which the sleep length falls into the given bin, but the idle duration measured after wakeup falls into a bin corresponding to one of the shallower idle states.
If the idle state corresponding to the given bin is disabled, it cannot be selected and if it turns out to be the one that should be selected, a shallower idle state needs to be used instead of it. Nevertheless, the metrics collected for the bin corresponding to it are still valid and need to be taken into account as though that state had not been disabled.
For this reason, make teo_select() always use the "hits" and "misses" values of the idle duration range that the sleep length falls into even if the specific idle state corresponding to it is disabled and if the "hits" values is greater than the "misses" one, select the closest enabled shallower idle state in that case.
--- drivers/cpuidle/governors/teo.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
drivers/cpuidle/governors/teo.c +21 -4
@@ -241,7 +241,7 @@ static int teo_select(struct cpuidle_dri {struct teo_cpu *cpu_data =per_cpu_ptr (&teo_cpus, dev->cpu);int latency_req =cpuidle_governor_latency_req (dev->cpu); -unsigned int duration_us, early_hits; +unsigned int duration_us, hits, misses, early_hits;int max_early_idx, constraint_idx, idx, i;ktime_t delta_tick;
@@ -255,6 +255,8 @@ static int teo_select(struct cpuidle_dri cpu_data->sleep_length_ns =tick_nohz_get_sleep_length (&delta_tick); duration_us =ktime_to_us (cpu_data->sleep_length_ns); + hits =0 ; + misses =0 ; early_hits =0 ; max_early_idx =-1 ; constraint_idx = drv->state_count;
@@ -273,6 +275,17 @@ static int teo_select(struct cpuidle_dricontinue ;/* +* This state is disabled, so the range of idle duration +* values corresponding to it is covered by the current +* candidate state, but still the "hits" and "misses" +* metrics of the disabled state need to be used to +* decide whether or not the state covering the range in +* question is good enough. +*/ + hits = cpu_data->states[i].hits; + misses = cpu_data->states[i].misses; + +/* * If the "early hits" metric of a disabled state is * greater than the current maximum, it should be taken * into account, because it would be a mistake to select
@@ -288,8 +301,11 @@ static int teo_select(struct cpuidle_dricontinue ; } -if (idx <0 ) +if (idx <0 ) { idx = i;/* first enabled state */ + hits = cpu_data->states[i].hits; + misses = cpu_data->states[i].misses; + }if (s->target_residency > duration_us)break ;
@@ -298,6 +314,8 @@ static int teo_select(struct cpuidle_dri constraint_idx = i; idx = i; + hits = cpu_data->states[i].hits; + misses = cpu_data->states[i].misses; if (early_hits < cpu_data->states[i].early_hits && !(tick_nohz_tick_stopped() &&
@@ -315,8 +333,7 @@ static int teo_select(struct cpuidle_dri* "early hits" metric, but if that cannot be determined, just use the * state selected so far. */ -if (cpu_data->states[idx].hits <= cpu_data->states[idx].misses && - max_early_idx >=0 ) { +if (hits <= misses && max_early_idx >=0 ) { idx = max_early_idx; duration_us = drv->states[idx].target_residency; }
Greg Kroah-Hartman
maintainerPATCH 93/180 cpuidle: teo: Fix "early hits" handling for disabled idle states
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 159e48560f51d9c2aa02d762a18cd24f7868ab27 upstream.
The TEO governor uses idle duration "bins" defined in accordance with the CPU idle states table provided by the driver, so that each "bin" covers the idle duration range between the target residency of the idle state corresponding to it and the target residency of the closest deeper idle state. The governor collects statistics for each bin regardless of whether or not the idle state corresponding to it is currently enabled.
In particular, the "early hits" metric measures the likelihood of a situation in which the idle duration measured after wakeup falls into to given bin, but the time till the next timer (sleep length) falls into a bin corresponding to one of the deeper idle states. It is used when the "hits" and "misses" metrics indicate that the state "matching" the sleep length should not be selected, so that the state with the maximum "early hits" value is selected instead of it.
If the idle state corresponding to the given bin is disabled, it cannot be selected and if it turns out to be the one that should be selected, a shallower idle state needs to be used instead of it. Nevertheless, the metrics collected for the bin corresponding to it are still valid and need to be taken into account as though that state had not been disabled.
As far as the "early hits" metric is concerned, teo_select() tries to take disabled states into account, but the state index corresponding to the maximum "early hits" value computed by it may be incorrect. Namely, it always uses the index of the previous maximum "early hits" state then, but there may be enabled idle states closer to the disabled one in question. In particular, if the current candidate state (whose index is the idx value) is closer to the disabled one and the "early hits" value of the disabled state is greater than the current maximum, the index of the current candidate state (idx) should replace the "maximum early hits state" index.
Modify the code to handle that case correctly.
--- drivers/cpuidle/governors/teo.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)
drivers/cpuidle/governors/teo.c +26 -9
@@ -285,18 +285,35 @@ static int teo_select(struct cpuidle_dri hits = cpu_data->states[i].hits; misses = cpu_data->states[i].misses; +if (early_hits >= cpu_data->states[i].early_hits || + idx <0 ) +continue ; + +/* +* If the current candidate state has been the one with +* the maximum "early hits" metric so far, the "early +* hits" metric of the disabled state replaces the +* current "early hits" count to avoid selecting a +* deeper state with lower "early hits" metric. +*/ +if (max_early_idx == idx) { + early_hits = cpu_data->states[i].early_hits; +continue ; + } +/* -* If the "early hits" metric of a disabled state is -* greater than the current maximum, it should be taken -* into account, because it would be a mistake to select -* a deeper state with lower "early hits" metric. The -* index cannot be changed to point to it, however, so -* just increase the "early hits" count alone and let -* the index still point to a shallower idle state. +* The current candidate state is closer to the disabled +* one than the current maximum "early hits" state, so +* replace the latter with it, but in case the maximum +* "early hits" state index has not been set so far, +* check if the current candidate state is not too +* shallow for that role. */ -if (max_early_idx >=0 && - early_hits < cpu_data->states[i].early_hits) +if (!(tick_nohz_tick_stopped () && + drv->states[idx].target_residency <TICK_USEC )) { early_hits = cpu_data->states[i].early_hits; + max_early_idx = idx; + }continue ; }
Greg Kroah-Hartman
maintainerPATCH 94/180 erofs: zero out when listxattr is called with no xattr
In reply to Greg Kroah-HartmanFrom: Gao Xiang <[email protected]>
commit 926d1650176448d7684b991fbe1a5b1a8289e97c upstream.
As David reported [1], ENODATA returns when attempting to modify files by using EROFS as an overlayfs lower layer.
The root cause is that listxattr could return unexpected -ENODATA by mistake for inodes without xattr. That breaks listxattr return value convention and it can cause copy up failure when used with overlayfs.
Resolve by zeroing out if no xattr is found for listxattr.
[1] https://lore.kernel.org/r/CAEvUa7nxnby+rxK-KRMA46=exeOMApkDMAV08AjMkkPnTPV4CQ@mail.gmail.com
--- drivers/staging/erofs/xattr.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/erofs/xattr.c +2 -0
@@ -649,6 +649,8 @@ ssize_t erofs_listxattr(struct dentry *dstruct listxattr_iter it; ret =init_inode_xattrs (d_inode (dentry)); +if (ret == -ENOATTR ) +return 0 ;if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 95/180 powerpc/perf: Disable trace_imc pmu
In reply to Greg Kroah-HartmanFrom: Madhavan Srinivasan <[email protected]>
commit 249fad734a25889a4f23ed014d43634af6798063 upstream.
When a root user or a user with CAP_SYS_ADMIN privilege uses any trace_imc performance monitoring unit events, to monitor application or KVM threads, it may result in a checkstop (System crash).
The cause is frequent switching of the "trace/accumulation" mode of the In-Memory Collection hardware (LDBAR).
This patch disables the trace_imc PMU unit entirely to avoid triggering the checkstop. A future patch will reenable it at a later stage once a workaround has been developed.
--- arch/powerpc/platforms/powernv/opal-imc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/powerpc/platforms/powernv/opal-imc.c +8 -1
@@ -285,7 +285,14 @@ static int opal_imc_counters_probe(struc domain =IMC_DOMAIN_THREAD ;break ;case IMC_TYPE_TRACE : - domain =IMC_DOMAIN_TRACE ; +/* +* FIXME. Using trace_imc events to monitor application +* or KVM thread performance can cause a checkstop +* (system crash). +* Disable it for now. +*/ +pr_info_once ("IMC: disabling trace_imc PMU\n" ); + domain =-1 ;break ;default :pr_warn ("IMC Unknown Device type \n" );
Greg Kroah-Hartman
maintainerPATCH 96/180 intel_th: Fix a double put_device() in error path
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit 512592779a337feb5905d8fcf9498dbf33672d4a upstream.
Commit a753bfcfdb1f ("intel_th: Make the switch allocate its subdevices") factored out intel_th_subdevice_alloc() from intel_th_populate(), but got the error path wrong, resulting in two instances of a double put_device() on a freshly initialized, but not 'added' device.
Fix this by only doing one put_device() in the error path.
--- drivers/hwtracing/intel_th/core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/hwtracing/intel_th/core.c +2 -6
@@ -649,10 +649,8 @@ intel_th_subdevice_alloc(struct intel_th } err =intel_th_device_add_resources (thdev, res, subdev->nres); -if (err) { -put_device (&thdev->dev); +if (err) goto fail_put_device; - }if (subdev->type ==INTEL_TH_OUTPUT ) {if (subdev->mknode)
@@ -667,10 +665,8 @@ intel_th_subdevice_alloc(struct intel_th } err =device_add (&thdev->dev); -if (err) { -put_device (&thdev->dev); +if (err) goto fail_free_res; - }/* need switch driver to be loaded to enumerate the rest */ if (subdev->type ==INTEL_TH_SWITCH && !req) {
Greg Kroah-Hartman
maintainerPATCH 97/180 intel_th: pci: Add Ice Lake CPU support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit 6a1743422a7c0fda26764a544136cac13e5ae486 upstream.
This adds support for the Trace Hub in Ice Lake CPU.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -210,6 +210,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Ice Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8a29), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Tiger Lake PCH */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xa0a6 ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 98/180 intel_th: pci: Add Tiger Lake CPU support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit 6e6c18bcb78c0dc0601ebe216bed12c844492d0c upstream.
This adds support for the Trace Hub in Tiger Lake CPU.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -215,6 +215,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Tiger Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9a33), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Tiger Lake PCH */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0xa0a6 ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 99/180 PM / devfreq: Lock devfreq in trans_stat_show
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
commit 2abb0d5268ae7b5ddf82099b1f8d5aa8414637d4 upstream.
There is no locking in this sysfs show function so stats printing can race with a devfreq_update_status called as part of freq switching or with initialization.
Also add an assert in devfreq_update_status to make it clear that lock must be held by caller.
--- drivers/devfreq/devfreq.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/devfreq/devfreq.c +9 -3
@@ -160,6 +160,7 @@ int devfreq_update_status(struct devfreqint lev, prev_lev, ret =0 ;unsigned long cur_time; +lockdep_assert_held (&devfreq->lock); cur_time = jiffies;/* Immediately exit if previous_freq is not initialized yet. */
@@ -1397,12 +1398,17 @@ static ssize_t trans_stat_show(struct deint i, j;unsigned int max_state = devfreq->profile->max_state; -if (!devfreq->stop_polling && -devfreq_update_status (devfreq, devfreq->previous_freq)) -return 0 ;if (max_state ==0 )return sprintf (buf,"Not Supported.\n" ); +mutex_lock (&devfreq->lock); +if (!devfreq->stop_polling && +devfreq_update_status (devfreq, devfreq->previous_freq)) { +mutex_unlock (&devfreq->lock); +return 0 ; + } +mutex_unlock (&devfreq->lock); + len =sprintf (buf," From : To\n" ); len +=sprintf (buf + len," :" );for (i =0 ; i < max_state; i++)
Greg Kroah-Hartman
maintainerPATCH 100/180 cpufreq: powernv: fix stack bloat and hard limit on number of CPUs
In reply to Greg Kroah-HartmanFrom: John Hubbard <[email protected]>
commit db0d32d84031188443e25edbd50a71a6e7ac5d1d upstream.
The following build warning occurred on powerpc 64-bit builds:
drivers/cpufreq/powernv-cpufreq.c: In function 'init_chip_info':drivers/cpufreq/powernv-cpufreq.c:1070:1: warning: the frame size of 1040 bytes is larger than 1024 bytes [-Wframe-larger-than=]
This is with a cross-compiler based on gcc 8.1.0, which I got from:
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/
The warning is due to putting 1024 bytes on the stack:
unsigned int chip[256];
...and it's also undesirable to have a hard limit on the number of CPUs here.
Fix both problems by dynamically allocating based on num_possible_cpus, as recommended by Michael Ellerman.
--- drivers/cpufreq/powernv-cpufreq.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/cpufreq/powernv-cpufreq.c +13 -4
@@ -1041,9 +1041,14 @@ static struct cpufreq_driver powernv_cpustatic int init_chip_info (void ) { -unsigned int chip[256 ]; +unsigned int *chip;unsigned int cpu, i;unsigned int prev_chip_id =UINT_MAX ; +int ret =0 ; + + chip =kcalloc (num_possible_cpus (),sizeof (*chip),GFP_KERNEL ); +if (!chip) +return -ENOMEM ;for_each_possible_cpu (cpu) {unsigned int id =cpu_to_chip_id (cpu);
@@ -1055,8 +1060,10 @@ static int init_chip_info(void) } chips =kcalloc (nr_chips,sizeof (struct chip ),GFP_KERNEL ); -if (!chips) -return -ENOMEM ; +if (!chips) { + ret = -ENOMEM ; + goto free_and_return; + }for (i =0 ; i < nr_chips; i++) { chips[i].id = chip[i];
@@ -1066,7 +1073,9 @@ static int init_chip_info(void)per_cpu (chip_info, cpu) = &chips[i]; } -return 0 ; +free_and_return: +kfree (chip); +return ret; }static inline void clean_chip_info (void )
Greg Kroah-Hartman
maintainerPATCH 101/180 ALSA: fireface: fix return value in error path of isochronous resources reservation
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit 480136343cbe89426d6c2ab74ffb4e3ee572c7ee upstream.
Even if isochronous resources reservation fails, error code doesn't return in pcm.hw_params callback.
--- sound/firewire/fireface/ff-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/firewire/fireface/ff-pcm.c +1 -1
@@ -219,7 +219,7 @@ static int pcm_hw_params(struct snd_pcm_mutex_unlock (&ff->mutex); } -return 0 ; +return err; }static int pcm_hw_free (struct snd_pcm_substream *substream)
Greg Kroah-Hartman
maintainerPATCH 102/180 ALSA: oxfw: fix return value in error path of isochronous resources reservation
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit 59a126aa3113fc23f03fedcafe3705f1de5aff50 upstream.
Even if isochronous resources reservation fails, error code doesn't return in pcm.hw_params callback.
--- sound/firewire/oxfw/oxfw-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/firewire/oxfw/oxfw-pcm.c +1 -1
@@ -255,7 +255,7 @@ static int pcm_playback_hw_params(structmutex_unlock (&oxfw->mutex); } -return 0 ; +return err; }static int pcm_capture_hw_free (struct snd_pcm_substream *substream)
Greg Kroah-Hartman
maintainerPATCH 103/180 ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
commit a814dcc269830c9dbb8a83731cfc6fc5dd787f8d upstream.
We have a stub defined for the acpi_dev_get_first_match_dev() in acpi.h for the case when CONFIG_ACPI=n.
Moreover, acpi_dev_put(), counterpart function, is already placed under CONFIG_ACPI.
Thus, move acpi_dev_get_first_match_dev() under CONFIG_ACPI as well.
--- include/acpi/acpi_bus.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/acpi/acpi_bus.h +3 -3
@@ -78,9 +78,6 @@ acpi_evaluate_dsm_typed(acpi_handle handbool acpi_dev_found (const char *hid);bool acpi_dev_present (const char *hid,const char *uid,s64 hrv); -struct acpi_device * -acpi_dev_get_first_match_dev (const char *hid,const char *uid,s64 hrv); -#ifdef CONFIG_ACPI #include <linux/proc_fs.h>
@@ -683,6 +680,9 @@ static inline bool acpi_device_can_power adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set); } +struct acpi_device * +acpi_dev_get_first_match_dev (const char *hid,const char *uid,s64 hrv); +static inline void acpi_dev_put (struct acpi_device *adev) {put_device (&adev->dev);
Greg Kroah-Hartman
maintainerPATCH 104/180 ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit cc18735f208565343a9824adeca5305026598550 upstream.
So far on Bay Trail (BYT) we only have been adding a device_link adding the iGPU (LNXVIDEO) device as consumer for the I2C controller for the PMIC for I2C5, but the PMIC only uses I2C5 on BYT CR (cost reduced) on regular BYT platforms I2C7 is used and we were not adding the device_link sometimes causing resume ordering issues.
This commit adds LNXVIDEO -> BYT I2C7 to the lpss_device_links table, fixing this.
--- drivers/acpi/acpi_lpss.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/acpi/acpi_lpss.c +5 -0
@@ -473,9 +473,14 @@ struct lpss_device_links {* the supplier is not enumerated until after the consumer is probed. */ static const struct lpss_device_links lpss_device_links[] = { +/* CHT External sdcard slot controller depends on PMIC I2C ctrl */ {"808622C1" ,"7" ,"80860F14" ,"3" ,DL_FLAG_PM_RUNTIME }, +/* CHT iGPU depends on PMIC I2C controller */ {"808622C1" ,"7" ,"LNXVIDEO" ,NULL ,DL_FLAG_PM_RUNTIME }, +/* BYT CR iGPU depends on PMIC I2C controller (UID 5 on CR) */ {"80860F41" ,"5" ,"LNXVIDEO" ,NULL ,DL_FLAG_PM_RUNTIME }, +/* BYT iGPU depends on PMIC I2C controller (UID 7 on non CR) */ + {"80860F41" ,"7" ,"LNXVIDEO" ,NULL ,DL_FLAG_PM_RUNTIME }, }; static bool hid_uid_match(struct acpi_device *adev,
Greg Kroah-Hartman
maintainerPATCH 105/180 ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit b3b3519c04bdff91651d0a6deb79dbd4516b5d7b upstream.
Various Asus Bay Trail devices (T100TA, T100CHI, T200TA) have an embedded controller connected to I2C1 and the iGPU (LNXVIDEO) _PS0/_PS3 methods access it, so we need to add a consumer link from LNXVIDEO to I2C1 on these devices to avoid suspend/resume ordering problems.
--- drivers/acpi/acpi_lpss.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/acpi/acpi_lpss.c +2 -0
@@ -477,6 +477,8 @@ static const struct lpss_device_links lp {"808622C1", "7", "80860F14", "3", DL_FLAG_PM_RUNTIME},/* CHT iGPU depends on PMIC I2C controller */ {"808622C1", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME}, +/* BYT iGPU depends on the Embedded Controller I2C controller (UID 1) */ + {"80860F41", "1", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},/* BYT CR iGPU depends on PMIC I2C controller (UID 5 on CR) */ {"80860F41", "5", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME}, /* BYT iGPU depends on PMIC I2C controller (UID 7 on non CR) */
Greg Kroah-Hartman
maintainerPATCH 106/180 ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 6025e2fae3dde3c3d789d08f8ceacbdd9f90d471 upstream.
The iGPU / GFX0 device's _PS0 method on the ASUS T200TA depends on the I2C1 controller (which is connected to the embedded controller). But unlike in the T100TA/T100CHI this dependency is not listed in the _DEP of the GFX0 device.
This results in the dev_WARN_ONCE(..., "Transfer while suspended\n") call in i2c-designware-master.c triggering and the AML code not working as it should.
This commit fixes this by adding a dmi based quirk mechanism for devices which miss a _DEP, and adding a quirk for the LNXVIDEO depending on the I2C1 device on the Asus T200TA.
--- drivers/acpi/acpi_lpss.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/acpi/acpi_lpss.c +19 -3
@@ -10,6 +10,7 @@#include <linux/acpi.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> +#include <linux/dmi.h> #include <linux/err.h> #include <linux/io.h> #include <linux/mutex.h>
@@ -463,6 +464,18 @@ struct lpss_device_links {const char *consumer_hid;const char *consumer_uid;u32 flags; +const struct dmi_system_id *dep_missing_ids; +}; + +/* Please keep this list sorted alphabetically by vendor and model */ +static const struct dmi_system_id i2c1_dep_missing_dmi_ids[] = { + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"T200TA" ), + }, + }, + {} };/*
@@ -478,7 +491,8 @@ static const struct lpss_device_links lp/* CHT iGPU depends on PMIC I2C controller */ {"808622C1", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},/* BYT iGPU depends on the Embedded Controller I2C controller (UID 1) */ - {"80860F41", "1", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME}, + {"80860F41", "1", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME, + i2c1_dep_missing_dmi_ids},/* BYT CR iGPU depends on PMIC I2C controller (UID 5 on CR) */ {"80860F41", "5", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME}, /* BYT iGPU depends on PMIC I2C controller (UID 7 on non CR) */
@@ -577,7 +591,8 @@ static void acpi_lpss_link_consumer(struif (!dev2)return ; -if (acpi_lpss_dep (ACPI_COMPANION (dev2),ACPI_HANDLE (dev1))) +if ((link->dep_missing_ids &&dmi_check_system (link->dep_missing_ids)) + ||acpi_lpss_dep (ACPI_COMPANION (dev2),ACPI_HANDLE (dev1)))device_link_add (dev2, dev1, link->flags);put_device (dev2);
@@ -592,7 +607,8 @@ static void acpi_lpss_link_supplier(struif (!dev2)return ; -if (acpi_lpss_dep (ACPI_COMPANION (dev1),ACPI_HANDLE (dev2))) +if ((link->dep_missing_ids &&dmi_check_system (link->dep_missing_ids)) + ||acpi_lpss_dep (ACPI_COMPANION (dev1),ACPI_HANDLE (dev2)))device_link_add (dev1, dev2, link->flags);put_device (dev2);
Greg Kroah-Hartman
maintainerPATCH 107/180 ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit 77adf9355304f8dcf09054280af5e23fc451ab3d upstream.
Valerio and others reported that commit 84c8b58ed3ad ("ACPI / hotplug /
PCI: Don't scan bridges managed by native hotplug") prevents some recent LG and HP laptops from booting with endless loop of:
ACPI Error: No handler or method for GPE 08, disabling event (20190215/evgpe-835) ACPI Error: No handler or method for GPE 09, disabling event (20190215/evgpe-835) ACPI Error: No handler or method for GPE 0A, disabling event (20190215/evgpe-835)
...
What seems to happen is that during boot, after the initial PCI enumeration when EC is enabled the platform triggers ACPI Notify() to one of the root ports. The root port itself looks like this:
pci 0000:00:1b.0: PCI bridge to [bus 02-3a]
pci 0000:00:1b.0: bridge window [mem 0xc4000000-0xda0fffff]
pci 0000:00:1b.0: bridge window [mem 0x80000000-0xa1ffffff 64bit pref]
The BIOS has configured the root port so that it does not have I/O bridge window.
Now when the ACPI Notify() is triggered ACPI hotplug handler calls acpiphp_native_scan_bridge() for each non-hotplug bridge (as this system is using native PCIe hotplug) and pci_assign_unassigned_bridge_resources() to allocate resources.
The device connected to the root port is a PCIe switch (Thunderbolt controller) with two hotplug downstream ports. Because of the hotplug ports __pci_bus_size_bridges() tries to add "additional I/O" of 256 bytes to each (DEFAULT_HOTPLUG_IO_SIZE). This gets further aligned to 4k as that's the minimum I/O window size so each hotplug port gets 4k I/O window and the same happens for the root port (which is also hotplug port). This means 3 * 4k = 12k I/O window.
Because of this pci_assign_unassigned_bridge_resources() ends up opening a I/O bridge window for the root port at first available I/O address which seems to be in range 0x1000 - 0x3fff. Normally this range is used for ACPI stuff such as GPE bits (below is part of /proc/ioports):
1800-1803 : ACPI PM1a_EVT_BLK
1804-1805 : ACPI PM1a_CNT_BLK
1808-180b : ACPI PM_TMR
1810-1815 : ACPI CPU throttle
1850-1850 : ACPI PM2_CNT_BLK
1854-1857 : pnp 00:05
1860-187f : ACPI GPE0_BLKHowever, when the ACPI Notify() happened this range was not yet reserved for ACPI/PNP (that happens later) so PCI gets it. It then starts writing to this range and accidentally stomps over GPE bits among other things causing the endless stream of messages about missing GPE handler.
This problem does not happen if "pci=hpiosize=0" is passed in the kernel command line. The reason is that then the kernel does not try to allocate the additional 256 bytes for each hotplug port.
Fix this by allocating resources directly below the non-hotplug bridges where a new device may appear as a result of ACPI Notify(). This avoids the hotplug bridges and prevents opening the additional I/O window.
--- drivers/pci/hotplug/acpiphp_glue.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/pci/hotplug/acpiphp_glue.c +9 -3
@@ -449,8 +449,15 @@ static void acpiphp_native_scan_bridge(s/* Scan non-hotplug bridges that need to be reconfigured */ for_each_pci_bridge (dev, bus) { -if (!hotplug_is_native (dev)) - max =pci_scan_bridge (bus, dev, max,1 ); +if (hotplug_is_native (dev)) +continue ; + + max =pci_scan_bridge (bus, dev, max,1 ); +if (dev->subordinate) { +pcibios_resource_survey_bus (dev->subordinate); +pci_bus_size_bridges (dev->subordinate); +pci_bus_assign_resources (dev->subordinate); + } } }
@@ -480,7 +487,6 @@ static void enable_slot(struct acpiphp_sif (PCI_SLOT (dev->devfn) == slot->device)acpiphp_native_scan_bridge (dev); } -pci_assign_unassigned_bridge_resources (bus->self); }else {LIST_HEAD (add_list);int max, pass;
Greg Kroah-Hartman
maintainerPATCH 108/180 ACPI: OSL: only free map once in osl.c
In reply to Greg Kroah-HartmanFrom: Francesco Ruggeri <[email protected]>
commit 833a426cc471b6088011b3d67f1dc4e147614647 upstream.
acpi_os_map_cleanup checks map->refcount outside of acpi_ioremap_lock before freeing the map. This creates a race condition the can result in the map being freed more than once.
A panic can be caused by running
for ((i=0; i<10; i++))
do
for ((j=0; j<100000; j++))
do
cat /sys/firmware/acpi/tables/data/BERT >/dev/null
done &
done
This patch makes sure that only the process that drops the reference to 0 does the freeing.
--- drivers/acpi/osl.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
drivers/acpi/osl.c +17 -11
@@ -360,19 +360,21 @@ void *__ref acpi_os_map_memory(acpi_phys }EXPORT_SYMBOL_GPL (acpi_os_map_memory); -static void acpi_os_drop_map_ref (struct acpi_ioremap *map) +/* Must be called with mutex_lock(&acpi_ioremap_lock) */ +static unsigned long acpi_os_drop_map_ref (struct acpi_ioremap *map) { -if (!--map->refcount) +unsigned long refcount = --map->refcount; + +if (!refcount)list_del_rcu (&map->list); +return refcount; }static void acpi_os_map_cleanup (struct acpi_ioremap *map) { -if (!map->refcount) { -synchronize_rcu_expedited (); -acpi_unmap (map->phys, map->virt); -kfree (map); - } +synchronize_rcu_expedited (); +acpi_unmap (map->phys, map->virt); +kfree (map); }/**
@@ -392,6 +394,7 @@ static void acpi_os_map_cleanup(struct avoid __ref acpi_os_unmap_iomem (void __iomem *virt,acpi_size size) {struct acpi_ioremap *map; +unsigned long refcount;if (!acpi_permanent_mmap) {__acpi_unmap_table (virt, size);
@@ -405,10 +408,11 @@ void __ref acpi_os_unmap_iomem(void __ioWARN (true,PREFIX "%s: bad address %p\n" , __func__, virt);return ; } -acpi_os_drop_map_ref (map); + refcount =acpi_os_drop_map_ref (map);mutex_unlock (&acpi_ioremap_lock); -acpi_os_map_cleanup (map); +if (!refcount) +acpi_os_map_cleanup (map); }EXPORT_SYMBOL_GPL (acpi_os_unmap_iomem);
@@ -443,6 +447,7 @@ void acpi_os_unmap_generic_address(struc {u64 addr;struct acpi_ioremap *map; +unsigned long refcount;if (gas->space_id !=ACPI_ADR_SPACE_SYSTEM_MEMORY )return ;
@@ -458,10 +463,11 @@ void acpi_os_unmap_generic_address(strucmutex_unlock (&acpi_ioremap_lock);return ; } -acpi_os_drop_map_ref (map); + refcount =acpi_os_drop_map_ref (map);mutex_unlock (&acpi_ioremap_lock); -acpi_os_map_cleanup (map); +if (!refcount) +acpi_os_map_cleanup (map); }EXPORT_SYMBOL (acpi_os_unmap_generic_address);
Greg Kroah-Hartman
maintainerPATCH 109/180 ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data()
In reply to Greg Kroah-HartmanFrom: Vamshi K Sthambamkadi <[email protected]>
commit 627ead724eff33673597216f5020b72118827de4 upstream.
kmemleak reported backtrace:
[<bbee0454>] kmem_cache_alloc_trace+0x128/0x260
[<6677f215>] i2c_acpi_install_space_handler+0x4b/0xe0
[<1180f4fc>] i2c_register_adapter+0x186/0x400
[<6083baf7>] i2c_add_adapter+0x4e/0x70
[<a3ddf966>] intel_gmbus_setup+0x1a2/0x2c0 [i915]
[<84cb69ae>] i915_driver_probe+0x8d8/0x13a0 [i915]
[<81911d4b>] i915_pci_probe+0x48/0x160 [i915]
[<4b159af1>] pci_device_probe+0xdc/0x160
[<b3c64704>] really_probe+0x1ee/0x450
[<bc029f5a>] driver_probe_device+0x142/0x1b0
[<d8829d20>] device_driver_attach+0x49/0x50
[<de71f045>] __driver_attach+0xc9/0x150
[<df33ac83>] bus_for_each_dev+0x56/0xa0
[<80089bba>] driver_attach+0x19/0x20
[<cc73f583>] bus_add_driver+0x177/0x220
[<7b29d8c7>] driver_register+0x56/0xf0In i2c_acpi_remove_space_handler(), a leak occurs whenever the "data" parameter is initialized to 0 before being passed to acpi_bus_get_private_data().
This is because the NULL pointer check in acpi_bus_get_private_data() (condition->if(!*data)) returns EINVAL and, in consequence, memory is never freed in i2c_acpi_remove_space_handler().
Fix the NULL pointer check in acpi_bus_get_private_data() to follow the analogous check in acpi_get_data_full().
--- drivers/acpi/bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/bus.c +1 -1
@@ -153,7 +153,7 @@ int acpi_bus_get_private_data(acpi_handl {acpi_status status; -if (!*data) +if (!data)return -EINVAL ; status =acpi_get_data (handle, acpi_bus_private_data_handler, data);
Greg Kroah-Hartman
maintainerPATCH 110/180 ACPI: PM: Avoid attaching ACPI PM domain to certain devices
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit b9ea0bae260f6aae546db224daa6ac1bd9d94b91 upstream.
Certain ACPI-enumerated devices represented as platform devices in Linux, like fans, require special low-level power management handling implemented by their drivers that is not in agreement with the ACPI PM domain behavior. That leads to problems with managing ACPI fans during system-wide suspend and resume.
For this reason, make acpi_dev_pm_attach() skip the affected devices by adding a list of device IDs to avoid to it and putting the IDs of the affected devices into that list.
--- drivers/acpi/device_pm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/acpi/device_pm.c +11 -1
@@ -1309,9 +1309,19 @@ static void acpi_dev_pm_detach(struct de*/ int acpi_dev_pm_attach (struct device *dev,bool power_on) { +/* +* Skip devices whose ACPI companions match the device IDs below, +* because they require special power management handling incompatible +* with the generic ACPI PM domain. +*/ +static const struct acpi_device_id special_pm_ids[] = { + {"PNP0C0B" , },/* Generic ACPI fan */ + {"INT3404" , },/* Fan */ + {} + };struct acpi_device *adev =ACPI_COMPANION (dev); -if (!adev) +if (!adev || !acpi_match_device_ids (adev, special_pm_ids))return 0 ;/*
Greg Kroah-Hartman
maintainerPATCH 111/180 pinctrl: rza2: Fix gpio name typos
In reply to Greg Kroah-HartmanFrom: Chris Brandt <[email protected]>
commit 930d3a4907ae6cdb476db23fc7caa86e9de1e557 upstream.
Fix apparent copy/paste errors that were overlooked in the original driver.
"P0_4" -> "PF_4"
"P0_3" -> "PG_3"
--- drivers/pinctrl/pinctrl-rza2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-rza2.c +2 -2
@@ -212,8 +212,8 @@ static const char * const rza2_gpio_name"PC_0" ,"PC_1" ,"PC_2" ,"PC_3" ,"PC_4" ,"PC_5" ,"PC_6" ,"PC_7" ,"PD_0" ,"PD_1" ,"PD_2" ,"PD_3" ,"PD_4" ,"PD_5" ,"PD_6" ,"PD_7" ,"PE_0" ,"PE_1" ,"PE_2" ,"PE_3" ,"PE_4" ,"PE_5" ,"PE_6" ,"PE_7" , -"PF_0" ,"PF_1" ,"PF_2" ,"PF_3" ,"P0_4" ,"PF_5" ,"PF_6" ,"PF_7" , -"PG_0" ,"PG_1" ,"PG_2" ,"P0_3" ,"PG_4" ,"PG_5" ,"PG_6" ,"PG_7" , +"PF_0" ,"PF_1" ,"PF_2" ,"PF_3" ,"PF_4" ,"PF_5" ,"PF_6" ,"PF_7" , +"PG_0" ,"PG_1" ,"PG_2" ,"PG_3" ,"PG_4" ,"PG_5" ,"PG_6" ,"PG_7" ,"PH_0" ,"PH_1" ,"PH_2" ,"PH_3" ,"PH_4" ,"PH_5" ,"PH_6" ,"PH_7" ,/* port I does not exist */ "PJ_0", "PJ_1", "PJ_2", "PJ_3", "PJ_4", "PJ_5", "PJ_6", "PJ_7",
Greg Kroah-Hartman
maintainerPATCH 112/180 pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type()
In reply to Greg Kroah-HartmanFrom: Gregory CLEMENT <[email protected]>
commit 04fb02757ae5188031eb71b2f6f189edb1caf5dc upstream.
As explained in the following commit a9a1a4833613 ("pinctrl:
armada-37xx: Fix gpio interrupt setup") the armada_37xx_irq_set_type() function can be called before the initialization of the mask field.
That means that we can't use this field in this function and need to workaround it using hwirq.
--- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +3 -3
@@ -595,10 +595,10 @@ static int armada_37xx_irq_set_type(struregmap_read (info->regmap, in_reg, &in_val);/* Set initial polarity based on current input level. */ -if (in_val & d->mask) - val |= d->mask;/* falling */ +if (in_val &BIT (d->hwirq %GPIO_PER_REG )) + val |=BIT (d->hwirq %GPIO_PER_REG );/* falling */ else - val &= ~d->mask;/* rising */ + val &= ~(BIT (d->hwirq %GPIO_PER_REG ));/* rising */ break ; }default :
Greg Kroah-Hartman
maintainerPATCH 113/180 pinctrl: samsung: Add of_node_put() before return in error path
In reply to Greg Kroah-HartmanFrom: Nishka Dasgupta <[email protected]>
commit 3d2557ab75d4c568c79eefa2e550e0d80348a6bd upstream.
Each iteration of for_each_child_of_node puts the previous node, but in the case of a return from the middle of the loop, there is no put, thus causing a memory leak. Hence add an of_node_put before the return of exynos_eint_wkup_init() error path.
Issue found with Coccinelle.
--- drivers/pinctrl/samsung/pinctrl-exynos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pinctrl/samsung/pinctrl-exynos.c +3 -1
@@ -486,8 +486,10 @@ int exynos_eint_wkup_init(struct samsungif (match) { irq_chip =kmemdup (match->data,sizeof (*irq_chip),GFP_KERNEL ); -if (!irq_chip) +if (!irq_chip) { +of_node_put (np);return -ENOMEM ; + } wkup_np = np;break ; }
Greg Kroah-Hartman
maintainerPATCH 114/180 pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 5c7f48dd14e892e3e920dd6bbbd52df79e1b3b41 upstream.
In exynos_eint_wkup_init() the for_each_child_of_node() loop is used with a break to find a matching child node. Although each iteration of for_each_child_of_node puts the previous node, but early exit from loop misses it. This leads to leak of device node.
--- drivers/pinctrl/samsung/pinctrl-exynos.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pinctrl/samsung/pinctrl-exynos.c +8 -2
@@ -506,6 +506,7 @@ int exynos_eint_wkup_init(struct samsung bank->nr_pins, &exynos_eint_irqd_ops, bank);if (!bank->irq_domain) {dev_err (dev,"wkup irq domain add failed\n" ); +of_node_put (wkup_np);return -ENXIO ; }
@@ -520,8 +521,10 @@ int exynos_eint_wkup_init(struct samsung weint_data =devm_kcalloc (dev, bank->nr_pins,sizeof (*weint_data),GFP_KERNEL ); -if (!weint_data) +if (!weint_data) { +of_node_put (wkup_np);return -ENOMEM ; + }for (idx =0 ; idx < bank->nr_pins; ++idx) { irq =irq_of_parse_and_map (bank->of_node, idx);
@@ -538,10 +541,13 @@ int exynos_eint_wkup_init(struct samsung } } -if (!muxed_banks) +if (!muxed_banks) { +of_node_put (wkup_np);return 0 ; + } irq =irq_of_parse_and_map (wkup_np,0 ); +of_node_put (wkup_np);if (!irq) {dev_err (dev,"irq number for muxed EINTs not found\n" );return 0 ;
Greg Kroah-Hartman
maintainerPATCH 115/180 pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 6fbbcb050802d6ea109f387e961b1dbcc3a80c96 upstream.
In s3c24xx_eint_init() the for_each_child_of_node() loop is used with a break to find a matching child node. Although each iteration of for_each_child_of_node puts the previous node, but early exit from loop misses it. This leads to leak of device node.
--- drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pinctrl/samsung/pinctrl-s3c24xx.c +5 -1
@@ -490,8 +490,10 @@ static int s3c24xx_eint_init(struct samsreturn -ENODEV ; eint_data =devm_kzalloc (dev,sizeof (*eint_data),GFP_KERNEL ); -if (!eint_data) +if (!eint_data) { +of_node_put (eint_np);return -ENOMEM ; + } eint_data->drvdata = d;
@@ -503,12 +505,14 @@ static int s3c24xx_eint_init(struct sams irq =irq_of_parse_and_map (eint_np, i);if (!irq) {dev_err (dev,"failed to get wakeup EINT IRQ %d\n" , i); +of_node_put (eint_np);return -ENXIO ; } eint_data->parents[i] = irq;irq_set_chained_handler_and_data (irq, handlers[i], eint_data); } +of_node_put (eint_np); bank = d->pin_banks;for (i =0 ; i < d->nr_banks; ++i, ++bank) {
Greg Kroah-Hartman
maintainerPATCH 116/180 pinctrl: samsung: Fix device node refcount leaks in init code
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit a322b3377f4bac32aa25fb1acb9e7afbbbbd0137 upstream.
Several functions use for_each_child_of_node() loop with a break to find a matching child node. Although each iteration of for_each_child_of_node puts the previous node, but early exit from loop misses it. This leads to leak of device node.
--- drivers/pinctrl/samsung/pinctrl-samsung.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pinctrl/samsung/pinctrl-samsung.c +8 -2
@@ -272,6 +272,7 @@ static int samsung_dt_node_to_map(struct &reserved_maps, num_maps);if (ret <0 ) {samsung_dt_free_map (pctldev, *map, *num_maps); +of_node_put (np);return ret; } }
@@ -785,8 +786,10 @@ static struct samsung_pmx_func *samsung_if (!of_get_child_count (cfg_np)) { ret =samsung_pinctrl_create_function (dev, drvdata, cfg_np, func); -if (ret <0 ) +if (ret <0 ) { +of_node_put (cfg_np);return ERR_PTR (ret); + }if (ret >0 ) { ++func; ++func_cnt;
@@ -797,8 +800,11 @@ static struct samsung_pmx_func *samsung_for_each_child_of_node (cfg_np, func_np) { ret =samsung_pinctrl_create_function (dev, drvdata, func_np, func); -if (ret <0 ) +if (ret <0 ) { +of_node_put (func_np); +of_node_put (cfg_np);return ERR_PTR (ret); + }if (ret >0 ) { ++func; ++func_cnt;
Greg Kroah-Hartman
maintainerPATCH 117/180 pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 7f028caadf6c37580d0f59c6c094ed09afc04062 upstream.
In s3c64xx_eint_eint0_init() the for_each_child_of_node() loop is used with a break to find a matching child node. Although each iteration of for_each_child_of_node puts the previous node, but early exit from loop misses it. This leads to leak of device node.
--- drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pinctrl/samsung/pinctrl-s3c64xx.c +5 -1
@@ -704,8 +704,10 @@ static int s3c64xx_eint_eint0_init(strucreturn -ENODEV ; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL ); -if (!data) +if (!data) { +of_node_put (eint0_np);return -ENOMEM ; + } data->drvdata = d;for (i =0 ; i <NUM_EINT0_IRQ ; ++i) {
@@ -714,6 +716,7 @@ static int s3c64xx_eint_eint0_init(struc irq =irq_of_parse_and_map (eint0_np, i);if (!irq) {dev_err (dev,"failed to get wakeup EINT IRQ %d\n" , i); +of_node_put (eint0_np);return -ENXIO ; }
@@ -721,6 +724,7 @@ static int s3c64xx_eint_eint0_init(struc s3c64xx_eint0_handlers[i], data); } +of_node_put (eint0_np); bank = d->pin_banks;for (i =0 ; i < d->nr_banks; ++i, ++bank) {
Greg Kroah-Hartman
maintainerPATCH 118/180 mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
commit f6498b922e57aecbe3b7fa30a308d9d586c0c369 upstream.
Pandora_wl1251_init_card was used to do special pdata based setup of the sdio mmc interface. This does no longer work with v4.7 and later. A fix requires a device tree based mmc3 setup.
Therefore we move the special setup to omap_hsmmc.c instead of calling some pdata supplied init_card function.
The new code checks for a DT child node compatible to wl1251 so it will not affect other MMC3 use cases.
Generally, this code was and still is a hack and should be moved to mmc core to e.g. read such properties from optional DT child nodes.
--- drivers/mmc/host/omap_hsmmc.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/mmc/host/omap_hsmmc.c +30 -0
@@ -1512,6 +1512,36 @@ static void omap_hsmmc_init_card(structif (mmc_pdata (host)->init_card)mmc_pdata (host)->init_card (card); +else if (card->type ==MMC_TYPE_SDIO || + card->type ==MMC_TYPE_SD_COMBO ) { +struct device_node *np =mmc_dev (mmc)->of_node; + +/* +* REVISIT: should be moved to sdio core and made more +* general e.g. by expanding the DT bindings of child nodes +* to provide a mechanism to provide this information: +* Documentation/devicetree/bindings/mmc/mmc-card.txt +*/ + + np =of_get_compatible_child (np,"ti,wl1251" ); +if (np) { +/* +* We have TI wl1251 attached to MMC3. Pass this +* information to the SDIO core because it can't be +* probed by normal methods. +*/ + +dev_info (host->dev,"found wl1251\n" ); + card->quirks |=MMC_QUIRK_NONSTD_SDIO ; + card->cccr.wide_bus =1 ; + card->cis.vendor =0x104c ; + card->cis.device =0x9066 ; + card->cis.blksize =512 ; + card->cis.max_dtr =24000000 ; + card->ocr =0x80 ; +of_node_put (np); + } + } }static void omap_hsmmc_enable_sdio_irq (struct mmc_host *mmc,int enable)
Greg Kroah-Hartman
maintainerPATCH 119/180 ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity
In reply to Greg Kroah-HartmanFrom: Jarkko Nikula <[email protected]>
commit 287897f9aaa2ad1c923d9875914f57c4dc9159c8 upstream.
The MMC card detection GPIO polarity is active low on TAO3530, like in many other similar boards. Now the card is not detected and it is unable to mount rootfs from an SD card.
Fix this by using the correct polarity.
This incorrect polarity was defined already in the commit 30d95c6d7092 ("ARM: dts: omap3: Add Technexion TAO3530 SOM omap3-tao3530.dtsi") in v3.18 kernel and later changed to use defined GPIO constants in v4.4 kernel by the commit 3a637e008e54 ("ARM: dts: Use defined GPIO constants in flags cell for OMAP2+ boards").
While the latter commit did not introduce the issue I'm marking it with Fixes tag due the v4.4 kernels still being maintained.
--- arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3-tao3530.dtsi +1 -1
@@ -222,7 +222,7 @@ pinctrl-0 = <&mmc1_pins>; vmmc-supply = <&vmmc1>; vqmmc-supply = <&vsim>; - cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>; + cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>; bus-width = <8>; };
Greg Kroah-Hartman
maintainerPATCH 120/180 RDMA/core: Fix ib_dma_max_seg_size()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
commit ecdfdfdbe4d4c74029f2b416b7ee6d0aeb56364a upstream.
If dev->dma_device->params == NULL then the maximum DMA segment size is 64 KB. See also the dma_get_max_seg_size() implementation. This patch fixes the following kernel warning:
DMA-API: infiniband rxe0: mapping sg segment longer than device claims to support [len=126976] [max=65536]
WARNING: CPU: 4 PID: 4848 at kernel/dma/debug.c:1220 debug_dma_map_sg+0x3d9/0x450 RIP: 0010:debug_dma_map_sg+0x3d9/0x450 Call Trace: srp_queuecommand+0x626/0x18d0 [ib_srp] scsi_queue_rq+0xd02/0x13e0 [scsi_mod] __blk_mq_try_issue_directly+0x2b3/0x3f0 blk_mq_request_issue_directly+0xac/0xf0 blk_insert_cloned_request+0xdf/0x170 dm_mq_queue_rq+0x43d/0x830 [dm_mod] __blk_mq_try_issue_directly+0x2b3/0x3f0 blk_mq_request_issue_directly+0xac/0xf0 blk_mq_try_issue_list_directly+0xb8/0x170 blk_mq_sched_insert_requests+0x23c/0x3b0 blk_mq_flush_plug_list+0x529/0x730 blk_flush_plug_list+0x21f/0x260 blk_mq_make_request+0x56b/0xf20 generic_make_request+0x196/0x660 submit_bio+0xae/0x290 blkdev_direct_IO+0x822/0x900 generic_file_direct_write+0x110/0x200 __generic_file_write_iter+0x124/0x2a0 blkdev_write_iter+0x168/0x270 aio_write+0x1c4/0x310 io_submit_one+0x971/0x1390 __x64_sys_io_submit+0x12a/0x390 do_syscall_64+0x6f/0x2e0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- include/rdma/ib_verbs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/rdma/ib_verbs.h +1 -3
@@ -3978,9 +3978,7 @@ static inline void ib_dma_unmap_sg_attrs*/ static inline unsigned int ib_dma_max_seg_size (struct ib_device *dev) { -struct device_dma_parameters *p = dev->dma_device->dma_parms; - -return p ? p->max_segment_size :UINT_MAX ; +return dma_get_max_seg_size (dev->dma_device); }/**
Greg Kroah-Hartman
maintainerPATCH 121/180 ppdev: fix PPGETTIME/PPSETTIME ioctls
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 998174042da229e2cf5841f574aba4a743e69650 upstream.
Going through the uses of timeval in the user space API, I noticed two bugs in ppdev that were introduced in the y2038 conversion:
* The range check was accidentally moved from ppsettime to ppgettime
* On sparc64, the microseconds are in the other half of the 64-bit word.
Fix both, and mark the fix for stable backports.
--- drivers/char/ppdev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/char/ppdev.c +12 -4
@@ -619,20 +619,27 @@ static int pp_do_ioctl(struct file *fileif (copy_from_user (time32, argp,sizeof (time32)))return -EFAULT ; +if ((time32[0 ] <0 ) || (time32[1 ] <0 )) +return -EINVAL ; +return pp_set_timeout (pp->pdev, time32[0 ], time32[1 ]);case PPSETTIME64 :if (copy_from_user (time64, argp,sizeof (time64)))return -EFAULT ; +if ((time64[0 ] <0 ) || (time64[1 ] <0 )) +return -EINVAL ; + +if (IS_ENABLED (CONFIG_SPARC64 ) && !in_compat_syscall ()) + time64[1 ] >>=32 ; +return pp_set_timeout (pp->pdev, time64[0 ], time64[1 ]);case PPGETTIME32 :jiffies_to_timespec64 (pp->pdev->timeout, &ts); time32[0 ] = ts.tv_sec; time32[1 ] = ts.tv_nsec /NSEC_PER_USEC ; -if ((time32[0 ] <0 ) || (time32[1 ] <0 )) -return -EINVAL ;if (copy_to_user (argp, time32,sizeof (time32)))return -EFAULT ;
@@ -643,8 +650,9 @@ static int pp_do_ioctl(struct file *filejiffies_to_timespec64 (pp->pdev->timeout, &ts); time64[0 ] = ts.tv_sec; time64[1 ] = ts.tv_nsec /NSEC_PER_USEC ; -if ((time64[0 ] <0 ) || (time64[1 ] <0 )) -return -EINVAL ; + +if (IS_ENABLED (CONFIG_SPARC64 ) && !in_compat_syscall ()) + time64[1 ] <<=32 ;if (copy_to_user (argp, time64,sizeof (time64)))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 122/180 stm class: Lose the protocol driver when dropping its reference
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit 0a8f72fafb3f72a08df4ee491fcbeaafd6de85fd upstream.
Commit c7fd62bc69d02 ("stm class: Introduce framing protocol drivers") forgot to tear down the link between an stm device and its protocol driver when policy is removed. This leads to an invalid pointer reference if one tries to write to an stm device after the policy has been removed and the protocol driver module unloaded, leading to the below splat:
Quoted 7 lines
BUG: unable to handle page fault for address: ffffffffc0737068 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 3d780f067 P4D 3d780f067 PUD 3d7811067 PMD 492781067 PTE 0 Oops: 0000 [#1] SMP NOPTI CPU: 1 PID: 26122 Comm: cat Not tainted 5.4.0-rc5+ #1 RIP: 0010:stm_output_free+0x40/0xc0 [stm_core]
Quoted 8 lines
Call Trace: stm_char_release+0x3e/0x70 [stm_core] __fput+0xc6/0x260 ____fput+0xe/0x10 task_work_run+0x9d/0xc0 exit_to_usermode_loop+0x103/0x110 do_syscall_64+0x19d/0x1e0 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Fix this by tearing down the link from an stm device to its protocol driver when the policy involving that driver is removed.
--- drivers/hwtracing/stm/policy.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/hwtracing/stm/policy.c +4 -0
@@ -345,7 +345,11 @@ void stp_policy_unbind(struct stp_policy stm->policy =NULL ; policy->stm =NULL ; +/* +* Drop the reference on the protocol driver and lose the link. +*/ stm_put_protocol (stm->pdrv); + stm->pdrv =NULL ;stm_put_device (stm); }
Greg Kroah-Hartman
maintainerPATCH 123/180 coresight: Serialize enabling/disabling a link device.
In reply to Greg Kroah-HartmanFrom: Yabin Cui <[email protected]>
commit edda32dabedb01f98b9d7b9a4492c13357834bbe upstream.
When tracing etm data of multiple threads on multiple cpus through perf interface, some link devices are shared between paths of different cpus. It creates race conditions when different cpus wants to enable/disable the same link device at the same time.
Example 1:
Two cpus want to enable different ports of a coresight funnel, thus calling the funnel enable operation at the same time. But the funnel enable operation isn't reentrantable.
Example 2:
For an enabled coresight dynamic replicator with refcnt=1, one cpu wants to disable it, while another cpu wants to enable it. Ideally we still have an enabled replicator with refcnt=1 at the end. But in reality the result is uncertain.
Since coresight devices claim themselves when enabled for self-hosted usage, the race conditions above usually make the link devices not usable after many cycles.
To fix the race conditions, this patch uses spinlocks to serialize enabling/disabling link devices.
--- drivers/hwtracing/coresight/coresight-funnel.c | 32 +++++++++++--- drivers/hwtracing/coresight/coresight-replicator.c | 33 ++++++++++++-- drivers/hwtracing/coresight/coresight-tmc-etf.c | 26 ++++++++--- drivers/hwtracing/coresight/coresight.c | 47 ++++++--------------- 4 files changed, 88 insertions(+), 50 deletions(-)
drivers/hwtracing/coresight/coresight-funnel.c +26 -6
@@ -37,12 +37,14 @@ DEFINE_CORESIGHT_DEVLIST(funnel_devs, "f* @atclk: optional clock for the core parts of the funnel. * @csdev: component vitals needed by the framework. * @priority: port selection order. +* @spinlock: serialize enable/disable operations. */ struct funnel_drvdata {void __iomem *base;struct clk *atclk;struct coresight_device *csdev;unsigned long priority; +spinlock_t spinlock; };static int dynamic_funnel_enable_hw (struct funnel_drvdata *drvdata,int port)
@@ -75,11 +77,21 @@ static int funnel_enable(struct coresigh {int rc =0 ;struct funnel_drvdata *drvdata =dev_get_drvdata (csdev->dev.parent); +unsigned long flags; +bool first_enable = false; -if (drvdata->base) - rc =dynamic_funnel_enable_hw (drvdata, inport); - +spin_lock_irqsave (&drvdata->spinlock, flags); +if (atomic_read (&csdev->refcnt[inport]) ==0 ) { +if (drvdata->base) + rc =dynamic_funnel_enable_hw (drvdata, inport); +if (!rc) + first_enable = true; + }if (!rc) +atomic_inc (&csdev->refcnt[inport]); +spin_unlock_irqrestore (&drvdata->spinlock, flags); + +if (first_enable)dev_dbg (&csdev->dev,"FUNNEL inport %d enabled\n" , inport);return rc; }
@@ -106,11 +118,19 @@ static void funnel_disable(struct coresi int outport) {struct funnel_drvdata *drvdata =dev_get_drvdata (csdev->dev.parent); +unsigned long flags; +bool last_disable = false; -if (drvdata->base) -dynamic_funnel_disable_hw (drvdata, inport); +spin_lock_irqsave (&drvdata->spinlock, flags); +if (atomic_dec_return (&csdev->refcnt[inport]) ==0 ) { +if (drvdata->base) +dynamic_funnel_disable_hw (drvdata, inport); + last_disable = true; + } +spin_unlock_irqrestore (&drvdata->spinlock, flags); -dev_dbg (&csdev->dev,"FUNNEL inport %d disabled\n" , inport); +if (last_disable) +dev_dbg (&csdev->dev,"FUNNEL inport %d disabled\n" , inport); }static const struct coresight_ops_link funnel_link_ops = {
drivers/hwtracing/coresight/coresight-replicator.c +28 -5
@@ -31,11 +31,13 @@ DEFINE_CORESIGHT_DEVLIST(replicator_devs* whether this one is programmable or not. * @atclk: optional clock for the core parts of the replicator. * @csdev: component vitals needed by the framework +* @spinlock: serialize enable/disable operations. */ struct replicator_drvdata {void __iomem *base;struct clk *atclk;struct coresight_device *csdev; +spinlock_t spinlock; };static void dynamic_replicator_reset (struct replicator_drvdata *drvdata)
@@ -97,10 +99,22 @@ static int replicator_enable(struct core {int rc =0 ;struct replicator_drvdata *drvdata =dev_get_drvdata (csdev->dev.parent); +unsigned long flags; +bool first_enable = false; -if (drvdata->base) - rc =dynamic_replicator_enable (drvdata, inport, outport); +spin_lock_irqsave (&drvdata->spinlock, flags); +if (atomic_read (&csdev->refcnt[outport]) ==0 ) { +if (drvdata->base) + rc =dynamic_replicator_enable (drvdata, inport, + outport); +if (!rc) + first_enable = true; + }if (!rc) +atomic_inc (&csdev->refcnt[outport]); +spin_unlock_irqrestore (&drvdata->spinlock, flags); + +if (first_enable)dev_dbg (&csdev->dev,"REPLICATOR enabled\n" );return rc; }
@@ -137,10 +151,19 @@ static void replicator_disable(struct co int outport) {struct replicator_drvdata *drvdata =dev_get_drvdata (csdev->dev.parent); +unsigned long flags; +bool last_disable = false; -if (drvdata->base) -dynamic_replicator_disable (drvdata, inport, outport); -dev_dbg (&csdev->dev,"REPLICATOR disabled\n" ); +spin_lock_irqsave (&drvdata->spinlock, flags); +if (atomic_dec_return (&csdev->refcnt[outport]) ==0 ) { +if (drvdata->base) +dynamic_replicator_disable (drvdata, inport, outport); + last_disable = true; + } +spin_unlock_irqrestore (&drvdata->spinlock, flags); + +if (last_disable) +dev_dbg (&csdev->dev,"REPLICATOR disabled\n" ); }static const struct coresight_ops_link replicator_link_ops = {
drivers/hwtracing/coresight/coresight-tmc-etf.c +19 -7
@@ -334,9 +334,10 @@ static int tmc_disable_etf_sink(struct cstatic int tmc_enable_etf_link (struct coresight_device *csdev,int inport,int outport) { -int ret; +int ret =0 ;unsigned long flags;struct tmc_drvdata *drvdata =dev_get_drvdata (csdev->dev.parent); +bool first_enable = false;spin_lock_irqsave (&drvdata->spinlock, flags);if (drvdata->reading) {
@@ -344,12 +345,18 @@ static int tmc_enable_etf_link(struct coreturn -EBUSY ; } - ret =tmc_etf_enable_hw (drvdata); +if (atomic_read (&csdev->refcnt[0 ]) ==0 ) { + ret =tmc_etf_enable_hw (drvdata); +if (!ret) { + drvdata->mode =CS_MODE_SYSFS ; + first_enable = true; + } + }if (!ret) - drvdata->mode =CS_MODE_SYSFS ; +atomic_inc (&csdev->refcnt[0 ]);spin_unlock_irqrestore (&drvdata->spinlock, flags); -if (!ret) +if (first_enable)dev_dbg (&csdev->dev,"TMC-ETF enabled\n" );return ret; }
@@ -359,6 +366,7 @@ static void tmc_disable_etf_link(struct {unsigned long flags;struct tmc_drvdata *drvdata =dev_get_drvdata (csdev->dev.parent); +bool last_disable = false;spin_lock_irqsave (&drvdata->spinlock, flags);if (drvdata->reading) {
@@ -366,11 +374,15 @@ static void tmc_disable_etf_link(structreturn ; } -tmc_etf_disable_hw (drvdata); - drvdata->mode =CS_MODE_DISABLED ; +if (atomic_dec_return (&csdev->refcnt[0 ]) ==0 ) { +tmc_etf_disable_hw (drvdata); + drvdata->mode =CS_MODE_DISABLED ; + last_disable = true; + }spin_unlock_irqrestore (&drvdata->spinlock, flags); -dev_dbg (&csdev->dev,"TMC-ETF disabled\n" ); +if (last_disable) +dev_dbg (&csdev->dev,"TMC-ETF disabled\n" ); } static void *tmc_alloc_etf_buffer(struct coresight_device *csdev,
drivers/hwtracing/coresight/coresight.c +15 -32
80 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 124/180 powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB
In reply to Greg Kroah-HartmanFrom: Alastair D'Silva <[email protected]>
commit f9ec11165301982585e5e5f606739b5bae5331f3 upstream.
When calling __kernel_sync_dicache with a size >4GB, we were masking off the upper 32 bits, so we would incorrectly flush a range smaller than intended.
This patch replaces the 32 bit shifts with 64 bit ones, so that the full size is accounted for.
--- arch/powerpc/kernel/vdso64/cacheflush.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/vdso64/cacheflush.S +2 -2
@@ -35,7 +35,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,CFG_DCACHE_LOGBLOCKSZ(r10) - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ crclr cr0*4+so beqlr /* nothing to do? */ mtctr r8
@@ -52,7 +52,7 @@ V_FUNCTION_BEGIN(__kernel_sync_dicache) subf r8,r6,r4 /* compute length */ add r8,r8,r5 lwz r9,CFG_ICACHE_LOGBLOCKSZ(r10) - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ crclr cr0*4+so beqlr /* nothing to do? */ mtctr r8
Greg Kroah-Hartman
maintainerPATCH 125/180 powerpc/xive: Prevent page fault issues in the machine crash handler
In reply to Greg Kroah-HartmanFrom: Cédric Le Goater <[email protected]>
commit 1ca3dec2b2dff9d286ce6cd64108bda0e98f9710 upstream.
When the machine crash handler is invoked, all interrupts are masked but interrupts which have not been started yet do not have an ESB page mapped in the Linux address space. This crashes the 'crash kexec' sequence on sPAPR guests.
To fix, force the mapping of the ESB page when an interrupt is being mapped in the Linux IRQ number space. This is done by setting the initial state of the interrupt to OFF which is not necessarily the case on PowerNV.
--- arch/powerpc/sysdev/xive/common.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/powerpc/sysdev/xive/common.c +9 -0
@@ -1000,6 +1000,15 @@ static int xive_irq_alloc_data(unsigned xd->target =XIVE_INVALID_TARGET ;irq_set_handler_data (virq, xd); +/* +* Turn OFF by default the interrupt being mapped. A side +* effect of this check is the mapping the ESB page of the +* interrupt in the Linux address space. This prevents page +* fault issues in the crash handler which masks all +* interrupts. +*/ +xive_esb_read (xd,XIVE_ESB_SET_PQ_01 ); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 126/180 powerpc: Allow flush_icache_range to work across ranges >4GB
In reply to Greg Kroah-HartmanFrom: Alastair D'Silva <[email protected]>
commit 29430fae82073d39b1b881a3cd507416a56a363f upstream.
When calling flush_icache_range with a size >4GB, we were masking off the upper 32 bits, so we would incorrectly flush a range smaller than intended.
This patch replaces the 32 bit shifts with 64 bit ones, so that the full size is accounted for.
--- arch/powerpc/kernel/misc_64.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kernel/misc_64.S +2 -2
@@ -82,7 +82,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_I subf r8,r6,r4 /* compute length */ add r8,r8,r5 /* ensure we get enough */ lwz r9,DCACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of cache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8 1: dcbst 0,r6
@@ -98,7 +98,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_I subf r8,r6,r4 /* compute length */ add r8,r8,r5 lwz r9,ICACHEL1LOGBLOCKSIZE(r10) /* Get log-2 of Icache block size */ - srw. r8,r8,r9 /* compute line count */ + srd. r8,r8,r9 /* compute line count */ beqlr /* nothing to do? */ mtctr r8 2: icbi 0,r6
Greg Kroah-Hartman
maintainerPATCH 127/180 powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts
In reply to Greg Kroah-HartmanFrom: Cédric Le Goater <[email protected]>
commit b67a95f2abff0c34e5667c15ab8900de73d8d087 upstream.
The PCI INTx interrupts and other LSI interrupts are handled differently under a sPAPR platform. When the interrupt source characteristics are queried, the hypervisor returns an H_INT_ESB flag to inform the OS that it should be using the H_INT_ESB hcall for interrupt management and not loads and stores on the interrupt ESB pages.
A default -1 value is returned for the addresses of the ESB pages. The driver ignores this condition today and performs a bogus IO mapping. Recent changes and the DEBUG_VM configuration option make the bug visible with :
kernel BUG at arch/powerpc/include/asm/book3s/64/pgtable.h:612!
Oops: Exception in kernel mode, sig: 5 [#1]
LE PAGE_SIZE=64K MMU=Radix MMU=Hash SMP NR_CPUS=1024 NUMA pSeries
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.4.0-0.rc6.git0.1.fc32.ppc64le #1
NIP: c000000000f63294 LR: c000000000f62e44 CTR: 0000000000000000
REGS: c0000000fa45f0d0 TRAP: 0700 Not tainted (5.4.0-0.rc6.git0.1.fc32.ppc64le)
...
NIP ioremap_page_range+0x4c4/0x6e0
LR ioremap_page_range+0x74/0x6e0
Call Trace:
ioremap_page_range+0x74/0x6e0 (unreliable)
do_ioremap+0x8c/0x120
__ioremap_caller+0x128/0x140
ioremap+0x30/0x50
xive_spapr_populate_irq_data+0x170/0x260
xive_irq_domain_map+0x8c/0x170
irq_domain_associate+0xb4/0x2d0
irq_create_mapping+0x1e0/0x3b0
irq_create_fwspec_mapping+0x27c/0x3e0
irq_create_of_mapping+0x98/0xb0
of_irq_parse_and_map_pci+0x168/0x230
pcibios_setup_device+0x88/0x250
pcibios_setup_bus_devices+0x54/0x100
__of_scan_bus+0x160/0x310
pcibios_scan_phb+0x330/0x390
pcibios_init+0x8c/0x128
do_one_initcall+0x60/0x2c0
kernel_init_freeable+0x290/0x378
kernel_init+0x2c/0x148
ret_from_kernel_thread+0x5c/0x80--- arch/powerpc/sysdev/xive/spapr.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/powerpc/sysdev/xive/spapr.c +10 -2
@@ -356,20 +356,28 @@ static int xive_spapr_populate_irq_data( data->esb_shift = esb_shift; data->trig_page = trig_page; + data->hw_irq = hw_irq; +/* * No chip-id for the sPAPR backend. This has an impact how we * pick a target. See xive_pick_irq_target(). */ data->src_chip =XIVE_INVALID_CHIP_ID ; +/* +* When the H_INT_ESB flag is set, the H_INT_ESB hcall should +* be used for interrupt management. Skip the remapping of the +* ESB pages which are not available. +*/ +if (data->flags &XIVE_IRQ_FLAG_H_INT_ESB ) +return 0 ; + data->eoi_mmio =ioremap (data->eoi_page,1u << data->esb_shift);if (!data->eoi_mmio) {pr_err ("Failed to map EOI page for irq 0x%x\n" , hw_irq);return -ENOMEM ; } - data->hw_irq = hw_irq; -/* Full function page supports trigger */ if (flags &XIVE_SRC_TRIGGER ) { data->trig_mmio = data->eoi_mmio;
Greg Kroah-Hartman
maintainerPATCH 128/180 video/hdmi: Fix AVI bar unpack
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
commit 6039f37dd6b76641198e290f26b31c475248f567 upstream.
The bar values are little endian, not big endian. The pack function did it right but the unpack got it wrong. Fix it.
--- drivers/video/hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/hdmi.c +4 -4
@@ -1576,12 +1576,12 @@ static int hdmi_avi_infoframe_unpack(strif (ptr[0 ] &0x10 ) frame->active_aspect = ptr[1 ] &0xf ;if (ptr[0 ] &0x8 ) { - frame->top_bar = (ptr[5 ] <<8 ) + ptr[6 ]; - frame->bottom_bar = (ptr[7 ] <<8 ) + ptr[8 ]; + frame->top_bar = (ptr[6 ] <<8 ) | ptr[5 ]; + frame->bottom_bar = (ptr[8 ] <<8 ) | ptr[7 ]; }if (ptr[0 ] &0x4 ) { - frame->left_bar = (ptr[9 ] <<8 ) + ptr[10 ]; - frame->right_bar = (ptr[11 ] <<8 ) + ptr[12 ]; + frame->left_bar = (ptr[10 ] <<8 ) | ptr[9 ]; + frame->right_bar = (ptr[12 ] <<8 ) | ptr[11 ]; } frame->scan_mode = ptr[0 ] &0x3 ;
Greg Kroah-Hartman
maintainerPATCH 129/180 quota: Check that quota is not dirty before release
In reply to Greg Kroah-HartmanFrom: Dmitry Monakhov <[email protected]>
commit df4bb5d128e2c44848aeb36b7ceceba3ac85080d upstream.
There is a race window where quota was redirted once we drop dq_list_lock inside dqput(), but before we grab dquot->dq_lock inside dquot_release()
TASK1 TASK2 (chowner)
->dqput()
we_slept:
spin_lock(&dq_list_lock)
if (dquot_dirty(dquot)) {
spin_unlock(&dq_list_lock);
dquot->dq_sb->dq_op->write_dquot(dquot);
goto we_slept
if (test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) {
spin_unlock(&dq_list_lock);
dquot->dq_sb->dq_op->release_dquot(dquot);
dqget()
mark_dquot_dirty()
dqput()
goto we_slept;
}So dquot dirty quota will be released by TASK1, but on next we_sleept loop
we detect this and call ->write_dquot() for it.
XFSTEST: https://github.com/dmonakhov/xfstests/commit/440a80d4cbb39e9234df4d7240aee1d551c36107
--- fs/ocfs2/quota_global.c | 2 +- fs/quota/dquot.c | 2 +- include/linux/quotaops.h | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-)
fs/ocfs2/quota_global.c +1 -1
@@ -728,7 +728,7 @@ static int ocfs2_release_dquot(struct dqmutex_lock (&dquot->dq_lock);/* Check whether we are not racing with some other dqget() */ -if (atomic_read (&dquot->dq_count) >1 ) +if (dquot_is_busy (dquot)) goto out;/* Running from downconvert thread? Postpone quota processing to wq */ if (current == osb->dc_task) {
fs/quota/dquot.c +1 -1
@@ -497,7 +497,7 @@ int dquot_release(struct dquot *dquot)mutex_lock (&dquot->dq_lock);/* Check whether we are not racing with some other dqget() */ -if (atomic_read (&dquot->dq_count) >1 ) +if (dquot_is_busy (dquot)) goto out_dqlock;if (dqopt->ops[dquot->dq_id.type]->release_dqblk) { ret = dqopt->ops[dquot->dq_id.type]->release_dqblk (dquot);
include/linux/quotaops.h +10 -0
@@ -54,6 +54,16 @@ static inline struct dquot *dqgrab(strucatomic_inc (&dquot->dq_count);return dquot; } + +static inline bool dquot_is_busy (struct dquot *dquot) +{ +if (test_bit (DQ_MOD_B , &dquot->dq_flags)) +return true; +if (atomic_read (&dquot->dq_count) >1 ) +return true; +return false; +} +void dqput (struct dquot *dquot); int dquot_scan_active(struct super_block *sb, int (*fn)(struct dquot *dquot, unsigned long priv),
Greg Kroah-Hartman
maintainerPATCH 130/180 ext2: check err when partial != NULL
In reply to Greg Kroah-HartmanFrom: Chengguang Xu <[email protected]>
commit e705f4b8aa27a59f8933e8f384e9752f052c469c upstream.
Check err when partial == NULL is meaningless because partial == NULL means getting branch successfully without error.
--- fs/ext2/inode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/ext2/inode.c +5 -2
@@ -701,10 +701,13 @@ static int ext2_get_blocks(struct inodeif (!partial) { count++;mutex_unlock (&ei->truncate_mutex); -if (err) - goto cleanup; goto got_it; } + +if (err) { +mutex_unlock (&ei->truncate_mutex); + goto cleanup; + } }/*
Greg Kroah-Hartman
maintainerPATCH 131/180 seccomp: avoid overflow in implicit constant conversion
In reply to Greg Kroah-HartmanFrom: Christian Brauner <[email protected]>
commit 223e660bc7638d126a0e4fbace4f33f2895788c4 upstream.
USER_NOTIF_MAGIC is assigned to int variables in this test so set it to INT_MAX to avoid warnings:
seccomp_bpf.c: In function ‘user_notification_continue’:
seccomp_bpf.c:3088:26: warning: overflow in implicit constant conversion [-Woverflow]
#define USER_NOTIF_MAGIC 116983961184613L
^
seccomp_bpf.c:3572:15: note: in expansion of macro ‘USER_NOTIF_MAGIC’
resp.error = USER_NOTIF_MAGIC;
^~~~~~~~~~~~~~~~--- tools/testing/selftests/seccomp/seccomp_bpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +2 -1
@@ -35,6 +35,7 @@#include <stdbool.h> #include <string.h> #include <time.h> +#include <limits.h> #include <linux/elf.h> #include <sys/uio.h> #include <sys/utsname.h>
@@ -3077,7 +3078,7 @@ static int user_trap_syscall(int nr, unsreturn seccomp (SECCOMP_SET_MODE_FILTER , flags, &prog); } -#define USER_NOTIF_MAGIC 116983961184613L +#define USER_NOTIF_MAGIC INT_MAXTEST (user_notification_basic) {pid_t pid;
Greg Kroah-Hartman
maintainerPATCH 132/180 quota: fix livelock in dquot_writeback_dquots
In reply to Greg Kroah-HartmanFrom: Dmitry Monakhov <[email protected]>
commit 6ff33d99fc5c96797103b48b7b0902c296f09c05 upstream.
Write only quotas which are dirty at entry.
XFSTEST: https://github.com/dmonakhov/xfstests/commit/b10ad23566a5bf75832a6f500e1236084083cddc
--- fs/quota/dquot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/quota/dquot.c +5 -4
@@ -623,7 +623,7 @@ EXPORT_SYMBOL(dquot_scan_active);/* Write all dquot structures to quota files */ int dquot_writeback_dquots (struct super_block *sb,int type) { -struct list_head *dirty; +struct list_head dirty;struct dquot *dquot;struct quota_info *dqopt =sb_dqopt (sb);int cnt;
@@ -637,9 +637,10 @@ int dquot_writeback_dquots(struct super_if (!sb_has_quota_active (sb, cnt))continue ;spin_lock (&dq_list_lock); - dirty = &dqopt->info[cnt].dqi_dirty_list; -while (!list_empty (dirty)) { - dquot = list_first_entry(dirty, struct dquot, +/* Move list away to avoid livelock. */ +list_replace_init (&dqopt->info[cnt].dqi_dirty_list, &dirty); +while (!list_empty (&dirty)) { + dquot = list_first_entry(&dirty, struct dquot, dq_dirty);WARN_ON (!test_bit (DQ_ACTIVE_B , &dquot->dq_flags));
Greg Kroah-Hartman
maintainerPATCH 133/180 ext4: Fix credit estimate for final inode freeing
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 65db869c754e7c271691dd5feabf884347e694f5 upstream.
Estimate for the number of credits needed for final freeing of inode in ext4_evict_inode() was to small. We may modify 4 blocks (inode & sb for orphan deletion, bitmap & group descriptor for inode freeing) and not just 3.
[ Fixed minor whitespace nit. -- TYT ]
--- fs/ext4/inode.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/ext4/inode.c +11 -2
@@ -196,7 +196,12 @@ void ext4_evict_inode(struct inode *inod {handle_t *handle;int err; -int extra_credits =3 ; +/* +* Credits for final inode cleanup and freeing: +* sb + inode (ext4_orphan_del()), block bitmap, group descriptor +* (xattr block freeing), bitmap, group descriptor (inode freeing) +*/ +int extra_credits =6 ;struct ext4_xattr_inode_array *ea_inode_array =NULL ;trace_ext4_evict_inode (inode);
@@ -252,8 +257,12 @@ void ext4_evict_inode(struct inode *inodif (!IS_NOQUOTA (inode)) extra_credits +=EXT4_MAXQUOTAS_DEL_BLOCKS (inode->i_sb); +/* +* Block bitmap, group descriptor, and inode are accounted in both +* ext4_blocks_for_truncate() and extra_credits. So subtract 3. +*/ handle =ext4_journal_start (inode,EXT4_HT_TRUNCATE , -ext4_blocks_for_truncate (inode)+extra_credits); +ext4_blocks_for_truncate (inode) + extra_credits -3 );if (IS_ERR (handle)) {ext4_std_error (inode->i_sb,PTR_ERR (handle));/*
Greg Kroah-Hartman
maintainerPATCH 134/180 reiserfs: fix extended attributes on the root directory
In reply to Greg Kroah-HartmanFrom: Jeff Mahoney <[email protected]>
commit 60e4cf67a582d64f07713eda5fcc8ccdaf7833e6 upstream.
Since commit d0a5b995a308 (vfs: Add IOP_XATTR inode operations flag) extended attributes haven't worked on the root directory in reiserfs.
This is due to reiserfs conditionally setting the sb->s_xattrs handler array depending on whether it located or create the internal privroot directory. It necessarily does this after the root inode is already read in. The IOP_XATTR flag is set during inode initialization, so it never gets set on the root directory.
This commit unconditionally assigns sb->s_xattrs and clears IOP_XATTR on internal inodes. The old return values due to the conditional assignment are handled via open_xa_root, which now returns EOPNOTSUPP as the VFS would have done.
--- fs/reiserfs/inode.c | 12 ++++++++++-- fs/reiserfs/namei.c | 7 +++++-- fs/reiserfs/reiserfs.h | 2 ++ fs/reiserfs/super.c | 2 ++ fs/reiserfs/xattr.c | 19 ++++++++++++------- fs/reiserfs/xattr_acl.c | 4 +--- 6 files changed, 32 insertions(+), 14 deletions(-)
fs/reiserfs/inode.c +10 -2
@@ -2097,6 +2097,15 @@ int reiserfs_new_inode(struct reiserfs_t goto out_inserted_sd; } +/* +* Mark it private if we're creating the privroot +* or something under it. +*/ +if (IS_PRIVATE (dir) || dentry ==REISERFS_SB (sb)->priv_root) { + inode->i_flags |=S_PRIVATE ; + inode->i_opflags &= ~IOP_XATTR ; + } +if (reiserfs_posixacl (inode->i_sb)) {reiserfs_write_unlock (inode->i_sb); retval =reiserfs_inherit_default_acl (th, dir, dentry, inode);
@@ -2111,8 +2120,7 @@ int reiserfs_new_inode(struct reiserfs_treiserfs_warning (inode->i_sb,"jdm-13090" ,"ACLs aren't enabled in the fs, " "but vfs thinks they are!" ); - }else if (IS_PRIVATE (dir)) - inode->i_flags |=S_PRIVATE ; + }if (security->name) {reiserfs_write_unlock (inode->i_sb);
fs/reiserfs/namei.c +5 -2
@@ -377,10 +377,13 @@ static struct dentry *reiserfs_lookup(st/* * Propagate the private flag so we know we're -* in the priv tree +* in the priv tree. Also clear IOP_XATTR +* since we don't have xattrs on xattr files. */ -if (IS_PRIVATE (dir)) +if (IS_PRIVATE (dir)) { inode->i_flags |=S_PRIVATE ; + inode->i_opflags &= ~IOP_XATTR ; + } }reiserfs_write_unlock (dir->i_sb);if (retval ==IO_ERROR ) {
fs/reiserfs/reiserfs.h +2 -0
@@ -1168,6 +1168,8 @@ static inline int bmap_would_wrap(unsignreturn bmap_nr > ((1LL <<16 ) -1 ); } +extern const struct xattr_handler *reiserfs_xattr_handlers[]; +/* * this says about version of key of all items (but stat data) the * object consists of
fs/reiserfs/super.c +2 -0
@@ -2046,6 +2046,8 @@ static int reiserfs_fill_super(struct suif (replay_only (s)) goto error_unlocked; + s->s_xattr = reiserfs_xattr_handlers; +if (bdev_read_only (s->s_bdev) && !sb_rdonly (s)) {SWARN (silent, s,"clm-7000" ,"Detected readonly device, marking FS readonly" );
fs/reiserfs/xattr.c +12 -7
@@ -122,13 +122,13 @@ static struct dentry *open_xa_root(strucstruct dentry *xaroot;if (d_really_is_negative (privroot)) -return ERR_PTR (-ENODATA ); +return ERR_PTR (-EOPNOTSUPP );inode_lock_nested (d_inode (privroot),I_MUTEX_XATTR ); xaroot =dget (REISERFS_SB (sb)->xattr_root);if (!xaroot) - xaroot =ERR_PTR (-ENODATA ); + xaroot =ERR_PTR (-EOPNOTSUPP );else if (d_really_is_negative (xaroot)) {int err = -ENODATA ;
@@ -619,6 +619,10 @@ int reiserfs_xattr_set(struct inode *inoint error, error2;size_t jbegin_count =reiserfs_xattr_nblocks (inode, buffer_size); +/* Check before we start a transaction and then do nothing. */ +if (!d_really_is_positive (REISERFS_SB (inode->i_sb)->priv_root)) +return -EOPNOTSUPP ; +if (!(flags &XATTR_REPLACE )) jbegin_count +=reiserfs_xattr_jcreate_nblocks (inode);
@@ -841,8 +845,7 @@ ssize_t reiserfs_listxattr(struct dentryif (d_really_is_negative (dentry))return -EINVAL ; -if (!dentry->d_sb->s_xattr || -get_inode_sd_version (d_inode (dentry)) ==STAT_DATA_V1 ) +if (get_inode_sd_version (d_inode (dentry)) ==STAT_DATA_V1 )return -EOPNOTSUPP ; dir =open_xa_dir (d_inode (dentry),XATTR_REPLACE );
@@ -882,6 +885,7 @@ static int create_privroot(struct dentry }d_inode (dentry)->i_flags |=S_PRIVATE ; +d_inode (dentry)->i_opflags &= ~IOP_XATTR ;reiserfs_info (dentry->d_sb,"Created %s - reserved for xattr " "storage.\n" ,PRIVROOT_NAME );
@@ -895,7 +899,7 @@ static int create_privroot(struct dentry#endif /* Actual operations that are exported to VFS-land */ -static const struct xattr_handler *reiserfs_xattr_handlers[] = { +const struct xattr_handler *reiserfs_xattr_handlers[] = { #ifdef CONFIG_REISERFS_FS_XATTR &reiserfs_xattr_user_handler, &reiserfs_xattr_trusted_handler,
@@ -966,8 +970,10 @@ int reiserfs_lookup_privroot(struct supeif (!IS_ERR (dentry)) {REISERFS_SB (s)->priv_root = dentry;d_set_d_op (dentry, &xattr_lookup_poison_ops); -if (d_really_is_positive (dentry)) +if (d_really_is_positive (dentry)) {d_inode (dentry)->i_flags |=S_PRIVATE ; +d_inode (dentry)->i_opflags &= ~IOP_XATTR ; + } }else err =PTR_ERR (dentry);inode_unlock (d_inode (s->s_root));
@@ -996,7 +1002,6 @@ int reiserfs_xattr_init(struct super_blo }if (d_really_is_positive (privroot)) { - s->s_xattr = reiserfs_xattr_handlers;inode_lock (d_inode (privroot));if (!REISERFS_SB (s)->xattr_root) {struct dentry *dentry;
fs/reiserfs/xattr_acl.c +1 -3
@@ -320,10 +320,8 @@ reiserfs_inherit_default_acl(struct reis* would be useless since permissions are ignored, and a pain because * it introduces locking cycles */ -if (IS_PRIVATE (dir)) { - inode->i_flags |=S_PRIVATE ; +if (IS_PRIVATE (inode)) goto apply_umask; - } err =posix_acl_create (dir, &inode->i_mode, &default_acl, &acl);if (err)
Greg Kroah-Hartman
maintainerPATCH 135/180 scsi: lpfc: Fix bad ndlp ptr in xri aborted handling
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
[ Upstream commit 324e1c402069e8d277d2a2b18ce40bde1265b96a ]
In cases where I/O may be aborted, such as driver unload or link bounces, the system will crash based on a bad ndlp pointer.
Example:
RIP: 0010:lpfc_sli4_abts_err_handler+0x15/0x140 [lpfc] ... lpfc_sli4_io_xri_aborted+0x20d/0x270 [lpfc] lpfc_sli4_sp_handle_abort_xri_wcqe.isra.54+0x84/0x170 [lpfc] lpfc_sli4_fp_handle_cqe+0xc2/0x480 [lpfc] __lpfc_sli4_process_cq+0xc6/0x230 [lpfc] __lpfc_sli4_hba_process_cq+0x29/0xc0 [lpfc] process_one_work+0x14c/0x390
Crash was caused by a bad ndlp address passed to I/O indicated by the XRI aborted CQE. The address was not NULL so the routine deferenced the ndlp ptr. The bad ndlp also caused the lpfc_sli4_io_xri_aborted to call an erroneous io handler. Root cause for the bad ndlp was an lpfc_ncmd that was aborted, put on the abort_io list, completed, taken off the abort_io list, sent to lpfc_release_nvme_buf where it was put back on the abort_io list because the lpfc_ncmd->flags setting LPFC_SBUF_XBUSY was not cleared on the final completion.
Rework the exchange busy handling to ensure the flags are properly set for both scsi and nvme.
--- drivers/scsi/lpfc/lpfc_scsi.c | 11 +++++++---- drivers/scsi/lpfc/lpfc_sli.c | 5 ++++- drivers/scsi/lpfc/lpfc_sli.h | 3 +-- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/scsi/lpfc/lpfc_scsi.c +7 -4
@@ -583,7 +583,7 @@ lpfc_sli4_fcp_xri_aborted(struct lpfc_hba *phba,if (psb->cur_iocbq.sli4_xritag == xri) {list_del (&psb->list); qp->abts_scsi_io_bufs--; - psb->exch_busy =0 ; + psb->flags &= ~LPFC_SBUF_XBUSY ; psb->status =IOSTAT_SUCCESS ;spin_unlock ( &qp->abts_scsi_buf_list_lock);
@@ -615,7 +615,7 @@ lpfc_sli4_fcp_xri_aborted(struct lpfc_hba *phba,if (iocbq->sli4_xritag != xri)continue ; psb = container_of(iocbq, struct lpfc_io_buf, cur_iocbq); - psb->exch_busy =0 ; + psb->flags &= ~LPFC_SBUF_XBUSY ;spin_unlock_irqrestore (&phba->hbalock, iflag);if (!list_empty (&pring->txq))lpfc_worker_wake_up (phba);
@@ -834,7 +834,7 @@ lpfc_release_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_io_buf *psb) psb->prot_seg_cnt =0 ; qp = psb->hdwq; -if (psb->exch_busy) { +if (psb->flags &LPFC_SBUF_XBUSY ) {spin_lock_irqsave (&qp->abts_scsi_buf_list_lock, iflag); psb->pCmd =NULL ;list_add_tail (&psb->list, &qp->lpfc_abts_scsi_buf_list);
@@ -3679,7 +3679,10 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, lpfc_cmd->result = (pIocbOut->iocb.un.ulpWord[4 ] &IOERR_PARAM_MASK ); lpfc_cmd->status = pIocbOut->iocb.ulpStatus;/* pick up SLI4 exhange busy status from HBA */ - lpfc_cmd->exch_busy = pIocbOut->iocb_flag &LPFC_EXCHANGE_BUSY ; +if (pIocbOut->iocb_flag &LPFC_EXCHANGE_BUSY ) + lpfc_cmd->flags |=LPFC_SBUF_XBUSY ; +else + lpfc_cmd->flags &= ~LPFC_SBUF_XBUSY ;#ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (lpfc_cmd->prot_data_type) {
drivers/scsi/lpfc/lpfc_sli.c +4 -1
@@ -11768,7 +11768,10 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba, !(cmdiocbq->iocb_flag & LPFC_IO_LIBDFC)) { lpfc_cmd = container_of(cmdiocbq, struct lpfc_io_buf, cur_iocbq); - lpfc_cmd->exch_busy = rspiocbq->iocb_flag &LPFC_EXCHANGE_BUSY ; +if (rspiocbq && (rspiocbq->iocb_flag &LPFC_EXCHANGE_BUSY )) + lpfc_cmd->flags |=LPFC_SBUF_XBUSY ; +else + lpfc_cmd->flags &= ~LPFC_SBUF_XBUSY ; } pdone_q = cmdiocbq->context_un.wait_queue;
drivers/scsi/lpfc/lpfc_sli.h +1 -2
@@ -375,14 +375,13 @@ struct lpfc_io_buf {struct lpfc_nodelist *ndlp;uint32_t timeout; -uint16_t flags;/* TBD convert exch_busy to flags */ +uint16_t flags;#define LPFC_SBUF_XBUSY 0x1/* SLI4 hba reported XB on WCQE cmpl */ #define LPFC_SBUF_BUMP_QDEPTH 0x2/* bumped queue depth counter */ /* External DIF device IO conversions */ #define LPFC_SBUF_NORMAL_DIF 0x4/* normal mode to insert/strip */ #define LPFC_SBUF_PASS_DIF 0x8/* insert/strip mode to passthru */ #define LPFC_SBUF_NOT_POSTED 0x10/* SGL failed post to FW. */ -uint16_t exch_busy;/* SLI4 hba reported XB on complete WCQE */ uint16_t status;/* From IOCB Word 7- ulpStatus */ uint32_t result;/* From IOCB Word 4. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/180 scsi: qla2xxx: Fix abort timeout race condition.
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 0c6df59061b23c7a951836d23977be34e896d3da ]
If an abort times out, the Abort IOCB completion and Abort timer can race against each other. This patch provides unique error code for timer path to allow proper cleanup.
[mkp: typo]
--- drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +1 -0
@@ -4629,6 +4629,7 @@ struct secure_flash_update_block_pk {#define QLA_SUSPENDED 0x106#define QLA_BUSY 0x107#define QLA_ALREADY_REGISTERED 0x109 +#define QLA_OS_TIMER_EXPIRED 0x10a#define NVRAM_DELAY () udelay(10)
drivers/scsi/qla2xxx/qla_init.c +16 -2
@@ -99,9 +99,22 @@ static void qla24xx_abort_iocb_timeout(void *data) {srb_t *sp = data;struct srb_iocb *abt = &sp->u.iocb_cmd; +struct qla_qpair *qpair = sp->qpair; +u32 handle; +unsigned long flags; + +spin_lock_irqsave (qpair->qp_lock_ptr, flags); +for (handle =1 ; handle < qpair->req->num_outstanding_cmds; handle++) { +/* removing the abort */ +if (qpair->req->outstanding_cmds[handle] == sp) { + qpair->req->outstanding_cmds[handle] =NULL ; +break ; + } + } +spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); abt->u.abt.comp_status =CS_TIMEOUT ; - sp->done (sp,QLA_FUNCTION_TIMEOUT ); + sp->done (sp,QLA_OS_TIMER_EXPIRED ); }static void qla24xx_abort_sp_done (void *ptr,int res)
@@ -109,7 +122,8 @@ static void qla24xx_abort_sp_done(void *ptr, int res)srb_t *sp = ptr;struct srb_iocb *abt = &sp->u.iocb_cmd; -if (del_timer (&sp->u.iocb_cmd.timer)) { +if ((res ==QLA_OS_TIMER_EXPIRED ) || +del_timer (&sp->u.iocb_cmd.timer)) {if (sp->flags &SRB_WAKEUP_ON_COMP )complete (&abt->u.abt.comp);else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/180 scsi: qla2xxx: Do command completion on abort timeout
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 71c80b75ce8f08c0978ce9a9816b81b5c3ce5e12 ]
On switch, fabric and mgt command timeout, driver send Abort to tell FW to return the original command. If abort is timeout, then return both Abort and original command for cleanup.
--- drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+)
drivers/scsi/qla2xxx/qla_def.h +1 -0
@@ -543,6 +543,7 @@ typedef struct srb {const char *name;int iocbs;struct qla_qpair *qpair; +struct srb *cmd_sp;struct list_head elem;u32 gen1;/* scratch */ u32 gen2;/* scratch */
drivers/scsi/qla2xxx/qla_init.c +18 -0
@@ -103,8 +103,22 @@ static void qla24xx_abort_iocb_timeout(void *data)u32 handle;unsigned long flags; +if (sp->cmd_sp) +ql_dbg (ql_dbg_async, sp->vha,0x507c , +"Abort timeout - cmd hdl=%x, cmd type=%x hdl=%x, type=%x\n" , + sp->cmd_sp->handle, sp->cmd_sp->type, + sp->handle, sp->type); +else +ql_dbg (ql_dbg_async, sp->vha,0x507c , +"Abort timeout 2 - hdl=%x, type=%x\n" , + sp->handle, sp->type); +spin_lock_irqsave (qpair->qp_lock_ptr, flags);for (handle =1 ; handle < qpair->req->num_outstanding_cmds; handle++) { +if (sp->cmd_sp && (qpair->req->outstanding_cmds[handle] == + sp->cmd_sp)) + qpair->req->outstanding_cmds[handle] =NULL ; +/* removing the abort */ if (qpair->req->outstanding_cmds[handle] == sp) { qpair->req->outstanding_cmds[handle] =NULL ;
@@ -113,6 +127,9 @@ static void qla24xx_abort_iocb_timeout(void *data) }spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); +if (sp->cmd_sp) + sp->cmd_sp->done (sp->cmd_sp,QLA_OS_TIMER_EXPIRED ); + abt->u.abt.comp_status =CS_TIMEOUT ; sp->done (sp,QLA_OS_TIMER_EXPIRED ); }
@@ -147,6 +164,7 @@ static int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait) sp->type =SRB_ABT_CMD ; sp->name ="abort" ; sp->qpair = cmd_sp->qpair; + sp->cmd_sp = cmd_sp;if (wait) sp->flags =SRB_WAKEUP_ON_COMP ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/180 scsi: qla2xxx: Fix premature timer expiration
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 3a4b6cc7332130ac5cbf3b505d8cddf0aa2ea745 ]
For any qla2xxx async command, the SRB buffer is used to send it. In setting up the SRB buffer, the timer for this command is started before all memory allocation has finished. Under low memory pressure, memory alloc can go to sleep and not wake up before the timer expires. Once timer has expired, the timer thread will access uninitialize fields resulting into NULL pointer crash.
This patch fixes this crash by moving the start of timer after everything is setup.
backtrace shows following
PID: 3720 TASK: ffff996928401040 CPU: 0 COMMAND: "qla2xxx_1_dpc"
0 [ffff99652751b698] __schedule at ffffffff965676c7
1 [ffff99652751b728] schedule at ffffffff96567bc9
2 [ffff99652751b738] schedule_timeout at ffffffff965655e8
3 [ffff99652751b7e0] io_schedule_timeout at ffffffff9656726d 4 [ffff99652751b810] congestion_wait at ffffffff95fd8d12
5 [ffff99652751b870] isolate_migratepages_range at ffffffff95fddaf3 6 [ffff99652751b930] compact_zone at ffffffff95fdde96
7 [ffff99652751b980] compact_zone_order at ffffffff95fde0bc 8 [ffff99652751ba20] try_to_compact_pages at ffffffff95fde481 9 [ffff99652751ba80] __alloc_pages_direct_compact at ffffffff9655cc31 10 [ffff99652751bae0] __alloc_pages_slowpath at ffffffff9655d101 11 [ffff99652751bbd0] __alloc_pages_nodemask at ffffffff95fc0e95 12 [ffff99652751bc80] dma_generic_alloc_coherent at ffffffff95e3217f 13 [ffff99652751bcc8] x86_swiotlb_alloc_coherent at ffffffff95e6b7a1 14 [ffff99652751bcf8] qla2x00_rft_id at ffffffffc055b5e0 [qla2xxx] 15 [ffff99652751bd50] qla2x00_loop_resync at ffffffffc0533e71 [qla2xxx] 16 [ffff99652751be68] qla2x00_do_dpc at ffffffffc05210ca [qla2xxx]
PID: 0 TASK: ffffffff96a18480 CPU: 0 COMMAND: "swapper/0"
0 [ffff99652fc03ae0] machine_kexec at ffffffff95e63674 1 [ffff99652fc03b40] __crash_kexec at ffffffff95f1ce12 2 [ffff99652fc03c10] crash_kexec at ffffffff95f1cf00 3 [ffff99652fc03c28] oops_end at ffffffff9656c758
4 [ffff99652fc03c50] no_context at ffffffff9655aa7e
5 [ffff99652fc03ca0] __bad_area_nosemaphore at ffffffff9655ab15 6 [ffff99652fc03cf0] bad_area_nosemaphore at ffffffff9655ac86 7 [ffff99652fc03d00] __do_page_fault at ffffffff9656f6b0 8 [ffff99652fc03d70] do_page_fault at ffffffff9656f915 9 [ffff99652fc03da0] page_fault at ffffffff9656b758
[exception RIP: unknown or invalid address]
RIP: 0000000000000000 RSP: ffff99652fc03e50 RFLAGS: 00010202
RAX: 0000000000000000 RBX: ffff99652b79a600 RCX: ffff99652b79a760
RDX: ffff99652b79a600 RSI: ffffffffc0525ad0 RDI: ffff99652b79a600
RBP: ffff99652fc03e60 R8: ffffffff96a18a18 R9: ffffffff96ee3c00
R10: 0000000000000002 R11: ffff99652fc03de8 R12: ffff99652b79a760
R13: 0000000000000100 R14: ffffffffc0525ad0 R15: ffff99652b79a600
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 001810 [ffff99652fc03e50] qla2x00_sp_timeout at ffffffffc0525af8 [qla2xxx] 11 [ffff99652fc03e68] call_timer_fn at ffffffff95ea7f58
12 [ffff99652fc03ea0] run_timer_softirq at ffffffff95eaa3bd 13 [ffff99652fc03f18] __do_softirq at ffffffff95ea0f05
14 [ffff99652fc03f88] call_softirq at ffffffff9657832c
15 [ffff99652fc03fa0] do_softirq at ffffffff95e2e675
16 [ffff99652fc03fc0] irq_exit at ffffffff95ea1285
17 [ffff99652fc03fd8] smp_apic_timer_interrupt at ffffffff965796c8 18 [ffff99652fc03ff0] apic_timer_interrupt at ffffffff96575df2
--- drivers/scsi/qla2xxx/qla_def.h | 1 + drivers/scsi/qla2xxx/qla_iocb.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_def.h +1 -0
@@ -537,6 +537,7 @@ typedef struct srb {wait_queue_head_t nvme_ls_waitq;struct fc_port *fcport;struct scsi_qla_host *vha; + unsigned int start_timer:1;uint32_t handle;uint16_t flags;uint16_t type;
drivers/scsi/qla2xxx/qla_iocb.c +4 -1
@@ -2540,7 +2540,7 @@ void qla2x00_init_timer(srb_t *sp, unsigned long tmo) sp->free = qla2x00_sp_free;if (IS_QLAFX00 (sp->vha->hw) && sp->type ==SRB_FXIOCB_DCMD )init_completion (&sp->u.iocb_cmd.u.fxiocb.fxiocb_comp); -add_timer (&sp->u.iocb_cmd.timer); + sp->start_timer =1 ; } static void
@@ -3668,6 +3668,9 @@ qla2x00_start_sp(srb_t *sp)break ; } +if (sp->start_timer) +add_timer (&sp->u.iocb_cmd.timer); +wmb ();qla2x00_start_iocbs (vha, qp->req); done:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/180 scsi: qla2xxx: Fix DMA unmap leak
In reply to Greg Kroah-HartmanFrom: Himanshu Madhani <[email protected]>
[ Upstream commit 5d328de64d89400dcf9911125844d8adc0db697f ]
With debug kernel we see following wanings indicating memory leak.
[28809.523959] WARNING: CPU: 3 PID: 6790 at lib/dma-debug.c:978 dma_debug_device_change+0x166/0x1d0 [28809.523964] pci 0000:0c:00.6: DMA-API: device driver has pending DMA allocations while released from device [count=5] [28809.523964] One of leaked entries details: [device
address=0x00000002aefe4000] [size=8208 bytes] [mapped with DMA_BIDIRECTIONAL] [mapped as coherent]
Fix this by unmapping DMA memory.
--- drivers/scsi/qla2xxx/qla_bsg.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/qla2xxx/qla_bsg.c +4 -0
@@ -341,6 +341,8 @@ qla2x00_process_els(struct bsg_job *bsg_job)dma_map_sg (&ha->pdev->dev, bsg_job->request_payload.sg_list, bsg_job->request_payload.sg_cnt,DMA_TO_DEVICE );if (!req_sg_cnt) { +dma_unmap_sg (&ha->pdev->dev, bsg_job->request_payload.sg_list, + bsg_job->request_payload.sg_cnt,DMA_TO_DEVICE ); rval = -ENOMEM ; goto done_free_fcport; }
@@ -348,6 +350,8 @@ qla2x00_process_els(struct bsg_job *bsg_job) rsp_sg_cnt =dma_map_sg (&ha->pdev->dev, bsg_job->reply_payload.sg_list, bsg_job->reply_payload.sg_cnt,DMA_FROM_DEVICE );if (!rsp_sg_cnt) { +dma_unmap_sg (&ha->pdev->dev, bsg_job->reply_payload.sg_list, + bsg_job->reply_payload.sg_cnt,DMA_FROM_DEVICE ); rval = -ENOMEM ; goto done_free_fcport; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/180 scsi: qla2xxx: Fix different size DMA Alloc/Unmap
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit d376dbda187317d06d3a2d495b43a7983e4a3250 ]
[ 17.177276] qla2xxx 0000:05:00.0: DMA-API: device driver frees DMA memory
with different size [device address=0x00000006198b0000] [map size=32784 bytes]
[unmap size=8208 bytes]
[ 17.177390] RIP: 0010:check_unmap+0x7a2/0x1750
[ 17.177425] Call Trace:
[ 17.177438] debug_dma_free_coherent+0x1b5/0x2d5
[ 17.177470] dma_free_attrs+0x7f/0x140
[ 17.177489] qla24xx_sp_unmap+0x1e2/0x610 [qla2xxx]
[ 17.177509] qla24xx_async_gnnft_done+0x9c6/0x17d0 [qla2xxx]
[ 17.177535] qla2x00_do_work+0x514/0x2200 [qla2xxx]--- drivers/scsi/qla2xxx/qla_gs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_gs.c +1 -1
@@ -4152,7 +4152,7 @@ int qla24xx_async_gpnft(scsi_qla_host_t *vha, u8 fc4_type, srb_t *sp) rspsz, &sp->u.iocb_cmd.u.ctarg.rsp_dma, GFP_KERNEL); - sp->u.iocb_cmd.u.ctarg.rsp_allocated_size =sizeof (struct ct_sns_pkt ); + sp->u.iocb_cmd.u.ctarg.rsp_allocated_size = rspsz;if (!sp->u.iocb_cmd.u.ctarg.rsp) {ql_log (ql_log_warn, vha,0xffff ,"Failed to allocate ct_sns request.\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/180 scsi: qla2xxx: Fix NVMe port discovery after a short device port loss
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
[ Upstream commit 9e744591ef1b8df27c25c68dac858dada8688f77 ]
The following sequence of event leads to NVME port disappearing:
- device port shut
- nvme_fc_unregister_remoteport
- device port online
- remote port delete completes
- relogin is scheduled
- "post gidpn" message appears due to rscn generation # mismatch
In short, if a device comes back online sooner than an unregister completion, a mismatch in rscn generation number occurs, which is not handled correctly during device relogin. Fix this by starting with a redo of GNL.
When ql2xextended_error_logging is enabled, the re-plugged device's discovery stops with the following messages printed:
--8<--
qla2xxx [0000:41:00.0]-480d:3: Relogin scheduled.
qla2xxx [0000:41:00.0]-4800:3: DPC handler sleeping.
qla2xxx [0000:41:00.0]-2902:3: qla24xx_handle_relogin_event 21:00:00:24:ff:17:9e:91 DS 0 LS 7 P 0 del 2 cnfl
(null) rscn 1|2 login 1|2 fl 1
qla2xxx [0000:41:00.0]-28e9:3: qla24xx_handle_relogin_event 1666 21:00:00:24:ff:17:9e:91 post gidpn qla2xxx [0000:41:00.0]-480e:3: Relogin end.
--8<--
--- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -2
@@ -1712,9 +1712,9 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha, }if (fcport->last_rscn_gen != fcport->rscn_gen) { -ql_dbg (ql_dbg_disc, vha,0x20e9 ,"%s %d %8phC post gidpn\n" , +ql_dbg (ql_dbg_disc, vha,0x20e9 ,"%s %d %8phC post gnl\n" , __func__, __LINE__, fcport->port_name); - +qla24xx_post_gnl_work (vha, fcport);return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/180 scsi: qla2xxx: Fix hang in fcport delete path
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit f00b3428a801758243693e046b34226e92bc56b3 ]
A hang was observed in the fcport delete path when the device was responding slow and an issue-lip path (results in session termination) was taken.
Fix this by issuing logo requests unconditionally.
PID: 19491 TASK: ffff8e23e67bb150 CPU: 0 COMMAND: "kworker/0:0"
#0 [ffff8e2370297bf8] __schedule at ffffffffb4f7dbb0
#1 [ffff8e2370297c88] schedule at ffffffffb4f7e199
#2 [ffff8e2370297c98] schedule_timeout at ffffffffb4f7ba68
#3 [ffff8e2370297d40] msleep at ffffffffb48ad9ff
#4 [ffff8e2370297d58] qlt_free_session_done at ffffffffc0c32052 [qla2xxx] #5 [ffff8e2370297e20] process_one_work at ffffffffb48bcfdf
#6 [ffff8e2370297e68] worker_thread at ffffffffb48bdca6
#7 [ffff8e2370297ec8] kthread at ffffffffb48c4f81
--- drivers/scsi/qla2xxx/qla_init.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +0 -3
@@ -396,9 +396,6 @@ qla2x00_async_logout(struct scsi_qla_host *vha, fc_port_t *fcport)struct srb_iocb *lio;int rval =QLA_FUNCTION_FAILED ; -if (!vha->flags.online || (fcport->flags &FCF_ASYNC_SENT )) -return rval; - fcport->flags |=FCF_ASYNC_SENT ; sp =qla2x00_get_sp (vha, fcport,GFP_KERNEL );if (!sp)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/180 scsi: qla2xxx: Make qla2x00_abort_srb() again decrease the sp reference count
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit d2d2b5a5741d317bed1fa38211f1f3b142d8cf7a ]
Since qla2x00_abort_srb() starts with increasing the reference count of @sp, decrease that same reference count before returning.
--- drivers/scsi/qla2xxx/qla_os.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla2xxx/qla_os.c +2 -0
@@ -1751,6 +1751,8 @@ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res,spin_lock_irqsave (qp->qp_lock_ptr, *flags); sp->comp =NULL ; } + +atomic_dec (&sp->ref_count); } static void
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/180 scsi: qla2xxx: Really fix qla2xxx_eh_abort()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 8dd9593cc07ad7d999bef81b06789ef873a94881 ]
I'm not sure how this happened but the patch that was intended to fix abort handling was incomplete. This patch fixes that patch as follows:
- If aborting the SCSI command failed, wait until the SCSI command completes.
- Return SUCCESS instead of FAILED if an abort attempt races with SCSI command completion.
- Since qla2xxx_eh_abort() increments the sp reference count by calling sp_get(), decrement the sp reference count before returning.
--- drivers/scsi/qla2xxx/qla_os.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/scsi/qla2xxx/qla_os.c +21 -0
@@ -1274,6 +1274,7 @@ static int qla2xxx_eh_abort(struct scsi_cmnd *cmd) {scsi_qla_host_t *vha =shost_priv (cmd->device->host); +DECLARE_COMPLETION_ONSTACK (comp);srb_t *sp;int ret;unsigned int id;
@@ -1309,6 +1310,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)return SUCCESS ; } +/* Get a reference to the sp and drop the lock. */ if (sp_get (sp)){/* ref_count is already 0 */ spin_unlock_irqrestore (qpair->qp_lock_ptr, flags);
@@ -1336,6 +1338,23 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) sp->done (sp,DID_ABORT <<16 ); ret =SUCCESS ;break ; +case QLA_FUNCTION_PARAMETER_ERROR : { +/* Wait for the command completion. */ +uint32_t ratov = ha->r_a_tov/10 ; +uint32_t ratov_j =msecs_to_jiffies (4 * ratov *1000 ); + +WARN_ON_ONCE (sp->comp); + sp->comp = ∁ +if (!wait_for_completion_timeout (&comp, ratov_j)) { +ql_dbg (ql_dbg_taskm, vha,0xffff , +"%s: Abort wait timer (4 * R_A_TOV[%d]) expired\n" , + __func__, ha->r_a_tov); + ret =FAILED ; + }else { + ret =SUCCESS ; + } +break ; + }default :/* * Either abort failed or abort and completion raced. Let
@@ -1345,6 +1364,8 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)break ; } + sp->comp =NULL ; +atomic_dec (&sp->ref_count);ql_log (ql_log_info, vha,0x801c ,"Abort command issued nexus=%ld:%d:%llu -- %x.\n" , vha->host_no, id, lun, ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/180 scsi: qla2xxx: Fix session lookup in qlt_abort_work()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit ac452b8e79320c9e90c78edf32ba2d42431e4daf ]
Pass the correct session ID to find_sess_by_s_id() instead of passing an uninitialized variable.
--- drivers/scsi/qla2xxx/qla_target.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +1 -3
@@ -6195,7 +6195,6 @@ static void qlt_abort_work(struct qla_tgt *tgt,struct qla_hw_data *ha = vha->hw;struct fc_port *sess =NULL ;unsigned long flags =0 , flags2 =0 ; -uint32_t be_s_id;uint8_t s_id[3 ];int rc;
@@ -6208,8 +6207,7 @@ static void qlt_abort_work(struct qla_tgt *tgt, s_id[1 ] = prm->abts.fcp_hdr_le.s_id[1 ]; s_id[2 ] = prm->abts.fcp_hdr_le.s_id[0 ]; - sess = ha->tgt.tgt_ops->find_sess_by_s_id (vha, - (unsigned char *)&be_s_id); + sess = ha->tgt.tgt_ops->find_sess_by_s_id (vha, s_id);if (!sess) {spin_unlock_irqrestore (&ha->tgt.sess_lock, flags2);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/180 scsi: qla2xxx: Fix qla24xx_process_bidir_cmd()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit c29282c65d1cf54daeea63be46243d7f69d72f4d ]
Set the r??_data_len variables before using these instead of after.
This patch fixes the following Coverity complaint:
const: At condition req_data_len != rsp_data_len, the value of req_data_len must be equal to 0.
const: At condition req_data_len != rsp_data_len, the value of rsp_data_len must be equal to 0.dead_error_condition: The condition req_data_len != rsp_data_len cannot be true.
--- drivers/scsi/qla2xxx/qla_bsg.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_bsg.c +5 -6
@@ -1782,8 +1782,8 @@ qla24xx_process_bidir_cmd(struct bsg_job *bsg_job)uint16_t nextlid =0 ;uint32_t tot_dsds;srb_t *sp =NULL ; -uint32_t req_data_len =0 ; -uint32_t rsp_data_len =0 ; +uint32_t req_data_len; +uint32_t rsp_data_len;/* Check the type of the adapter */ if (!IS_BIDI_CAPABLE (ha)) {
@@ -1888,6 +1888,9 @@ qla24xx_process_bidir_cmd(struct bsg_job *bsg_job) goto done_unmap_sg; } + req_data_len = bsg_job->request_payload.payload_len; + rsp_data_len = bsg_job->reply_payload.payload_len; +if (req_data_len != rsp_data_len) { rval =EXT_STATUS_BUSY ; ql_log(ql_log_warn, vha, 0x70aa,
@@ -1895,10 +1898,6 @@ qla24xx_process_bidir_cmd(struct bsg_job *bsg_job) goto done_unmap_sg; } - req_data_len = bsg_job->request_payload.payload_len; - rsp_data_len = bsg_job->reply_payload.payload_len; - -/* Alloc SRB structure */ sp =qla2x00_get_sp (vha, &(vha->bidir_fcport),GFP_KERNEL );if (!sp) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/180 scsi: qla2xxx: Always check the qla2x00_wait_for_hba_online() return value
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit e6803efae5acd109fad9f2f07dab674563441a53 ]
This patch fixes several Coverity complaints about not always checking the qla2x00_wait_for_hba_online() return value.
--- drivers/scsi/qla2xxx/qla_attr.c | 3 ++- drivers/scsi/qla2xxx/qla_target.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +2 -1
@@ -725,7 +725,8 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,break ; }else {/* Make sure FC side is not in reset */ -qla2x00_wait_for_hba_online (vha); +WARN_ON_ONCE (qla2x00_wait_for_hba_online (vha) != +QLA_SUCCESS );/* Issue MPI reset */ scsi_block_requests (vha->host);
drivers/scsi/qla2xxx/qla_target.c +5 -2
@@ -6681,7 +6681,8 @@ qlt_enable_vha(struct scsi_qla_host *vha) }else {set_bit (ISP_ABORT_NEEDED , &base_vha->dpc_flags);qla2xxx_wake_dpc (base_vha); -qla2x00_wait_for_hba_online (base_vha); +WARN_ON_ONCE (qla2x00_wait_for_hba_online (base_vha) != +QLA_SUCCESS ); }mutex_unlock (&ha->optrom_mutex); }
@@ -6712,7 +6713,9 @@ static void qlt_disable_vha(struct scsi_qla_host *vha)set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);qla2xxx_wake_dpc (vha); -qla2x00_wait_for_hba_online (vha); +if (qla2x00_wait_for_hba_online (vha) !=QLA_SUCCESS ) +ql_dbg (ql_dbg_tgt, vha,0xe081 , +"qla2x00_wait_for_hba_online() failed\n" ); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 148/180 scsi: qla2xxx: Check secondary image if reading the primary image fails
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 0597fe601a3a7d103c35b922046251906e0349b3 ]
This patch fixes several Coverity complaints about reading data that has not been initialized.
--- drivers/scsi/qla2xxx/qla_init.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +6 -2
@@ -7624,8 +7624,12 @@ qla27xx_get_active_image(struct scsi_qla_host *vha, goto check_sec_image; } -qla24xx_read_flash_data (vha, (void *)(&pri_image_status), - ha->flt_region_img_status_pri,sizeof (pri_image_status) >>2 ); +if (qla24xx_read_flash_data (vha, (void *)(&pri_image_status), + ha->flt_region_img_status_pri,sizeof (pri_image_status) >>2 ) != +QLA_SUCCESS ) { +WARN_ON_ONCE (true); + goto check_sec_image; + }qla27xx_print_image (vha,"Primary image" , &pri_image_status);if (qla27xx_check_image_status_signature (&pri_image_status)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/180 scsi: qla2xxx: Make sure that aborted commands are freed
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 0dcec41acb85da33841c2ab56dbf337ed00a3914 ]
The LIO core requires that the target driver callback functions .queue_data_in() and .queue_status() call target_put_sess_cmd() or transport_generic_free_cmd(). These calls may happen synchronously or asynchronously. Make sure that one of these LIO functions is called in case a command has been aborted. This patch avoids that the code for removing a session hangs due to commands that do not make progress.
--- drivers/scsi/qla2xxx/qla_target.c | 13 ++++++++----- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_target.c +8 -5
@@ -3237,7 +3237,8 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,if (!qpair->fw_started || (cmd->reset_count != qpair->chip_reset) || (cmd->sess && cmd->sess->deleted)) { cmd->state =QLA_TGT_STATE_PROCESSED ; -return 0 ; + res =0 ; + goto free; } ql_dbg_qp(ql_dbg_tgt, qpair, 0xe018,
@@ -3248,9 +3249,8 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, res =qlt_pre_xmit_response (cmd, &prm, xmit_type, scsi_status, &full_req_cnt); -if (unlikely (res !=0 )) { -return res; - } +if (unlikely (res !=0 )) + goto free;spin_lock_irqsave (qpair->qp_lock_ptr, flags);
@@ -3270,7 +3270,8 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, vha->flags.online,qla2x00_reset_active (vha), cmd->reset_count, qpair->chip_reset);spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); -return 0 ; + res =0 ; + goto free; }/* Does F/W have an IOCBs for this request */
@@ -3373,6 +3374,8 @@ out_unmap_unlock:qlt_unmap_sg (vha, cmd);spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); +free: + vha->hw->tgt.tgt_ops->free_cmd (cmd);return res; }EXPORT_SYMBOL (qlt_xmit_response);
drivers/scsi/qla2xxx/tcm_qla2xxx.c +4 -0
@@ -620,6 +620,7 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd) {struct qla_tgt_cmd *cmd =container_of (se_cmd, struct qla_tgt_cmd, se_cmd); +struct scsi_qla_host *vha = cmd->vha;if (cmd->aborted) {/* Cmd can loop during Q-full. tcm_qla2xxx_aborted_task
@@ -632,6 +633,7 @@ static int tcm_qla2xxx_queue_data_in(struct se_cmd *se_cmd) cmd->se_cmd.transport_state, cmd->se_cmd.t_state, cmd->se_cmd.se_cmd_flags); + vha->hw->tgt.tgt_ops->free_cmd (cmd);return 0 ; }
@@ -659,6 +661,7 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd) {struct qla_tgt_cmd *cmd =container_of (se_cmd, struct qla_tgt_cmd, se_cmd); +struct scsi_qla_host *vha = cmd->vha;int xmit_type =QLA_TGT_XMIT_STATUS ;if (cmd->aborted) {
@@ -672,6 +675,7 @@ static int tcm_qla2xxx_queue_status(struct se_cmd *se_cmd) cmd,kref_read (&cmd->se_cmd.cmd_kref), cmd->se_cmd.transport_state, cmd->se_cmd.t_state, cmd->se_cmd.se_cmd_flags); + vha->hw->tgt.tgt_ops->free_cmd (cmd);return 0 ; } cmd->bufflen = se_cmd->data_length;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 150/180 scsi: qla2xxx: qla2x00_alloc_fw_dump: set ha->eft
In reply to Greg Kroah-HartmanFrom: Martin Wilck <[email protected]>
[ Upstream commit edbd56472a636ab396f5ee6783e8438fa725a6ee ]
In qla2x00_alloc_fw_dump(), an existing EFT buffer (e.g. from previous invocation of qla2x00_alloc_offload_mem()) is freed. The buffer is then re-allocated, but without setting the eft and eft_dma fields to the new values.
--- drivers/scsi/qla2xxx/qla_init.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla2xxx/qla_init.c +2 -0
@@ -3317,6 +3317,8 @@ try_eft:ql_dbg (ql_dbg_init, vha,0x00c3 ,"Allocated (%d KB) EFT ...\n" ,EFT_SIZE /1024 ); eft_size =EFT_SIZE ; + ha->eft_dma = tc_dma; + ha->eft = tc; }if (IS_QLA27XX (ha) ||IS_QLA28XX (ha)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 151/180 scsi: qla2xxx: Fix message indicating vectors used by driver
In reply to Greg Kroah-HartmanFrom: Himanshu Madhani <[email protected]>
[ Upstream commit da48b82425b8bf999fb9f7c220e967c4d661b5f8 ]
This patch updates log message which indicates number of vectors used by the driver instead of displaying failure to get maximum requested vectors. Driver will always request maximum vectors during initialization. In the event driver is not able to get maximum requested vectors, it will adjust the allocated vectors. This is normal and does not imply failure in driver.
--- drivers/scsi/qla2xxx/qla_isr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +2 -4
@@ -3471,10 +3471,8 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) ha->msix_count, ret); goto msix_out; }else if (ret < ha->msix_count) { -ql_log (ql_log_warn, vha,0x00c6 , -"MSI-X: Failed to enable support " -"with %d vectors, using %d vectors.\n" , - ha->msix_count, ret); +ql_log (ql_log_info, vha,0x00c6 , +"MSI-X: Using %d vectors\n" , ret); ha->msix_count = ret;/* Recalculate queue values */ if (ha->mqiobase && (ql2xmqsupport || ql2xnvmeenable)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 152/180 scsi: qla2xxx: Fix flash read for Qlogic ISPs
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit cb92cb1657c438efe7c88c9759f40c0a9d46c353 ]
Use adapter specific callback to read flash instead of ISP adapter specific.
--- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx.c | 1 + drivers/scsi/qla2xxx/qla_sup.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -2
@@ -8385,7 +8385,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) active_regions.aux.vpd_nvram ==QLA27XX_PRIMARY_IMAGE ? "primary" : "secondary"); } -qla24xx_read_flash_data (vha, ha->vpd, faddr, ha->vpd_size >>2 ); + ha->isp_ops->read_optrom (vha, ha->vpd, faddr <<2 , ha->vpd_size);/* Get NVRAM data into cache and calculate checksum. */ faddr = ha->flt_region_nvram;
@@ -8397,7 +8397,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)"Loading %s nvram image.\n" , active_regions.aux.vpd_nvram ==QLA27XX_PRIMARY_IMAGE ? "primary" : "secondary"); -qla24xx_read_flash_data (vha, ha->nvram, faddr, ha->nvram_size >>2 ); + ha->isp_ops->read_optrom (vha, ha->nvram, faddr <<2 , ha->nvram_size); dptr = (uint32_t *)nv;for (cnt =0 , chksum =0 ; cnt < ha->nvram_size >>2 ; cnt++, dptr++)
drivers/scsi/qla2xxx/qla_nx.c +1 -0
@@ -2288,6 +2288,7 @@ qla82xx_disable_intrs(struct qla_hw_data *ha)scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev);qla82xx_mbx_intr_disable (vha); +spin_lock_irq (&ha->hardware_lock);if (IS_QLA8044 (ha))qla8044_wr_reg (ha,LEG_INTR_MASK_OFFSET ,1 );
drivers/scsi/qla2xxx/qla_sup.c +4 -4
@@ -680,8 +680,8 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) ha->flt_region_flt = flt_addr; wptr = (uint16_t *)ha->flt; -qla24xx_read_flash_data (vha, (void *)flt, flt_addr, - (sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE ) >>2 ); + ha->isp_ops->read_optrom (vha, (void *)flt, flt_addr <<2 , + (sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE ));if (le16_to_cpu (*wptr) ==0xffff ) goto no_flash_data;
@@ -948,11 +948,11 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)struct req_que *req = ha->req_q_map[0 ];uint16_t cnt, chksum;uint16_t *wptr = (void *)req->ring; -struct qla_fdt_layout *fdt = (void *)req->ring; +struct qla_fdt_layout *fdt = (struct qla_fdt_layout *)req->ring;uint8_t man_id, flash_id;uint16_t mid =0 , fid =0 ; -qla24xx_read_flash_data (vha, (void *)fdt, ha->flt_region_fdt, + ha->isp_ops->read_optrom (vha, fdt, ha->flt_region_fdt <<2 ,OPTROM_BURST_DWORDS );if (le16_to_cpu (*wptr) ==0xffff ) goto no_flash_data;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 153/180 scsi: qla2xxx: Fix driver reload for ISP82xx
In reply to Greg Kroah-HartmanFrom: Himanshu Madhani <[email protected]>
[ Upstream commit 32a13df21668b92f70f0673387f29251e0f285ec ]
HINT_MBX_INT_PENDING is not guaranteed to be cleared by firmware. Remove check that prevent driver load with ISP82XX.
--- drivers/scsi/qla2xxx/qla_mbx.c | 16 ++-------------- drivers/scsi/qla2xxx/qla_nx.c | 3 ++- 2 files changed, 4 insertions(+), 15 deletions(-)
drivers/scsi/qla2xxx/qla_mbx.c +2 -14
@@ -253,21 +253,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if ((!abort_active && io_lock_on) ||IS_NOPOLLING_TYPE (ha)) {set_bit (MBX_INTR_WAIT , &ha->mbx_cmd_flags); -if (IS_P3P_TYPE (ha)) { -if (RD_REG_DWORD (®->isp82.hint) & -HINT_MBX_INT_PENDING ) { - ha->flags.mbox_busy =0 ; -spin_unlock_irqrestore (&ha->hardware_lock, - flags); - -atomic_dec (&ha->num_pend_mbx_stage2); -ql_dbg (ql_dbg_mbx, vha,0x1010 , -"Pending mailbox timeout, exiting.\n" ); - rval =QLA_FUNCTION_TIMEOUT ; - goto premature_exit; - } +if (IS_P3P_TYPE (ha))WRT_REG_DWORD (®->isp82.hint,HINT_MBX_INT_PENDING ); - }else if (IS_FWI2_CAPABLE (ha)) +else if (IS_FWI2_CAPABLE (ha))WRT_REG_DWORD (®->isp24.hccr,HCCRX_SET_HOST_INT );else WRT_REG_WORD (®->isp.hccr,HCCR_SET_HOST_INT );
drivers/scsi/qla2xxx/qla_nx.c +2 -1
@@ -2287,7 +2287,8 @@ qla82xx_disable_intrs(struct qla_hw_data *ha) {scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev); -qla82xx_mbx_intr_disable (vha); +if (ha->interrupts_on) +qla82xx_mbx_intr_disable (vha);spin_lock_irq (&ha->hardware_lock);if (IS_QLA8044 (ha))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 154/180 scsi: qla2xxx: Fix stuck login session
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit ce0ba496dccfc15d3a8866b845864585b5d316ff ]
Login session was stucked on cable pull. When FW is in the middle PRLI PENDING + driver is in Initiator mode, driver fails to check back with FW to see if the PRLI has completed. This patch would re-check with FW again to make sure PRLI would complete before pushing forward with relogin.
--- drivers/scsi/qla2xxx/qla_init.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +11 -12
@@ -842,6 +842,15 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, fcport->fw_login_state = current_login_state; fcport->d_id = id;switch (current_login_state) { +case DSC_LS_PRLI_PEND : +/* +* In the middle of PRLI. Let it finish. +* Allow relogin code to recheck state again +* with GNL. Push disc_state back to DELETED +* so GNL can go out again +*/ + fcport->disc_state =DSC_DELETED ; +break ;case DSC_LS_PRLI_COMP :if ((e->prli_svc_param_word_3[0 ] &BIT_4 ) ==0 ) fcport->port_type =FCT_INITIATOR ;
@@ -1517,7 +1526,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)u64 wwn;u16 sec; - ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20d8, + ql_dbg(ql_dbg_disc, vha, 0x20d8, "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d lid %d scan %d\n", __func__, fcport->port_name, fcport->disc_state, fcport->fw_login_state, fcport->login_pause, fcport->flags,
@@ -1528,6 +1537,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)return 0 ;if ((fcport->loop_id !=FC_NO_LOOP_ID ) && +qla_dual_mode_enabled (vha) && ((fcport->fw_login_state ==DSC_LS_PLOGI_PEND ) || (fcport->fw_login_state ==DSC_LS_PRLI_PEND )))return 0 ;
@@ -1697,17 +1707,6 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha, fcport->last_login_gen, fcport->login_gen, fcport->flags); -if ((fcport->fw_login_state ==DSC_LS_PLOGI_PEND ) || - (fcport->fw_login_state ==DSC_LS_PRLI_PEND )) -return ; - -if (fcport->fw_login_state ==DSC_LS_PLOGI_COMP ) { -if (time_before_eq (jiffies, fcport->plogi_nack_done_deadline)) { -set_bit (RELOGIN_NEEDED , &vha->dpc_flags); -return ; - } - } -if (fcport->last_rscn_gen != fcport->rscn_gen) {ql_dbg (ql_dbg_disc, vha,0x20e9 ,"%s %d %8phC post gnl\n" , __func__, __LINE__, fcport->port_name);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/180 scsi: qla2xxx: Fix stale session
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 2037ce49d30a0d07348df406ef78f6664f4bc899 ]
On fast cable pull, where driver is unable to detect device has disappeared and came back based on switch info, qla2xxx would not re-login while remote port has already invalidated the session. This causes IO timeout. This patch would relogin to remote device for RSCN affected port.
--- drivers/scsi/qla2xxx/qla_gs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +3 -2
@@ -3674,7 +3674,6 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)list_for_each_entry (fcport, &vha->vp_fcports, list) {if (memcmp (rp->port_name, fcport->port_name,WWN_SIZE ))continue ; - fcport->scan_needed =0 ; fcport->scan_state =QLA_FCPORT_FOUND ; found = true;/*
@@ -3683,10 +3682,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 ) {qla2x00_clear_loop_id (fcport); fcport->flags |=FCF_FABRIC_DEVICE ; - }else if (fcport->d_id.b24 != rp->id.b24) { + }else if (fcport->d_id.b24 != rp->id.b24 || + fcport->scan_needed) {qlt_schedule_sess_for_deletion (fcport); } fcport->d_id.b24 = rp->id.b24; + fcport->scan_needed =0 ;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/180 scsi: qla2xxx: Fix SRB leak on switch command timeout
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit af2a0c51b1205327f55a7e82e530403ae1d42cbb ]
when GPSC/GPDB switch command fails, driver just returns without doing a proper cleanup. This patch fixes this memory leak by calling sp->free() in the error path.
--- drivers/scsi/qla2xxx/qla_gs.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 11 +++++------ drivers/scsi/qla2xxx/qla_mbx.c | 4 ---- drivers/scsi/qla2xxx/qla_mid.c | 11 ++++------- drivers/scsi/qla2xxx/qla_os.c | 7 ++++++- 5 files changed, 16 insertions(+), 19 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +1 -1
@@ -3029,7 +3029,7 @@ static void qla24xx_async_gpsc_sp_done(void *s, int res) fcport->flags &= ~(FCF_ASYNC_SENT |FCF_ASYNC_ACTIVE );if (res ==QLA_FUNCTION_TIMEOUT ) -return ; + goto done;if (res == (DID_ERROR <<16 )) {/* entry status error */
drivers/scsi/qla2xxx/qla_init.c +5 -6
@@ -1169,13 +1169,11 @@ void qla24xx_async_gpdb_sp_done(void *s, int res)"Async done-%s res %x, WWPN %8phC mb[1]=%x mb[2]=%x \n" , sp->name, res, fcport->port_name, mb[1], mb[2]); -if (res ==QLA_FUNCTION_TIMEOUT ) { -dma_pool_free (sp->vha->hw->s_dma_pool, sp->u.iocb_cmd.u.mbx.in, - sp->u.iocb_cmd.u.mbx.in_dma); -return ; - } - fcport->flags &= ~(FCF_ASYNC_SENT |FCF_ASYNC_ACTIVE ); + +if (res ==QLA_FUNCTION_TIMEOUT ) + goto done; +memset (&ea,0 ,sizeof (ea)); ea.event =FCME_GPDB_DONE ; ea.fcport = fcport;
@@ -1183,6 +1181,7 @@ void qla24xx_async_gpdb_sp_done(void *s, int res)qla2x00_fcport_event_handler (vha, &ea); +done:dma_pool_free (ha->s_dma_pool, sp->u.iocb_cmd.u.mbx.in, sp->u.iocb_cmd.u.mbx.in_dma);
drivers/scsi/qla2xxx/qla_mbx.c +0 -4
@@ -6285,17 +6285,13 @@ int qla24xx_send_mb_cmd(struct scsi_qla_host *vha, mbx_cmd_t *mcp)case QLA_SUCCESS :ql_dbg (ql_dbg_mbx, vha,0x119d ,"%s: %s done.\n" , __func__, sp->name); - sp->free (sp);break ;default :ql_dbg (ql_dbg_mbx, vha,0x119e ,"%s: %s Failed. %x.\n" , __func__, sp->name, rval); - sp->free (sp);break ; } -return rval; - done_free_sp: sp->free (sp); done:
drivers/scsi/qla2xxx/qla_mid.c +4 -7
@@ -934,7 +934,7 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd) sp =qla2x00_get_sp (base_vha,NULL ,GFP_KERNEL );if (!sp) - goto done; +return rval; sp->type =SRB_CTRL_VP ; sp->name ="ctrl_vp" ;
@@ -950,7 +950,7 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)ql_dbg (ql_dbg_async, vha,0xffff ,"%s: %s Failed submission. %x.\n" , __func__, sp->name, rval); - goto done_free_sp; + goto done; } ql_dbg(ql_dbg_vport, vha, 0x113f, "%s hndl %x submitted\n",
@@ -968,16 +968,13 @@ int qla24xx_control_vp(scsi_qla_host_t *vha, int cmd)case QLA_SUCCESS :ql_dbg (ql_dbg_vport, vha,0xffff ,"%s: %s done.\n" , __func__, sp->name); - goto done_free_sp; +break ;default :ql_dbg (ql_dbg_vport, vha,0xffff ,"%s: %s Failed. %x.\n" , __func__, sp->name, rval); - goto done_free_sp; +break ; } done: -return rval; - -done_free_sp: sp->free (sp);return rval; }
drivers/scsi/qla2xxx/qla_os.c +6 -1
@@ -1030,7 +1030,7 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd,ql_dbg (ql_dbg_io + ql_dbg_verbose, vha,0x3078 ,"Start scsi failed rval=%d for cmd=%p.\n" , rval, cmd);if (rval ==QLA_INTERFACE_ERROR ) - goto qc24_fail_command; + goto qc24_free_sp_fail_command; goto qc24_host_busy_free_sp; }
@@ -1047,6 +1047,11 @@ qc24_host_busy: qc24_target_busy:return SCSI_MLQUEUE_TARGET_BUSY ; +qc24_free_sp_fail_command: + sp->free (sp); +CMD_SP (cmd) =NULL ; +qla2xxx_rel_qpair_sp (sp->qpair, sp); + qc24_fail_command: cmd->scsi_done (cmd);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/180 scsi: qla2xxx: Fix a dma_pool_free() call
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 162b805e38327135168cb0938bd37b131b481cb0 ]
This patch fixes the following kernel warning:
DMA-API: qla2xxx 0000:00:0a.0: device driver frees DMA memory with different size [device address=0x00000000c7b60000] [map size=4088 bytes] [unmap size=512 bytes]
WARNING: CPU: 3 PID: 1122 at kernel/dma/debug.c:1021 check_unmap+0x4d0/0xbd0 CPU: 3 PID: 1122 Comm: rmmod Tainted: G O 5.4.0-rc1-dbg+ #1 RIP: 0010:check_unmap+0x4d0/0xbd0 Call Trace: debug_dma_free_coherent+0x123/0x173 dma_free_attrs+0x76/0xe0 qla2x00_mem_free+0x329/0xc40 [qla2xxx_scst] qla2x00_free_device+0x170/0x1c0 [qla2xxx_scst] qla2x00_remove_one+0x4f0/0x6d0 [qla2xxx_scst] pci_device_remove+0xd5/0x1f0 device_release_driver_internal+0x159/0x280 driver_detach+0x8b/0xf2 bus_remove_driver+0x9a/0x15a driver_unregister+0x51/0x70 pci_unregister_driver+0x2d/0x130 qla2x00_module_exit+0x1c/0xbc [qla2xxx_scst] __x64_sys_delete_module+0x22a/0x300 do_syscall_64+0x6f/0x2e0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/scsi/qla2xxx/qla_os.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_os.c +2 -1
@@ -4703,7 +4703,8 @@ qla2x00_mem_free(struct qla_hw_data *ha) ha->sfp_data =NULL ;if (ha->flt) -dma_free_coherent (&ha->pdev->dev,SFP_DEV_SIZE , +dma_free_coherent (&ha->pdev->dev, +sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE , ha->flt, ha->flt_dma); ha->flt =NULL ; ha->flt_dma =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/180 Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
In reply to Greg Kroah-HartmanFrom: Martin K. Petersen <[email protected]>
[ Upstream commit 5a993e507ee65a28eca6690ee11868555c4ca46b ]
This reverts commit 2f856d4e8c23f5ad5221f8da4a2f22d090627f19.
This patch was found to introduce a double free regression. The issue it originally attempted to address was fixed in patch f45bca8c5052 ("scsi: qla2xxx: Fix double scsi_done for abort path").
--- drivers/scsi/qla2xxx/qla_os.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +0 -4
@@ -947,8 +947,6 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) qc24_host_busy_free_sp: sp->free (sp); -CMD_SP (cmd) =NULL ; -qla2x00_rel_sp (sp); qc24_host_busy:return SCSI_MLQUEUE_HOST_BUSY ;
@@ -1038,8 +1036,6 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, qc24_host_busy_free_sp: sp->free (sp); -CMD_SP (cmd) =NULL ; -qla2xxx_rel_qpair_sp (sp->qpair, sp); qc24_host_busy:return SCSI_MLQUEUE_HOST_BUSY ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/180 scsi: qla2xxx: Fix a race condition between aborting and completing a SCSI command
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 85cffefa09e448906a6f0bc20f422d75a18675bd ]
Instead of allocating a struct srb dynamically from inside .queuecommand(), set qla2xxx_driver_template.cmd_size such that struct scsi_cmnd and struct srb are contiguous. Do not call QLA_QPAIR_MARK_BUSY() / QLA_QPAIR_MARK_NOT_BUSY() for SRBs associated with SCSI commands. That is safe because scsi_remove_host() is called before queue pairs are deleted and scsi_remove_host() waits for all outstanding SCSI commands to finish.
--- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 45 ++++++---------------------------- 2 files changed, 8 insertions(+), 38 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +0 -1
@@ -562,7 +562,6 @@ typedef struct srb { } srb_t;#define GET_CMD_SP (sp) (sp->u.scmd.cmd) -#define SET_CMD_SP (sp, cmd) (sp->u.scmd.cmd = cmd)#define GET_CMD_CTX_SP (sp) (sp->u.scmd.ctx)#define GET_CMD_SENSE_LEN (sp) \
drivers/scsi/qla2xxx/qla_os.c +8 -37
103 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/180 scsi: qla2xxx: Fix double scsi_done for abort path
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit f45bca8c5052e8c59bab64ee90c44441678b9a52 ]
Current code assumes abort will remove the original command from the active list where scsi_done will not be called. Instead, the eh_abort thread will do the scsi_done. That is not the case. Instead, we have a double scsi_done calls triggering use after free.
Abort will tell FW to release the command from FW possesion. The original command will return to ULP with error in its normal fashion via scsi_done. eh_abort path would wait for the original command completion before returning. eh_abort path will not perform the scsi_done call.
--- drivers/scsi/qla2xxx/qla_def.h | 5 +- drivers/scsi/qla2xxx/qla_isr.c | 5 ++ drivers/scsi/qla2xxx/qla_nvme.c | 4 +- drivers/scsi/qla2xxx/qla_os.c | 118 +++++++++++++++++--------------- 4 files changed, 74 insertions(+), 58 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +4 -1
@@ -531,13 +531,16 @@ typedef struct srb {*/ uint8_t cmd_type;uint8_t pad[3 ]; -atomic_t ref_count;struct kref cmd_kref;/* need to migrate ref_count over to this */ void *priv;wait_queue_head_t nvme_ls_waitq;struct fc_port *fcport;struct scsi_qla_host *vha; unsigned int start_timer:1; + unsigned int abort:1; + unsigned int aborted:1; + unsigned int completed:1; +uint32_t handle;uint16_t flags;uint16_t type;
drivers/scsi/qla2xxx/qla_isr.c +5 -0
@@ -2473,6 +2473,11 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)return ; } +if (sp->abort) + sp->aborted =1 ; +else + sp->completed =1 ; +if (sp->cmd_type !=TYPE_SRB ) { req->outstanding_cmds[handle] =NULL ; ql_dbg(ql_dbg_io, vha, 0x3015,
drivers/scsi/qla2xxx/qla_nvme.c +2 -2
@@ -227,8 +227,8 @@ static void qla_nvme_abort_work(struct work_struct *work)if (ha->flags.host_shutting_down) {ql_log (ql_log_info, sp->fcport->vha,0xffff , -"%s Calling done on sp: %p, type: 0x%x, sp->ref_count: 0x%x\n" , - __func__, sp, sp->type,atomic_read (&sp->ref_count)); +"%s Calling done on sp: %p, type: 0x%x\n" , + __func__, sp, sp->type); sp->done (sp,0 ); goto out; }
drivers/scsi/qla2xxx/qla_os.c +63 -55
228 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/180 scsi: qla2xxx: Introduce the function qla2xxx_init_sp()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit bdb61b9b944d1e5b7cee5a9fe21014363c55b811 ]
This patch does not change any functionality but makes the next patch easier to read.
--- drivers/scsi/qla2xxx/qla_inline.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/scsi/qla2xxx/qla_inline.h +15 -13
@@ -152,6 +152,18 @@ qla2x00_chip_is_down(scsi_qla_host_t *vha)return (qla2x00_reset_active (vha) || !vha->hw->flags.fw_started); } +static void qla2xxx_init_sp (srb_t *sp,scsi_qla_host_t *vha, +struct qla_qpair *qpair,fc_port_t *fcport) +{ +memset (sp,0 ,sizeof (*sp)); + sp->fcport = fcport; + sp->iocbs =1 ; + sp->vha = vha; + sp->qpair = qpair; + sp->cmd_type =TYPE_SRB ; +INIT_LIST_HEAD (&sp->elem); +} +static inline srb_t *qla2xxx_get_qpair_sp (scsi_qla_host_t *vha,struct qla_qpair *qpair,fc_port_t *fcport,gfp_t flag)
@@ -164,19 +176,9 @@ qla2xxx_get_qpair_sp(scsi_qla_host_t *vha, struct qla_qpair *qpair,return NULL ; sp =mempool_alloc (qpair->srb_mempool, flag); -if (!sp) - goto done; - -memset (sp,0 ,sizeof (*sp)); - sp->fcport = fcport; - sp->iocbs =1 ; - sp->vha = vha; - sp->qpair = qpair; - sp->cmd_type =TYPE_SRB ; -INIT_LIST_HEAD (&sp->elem); - -done: -if (!sp) +if (sp) +qla2xxx_init_sp (sp, vha, qpair, fcport); +else QLA_QPAIR_MARK_NOT_BUSY (qpair);return sp; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/180 iio: imu: st_lsm6dsx: move odr_table in st_lsm6dsx_sensor_settings
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 40dd7343897760c4b617faa78d213e25652de9a6 ]
Move sensor odr table in st_lsm6dsx_sensor_settings in order to support sensors with different odr maps. This is a preliminary patch to add support for LSM9DS1 sensor to st_lsm6dsx driver
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 196 ++++++++++++++++--- 2 files changed, 166 insertions(+), 32 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +2 -0
@@ -198,6 +198,7 @@ struct st_lsm6dsx_ext_dev_settings {* @wai: Sensor WhoAmI default value. * @max_fifo_size: Sensor max fifo length in FIFO words. * @id: List of hw id/device name supported by the driver configuration. +* @odr_table: Hw sensors odr table (Hz + val). * @decimator: List of decimator register info (addr + mask). * @batch: List of FIFO batching register info (addr + mask). * @fifo_ops: Sensor hw FIFO parameters.
@@ -211,6 +212,7 @@ struct st_lsm6dsx_settings {enum st_lsm6dsx_hw_id hw_id;const char *name; } id[ST_LSM6DSX_MAX_ID ]; +struct st_lsm6dsx_odr_table_entry odr_table[2 ];struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID ];struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID ];struct st_lsm6dsx_fifo_ops fifo_ops;
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +164 -32
278 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/180 iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit fc3f6ad7f5dc6c899fbda0255865737bac88c2e0 ]
Since st_lsm6dsx i2c master controller relies on accel device as trigger and slave devices can run at different ODRs we must select an accel_odr >= slave_odr. Report real accel ODR in st_lsm6dsx_check_odr() in order to properly set sensor frequency in st_lsm6dsx_write_raw and avoid to report unsupported frequency
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +5 -4
@@ -705,8 +705,7 @@ int st_lsm6dsx_check_odr(struct st_lsm6dsx_sensor *sensor, u16 odr, u8 *val)return -EINVAL ; *val = odr_table->odr_avl[i].val; - -return 0 ; +return odr_table->odr_avl[i].hz; } static u16 st_lsm6dsx_check_odr_dependency(struct st_lsm6dsx_hw *hw, u16 odr,
@@ -869,8 +868,10 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,case IIO_CHAN_INFO_SAMP_FREQ : {u8 data; - err =st_lsm6dsx_check_odr (sensor, val, &data); -if (!err) + val =st_lsm6dsx_check_odr (sensor, val, &data); +if (val <0 ) + err = val; +else sensor->odr = val;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/180 iio: ad7949: kill pointless "readback"-handling code
In reply to Greg Kroah-HartmanFrom: Andrea Merello <[email protected]>
[ Upstream commit c270bbf7bb9ddc4e2a51b3c56557c377c9ac79bc ]
The device could be configured to spit out also the configuration word while reading the AD result value (in the same SPI xfer) - this is called "readback" in the device datasheet.
The driver checks if readback is enabled and it eventually adjusts the SPI xfer length and it applies proper shifts to still get the data, discarding the configuration word.
The readback option is actually never enabled (the driver disables it), so the said checks do not serve for any purpose.
Since enabling the readback option seems not to provide any advantage (the driver entirely sets the configuration word without relying on any default value), just kill the said, unused, code.
--- drivers/iio/adc/ad7949.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-)
drivers/iio/adc/ad7949.c +3 -24
@@ -57,29 +57,11 @@ struct ad7949_adc_chip {u32 buffer____cacheline_aligned ; }; -static bool ad7949_spi_cfg_is_read_back (struct ad7949_adc_chip *ad7949_adc) -{ -if (!(ad7949_adc->cfg &AD7949_CFG_READ_BACK )) -return true; - -return false; -} - -static int ad7949_spi_bits_per_word (struct ad7949_adc_chip *ad7949_adc) -{ -int ret = ad7949_adc->resolution; - -if (ad7949_spi_cfg_is_read_back (ad7949_adc)) - ret +=AD7949_CFG_REG_SIZE_BITS ; - -return ret; -} -static int ad7949_spi_write_cfg (struct ad7949_adc_chip *ad7949_adc,u16 val,u16 mask) {int ret; -int bits_per_word =ad7949_spi_bits_per_word (ad7949_adc); +int bits_per_word = ad7949_adc->resolution;int shift = bits_per_word -AD7949_CFG_REG_SIZE_BITS ;struct spi_message msg;struct spi_transfer tx[] = {
@@ -107,7 +89,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val, unsigned int channel) {int ret; -int bits_per_word =ad7949_spi_bits_per_word (ad7949_adc); +int bits_per_word = ad7949_adc->resolution;int mask =GENMASK (ad7949_adc->resolution,0 );struct spi_message msg;struct spi_transfer tx[] = {
@@ -138,10 +120,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val, ad7949_adc->current_channel = channel; -if (ad7949_spi_cfg_is_read_back (ad7949_adc)) - *val = (ad7949_adc->buffer >>AD7949_CFG_REG_SIZE_BITS ) & mask; -else - *val = ad7949_adc->buffer & mask; + *val = ad7949_adc->buffer & mask;return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 165/180 iio: ad7949: fix channels mixups
In reply to Greg Kroah-HartmanFrom: Andrea Merello <[email protected]>
[ Upstream commit 3b71f6b59508b1c9befcb43de434866aafc76520 ]
Each time we need to read a sample (from the sysfs interface, since the driver supports only it) the driver writes the configuration register with the proper settings needed to perform the said read, then it runs another xfer to actually read the resulting value. Most notably the configuration register is updated to set the ADC internal MUX depending by which channel the read targets.
Unfortunately this seems not enough to ensure correct operation because the ADC works in a pipelined-like fashion and the new configuration isn't applied in time.
The ADC alternates two phases: acquisition and conversion. During the acquisition phase the ADC samples the analog signal in an internal capacitor; in the conversion phase the ADC performs the actual analog to digital conversion of the stored voltage. Note that of course the MUX needs to be set to the proper channel when the acquisition phase is performed.
Once the conversion phase has been completed, the device automatically switches back to a new acquisition; on the other hand the device switches from acquisition to conversion on the rising edge of SPI cs signal (that is when the xfer finishes).
Only after both two phases have been completed (with the proper settings already written in the configuration register since the beginning) it is possible to read the outcome from SPI bus.
With the current driver implementation, we end up in the following situation:
_______ 1st xfer ____________ 2nd xfer ___________________ SPI cs.. \_________/ \_________/ SPI rd.. idle |(val N-2)+ idle | val N-1 + idle ... SPI wr.. idle | cfg N + idle | (X) + idle ...
------------------------ + -------------------- + ------------------
AD .. acq N-1 + cnv N-1 | acq N + cnv N | acq N+1
As shown in the diagram above, the value we read in the Nth read belongs to configuration setting N-1.
In case the configuration is not changed (config[N] == config[N-1]), then we still get correct data, but in case the configuration changes (i.e. switching the MUX on another channel), we get wrong data (data from the previously selected channel).
This patch fixes this by performing one more "dummy" transfer in order to ending up in reading the data when it's really ready, as per the following timing diagram.
_______ 1st xfer ____________ 2nd xfer ___________ 3rd xfer ___ SPI cs.. \_________/ \_________/ \_________/ SPI rd.. idle |(val N-2)+ idle |(val N-1)+ idle | val N + .. SPI wr.. idle | cfg N + idle | (X) + idle | (X) + ..
------------------------ + -------------------- + ------------------- + --
AD .. acq N-1 + cnv N-1 | acq N + cnv N | acq N+1 | ..
NOTE: in the latter case (cfg changes), the acquisition phase for the value to be read begins after the 1st xfer, that is after the read request has been issued on sysfs. On the other hand, if the cfg doesn't change, then we can refer to the fist diagram assuming N == (N - 1); the acquisition phase _begins_ before the 1st xfer (potentially a lot of time before the read has been issued via sysfs, but it _ends_ after the 1st xfer, that is _after_ the read has started. This should guarantee a reasonably fresh data, which value represents the voltage that the sampled signal has after the read start or maybe just around it.
--- drivers/iio/adc/ad7949.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/iio/adc/ad7949.c +17 -5
@@ -89,6 +89,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val, unsigned int channel) {int ret; +int i;int bits_per_word = ad7949_adc->resolution;int mask =GENMASK (ad7949_adc->resolution,0 );struct spi_message msg;
@@ -100,12 +101,23 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val, }, }; - ret =ad7949_spi_write_cfg (ad7949_adc, - channel <<AD7949_OFFSET_CHANNEL_SEL , -AD7949_MASK_CHANNEL_SEL ); -if (ret) -return ret; +/* +* 1: write CFG for sample N and read old data (sample N-2) +* 2: if CFG was not changed since sample N-1 then we'll get good data +* at the next xfer, so we bail out now, otherwise we write something +* and we read garbage (sample N-1 configuration). +*/ +for (i =0 ; i <2 ; i++) { + ret =ad7949_spi_write_cfg (ad7949_adc, + channel <<AD7949_OFFSET_CHANNEL_SEL , +AD7949_MASK_CHANNEL_SEL ); +if (ret) +return ret; +if (channel == ad7949_adc->current_channel) +break ; + } +/* 3: write something and read actual data */ ad7949_adc->buffer =0 ;spi_message_init_with_transfers (&msg, tx,1 ); ret =spi_sync (ad7949_adc->spi, &msg);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 166/180 omap: pdata-quirks: revert pandora specific gpiod additions
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 4e8fad98171babe019db51c15055ec74697e9525 ]
This partly reverts the commit efdfeb079cc3 ("regulator: fixed: Convert to use GPIO descriptor only").
We must remove this from mainline first, so that the following patch to remove the openpandora quirks for mmc3 and wl1251 cleanly applies to stable v4.9, v4.14, v4.19 where the above mentioned patch is not yet present.
Since the code affected is removed (no pandora gpios in pdata-quirks and more), there will be no matching revert-of-the-revert.
--- arch/arm/mach-omap2/pdata-quirks.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
arch/arm/mach-omap2/pdata-quirks.c +4 -15
@@ -7,7 +7,6 @@#include <linux/clk.h> #include <linux/davinci_emac.h> #include <linux/gpio.h> -#include <linux/gpio/machine.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/of_platform.h>
@@ -327,7 +326,9 @@ static struct regulator_init_data pandora_vmmc3 = {static struct fixed_voltage_config pandora_vwlan = { .supply_name ="vwlan" , .microvolts =1800000 ,/* 1.8V */ + .gpio =PANDORA_WIFI_NRESET_GPIO , .startup_delay =50000 ,/* 50ms */ + .enable_high =1 , .init_data = &pandora_vmmc3, };
@@ -339,19 +340,6 @@ static struct platform_device pandora_vwlan_device = { }, }; -static struct gpiod_lookup_table pandora_vwlan_gpiod_table = { - .dev_id ="reg-fixed-voltage.1" , - .table = { -/* -* As this is a low GPIO number it should be at the first -* GPIO bank. -*/ -GPIO_LOOKUP ("gpio-0-31" ,PANDORA_WIFI_NRESET_GPIO , -NULL ,GPIO_ACTIVE_HIGH ), - { }, - }, -}; -static void pandora_wl1251_init_card (struct mmc_card *card) {/*
@@ -373,6 +361,8 @@ static struct omap2_hsmmc_info pandora_mmc3[] = { { .mmc = 3, .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD, + .gpio_cd = -EINVAL, + .gpio_wp = -EINVAL, .init_card = pandora_wl1251_init_card, }, {}/* Terminator */
@@ -411,7 +401,6 @@ fail:static void __init omap3_pandora_legacy_init (void ) {platform_device_register (&pandora_backlight); -gpiod_add_lookup_table (&pandora_vwlan_gpiod_table);platform_device_register (&pandora_vwlan_device);omap_hsmmc_init (pandora_mmc3);omap_hsmmc_late_init (pandora_mmc3);
Signature · 1 line
2.20.1