4.19.85-stable review
Subsystems (9)
Greg Kroah-Hartman
maintainercover 4.19.85-stable review
This is the start of the stable review cycle for the 4.19.85 release. There are 422 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 21 Nov 2019 05:02:35 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.85-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.85-rc1
zhong jiang <[email protected]>
memfd: Use radix_tree_deref_slot_protected to avoid the warning.
Arnd Bergmann <[email protected]>
net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused
Vasily Gorbik <[email protected]>
s390/vdso: correct vdso mapping for compat tasks
Rui Miguel Silva <[email protected]>
media: ov2680: fix null dereference at power on
Israel Rukshin <[email protected]>
IB/iser: Fix possible NULL deref at iser_inv_desc()
Kirill Tkhai <[email protected]>
fuse: use READ_ONCE on congestion_threshold and max_background
Guido Kiener <[email protected]>
usb: usbtmc: uninitialized symbol 'actual' in usbtmc_ioctl_clear
Chunfeng Yun <[email protected]>
usb: xhci-mtk: fix ISOC error when interval is zero
Tan Hu <[email protected]>
netfilter: masquerade: don't flush all conntracks if only one address deleted on device
Alexandre Belloni <[email protected]>
rtc: armada38x: fix possible race condition
Alexandre Belloni <[email protected]>
rtc: tx4939: fixup nvmem name and register size
Alexandre Belloni <[email protected]>
rtc: isl1208: avoid possible sysfs race
Rob Herring <[email protected]>
ARM: dts: lpc32xx: Fix SPI controller node names
Rob Herring <[email protected]>
arm64: dts: lg: Fix SPI controller node names
Rob Herring <[email protected]>
arm64: dts: amd: Fix SPI bus warnings
Finn Thain <[email protected]>
scsi: NCR5380: Check for bus reset
Finn Thain <[email protected]>
scsi: NCR5380: Handle BUS FREE during reselection
Finn Thain <[email protected]>
scsi: NCR5380: Don't call dsprintk() following reselection interrupt
Finn Thain <[email protected]>
scsi: NCR5380: Don't clear busy flag when abort fails
Finn Thain <[email protected]>
scsi: NCR5380: Check for invalid reselection target
Finn Thain <[email protected]>
scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data
Finn Thain <[email protected]>
scsi: NCR5380: Withhold disconnect privilege for REQUEST SENSE
Finn Thain <[email protected]>
scsi: NCR5380: Have NCR5380_select() return a bool
Hannes Reinecke <[email protected]>
scsi: NCR5380: Clear all unissued commands on host reset
Ilan Peer <[email protected]>
iwlwifi: mvm: Allow TKIP for AP mode
Sara Sharon <[email protected]>
iwlwifi: mvm: use correct FIFO length
Golan Ben Ami <[email protected]>
iwlwifi: pcie: fit reclaim msg to MAX_MSG_LEN
Johannes Berg <[email protected]>
iwlwifi: pcie: gen2: build A-MSDU only for GSO
Johannes Berg <[email protected]>
iwlwifi: api: annotate compressed BA notif array sizes
Sara Sharon <[email protected]>
iwlwifi: pcie: read correct prph address for newer devices
Erel Geron <[email protected]>
iwlwifi: fix non_shared_ant for 22000 devices
Emmanuel Grumbach <[email protected]>
iwlwifi: dbg: don't crash if the firmware crashes in the middle of a debug dump
Dan Aloni <[email protected]>
crypto: fix a memory leak in rsa-kcs1pad's encryption mode
Christoph Manszewski <[email protected]>
crypto: s5p-sss: Fix Fix argument list alignment
Christoph Manszewski <[email protected]>
crypto: s5p-sss: Fix race in error handling
Dexuan Cui <[email protected]>
x86/hyperv: Suppress "PCI: Fatal: No config space access function found"
Sanjay Kumar Konduri <[email protected]>
Bluetooth: btrsi: fix bt tx timeout issue
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS
Balakrishna Godavarthi <[email protected]>
Bluetooth: hci_serdev: clear HCI_UART_PROTO_READY to avoid closing proto races
Stuart Hayes <[email protected]>
firmware: dell_rbu: Make payload memory uncachable
Rob Herring <[email protected]>
ARM: dts: realview: Fix SPI controller node names
Justin Ernst <[email protected]>
EDAC: Raise the maximum number of memory controllers
Arnd Bergmann <[email protected]>
RDMA: Fix dependencies for rdma_user_mmap_io
Chao Yu <[email protected]>
f2fs: mark inode dirty explicitly in recover_inode()
Chao Yu <[email protected]>
f2fs: fix to recover inode's project id during POR
Jaegeuk Kim <[email protected]>
f2fs: update i_size after DIO completion
Keith Busch <[email protected]>
PCI/ERR: Run error recovery callbacks for all affected devices
YueHaibing <[email protected]>
net: faraday: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: smsc: fix return type of ndo_start_xmit function
Marc Dietrich <[email protected]>
ARM: dts: paz00: fix wakeup gpio keycode
Marcel Ziswiler <[email protected]>
ARM: tegra: colibri_t30: fix mcp2515 can controller interrupt polarity
Marcel Ziswiler <[email protected]>
ARM: tegra: apalis_t30: fix mcp2515 can controller interrupt polarity
Marcel Ziswiler <[email protected]>
ARM: tegra: apalis_t30: fix mmc1 cmd pull-up
Marcel Ziswiler <[email protected]>
ARM: dts: tegra20: restore address order
Marcel Ziswiler <[email protected]>
ARM: dts: tegra30: fix xcvr-setup-use-fuses
Thierry Reding <[email protected]>
arm64: tegra: I2C on Tegra194 is not compatible with Tegra114
Fabio Estevam <[email protected]>
ARM: dts: imx51-zii-rdu1: Fix the rtc compatible string
Rob Herring <[email protected]>
arm64: dts: fsl: Fix I2C and SPI bus warnings
Martin Blumenstingl <[email protected]>
ARM: dts: meson8b: odroidc1: enable the SAR ADC
Hauke Mehrtens <[email protected]>
phy: lantiq: Fix compile warning
Chengguang Xu <[email protected]>
f2fs: fix remount problem of option io_bits
Jason Yan <[email protected]>
scsi: libsas: always unregister the old device if going to discover new
Nathan Chancellor <[email protected]>
iw_cxgb4: Use proper enumerated type in c4iw_bar2_addrs
Alex Williamson <[email protected]>
vfio/pci: Mask buggy SR-IOV VF INTx support
Li Qiang <[email protected]>
vfio/pci: Fix potential memory leak in vfio_msi_cap_len
Stephen Hemminger <[email protected]>
vmbus: keep pointer to ring buffer page
zhong jiang <[email protected]>
misc: genwqe: should return proper error value.
Laura Abbott <[email protected]>
misc: kgdbts: Fix restrict error
Srinivas Kandagatla <[email protected]>
silmbus: ngd: register controller after power up.
Srinivas Kandagatla <[email protected]>
slimbus: ngd: return proper error code instead of zero
Srinivas Kandagatla <[email protected]>
slimbus: ngd: register ngd driver only once.
Suzuki K Poulose <[email protected]>
coresight: dynamic-replicator: Handle multiple connections
Leo Yan <[email protected]>
coresight: tmc: Fix byte-address alignment for RRP
Tomasz Nowicki <[email protected]>
coresight: etm4x: Configure EL2 exception level when kernel is running in HYP
Suzuki K Poulose <[email protected]>
coresight: tmc-etr: Handle driver mode specific ETR buffers
Suzuki K Poulose <[email protected]>
coresight: perf: Disable trace path upon source error
Suzuki K Poulose <[email protected]>
coresight: perf: Fix per cpu path management
Suzuki K Poulose <[email protected]>
coresight: Fix handling of sinks
zhong jiang <[email protected]>
coresight: Use ERR_CAST instead of ERR_PTR
Laurent Pinchart <[email protected]>
usb: gadget: uvc: Only halt video streaming endpoint in bulk mode
Laurent Pinchart <[email protected]>
usb: gadget: uvc: Factor out video USB request queueing
Anson Huang <[email protected]>
ARM: dts: imx6ull: update vdd_soc voltage for 900MHz operating point
Andreas Kemnade <[email protected]>
phy: phy-twl4030-usb: fix denied runtime access
Yoshihiro Shimoda <[email protected]>
phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs
Florian Fainelli <[email protected]>
phy: brcm-sata: allow PHY_BRCM_SATA driver to be built for DSL SoCs
zhong jiang <[email protected]>
ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws
Ricardo Ribalda Delgado <[email protected]>
gpiolib: Fix gpio_direction_* for single direction GPIOs
Brendan Higgins <[email protected]>
i2c: aspeed: fix invalid clock parameters for very large divisors
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Correct audio subsystem parent clock on Peach Chromebooks
Paul Elder <[email protected]>
usb: gadget: uvc: configfs: Sort frame intervals upon writing
Joel Pepper <[email protected]>
usb: gadget: uvc: configfs: Prevent format changes after linking header
Laurent Pinchart <[email protected]>
usb: gadget: uvc: configfs: Drop leaked references to config items
Heiko Stuebner <[email protected]>
ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock
Nathan Chancellor <[email protected]>
media: davinci: Fix implicit enum conversion warning
Brad Love <[email protected]>
media: au0828: Fix incorrect error messages
Jia-Ju Bai <[email protected]>
media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init()
Arnd Bergmann <[email protected]>
media: imx: work around false-positive warning, again
Petr Machata <[email protected]>
mlxsw: Make MLXSW_SP1_FWREV_MINOR a hard requirement
Vicente Bergas <[email protected]>
arm64: dts: rockchip: Fix microSD in rk3399 sapphire board
Dengcheng Zhu <[email protected]>
MIPS: kexec: Relax memory restriction
Qiuxu Zhuo <[email protected]>
EDAC: Correct DIMM capacity unit symbol
Matthew Whitehead <[email protected]>
x86/CPU: Change query logic so CPUID is enabled before testing
Matthew Whitehead <[email protected]>
x86/CPU: Use correct macros for Cyrix calls
YueHaibing <[email protected]>
net: freescale: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: micrel: fix return type of ndo_start_xmit function
Florian Fainelli <[email protected]>
net: phy: mdio-bcm-unimac: Allow configuring MDIO clock divider
Prashant Bhole <[email protected]>
samples/bpf: fix compilation failure
Keith Busch <[email protected]>
PCI/ERR: Use slot reset if available
Keith Busch <[email protected]>
PCI/AER: Don't read upstream ports below fatal errors
Keith Busch <[email protected]>
PCI/AER: Take reference on error devices
Shahed Shaikh <[email protected]>
bnx2x: Ignore bandwidth attention in single function mode
Rob Herring <[email protected]>
ARM: dts: stm32: Fix SPI controller node names
Baruch Siach <[email protected]>
ARM: dts: clearfog: fix sdhci supply property name
Yannick Fertré <[email protected]>
ARM: dts: stm32: enable display on stm32mp157c-ev1 board
Borislav Petkov <[email protected]>
x86/mce-inject: Reset injection struct after injection
Rob Herring <[email protected]>
ARM: dts: marvell: Fix SPI and I2C bus warnings
Stefan Agner <[email protected]>
crypto: arm/crc32 - avoid warning when compiling with Clang
Stefan Agner <[email protected]>
cpufeature: avoid warning when compiling with clang
Eric Biggers <[email protected]>
crypto: chacha20 - Fix chacha20_block() keystream alignment (again)
Nathan Chancellor <[email protected]>
spi: pic32: Use proper enum in dmaengine_prep_slave_rg
Rob Herring <[email protected]>
ARM: dts: ste: Fix SPI controller node names
Linus Walleij <[email protected]>
ARM: dts: ux500: Fix LCDA clock line muxing
Geert Uytterhoeven <[email protected]>
ARM: dts: ux500: Correct SCU unit address
Chao Yu <[email protected]>
f2fs: fix to recover inode's uid/gid during POR
Jaegeuk Kim <[email protected]>
f2fs: avoid infinite loop in f2fs_alloc_nid
Rob Herring <[email protected]>
ARM: dts: ti: Fix SPI and I2C bus warnings
Grygorii Strashko <[email protected]>
ARM: dts: am335x-evm: fix number of cpsw
Keith Busch <[email protected]>
PCI: portdrv: Initialize service drivers directly
Petr Machata <[email protected]>
mlxsw: spectrum: Init shaper for TCs 8..15
Takashi Iwai <[email protected]>
brcmsmac: Use kvmalloc() for ucode allocations
Arend van Spriel <[email protected]>
brcmfmac: increase buffer for obtaining firmware capabilities
Vasily Gorbik <[email protected]>
s390/vdso: correct CFI annotations of vDSO functions
Vasily Gorbik <[email protected]>
s390/vdso: avoid 64-bit vdso mapping for compat tasks
Halil Pasic <[email protected]>
s390/zcrypt: enable AP bus scan without a valid default domain
Guido Kiener <[email protected]>
usb: usbtmc: Fix ioctl USBTMC_IOCTL_ABORT_BULK_OUT
Loic Poulain <[email protected]>
usb: chipidea: Fix otg event handler
Nicolas Adell <[email protected]>
usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started
Jakub Kicinski <[email protected]>
nfp: provide a better warning when ring allocation fails
Jian Shen <[email protected]>
net: hns3: Fix parameter type for q_id in hclge_tm_q_to_qs_map_cfg()
Jian Shen <[email protected]>
net: hns3: Fix client initialize state issue when roce client initialize failed
Jian Shen <[email protected]>
net: hns3: Clear client pointer when initialize client failed or unintialize finished
Jian Shen <[email protected]>
net: hns3: Fix cmdq registers initialization issue for vf
Fuyun Liang <[email protected]>
net: hns3: Fix for setting speed for phy failed problem
YueHaibing <[email protected]>
net: sun: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: amd: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: broadcom: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: xilinx: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: toshiba: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: marvell: fix return type of ndo_start_xmit function
Antoine Tenart <[email protected]>
net: mvpp2: fix the number of queues per cpu for PPv2.2
Andreas Kemnade <[email protected]>
power: supply: twl4030_charger: disable eoc interrupt on linear charge
Andreas Kemnade <[email protected]>
power: supply: twl4030_charger: fix charging current out-of-bounds
Rob Herring <[email protected]>
libfdt: Ensure INT_MAX is defined in libfdt_env.h
Rob Herring <[email protected]>
of/unittest: Fix I2C bus unit-address error
Viresh Kumar <[email protected]>
OPP: Protect dev_list with opp_table lock
Rob Herring <[email protected]>
ARM: dts: atmel: Fix I2C and SPI bus warnings
Håkon Bugge <[email protected]>
RDMA/i40iw: Fix incorrect iterator type
Anton Blanchard <[email protected]>
powerpc: Fix duplicate const clang warning in user access code
Nathan Fontenot <[email protected]>
powerpc/pseries: Disable CPU hotplug across migrations
Nathan Fontenot <[email protected]>
powerpc/pseries/memory-hotplug: Only update DT once per memory DLPAR request
Nicholas Piggin <[email protected]>
powerpc/64s/hash: Fix stab_rr off by one initialization
Breno Leitao <[email protected]>
selftests/powerpc: Do not fail with reschedule
Breno Leitao <[email protected]>
powerpc/iommu: Avoid derefence before pointer check
YueHaibing <[email protected]>
net: ibm: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: cavium: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
net: hns3: fix return type of ndo_start_xmit function
YueHaibing <[email protected]>
ipmi: fix return value of ipmi_set_my_LUN
Corey Minyard <[email protected]>
ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address
Colin Ian King <[email protected]>
ipmi_si: fix potential integer overflow on large shift
Meelis Roos <[email protected]>
ipmi_si_pci: fix NULL device in ipmi_si error message
Shuming Fan <[email protected]>
ASoC: rt5682: Fix the boost volume at the begining of playback
Peter Shih <[email protected]>
spi: mediatek: Don't modify spi_transfer when transfer.
Jonas Gorski <[email protected]>
spi/bcm63xx-hsspi: keep pll clk enabled
Yonghong Song <[email protected]>
samples/bpf: fix a compilation failure
Kishon Vijay Abraham I <[email protected]>
arm64: dts: ti: k3-am65: Change #address-cells and #size-cells of interconnect to 2
Douglas Anderson <[email protected]>
tty: serial: qcom_geni_serial: Fix serial when not used as console
Anton Vasilyev <[email protected]>
serial: mxs-auart: Fix potential infinite loop
Marek Szyprowski <[email protected]>
serial: samsung: Enable baud clock for UART reset procedure in resume
Nava kishore Manne <[email protected]>
serial: uartps: Fix suspend functionality
Rob Herring <[email protected]>
ARM: dts: xilinx: Fix I2C and SPI bus warnings
Gustavo A. R. Silva <[email protected]>
PCI: mediatek: Fix unchecked return value
Jia-Ju Bai <[email protected]>
net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset()
Sinan Kaya <[email protected]>
PCI/ACPI: Correct error message for ASPM disabling
Javier Martinez Canillas <[email protected]>
media: ov2680: don't register the v4l2 subdevice before checking chip ID
Koji Matsuoka <[email protected]>
media: vsp1: Fix YCbCr planar formats pitch calculation
Laurent Pinchart <[email protected]>
media: vsp1: Fix vsp1_regs.h license header
Julian Wiedmann <[email protected]>
s390/qeth: invoke softirqs after napi_schedule()
Julian Wiedmann <[email protected]>
s390/qeth: uninstall IRQ handler on device removal
Dan Carpenter <[email protected]>
ath9k: Fix a locking bug in ath9k_add_interface()
Florian Westphal <[email protected]>
netfilter: nf_tables: avoid BUG_ON usage
Hans de Goede <[email protected]>
ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask
Rob Herring <[email protected]>
arm64: dts: rockchip: Fix I2C bus unit-address error on rk3399-puma-haikou
Rob Herring <[email protected]>
ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036
Vivek Gautam <[email protected]>
scsi: ufshcd: Fix NULL pointer dereference for in ufshcd_init
Haishuang Yan <[email protected]>
ip_gre: fix parsing gre header in ipgre_err
Bernd Edlinger <[email protected]>
kernfs: Fix range checks in kernfs_get_target_path
Banajit Goswami <[email protected]>
component: fix loop condition to call unbind() if bind() fails
Tomasz Figa <[email protected]>
power: supply: max8998-charger: Fix platform data retrieval
Claudiu Beznea <[email protected]>
power: reset: at91-poweroff: do not procede if at91_shdwc is allocated
Dan Carpenter <[email protected]>
power: supply: ab8500_fg: silence uninitialized variable warnings
Rob Herring <[email protected]>
arm64: dts: meson: Fix erroneous SPI bus warnings
Paolo Valente <[email protected]>
blok, bfq: do not plug I/O if all queues are weight-raised
Paolo Valente <[email protected]>
block, bfq: inject other-queue I/O into seeky idle queues on NCQ flash
Hari Vyas <[email protected]>
arm64: fix for bad_mode() handler to always result in panic
Ganesh Goudar <[email protected]>
cxgb4: Fix endianness issue in t4_fwcache()
Sherry Yang <[email protected]>
android: binder: no outgoing transaction when thread todo has transaction
Rob Herring <[email protected]>
ARM: dts: sun9i: Fix I2C bus warnings
Ludovic Desroches <[email protected]>
pinctrl: at91: don't use the same irqchip with multiple gpiochips
Rob Herring <[email protected]>
ARM: dts: sunxi: Fix I2C bus warnings
Dinh Nguyen <[email protected]>
ARM: dts: socfpga: Fix I2C bus unit-address error
Alan Modra <[email protected]>
powerpc/vdso: Correct call frame information
Rob Herring <[email protected]>
ARM: dts: aspeed: Fix I2C bus warnings
Rob Herring <[email protected]>
ARM: dts: bcm: Fix SPI bus warnings
Rob Herring <[email protected]>
arm64: dts: broadcom: Fix I2C and SPI bus warnings
Lina Iyer <[email protected]>
drivers: qcom: rpmh-rsc: clear wait_for_compl after use
Niklas Cassel <[email protected]>
soc: qcom: apr: Avoid string overflow
Niklas Cassel <[email protected]>
soc: qcom: wcnss_ctrl: Avoid string overflow
Douglas Anderson <[email protected]>
soc: qcom: geni: geni_se_clk_freq_match() should always accept multiples
Douglas Anderson <[email protected]>
soc: qcom: geni: Don't ignore clk_round_rate() errors in geni_se_clk_tbl_get()
Christian Lamparter <[email protected]>
ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value
Cong Wang <[email protected]>
llc: avoid blocking in llc_sap_close()
Dan Carpenter <[email protected]>
pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map()
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r8a77965: Fix clock/reset for usb2_phy1
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: r8a77965: Fix HS-USB compatible
Magnus Damm <[email protected]>
arm64: dts: renesas: r8a77965: Attach the SYS-DMAC to the IPMMU
Kieran Bingham <[email protected]>
arm64: dts: renesas: salvator-common: adv748x: Override secondary addresses
Takashi Iwai <[email protected]>
ALSA: intel8x0m: Register irq handler after register initializations
Neil Armstrong <[email protected]>
arm64: dts: meson-axg: use the proper compatible for ethmac
Jerome Brunet <[email protected]>
arm64: dts: meson: libretech: update board model
Andrew Lunn <[email protected]>
net: bcmgenet: Fix speed selection for reverse MII
Arnd Bergmann <[email protected]>
media: dvb: fix compat ioctl translation
Lao Wei <[email protected]>
media: fix: media: pci: meye: validate offset to avoid arbitrary access
Mark Brown <[email protected]>
ALSA: hda: Fix implicit definition of pci_iomap() on SH
Geert Uytterhoeven <[email protected]>
media: dt-bindings: adv748x: Fix decimal unit addresses
Srinivas Kandagatla <[email protected]>
nvmem: core: return error code instead of NULL from nvmem_device_get
Michael Kelley <[email protected]>
Drivers: hv: vmbus: Fix synic per-cpu context initialization
Yana Esina <[email protected]>
net: aquantia: fix hw_atl_utils_fw_upload_dwords
Masami Hiramatsu <[email protected]>
kprobes: Don't call BUG_ON() if there is a kprobe in use on free list
Deepak Ukey <[email protected]>
scsi: pm80xx: Fixed system hang issue during kexec boot
Deepak Ukey <[email protected]>
scsi: pm80xx: Corrected dma_unmap_sg() parameter
Oleksij Rempel <[email protected]>
ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set
George Kennedy <[email protected]>
scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir()
James Smart <[email protected]>
scsi: lpfc: Fix errors in log messages.
James Smart <[email protected]>
scsi: lpfc: Correct invalid EQ doorbell write on if_type=6
James Smart <[email protected]>
scsi: lpfc: Fix GFT_ID and PRLI logic for RSCN
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix duplicate switch's Nport ID entries
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix dropped srb resource.
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix port speed display on chip reset
Sawan Chandak <[email protected]>
scsi: qla2xxx: Check for Register disconnect
Quinn Tran <[email protected]>
scsi: qla2xxx: Increase abort timeout value
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix deadlock between ATIO and HW lock
Quinn Tran <[email protected]>
scsi: qla2xxx: Terminate Plogi/PRLI if WWN is 0
Quinn Tran <[email protected]>
scsi: qla2xxx: Defer chip reset until target mode is enabled
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix iIDMA error
Quinn Tran <[email protected]>
scsi: qla2xxx: Use correct qpair for ABTS/CMD
Wang Shilong <[email protected]>
f2fs: fix setattr project check upon fssetxattr ioctl
Chao Yu <[email protected]>
f2fs: fix memory leak of percpu counter in fill_super()
Chao Yu <[email protected]>
f2fs: fix memory leak of write_io in fill_super()
Eric W. Biederman <[email protected]>
signal: Properly deliver SIGSEGV from x86 uprobes
Eric W. Biederman <[email protected]>
signal: Properly deliver SIGILL from uprobes
Eric W. Biederman <[email protected]>
signal: Always ignore SIGKILL and SIGSTOP sent to the global init
Michael J. Ruhl <[email protected]>
IB/hfi1: Missing return value in error path for user sdma
Dan Carpenter <[email protected]>
RDMA/hns: Fix an error code in hns_roce_v2_init_eq_table()
Dan Carpenter <[email protected]>
dmaengine: at_xdmac: remove a stray bottom half unlock
Felix Fietkau <[email protected]>
ath9k: add back support for using active monitor interfaces for tx99
Alexandre Belloni <[email protected]>
rtc: pl030: fix possible race condition
Alexandre Belloni <[email protected]>
rtc: mt6397: fix possible race condition
Qiuxu Zhuo <[email protected]>
EDAC, sb_edac: Return early on ADDRV bit and address type test
Daniel Silsby <[email protected]>
dmaengine: dma-jz4780: Further residue status fix
Paul Cercueil <[email protected]>
dmaengine: dma-jz4780: Don't depend on MACH_JZ4780
Chunfeng Yun <[email protected]>
usb: mtu3: disable vbus rise/fall interrupts of ltssm
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Disable pull control for PMIC IRQ line on Artik5 board
Radu Pirea <[email protected]>
tty/serial: atmel: Change the driver to work under at91-usart MFD
Vicente Bergas <[email protected]>
arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire
Sudeep Holla <[email protected]>
firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings
Uwe Kleine-König <[email protected]>
sched/debug: Use symbolic names for task state constants
Peter Zijlstra <[email protected]>
sched/debug: Explicitly cast sched_feat() to bool
YueHaibing <[email protected]>
failover: Fix error return code in net_failover_create
Jaegeuk Kim <[email protected]>
f2fs: submit bio after shutdown
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: keep vpll2 always on
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: fix touchscreen tsc2007
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: tvout: enable as display1 alias
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: fixes for tvout / venc
H. Nikolaus Schaller <[email protected]>
ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files
Rob Herring <[email protected]>
of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
Suman Tripathi <[email protected]>
ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA
Yong Zhi <[email protected]>
ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation
Charles Keepax <[email protected]>
ASoC: dapm: Avoid uninitialised variable warning
Jan Kara <[email protected]>
udf: Fix crash during mount
Ding Xiang <[email protected]>
mips: txx9: fix iounmap related issue
Parav Pandit <[email protected]>
RDMA/core: Follow correct unregister order between sysfs and cgroup
Parav Pandit <[email protected]>
RDMA/core: Rate limit MAD error messages
Muhammad Sammar <[email protected]>
IB/ipoib: Ensure that MTU isn't less than minimum permitted
Parav Pandit <[email protected]>
IB/mlx5: Don't hold spin lock while checking device state
Jun Gao <[email protected]>
i2c: mediatek: Use DMA safe buffers for i2c transactions
Erik Stromdahl <[email protected]>
ath10k: wmi: disable softirq's while calling ieee80211_rx
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Disable pull control for S5M8767 PMIC
K.T.VIJAYAKUMAAR <[email protected]>
ath10k: avoid possible memory access violation
Colin Ian King <[email protected]>
ASoC: sgtl5000: avoid division by zero if lo_vag is zero
Christian Brauner <[email protected]>
rtnetlink: move type calculation out of loop
Stefan Wahren <[email protected]>
net: lan78xx: Bail out if lan78xx_get_endpoints fails
Jaegeuk Kim <[email protected]>
f2fs: avoid wrong decrypted data from disk
Stanislaw Gruszka <[email protected]>
cfg80211: validate wmm rule when setting
Naftali Goldstein <[email protected]>
mac80211: fix saving a few HE values
Peter Wu <[email protected]>
qxl: fix null-pointer crash during suspend
Majd Dibbiny <[email protected]>
IB/mlx5: Change TX affinity assignment in RoCE LAG mode
Christoph Hellwig <[email protected]>
mtd: rawnand: qcom: don't include dma-direct.h
Kurt Kanzenbach <[email protected]>
mtd: rawnand: fsl_ifc: fixup SRAM init for newer ctrl versions
Kurt Kanzenbach <[email protected]>
mtd: rawnand: fsl_ifc: check result of SRAM initialization
Thomas Petazzoni <[email protected]>
mtd: rawnand: marvell: use regmap_update_bits() for syscon access
Martin Blumenstingl <[email protected]>
ARM: dts: meson8b: fix the clock controller register size
Martin Blumenstingl <[email protected]>
ARM: dts: meson8: fix the clock controller register size
Quentin Schulz <[email protected]>
net: phy: mscc: read 'vsc8531, edge-slowdown' as an u32
Quentin Schulz <[email protected]>
net: phy: mscc: read 'vsc8531,vddmac' as an u32
Moni Shoua <[email protected]>
net/mlx5: Fix atomic_mode enum values
Yunsheng Lin <[email protected]>
net: hns3: Change the dst mac addr of loopback packet
Yunsheng Lin <[email protected]>
net: hns3: Fix for loopback selftest failed problem
Jian Shen <[email protected]>
net: hns3: Fix error of checking used vlan id
Huazhong Tan <[email protected]>
net: hns3: Fix for multicast failure
Jiada Wang <[email protected]>
ASoC: rsnd: ssi: Fix issue in dma data address assignment
Sven Schmitt <[email protected]>
soc: imx: gpc: fix PDN delay
Geert Uytterhoeven <[email protected]>
mt76: Fix comparisons with invalid hardware key index
Rasmus Villemoes <[email protected]>
brcmfmac: fix wrong strnchr usage
Ganapathi Bhat <[email protected]>
mwifex: free rx_cmd skb in suspended state
Ganapathi Bhat <[email protected]>
mwifiex: do no submit URB in suspended state
Larry Finger <[email protected]>
rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument
Marcel Ziswiler <[email protected]>
ARM: dts: pxa: fix power i2c base address
Robert Jarzmik <[email protected]>
ARM: dts: pxa: fix the rtc controller
Alexey Khoroshilov <[email protected]>
media: ov772x: Disable clk on error path
Sakari Ailus <[email protected]>
media: i2c: Fix pm_runtime_get_if_in_use() usage in sensor drivers
Hans Verkuil <[email protected]>
media: vicodec: fix out-of-range values when decoding
Sara Sharon <[email protected]>
iwlwifi: mvm: avoid sending too many BARs
Johannes Berg <[email protected]>
iwlwifi: don't WARN on trying to dump dead firmware
Sara Sharon <[email protected]>
iwlwifi: drop packets with bad status in CD
Vijay Immanuel <[email protected]>
IB/rxe: fixes for rdma read retry
Vijay Immanuel <[email protected]>
IB/rxe: avoid back-to-back retries
Patryk Małek <[email protected]>
i40e: Prevent deleting MAC address from VF when set by PF
Lihong Yang <[email protected]>
i40evf: cancel workqueue sync for adminq when a VF is removed
Patryk Małek <[email protected]>
i40e: hold the rtnl lock on clearing interrupt scheme
Patryk Małek <[email protected]>
i40evf: Don't enable vlan stripping when rx offload is turned on
Jan Sokolowski <[email protected]>
i40e: Check and correct speed values for link on open
Lihong Yang <[email protected]>
i40evf: set IFF_UNICAST_FLT flag for the VF
Mitch Williams <[email protected]>
i40e: use correct length for strncpy
Paul M Stillwell Jr <[email protected]>
i40evf: Validate the number of queues a PF sends
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks
Alan Tull <[email protected]>
arm64: dts: stratix10: i2c clock running out of spec
Rick Farrington <[email protected]>
liquidio: fix race condition in instruction completion processing
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook
Andrzej Hajda <[email protected]>
ARM: dts: exynos: Fix HDMI-HPD line handling on Arndale
Andrzej Hajda <[email protected]>
ARM: dts: exynos: Use i2c-gpio for HDMI-DDC on Arndale
Tuomas Tynkkynen <[email protected]>
MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
Paul Cercueil <[email protected]>
pinctrl: ingenic: Probe driver at subsys_initcall
Akshu Agrawal <[email protected]>
ASoC: AMD: Change MCLK to 48Mhz
Jerome Brunet <[email protected]>
ASoC: meson: axg-fifo: report interrupt request failure
Charles Keepax <[email protected]>
ASoC: dpcm: Properly initialise hw->rate_max
Charles Keepax <[email protected]>
ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl
Anirudh Venkataramanan <[email protected]>
ice: Fix and update driver version string
Bob Peterson <[email protected]>
gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated
Anirudh Venkataramanan <[email protected]>
ice: Prevent control queue operations during reset
Dan Nowlin <[email protected]>
ice: Update request resource command to latest specification
Sven Eckelmann <[email protected]>
ath10k: limit available channels via DT ieee80211-freq-limit
Dedy Lansky <[email protected]>
wil6210: fix invalid memory access for rx_buff_mgmt debugfs
Maya Erez <[email protected]>
wil6210: prevent usage of tx ring 0 for eDMA
Maya Erez <[email protected]>
wil6210: set edma variables only for Talyn-MB devices
Dedy Lansky <[email protected]>
wil6210: drop Rx multicast packets that are looped-back to STA
Felix Fietkau <[email protected]>
ath9k: fix tx99 with monitor mode interface
Rakesh Pillai <[email protected]>
ath10k: skip resetting rx filter for WCN3990
Takashi Iwai <[email protected]>
ALSA: seq: Do error checks at creating system ports
Rajeev Kumar Sirasanagandla <[email protected]>
cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set
Andy Shevchenko <[email protected]>
extcon: cht-wc: Return from default case to avoid warnings
Bjorn Andersson <[email protected]>
remoteproc/davinci: Use %zx for formating size_t
Alexandre Belloni <[email protected]>
rtc: rv8803: fix the rv8803 id in the OF table
Dan Carpenter <[email protected]>
rtc: sysfs: fix NULL check in rtc_add_groups()
Jay Foster <[email protected]>
ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45
Geert Uytterhoeven <[email protected]>
ARM: dts: rcar: Correct SATA device sizes to 2 MiB
Arnd Bergmann <[email protected]>
y2038: make do_gettimeofday() and get_seconds() inline
Aapo Vienamo <[email protected]>
arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply
Aapo Vienamo <[email protected]>
soc/tegra: pmc: Fix pad voltage configuration for Tegra186
Dan Carpenter <[email protected]>
ALSA: pcm: signedness bug in snd_pcm_plug_alloc()
Andre Przywara <[email protected]>
arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage
Andre Przywara <[email protected]>
arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage
Samuel Holland <[email protected]>
arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node
Vinod Koul <[email protected]>
soundwire: intel: Fix uninitialized adev deref
Shreyas NC <[email protected]>
soundwire: Initialize completion for defer messages
Rongyi Chen <[email protected]>
clk: sunxi-ng: h6: fix PWM gate/reset offset
Marcus Folkesson <[email protected]>
iio: dac: mcp4922: fix error handling in mcp4922_write_raw
Tamizh chelvam <[email protected]>
ath10k: fix kernel panic by moving pci flush after napi_disable
Ard Biesheuvel <[email protected]>
tee: optee: take DT status property into account
Stefan Agner <[email protected]>
iio: adc: max9611: explicitly cast gain_selectors
Eugen Hristev <[email protected]>
mmc: sdhci-of-at91: fix quirk2 overwrite
Roman Gushchin <[email protected]>
mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup()
Roman Gushchin <[email protected]>
mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm()
Yang Shi <[email protected]>
mm: mempolicy: fix the wrong return value and potential pages leak of mbind
Eric Auger <[email protected]>
iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros
Corentin Labbe <[email protected]>
net: ethernet: dwmac-sun8i: Use the correct function in exit path
Al Viro <[email protected]>
ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either
Al Viro <[email protected]>
ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable
Kai-Heng Feng <[email protected]>
x86/quirks: Disable HPET on Intel Coffe Lake platforms
Hans de Goede <[email protected]>
i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present
Mike Marciniszyn <[email protected]>
IB/hfi1: Use a common pad buffer for 9B and 16B packets
James Erwin <[email protected]>
IB/hfi1: Ensure full Gen3 speed in a Gen4 system
Chuhong Yuan <[email protected]>
Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
Lucas Stach <[email protected]>
Input: synaptics-rmi4 - clear IRQ enables for F54
Andrew Duggan <[email protected]>
Input: synaptics-rmi4 - do not consume more data than we have (F11, F12)
Andrew Duggan <[email protected]>
Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver
Lucas Stach <[email protected]>
Input: synaptics-rmi4 - fix video buffer size
Oliver Neukum <[email protected]>
Input: ff-memless - kill timer in destroy()
Filipe Manana <[email protected]>
Btrfs: fix log context list corruption after rename exchange operation
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix incorrect size check for processing/extension units
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk()
Henry Lin <[email protected]>
ALSA: usb-audio: not submit urb for stopped endpoint
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix missing error check at mixer resolution test
Jiri Pirko <[email protected]>
devlink: disallow reload operation during device cleanup
Jouni Hogander <[email protected]>
slip: Fix memory leak in slip_open error path
Aleksander Morgado <[email protected]>
net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules
Chuhong Yuan <[email protected]>
net: gemini: add missed free_netdev
Guillaume Nault <[email protected]>
ipmr: Fix skb headroom in ipmr_get_route().
Oliver Neukum <[email protected]>
ax88172a: fix information leak on short answers
Michael Schmitz <[email protected]>
scsi: core: Handle drivers which set sg_tablesize to zero
Jonas Gorski <[email protected]>
MIPS: BCM63XX: fix switch core reset on BCM6368
Paolo Bonzini <[email protected]>
KVM: x86: introduce is_pae_paging
-------------
Diffstat:
.../devicetree/bindings/media/i2c/adv748x.txt | 4 +- .../devicetree/bindings/net/brcm,unimac-mdio.txt | 3 + Makefile | 4 +- arch/arm/boot/compressed/libfdt_env.h | 2 + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 2 +- arch/arm/boot/dts/am335x-evm.dts | 12 +- arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 2 +- arch/arm/boot/dts/am335x-pdu001.dts | 2 +- arch/arm/boot/dts/am4372.dtsi | 2 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- arch/arm/boot/dts/arm-realview-eb.dtsi | 2 +- arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +- arch/arm/boot/dts/arm-realview-pb11mp.dts | 2 +- arch/arm/boot/dts/arm-realview-pbx.dtsi | 2 +- arch/arm/boot/dts/armada-388-clearfog.dtsi | 2 +- arch/arm/boot/dts/aspeed-g4.dtsi | 2 +- arch/arm/boot/dts/aspeed-g5.dtsi | 2 +- arch/arm/boot/dts/at91-dvk_su60_somc.dtsi | 4 +- arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi | 4 +- arch/arm/boot/dts/at91-vinco.dts | 2 +- arch/arm/boot/dts/at91sam9260ek.dts | 2 +- arch/arm/boot/dts/at91sam9261ek.dts | 2 +- arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +- arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/dove-cubox.dts | 2 +- arch/arm/boot/dts/dove.dtsi | 6 +- arch/arm/boot/dts/dra7.dtsi | 2 +- arch/arm/boot/dts/exynos3250-artik5.dtsi | 7 + arch/arm/boot/dts/exynos5250-arndale.dts | 41 ++++-- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 11 ++ arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 ++ arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- arch/arm/boot/dts/imx51-zii-rdu1.dts | 2 +- arch/arm/boot/dts/imx6ull.dtsi | 2 +- arch/arm/boot/dts/keystone-k2g.dtsi | 2 +- arch/arm/boot/dts/lpc32xx.dtsi | 4 +- arch/arm/boot/dts/meson8.dtsi | 2 +- arch/arm/boot/dts/meson8b-odroidc1.dts | 5 + arch/arm/boot/dts/meson8b.dtsi | 2 +- arch/arm/boot/dts/omap2.dtsi | 4 +- arch/arm/boot/dts/omap2430.dtsi | 2 +- arch/arm/boot/dts/omap3-gta04.dtsi | 49 +++++-- arch/arm/boot/dts/omap3-n9.dts | 2 +- arch/arm/boot/dts/orion5x-linkstation.dtsi | 2 +- arch/arm/boot/dts/pxa25x.dtsi | 4 + arch/arm/boot/dts/pxa27x.dtsi | 6 +- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- arch/arm/boot/dts/r8a7779.dtsi | 2 +- arch/arm/boot/dts/r8a7790.dtsi | 4 +- arch/arm/boot/dts/r8a7791.dtsi | 4 +- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3188-radxarock.dts | 8 ++ arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 2 +- arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +- arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 8 +- arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- arch/arm/boot/dts/ste-snowball.dts | 2 +- arch/arm/boot/dts/ste-u300.dts | 2 +- arch/arm/boot/dts/stm32mp157c-ev1.dts | 73 +++++++++- arch/arm/boot/dts/stm32mp157c.dtsi | 2 +- .../boot/dts/sun5i-reference-design-tablet.dtsi | 3 +- .../boot/dts/sun8i-reference-design-tablet.dtsi | 3 +- arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- arch/arm/boot/dts/tegra20-paz00.dts | 6 +- arch/arm/boot/dts/tegra20.dtsi | 26 ++-- arch/arm/boot/dts/tegra30-apalis.dtsi | 10 +- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 3 +- arch/arm/boot/dts/tegra30.dtsi | 6 +- arch/arm/boot/dts/versatile-ab.dts | 2 +- arch/arm/boot/dts/zynq-zc702.dts | 12 +- arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +- arch/arm/crypto/crc32-ce-glue.c | 2 +- arch/arm/mach-at91/pm.c | 6 +- arch/arm/mach-imx/pm-imx6.c | 25 ++++ .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 6 +- .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 8 +- .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 +- .../boot/dts/altera/socfpga_stratix10_socdk.dts | 2 + arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 4 +- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +- .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 +- .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 6 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 +- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 4 +- arch/arm64/boot/dts/lg/lg1312.dtsi | 4 +- arch/arm64/boot/dts/lg/lg1313.dtsi | 4 +- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 16 +-- arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 1 + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 30 +++- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 5 +- .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 26 +++- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 10 +- arch/arm64/boot/dts/ti/k3-am65.dtsi | 44 +++--- arch/arm64/kernel/traps.c | 1 - arch/mips/bcm47xx/workarounds.c | 8 +- arch/mips/bcm63xx/reset.c | 2 +- arch/mips/include/asm/kexec.h | 6 +- arch/mips/txx9/generic/setup.c | 5 +- arch/powerpc/boot/libfdt_env.h | 2 + arch/powerpc/include/asm/drmem.h | 5 + arch/powerpc/include/asm/uaccess.h | 6 +- arch/powerpc/kernel/iommu.c | 2 +- arch/powerpc/kernel/rtas.c | 2 + arch/powerpc/kernel/vdso32/datapage.S | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 1 + arch/powerpc/kernel/vdso64/datapage.S | 1 + arch/powerpc/kernel/vdso64/gettimeofday.S | 1 + arch/powerpc/mm/slb.c | 2 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 55 +++----- arch/s390/include/asm/mmu.h | 2 + arch/s390/include/asm/mmu_context.h | 1 + arch/s390/kernel/vdso.c | 7 +- arch/s390/kernel/vdso32/clock_gettime.S | 19 +-- arch/s390/kernel/vdso32/gettimeofday.S | 3 +- arch/s390/kernel/vdso64/clock_gettime.S | 25 ++-- arch/s390/kernel/vdso64/gettimeofday.S | 3 +- arch/x86/hyperv/hv_init.c | 19 +++ arch/x86/kernel/cpu/common.c | 4 +- arch/x86/kernel/cpu/cyrix.c | 2 +- arch/x86/kernel/cpu/mcheck/mce-inject.c | 6 + arch/x86/kernel/early-quirks.c | 2 + arch/x86/kernel/uprobes.c | 2 +- arch/x86/kvm/vmx.c | 7 +- arch/x86/kvm/x86.c | 8 +- arch/x86/kvm/x86.h | 5 + block/bfq-iosched.c | 78 +++++++++-- block/bfq-iosched.h | 26 ++++ crypto/chacha20_generic.c | 7 +- crypto/rsa-pkcs1pad.c | 9 -- drivers/acpi/acpi_lpss.c | 22 ++- drivers/acpi/pci_root.c | 5 +- drivers/android/binder.c | 44 ++++-- drivers/ata/ahci_platform.c | 15 +- drivers/base/component.c | 6 +- drivers/bluetooth/btrsi.c | 13 +- drivers/bluetooth/hci_serdev.c | 1 + drivers/char/ipmi/ipmi_dmi.c | 4 + drivers/char/ipmi/ipmi_msghandler.c | 2 +- drivers/char/ipmi/ipmi_si_mem_io.c | 2 +- drivers/char/ipmi/ipmi_si_pci.c | 4 +- drivers/char/random.c | 24 ++-- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 2 +- drivers/crypto/s5p-sss.c | 16 ++- drivers/dma/Kconfig | 2 +- drivers/dma/at_xdmac.c | 2 +- drivers/dma/dma-jz4780.c | 2 +- drivers/edac/i3200_edac.c | 2 +- drivers/edac/i7core_edac.c | 2 +- drivers/edac/sb_edac.c | 70 ++++----- drivers/edac/skx_edac.c | 4 +- drivers/extcon/extcon-intel-cht-wc.c | 2 +- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 2 +- drivers/firmware/dell_rbu.c | 8 ++ drivers/gpio/gpiolib.c | 36 +++-- drivers/gpu/drm/qxl/qxl_drv.c | 26 +--- drivers/hv/channel.c | 20 ++- drivers/hv/hv.c | 15 +- .../coresight/coresight-dynamic-replicator.c | 64 ++++++--- drivers/hwtracing/coresight/coresight-etm-perf.c | 59 +++++--- drivers/hwtracing/coresight/coresight-etm4x.c | 40 +++--- drivers/hwtracing/coresight/coresight-tmc-etf.c | 4 +- drivers/hwtracing/coresight/coresight-tmc-etr.c | 60 +++++--- drivers/hwtracing/coresight/coresight-tmc.h | 2 + drivers/hwtracing/coresight/coresight.c | 22 ++- drivers/i2c/busses/i2c-aspeed.c | 65 ++++++--- drivers/i2c/busses/i2c-mt65xx.c | 62 +++++++- drivers/i2c/i2c-core-acpi.c | 28 +++- drivers/iio/adc/max9611.c | 2 +- drivers/iio/dac/mcp4922.c | 11 +- drivers/infiniband/core/device.c | 2 +- drivers/infiniband/core/mad.c | 72 +++++----- drivers/infiniband/hw/cxgb4/cq.c | 2 +- drivers/infiniband/hw/cxgb4/qp.c | 7 +- drivers/infiniband/hw/hfi1/pcie.c | 4 +- drivers/infiniband/hw/hfi1/sdma.c | 5 +- drivers/infiniband/hw/hfi1/user_sdma.c | 4 +- drivers/infiniband/hw/hfi1/verbs.c | 10 +- drivers/infiniband/hw/hns/Kconfig | 1 + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 1 + drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- drivers/infiniband/hw/mlx4/Kconfig | 1 + drivers/infiniband/hw/mlx5/main.c | 8 ++ drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 +- drivers/infiniband/hw/mlx5/qp.c | 63 ++++++--- drivers/infiniband/sw/rxe/rxe_comp.c | 39 +++++- drivers/infiniband/sw/rxe/rxe_req.c | 15 +- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +- drivers/infiniband/ulp/iser/iser_initiator.c | 18 ++- drivers/input/ff-memless.c | 9 ++ drivers/input/rmi4/rmi_f11.c | 4 +- drivers/input/rmi4/rmi_f12.c | 32 ++++- drivers/input/rmi4/rmi_f54.c | 5 +- drivers/media/i2c/ov13858.c | 2 +- drivers/media/i2c/ov2680.c | 26 +--- drivers/media/i2c/ov2685.c | 2 +- drivers/media/i2c/ov5670.c | 2 +- drivers/media/i2c/ov5695.c | 2 +- drivers/media/i2c/ov772x.c | 1 + drivers/media/i2c/ov7740.c | 2 +- drivers/media/pci/ivtv/ivtv-yuv.c | 2 +- drivers/media/pci/meye/meye.c | 2 +- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/vicodec/vicodec-codec.c | 10 +- drivers/media/platform/vsp1/vsp1_drm.c | 11 +- drivers/media/platform/vsp1/vsp1_regs.h | 2 +- drivers/media/usb/au0828/au0828-core.c | 4 +- drivers/misc/genwqe/card_utils.c | 13 +- drivers/misc/kgdbts.c | 16 +-- drivers/mmc/host/sdhci-of-at91.c | 2 +- drivers/mtd/nand/raw/fsl_ifc_nand.c | 36 ++++- drivers/mtd/nand/raw/marvell_nand.c | 23 ++- drivers/mtd/nand/raw/qcom_nandc.c | 1 - drivers/net/ethernet/amd/am79c961a.c | 2 +- drivers/net/ethernet/amd/atarilance.c | 6 +- drivers/net/ethernet/amd/declance.c | 2 +- drivers/net/ethernet/amd/sun3lance.c | 6 +- drivers/net/ethernet/amd/sunlance.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 8 ++ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 3 + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 13 ++ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 36 +++-- .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 5 + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 5 + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 ++ drivers/net/ethernet/broadcom/genet/bcmmii.c | 7 +- drivers/net/ethernet/broadcom/sb1250-mac.c | 4 +- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 5 +- .../net/ethernet/cavium/liquidio/octeon_device.c | 5 +- drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 + .../net/ethernet/cavium/liquidio/request_manager.c | 2 + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 2 +- drivers/net/ethernet/cortina/gemini.c | 1 + drivers/net/ethernet/faraday/ftgmac100.c | 4 +- drivers/net/ethernet/faraday/ftmac100.c | 7 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 3 +- drivers/net/ethernet/freescale/fec_mpc52xx.c | 3 +- .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 3 +- drivers/net/ethernet/freescale/gianfar.c | 4 +- drivers/net/ethernet/freescale/ucc_geth.c | 3 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 3 +- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 12 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 3 + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 18 +-- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 93 +++++++----- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 4 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 42 ++++-- drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- drivers/net/ethernet/ibm/emac/core.c | 7 +- drivers/net/ethernet/ibm/ibmvnic.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 35 ++++- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 15 +- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 32 +++++ drivers/net/ethernet/intel/ice/ice_common.c | 75 +++++++--- drivers/net/ethernet/intel/ice/ice_common.h | 2 +- drivers/net/ethernet/intel/ice/ice_controlq.c | 3 + drivers/net/ethernet/intel/ice/ice_main.c | 36 ++++- drivers/net/ethernet/intel/ice/ice_nvm.c | 2 +- drivers/net/ethernet/intel/ice/ice_status.h | 1 + drivers/net/ethernet/intel/ice/ice_type.h | 10 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 3 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 9 +- drivers/net/ethernet/marvell/pxa168_eth.c | 3 +- drivers/net/ethernet/mellanox/mlx4/main.c | 3 + drivers/net/ethernet/mellanox/mlxsw/core.c | 4 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 12 +- drivers/net/ethernet/micrel/ks8695net.c | 2 +- drivers/net/ethernet/micrel/ks8851_mll.c | 4 +- .../net/ethernet/netronome/nfp/nfp_net_common.c | 16 ++- drivers/net/ethernet/smsc/smc911x.c | 3 +- drivers/net/ethernet/smsc/smc91x.c | 3 +- drivers/net/ethernet/smsc/smsc911x.c | 3 +- drivers/net/ethernet/socionext/sni_ave.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- drivers/net/ethernet/sun/ldmvsw.c | 2 +- drivers/net/ethernet/sun/sunbmac.c | 3 +- drivers/net/ethernet/sun/sunqe.c | 2 +- drivers/net/ethernet/sun/sunvnet.c | 2 +- drivers/net/ethernet/sun/sunvnet_common.c | 14 +- drivers/net/ethernet/sun/sunvnet_common.h | 7 +- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +- drivers/net/ethernet/toshiba/ps3_gelic_net.h | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 4 +- drivers/net/ethernet/toshiba/tc35815.c | 6 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 9 +- drivers/net/net_failover.c | 4 +- drivers/net/netdevsim/netdev.c | 5 + drivers/net/phy/mdio-bcm-unimac.c | 83 ++++++++++- drivers/net/phy/mscc.c | 11 +- drivers/net/slip/slip.c | 1 + drivers/net/usb/ax88172a.c | 2 +- drivers/net/usb/lan78xx.c | 5 + drivers/net/usb/qmi_wwan.c | 2 + drivers/net/wireless/ath/ath10k/ahb.c | 4 +- drivers/net/wireless/ath/ath10k/core.c | 17 ++- drivers/net/wireless/ath/ath10k/hw.h | 5 + drivers/net/wireless/ath/ath10k/mac.c | 2 + drivers/net/wireless/ath/ath10k/pci.c | 2 +- drivers/net/wireless/ath/ath10k/wmi.c | 10 +- drivers/net/wireless/ath/ath9k/main.c | 1 - drivers/net/wireless/ath/ath9k/tx99.c | 10 +- drivers/net/wireless/ath/wil6210/debugfs.c | 3 + drivers/net/wireless/ath/wil6210/main.c | 9 +- drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 + drivers/net/wireless/ath/wil6210/txrx.c | 15 +- .../wireless/broadcom/brcm80211/brcmfmac/common.c | 4 +- .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 2 +- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 6 +- drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 +- drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 63 +++++++++ drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 6 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 9 +- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 4 + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 4 - drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 55 ++++++-- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 60 -------- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 8 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 16 ++- drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 7 +- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- drivers/net/wireless/marvell/mwifiex/usb.c | 13 ++ drivers/net/wireless/mediatek/mt76/mt76x0/tx.c | 2 +- .../net/wireless/mediatek/mt76/mt76x2_tx_common.c | 2 +- .../net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- drivers/nvmem/core.c | 2 +- drivers/of/base.c | 2 +- drivers/of/unittest-data/overlay_15.dts | 4 +- drivers/of/unittest-data/tests-overlay.dtsi | 4 +- drivers/opp/core.c | 21 ++- drivers/opp/cpu.c | 2 + drivers/opp/opp.h | 2 +- drivers/pci/controller/pcie-mediatek.c | 4 +- drivers/pci/hotplug/pciehp_core.c | 3 +- drivers/pci/pci.c | 37 +++++ drivers/pci/pci.h | 2 + drivers/pci/pcie/aer.c | 13 +- drivers/pci/pcie/dpc.c | 3 +- drivers/pci/pcie/err.c | 87 +++--------- drivers/pci/pcie/pme.c | 3 +- drivers/pci/pcie/portdrv.h | 24 ++++ drivers/pci/pcie/portdrv_pci.c | 9 ++ drivers/pci/slot.c | 1 - drivers/phy/broadcom/Kconfig | 3 +- drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 1 - drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +- drivers/phy/ti/phy-twl4030-usb.c | 29 ++++ drivers/pinctrl/pinctrl-at91-pio4.c | 8 +- drivers/pinctrl/pinctrl-at91.c | 28 ++-- drivers/pinctrl/pinctrl-ingenic.c | 2 +- drivers/power/reset/at91-sama5d2_shdwc.c | 3 + drivers/power/supply/ab8500_fg.c | 31 ++-- drivers/power/supply/max8998_charger.c | 2 +- drivers/power/supply/twl4030_charger.c | 30 +++- drivers/remoteproc/da8xx_remoteproc.c | 2 +- drivers/rtc/rtc-armada38x.c | 22 +-- drivers/rtc/rtc-isl1208.c | 27 ++-- drivers/rtc/rtc-mt6397.c | 13 +- drivers/rtc/rtc-pl030.c | 15 +- drivers/rtc/rtc-rv8803.c | 2 +- drivers/rtc/rtc-sysfs.c | 4 +- drivers/rtc/rtc-tx4939.c | 4 +- drivers/s390/crypto/ap_bus.c | 18 +-- drivers/s390/net/qeth_core_main.c | 102 +++++++------- drivers/s390/net/qeth_l2_main.c | 3 + drivers/s390/net/qeth_l3_main.c | 3 + drivers/scsi/NCR5380.c | 156 ++++++++++++--------- drivers/scsi/NCR5380.h | 2 +- drivers/scsi/libsas/sas_expander.c | 13 +- drivers/scsi/lpfc/lpfc_ct.c | 5 - drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 3 + drivers/scsi/lpfc/lpfc_nvme.c | 2 +- drivers/scsi/lpfc/lpfc_nvmet.c | 7 +- drivers/scsi/lpfc/lpfc_sli.c | 6 +- drivers/scsi/pm8001/pm8001_hwi.c | 6 + drivers/scsi/pm8001/pm8001_sas.c | 9 +- drivers/scsi/pm8001/pm8001_sas.h | 1 + drivers/scsi/pm8001/pm80xx_hwi.c | 80 ++++++++++- drivers/scsi/pm8001/pm80xx_hwi.h | 3 + drivers/scsi/qla2xxx/qla_gs.c | 28 +++- drivers/scsi/qla2xxx/qla_init.c | 36 ++--- drivers/scsi/qla2xxx/qla_iocb.c | 12 +- drivers/scsi/qla2xxx/qla_isr.c | 50 +++---- drivers/scsi/qla2xxx/qla_os.c | 29 +++- drivers/scsi/qla2xxx/qla_target.c | 6 + drivers/scsi/scsi_lib.c | 3 +- drivers/scsi/sym53c8xx_2/sym_hipd.c | 15 +- drivers/scsi/ufs/ufshcd.c | 53 ++++--- drivers/slimbus/qcom-ngd-ctrl.c | 24 ++-- drivers/soc/imx/gpc.c | 2 +- drivers/soc/qcom/apr.c | 4 +- drivers/soc/qcom/qcom-geni-se.c | 41 +++--- drivers/soc/qcom/rpmh-rsc.c | 2 + drivers/soc/qcom/wcnss_ctrl.c | 2 +- drivers/soc/tegra/pmc.c | 55 +++++--- drivers/soundwire/bus.c | 1 + drivers/soundwire/intel_init.c | 2 +- drivers/spi/spi-bcm63xx-hsspi.c | 20 ++- drivers/spi/spi-mt65xx.c | 37 ++--- drivers/spi/spi-pic32.c | 4 +- drivers/staging/media/imx/imx-media-csi.c | 5 +- drivers/tee/optee/core.c | 2 +- drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/atmel_serial.c | 42 ++++-- drivers/tty/serial/mxs-auart.c | 3 +- drivers/tty/serial/qcom_geni_serial.c | 55 ++++---- drivers/tty/serial/samsung.c | 8 ++ drivers/tty/serial/xilinx_uartps.c | 41 ++---- drivers/uio/uio_hv_generic.c | 5 +- drivers/usb/chipidea/otg.c | 9 +- drivers/usb/chipidea/usbmisc_imx.c | 2 + drivers/usb/class/usbtmc.c | 17 ++- drivers/usb/gadget/function/uvc_configfs.c | 20 +++ drivers/usb/gadget/function/uvc_video.c | 32 +++-- drivers/usb/host/xhci-mtk-sch.c | 4 +- drivers/usb/mtu3/mtu3_core.c | 4 +- drivers/usb/mtu3/mtu3_gadget.c | 22 +-- drivers/vfio/pci/vfio_pci.c | 8 +- drivers/vfio/pci/vfio_pci_config.c | 31 +++- fs/btrfs/inode.c | 15 ++ fs/compat_ioctl.c | 10 +- fs/ecryptfs/inode.c | 19 ++- fs/f2fs/data.c | 35 ++--- fs/f2fs/f2fs.h | 3 +- fs/f2fs/file.c | 63 +++++---- fs/f2fs/node.c | 5 +- fs/f2fs/recovery.c | 17 +++ fs/f2fs/segment.c | 6 +- fs/f2fs/super.c | 11 +- fs/fuse/control.c | 4 +- fs/gfs2/rgrp.c | 2 +- fs/kernfs/symlink.c | 5 +- fs/udf/super.c | 65 ++++++++- include/crypto/chacha20.h | 3 +- include/linux/cpufeature.h | 2 +- include/linux/edac.h | 3 +- include/linux/fsl_ifc.h | 2 + include/linux/hyperv.h | 2 +- include/linux/intel-iommu.h | 6 +- include/linux/libfdt_env.h | 1 + include/linux/mlx5/driver.h | 5 +- include/linux/timekeeping32.h | 15 +- include/media/vsp1.h | 2 +- include/net/devlink.h | 3 + include/net/llc.h | 1 + include/soc/tegra/pmc.h | 1 + include/trace/events/sched.h | 11 +- kernel/events/uprobes.c | 4 +- kernel/kprobes.c | 8 +- kernel/sched/sched.h | 2 +- kernel/signal.c | 4 + kernel/time/time.c | 15 +- kernel/time/timekeeping.c | 24 ---- lib/chacha20.c | 6 +- mm/hugetlb_cgroup.c | 2 +- mm/memcontrol.c | 2 +- mm/memfd.c | 2 +- mm/mempolicy.c | 14 +- net/bluetooth/l2cap_core.c | 10 ++ net/core/devlink.c | 39 +++++- net/core/rtnetlink.c | 2 +- net/ipv4/gre_demux.c | 7 +- net/ipv4/ip_gre.c | 9 +- net/ipv4/ipmr.c | 3 +- net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 22 ++- net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 19 ++- net/llc/llc_core.c | 4 +- net/mac80211/mlme.c | 17 +-- net/netfilter/nf_tables_api.c | 9 +- net/netfilter/nft_cmp.c | 6 +- net/netfilter/nft_reject.c | 6 +- net/wireless/reg.c | 110 +++++++++++---- samples/bpf/sockex2_kern.c | 11 +- samples/bpf/sockex3_kern.c | 8 +- samples/bpf/sockex3_user.c | 4 +- sound/core/oss/pcm_plugin.c | 4 +- sound/core/seq/seq_system.c | 18 ++- sound/pci/hda/patch_ca0132.c | 1 + sound/pci/intel8x0m.c | 20 +-- sound/soc/amd/acp-da7219-max98357a.c | 2 +- sound/soc/codecs/hdac_hdmi.c | 6 + sound/soc/codecs/rt5682.c | 5 + sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/meson/axg-fifo.c | 2 + sound/soc/sh/rcar/rsnd.h | 1 + sound/soc/sh/rcar/ssi.c | 4 +- sound/soc/soc-dapm.c | 4 +- sound/soc/soc-pcm.c | 2 +- sound/usb/endpoint.c | 3 + sound/usb/mixer.c | 4 +- sound/usb/quirks.c | 4 +- sound/usb/validate.c | 6 +- .../testing/selftests/powerpc/tm/tm-unavailable.c | 9 +- tools/testing/selftests/powerpc/tm/tm.h | 9 ++ 524 files changed, 3933 insertions(+), 1921 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/422 KVM: x86: introduce is_pae_paging
From: Paolo Bonzini <[email protected]>
[ Upstream commit bf03d4f9334728bf7c8ffc7de787df48abd6340e ]
Checking for 32-bit PAE is quite common around code that fiddles with the PDPTRs. Add a function to compress all checks into a single invocation.
Moving to the common helper also fixes a subtle bug in kvm_set_cr3() where it fails to check is_long_mode() and results in KVM incorrectly attempting to load PDPTRs for a 64-bit guest.
--- arch/x86/kvm/vmx.c | 7 +++---- arch/x86/kvm/x86.c | 8 ++++---- arch/x86/kvm/x86.h | 5 +++++ 3 files changed, 12 insertions(+), 8 deletions(-)
arch/x86/kvm/vmx.c +3 -4
@@ -5173,7 +5173,7 @@ static void ept_load_pdptrs(struct kvm_vcpu *vcpu) (unsigned long *)&vcpu->arch.regs_dirty))return ; -if (is_paging (vcpu) &&is_pae (vcpu) && !is_long_mode (vcpu)) { +if (is_pae_paging (vcpu)) {vmcs_write64 (GUEST_PDPTR0 , mmu->pdptrs[0 ]);vmcs_write64 (GUEST_PDPTR1 , mmu->pdptrs[1 ]);vmcs_write64 (GUEST_PDPTR2 , mmu->pdptrs[2 ]);
@@ -5185,7 +5185,7 @@ static void ept_save_pdptrs(struct kvm_vcpu *vcpu) {struct kvm_mmu *mmu = vcpu->arch.walk_mmu; -if (is_paging (vcpu) &&is_pae (vcpu) && !is_long_mode (vcpu)) { +if (is_pae_paging (vcpu)) { mmu->pdptrs[0 ] =vmcs_read64 (GUEST_PDPTR0 ); mmu->pdptrs[1 ] =vmcs_read64 (GUEST_PDPTR1 ); mmu->pdptrs[2 ] =vmcs_read64 (GUEST_PDPTR2 );
@@ -12013,8 +12013,7 @@ static int nested_vmx_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, bool ne* If PAE paging and EPT are both on, CR3 is not used by the CPU and * must not be dereferenced. */ -if (!is_long_mode (vcpu) &&is_pae (vcpu) &&is_paging (vcpu) && - !nested_ept) { +if (is_pae_paging (vcpu) && !nested_ept) {if (!load_pdptrs (vcpu, vcpu->arch.walk_mmu, cr3)) { *entry_failure_code =ENTRY_FAIL_PDPTE ;return 1 ;
arch/x86/kvm/x86.c +4 -4
@@ -634,7 +634,7 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)gfn_t gfn;int r; -if (is_long_mode (vcpu) || !is_pae (vcpu) || !is_paging (vcpu)) +if (!is_pae_paging (vcpu))return false; if (!test_bit(VCPU_EXREG_PDPTR,
@@ -885,8 +885,8 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)if (is_long_mode (vcpu) && (cr3 &rsvd_bits (cpuid_maxphyaddr (vcpu),63 )))return 1 ; -else if (is_pae (vcpu) &&is_paging (vcpu) && - !load_pdptrs (vcpu, vcpu->arch.walk_mmu, cr3)) +else if (is_pae_paging (vcpu) && + !load_pdptrs (vcpu, vcpu->arch.walk_mmu, cr3))return 1 ;kvm_mmu_new_cr3 (vcpu, cr3, skip_tlb_flush);
@@ -8348,7 +8348,7 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)kvm_update_cpuid (vcpu); idx =srcu_read_lock (&vcpu->kvm->srcu); -if (!is_long_mode (vcpu) &&is_pae (vcpu) &&is_paging (vcpu)) { +if (is_pae_paging (vcpu)) {load_pdptrs (vcpu, vcpu->arch.walk_mmu,kvm_read_cr3 (vcpu)); mmu_reset_needed =1 ; }
arch/x86/kvm/x86.h +5 -0
@@ -139,6 +139,11 @@ static inline int is_paging(struct kvm_vcpu *vcpu)return likely (kvm_read_cr0_bits (vcpu,X86_CR0_PG )); } +static inline bool is_pae_paging (struct kvm_vcpu *vcpu) +{ +return !is_long_mode (vcpu) &&is_pae (vcpu) &&is_paging (vcpu); +} +static inline u32 bit (int bitno) {return 1 << (bitno &31 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/422 MIPS: BCM63XX: fix switch core reset on BCM6368
In reply to Greg Kroah-HartmanFrom: Jonas Gorski <[email protected]>
commit 8a38dacf87180738d42b058334c951eba15d2d47 upstream.
The Ethernet Switch core mask was set to 0, causing the switch core to be not reset on BCM6368 on boot. Provide the proper mask so the switch core gets reset to a known good state.
--- arch/mips/bcm63xx/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/bcm63xx/reset.c +1 -1
@@ -120,7 +120,7 @@#define BCM6368_RESET_DSL 0#define BCM6368_RESET_SAR SOFTRESET_6368_SAR_MASK#define BCM6368_RESET_EPHY SOFTRESET_6368_EPHY_MASK -#define BCM6368_RESET_ENETSW 0 +#define BCM6368_RESET_ENETSW SOFTRESET_6368_ENETSW_MASK#define BCM6368_RESET_PCM SOFTRESET_6368_PCM_MASK#define BCM6368_RESET_MPI SOFTRESET_6368_MPI_MASK#define BCM6368_RESET_PCIE 0
Greg Kroah-Hartman
maintainerPATCH 3/422 scsi: core: Handle drivers which set sg_tablesize to zero
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit 9393c8de628cf0968d81a17cc11841e42191e041 upstream.
In scsi_mq_setup_tags(), cmd_size is calculated based on zero size for the scatter-gather list in case the low level driver uses SG_NONE in its host template.
cmd_size is passed on to the block layer for calculation of the request size, and we've seen NULL pointer dereference errors from the block layer in drivers where SG_NONE is used and a mq IO scheduler is active, apparently as a consequence of this (see commit 68ab2d76e4be ("scsi:
cxlflash: Set sg_tablesize to 1 instead of SG_NONE"), and a recent patch by Finn Thain converting the three m68k NFR5380 drivers to avoid setting SG_NONE).
Try to avoid these errors by accounting for at least one sg list entry when calculating cmd_size, regardless of whether the low level driver set a zero sg_tablesize.
Tested on 030 m68k with the atari_scsi driver - setting sg_tablesize to SG_NONE no longer results in a crash when loading this driver.
--- drivers/scsi/scsi_lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/scsi_lib.c +2 -1
@@ -2371,7 +2371,8 @@ int scsi_mq_setup_tags(struct Scsi_Host {unsigned int cmd_size, sgl_size; - sgl_size =scsi_mq_sgl_size (shost); + sgl_size = max_t(unsigned int, sizeof(struct scatterlist), +scsi_mq_sgl_size (shost)); cmd_size =sizeof (struct scsi_cmnd ) + shost->hostt->cmd_size + sgl_size;if (scsi_host_get_prot (shost)) cmd_size +=sizeof (struct scsi_data_buffer ) + sgl_size;
Greg Kroah-Hartman
maintainerPATCH 4/422 ax88172a: fix information leak on short answers
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
[ Upstream commit a9a51bd727d141a67b589f375fe69d0e54c4fe22 ]
If a malicious device gives a short MAC it can elicit up to 5 bytes of leaked memory out of the driver. We need to check for ETH_ALEN instead.
--- drivers/net/usb/ax88172a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/ax88172a.c +1 -1
@@ -208,7 +208,7 @@ static int ax88172a_bind(struct usbnet */* Get the MAC address */ ret =asix_read_cmd (dev,AX_CMD_READ_NODE_ID ,0 ,0 ,ETH_ALEN , buf,0 ); -if (ret <0 ) { +if (ret <ETH_ALEN ) {netdev_err (dev->net,"Failed to read MAC address: %d\n" , ret); goto free; }
Greg Kroah-Hartman
maintainerPATCH 5/422 ipmr: Fix skb headroom in ipmr_get_route().
In reply to Greg Kroah-HartmanFrom: Guillaume Nault <[email protected]>
[ Upstream commit 7901cd97963d6cbde88fa25a4a446db3554c16c6 ]
In route.c, inet_rtm_getroute_build_skb() creates an skb with no headroom. This skb is then used by inet_rtm_getroute() which may pass it to rt_fill_info() and, from there, to ipmr_get_route(). The later might try to reuse this skb by cloning it and prepending an IPv4 header. But since the original skb has no headroom, skb_push() triggers skb_under_panic():
skbuff: skb_under_panic: text:00000000ca46ad8a len:80 put:20 head:00000000cd28494e data:000000009366fd6b tail:0x3c end:0xec0 dev:veth0
------------[ cut here ]------------ kernel BUG at net/core/skbuff.c:108! invalid opcode: 0000 [#1] SMP KASAN PTI CPU: 6 PID: 587 Comm: ip Not tainted 5.4.0-rc6+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014 RIP: 0010:skb_panic+0xbf/0xd0 Code: 41 a2 ff 8b 4b 70 4c 8b 4d d0 48 c7 c7 20 76 f5 8b 44 8b 45 bc 48 8b 55 c0 48 8b 75 c8 41 54 41 57 41 56 41 55 e8 75 dc 7a ff <0f> 0b 0f 1f 44 00 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 RSP: 0018:ffff888059ddf0b0 EFLAGS: 00010286 RAX: 0000000000000086 RBX: ffff888060a315c0 RCX: ffffffff8abe4822 RDX: 0000000000000000 RSI: 0000000000000008 RDI: ffff88806c9a79cc RBP: ffff888059ddf118 R08: ffffed100d9361b1 R09: ffffed100d9361b0 R10: ffff88805c68aee3 R11: ffffed100d9361b1 R12: ffff88805d218000 R13: ffff88805c689fec R14: 000000000000003c R15: 0000000000000ec0 FS: 00007f6af184b700(0000) GS:ffff88806c980000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffc8204a000 CR3: 0000000057b40006 CR4: 0000000000360ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: skb_push+0x7e/0x80 ipmr_get_route+0x459/0x6fa rt_fill_info+0x692/0x9f0 inet_rtm_getroute+0xd26/0xf20 rtnetlink_rcv_msg+0x45d/0x630 netlink_rcv_skb+0x1a5/0x220 rtnetlink_rcv+0x15/0x20 netlink_unicast+0x305/0x3a0 netlink_sendmsg+0x575/0x730 sock_sendmsg+0xb5/0xc0 ___sys_sendmsg+0x497/0x4f0 __sys_sendmsg+0xcb/0x150 __x64_sys_sendmsg+0x48/0x50 do_syscall_64+0xd2/0xac0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Actually the original skb used to have enough headroom, but the reserve_skb() call was lost with the introduction of inet_rtm_getroute_build_skb() by commit 404eb77ea766 ("ipv4: support sport, dport and ip_proto in RTM_GETROUTE").
We could reserve some headroom again in inet_rtm_getroute_build_skb(), but this function shouldn't be responsible for handling the special case of ipmr_get_route(). Let's handle that directly in ipmr_get_route() by calling skb_realloc_headroom() instead of skb_clone().
--- net/ipv4/ipmr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/ipmr.c +2 -1
@@ -2278,7 +2278,8 @@ int ipmr_get_route(struct net *net, strurcu_read_unlock ();return -ENODEV ; } - skb2 =skb_clone (skb,GFP_ATOMIC ); + + skb2 =skb_realloc_headroom (skb,sizeof (struct iphdr ));if (!skb2) {read_unlock (&mrt_lock);rcu_read_unlock ();
Greg Kroah-Hartman
maintainerPATCH 6/422 net: gemini: add missed free_netdev
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 18d647ae74116bfee38953978501cea2960a0c25 ]
This driver forgets to free allocated netdev in remove like what is done in probe failure.
Add the free to fix it.
--- drivers/net/ethernet/cortina/gemini.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/cortina/gemini.c +1 -0
@@ -2530,6 +2530,7 @@ static int gemini_ethernet_port_remove(sstruct gemini_ethernet_port *port =platform_get_drvdata (pdev);gemini_port_remove (port); +free_netdev (port->netdev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 7/422 net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules
In reply to Greg Kroah-HartmanFrom: Aleksander Morgado <[email protected]>
[ Upstream commit 802753cb0b141cf5170ab97fe7e79f5ca10d06b0 ]
These are the Foxconn-branded variants of the Dell DW5821e modules, same USB layout as those.
The QMI interface is exposed in USB configuration #1:
P: Vendor=0489 ProdID=e0b4 Rev=03.18 S: Manufacturer=FII S: Product=T77W968 LTE S: SerialNumber=0123456789ABCDEF C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
--- drivers/net/usb/qmi_wwan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/usb/qmi_wwan.c +2 -0
@@ -1306,6 +1306,8 @@ static const struct usb_device_id produc {QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */ {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ {QMI_QUIRK_SET_DTR(0x2cb7, 0x0104, 4)}, /* Fibocom NL678 series */ + {QMI_FIXED_INTF(0x0489, 0xe0b4, 0)}, /* Foxconn T77W968 LTE */ + {QMI_FIXED_INTF(0x0489, 0xe0b5, 0)}, /* Foxconn T77W968 LTE with eSIM support*//* 4. Gobi 1000 devices */ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
Greg Kroah-Hartman
maintainerPATCH 8/422 slip: Fix memory leak in slip_open error path
In reply to Greg Kroah-HartmanFrom: Jouni Hogander <[email protected]>
[ Upstream commit 3b5a39979dafea9d0cd69c7ae06088f7a84cdafa ]
Driver/net/can/slcan.c is derived from slip.c. Memory leak was detected by Syzkaller in slcan. Same issue exists in slip.c and this patch is addressing the leak in slip.c.
Here is the slcan memory leak trace reported by Syzkaller:
BUG: memory leak unreferenced object 0xffff888067f65500 (size 4096):
comm "syz-executor043", pid 454, jiffies 4294759719 (age 11.930s)
hex dump (first 32 bytes):
73 6c 63 61 6e 30 00 00 00 00 00 00 00 00 00 00 slcan0..........
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000a06eec0d>] __kmalloc+0x18b/0x2c0
[<0000000083306e66>] kvmalloc_node+0x3a/0xc0
[<000000006ac27f87>] alloc_netdev_mqs+0x17a/0x1080
[<0000000061a996c9>] slcan_open+0x3ae/0x9a0
[<000000001226f0f9>] tty_ldisc_open.isra.1+0x76/0xc0
[<0000000019289631>] tty_set_ldisc+0x28c/0x5f0
[<000000004de5a617>] tty_ioctl+0x48d/0x1590
[<00000000daef496f>] do_vfs_ioctl+0x1c7/0x1510
[<0000000059068dbc>] ksys_ioctl+0x99/0xb0
[<000000009a6eb334>] __x64_sys_ioctl+0x78/0xb0
[<0000000053d0332e>] do_syscall_64+0x16f/0x580
[<0000000021b83b99>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
[<000000008ea75434>] 0xfffffffffffffff--- drivers/net/slip/slip.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/slip/slip.c +1 -0
@@ -855,6 +855,7 @@ err_free_chan: sl->tty =NULL ; tty->disc_data =NULL ;clear_bit (SLF_INUSE , &sl->flags); +free_netdev (sl->dev); err_exit:rtnl_unlock ();
Greg Kroah-Hartman
maintainerPATCH 9/422 devlink: disallow reload operation during device cleanup
In reply to Greg Kroah-HartmanFrom: Jiri Pirko <[email protected]>
[ Upstream commit 5a508a254bed9a2e36a5fb96c9065532a6bf1e9c ]
There is a race between driver code that does setup/cleanup of device and devlink reload operation that in some drivers works with the same code. Use after free could we easily obtained by running:
while true; do
echo "0000:00:10.0" >/sys/bus/pci/drivers/mlxsw_spectrum2/bind
devlink dev reload pci/0000:00:10.0 &
echo "0000:00:10.0" >/sys/bus/pci/drivers/mlxsw_spectrum2/unbinddone
Fix this by enabling reload only after setup of device is complete and disabling it at the beginning of the cleanup process.
--- drivers/net/ethernet/mellanox/mlx4/main.c | 3 ++ drivers/net/ethernet/mellanox/mlxsw/core.c | 4 ++ drivers/net/netdevsim/netdev.c | 5 +++ include/net/devlink.h | 3 ++ net/core/devlink.c | 39 ++++++++++++++++++++++++++++- 5 files changed, 53 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/main.c +3 -0
@@ -3982,6 +3982,7 @@ static int mlx4_init_one(struct pci_devif (ret) goto err_params_unregister; +devlink_reload_enable (devlink);pci_save_state (pdev);return 0 ;
@@ -4093,6 +4094,8 @@ static void mlx4_remove_one(struct pci_dstruct devlink *devlink =priv_to_devlink (priv);int active_vfs =0 ; +devlink_reload_disable (devlink); +if (mlx4_is_slave (dev)) persist->interface_state |=MLX4_INTERFACE_STATE_NOWAIT ;
drivers/net/ethernet/mellanox/mlxsw/core.c +4 -0
@@ -1054,6 +1054,8 @@ int mlxsw_core_bus_device_register(constif (err) goto err_driver_init; } +if (!reload) +devlink_reload_enable (devlink);return 0 ;
@@ -1088,6 +1090,8 @@ void mlxsw_core_bus_device_unregister(st {struct devlink *devlink =priv_to_devlink (mlxsw_core); +if (!reload) +devlink_reload_disable (devlink);if (mlxsw_core->reload_fail) {if (!reload)/* Only the parts that were not de-initialized in the
drivers/net/netdevsim/netdev.c +5 -0
@@ -23,6 +23,7 @@#include <net/pkt_cls.h> #include <net/rtnetlink.h> #include <net/switchdev.h> +#include <net/devlink.h> #include "netdevsim.h"
@@ -221,6 +222,8 @@ static int nsim_init(struct net_device * goto err_unreg_dev;nsim_ipsec_init (ns); +if (ns->devlink) +devlink_reload_enable (ns->devlink);return 0 ;
@@ -243,6 +246,8 @@ static void nsim_uninit(struct net_devic {struct netdevsim *ns =netdev_priv (dev); +if (ns->devlink) +devlink_reload_disable (ns->devlink);nsim_ipsec_teardown (ns);nsim_devlink_teardown (ns);debugfs_remove_recursive (ns->ddir);
include/net/devlink.h +3 -0
@@ -35,6 +35,7 @@ struct devlink {struct device *dev;possible_net_t _net;struct mutex lock; + u8 reload_enabled:1;char priv[0 ]__aligned(NETDEV_ALIGN) ; };
@@ -477,6 +478,8 @@ struct ib_device;struct devlink *devlink_alloc (const struct devlink_ops *ops,size_t priv_size);int devlink_register (struct devlink *devlink,struct device *dev);void devlink_unregister (struct devlink *devlink); +void devlink_reload_enable (struct devlink *devlink); +void devlink_reload_disable (struct devlink *devlink);void devlink_free (struct devlink *devlink); int devlink_port_register(struct devlink *devlink, struct devlink_port *devlink_port,
net/core/devlink.c +38 -1
@@ -2643,7 +2643,7 @@ static int devlink_nl_cmd_reload(structstruct devlink *devlink = info->user_ptr[0 ];int err; -if (!devlink->ops->reload) +if (!devlink->ops->reload || !devlink->reload_enabled)return -EOPNOTSUPP ; err =devlink_resources_validate (devlink,NULL , info);
@@ -3889,6 +3889,8 @@ EXPORT_SYMBOL_GPL(devlink_register);void devlink_unregister (struct devlink *devlink) {mutex_lock (&devlink_mutex); +WARN_ON (devlink->ops->reload && + devlink->reload_enabled);devlink_notify (devlink,DEVLINK_CMD_DEL );list_del (&devlink->list);mutex_unlock (&devlink_mutex);
@@ -3896,6 +3898,41 @@ void devlink_unregister(struct devlink *EXPORT_SYMBOL_GPL (devlink_unregister);/** +* devlink_reload_enable - Enable reload of devlink instance +* +* @devlink: devlink +* +* Should be called at end of device initialization +* process when reload operation is supported. +*/ +void devlink_reload_enable (struct devlink *devlink) +{ +mutex_lock (&devlink_mutex); + devlink->reload_enabled = true; +mutex_unlock (&devlink_mutex); +} +EXPORT_SYMBOL_GPL (devlink_reload_enable); + +/** +* devlink_reload_disable - Disable reload of devlink instance +* +* @devlink: devlink +* +* Should be called at the beginning of device cleanup +* process when reload operation is supported. +*/ +void devlink_reload_disable (struct devlink *devlink) +{ +mutex_lock (&devlink_mutex); +/* Mutex is taken which ensures that no reload operation is in +* progress while setting up forbidded flag. +*/ + devlink->reload_enabled = false; +mutex_unlock (&devlink_mutex); +} +EXPORT_SYMBOL_GPL (devlink_reload_disable); + +/** * devlink_free - Free devlink instance resources * * @devlink: devlink
Greg Kroah-Hartman
maintainerPATCH 10/422 ALSA: usb-audio: Fix missing error check at mixer resolution test
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 167beb1756791e0806365a3f86a0da10d7a327ee upstream.
A check of the return value from get_cur_mix_raw() is missing at the resolution test code in get_min_max_with_quirks(), which may leave the variable untouched, leading to a random uninitialized value, as detected by syzkaller fuzzer.
Add the missing return error check for fixing that.
--- sound/usb/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/usb/mixer.c +3 -1
@@ -1244,7 +1244,8 @@ static int get_min_max_with_quirks(strucif (cval->min + cval->res < cval->max) {int last_valid_res = cval->res;int saved, test, check; -get_cur_mix_raw (cval, minchn, &saved); +if (get_cur_mix_raw (cval, minchn, &saved) <0 ) + goto no_res_check;for (;;) { test = saved;if (test < cval->max)
@@ -1264,6 +1265,7 @@ static int get_min_max_with_quirks(strucsnd_usb_set_cur_mix_value (cval, minchn,0 , saved); } +no_res_check: cval->initialized =1 ; }
Greg Kroah-Hartman
maintainerPATCH 11/422 ALSA: usb-audio: not submit urb for stopped endpoint
In reply to Greg Kroah-HartmanFrom: Henry Lin <[email protected]>
commit 528699317dd6dc722dccc11b68800cf945109390 upstream.
While output urb's snd_complete_urb() is executing, calling prepare_outbound_urb() may cause endpoint stopped before prepare_outbound_urb() returns and result in next urb submitted to stopped endpoint. usb-audio driver cannot re-use it afterwards as the urb is still hold by usb stack.
This change checks EP_FLAG_RUNNING flag after prepare_outbound_urb() again to let snd_complete_urb() know the endpoint already stopped and does not submit next urb. Below kind of error will be fixed:
[ 213.153103] usb 1-2: timeout: still 1 active urbs on EP #1 [ 213.164121] usb 1-2: cannot submit urb 0, error -16: unknown error
--- sound/usb/endpoint.c | 3 +++ 1 file changed, 3 insertions(+)
sound/usb/endpoint.c +3 -0
@@ -401,6 +401,9 @@ static void snd_complete_urb(struct urb }prepare_outbound_urb (ep, ctx); +/* can be stopped during prepare callback */ +if (unlikely (!test_bit (EP_FLAG_RUNNING , &ep->flags))) + goto exit_clear; }else {retire_inbound_urb (ep, ctx);/* can be stopped during retire callback */
Greg Kroah-Hartman
maintainerPATCH 12/422 ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit cc9dbfa9707868fb0ca864c05e0c42d3f4d15cf2 upstream.
The commit 60849562a5db ("ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk()") added NULL checks in create_yamaha_midi_quirk(), but there was an overlook. The code allows one of either injd or outjd is NULL, but the second if check made returning -ENODEV if any of them is NULL. Fix it in a proper form.
--- sound/usb/quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/quirks.c +2 -2
@@ -259,8 +259,8 @@ static int create_yamaha_midi_quirk(stru NULL, USB_MS_MIDI_OUT_JACK);if (!injd && !outjd)return -ENODEV ; -if (!(injd &&snd_usb_validate_midi_desc (injd)) || - !(outjd &&snd_usb_validate_midi_desc (outjd))) +if ((injd && !snd_usb_validate_midi_desc (injd)) || + (outjd && !snd_usb_validate_midi_desc (outjd)))return -ENODEV ; if (injd && (injd->bLength < 5 || (injd->bJackType != USB_MS_EMBEDDED &&
Greg Kroah-Hartman
maintainerPATCH 13/422 ALSA: usb-audio: Fix incorrect size check for processing/extension units
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 976a68f06b2ea49e2ab67a5f84919a8b105db8be upstream.
The recently introduced unit descriptor validation had some bug for processing and extension units, it counts a bControlSize byte twice so it expected a bigger size than it should have been. This seems resulting in a probe error on a few devices.
Fix the calculation for proper checks of PU and EU.
--- sound/usb/validate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/usb/validate.c +3 -3
@@ -81,9 +81,9 @@ static bool validate_processing_unit(conswitch (v->protocol) {case UAC_VERSION_1 :default : -/* bNrChannels, wChannelConfig, iChannelNames, bControlSize */ - len +=1 +2 +1 +1 ; -if (d->bLength < len)/* bControlSize */ +/* bNrChannels, wChannelConfig, iChannelNames */ + len +=1 +2 +1 ; +if (d->bLength < len +1 )/* bControlSize */ return false; m = hdr[len]; len +=1 + m +1 ;/* bControlSize, bmControls, iProcessing */
Greg Kroah-Hartman
maintainerPATCH 14/422 Btrfs: fix log context list corruption after rename exchange operation
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit e6c617102c7e4ac1398cb0b98ff1f0727755b520 upstream.
During rename exchange we might have successfully log the new name in the source root's log tree, in which case we leave our log context (allocated on stack) in the root's list of log contextes. However we might fail to log the new name in the destination root, in which case we fallback to a transaction commit later and never sync the log of the source root, which causes the source root log context to remain in the list of log contextes. This later causes invalid memory accesses because the context was allocated on stack and after rename exchange finishes the stack gets reused and overwritten for other purposes.
The kernel's linked list corruption detector (CONFIG_DEBUG_LIST=y) can detect this and report something like the following:
[ 691.489929] ------------[ cut here ]------------ [ 691.489947] list_add corruption. prev->next should be next (ffff88819c944530), but was ffff8881c23f7be4. (prev=ffff8881c23f7a38). [ 691.489967] WARNING: CPU: 2 PID: 28933 at lib/list_debug.c:28 __list_add_valid+0x95/0xe0 (...) [ 691.489998] CPU: 2 PID: 28933 Comm: fsstress Not tainted 5.4.0-rc6-btrfs-next-62 #1 [ 691.490001] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 [ 691.490003] RIP: 0010:__list_add_valid+0x95/0xe0 (...) [ 691.490007] RSP: 0018:ffff8881f0b3faf8 EFLAGS: 00010282 [ 691.490010] RAX: 0000000000000000 RBX: ffff88819c944530 RCX: 0000000000000000 [ 691.490011] RDX: 0000000000000001 RSI: 0000000000000008 RDI: ffffffffa2c497e0 [ 691.490013] RBP: ffff8881f0b3fe68 R08: ffffed103eaa4115 R09: ffffed103eaa4114 [ 691.490015] R10: ffff88819c944000 R11: ffffed103eaa4115 R12: 7fffffffffffffff [ 691.490016] R13: ffff8881b4035610 R14: ffff8881e7b84728 R15: 1ffff1103e167f7b [ 691.490019] FS: 00007f4b25ea2e80(0000) GS:ffff8881f5500000(0000) knlGS:0000000000000000 [ 691.490021] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 691.490022] CR2: 00007fffbb2d4eec CR3: 00000001f2a4a004 CR4: 00000000003606e0 [ 691.490025] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 691.490027] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 691.490029] Call Trace: [ 691.490058] btrfs_log_inode_parent+0x667/0x2730 [btrfs] [ 691.490083] ? join_transaction+0x24a/0xce0 [btrfs] [ 691.490107] ? btrfs_end_log_trans+0x80/0x80 [btrfs] [ 691.490111] ? dget_parent+0xb8/0x460 [ 691.490116] ? lock_downgrade+0x6b0/0x6b0 [ 691.490121] ? rwlock_bug.part.0+0x90/0x90 [ 691.490127] ? do_raw_spin_unlock+0x142/0x220 [ 691.490151] btrfs_log_dentry_safe+0x65/0x90 [btrfs] [ 691.490172] btrfs_sync_file+0x9f1/0xc00 [btrfs] [ 691.490195] ? btrfs_file_write_iter+0x1800/0x1800 [btrfs] [ 691.490198] ? rcu_read_lock_any_held.part.11+0x20/0x20 [ 691.490204] ? __do_sys_newstat+0x88/0xd0 [ 691.490207] ? cp_new_stat+0x5d0/0x5d0 [ 691.490218] ? do_fsync+0x38/0x60 [ 691.490220] do_fsync+0x38/0x60 [ 691.490224] __x64_sys_fdatasync+0x32/0x40 [ 691.490228] do_syscall_64+0x9f/0x540 [ 691.490233] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 691.490235] RIP: 0033:0x7f4b253ad5f0 (...) [ 691.490239] RSP: 002b:00007fffbb2d6078 EFLAGS: 00000246 ORIG_RAX: 000000000000004b [ 691.490242] RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007f4b253ad5f0 [ 691.490244] RDX: 00007fffbb2d5fe0 RSI: 00007fffbb2d5fe0 RDI: 0000000000000003 [ 691.490245] RBP: 000000000000000d R08: 0000000000000001 R09: 00007fffbb2d608c [ 691.490247] R10: 00000000000002e8 R11: 0000000000000246 R12: 00000000000001f4 [ 691.490248] R13: 0000000051eb851f R14: 00007fffbb2d6120 R15: 00005635a498bda0
This started happening recently when running some test cases from fstests like btrfs/004 for example, because support for rename exchange was added last week to fsstress from fstests.
So fix this by deleting the log context for the source root from the list if we have logged the new name in the source root.
--- fs/btrfs/inode.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
fs/btrfs/inode.c +15 -0
@@ -9700,6 +9700,18 @@ out_fail: commit_transaction = true; }if (commit_transaction) { +/* +* We may have set commit_transaction when logging the new name +* in the destination root, in which case we left the source +* root context in the list of log contextes. So make sure we +* remove it to avoid invalid memory accesses, since the context +* was allocated in our stack frame. +*/ +if (sync_log_root) { +mutex_lock (&root->log_mutex); +list_del_init (&ctx_root.list); +mutex_unlock (&root->log_mutex); + } ret =btrfs_commit_transaction (trans); }else {int ret2;
@@ -9713,6 +9725,9 @@ out_notrans:if (old_ino ==BTRFS_FIRST_FREE_OBJECTID )up_read (&fs_info->subvol_sem); +ASSERT (list_empty (&ctx_root.list)); +ASSERT (list_empty (&ctx_dest.list)); +return ret; }
Greg Kroah-Hartman
maintainerPATCH 15/422 Input: ff-memless - kill timer in destroy()
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit fa3a5a1880c91bb92594ad42dfe9eedad7996b86 upstream.
No timer must be left running when the device goes away.
--- drivers/input/ff-memless.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/input/ff-memless.c +9 -0
@@ -501,6 +501,15 @@ static void ml_ff_destroy(struct ff_devi {struct ml_device *ml = ff->private; +/* +* Even though we stop all playing effects when tearing down +* an input device (via input_device_flush() that calls into +* input_ff_flush() that stops and erases all effects), we +* do not actually stop the timer, and therefore we should +* do it here. +*/ +del_timer_sync (&ml->timer); +kfree (ml->private); }
Greg Kroah-Hartman
maintainerPATCH 16/422 Input: synaptics-rmi4 - fix video buffer size
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 003f01c780020daa9a06dea1db495b553a868c29 upstream.
The video buffer used by the queue is a vb2_v4l2_buffer, not a plain vb2_buffer. Using the wrong type causes the allocation of the buffer storage to be too small, causing a out of bounds write when __init_vb2_v4l2_buffer initializes the buffer.
--- drivers/input/rmi4/rmi_f54.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/rmi4/rmi_f54.c +1 -1
@@ -362,7 +362,7 @@ static const struct vb2_ops rmi_f54_queustatic const struct vb2_queue rmi_f54_queue = { .type =V4L2_BUF_TYPE_VIDEO_CAPTURE , .io_modes =VB2_MMAP |VB2_USERPTR |VB2_DMABUF |VB2_READ , - .buf_struct_size =sizeof (struct vb2_buffer ), + .buf_struct_size =sizeof (struct vb2_v4l2_buffer ), .ops = &rmi_f54_queue_ops, .mem_ops = &vb2_vmalloc_memops, .timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ,
Greg Kroah-Hartman
maintainerPATCH 17/422 Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver
In reply to Greg Kroah-HartmanFrom: Andrew Duggan <[email protected]>
commit f6aabe1ff1d9d7bad0879253011216438bdb2530 upstream.
This patch fixes an issue seen on HID touchpads which report finger positions using RMI4 Function 12. The issue manifests itself as spurious button presses as described in:
https://www.spinics.net/lists/linux-input/msg58618.html
Commit 24d28e4f1271 ("Input: synaptics-rmi4 - convert irq distribution to irq_domain") switched the RMI4 driver to using an irq_domain to handle RMI4 function interrupts. Functions with more then one interrupt now have each interrupt mapped to their own IRQ and IRQ handler. The result of this change is that the F12 IRQ handler was now getting called twice. Once for the absolute data interrupt and once for the relative data interrupt. For HID devices, calling rmi_f12_attention() a second time causes the attn_data data pointer and size to be set incorrectly. When the touchpad button is pressed, F30 will generate an interrupt and attempt to read the F30 data from the invalid attn_data data pointer and report incorrect button events.
This patch disables the F12 relative interrupt which prevents rmi_f12_attention() from being called twice.
--- drivers/input/rmi4/rmi_f12.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/input/rmi4/rmi_f12.c +26 -2
@@ -58,6 +58,9 @@ struct f12_data {const struct rmi_register_desc_item *data15;u16 data15_offset; + +unsigned long *abs_mask; +unsigned long *rel_mask; };static int rmi_f12_read_sensor_tuning (struct f12_data *f12)
@@ -296,9 +299,18 @@ static int rmi_f12_write_control_regs(ststatic int rmi_f12_config (struct rmi_function *fn) {struct rmi_driver *drv = fn->rmi_dev->driver; +struct f12_data *f12 =dev_get_drvdata (&fn->dev); +struct rmi_2d_sensor *sensor;int ret; - drv->set_irq_bits (fn->rmi_dev, fn->irq_mask); + sensor = &f12->sensor; + +if (!sensor->report_abs) + drv->clear_irq_bits (fn->rmi_dev, f12->abs_mask); +else + drv->set_irq_bits (fn->rmi_dev, f12->abs_mask); + + drv->clear_irq_bits (fn->rmi_dev, f12->rel_mask); ret =rmi_f12_write_control_regs (fn);if (ret)
@@ -320,9 +332,12 @@ static int rmi_f12_probe(struct rmi_funcstruct rmi_device_platform_data *pdata =rmi_get_platform_data (rmi_dev);struct rmi_driver_data *drvdata =dev_get_drvdata (&rmi_dev->dev);u16 data_offset =0 ; +int mask_size;rmi_dbg (RMI_DEBUG_FN , &fn->dev,"%s\n" , __func__); + mask_size =BITS_TO_LONGS (drvdata->irq_count) *sizeof (unsigned long ); + ret =rmi_read (fn->rmi_dev, query_addr, &buf);if (ret <0 ) { dev_err(&fn->dev, "Failed to read general info register: %d\n",
@@ -337,10 +352,19 @@ static int rmi_f12_probe(struct rmi_funcreturn -ENODEV ; } - f12 =devm_kzalloc (&fn->dev,sizeof (struct f12_data ),GFP_KERNEL ); + f12 =devm_kzalloc (&fn->dev,sizeof (struct f12_data ) + mask_size *2 , +GFP_KERNEL );if (!f12)return -ENOMEM ; + f12->abs_mask = (unsigned long *)((char *)f12 + +sizeof (struct f12_data )); + f12->rel_mask = (unsigned long *)((char *)f12 + +sizeof (struct f12_data ) + mask_size); + +set_bit (fn->irq_pos, f12->abs_mask); +set_bit (fn->irq_pos +1 , f12->rel_mask); + f12->has_dribble = !!(buf &BIT (3 ));if (fn->dev.of_node) {
Greg Kroah-Hartman
maintainerPATCH 18/422 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12)
In reply to Greg Kroah-HartmanFrom: Andrew Duggan <[email protected]>
commit 5d40d95e7e64756cc30606c2ba169271704d47cb upstream.
Currently, rmi_f11_attention() and rmi_f12_attention() functions update the attn_data data pointer and size based on the size of the expected size of the attention data. However, if the actual valid data in the attn buffer is less then the expected value then the updated data pointer will point to memory beyond the end of the attn buffer. Using the calculated valid_bytes instead will prevent this from happening.
--- drivers/input/rmi4/rmi_f11.c | 4 ++-- drivers/input/rmi4/rmi_f12.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/input/rmi4/rmi_f11.c +2 -2
@@ -1287,8 +1287,8 @@ static irqreturn_t rmi_f11_attention(int valid_bytes = f11->sensor.attn_size;memcpy (f11->sensor.data_pkt, drvdata->attn_data.data, valid_bytes); - drvdata->attn_data.data += f11->sensor.attn_size; - drvdata->attn_data.size -= f11->sensor.attn_size; + drvdata->attn_data.data += valid_bytes; + drvdata->attn_data.size -= valid_bytes; }else { error = rmi_read_block(rmi_dev, data_base_addr, f11->sensor.data_pkt,
drivers/input/rmi4/rmi_f12.c +2 -2
@@ -217,8 +217,8 @@ static irqreturn_t rmi_f12_attention(int valid_bytes = sensor->attn_size;memcpy (sensor->data_pkt, drvdata->attn_data.data, valid_bytes); - drvdata->attn_data.data += sensor->attn_size; - drvdata->attn_data.size -= sensor->attn_size; + drvdata->attn_data.data += valid_bytes; + drvdata->attn_data.size -= valid_bytes; }else { retval =rmi_read_block (rmi_dev, f12->data_addr, sensor->data_pkt, sensor->pkt_size);
Greg Kroah-Hartman
maintainerPATCH 19/422 Input: synaptics-rmi4 - clear IRQ enables for F54
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 549766ac2ac1f6c8bb85906bbcea759541bb19a2 upstream.
The driver for F54 just polls the status and doesn't even have a IRQ handler registered. Make sure to disable all F54 IRQs, so we don't crash the kernel on a nonexistent handler.
--- drivers/input/rmi4/rmi_f54.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/rmi4/rmi_f54.c +1 -1
@@ -614,7 +614,7 @@ static int rmi_f54_config(struct rmi_fun {struct rmi_driver *drv = fn->rmi_dev->driver; - drv->set_irq_bits (fn->rmi_dev, fn->irq_mask); + drv->clear_irq_bits (fn->rmi_dev, fn->irq_mask);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 20/422 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
commit ba60cf9f78f0d7c8e73c7390608f7f818ee68aa0 upstream.
The driver forgets to destroy workqueue in remove() similarly to what is done when probe() fails. Add a call to destroy_workqueue() to fix it.
Since unregistration will wait for the work to finish, we do not need to cancel/flush the work instance in remove().
--- drivers/input/rmi4/rmi_f54.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/rmi4/rmi_f54.c +1 -0
@@ -742,6 +742,7 @@ static void rmi_f54_remove(struct rmi_fuvideo_unregister_device (&f54->vdev);v4l2_device_unregister (&f54->v4l2); +destroy_workqueue (f54->workqueue); }struct rmi_function_handler rmi_f54_handler = {
Greg Kroah-Hartman
maintainerPATCH 21/422 IB/hfi1: Ensure full Gen3 speed in a Gen4 system
In reply to Greg Kroah-HartmanFrom: James Erwin <[email protected]>
commit a9c3c4c597704b3a1a2b9bef990e7d8a881f6533 upstream.
If an hfi1 card is inserted in a Gen4 systems, the driver will avoid the gen3 speed bump and the card will operate at half speed.
This is because the driver avoids the gen3 speed bump when the parent bus speed isn't identical to gen3, 8.0GT/s. This is not compatible with gen4 and newer speeds.
Fix by relaxing the test to explicitly look for the lower capability speeds which inherently allows for gen4 and all future speeds.
--- drivers/infiniband/hw/hfi1/pcie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/pcie.c +3 -1
@@ -331,7 +331,9 @@ int pcie_speeds(struct hfi1_devdata *dd)/* * bus->max_bus_speed is set from the bridge's linkcap Max Link Speed */ -if (parent && dd->pcidev->bus->max_bus_speed !=PCIE_SPEED_8_0GT ) { +if (parent && + (dd->pcidev->bus->max_bus_speed ==PCIE_SPEED_2_5GT || + dd->pcidev->bus->max_bus_speed ==PCIE_SPEED_5_0GT )) {dd_dev_info (dd,"Parent PCIe bridge does not support Gen3\n" ); dd->link_gen3_capable =0 ; }
Greg Kroah-Hartman
maintainerPATCH 22/422 IB/hfi1: Use a common pad buffer for 9B and 16B packets
In reply to Greg Kroah-HartmanFrom: Mike Marciniszyn <[email protected]>
commit 22bb13653410424d9fce8d447506a41f8292f22f upstream.
There is no reason for a different pad buffer for the two packet types.
Expand the current buffer allocation to allow for both packet types.
--- drivers/infiniband/hw/hfi1/sdma.c | 5 +++-- drivers/infiniband/hw/hfi1/verbs.c | 10 ++++------ 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/infiniband/hw/hfi1/sdma.c +3 -2
@@ -65,6 +65,7 @@#define SDMA_DESCQ_CNT 2048#define SDMA_DESC_INTR 64#define INVALID_TAIL 0xffff +#define SDMA_PAD max_t(size_t, MAX_16B_PADDING, sizeof(u32))static uint sdma_descq_cnt =SDMA_DESCQ_CNT ;module_param (sdma_descq_cnt, uint,S_IRUGO );
@@ -1280,7 +1281,7 @@ void sdma_clean(struct hfi1_devdata *dd,struct sdma_engine *sde;if (dd->sdma_pad_dma) { -dma_free_coherent (&dd->pcidev->dev,4 , +dma_free_coherent (&dd->pcidev->dev,SDMA_PAD , (void *)dd->sdma_pad_dma, dd->sdma_pad_phys); dd->sdma_pad_dma =NULL ;
@@ -1481,7 +1482,7 @@ int sdma_init(struct hfi1_devdata *dd, u/* Allocate memory for pad */ dd->sdma_pad_dma =dma_zalloc_coherent ( &dd->pcidev->dev, -sizeof (u32), +SDMA_PAD , &dd->sdma_pad_phys,GFP_KERNEL );
drivers/infiniband/hw/hfi1/verbs.c +4 -6
@@ -149,9 +149,6 @@ static int pio_wait(struct rvt_qp *qp,/* Length of buffer to create verbs txreq cache name */ #define TXREQ_NAME_LEN 24 -/* 16B trailing buffer */ -static const u8 trail_buf[MAX_16B_PADDING ]; -static uint wss_threshold;module_param (wss_threshold, uint,S_IRUGO );MODULE_PARM_DESC (wss_threshold,"Percentage (1-100) of LLC to use as a threshold for a cacheless copy" );
@@ -893,8 +890,8 @@ static int build_verbs_tx_desc(/* add icrc, lt byte, and padding to flit */ if (extra_bytes) - ret =sdma_txadd_kvaddr (sde->dd, &tx->txreq, - (void *)trail_buf, extra_bytes); + ret =sdma_txadd_daddr (sde->dd, &tx->txreq, + sde->dd->sdma_pad_phys, extra_bytes); bail_txadd:return ret;
@@ -1151,7 +1148,8 @@ int hfi1_verbs_send_pio(struct rvt_qp *q }/* add icrc, lt byte, and padding to flit */ if (extra_bytes) -seg_pio_copy_mid (pbuf, trail_buf, extra_bytes); +seg_pio_copy_mid (pbuf, ppd->dd->sdma_pad_dma, + extra_bytes);seg_pio_copy_end (pbuf); }
Greg Kroah-Hartman
maintainerPATCH 23/422 i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 7574c0db2e68c4d0bae9d415a683bdd8b2a761e9 upstream.
Many cheap devices use Silead touchscreen controllers. Testing has shown repeatedly that these touchscreen controllers work fine at 400KHz, but for unknown reasons do not work properly at 100KHz. This has been seen on both ARM and x86 devices using totally different i2c controllers.
On some devices the ACPI tables list another device at the same I2C-bus as only being capable of 100KHz, testing has shown that these other devices work fine at 400KHz (as can be expected of any recent I2C hw).
This commit makes i2c_acpi_find_bus_speed() always return 400KHz if a Silead touchscreen controller is present, fixing the touchscreen not working on devices which ACPI tables' wrongly list another device on the same bus as only being capable of 100KHz.
Specifically this fixes the touchscreen on the Jumper EZpad 6 m4 not working.
--- drivers/i2c/i2c-core-acpi.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
drivers/i2c/i2c-core-acpi.c +27 -1
@@ -43,6 +43,7 @@ struct i2c_acpi_lookup {int index;u32 speed;u32 min_speed; +u32 force_speed; };static int i2c_acpi_fill_info (struct acpi_resource *ares,void *data)
@@ -240,6 +241,19 @@ i2c_acpi_match_device(const struct acpi_return acpi_match_device (matches, &client->dev); } +static const struct acpi_device_id i2c_acpi_force_400khz_device_ids[] = { +/* +* These Silead touchscreen controllers only work at 400KHz, for +* some reason they do not work at 100KHz. On some devices the ACPI +* tables list another device at their bus as only being capable +* of 100KHz, testing has shown that these other devices work fine +* at 400KHz (as can be expected of any recent i2c hw) so we force +* the speed of the bus to 400 KHz if a Silead device is present. +*/ + {"MSSL1680" ,0 }, + {} +}; +static acpi_status i2c_acpi_lookup_speed (acpi_handle handle,u32 level,void *data,void **return_value) {
@@ -258,6 +272,9 @@ static acpi_status i2c_acpi_lookup_speedif (lookup->speed <= lookup->min_speed) lookup->min_speed = lookup->speed; +if (acpi_match_device_ids (adev, i2c_acpi_force_400khz_device_ids) ==0 ) + lookup->force_speed =400000 ; +return AE_OK ; }
@@ -295,7 +312,16 @@ u32 i2c_acpi_find_bus_speed(struct devicreturn 0 ; } -return lookup.min_speed !=UINT_MAX ? lookup.min_speed :0 ; +if (lookup.force_speed) { +if (lookup.force_speed != lookup.min_speed) +dev_warn (dev,FW_BUG "DSDT uses known not-working I2C bus speed %d, forcing it to %d\n" , + lookup.min_speed, lookup.force_speed); +return lookup.force_speed; + }else if (lookup.min_speed !=UINT_MAX ) { +return lookup.min_speed; + }else { +return 0 ; + } }EXPORT_SYMBOL_GPL (i2c_acpi_find_bus_speed);
Greg Kroah-Hartman
maintainerPATCH 24/422 x86/quirks: Disable HPET on Intel Coffe Lake platforms
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit fc5db58539b49351e76f19817ed1102bf7c712d0 upstream.
Some Coffee Lake platforms have a skewed HPET timer once the SoCs entered PC10, which in consequence marks TSC as unstable because HPET is used as watchdog clocksource for TSC.
Harry Pan tried to work around it in the clocksource watchdog code [1] thereby creating a circular dependency between HPET and TSC. This also ignores the fact, that HPET is not only unsuitable as watchdog clocksource on these systems, it becomes unusable in general.
Disable HPET on affected platforms.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203183
--- arch/x86/kernel/early-quirks.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/early-quirks.c +2 -0
@@ -707,6 +707,8 @@ static struct chipset early_qrk[] __init*/ {PCI_VENDOR_ID_INTEL ,0x0f00 , PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet}, + { PCI_VENDOR_ID_INTEL, 0x3ec4, + PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet}, { PCI_VENDOR_ID_BROADCOM, 0x4331, PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset}, {}
Greg Kroah-Hartman
maintainerPATCH 25/422 ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit e72b9dd6a5f17d0fb51f16f8685f3004361e83d0 upstream.
lower_dentry can't go from positive to negative (we have it pinned), but it *can* go from negative to positive. So fetching ->d_inode into a local variable, doing a blocking allocation, checking that now ->d_inode is non-NULL and feeding the value we'd fetched earlier to a function that won't accept NULL is not a good idea.
--- fs/ecryptfs/inode.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/ecryptfs/inode.c +10 -2
@@ -325,7 +325,7 @@ static int ecryptfs_i_size_read(struct dstatic struct dentry *ecryptfs_lookup_interpose (struct dentry *dentry,struct dentry *lower_dentry) { -struct inode *inode, *lower_inode =d_inode (lower_dentry); +struct inode *inode, *lower_inode;struct ecryptfs_dentry_info *dentry_info;struct vfsmount *lower_mnt;int rc =0 ;
@@ -345,7 +345,15 @@ static struct dentry *ecryptfs_lookup_in dentry_info->lower_path.mnt = lower_mnt; dentry_info->lower_path.dentry = lower_dentry; -if (d_really_is_negative (lower_dentry)) { +/* +* negative dentry can go positive under us here - its parent is not +* locked. That's OK and that could happen just as we return from +* ecryptfs_lookup() anyway. Just need to be careful and fetch +* ->d_inode only once - it's not stable here. +*/ + lower_inode =READ_ONCE (lower_dentry->d_inode); + +if (!lower_inode) {/* We want to add because we couldn't find in lower */ d_add (dentry,NULL );return NULL ;
Re: [PATCH 4.19 025/422] ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable
Hi!
Quoted 15 lines
From: Al Viro <[email protected]>
commit
e72b9dd6a5f17d0fb51f16f8685f3004361e83d0upstream.
lower_dentrycan't go from positive to negative (we have it pinned), but it *can* go from negative to positive. So fetching ->d_inode into a local variable, doing a blocking allocation, checking that now ->d_inode is non-NULL and feeding the value we'd fetched earlier to a function that won't accept NULL is not a good idea.fs/ecryptfs/inode.c +0
-0@@ -345,7 +345,15 @@ static struct dentry *ecryptfs_lookup_in dentry_info->lower_path.mnt = lower_mnt;
fs/ecryptfs/inode.c static struct dentry *ecryptfs_lookup_in · line 354
Quoted 10 lines
fs/ecryptfs/inode.c +7
-1dentry_info->lower_path.dentry = lower_dentry; -if (d_really_is_negative (lower_dentry)) { +/* +* negative dentry can go positive under us here - its parent is not +* locked. That's OK and that could happen just as we return from +* ecryptfs_lookup() anyway. Just need to be careful and fetch +* ->d_inode only once - it's not stable here. +*/ + lower_inode =READ_ONCE (lower_dentry->d_inode);
Should this use d_inode_rcu() function, to keep the abstraction provided by the header file?
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 26/422 ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 762c69685ff7ad5ad7fee0656671e20a0c9c864d upstream.
We need to get the underlying dentry of parent; sure, absent the races it is the parent of underlying dentry, but there's nothing to prevent losing a timeslice to preemtion in the middle of evaluation of lower_dentry->d_parent->d_inode, having another process move lower_dentry around and have its (ex)parent not pinned anymore and freed on memory pressure. Then we regain CPU and try to fetch ->d_inode from memory that is freed by that point.
dentry->d_parent *is* stable here - it's an argument of ->lookup() and we are guaranteed that it won't be moved anywhere until we feed it to d_add/d_splice_alias. So we safely go that way to get to its underlying dentry.
--- fs/ecryptfs/inode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/ecryptfs/inode.c +3 -4
@@ -325,9 +325,9 @@ static int ecryptfs_i_size_read(struct dstatic struct dentry *ecryptfs_lookup_interpose (struct dentry *dentry,struct dentry *lower_dentry) { +struct path *path =ecryptfs_dentry_to_lower_path (dentry->d_parent);struct inode *inode, *lower_inode;struct ecryptfs_dentry_info *dentry_info; -struct vfsmount *lower_mnt;int rc =0 ; dentry_info =kmem_cache_alloc (ecryptfs_dentry_info_cache,GFP_KERNEL );
@@ -336,13 +336,12 @@ static struct dentry *ecryptfs_lookup_inreturn ERR_PTR (-ENOMEM ); } - lower_mnt =mntget (ecryptfs_dentry_to_lower_mnt (dentry->d_parent));fsstack_copy_attr_atime (d_inode (dentry->d_parent), -d_inode (lower_dentry->d_parent)); +d_inode (path->dentry));BUG_ON (!d_count (lower_dentry));ecryptfs_set_dentry_private (dentry, dentry_info); - dentry_info->lower_path.mnt = lower_mnt; + dentry_info->lower_path.mnt =mntget (path->mnt); dentry_info->lower_path.dentry = lower_dentry;/*
Greg Kroah-Hartman
maintainerPATCH 27/422 net: ethernet: dwmac-sun8i: Use the correct function in exit path
In reply to Greg Kroah-HartmanFrom: Corentin Labbe <[email protected]>
commit 40a1dcee2d1846a24619fe9ca45c661ca0db7dda upstream.
When PHY is not powered, the probe function fail and some resource are still unallocated.
Furthermore some BUG happens:
dwmac-sun8i 5020000.ethernet: EMAC reset timeout
------------[ cut here ]------------ kernel BUG at /linux-next/net/core/dev.c:9844!
So let's use the right function (stmmac_pltfr_remove) in the error path.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +1 -1
@@ -1199,7 +1199,7 @@ static int sun8i_dwmac_probe(struct plat dwmac_mux:sun8i_dwmac_unset_syscon (gmac); dwmac_exit: -sun8i_dwmac_exit (pdev, plat_dat->bsp_priv); +stmmac_pltfr_remove (pdev);return ret; }
Greg Kroah-Hartman
maintainerPATCH 28/422 iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros
In reply to Greg Kroah-HartmanFrom: Eric Auger <[email protected]>
commit 4e7120d79edb31e4ee68e6f8421448e4603be1e9 upstream.
For both PASID-based-Device-TLB Invalidate Descriptor and Device-TLB Invalidate Descriptor, the Physical Function Source-ID value is split according to this layout:
PFSID[3:0] is set at offset 12 and PFSID[15:4] is put at offset 52. Fix the part laid out at offset 52.
--- include/linux/intel-iommu.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/intel-iommu.h +4 -2
@@ -286,7 +286,8 @@ enum {#define QI_DEV_IOTLB_SID (sid) ((u64)((sid) & 0xffff) << 32)#define QI_DEV_IOTLB_QDEP (qdep) (((qdep) & 0x1f) << 16)#define QI_DEV_IOTLB_ADDR (addr) ((u64)(addr) & VTD_PAGE_MASK) -#define QI_DEV_IOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | ((u64)(pfsid & 0xfff) << 52)) +#define QI_DEV_IOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | \ + ((u64)((pfsid >> 4) & 0xfff) << 52))#define QI_DEV_IOTLB_SIZE 1#define QI_DEV_IOTLB_MAX_INVS 32
@@ -311,7 +312,8 @@ enum {#define QI_DEV_EIOTLB_PASID (p) (((u64)p) << 32)#define QI_DEV_EIOTLB_SID (sid) ((u64)((sid) & 0xffff) << 16)#define QI_DEV_EIOTLB_QDEP (qd) ((u64)((qd) & 0x1f) << 4) -#define QI_DEV_EIOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | ((u64)(pfsid & 0xfff) << 52)) +#define QI_DEV_EIOTLB_PFSID (pfsid) (((u64)(pfsid & 0xf) << 12) | \ + ((u64)((pfsid >> 4) & 0xfff) << 52))#define QI_DEV_EIOTLB_MAX_INVS 32#define QI_PGRP_IDX (idx) (((u64)(idx)) << 55)
Greg Kroah-Hartman
maintainerPATCH 29/422 mm: mempolicy: fix the wrong return value and potential pages leak of mbind
In reply to Greg Kroah-HartmanFrom: Yang Shi <[email protected]>
commit a85dfc305a21acfc48fa28a0fa0a0cb6ad496120 upstream.
Commit d883544515aa ("mm: mempolicy: make the behavior consistent when MPOL_MF_MOVE* and MPOL_MF_STRICT were specified") fixed the return value of mbind() for a couple of corner cases. But, it altered the errno for some other cases, for example, mbind() should return -EFAULT when part or all of the memory range specified by nodemask and maxnode points outside your accessible address space, or there was an unmapped hole in the specified memory range specified by addr and len.
Fix this by preserving the errno returned by queue_pages_range(). And, the pagelist may be not empty even though queue_pages_range() returns error, put the pages back to LRU since mbind_range() is not called to really apply the policy so those pages should not be migrated, this is also the old behavior before the problematic commit.
--- mm/mempolicy.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
mm/mempolicy.c +9 -5
@@ -666,7 +666,9 @@ static int queue_pages_test_walk(unsigne* 1 - there is unmovable page, but MPOL_MF_MOVE* & MPOL_MF_STRICT were * specified. * 0 - queue pages successfully or no misplaced page. -* -EIO - there is misplaced page and only MPOL_MF_STRICT was specified. +* errno - i.e. misplaced pages with MPOL_MF_STRICT specified (-EIO) or +* memory range specified by nodemask and maxnode points outside +* your accessible address space (-EFAULT) */ static int queue_pages_range(struct mm_struct *mm, unsigned long start, unsigned long end,
@@ -1273,7 +1275,7 @@ static long do_mbind(unsigned long start flags | MPOL_MF_INVERT, &pagelist);if (ret <0 ) { - err = -EIO ; + err = ret; goto up_out; }
@@ -1292,10 +1294,12 @@ static long do_mbind(unsigned long startif ((ret >0 ) || (nr_failed && (flags &MPOL_MF_STRICT ))) err = -EIO ; - }else -putback_movable_pages (&pagelist); - + }else { up_out: +if (!list_empty (&pagelist)) +putback_movable_pages (&pagelist); + } +up_write (&mm->mmap_sem); mpol_out:mpol_put (new);
Greg Kroah-Hartman
maintainerPATCH 30/422 mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm()
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit 00d484f354d85845991b40141d40ba9e5eb60faf upstream.
We've encountered a rcu stall in get_mem_cgroup_from_mm():
rcu: INFO: rcu_sched self-detected stall on CPU rcu: 33-....: (21000 ticks this GP) idle=6c6/1/0x4000000000000002 softirq=35441/35441 fqs=5017 (t=21031 jiffies g=324821 q=95837) NMI backtrace for cpu 33 <...> RIP: 0010:get_mem_cgroup_from_mm+0x2f/0x90 <...> __memcg_kmem_charge+0x55/0x140 __alloc_pages_nodemask+0x267/0x320 pipe_write+0x1ad/0x400 new_sync_write+0x127/0x1c0 __kernel_write+0x4f/0xf0 dump_emit+0x91/0xc0 writenote+0xa0/0xc0 elf_core_dump+0x11af/0x1430 do_coredump+0xc65/0xee0 get_signal+0x132/0x7c0 do_signal+0x36/0x640 exit_to_usermode_loop+0x61/0xd0 do_syscall_64+0xd4/0x100 entry_SYSCALL_64_after_hwframe+0x44/0xa9
The problem is caused by an exiting task which is associated with an offline memcg. We're iterating over and over in the do {} while (!css_tryget_online()) loop, but obviously the memcg won't become online and the exiting task won't be migrated to a live memcg.
Let's fix it by switching from css_tryget_online() to css_tryget().
As css_tryget_online() cannot guarantee that the memcg won't go offline, the check is usually useless, except some rare cases when for example it determines if something should be presented to a user.
A similar problem is described by commit 18fa84a2db0e ("cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css()").
Johannes:
: The bug aside, it doesn't matter whether the cgroup is online for the : callers. It used to matter when offlining needed to evacuate all charges : from the memcg, and so needed to prevent new ones from showing up, but we : don't care now.
--- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memcontrol.c +1 -1
@@ -851,7 +851,7 @@ struct mem_cgroup *get_mem_cgroup_from_mif (unlikely (!memcg)) memcg = root_mem_cgroup; } - }while (!css_tryget_online (&memcg->css)); + }while (!css_tryget (&memcg->css));rcu_read_unlock ();return memcg; }
Greg Kroah-Hartman
maintainerPATCH 31/422 mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup()
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit 0362f326d86c645b5e96b7dbc3ee515986ed019d upstream.
An exiting task might belong to an offline cgroup. In this case an attempt to grab a cgroup reference from the task can end up with an infinite loop in hugetlb_cgroup_charge_cgroup(), because neither the cgroup will become online, neither the task will be migrated to a live cgroup.
Fix this by switching over to css_tryget(). As css_tryget_online() can't guarantee that the cgroup won't go offline, in most cases the check doesn't make sense. In this particular case users of hugetlb_cgroup_charge_cgroup() are not affected by this change.
A similar problem is described by commit 18fa84a2db0e ("cgroup: Use css_tryget() instead of css_tryget_online() in task_get_css()").
--- mm/hugetlb_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hugetlb_cgroup.c +1 -1
@@ -196,7 +196,7 @@ int hugetlb_cgroup_charge_cgroup(int idx again:rcu_read_lock (); h_cg =hugetlb_cgroup_from_task (current); -if (!css_tryget_online (&h_cg->css)) { +if (!css_tryget (&h_cg->css)) {rcu_read_unlock (); goto again; }
Greg Kroah-Hartman
maintainerPATCH 32/422 mmc: sdhci-of-at91: fix quirk2 overwrite
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
commit fed23c5829ecab4ddc712d7b0046e59610ca3ba4 upstream.
The quirks2 are parsed and set (e.g. from DT) before the quirk for broken HS200 is set in the driver.
The driver needs to enable just this flag, not rewrite the whole quirk set.
--- drivers/mmc/host/sdhci-of-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-at91.c +1 -1
@@ -366,7 +366,7 @@ static int sdhci_at91_probe(struct platfpm_runtime_use_autosuspend (&pdev->dev);/* HS200 is broken at this moment */ - host->quirks2 =SDHCI_QUIRK2_BROKEN_HS200 ; + host->quirks2 |=SDHCI_QUIRK2_BROKEN_HS200 ; ret =sdhci_add_host (host);if (ret)
Greg Kroah-Hartman
maintainerPATCH 33/422 iio: adc: max9611: explicitly cast gain_selectors
In reply to Greg Kroah-HartmanFrom: Stefan Agner <[email protected]>
[ Upstream commit b1ec0802503820ccbc894aadfd2a44da20232f5e ]
After finding a reasonable gain, the function converts the configured gain to a gain configuration option selector enum max9611_csa_gain. Make the conversion clearly visible by using an explicit cast. This also avoids a warning seen with clang:
drivers/iio/adc/max9611.c:292:16: warning: implicit conversion from
enumeration type 'enum max9611_conf_ids' to different enumeration type 'enum max9611_csa_gain' [-Wenum-conversion]
*csa_gain = gain_selectors[i];
~ ^~~~~~~~~~~~~~~~~
--- drivers/iio/adc/max9611.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/max9611.c +1 -1
@@ -289,7 +289,7 @@ static int max9611_read_csa_voltage(struct max9611_dev *max9611,return ret;if (*adc_raw >0 ) { - *csa_gain = gain_selectors[i]; + *csa_gain = (enum max9611_csa_gain )gain_selectors[i];return 0 ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/422 tee: optee: take DT status property into account
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit db878f76b9ff7487da9bb0f686153f81829f1230 ]
DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver.
--- drivers/tee/optee/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tee/optee/core.c +1 -1
@@ -696,7 +696,7 @@ static int __init optee_driver_init(void)return -ENODEV ; np =of_find_matching_node (fw_np, optee_match); -if (!np) +if (!np || !of_device_is_available (np))return -ENODEV ; optee =optee_probe (np);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 034/422] tee: optee: take DT status property into account
Hi,
Quoted 4 lines · Greg Kroah-Hartman
From: Ard Biesheuvel <[email protected]>
[ Upstream commit
db878f76b9ff7487da9bb0f686153f81829f1230]
Quoted 8 lines
DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver.
Signed-off-by Ard Biesheuvel <[email protected]>Signed-off-by Jens Wiklander <[email protected]>Signed-off-by Sasha Levin <[email protected]>
This patch requires the following additional commit:
commit c7c0d8df0b94a67377555a550b8d66ee2ad2f4ed
Author: Julia Lawall <[email protected]> Date: Sat Feb 23 14:20:36 2019 +0100
tee: optee: add missing of_node_put after of_device_is_available
Add an of_node_put when a tested device node is not available.
The semantic patch that fixes this problem is as follows
(http://coccinelle.lip6.fr):
// <smpl>
@@
identifier f;
local idexpression e;
expression x;
@@
e = f(...);
... when != of_node_put(e)
when != x = e
when != e = x
when any
if (<+...of_device_is_available(e)...+>) {
... when != of_node_put(e)
(
return e;
|
+ of_node_put(e);
return ...;
)
}
// </smpl>
Fixes: db878f76b9ff ("tee: optee: take DT status property into account")
Signed-off-by: Julia Lawall <[email protected]>
Signed-off-by: Jens Wiklander <[email protected]>Please apply this commit. And this is also required for 4.14.y.
Best regards,
Nobuhiro
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 034/422] tee: optee: take DT status property into account
Quoted 56 lines · Nobuhiro Iwamatsu
Hi,
Quoted 4 lines · Greg Kroah-Hartman
From: Ard Biesheuvel <[email protected]>
[ Upstream commit
db878f76b9ff7487da9bb0f686153f81829f1230]Quoted 8 lines
DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver.
Signed-off-by Ard Biesheuvel <[email protected]>Signed-off-by Jens Wiklander <[email protected]>Signed-off-by Sasha Levin <[email protected]>This patch requires the following additional commit:
commit
c7c0d8df0b94a67377555a550b8d66ee2ad2f4edAuthor: Julia Lawall <[email protected]> Date: Sat Feb 23 14:20:36 2019 +0100tee: optee: add missing of_node_put after of_device_is_available Add an of_node_put when a tested device node is not available. The semantic patch that fixes this problem is as follows (http://coccinelle.lip6.fr): // <smpl> @@ identifier f; local idexpression e; expression x; @@ e = f(...); ... when != of_node_put(e) when != x = e when != e = x when any if (<+...of_device_is_available(e)...+>) { ... when != of_node_put(e) ( return e; | + of_node_put(e); return ...; ) } // </smpl> Fixes: db878f76b9ff ("tee: optee: take DT status property into account") Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Jens Wiklander <[email protected]>
Quoted 1 line
Please apply this commit. And this is also required for 4.14.y.
Now queued up, thanks!
greg k-h
Greg Kroah-Hartman
maintainerPATCH 35/422 ath10k: fix kernel panic by moving pci flush after napi_disable
In reply to Greg Kroah-HartmanFrom: Tamizh chelvam <[email protected]>
[ Upstream commit bd1d395070cca4f42a93e520b0597274789274a4 ]
When continuously running wifi up/down sequence, the napi poll can be scheduled after the CE buffers being freed by ath10k_pci_flush
Steps:
In a certain condition, during wifi down below scenario might occur.
ath10k_stop->ath10k_hif_stop->napi_schedule->ath10k_pci_flush->napi_poll(napi_synchronize).
In the above scenario, CE buffer entries will be freed up and become NULL in ath10k_pci_flush. And the napi_poll has been invoked after the flush process and it will try to get the skb from the CE buffer entry and perform some action on that. Since the CE buffer already cleaned by pci flush this action will create NULL pointer dereference and trigger below kernel panic.
Unable to handle kernel NULL pointer dereference at virtual address 0000005c PC is at ath10k_pci_htt_rx_cb+0x64/0x3ec [ath10k_pci]
ath10k_pci_htt_rx_cb [ath10k_pci] ath10k_ce_per_engine_service+0x74/0xc4 [ath10k_pci] ath10k_ce_per_engine_service [ath10k_pci] ath10k_ce_per_engine_service_any+0x74/0x80 [ath10k_pci] ath10k_ce_per_engine_service_any [ath10k_pci] ath10k_pci_napi_poll+0x48/0xec [ath10k_pci] ath10k_pci_napi_poll [ath10k_pci] net_rx_action+0xac/0x160net_rx_action__do_softirq+0xdc/0x208__do_softirqirq_exit+0x84/0xe0irq_exit__handle_domain_irq+0x80/0xa0 __handle_domain_irqgic_handle_irq+0x38/0x5cgic_handle_irq__irq_usr+0x44/0x60
Tested on QCA4019 and firmware version 10.4.3.2.1.1-00010
--- drivers/net/wireless/ath/ath10k/ahb.c | 4 ++-- drivers/net/wireless/ath/ath10k/pci.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/ahb.c +2 -2
@@ -655,10 +655,10 @@ static void ath10k_ahb_hif_stop(struct ath10k *ar)ath10k_ahb_irq_disable (ar);synchronize_irq (ar_ahb->irq); -ath10k_pci_flush (ar); -napi_synchronize (&ar->napi);napi_disable (&ar->napi); + +ath10k_pci_flush (ar); }static int ath10k_ahb_hif_power_up (struct ath10k *ar)
drivers/net/wireless/ath/ath10k/pci.c +1 -1
@@ -2068,9 +2068,9 @@ static void ath10k_pci_hif_stop(struct ath10k *ar)ath10k_pci_irq_disable (ar);ath10k_pci_irq_sync (ar); -ath10k_pci_flush (ar);napi_synchronize (&ar->napi);napi_disable (&ar->napi); +ath10k_pci_flush (ar);spin_lock_irqsave (&ar_pci->ps_lock, flags);WARN_ON (ar_pci->ps_wake_refcount >0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/422 iio: dac: mcp4922: fix error handling in mcp4922_write_raw
In reply to Greg Kroah-HartmanFrom: Marcus Folkesson <[email protected]>
[ Upstream commit 0833627fc3f757a0dca11e2a9c46c96335a900ee ]
Do not try to write negative values and make sure that the write goes well.
--- drivers/iio/dac/mcp4922.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/iio/dac/mcp4922.c +8 -3
@@ -94,17 +94,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev, long mask) {struct mcp4922_state *state =iio_priv (indio_dev); +int ret;if (val2 !=0 )return -EINVAL ;switch (mask) {case IIO_CHAN_INFO_RAW : -if (val >GENMASK (chan->scan_type.realbits-1 ,0 )) +if (val <0 || val >GENMASK (chan->scan_type.realbits -1 ,0 ))return -EINVAL ; val <<= chan->scan_type.shift; - state->value[chan->channel] = val; -return mcp4922_spi_write (state, chan->channel, val); + + ret =mcp4922_spi_write (state, chan->channel, val); +if (!ret) + state->value[chan->channel] = val; +return ret; +default :return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/422 clk: sunxi-ng: h6: fix PWM gate/reset offset
In reply to Greg Kroah-HartmanFrom: Rongyi Chen <[email protected]>
[ Upstream commit 58c0f79887d5e425fe6a9fd542778e50df69e9c6 ]
Currently the register offset of the PWM bus gate in Allwinner H6 clock driver is wrong.
Fix this issue.
--- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/sunxi-ng/ccu-sun50i-h6.c +1 -1
@@ -352,7 +352,7 @@ static SUNXI_CCU_GATE(bus_dbg_clk, "bus-dbg", "psi-ahb1-ahb2", static SUNXI_CCU_GATE(bus_psi_clk, "bus-psi", "psi-ahb1-ahb2", 0x79c, BIT(0), 0); -static SUNXI_CCU_GATE(bus_pwm_clk, "bus-pwm", "apb1", 0x79c, BIT(0), 0); +static SUNXI_CCU_GATE(bus_pwm_clk, "bus-pwm", "apb1", 0x7ac, BIT(0), 0); static SUNXI_CCU_GATE(bus_iommu_clk, "bus-iommu", "apb1", 0x7bc, BIT(0), 0);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/422 soundwire: Initialize completion for defer messages
In reply to Greg Kroah-HartmanFrom: Shreyas NC <[email protected]>
[ Upstream commit a306a0e4a5326269b6c78d136407f08433ab5ece ]
Deferred messages are async messages used to synchronize transitions mostly while doing a bank switch on multi links. On successful transitions these messages are marked complete and thereby confirming that all the buses performed bank switch successfully.
So, initialize the completion structure for the same.
--- drivers/soundwire/bus.c | 1 + 1 file changed, 1 insertion(+)
drivers/soundwire/bus.c +1 -0
@@ -175,6 +175,7 @@ static inline int do_transfer_defer(struct sdw_bus *bus, defer->msg = msg; defer->length = msg->len; +init_completion (&defer->complete);for (i =0 ; i <= retry; i++) { resp = bus->ops->xfer_msg_defer (bus, msg, defer);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 038/422] soundwire: Initialize completion for defer messages
Quoted 10 lines · Greg Kroah-Hartman
From: Shreyas NC <[email protected]>
[ Upstream commit
a306a0e4a5326269b6c78d136407f08433ab5ece]Deferred messages are async messages used to synchronize transitions mostly while doing a bank switch on multi links. On successful transitions these messages are marked complete and thereby confirming that all the buses performed bank switch successfully.
Quoted 3 lines
So, initialize the completion structure for the same.
Signed-off-by Sanyog Kale <[email protected]>
This is only called from sdw_transfer_defer() and that function is called in mainline, but is unused in 4.19.X.
So I don't think this is suitable for -stable.
Best regards,
Pavel
Quoted 12 lines
drivers/soundwire/bus.c +1
-0@@ -175,6 +175,7 @@ static inline int do_transfer_defer(struct sdw_bus *bus, defer->msg = msg; defer->length = msg->len; +init_completion (&defer->complete);for (i =0 ; i <= retry; i++) { resp = bus->ops->xfer_msg_defer (bus, msg, defer);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 038/422] soundwire: Initialize completion for defer messages
Quoted 9 lines
Quoted 9 lines
[ Upstream commit
a306a0e4a5326269b6c78d136407f08433ab5ece]Deferred messages are async messages used to synchronize transitions mostly while doing a bank switch on multi links. On successful transitions these messages are marked complete and thereby confirming that all the buses performed bank switch successfully.
Quoted 8 lines
Quoted 3 lines
So, initialize the completion structure for the same.
Signed-off-by Sanyog Kale <[email protected]>This is only called from
sdw_transfer_defer()and that function is called in mainline, but is unused in 4.19.X.So I don't think this is suitable for -stable.
Agree.
Multi-link solutions with synchronized streaming are not supported just yet. It's an important feature but it'll only be enabled after the existing backlog of 60+ patches are merged, and when the ASoC multi-cpu support allows for this feature, hopefully for 5.7.
my 2 cents
-Pierre
Greg Kroah-Hartman
maintainerPATCH 39/422 soundwire: intel: Fix uninitialized adev deref
In reply to Greg Kroah-HartmanFrom: Vinod Koul <[email protected]>
[ Upstream commit e1c815f4b24a305e5bc9eceb541674bf4d02b709 ]
In case of error, we can dereference uninitialized 'adev'
drivers/soundwire/intel_init.c:154 sdw_intel_acpi_cb()
error: uninitialized symbol 'adev'.
Fix that by not using adev for warn print and make it pr_err.
--- drivers/soundwire/intel_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soundwire/intel_init.c +1 -1
@@ -151,7 +151,7 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level,struct acpi_device *adev;if (acpi_bus_get_device (handle, &adev)) { -dev_err (&adev->dev,"Couldn't find ACPI handle\n" ); +pr_err ("%s: Couldn't find ACPI handle\n" , __func__);return AE_NOT_FOUND ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/422 arm64: dts: allwinner: a64: Orange Pi Win: Fix SD card node
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit 09b964afca14d0594b2b2f265df3d987e2f43867 ]
The Orange Pi Win has a microSD card slot which is connected via all four SD data lines. As the DT was not mentioning this fact, we got the default single bit transfers, losing out on performance. Also, as microSD does not have a write protect switch, we disable this feature in the DT node.
--- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +3 -1
@@ -67,7 +67,9 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + disable-wp; + bus-width = <4>; status = "okay"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/422 arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit 93366b49a35f3a190052734b3f32c8fe2535b53f ]
The Olinuxino board uses DDR3L chips which are supposed to be driven with 1.35V. The reset default of the AXP is properly set to 1.36V.
While technically the chips can also run at 1.5 volts, changing the voltage on the fly while booting Linux is asking for trouble. Also running at a lower voltage saves power.
So fix the DCDC5 value to match the actual board design.
--- arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +6 -2
@@ -142,10 +142,14 @@ /* DCDC3 is polyphased with DCDC2 */ +/* + * The board uses DDR3L DRAM chips. 1.36V is the closest to the nominal + * 1.35V that the PMIC can drive. + */ ®_dcdc5 { regulator-always-on; - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; + regulator-min-microvolt = <1360000>; + regulator-max-microvolt = <1360000>; regulator-name = "vcc-ddr3"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/422 arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit 480f58cdbe392d4387a2193b6131a277e0111dd0 ]
According to the NanoPi-A64 schematics, DCDC1 is connected to a voltage rail named "VDD_SYS_3.3V". All users seem to expect 3.3V here: the Ethernet PHY, the uSD card slot, the camera interface and the GPIO pins on the headers.
Fix up the voltage on the regulator to lift it up to 3.3V.
--- arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +3 -3
@@ -125,9 +125,9 @@ ®_dcdc1 { regulator-always-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "vcc-3v"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-3v3"; }; ®_dcdc2 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/422 ALSA: pcm: signedness bug in snd_pcm_plug_alloc()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 6f128fa41f310e1f39ebcea9621d2905549ecf52 ]
The "frames" variable is unsigned so the error handling doesn't work properly.
--- sound/core/oss/pcm_plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/oss/pcm_plugin.c +2 -2
@@ -111,7 +111,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->next) {if (plugin->dst_frames) frames = plugin->dst_frames (plugin, frames); -if (snd_BUG_ON (frames <=0 )) +if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 ))return -ENXIO ; plugin = plugin->next; err =snd_pcm_plugin_alloc (plugin, frames);
@@ -123,7 +123,7 @@ int snd_pcm_plug_alloc(struct snd_pcm_substream *plug, snd_pcm_uframes_t frames)while (plugin->prev) {if (plugin->src_frames) frames = plugin->src_frames (plugin, frames); -if (snd_BUG_ON (frames <=0 )) +if (snd_BUG_ON ((snd_pcm_sframes_t )frames <=0 ))return -ENXIO ; plugin = plugin->prev; err =snd_pcm_plugin_alloc (plugin, frames);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/422 soc/tegra: pmc: Fix pad voltage configuration for Tegra186
In reply to Greg Kroah-HartmanFrom: Aapo Vienamo <[email protected]>
[ Upstream commit 13136a47a061c01c91df78b37f7708dd5ce7035f ]
Implement support for the PMC_IMPL_E_33V_PWR register which replaces PMC_PWR_DET register interface of the SoC generations preceding Tegra186. Also add the voltage bit offsets to the tegra186_io_pads[] table and the AO_HV pad.
--- drivers/soc/tegra/pmc.c | 55 +++++++++++++++++++++++++++++------------ include/soc/tegra/pmc.h | 1 + 2 files changed, 40 insertions(+), 16 deletions(-)
drivers/soc/tegra/pmc.c +39 -16
@@ -65,6 +65,8 @@#define PWRGATE_STATUS 0x38 +#define PMC_IMPL_E_33V_PWR 0x40 +#define PMC_PWR_DET 0x48#define PMC_SCRATCH0_MODE_RECOVERY BIT(31)
@@ -154,6 +156,7 @@ struct tegra_pmc_soc {bool has_tsense_reset;bool has_gpu_clamps;bool needs_mbist_war; +bool has_impl_33v_pwr;const struct tegra_io_pad_soc *io_pads;unsigned int num_io_pads;
@@ -1067,20 +1070,31 @@ int tegra_io_pad_set_voltage(enum tegra_io_pad id,mutex_lock (&pmc->powergates_lock); -/* write-enable PMC_PWR_DET_VALUE[pad->voltage] */ - value =tegra_pmc_readl (PMC_PWR_DET ); - value |=BIT (pad->voltage); -tegra_pmc_writel (value,PMC_PWR_DET ); +if (pmc->soc->has_impl_33v_pwr) { + value =tegra_pmc_readl (PMC_IMPL_E_33V_PWR ); -/* update I/O voltage */ - value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); +if (voltage ==TEGRA_IO_PAD_1800000UV ) + value &= ~BIT (pad->voltage); +else + value |=BIT (pad->voltage); -if (voltage ==TEGRA_IO_PAD_1800000UV ) - value &= ~BIT (pad->voltage); -else +tegra_pmc_writel (value,PMC_IMPL_E_33V_PWR ); + }else { +/* write-enable PMC_PWR_DET_VALUE[pad->voltage] */ + value =tegra_pmc_readl (PMC_PWR_DET ); value |=BIT (pad->voltage); +tegra_pmc_writel (value,PMC_PWR_DET ); + +/* update I/O voltage */ + value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); -tegra_pmc_writel (value,PMC_PWR_DET_VALUE ); +if (voltage ==TEGRA_IO_PAD_1800000UV ) + value &= ~BIT (pad->voltage); +else + value |=BIT (pad->voltage); + +tegra_pmc_writel (value,PMC_PWR_DET_VALUE ); + }mutex_unlock (&pmc->powergates_lock);
@@ -1102,7 +1116,10 @@ int tegra_io_pad_get_voltage(enum tegra_io_pad id)if (pad->voltage ==UINT_MAX )return -ENOTSUPP ; - value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); +if (pmc->soc->has_impl_33v_pwr) + value =tegra_pmc_readl (PMC_IMPL_E_33V_PWR ); +else + value =tegra_pmc_readl (PMC_PWR_DET_VALUE );if ((value &BIT (pad->voltage)) ==0 )return TEGRA_IO_PAD_1800000UV ;
@@ -1561,6 +1578,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { .cpu_powergates = tegra30_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL, .regs = &tegra20_pmc_regs,
@@ -1603,6 +1621,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { .cpu_powergates = tegra114_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL, .regs = &tegra20_pmc_regs,
@@ -1683,6 +1702,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { .cpu_powergates = tegra124_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, + .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra124_io_pads), .io_pads = tegra124_io_pads, .regs = &tegra20_pmc_regs,
@@ -1772,6 +1792,7 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { .cpu_powergates = tegra210_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, + .has_impl_33v_pwr = false, .needs_mbist_war = true, .num_io_pads = ARRAY_SIZE(tegra210_io_pads), .io_pads = tegra210_io_pads,
@@ -1800,7 +1821,7 @@ static const struct tegra_io_pad_soc tegra186_io_pads[] = { { .id = TEGRA_IO_PAD_HDMI_DP0, .dpd = 28, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_HDMI_DP1, .dpd = 29, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_PEX_CNTRL, .dpd = 32, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_SDMMC2_HV, .dpd = 34, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_SDMMC2_HV, .dpd = 34, .voltage = 5 }, { .id = TEGRA_IO_PAD_SDMMC4, .dpd = 36, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_CAM, .dpd = 38, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_DSIB, .dpd = 40, .voltage = UINT_MAX },
@@ -1812,12 +1833,13 @@ static const struct tegra_io_pad_soc tegra186_io_pads[] = { { .id = TEGRA_IO_PAD_CSIF, .dpd = 46, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_SPI, .dpd = 47, .voltage = UINT_MAX }, { .id = TEGRA_IO_PAD_UFS, .dpd = 49, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_DMIC_HV, .dpd = 52, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_DMIC_HV, .dpd = 52, .voltage = 2 }, { .id = TEGRA_IO_PAD_EDP, .dpd = 53, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_SDMMC1_HV, .dpd = 55, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_SDMMC3_HV, .dpd = 56, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_SDMMC1_HV, .dpd = 55, .voltage = 4 }, + { .id = TEGRA_IO_PAD_SDMMC3_HV, .dpd = 56, .voltage = 6 }, { .id = TEGRA_IO_PAD_CONN, .dpd = 60, .voltage = UINT_MAX }, - { .id = TEGRA_IO_PAD_AUDIO_HV, .dpd = 61, .voltage = UINT_MAX }, + { .id = TEGRA_IO_PAD_AUDIO_HV, .dpd = 61, .voltage = 1 }, + { .id = TEGRA_IO_PAD_AO_HV, .dpd = UINT_MAX, .voltage = 0 }, }; static const struct tegra_pmc_regs tegra186_pmc_regs = {
@@ -1870,6 +1892,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .has_impl_33v_pwr = true, .num_io_pads = ARRAY_SIZE(tegra186_io_pads), .io_pads = tegra186_io_pads, .regs = &tegra186_pmc_regs,
include/soc/tegra/pmc.h +1 -0
@@ -134,6 +134,7 @@ enum tegra_io_pad {TEGRA_IO_PAD_USB2 ,TEGRA_IO_PAD_USB3 ,TEGRA_IO_PAD_USB_BIAS , + TEGRA_IO_PAD_AO_HV, };/* deprecated, use TEGRA_IO_PAD_{HDMI,LVDS} instead */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/422 arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply
In reply to Greg Kroah-HartmanFrom: Aapo Vienamo <[email protected]>
[ Upstream commit 6ff7705da8806de45ca1490194f0b4eb07725804 ]
On p2180 sdmmc4 is powered from a fixed 1.8 V regulator.
--- arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi +1 -0
@@ -282,6 +282,7 @@ status = "okay"; bus-width = <8>; non-removable; + vqmmc-supply = <&vdd_1v8>; }; clocks {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/422 y2038: make do_gettimeofday() and get_seconds() inline
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 33e26418193f58d1895f2f968e1953b1caf8deb7 ]
get_seconds() and do_gettimeofday() are only used by a few modules now any more (waiting for the respective patches to get accepted), and they are among the last holdouts of code that is not y2038 safe in the core kernel.
Move the implementation into the timekeeping32.h header to clean up the core kernel and isolate the old interfaces further.
--- include/linux/timekeeping32.h | 15 +++++++++++++-- kernel/time/time.c | 15 +++++++++------ kernel/time/timekeeping.c | 24 ------------------------ 3 files changed, 22 insertions(+), 32 deletions(-)
include/linux/timekeeping32.h +13 -2
@@ -6,8 +6,19 @@* over time so we can remove the file here. */ -extern void do_gettimeofday (struct timeval *tv); -unsigned long get_seconds (void ); +static inline void do_gettimeofday (struct timeval *tv) +{ +struct timespec64 now; + +ktime_get_real_ts64 (&now); + tv->tv_sec = now.tv_sec; + tv->tv_usec = now.tv_nsec/1000 ; +} + +static inline unsigned long get_seconds (void ) +{ +return ktime_get_real_seconds (); +}static inline struct timespec current_kernel_time (void ) {
kernel/time/time.c +9 -6
@@ -144,9 +144,11 @@ SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv, struct timezone __user *, tz) {if (likely (tv !=NULL )) { -struct timeval ktv; -do_gettimeofday (&ktv); -if (copy_to_user (tv, &ktv,sizeof (ktv))) +struct timespec64 ts; + +ktime_get_real_ts64 (&ts); +if (put_user (ts.tv_sec, &tv->tv_sec) || +put_user (ts.tv_nsec /1000 , &tv->tv_usec))return -EFAULT ; }if (unlikely (tz !=NULL )) {
@@ -227,10 +229,11 @@ COMPAT_SYSCALL_DEFINE2(gettimeofday, struct compat_timeval __user *, tv, struct timezone __user *, tz) {if (tv) { -struct timeval ktv; +struct timespec64 ts; -do_gettimeofday (&ktv); -if (compat_put_timeval (&ktv, tv)) +ktime_get_real_ts64 (&ts); +if (put_user (ts.tv_sec, &tv->tv_sec) || +put_user (ts.tv_nsec /1000 , &tv->tv_usec))return -EFAULT ; }if (tz) {
kernel/time/timekeeping.c +0 -24
@@ -1214,22 +1214,6 @@ int get_device_system_crosststamp(int (*get_time_fn) }EXPORT_SYMBOL_GPL (get_device_system_crosststamp); -/** -* do_gettimeofday - Returns the time of day in a timeval -* @tv: pointer to the timeval to be set -* -* NOTE: Users should be converted to using getnstimeofday() -*/ -void do_gettimeofday (struct timeval *tv) -{ -struct timespec64 now; - -getnstimeofday64 (&now); - tv->tv_sec = now.tv_sec; - tv->tv_usec = now.tv_nsec/1000 ; -} -EXPORT_SYMBOL (do_gettimeofday); -/** * do_settimeofday64 - Sets the time of day. * @ts: pointer to the timespec64 variable containing the new time
@@ -2177,14 +2161,6 @@ void getboottime64(struct timespec64 *ts) }EXPORT_SYMBOL_GPL (getboottime64); -unsigned long get_seconds (void ) -{ -struct timekeeper *tk = &tk_core.timekeeper; - -return tk->xtime_sec; -} -EXPORT_SYMBOL (get_seconds); -void ktime_get_coarse_real_ts64 (struct timespec64 *ts) {struct timekeeper *tk = &tk_core.timekeeper;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/422 ARM: dts: rcar: Correct SATA device sizes to 2 MiB
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 441f61e3aa9e7386731ce1405044d484bd81f911 ]
Update the SATA device nodes on R-Car H1, H2, and M2-W to use a 2 MiB I/O space, as specified in Rev.1.0 of the R-Car H1 and R-Car Gen2 hardware user manuals.
See also commit e9f0089b2d8a3d45 ("arm64: dts: r8a7795: Correct SATA device size to 2MiB").
--- arch/arm/boot/dts/r8a7779.dtsi | 2 +- arch/arm/boot/dts/r8a7790.dtsi | 4 ++-- arch/arm/boot/dts/r8a7791.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/r8a7779.dtsi +1 -1
@@ -344,7 +344,7 @@ sata: sata@fc600000 { compatible = "renesas,sata-r8a7779", "renesas,rcar-sata"; - reg = <0xfc600000 0x2000>; + reg = <0xfc600000 0x200000>; interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp1_clks R8A7779_CLK_SATA>; power-domains = <&sysc R8A7779_PD_ALWAYS_ON>;
arch/arm/boot/dts/r8a7790.dtsi +2 -2
@@ -1559,7 +1559,7 @@ sata0: sata@ee300000 { compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata"; - reg = <0 0xee300000 0 0x2000>; + reg = <0 0xee300000 0 0x200000>; interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 815>; power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
@@ -1570,7 +1570,7 @@ sata1: sata@ee500000 { compatible = "renesas,sata-r8a7790", "renesas,rcar-gen2-sata"; - reg = <0 0xee500000 0 0x2000>; + reg = <0 0xee500000 0 0x200000>; interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 814>; power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
arch/arm/boot/dts/r8a7791.dtsi +2 -2
@@ -1543,7 +1543,7 @@ sata0: sata@ee300000 { compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata"; - reg = <0 0xee300000 0 0x2000>; + reg = <0 0xee300000 0 0x200000>; interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 815>; power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
@@ -1554,7 +1554,7 @@ sata1: sata@ee500000 { compatible = "renesas,sata-r8a7791", "renesas,rcar-gen2-sata"; - reg = <0 0xee500000 0 0x2000>; + reg = <0 0xee500000 0 0x200000>; interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 814>; power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/422 ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45
In reply to Greg Kroah-HartmanFrom: Jay Foster <[email protected]>
[ Upstream commit 10af10db8c76fa5b9bf1f52a895c1cb2c0ac24da ]
Fix a typo. No functional change made by this patch.
--- arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/at91sam9g45.dtsi +1 -1
@@ -570,7 +570,7 @@ }; }; - uart1 { + usart1 { pinctrl_usart1: usart1-0 { atmel,pins = <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/422 rtc: sysfs: fix NULL check in rtc_add_groups()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 777d8ae56da18fb6440acd941edb3597c1b02bf0 ]
devm_kcalloc() returns NULL, it never returns error pointers. In the current code we would return PTR_ERR(NULL) which is success, instead of returning the -ENOMEM error code.
--- drivers/rtc/rtc-sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rtc-sysfs.c +2 -2
@@ -338,8 +338,8 @@ int rtc_add_groups(struct rtc_device *rtc, const struct attribute_group **grps) new_cnt = old_cnt + add_cnt +1 ; groups =devm_kcalloc (&rtc->dev, new_cnt,sizeof (*groups),GFP_KERNEL ); -if (IS_ERR_OR_NULL (groups)) -return PTR_ERR (groups); +if (!groups) +return -ENOMEM ;memcpy (groups, rtc->dev.groups, old_cnt *sizeof (*groups));memcpy (groups + old_cnt, grps, add_cnt *sizeof (*groups)); groups[old_cnt + add_cnt] =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/422 rtc: rv8803: fix the rv8803 id in the OF table
In reply to Greg Kroah-HartmanFrom: Alexandre Belloni <[email protected]>
[ Upstream commit c856618d20662695fcdb47bf4d560dc457662aec ]
The ID for RV8803 must be rv_8803
--- drivers/rtc/rtc-rv8803.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-rv8803.c +1 -1
@@ -623,7 +623,7 @@ MODULE_DEVICE_TABLE(i2c, rv8803_id);static const struct of_device_id rv8803_of_match[] = { { .compatible ="microcrystal,rv8803" , - .data = (void *)rx_8900 + .data = (void *)rv_8803 }, { .compatible ="epson,rx8900" ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/422 remoteproc/davinci: Use %zx for formating size_t
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 1e28dbbeced6152b9ea7c417ff8cef3f7dcf0f19 ]
da8xx_rproc_mem size is of type size_t, so use %zx to format the debug print of it to avoid a compile warning.
--- drivers/remoteproc/da8xx_remoteproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/da8xx_remoteproc.c +1 -1
@@ -226,7 +226,7 @@ static int da8xx_rproc_get_internal_memories(struct platform_device *pdev, res->start &DA8XX_RPROC_LOCAL_ADDRESS_MASK ; drproc->mem[i].size =resource_size (res); -dev_dbg (dev,"memory %8s: bus addr %pa size 0x%x va %p da 0x%x\n" , +dev_dbg (dev,"memory %8s: bus addr %pa size 0x%zx va %p da 0x%x\n" , mem_names[i], &drproc->mem[i].bus_addr, drproc->mem[i].size, drproc->mem[i].cpu_addr, drproc->mem[i].dev_addr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/422 extcon: cht-wc: Return from default case to avoid warnings
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 962341b54b99965ebec5f70c8d39f1c382eea833 ]
When we have first case to fall through it's not enough to put single comment there to satisfy compiler. Instead of doing that, return fall back value directly from default case.
This to avoid following warnings:
drivers/extcon/extcon-intel-cht-wc.c: In function ‘cht_wc_extcon_get_charger’:include/linux/device.h:1420:2: warning: this statement may fall through [-Wimplicit-fallthrough=]
_dev_warn(dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/extcon/extcon-intel-cht-wc.c:148:3: note: in expansion of macro ‘dev_warn’
dev_warn(ext->dev,
^~~~~~~~drivers/extcon/extcon-intel-cht-wc.c:152:2: note: here
case CHT_WC_USBSRC_TYPE_SDP:
^~~~
--- drivers/extcon/extcon-intel-cht-wc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/extcon/extcon-intel-cht-wc.c +1 -1
@@ -156,7 +156,7 @@ static int cht_wc_extcon_get_charger(struct cht_wc_extcon_data *ext,dev_warn (ext->dev,"Unhandled charger type %d, defaulting to SDP\n" , ret); -/* Fall through, treat as SDP */ +return EXTCON_CHG_USB_SDP ;case CHT_WC_USBSRC_TYPE_SDP :case CHT_WC_USBSRC_TYPE_FLOAT_DP_DN :case CHT_WC_USBSRC_TYPE_OTHER :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/422 cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set
In reply to Greg Kroah-HartmanFrom: Rajeev Kumar Sirasanagandla <[email protected]>
[ Upstream commit 7417844b63d4b0dc8ab23f88259bf95de7d09b57 ]
When REGULATORY_COUNTRY_IE_IGNORE is set, __reg_process_hint_country_ie() ignores the country code change request from __cfg80211_connect_result() via regulatory_hint_country_ie().
After Disconnect, similar to above, country code should not be reset to world when country IE ignore is set. But this is violated and restore of regulatory settings is invoked by cfg80211_disconnect_work via regulatory_hint_disconnect().
To address this, avoid regulatory restore from regulatory_hint_disconnect() when COUNTRY_IE_IGNORE is set.
Note: Currently, restore_regulatory_settings() takes care of clearing beacon hints. But in the proposed change, regulatory restore is avoided. Therefore, explicitly clear beacon hints when DISABLE_BEACON_HINTS is not set.
--- net/wireless/reg.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)
net/wireless/reg.c +46 -0
@@ -3225,8 +3225,54 @@ static void restore_regulatory_settings(bool reset_user)schedule_work (®_work); } +static bool is_wiphy_all_set_reg_flag (enum ieee80211_regulatory_flags flag) +{ +struct cfg80211_registered_device *rdev; +struct wireless_dev *wdev; + +list_for_each_entry (rdev, &cfg80211_rdev_list, list) { +list_for_each_entry (wdev, &rdev->wiphy.wdev_list, list) { +wdev_lock (wdev); +if (!(wdev->wiphy->regulatory_flags & flag)) { +wdev_unlock (wdev); +return false; + } +wdev_unlock (wdev); + } + } + +return true; +} +void regulatory_hint_disconnect (void ) { +/* Restore of regulatory settings is not required when wiphy(s) +* ignore IE from connected access point but clearance of beacon hints +* is required when wiphy(s) supports beacon hints. +*/ +if (is_wiphy_all_set_reg_flag (REGULATORY_COUNTRY_IE_IGNORE )) { +struct reg_beacon *reg_beacon, *btmp; + +if (is_wiphy_all_set_reg_flag (REGULATORY_DISABLE_BEACON_HINTS )) +return ; + +spin_lock_bh (®_pending_beacons_lock); +list_for_each_entry_safe (reg_beacon, btmp, + ®_pending_beacons, list) { +list_del (®_beacon->list); +kfree (reg_beacon); + } +spin_unlock_bh (®_pending_beacons_lock); + +list_for_each_entry_safe (reg_beacon, btmp, + ®_beacon_list, list) { +list_del (®_beacon->list); +kfree (reg_beacon); + } + +return ; + } +pr_debug ("All devices are disconnected, going to restore regulatory settings\n" );restore_regulatory_settings (false); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/422 ALSA: seq: Do error checks at creating system ports
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit b8e131542b47b81236ecf6768c923128e1f5db6e ]
snd_seq_system_client_init() doesn't check the errors returned from its port creations. Let's do it properly and handle the error paths.
--- sound/core/seq/seq_system.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
sound/core/seq/seq_system.c +15 -3
@@ -123,6 +123,7 @@ int __init snd_seq_system_client_init(void) {struct snd_seq_port_callback pcallbacks;struct snd_seq_port_info *port; +int err; port =kzalloc (sizeof (*port),GFP_KERNEL );if (!port)
@@ -144,7 +145,10 @@ int __init snd_seq_system_client_init(void) port->flags =SNDRV_SEQ_PORT_FLG_GIVEN_PORT ; port->addr.client = sysclient; port->addr.port =SNDRV_SEQ_PORT_SYSTEM_TIMER ; -snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , port); + err =snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , + port); +if (err <0 ) + goto error_port;/* register announcement port */ strcpy (port->name,"Announce" );
@@ -154,16 +158,24 @@ int __init snd_seq_system_client_init(void) port->flags =SNDRV_SEQ_PORT_FLG_GIVEN_PORT ; port->addr.client = sysclient; port->addr.port =SNDRV_SEQ_PORT_SYSTEM_ANNOUNCE ; -snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , port); + err =snd_seq_kernel_client_ctl (sysclient,SNDRV_SEQ_IOCTL_CREATE_PORT , + port); +if (err <0 ) + goto error_port; announce_port = port->addr.port;kfree (port);return 0 ; + + error_port: +snd_seq_system_client_done (); +kfree (port); +return err; }/* unregister our internal client */ -void __exit snd_seq_system_client_done(void) +void snd_seq_system_client_done (void ) {int oldsysclient = sysclient;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/422 ath10k: skip resetting rx filter for WCN3990
In reply to Greg Kroah-HartmanFrom: Rakesh Pillai <[email protected]>
[ Upstream commit 58da3b42307061b71f2dcce2bd1185d578a3aa53 ]
WCN3990 has the MAC_PCU_ADDR1 configured properly and hence it will not send spurious ack frames during boot up.
Hence the reset_rx_filter workaround is not needed for WCN3990. Add a hw_param to indicate if hardware rx filter reset is needed and skip the reset_rx_filter for WCN3990.
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/core.c | 17 ++++++++++++++++- drivers/net/wireless/ath/ath10k/hw.h | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +16 -1
@@ -91,6 +91,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .rx_ring_fill_level = HTT_RX_RING_FILL_LEVEL, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA988X_HW_2_0_VERSION,
@@ -124,6 +125,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9887_HW_1_0_VERSION,
@@ -157,6 +159,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_2_1_VERSION,
@@ -189,6 +192,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_2_1_VERSION,
@@ -221,6 +225,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_3_0_VERSION,
@@ -253,6 +258,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA6174_HW_3_2_VERSION,
@@ -288,6 +294,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -326,6 +333,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9984_HW_1_0_DEV_VERSION,
@@ -369,6 +377,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9888_HW_2_0_DEV_VERSION,
@@ -411,6 +420,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9377_HW_1_0_DEV_VERSION,
@@ -443,6 +453,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -477,6 +488,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = QCA4019_HW_1_0_DEV_VERSION,
@@ -516,6 +528,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = false, .shadow_reg_support = false, .rri_on_ddr = false, + .hw_filter_reset_required = true, }, { .id = WCN3990_HW_1_0_DEV_VERSION,
@@ -540,6 +553,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .per_ce_irq = true, .shadow_reg_support = true, .rri_on_ddr = true, + .hw_filter_reset_required = false, }, };
@@ -2406,7 +2420,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,* possible to implicitly make it correct by creating a dummy vdev and * then deleting it. */ -if (mode ==ATH10K_FIRMWARE_MODE_NORMAL ) { +if (ar->hw_params.hw_filter_reset_required && + mode ==ATH10K_FIRMWARE_MODE_NORMAL ) { status =ath10k_core_reset_rx_filter (ar);if (status) { ath10k_err(ar,
drivers/net/wireless/ath/ath10k/hw.h +5 -0
@@ -589,6 +589,11 @@ struct ath10k_hw_params {/* Number of bytes to be the offset for each FFT sample */ int spectral_bin_offset; + +/* targets which require hw filter reset during boot up, +* to avoid it sending spurious acks. +*/ +bool hw_filter_reset_required; };struct htt_rx_desc ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/422 ath9k: fix tx99 with monitor mode interface
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit d9c52fd17cb483bd8a470398afcb79f86c1b77c8 ]
Tx99 is typically configured via a monitor mode interface, which does not get added to the driver as a vif. Since the code currently expects a configured virtual interface for tx99, enabling tx99 via debugfs fails. Since the vif is not needed anyway, remove all checks for it.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/main.c | 12 +++--------- drivers/net/wireless/ath/ath9k/tx99.c | 9 --------- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- 4 files changed, 4 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +0 -1
@@ -1074,7 +1074,6 @@ struct ath_softc {struct ath_spec_scan_priv spec_priv; -struct ieee80211_vif *tx99_vif;struct sk_buff *tx99_skb;bool tx99_state;s16 tx99_power;
drivers/net/wireless/ath/ath9k/main.c +3 -9
@@ -1251,15 +1251,10 @@ static int ath9k_add_interface(struct ieee80211_hw *hw,struct ath_vif *avp = (void *)vif->drv_priv;struct ath_node *an = &avp->mcast_node; -mutex_lock (&sc->mutex); +if (IS_ENABLED (CONFIG_ATH9K_TX99 )) +return -EOPNOTSUPP ; -if (IS_ENABLED (CONFIG_ATH9K_TX99 )) { -if (sc->cur_chan->nvifs >=1 ) { -mutex_unlock (&sc->mutex); -return -EOPNOTSUPP ; - } - sc->tx99_vif = vif; - } +mutex_lock (&sc->mutex);ath_dbg (common,CONFIG ,"Attach a VIF of type: %d\n" , vif->type); sc->cur_chan->nvifs++;
@@ -1342,7 +1337,6 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,ath9k_p2p_remove_vif (sc, vif); sc->cur_chan->nvifs--; - sc->tx99_vif =NULL ;if (!ath9k_is_chanctx_enabled ())list_del (&avp->list);
drivers/net/wireless/ath/ath9k/tx99.c +0 -9
@@ -54,12 +54,6 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)struct ieee80211_hdr *hdr;struct ieee80211_tx_info *tx_info;struct sk_buff *skb; -struct ath_vif *avp; - -if (!sc->tx99_vif) -return NULL ; - - avp = (struct ath_vif *)sc->tx99_vif->drv_priv; skb =alloc_skb (len,GFP_KERNEL );if (!skb)
@@ -77,14 +71,11 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc)memcpy (hdr->addr2, hw->wiphy->perm_addr,ETH_ALEN );memcpy (hdr->addr3, hw->wiphy->perm_addr,ETH_ALEN ); - hdr->seq_ctrl |=cpu_to_le16 (avp->seq_no); - tx_info =IEEE80211_SKB_CB (skb);memset (tx_info,0 ,sizeof (*tx_info)); rate = &tx_info->control.rates[0 ]; tx_info->band = sc->cur_chan->chandef.chan->band; tx_info->flags =IEEE80211_TX_CTL_NO_ACK ; - tx_info->control.vif = sc->tx99_vif; rate->count =1 ;if (ah->curchan &&IS_CHAN_HT (ah->curchan)) { rate->flags |=IEEE80211_TX_RC_MCS ;
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -2974,7 +2974,7 @@ int ath9k_tx99_send(struct ath_softc *sc, struct sk_buff *skb,return -EINVAL ; } -ath_set_rates (sc->tx99_vif,NULL , bf); +ath_set_rates (NULL ,NULL , bf);ath9k_hw_set_desc_link (sc->sc_ah, bf->bf_desc, bf->bf_daddr);ath9k_hw_tx99_start (sc->sc_ah, txctl->txq->axq_qnum);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/422 wil6210: drop Rx multicast packets that are looped-back to STA
In reply to Greg Kroah-HartmanFrom: Dedy Lansky <[email protected]>
[ Upstream commit 9a65064abdf82934e0ed4744125f9f466f421f57 ]
Delivering a looped-back multicast packet to network stack can cause higher layer protocols to fail like for example IPv6 DAD. In STA mode, upon receiving Rx multicast packet, check if the source MAC address is equal to our own MAC address and if so drop the packet.
--- drivers/net/wireless/ath/wil6210/txrx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wil6210/txrx.c +8 -1
@@ -766,7 +766,14 @@ void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev)return ; } -if (wdev->iftype ==NL80211_IFTYPE_AP && !vif->ap_isolate) { +if (wdev->iftype ==NL80211_IFTYPE_STATION ) { +if (mcast &ðer_addr_equal (eth->h_source, ndev->dev_addr)) { +/* mcast packet looped back to us */ + rc =GRO_DROP ; +dev_kfree_skb (skb); + goto stats; + } + }else if (wdev->iftype ==NL80211_IFTYPE_AP && !vif->ap_isolate) {if (mcast) {/* send multicast frames both to higher layers in * local net stack and back to the wireless medium
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/422 wil6210: set edma variables only for Talyn-MB devices
In reply to Greg Kroah-HartmanFrom: Maya Erez <[email protected]>
[ Upstream commit 596bdbcce90fa93f43ebcb99cefea34bd2e27707 ]
use_rx_hw_reordering is already set to true in wil_set_capabilities for Talyn-MB devices. Remove its setting from wil_priv_init to prevent its activation for older chips.
Similarly, move the setting of use_compressed_rx_status to wil_set_capabilities.
--- drivers/net/wireless/ath/wil6210/main.c | 2 -- drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/wil6210/main.c +0 -2
@@ -653,8 +653,6 @@ int wil_priv_init(struct wil6210_priv *wil)/* edma configuration can be updated via debugfs before allocation */ wil->num_rx_status_rings =WIL_DEFAULT_NUM_RX_STATUS_RINGS ; - wil->use_compressed_rx_status = true; - wil->use_rx_hw_reordering = true; wil->tx_status_ring_order =WIL_TX_SRING_SIZE_ORDER_DEFAULT ;/* Rx status ring size should be bigger than the number of RX buffers
drivers/net/wireless/ath/wil6210/pcie_bus.c +1 -0
@@ -108,6 +108,7 @@ int wil_set_capabilities(struct wil6210_priv *wil)set_bit (hw_capa_no_flash, wil->hw_capa); wil->use_enhanced_dma_hw = true; wil->use_rx_hw_reordering = true; + wil->use_compressed_rx_status = true; wil_fw_name = ftm_mode ?WIL_FW_NAME_FTM_TALYN :WIL_FW_NAME_TALYN ;if (wil_fw_verify_file_exists (wil, wil_fw_name))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/422 wil6210: prevent usage of tx ring 0 for eDMA
In reply to Greg Kroah-HartmanFrom: Maya Erez <[email protected]>
[ Upstream commit df2b53884a5a454bf441ca78e5b57307262c73f4 ]
In enhanced DMA ring 0 is used for RX ring, hence TX ring 0 is an unused element in ring_tx and ring2cid_tid arrays. Initialize ring2cid_tid CID to WIL6210_MAX_CID to prevent a false match of CID 0.
Go over the ring_tx and ring2cid_tid from wil_get_min_tx_ring_id and on to prevent access to index 0 in eDMA.
--- drivers/net/wireless/ath/wil6210/main.c | 7 +++++-- drivers/net/wireless/ath/wil6210/txrx.c | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/wil6210/main.c +5 -2
@@ -223,6 +223,7 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock)struct net_device *ndev =vif_to_ndev (vif);struct wireless_dev *wdev =vif_to_wdev (vif);struct wil_sta_info *sta = &wil->sta[cid]; +int min_ring_id =wil_get_min_tx_ring_id (wil);might_sleep (); wil_dbg_misc(wil, "disconnect_cid: CID %d, MID %d, status %d\n",
@@ -273,7 +274,7 @@ __acquires(&sta->tid_rx_lock) __releases(&sta->tid_rx_lock)memset (sta->tid_crypto_rx,0 ,sizeof (sta->tid_crypto_rx));memset (&sta->group_crypto_rx,0 ,sizeof (sta->group_crypto_rx));/* release vrings */ -for (i =0 ; i <ARRAY_SIZE (wil->ring_tx); i++) { +for (i = min_ring_id; i <ARRAY_SIZE (wil->ring_tx); i++) {if (wil->ring2cid_tid[i][0 ] == cid)wil_ring_fini_tx (wil, i); }
@@ -604,8 +605,10 @@ int wil_priv_init(struct wil6210_priv *wil) wil->sta[i].mid =U8_MAX ; } -for (i =0 ; i <WIL6210_MAX_TX_RINGS ; i++) +for (i =0 ; i <WIL6210_MAX_TX_RINGS ; i++) {spin_lock_init (&wil->ring_tx_data[i].lock); + wil->ring2cid_tid[i][0 ] =WIL6210_MAX_CID ; + }mutex_init (&wil->mutex);mutex_init (&wil->vif_mutex);
drivers/net/wireless/ath/wil6210/txrx.c +4 -2
@@ -77,8 +77,9 @@ bool wil_is_tx_idle(struct wil6210_priv *wil) {int i;unsigned long data_comp_to; +int min_ring_id =wil_get_min_tx_ring_id (wil); -for (i =0 ; i <WIL6210_MAX_TX_RINGS ; i++) { +for (i = min_ring_id; i <WIL6210_MAX_TX_RINGS ; i++) {struct wil_ring *vring = &wil->ring_tx[i];int vring_index = vring - wil->ring_tx; struct wil_ring_tx_data *txdata =
@@ -1945,6 +1946,7 @@ static inline void __wil_update_net_queues(struct wil6210_priv *wil, bool check_stop) {int i; +int min_ring_id =wil_get_min_tx_ring_id (wil);if (unlikely (!vif))return ;
@@ -1977,7 +1979,7 @@ static inline void __wil_update_net_queues(struct wil6210_priv *wil,return ;/* check wake */ -for (i =0 ; i <WIL6210_MAX_TX_RINGS ; i++) { +for (i = min_ring_id; i <WIL6210_MAX_TX_RINGS ; i++) {struct wil_ring *cur_ring = &wil->ring_tx[i];struct wil_ring_tx_data *txdata = &wil->ring_tx_data[i];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/422 wil6210: fix invalid memory access for rx_buff_mgmt debugfs
In reply to Greg Kroah-HartmanFrom: Dedy Lansky <[email protected]>
[ Upstream commit 4405b632e3da839defec966e4b0be44d0c5e3102 ]
Check rx_buff_mgmt is allocated before accessing its internal fields.
--- drivers/net/wireless/ath/wil6210/debugfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/wil6210/debugfs.c +3 -0
@@ -1263,6 +1263,9 @@ static int wil_rx_buff_mgmt_debugfs_show(struct seq_file *s, void *data)int num_active;int num_free; +if (!rbm->buff_arr) +return -EINVAL ; +seq_printf (s," size = %zu\n" , rbm->size);seq_printf (s," free_list_empty_cnt = %lu\n" , rbm->free_list_empty_cnt);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/422 ath10k: limit available channels via DT ieee80211-freq-limit
In reply to Greg Kroah-HartmanFrom: Sven Eckelmann <[email protected]>
[ Upstream commit 34d5629d2ca89d847b7040762b87964c696c14da ]
Tri-band devices (1x 2.4GHz + 2x 5GHz) often incorporate special filters in the RX and TX path. These filtered channel can in theory still be used by the hardware but the signal strength is reduced so much that it makes no sense.
There is already a DT property to limit the available channels but ath10k has to manually call this functionality to limit the currrently set wiphy channels further.
--- drivers/net/wireless/ath/ath10k/mac.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +2 -0
@@ -18,6 +18,7 @@#include "mac.h" +#include <net/cfg80211.h> #include <net/mac80211.h> #include <linux/etherdevice.h> #include <linux/acpi.h>
@@ -8363,6 +8364,7 @@ int ath10k_mac_register(struct ath10k *ar) ar->hw->wiphy->bands[NL80211_BAND_5GHZ ] = band; } +wiphy_read_of_freq_limits (ar->hw->wiphy);ath10k_mac_setup_ht_vht_cap (ar); ar->hw->wiphy->interface_modes =
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/422 ice: Update request resource command to latest specification
In reply to Greg Kroah-HartmanFrom: Dan Nowlin <[email protected]>
[ Upstream commit ff2b13213a6a0baca105bc3bc724225f0adde1f8 ]
Align Request Resource Ownership AQ command (0x0008) to the latest specification. This includes:
- Correcting the resource IDs for the Global Cfg and Change locks.
- new enum ICE_CHANGE_LOCK_RES_ID
- new enum ICE_GLOBAL_CFG_LOCK_RES_ID
- Altering the flow for Global Config Lock to allow only the first PF to download the package.
--- drivers/net/ethernet/intel/ice/ice_common.c | 75 ++++++++++++++++----- drivers/net/ethernet/intel/ice/ice_common.h | 2 +- drivers/net/ethernet/intel/ice/ice_nvm.c | 2 +- drivers/net/ethernet/intel/ice/ice_type.h | 9 ++- 4 files changed, 67 insertions(+), 21 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +58 -17
@@ -904,7 +904,22 @@ enum ice_status ice_aq_q_shutdown(struct ice_hw *hw, bool unloading)* @timeout: the maximum time in ms that the driver may hold the resource * @cd: pointer to command details structure or NULL * -* requests common resource using the admin queue commands (0x0008) +* Requests common resource using the admin queue commands (0x0008). +* When attempting to acquire the Global Config Lock, the driver can +* learn of three states: +* 1) ICE_SUCCESS - acquired lock, and can perform download package +* 2) ICE_ERR_AQ_ERROR - did not get lock, driver should fail to load +* 3) ICE_ERR_AQ_NO_WORK - did not get lock, but another driver has +* successfully downloaded the package; the driver does +* not have to download the package and can continue +* loading +* +* Note that if the caller is in an acquire lock, perform action, release lock +* phase of operation, it is possible that the FW may detect a timeout and issue +* a CORER. In this case, the driver will receive a CORER interrupt and will +* have to determine its cause. The calling thread that is handling this flow +* will likely get an error propagated back to it indicating the Download +* Package, Update Package or the Release Resource AQ commands timed out. */ static enum ice_status ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res,
@@ -922,13 +937,43 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res, cmd_resp->res_id =cpu_to_le16 (res); cmd_resp->access_type =cpu_to_le16 (access); cmd_resp->res_number =cpu_to_le32 (sdp_number); + cmd_resp->timeout =cpu_to_le32 (*timeout); + *timeout =0 ; status =ice_aq_send_cmd (hw, &desc,NULL ,0 , cd); +/* The completion specifies the maximum time in ms that the driver * may hold the resource in the Timeout field. -* If the resource is held by someone else, the command completes with -* busy return value and the timeout field indicates the maximum time -* the current owner of the resource has to free it. +*/ + +/* Global config lock response utilizes an additional status field. +* +* If the Global config lock resource is held by some other driver, the +* command completes with ICE_AQ_RES_GLBL_IN_PROG in the status field +* and the timeout field indicates the maximum time the current owner +* of the resource has to free it. +*/ +if (res ==ICE_GLOBAL_CFG_LOCK_RES_ID ) { +if (le16_to_cpu (cmd_resp->status) ==ICE_AQ_RES_GLBL_SUCCESS ) { + *timeout =le32_to_cpu (cmd_resp->timeout); +return 0 ; + }else if (le16_to_cpu (cmd_resp->status) == +ICE_AQ_RES_GLBL_IN_PROG ) { + *timeout =le32_to_cpu (cmd_resp->timeout); +return ICE_ERR_AQ_ERROR ; + }else if (le16_to_cpu (cmd_resp->status) == +ICE_AQ_RES_GLBL_DONE ) { +return ICE_ERR_AQ_NO_WORK ; + } + +/* invalid FW response, force a timeout immediately */ + *timeout =0 ; +return ICE_ERR_AQ_ERROR ; + } + +/* If the resource is held by some other driver, the command completes +* with a busy return value and the timeout field indicates the maximum +* time the current owner of the resource has to free it. */ if (!status || hw->adminq.sq_last_status ==ICE_AQ_RC_EBUSY ) *timeout =le32_to_cpu (cmd_resp->timeout);
@@ -967,30 +1012,28 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number,* @hw: pointer to the HW structure * @res: resource id * @access: access type (read or write) +* @timeout: timeout in milliseconds * * This function will attempt to acquire the ownership of a resource. */ enum ice_status ice_acquire_res (struct ice_hw *hw,enum ice_aq_res_ids res, -enum ice_aq_res_access_type access) +enum ice_aq_res_access_type access,u32 timeout) {#define ICE_RES_POLLING_DELAY_MS 10u32 delay =ICE_RES_POLLING_DELAY_MS ; +u32 time_left = timeout;enum ice_status status; -u32 time_left =0 ; -u32 timeout; status =ice_aq_req_res (hw, res, access,0 , &time_left,NULL ); -/* An admin queue return code of ICE_AQ_RC_EEXIST means that another -* driver has previously acquired the resource and performed any -* necessary updates; in this case the caller does not obtain the -* resource and has no further work to do. +/* A return code of ICE_ERR_AQ_NO_WORK means that another driver has +* previously acquired the resource and performed any necessary updates; +* in this case the caller does not obtain the resource and has no +* further work to do. */ -if (hw->adminq.sq_last_status ==ICE_AQ_RC_EEXIST ) { - status =ICE_ERR_AQ_NO_WORK ; +if (status ==ICE_ERR_AQ_NO_WORK ) goto ice_acquire_res_exit; - }if (status) ice_debug(hw, ICE_DBG_RES,
@@ -1003,11 +1046,9 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res, timeout = (timeout > delay) ? timeout - delay :0 ; status =ice_aq_req_res (hw, res, access,0 , &time_left,NULL ); -if (hw->adminq.sq_last_status ==ICE_AQ_RC_EEXIST ) { +if (status ==ICE_ERR_AQ_NO_WORK )/* lock free, but no work to do */ - status =ICE_ERR_AQ_NO_WORK ;break ; - }if (!status)/* lock acquired */
drivers/net/ethernet/intel/ice/ice_common.h +1 -1
@@ -23,7 +23,7 @@ enum ice_status ice_get_link_status(struct ice_port_info *pi, bool *link_up);enum ice_status ice_acquire_res (struct ice_hw *hw,enum ice_aq_res_ids res, -enum ice_aq_res_access_type access); +enum ice_aq_res_access_type access,u32 timeout);void ice_release_res (struct ice_hw *hw,enum ice_aq_res_ids res);enum ice_status ice_init_nvm (struct ice_hw *hw);enum ice_status
drivers/net/ethernet/intel/ice/ice_nvm.c +1 -1
@@ -137,7 +137,7 @@ ice_acquire_nvm(struct ice_hw *hw, enum ice_aq_res_access_type access)if (hw->nvm.blank_nvm_mode)return 0 ; -return ice_acquire_res (hw,ICE_NVM_RES_ID , access); +return ice_acquire_res (hw,ICE_NVM_RES_ID , access,ICE_NVM_TIMEOUT ); }/**
drivers/net/ethernet/intel/ice/ice_type.h +7 -2
@@ -34,10 +34,15 @@ static inline bool ice_is_tc_ena(u8 bitmap, u8 tc)enum ice_aq_res_ids {ICE_NVM_RES_ID =1 ,ICE_SPD_RES_ID , -ICE_GLOBAL_CFG_LOCK_RES_ID , -ICE_CHANGE_LOCK_RES_ID +ICE_CHANGE_LOCK_RES_ID , +ICE_GLOBAL_CFG_LOCK_RES_ID }; +/* FW update timeout definitions are in milliseconds */ +#define ICE_NVM_TIMEOUT 180000 +#define ICE_CHANGE_LOCK_TIMEOUT 1000 +#define ICE_GLOBAL_CFG_LOCK_TIMEOUT 3000 +enum ice_aq_res_access_type {ICE_RES_READ =1 ,ICE_RES_WRITE
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/422 ice: Prevent control queue operations during reset
In reply to Greg Kroah-HartmanFrom: Anirudh Venkataramanan <[email protected]>
[ Upstream commit fd2a981777d911b2e94cdec50779c85c58a0dec9 ]
Once reset is issued, the driver loses all control queue interfaces. Exercising control queue operations during reset is incorrect and may result in long timeouts.
This patch introduces a new field 'reset_ongoing' in the hw structure. This is set to 1 by the core driver when it receives a reset interrupt. ice_sq_send_cmd checks reset_ongoing before actually issuing the control queue operation. If a reset is in progress, it returns a soft error code (ICE_ERR_RESET_PENDING) to the caller. The caller may or may not have to take any action based on this return. Once the driver knows that the reset is done, it has to set reset_ongoing back to 0. This will allow control queue operations to be posted to the hardware again.
This "bail out" logic was specifically added to ice_sq_send_cmd (which is pretty low level function) so that we have one solution in one place that applies to all types of control queues.
--- drivers/net/ethernet/intel/ice/ice_controlq.c | 3 ++ drivers/net/ethernet/intel/ice/ice_main.c | 34 ++++++++++++++++--- drivers/net/ethernet/intel/ice/ice_status.h | 1 + drivers/net/ethernet/intel/ice/ice_type.h | 1 + 4 files changed, 34 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice_controlq.c +3 -0
@@ -814,6 +814,9 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,u16 retval =0 ;u32 val =0 ; +/* if reset is in progress return a soft error */ +if (hw->reset_ongoing) +return ICE_ERR_RESET_ONGOING ;mutex_lock (&cq->sq_lock); cq->sq_last_status =ICE_AQ_RC_OK ;
drivers/net/ethernet/intel/ice/ice_main.c +29 -5
@@ -535,10 +535,13 @@ static void ice_reset_subtask(struct ice_pf *pf)ice_prepare_for_reset (pf);/* make sure we are ready to rebuild */ -if (ice_check_reset (&pf->hw)) +if (ice_check_reset (&pf->hw)) {set_bit (__ICE_RESET_FAILED, pf->state); -else + }else { +/* done with reset. start rebuild */ + pf->hw.reset_ongoing = false;ice_rebuild (pf); + }clear_bit (__ICE_RESET_RECOVERY_PENDING, pf->state); goto unlock; }
@@ -1757,7 +1760,8 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)* We also make note of which reset happened so that peer * devices/drivers can be informed. */ -if (!test_bit (__ICE_RESET_RECOVERY_PENDING, pf->state)) { +if (!test_and_set_bit (__ICE_RESET_RECOVERY_PENDING, + pf->state)) {if (reset ==ICE_RESET_CORER )set_bit (__ICE_CORER_RECV, pf->state);else if (reset ==ICE_RESET_GLOBR )
@@ -1765,7 +1769,20 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)else set_bit (__ICE_EMPR_RECV, pf->state); -set_bit (__ICE_RESET_RECOVERY_PENDING, pf->state); +/* There are couple of different bits at play here. +* hw->reset_ongoing indicates whether the hardware is +* in reset. This is set to true when a reset interrupt +* is received and set back to false after the driver +* has determined that the hardware is out of reset. +* +* __ICE_RESET_RECOVERY_PENDING in pf->state indicates +* that a post reset rebuild is required before the +* driver is operational again. This is set above. +* +* As this is the start of the reset/rebuild cycle, set +* both to indicate that. +*/ + hw->reset_ongoing = true; } }
@@ -4188,7 +4205,14 @@ static int ice_vsi_stop_tx_rings(struct ice_vsi *vsi) } status =ice_dis_vsi_txq (vsi->port_info, vsi->num_txq, q_ids, q_teids,NULL ); -if (status) { +/* if the disable queue command was exercised during an active reset +* flow, ICE_ERR_RESET_ONGOING is returned. This is not an error as +* the reset operation disables queues at the hardware level anyway. +*/ +if (status ==ICE_ERR_RESET_ONGOING ) { +dev_dbg (&pf->pdev->dev, +"Reset in progress. LAN Tx queues already disabled\n" ); + }else if (status) {dev_err (&pf->pdev->dev,"Failed to disable LAN Tx queues, error: %d\n" , status);
drivers/net/ethernet/intel/ice/ice_status.h +1 -0
@@ -20,6 +20,7 @@ enum ice_status {ICE_ERR_ALREADY_EXISTS =-14 ,ICE_ERR_DOES_NOT_EXIST =-15 ,ICE_ERR_MAX_LIMIT =-17 , +ICE_ERR_RESET_ONGOING =-18 ,ICE_ERR_BUF_TOO_SHORT =-52 ,ICE_ERR_NVM_BLANK_MODE =-53 , ICE_ERR_AQ_ERROR = -100,
drivers/net/ethernet/intel/ice/ice_type.h +1 -0
@@ -293,6 +293,7 @@ struct ice_hw {u8 sw_entry_point_layer;u8 evb_veb;/* true for VEB, false for VEPA */ +u8 reset_ongoing;/* true if hw is in reset, false otherwise */ struct ice_bus_info bus;struct ice_nvm_info nvm;struct ice_hw_dev_caps dev_caps;/* device capabilities */
Signature · 1 line
2.20.1
Re: [PATCH 4.19 063/422] ice: Prevent control queue operations during reset
Hi!
Quoted 16 lines
[ Upstream commit
fd2a981777d911b2e94cdec50779c85c58a0dec9]Once reset is issued, the driver loses all control queue interfaces. Exercising control queue operations during reset is incorrect and may result in long timeouts.
This patch introduces a new field '
reset_ongoing' in the hw structure. This is set to 1 by the core driver when it receives a reset interrupt.ice_sq_send_cmdchecksreset_ongoingbefore actually issuing the control queue operation. If a reset is in progress, it returns a soft error code (ICE_ERR_RESET_PENDING) to the caller. The caller may or may not have to take any action based on this return. Once the driver knows that the reset is done, it has to setreset_ongoingback to 0. This will allow control queue operations to be posted to the hardware again.
Quoted 3 lines
This "bail out" logic was specifically added to
ice_sq_send_cmd(which is pretty low level function) so that we have one solution in one place that applies to all types of control queues.
I don't think this is suitable for stable. Would driver maintainers comment?
drivers/net/ethernet/intel/ice/ice_main.c static irqreturn_t ice_misc_intr(int __always_unused irq, void *data) · line 1787
Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_main.c +5
-0+* +* As this is the start of the reset/rebuild cycle, set +* both to indicate that. +*/ + hw->reset_ongoing = true; } }
This should be = 1, since variable is u8...
Best regards,
Pavel
Quoted 10 lines
+++
b/drivers/net/ethernet/intel/ice/ice_type.hdrivers/net/ethernet/intel/ice/ice_type.h +1
-0@@ -293,6 +293,7 @@ struct ice_hw {u8 sw_entry_point_layer;u8 evb_veb;/* true for VEB, false for VEPA */ +u8 reset_ongoing;/* true if hw is in reset, false otherwise */ struct ice_bus_info bus;struct ice_nvm_info nvm;struct ice_hw_dev_caps dev_caps;/* device capabilities */
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 063/422] ice: Prevent control queue operations during reset
Quoted 19 lines · Pavel Machek
Hi!
Quoted 18 lines
[ Upstream commit
fd2a981777d911b2e94cdec50779c85c58a0dec9]Once reset is issued, the driver loses all control queue interfaces. Exercising control queue operations during reset is incorrect and may result in long timeouts.
This patch introduces a new field '
reset_ongoing' in the hw structure. This is set to 1 by the core driver when it receives a reset interrupt.ice_sq_send_cmdchecksreset_ongoingbefore actually issuing the control
queue operation. If a reset is in progress, it returns a soft error code
(ICE_ERR_RESET_PENDING) to the caller. The caller may or may not have to
take any action based on this return. Once the driver knows that the reset is done, it has to setreset_ongoingback to 0. This will allow control queue operations to be posted to the hardware again.
Quoted 6 lines
Quoted 3 lines
This "bail out" logic was specifically added to
ice_sq_send_cmd(which is pretty low level function) so that we have one solution in one place that applies to all types of control queues.I don't think this is suitable for stable. Would driver maintainers comment?
Actually this change is fine for stable.
Quoted 11 lines
drivers/net/ethernet/intel/ice/ice_main.c static irqreturn_t ice_misc_intr(int __always_unused irq, void *data) · line 1787
Quoted 9 lines
(quoted diff) +2
-0+ * + * As this is the start of the reset/rebuild cycle,set
drivers/net/ethernet/intel/ice/ice_main.c +3
-0+* both to indicate that. +*/ + hw->reset_ongoing = true; } }This should be = 1, since variable is u8...
This variable is treated as a bool, and since bools vary depending on architecture, Linus has stated that using a u8 would be more consistent across the vary architectures. So we have used u8's for variables treated as bools.
In addition, there has been no issue assigning "true" or "false" to a u8.
Quoted 15 lines
Best regards,
Pav
elQuoted 10 lines
+++
b/drivers/net/ethernet/intel/ice/ice_type.hdrivers/net/ethernet/intel/ice/ice_type.h +1
-0@@ -293,6 +293,7 @@ struct ice_hw {u8 sw_entry_point_layer;u8 evb_veb;/* true for VEB, false for VEPA */ +u8 reset_ongoing;/* true if hw is in reset, false otherwise */ struct ice_bus_info bus;struct ice_nvm_info nvm;struct ice_hw_dev_caps dev_caps;/* device capabilities */
Greg Kroah-Hartman
maintainerPATCH 64/422 gfs2: Dont set GFS2_RDF_UPTODATE when the lvb is updated
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
[ Upstream commit 4f36cb36c9d14340bb200d2ad9117b03ce992cfe ]
The GFS2_RDF_UPTODATE flag in the rgrp is used to determine when a rgrp buffer is valid. It's cleared when the glock is invalidated, signifying that the buffer data is now invalid. But before this patch, function update_rgrp_lvb was setting the flag when it determined it had a valid lvb. But that's an invalid assumption:
just because you have a valid lvb doesn't mean you have valid buffers. After all, another node may have made the lvb valid, and this node just fetched it from the glock via dlm.
Consider this scenario:
1. The file system is mounted with RGRPLVB option.
2. In gfs2_inplace_reserve it locks the rgrp glock EX, but thanks to GL_SKIP, it skips the gfs2_rgrp_bh_get.
3. Since loops == 0 and the allocation target (ap->target) is bigger than the largest known chunk of blocks in the rgrp (rs->rs_rbm.rgd->rd_extfail_pt) it skips that rgrp and bypasses the call to gfs2_rgrp_bh_get there as well.
4. update_rgrp_lvb sees the lvb MAGIC number is valid, so bypasses gfs2_rgrp_bh_get, but it still sets sets GFS2_RDF_UPTODATE due to this invalid assumption.
5. The next time update_rgrp_lvb is called, it sees the bit is set and just returns 0, assuming both the lvb and rgrp are both uptodate. But since this is a smaller allocation, or space has been freed by another node, thus adjusting the lvb values, it decides to use the rgrp for allocations, with invalid rd_free due to the fact it was never updated.
This patch changes update_rgrp_lvb so it doesn't set the UPTODATE flag anymore. That way, it has no choice but to fetch the latest values.
--- fs/gfs2/rgrp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/gfs2/rgrp.c +1 -1
@@ -1227,7 +1227,7 @@ static int update_rgrp_lvb(struct gfs2_rgrpd *rgd) rl_flags =be32_to_cpu (rgd->rd_rgl->rl_flags); rl_flags &= ~GFS2_RDF_MASK ; rgd->rd_flags &=GFS2_RDF_MASK ; - rgd->rd_flags |= (rl_flags |GFS2_RDF_UPTODATE |GFS2_RDF_CHECK ); + rgd->rd_flags |= (rl_flags |GFS2_RDF_CHECK );if (rgd->rd_rgl->rl_unlinked ==0 ) rgd->rd_flags &= ~GFS2_RDF_CHECK ; rgd->rd_free =be32_to_cpu (rgd->rd_rgl->rl_free);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/422 ice: Fix and update driver version string
In reply to Greg Kroah-HartmanFrom: Anirudh Venkataramanan <[email protected]>
[ Upstream commit 9ea47d81a7f17c6b77211ab75fbca2127719ad39 ]
Remove the "ice" prefix for the driver version string and bump version to 0.7.1-k.
--- drivers/net/ethernet/intel/ice/ice_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
@@ -7,7 +7,7 @@#include "ice.h" -#define DRV_VERSION "ice-0.7.0-k" +#define DRV_VERSION "0.7.1-k"#define DRV_SUMMARY "Intel(R) Ethernet Connection E800 Series Linux Driver"const char ice_drv_ver[] =DRV_VERSION ;static const char ice_driver_string[] =DRV_SUMMARY ;
Signature · 1 line
2.20.1
Re: [PATCH 4.19 065/422] ice: Fix and update driver version string
Quoted 6 lines · Greg Kroah-Hartman
From: Anirudh Venkataramanan <[email protected]>
[ Upstream commit
9ea47d81a7f17c6b77211ab75fbca2127719ad39]Remove the "ice" prefix for the driver version string and bump version to 0.7.1-k.
This sounds like a bad idea. 0.7.1 in mainline contains patches that were not backported to stable, so marking this as 0.7.1 version is wrong.
Best regards,
Pavel
Quoted 14 lines
+++
b/drivers/net/ethernet/intel/ice/ice_main.cdrivers/net/ethernet/intel/ice/ice_main.c +1
-1@@ -7,7 +7,7 @@#include "ice.h" -#define DRV_VERSION "ice-0.7.0-k" +#define DRV_VERSION "0.7.1-k"#define DRV_SUMMARY "Intel(R) Ethernet Connection E800 Series Linux Driver"const char ice_drv_ver[] =DRV_VERSION ;static const char ice_driver_string[] =DRV_SUMMARY ;Signature · 1 line
2.20.1
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Jeff Kirsher
NAKRe: [PATCH 4.19 065/422] ice: Fix and update driver version string
Quoted 5 lines · Pavel Machek
Quoted 4 lines · Greg Kroah-Hartman
From: Anirudh Venkataramanan <[email protected]>
[ Upstream commit
9ea47d81a7f17c6b77211ab75fbca2127719ad39]
Quoted 7 lines
Quoted 3 lines
Remove the "ice" prefix for the driver version string and bump version
to 0.7.1-k.This sounds like a bad idea. 0.7.1 in mainline contains patches that were not backported to stable, so marking this as 0.7.1 version is wrong.
I agree, backporting this change to stable should not happen.
NAK
Quoted 16 lines
Quoted 16 lines
+++
b/drivers/net/ethernet/intel/ice/ice_main.cdrivers/net/ethernet/intel/ice/ice_main.c +1
-1@@ -7,7 +7,7 @@#include "ice.h" -#define DRV_VERSION "ice-0.7.0-k" +#define DRV_VERSION "0.7.1-k"#define DRV_SUMMARY "Intel(R) Ethernet Connection E800Series Linux Driver"
const char ice_drv_ver[] =DRV_VERSION; static const char ice_driver_string[] =DRV_SUMMARY;Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 065/422] ice: Fix and update driver version string
In reply to Pavel MachekQuoted 15 lines · Pavel Machek
Quoted 6 lines · Greg Kroah-Hartman
From: Anirudh Venkataramanan <[email protected]>
[ Upstream commit
9ea47d81a7f17c6b77211ab75fbca2127719ad39]Remove the "ice" prefix for the driver version string and bump version to 0.7.1-k.
This sounds like a bad idea. 0.7.1 in mainline contains patches that were not backported to stable, so marking this as 0.7.1 version is wrong.
Best regards,
Pavel
Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_main.c line 10
Quoted 7 lines
+++
b/drivers/net/ethernet/intel/ice/ice_main.cdrivers/net/ethernet/intel/ice/ice_main.c +1
-1@@ -7,7 +7,7 @@#include "ice.h" -#define DRV_VERSION "ice-0.7.0-k" +#define DRV_VERSION "0.7.1-k"
Hah, this is why "versions" for drivers are totally meaningless and why we removed them from most of the kernel tree already. I recommend doing that here as well.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 66/422 ASoC: dapm: Dont fail creating new DAPM control on NULL pinctrl
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit a5cd7e9cf587f51a84b86c828b4e1c7b392f448e ]
devm_pinctrl_get will only return NULL in the case that pinctrl is not built into the kernel and all the pinctrl functions used by the DAPM core are appropriately stubbed for that case. There is no need to error out of snd_soc_dapm_new_control_unlocked if pinctrl isn't built into the kernel, so change the IS_ERR_OR_NULL to just an IS_ERR.
--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-dapm.c +1 -1
@@ -3514,7 +3514,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,break ;case snd_soc_dapm_pinctrl: w->pinctrl =devm_pinctrl_get (dapm->dev); -if (IS_ERR_OR_NULL (w->pinctrl)) { +if (IS_ERR (w->pinctrl)) { ret =PTR_ERR (w->pinctrl);if (ret == -EPROBE_DEFER )return ERR_PTR (ret);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/422 ASoC: dpcm: Properly initialise hw->rate_max
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit e33ffbd9cd39da09831ce62c11025d830bf78d9e ]
If the CPU DAI does not initialise rate_max, say if using using KNOT or CONTINUOUS, then the rate_max field will be initialised to 0. A value of zero in the rate_max field of the hardware runtime will cause the sound card to support no sample rates at all. Obviously this is not desired, just a different mechanism is being used to apply the constraints. As such update the setting of rate_max in dpcm_init_runtime_hw to be consistent with the non-DPCM cases and set rate_max to UINT_MAX if nothing is defined on the CPU DAI.
--- sound/soc/soc-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-pcm.c +1 -1
@@ -1683,7 +1683,7 @@ static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime, struct snd_soc_pcm_stream *stream) { runtime->hw.rate_min = stream->rate_min; - runtime->hw.rate_max = stream->rate_max; + runtime->hw.rate_max =min_not_zero (stream->rate_max,UINT_MAX ); runtime->hw.channels_min = stream->channels_min; runtime->hw.channels_max = stream->channels_max;if (runtime->hw.formats)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/422 ASoC: meson: axg-fifo: report interrupt request failure
In reply to Greg Kroah-HartmanFrom: Jerome Brunet <[email protected]>
[ Upstream commit dadfab7272b13ca441efdb9aa9117bc669680b05 ]
Return value of request_irq() was irgnored. Fix this and report the failure if any
--- sound/soc/meson/axg-fifo.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/meson/axg-fifo.c +2 -0
@@ -203,6 +203,8 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss) ret =request_irq (fifo->irq, axg_fifo_pcm_irq_block,0 ,dev_name (dev), ss); +if (ret) +return ret;/* Enable pclk to access registers and clock the fifo ip */ ret =clk_prepare_enable (fifo->pclk);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 068/422] ASoC: meson: axg-fifo: report interrupt request failure
Hi!
Quoted 10 lines
Return value of
request_irq()was irgnored. Fix this and report the failure if any1 file changed, 2 insertions(+)sound/soc/meson/axg-fifo.c +0
-0
sound/soc/meson/axg-fifo.c static int axg_fifo_pcm_open(struct snd_pcm_substream *ss) · line 210
Quoted 8 lines
sound/soc/meson/axg-fifo.c +2
-0@@ -203,6 +203,8 @@ static int axg_fifo_pcm_open(struct snd_pcm_substream *ss) ret =request_irq (fifo->irq, axg_fifo_pcm_irq_block,0 ,dev_name (dev), ss); +if (ret) +return ret;/* Enable pclk to access registers and clock the fifo ip */ ret =clk_prepare_enable (fifo->pclk);
While this is not incorrect...
Do we need to free_irq in case of clk_prepare_enable() or other stuff below fails?
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Greg Kroah-Hartman
maintainerPATCH 69/422 ASoC: AMD: Change MCLK to 48Mhz
In reply to Greg Kroah-HartmanFrom: Akshu Agrawal <[email protected]>
[ Upstream commit a1b1e9880f0c2754a5ac416a546d9f295f72eabc ]
25Mhz MCLK which was earlier used was of spread type. Thus, we were not getting accurate rate. The 48Mhz system clk is of non-spread type and we are changing to it to get accurate rate.
--- sound/soc/amd/acp-da7219-max98357a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/amd/acp-da7219-max98357a.c +1 -1
@@ -42,7 +42,7 @@#include "../codecs/da7219.h" #include "../codecs/da7219-aad.h" -#define CZ_PLAT_CLK 25000000 +#define CZ_PLAT_CLK 48000000#define DUAL_CHANNEL 2static struct snd_soc_jack cz_jack;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/422 pinctrl: ingenic: Probe driver at subsys_initcall
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit 556a36a71ed80e17ade49225b58513ea3c9e4558 ]
Using postcore_initcall() makes the driver try to initialize way too early.
--- drivers/pinctrl/pinctrl-ingenic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-ingenic.c +1 -1
@@ -847,4 +847,4 @@ static int __init ingenic_pinctrl_drv_register(void) {return platform_driver_register (&ingenic_pinctrl_driver); } -postcore_initcall (ingenic_pinctrl_drv_register); +subsys_initcall (ingenic_pinctrl_drv_register);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 070/422] pinctrl: ingenic: Probe driver at subsys_initcall
Quoted 6 lines · Greg Kroah-Hartman
From: Paul Cercueil <[email protected]>
[ Upstream commit
556a36a71ed80e17ade49225b58513ea3c9e4558]Using
postcore_initcall()makes the driver try to initialize way too early.
Does it fix concrete bug / would you say it is suitable for -stable?
drivers/pinctrl/pinctrl-ingenic.c static int __init ingenic_pinctrl_drv_register(void) · line 850
Quoted 7 lines
+++
b/drivers/pinctrl/pinctrl-ingenic.cdrivers/pinctrl/pinctrl-ingenic.c +1
-1@@ -847,4 +847,4 @@ static int __init ingenic_pinctrl_drv_register(void) {return platform_driver_register (&ingenic_pinctrl_driver); } -postcore_initcall (ingenic_pinctrl_drv_register); +subsys_initcall (ingenic_pinctrl_drv_register);
There are other pinctrl drivers initialized very early, do they need fixing, too?
Best regards,
Pavel
pavel@amd:~/cip/k$ grep _initcall drivers/pinctrl/pinctrl-*.c drivers/pinctrl/pinctrl-artpec6.c:arch_initcall(artpec6_pmx_init); drivers/pinctrl/pinctrl-at91.c:arch_initcall(at91_pinctrl_init); drivers/pinctrl/pinctrl-coh901.c:arch_initcall(u300_gpio_init); drivers/pinctrl/pinctrl-falcon.c:core_initcall_sync(pinctrl_falcon_init); drivers/pinctrl/pinctrl-gemini.c:arch_initcall(gemini_pmx_init); drivers/pinctrl/pinctrl-ingenic.c:postcore_initcall(ingenic_pinctrl_drv_register); drivers/pinctrl/pinctrl-mcp23s08.c:subsys_initcall(mcp23s08_init); drivers/pinctrl/pinctrl-oxnas.c:arch_initcall(oxnas_gpio_register); drivers/pinctrl/pinctrl-oxnas.c:arch_initcall(oxnas_pinctrl_register); drivers/pinctrl/pinctrl-pic32.c:arch_initcall(pic32_gpio_register); drivers/pinctrl/pinctrl-pic32.c:arch_initcall(pic32_pinctrl_register); drivers/pinctrl/pinctrl-pistachio.c:arch_initcall(pistachio_pinctrl_register); drivers/pinctrl/pinctrl-rockchip.c:postcore_initcall(rockchip_pinctrl_drv_register); drivers/pinctrl/pinctrl-rza1.c:core_initcall(rza1_pinctrl_init); drivers/pinctrl/pinctrl-st.c:arch_initcall(st_pctl_init); drivers/pinctrl/pinctrl-sx150x.c:subsys_initcall(sx150x_init); drivers/pinctrl/pinctrl-u300.c:arch_initcall(u300_pmx_init); drivers/pinctrl/pinctrl-xway.c:core_initcall_sync(pinmux_xway_init); drivers/pinctrl/pinctrl-zynq.c:arch_initcall(zynq_pinctrl_init);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 070/422] pinctrl: ingenic: Probe driver at subsys_initcall
Hi Pavel,
Quoted 9 lines · Pavel Machek
Quoted 6 lines · Greg Kroah-Hartman
From: Paul Cercueil <[email protected]>
[ Upstream commit
556a36a71ed80e17ade49225b58513ea3c9e4558]Using
postcore_initcall()makes the driver try to initialize way too early.Does it fix concrete bug / would you say it is suitable for -stable?
When using postcore_initcall() it locks up early in the boot process, so it definitely fixes a bug. I think it locks up because standard (non-early) platform drivers can't be probed postcore (but they can be registered and probed later).
Quoted 10 lines
Quoted 9 lines
+++
b/drivers/pinctrl/pinctrl-ingenic.c
@@ -847,4 +847,4 @@ static int__initingenic_pinctrl_drv_register(void)
{
returnplatform_driver_register(&ingenic_pinctrl_driver);
}
-postcore_initcall(ingenic_pinctrl_drv_register); +subsys_initcall(ingenic_pinctrl_drv_register);
Quoted 2 lines
There are other pinctrl drivers initialized very early, do they need fixing, too?
The other drivers call platform_driver_register(), not platform_driver_probe(), which means that they will probe at the same time as the other platform drivers.
The reason platform_driver_probe() is used in pinctrl-ingenic is that it allows the probe function and all the code attached to be marked __init.
Cheers,
-Paul
Greg Kroah-Hartman
maintainerPATCH 71/422 MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
In reply to Greg Kroah-HartmanFrom: Tuomas Tynkkynen <[email protected]>
[ Upstream commit feef7918667b84f9d5653c501542dd8d84ae32af ]
Setting GPIO 21 high seems to be required to enable power to USB ports on the WNDR3400v3. As there is already similar code for WNR3500L, make the existing USB power GPIO code generic and use that.
Patchwork: https://patchwork.linux-mips.org/patch/20259/
--- arch/mips/bcm47xx/workarounds.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/mips/bcm47xx/workarounds.c +5 -3
@@ -5,9 +5,8 @@#include <bcm47xx_board.h> #include <bcm47xx.h> -static void __init bcm47xx_workarounds_netgear_wnr3500l (void ) +static void __init bcm47xx_workarounds_enable_usb_power (int usb_power) { -const int usb_power =12 ;int err; err =gpio_request_one (usb_power,GPIOF_OUT_INIT_HIGH ,"usb_power" );
@@ -23,7 +22,10 @@ void __init bcm47xx_workarounds(void)switch (board) {case BCM47XX_BOARD_NETGEAR_WNR3500L : -bcm47xx_workarounds_netgear_wnr3500l (); +bcm47xx_workarounds_enable_usb_power (12 ); +break ; +case BCM47XX_BOARD_NETGEAR_WNDR3400_V3 : +bcm47xx_workarounds_enable_usb_power (21 );break ;default :/* No workaround(s) needed */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/422 ARM: dts: exynos: Use i2c-gpio for HDMI-DDC on Arndale
In reply to Greg Kroah-HartmanFrom: Andrzej Hajda <[email protected]>
[ Upstream commit 620375c8fdf2f9f5110ed48d6c407cc4b7554f86 ]
HDMI-DDC for unknown reasons doesn't work with Exynos I2C controllers. Fortunately i2c-gpio comes to the rescue.
--- arch/arm/boot/dts/exynos5250-arndale.dts | 28 ++++++++++++++++------- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 6 +++++ 2 files changed, 26 insertions(+), 8 deletions(-)
arch/arm/boot/dts/exynos5250-arndale.dts +20 -8
@@ -150,7 +150,7 @@ &hdmi { status = "okay"; - ddc = <&i2c_2>; + ddc = <&i2c_ddc>; hpd-gpios = <&gpx3 7 GPIO_ACTIVE_LOW>; vdd_osc-supply = <&ldo10_reg>; vdd_pll-supply = <&ldo8_reg>;
@@ -452,13 +452,6 @@ }; }; -&i2c_2 { - status = "okay"; - /* used by HDMI DDC */ - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; -}; - &i2c_3 { status = "okay";
@@ -547,3 +540,22 @@ status = "okay"; samsung,exynos-sataphy-i2c-phandle = <&sata_phy_i2c>; }; + +&soc { + /* + * For unknown reasons HDMI-DDC does not work with Exynos I2C + * controllers. Lets use software I2C over GPIO pins as a workaround. + */ + i2c_ddc: i2c-gpio { + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_gpio_bus>; + status = "okay"; + compatible = "i2c-gpio"; + gpios = <&gpa0 6 0 /* sda */ + &gpa0 7 0 /* scl */ + >; + i2c-gpio,delay-us = <2>; + #address-cells = <1>; + #size-cells = <0>; + }; +};
arch/arm/boot/dts/exynos5250-pinctrl.dtsi +6 -0
@@ -225,6 +225,12 @@ samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; }; + i2c2_gpio_bus: i2c2-gpio-bus { + samsung,pins = "gpa0-6", "gpa0-7"; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; + }; + uart2_data: uart2-data { samsung,pins = "gpa1-0", "gpa1-1"; samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/422 ARM: dts: exynos: Fix HDMI-HPD line handling on Arndale
In reply to Greg Kroah-HartmanFrom: Andrzej Hajda <[email protected]>
[ Upstream commit 21cb5a27483a3cfdbcb7508a06a30c0a485e1211 ]
HDMI-HPD was set active low, moreover by default pincontrol chip sets pull-down on the pin. As a result HDMI driver assumes TV is always connected regardless of actual state. The patch fixes it.
--- arch/arm/boot/dts/exynos5250-arndale.dts | 4 +++- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/exynos5250-arndale.dts +3 -1
@@ -149,9 +149,11 @@ }; &hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_hpd>; status = "okay"; ddc = <&i2c_ddc>; - hpd-gpios = <&gpx3 7 GPIO_ACTIVE_LOW>; + hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; vdd_osc-supply = <&ldo10_reg>; vdd_pll-supply = <&ldo8_reg>; vdd-supply = <&ldo8_reg>;
arch/arm/boot/dts/exynos5250-pinctrl.dtsi +5 -0
@@ -599,6 +599,11 @@ samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>; }; + + hdmi_hpd: hdmi-hpd { + samsung,pins = "gpx3-7"; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + }; }; &pinctrl_1 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/422 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 64858773d78e820003a94e5a7179d368213655d6 ]
This patch adds missing properties to the CODEC and sound nodes, so the audio will work also on Snow rev5 Chromebook. This patch is an extension to the commit e9eefc3f8ce0 ("ARM: dts: exynos: Add missing clock and DAI properties to the max98095 node in Snow Chromebook")
and commit 6ab569936d60 ("ARM: dts: exynos: Enable HDMI audio on Snow Chromebook"). It has been reported that such changes work fine on the rev5 board too.
--- arch/arm/boot/dts/exynos5250-snow-rev5.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/exynos5250-snow-rev5.dts +11 -0
@@ -20,6 +20,14 @@ samsung,model = "Snow-I2S-MAX98090"; samsung,audio-codec = <&max98090>; + + cpu { + sound-dai = <&i2s0 0>; + }; + + codec { + sound-dai = <&max98090 0>, <&hdmi>; + }; }; };
@@ -31,6 +39,9 @@ interrupt-parent = <&gpx0>; pinctrl-names = "default"; pinctrl-0 = <&max98090_irq>; + clocks = <&pmu_system_controller 0>; + clock-names = "mclk"; + #sound-dai-cells = <1>; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/422 liquidio: fix race condition in instruction completion processing
In reply to Greg Kroah-HartmanFrom: Rick Farrington <[email protected]>
[ Upstream commit b943f17e06493fd2c7fd00743093ad5dcdb90e7f ]
In lio_enable_irq, the pkt_in_done count register was being cleared to zero. However, there could be some completed instructions which were not yet processed due to budget and limit constraints.
So, only write this register with the number of actual completions that were processed.
--- drivers/net/ethernet/cavium/liquidio/octeon_device.c | 5 +++-- drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 ++ drivers/net/ethernet/cavium/liquidio/request_manager.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/cavium/liquidio/octeon_device.c +3 -2
@@ -1450,8 +1450,9 @@ void lio_enable_irq(struct octeon_droq *droq, struct octeon_instr_queue *iq) }if (iq) {spin_lock_bh (&iq->lock); -writel (iq->pkt_in_done, iq->inst_cnt_reg); - iq->pkt_in_done =0 ; +writel (iq->pkts_processed, iq->inst_cnt_reg); + iq->pkt_in_done -= iq->pkts_processed; + iq->pkts_processed =0 ;/* this write needs to be flushed before we release the lock */ mmiowb ();spin_unlock_bh (&iq->lock);
drivers/net/ethernet/cavium/liquidio/octeon_iq.h +2 -0
@@ -94,6 +94,8 @@ struct octeon_instr_queue {u32 pkt_in_done; +u32 pkts_processed; +/** A spinlock to protect access to the input ring.*/ spinlock_t iq_flush_running_lock;
drivers/net/ethernet/cavium/liquidio/request_manager.c +2 -0
@@ -123,6 +123,7 @@ int octeon_init_instr_queue(struct octeon_device *oct, iq->do_auto_flush =1 ; iq->db_timeout = (u32 )conf->db_timeout;atomic_set (&iq->instr_pending,0 ); + iq->pkts_processed =0 ;/* Initialize the spinlock for this instruction queue */ spin_lock_init (&iq->lock);
@@ -497,6 +498,7 @@ octeon_flush_iq(struct octeon_device *oct, struct octeon_instr_queue *iq,lio_process_iq_request_list (oct, iq,0 );if (inst_processed) { + iq->pkts_processed += inst_processed;atomic_sub (inst_processed, &iq->instr_pending); iq->stats.instr_processed += inst_processed; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/422 arm64: dts: stratix10: i2c clock running out of spec
In reply to Greg Kroah-HartmanFrom: Alan Tull <[email protected]>
[ Upstream commit c8da1d15b8a4957f105ad77bb1404d72e304566f ]
DesignWare I2C controller was observed running at 105.93kHz rather than the specified 100kHz. Adjust device tree settings to bring it within spec (a slightly conservative 98 MHz).
--- arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +2 -0
@@ -124,6 +124,8 @@ &i2c1 { status = "okay"; clock-frequency = <100000>; + i2c-sda-falling-time-ns = <890>; /* hcnt */ + i2c-sdl-falling-time-ns = <890>; /* lcnt */ adc@14 { compatible = "lltc,ltc2497";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/422 ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit f8f3b7fc21b1cb59385b780acd9b9a26d04cb7b2 ]
Regulators, which are marked as 'on-in-suspend' seems to be critical for board operation, thus they must not be disabled anytime. This can be only assured by marking them as 'always-on', because otherwise some actions of their clients might result in turning them off. This patch restores suspend/resume operation on Peach-Pit Chromebook board. It partially reverts 'always-on' property removal done by the commit mentioned in the Fixes tag.
--- arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 +++ arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 +++ 2 files changed, 6 insertions(+)
arch/arm/boot/dts/exynos5420-peach-pit.dts +3 -0
@@ -312,6 +312,7 @@ regulator-name = "vdd_1v35"; regulator-min-microvolt = <1350000>; regulator-max-microvolt = <1350000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -333,6 +334,7 @@ regulator-name = "vdd_2v"; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -343,6 +345,7 @@ regulator-name = "vdd_1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
arch/arm/boot/dts/exynos5800-peach-pi.dts +3 -0
@@ -312,6 +312,7 @@ regulator-name = "vdd_1v35"; regulator-min-microvolt = <1350000>; regulator-max-microvolt = <1350000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -333,6 +334,7 @@ regulator-name = "vdd_2v"; regulator-min-microvolt = <2000000>; regulator-max-microvolt = <2000000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
@@ -343,6 +345,7 @@ regulator-name = "vdd_1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-boot-on; regulator-state-mem { regulator-on-in-suspend;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/422 i40evf: Validate the number of queues a PF sends
In reply to Greg Kroah-HartmanFrom: Paul M Stillwell Jr <[email protected]>
[ Upstream commit 3c818910911c93bb5099c6637ec350f90c0e71fc ]
A PF can send any number of queues to the VF and the VF may not be able to support that many. Check to see that the number of queues is less than or equal to the max number of queues the VF can have.
--- .../ethernet/intel/i40evf/i40evf_virtchnl.c | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c +32 -0
@@ -153,6 +153,32 @@ int i40evf_send_vf_config_msg(struct i40evf_adapter *adapter) NULL, 0); } +/** +* i40evf_validate_num_queues +* @adapter: adapter structure +* +* Validate that the number of queues the PF has sent in +* VIRTCHNL_OP_GET_VF_RESOURCES is not larger than the VF can handle. +**/ +static void i40evf_validate_num_queues (struct i40evf_adapter *adapter) +{ +if (adapter->vf_res->num_queue_pairs >I40EVF_MAX_REQ_QUEUES ) { +struct virtchnl_vsi_resource *vsi_res; +int i; + +dev_info (&adapter->pdev->dev,"Received %d queues, but can only have a max of %d\n" , + adapter->vf_res->num_queue_pairs, +I40EVF_MAX_REQ_QUEUES ); +dev_info (&adapter->pdev->dev,"Fixing by reducing queues to %d\n" , +I40EVF_MAX_REQ_QUEUES ); + adapter->vf_res->num_queue_pairs =I40EVF_MAX_REQ_QUEUES ; +for (i =0 ; i < adapter->vf_res->num_vsis; i++) { + vsi_res = &adapter->vf_res->vsi_res[i]; + vsi_res->num_queue_pairs =I40EVF_MAX_REQ_QUEUES ; + } + } +} +/** * i40evf_get_vf_config * @adapter: private adapter structure
@@ -195,6 +221,11 @@ int i40evf_get_vf_config(struct i40evf_adapter *adapter) err = (i40e_status )le32_to_cpu (event.desc.cookie_low);memcpy (adapter->vf_res, event.msg_buf,min (event.msg_len, len)); +/* some PFs send more queues than we should have so validate that +* we aren't getting too many queues +*/ +if (!err) +i40evf_validate_num_queues (adapter);i40e_vf_parse_hw_config (hw, adapter->vf_res); out_alloc:kfree (event.msg_buf);
@@ -1329,6 +1360,7 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,I40E_MAX_VF_VSI * sizeof(struct virtchnl_vsi_resource);memcpy (adapter->vf_res, msg,min (msglen, len)); +i40evf_validate_num_queues (adapter);i40e_vf_parse_hw_config (&adapter->hw, adapter->vf_res);/* restore current mac address */ ether_addr_copy (adapter->hw.mac.addr, netdev->dev_addr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/422 i40e: use correct length for strncpy
In reply to Greg Kroah-HartmanFrom: Mitch Williams <[email protected]>
[ Upstream commit 7eb74ff891b4e94b8bac48f648a21e4b94ddee64 ]
Caught by GCC 8. When we provide a length for strncpy, we should not include the terminating null. So we must tell it one less than the size of the destination buffer.
--- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2 -1
@@ -694,7 +694,8 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)if (!IS_ERR_OR_NULL (pf->ptp_clock))return 0 ; -strncpy (pf->ptp_caps.name, i40e_driver_name,sizeof (pf->ptp_caps.name)); +strncpy (pf->ptp_caps.name, i40e_driver_name, +sizeof (pf->ptp_caps.name) -1 ); pf->ptp_caps.owner =THIS_MODULE ; pf->ptp_caps.max_adj =999999999 ; pf->ptp_caps.n_ext_ts =0 ;
Signature · 1 line
2.20.1
Re: [PATCH 4.19 079/422] i40e: use correct length for strncpy
Hi!
Quoted 10 lines
From: Mitch Williams <[email protected]>
[ Upstream commit
7eb74ff891b4e94b8bac48f648a21e4b94ddee64]Caught by GCC 8. When we provide a length for strncpy, we should not include the terminating null. So we must tell it one less than the size of the destination buffer.
+++
b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
drivers/net/ethernet/intel/i40e/i40e_ptp.c static long i40e_ptp_create_clock(struct i40e_pf *pf) · line 701
Quoted 9 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-1@@ -694,7 +694,8 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)if (!IS_ERR_OR_NULL (pf->ptp_clock))return 0 ; -strncpy (pf->ptp_caps.name, i40e_driver_name,sizeof (pf->ptp_caps.name)); +strncpy (pf->ptp_caps.name, i40e_driver_name, +sizeof (pf->ptp_caps.name) -1 ); pf->ptp_caps.owner =THIS_MODULE ; pf->ptp_caps.max_adj =999999999 ; pf->ptp_caps.n_ext_ts =0 ;
So... pf is allocated with kzalloc, which will provide the null termination... so the code is okay.
On the other hand, the = 0 below is unneeded by the same logic, so this is a bit confusing.
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
RE: [PATCH 4.19 079/422] i40e: use correct length for strncpy
Quoted 37 lines
-----Original Message-----
From: Pavel Machek <[email protected]>
Sent: Thursday, November 21, 2019 2:35 AM
To: Greg Kroah-Hartman <[email protected]>
Cc: [email protected]; [email protected]; Williams, Mitch A <[email protected]>; Bowers, AndrewX <[email protected]>; Kirsher, Jeffrey T <[email protected]>; Sasha Levin <[email protected]>
Subject: Re: [PATCH 4.19 079/422] i40e: use correct length for strncpyHi!
Quoted 10 lines
From: Mitch Williams <[email protected]>
[ Upstream commit
7eb74ff891b4e94b8bac48f648a21e4b94ddee64]Caught by GCC 8. When we provide a length for strncpy, we should not include the terminating null. So we must tell it one less than the size of the destination buffer.
+++
b/drivers/net/ethernet/intel/i40e/i40e_ptp.cdrivers/net/ethernet/intel/i40e/i40e_ptp.c static long i40e_ptp_create_clock(struct i40e_pf *pf) · line 701
Quoted 9 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-1@@ -694,7 +694,8 @@ static long i40e_ptp_create_clock(struct i40e_pf *pf)if (!IS_ERR_OR_NULL (pf->ptp_clock))return 0 ; -strncpy (pf->ptp_caps.name, i40e_driver_name,sizeof (pf->ptp_caps.name)); +strncpy (pf->ptp_caps.name, i40e_driver_name, +sizeof (pf->ptp_caps.name) -1 ); pf->ptp_caps.owner =THIS_MODULE ; pf->ptp_caps.max_adj =999999999 ; pf->ptp_caps.n_ext_ts =0 ;So... pf is allocated with kzalloc, which will provide the null termination... so the code is okay.
Quoted 5 lines
On the other hand, the = 0 below is unneeded by the same logic, so this is a bit confusing.
Best regards,
Pavel
Thanks for catching this, Pavel. Aleksandr Loktionov owns this driver now. He can get this taken care of. -Mitch
Quoted 4 lines
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 4.19 079/422] i40e: use correct length for strncpy
In reply to Pavel MachekQuoted 22 lines · Pavel Machek
Review static long i40e_ptp_create_clock(struct i40e_pf
Quoted 10 lines
From: Mitch Williams <[email protected]>
[ Upstream commit
7eb74ff891b4e94b8bac48f648a21e4b94ddee64]Caught by GCC 8. When we provide a length for strncpy, we should not include the terminating null. So we must tell it one less than the size of the destination buffer.
+++
b/drivers/net/ethernet/intel/i40e/i40e_ptp.c(quoted diff) +0
-0@@ -694,7 +694,8 @@ static long i40e_ptp_create_clock(struct i40e_pf*pf)
Quoted 10 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-1if (!IS_ERR_OR_NULL (pf->ptp_clock))return 0 ; -strncpy (pf->ptp_caps.name, i40e_driver_name,sizeof (pf- ptp_caps.name)); +strncpy (pf->ptp_caps.name, i40e_driver_name, +sizeof (pf->ptp_caps.name) -1 ); pf->ptp_caps.owner =THIS_MODULE ; pf->ptp_caps.max_adj =999999999 ;pf->ptp_caps.n_ext_ts = 0;
Quoted 5 lines
So... pf is allocated with kzalloc, which will provide the null termination... so the code is okay.
On the other hand, the = 0 below is unneeded by the same logic, so this is a bit confusing.
Thanks for the catch, we are putting together a follow-on patch to cleanup up the unneeded code.
Greg Kroah-Hartman
maintainerPATCH 80/422 i40evf: set IFF_UNICAST_FLT flag for the VF
In reply to Greg Kroah-HartmanFrom: Lihong Yang <[email protected]>
[ Upstream commit e65aae086330d0a6c6c9f874aef03c69cf98884b ]
Set IFF_UNICAST_FLT flag for the VF to prevent it from entering promiscuous mode when macvlan is added to the VF.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +2 -0
@@ -3332,6 +3332,8 @@ int i40evf_process_config(struct i40evf_adapter *adapter)if (vfres->vf_cap_flags &VIRTCHNL_VF_OFFLOAD_VLAN ) netdev->features |=NETIF_F_HW_VLAN_CTAG_FILTER ; + netdev->priv_flags |=IFF_UNICAST_FLT ; +/* Do not turn on offloads when they are requested to be turned off. * TSO needs minimum 576 bytes to work correctly. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/422 i40e: Check and correct speed values for link on open
In reply to Greg Kroah-HartmanFrom: Jan Sokolowski <[email protected]>
[ Upstream commit e78d9a39fd06109022d11c8ca444cfcec2abb290 ]
If our card has been put in an unstable state due to other drivers interacting with it, speed settings might be incorrect. If incorrect, forcefully reset them on open to known default values.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 27 ++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +24 -3
@@ -6587,6 +6587,24 @@ static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up)struct i40e_hw *hw = &pf->hw;i40e_status err;u64 mask; +u8 speed; + +/* Card might've been put in an unstable state by other drivers +* and applications, which causes incorrect speed values being +* set on startup. In order to clear speed registers, we call +* get_phy_capabilities twice, once to get initial state of +* available speeds, and once to get current PHY config. +*/ + err =i40e_aq_get_phy_capabilities (hw, false, true, &abilities, +NULL ); +if (err) { +dev_err (&pf->pdev->dev, +"failed to get phy cap., ret = %s last_status = %s\n" , +i40e_stat_str (hw, err), +i40e_aq_str (hw, hw->aq.asq_last_status)); +return err; + } + speed = abilities.link_speed;/* Get the current phy config */ err = i40e_aq_get_phy_capabilities(hw, false, false, &abilities,
@@ -6600,9 +6618,9 @@ static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up) }/* If link needs to go up, but was not forced to go down, -* no need for a flap +* and its speed values are OK, no need for a flap */ -if (is_up && abilities.phy_type !=0 ) +if (is_up && abilities.phy_type !=0 && abilities.link_speed !=0 )return I40E_SUCCESS ;/* To force link we need to set bits for all supported PHY types,
@@ -6614,7 +6632,10 @@ static i40e_status i40e_force_link_state(struct i40e_pf *pf, bool is_up) config.phy_type_ext = is_up ? (u8)((mask >>32 ) &0xff ) :0 ;/* Copy the old settings, except of phy_type */ config.abilities = abilities.abilities; - config.link_speed = abilities.link_speed; +if (abilities.link_speed !=0 ) + config.link_speed = abilities.link_speed; +else + config.link_speed = speed; config.eee_capability = abilities.eee_capability; config.eeer = abilities.eeer_val; config.low_power_ctrl = abilities.d3_lpan;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/422 i40evf: Dont enable vlan stripping when rx offload is turned on
In reply to Greg Kroah-HartmanFrom: Patryk Małek <[email protected]>
[ Upstream commit 3bd77e2ae1477d6f87fc3f542c737119d5decf9f ]
With current implementation of i40evf_set_features when user sets any offload via ethtool we set I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING as a required aq which triggers driver to call i40evf_enable_vlan_stripping. This shouldn't take place. This patches fixes it by setting the flag only when VLAN offload is turned on.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +6 -5
@@ -3097,18 +3097,19 @@ static int i40evf_set_features(struct net_device *netdev, {struct i40evf_adapter *adapter =netdev_priv (netdev); -/* Don't allow changing VLAN_RX flag when VLAN is set for VF -* and return an error in this case +/* Don't allow changing VLAN_RX flag when adapter is not capable +* of VLAN offload */ -if (VLAN_ALLOWED (adapter)) { +if (!VLAN_ALLOWED (adapter)) { +if ((netdev->features ^ features) &NETIF_F_HW_VLAN_CTAG_RX ) +return -EINVAL ; + }else if ((netdev->features ^ features) &NETIF_F_HW_VLAN_CTAG_RX ) {if (features &NETIF_F_HW_VLAN_CTAG_RX ) adapter->aq_required |=I40EVF_FLAG_AQ_ENABLE_VLAN_STRIPPING ;else adapter->aq_required |=I40EVF_FLAG_AQ_DISABLE_VLAN_STRIPPING ; - }else if ((netdev->features ^ features) &NETIF_F_HW_VLAN_CTAG_RX ) { -return -EINVAL ; }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/422 i40e: hold the rtnl lock on clearing interrupt scheme
In reply to Greg Kroah-HartmanFrom: Patryk Małek <[email protected]>
[ Upstream commit 5cba17b14182696d6bb0ec83a1d087933f252241 ]
Hold the rtnl lock when we're clearing interrupt scheme in i40e_shutdown and in i40e_remove.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -0
@@ -14208,6 +14208,7 @@ static void i40e_remove(struct pci_dev *pdev)mutex_destroy (&hw->aq.asq_mutex);/* Clear all dynamic memory lists of rings, q_vectors, and VSIs */ +rtnl_lock ();i40e_clear_interrupt_scheme (pf);for (i =0 ; i < pf->num_alloc_vsi; i++) {if (pf->vsi[i]) {
@@ -14216,6 +14217,7 @@ static void i40e_remove(struct pci_dev *pdev) pf->vsi[i] =NULL ; } } +rtnl_unlock ();for (i =0 ; i <I40E_MAX_VEB ; i++) {kfree (pf->veb[i]);
@@ -14427,7 +14429,13 @@ static void i40e_shutdown(struct pci_dev *pdev)wr32 (hw,I40E_PFPM_WUFC , (pf->wol_en ?I40E_PFPM_WUFC_MAG_MASK :0 )); +/* Since we're going to destroy queues during the +* i40e_clear_interrupt_scheme() we should hold the RTNL lock for this +* whole section +*/ +rtnl_lock ();i40e_clear_interrupt_scheme (pf); +rtnl_unlock ();if (system_state ==SYSTEM_POWER_OFF ) {pci_wake_from_d3 (pdev, pf->wol_en);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/422 i40evf: cancel workqueue sync for adminq when a VF is removed
In reply to Greg Kroah-HartmanFrom: Lihong Yang <[email protected]>
[ Upstream commit babbcc60040abfb7a9e3caa1c58fe182ae73762a ]
If a VF is being removed, there is no need to continue with the workqueue sync for the adminq task, thus cancel it. Without this call, when VFs are created and removed right away, there might be a chance for the driver to crash with events stuck in the adminq.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +2 -0
@@ -3884,6 +3884,8 @@ static void i40evf_remove(struct pci_dev *pdev)if (adapter->watchdog_timer.function)del_timer_sync (&adapter->watchdog_timer); +cancel_work_sync (&adapter->adminq_task); +i40evf_free_rss (adapter);if (hw->aq.asq.count)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/422 i40e: Prevent deleting MAC address from VF when set by PF
In reply to Greg Kroah-HartmanFrom: Patryk Małek <[email protected]>
[ Upstream commit 5907cf6c5bbe78be2ed18b875b316c6028b20634 ]
To prevent VF from deleting MAC address that was assigned by the PF we need to check for that scenario when we try to delete a MAC address from a VF.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +10 -0
@@ -2571,6 +2571,16 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) ret =I40E_ERR_INVALID_MAC_ADDR ; goto error_param; } + +if (vf->pf_set_mac && +ether_addr_equal (al->list[i].addr, + vf->default_lan_addr.addr)) { +dev_err (&pf->pdev->dev, +"MAC addr %pM has been set by PF, cannot delete it for VF %d, reset VF to change MAC addr\n" , + vf->default_lan_addr.addr, vf->vf_id); + ret =I40E_ERR_PARAM ; + goto error_param; + } } vsi = pf->vsi[vf->lan_vsi_idx];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/422 IB/rxe: avoid back-to-back retries
In reply to Greg Kroah-HartmanFrom: Vijay Immanuel <[email protected]>
[ Upstream commit 4e4c53df567714b3d08b2b5d8ccb1d175fc9be01 ]
Error retries can occur due to timeouts, NAKs or receiving packets beyond the current read request. Avoid back-to-back retries due to packet processing, by only retrying the initial attempt immediately. Subsequent retries must be due to timeouts.
Continue to process completion packets after scheduling a retry.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 18 +++++++++++++++++- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + 2 files changed, 18 insertions(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_comp.c +17 -1
@@ -191,6 +191,7 @@ static inline void reset_retry_counters(struct rxe_qp *qp) { qp->comp.retry_cnt = qp->attr.retry_cnt; qp->comp.rnr_retry = qp->attr.rnr_retry; + qp->comp.started_retry =0 ; } static inline enum comp_state check_psn(struct rxe_qp *qp,
@@ -676,6 +677,20 @@ int rxe_completer(void *arg) goto exit; } +/* if we've started a retry, don't start another +* retry sequence, unless this is a timeout. +*/ +if (qp->comp.started_retry && + !qp->comp.timeout_retry) { +if (pkt) { +rxe_drop_ref (pkt->qp); +kfree_skb (skb); + skb =NULL ; + } + + goto done; + } +if (qp->comp.retry_cnt >0 ) {if (qp->comp.retry_cnt !=7 ) qp->comp.retry_cnt--;
@@ -692,6 +707,7 @@ int rxe_completer(void *arg)rxe_counter_inc (rxe,RXE_CNT_COMP_RETRY ); qp->req.need_retry =1 ; + qp->comp.started_retry =1 ;rxe_run_task (&qp->req.task,1 ); }
@@ -701,7 +717,7 @@ int rxe_completer(void *arg) skb =NULL ; } - goto exit; + goto done; }else {rxe_counter_inc (rxe,RXE_CNT_RETRY_EXCEEDED );
drivers/infiniband/sw/rxe/rxe_verbs.h +1 -0
@@ -158,6 +158,7 @@ struct rxe_comp_info {int opcode;int timeout;int timeout_retry; +int started_retry;u32 retry_cnt;u32 rnr_retry;struct rxe_task task;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/422 IB/rxe: fixes for rdma read retry
In reply to Greg Kroah-HartmanFrom: Vijay Immanuel <[email protected]>
[ Upstream commit 030e46e495af855a13964a0aab9753ea82a96edc ]
When a read request is retried for the remaining partial data, the response may restart from read response first or read response only. So support those cases.
Do not advance the comp psn beyond the current wqe's last_psn as that could skip over an entire read wqe and will cause the req_retry() logic to set an incorrect req psn.
An example sequence is as follows:
Write PSN 40 -- this is the current WQE.
Read request PSN 41
Write PSN 42
Receive ACK PSN 42 -- this will complete the current WQE for PSN 40, and set the comp psn to 42 which is a problem because the read request at PSN 41 has been skipped over. So when req_retry() tries to retransmit the read request, it sets the req psn to 42 which is incorrect.
When retrying a read request, calculate the number of psns completed based on the dma resid instead of the wqe first_psn. The wqe first_psn could have moved if the read request was retried multiple times.
Set the reth length to the dma resid to handle read retries for the remaining partial data.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 21 ++++++++++++++++----- drivers/infiniband/sw/rxe/rxe_req.c | 15 +++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +16 -5
@@ -254,6 +254,17 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,case IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE :if (pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE && pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_LAST ) { +/* read retries of partial data may restart from +* read response first or response only. +*/ +if ((pkt->psn == wqe->first_psn && + pkt->opcode == +IB_OPCODE_RC_RDMA_READ_RESPONSE_FIRST ) || + (wqe->first_psn == wqe->last_psn && + pkt->opcode == +IB_OPCODE_RC_RDMA_READ_RESPONSE_ONLY )) +break ; +return COMPST_ERROR ; }break ;
@@ -500,11 +511,11 @@ static inline enum comp_state complete_wqe(struct rxe_qp *qp, struct rxe_pkt_info *pkt, struct rxe_send_wqe *wqe) { - qp->comp.opcode = -1; - -if (pkt) { -if (psn_compare (pkt->psn, qp->comp.psn) >=0 ) - qp->comp.psn = (pkt->psn +1 ) &BTH_PSN_MASK ; +if (pkt && wqe->state == wqe_state_pending) { +if (psn_compare (wqe->last_psn, qp->comp.psn) >=0 ) { + qp->comp.psn = (wqe->last_psn +1 ) &BTH_PSN_MASK ; + qp->comp.opcode =-1 ; + }if (qp->req.wait_psn) { qp->req.wait_psn =0 ;
drivers/infiniband/sw/rxe/rxe_req.c +9 -6
@@ -73,9 +73,6 @@ static void req_retry(struct rxe_qp *qp)int npsn;int first =1 ; - wqe =queue_head (qp->sq.queue); - npsn = (qp->comp.psn - wqe->first_psn) &BTH_PSN_MASK ; - qp->req.wqe_index =consumer_index (qp->sq.queue); qp->req.psn = qp->comp.psn; qp->req.opcode =-1 ;
@@ -107,11 +104,17 @@ static void req_retry(struct rxe_qp *qp)if (first) { first =0 ; -if (mask &WR_WRITE_OR_SEND_MASK ) +if (mask &WR_WRITE_OR_SEND_MASK ) { + npsn = (qp->comp.psn - wqe->first_psn) & +BTH_PSN_MASK ;retry_first_write_send (qp, wqe, mask, npsn); + } -if (mask &WR_READ_MASK ) +if (mask &WR_READ_MASK ) { + npsn = (wqe->dma.length - wqe->dma.resid) / + qp->mtu; wqe->iova += npsn * qp->mtu; + } } wqe->state = wqe_state_posted;
@@ -435,7 +438,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,if (pkt->mask &RXE_RETH_MASK ) {reth_set_rkey (pkt, ibwr->wr.rdma.rkey);reth_set_va (pkt, wqe->iova); -reth_set_len (pkt, wqe->dma.length); +reth_set_len (pkt, wqe->dma.resid); }if (pkt->mask &RXE_IMMDT_MASK )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/422 iwlwifi: drop packets with bad status in CD
In reply to Greg Kroah-HartmanFrom: Sara Sharon <[email protected]>
[ Upstream commit 7891965d74bc48fb42b5068033192f97c9aa2090 ]
We need to drop packets with errors (such as replay, MIC, ICV, conversion, duplicate and so on).
Drop invalid packets, put the status bits in the metadata and move the enum definition to the correct place (FW API header).
--- .../net/wireless/intel/iwlwifi/fw/api/rx.h | 63 +++++++++++++++++++ .../net/wireless/intel/iwlwifi/iwl-trans.h | 1 + .../wireless/intel/iwlwifi/pcie/internal.h | 60 ------------------ drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 8 ++- 4 files changed, 70 insertions(+), 62 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/api/rx.h +63 -0
@@ -574,6 +574,69 @@ struct iwl_rx_mpdu_desc {#define IWL_RX_DESC_SIZE_V1 offsetofend(struct iwl_rx_mpdu_desc, v1) +#define IWL_CD_STTS_OPTIMIZED_POS 0 +#define IWL_CD_STTS_OPTIMIZED_MSK 0x01 +#define IWL_CD_STTS_TRANSFER_STATUS_POS 1 +#define IWL_CD_STTS_TRANSFER_STATUS_MSK 0x0E +#define IWL_CD_STTS_WIFI_STATUS_POS 4 +#define IWL_CD_STTS_WIFI_STATUS_MSK 0xF0 + +/** +* enum iwl_completion_desc_transfer_status - transfer status (bits 1-3) +* @IWL_CD_STTS_UNUSED: unused +* @IWL_CD_STTS_UNUSED_2: unused +* @IWL_CD_STTS_END_TRANSFER: successful transfer complete. +* In sniffer mode, when split is used, set in last CD completion. (RX) +* @IWL_CD_STTS_OVERFLOW: In sniffer mode, when using split - used for +* all CD completion. (RX) +* @IWL_CD_STTS_ABORTED: CR abort / close flow. (RX) +* @IWL_CD_STTS_ERROR: general error (RX) +*/ +enum iwl_completion_desc_transfer_status { +IWL_CD_STTS_UNUSED , +IWL_CD_STTS_UNUSED_2 , +IWL_CD_STTS_END_TRANSFER , +IWL_CD_STTS_OVERFLOW , +IWL_CD_STTS_ABORTED , +IWL_CD_STTS_ERROR , +}; + +/** +* enum iwl_completion_desc_wifi_status - wifi status (bits 4-7) +* @IWL_CD_STTS_VALID: the packet is valid (RX) +* @IWL_CD_STTS_FCS_ERR: frame check sequence error (RX) +* @IWL_CD_STTS_SEC_KEY_ERR: error handling the security key of rx (RX) +* @IWL_CD_STTS_DECRYPTION_ERR: error decrypting the frame (RX) +* @IWL_CD_STTS_DUP: duplicate packet (RX) +* @IWL_CD_STTS_ICV_MIC_ERR: MIC error (RX) +* @IWL_CD_STTS_INTERNAL_SNAP_ERR: problems removing the snap (RX) +* @IWL_CD_STTS_SEC_PORT_FAIL: security port fail (RX) +* @IWL_CD_STTS_BA_OLD_SN: block ack received old SN (RX) +* @IWL_CD_STTS_QOS_NULL: QoS null packet (RX) +* @IWL_CD_STTS_MAC_HDR_ERR: MAC header conversion error (RX) +* @IWL_CD_STTS_MAX_RETRANS: reached max number of retransmissions (TX) +* @IWL_CD_STTS_EX_LIFETIME: exceeded lifetime (TX) +* @IWL_CD_STTS_NOT_USED: completed but not used (RX) +* @IWL_CD_STTS_REPLAY_ERR: pn check failed, replay error (RX) +*/ +enum iwl_completion_desc_wifi_status { +IWL_CD_STTS_VALID , +IWL_CD_STTS_FCS_ERR , +IWL_CD_STTS_SEC_KEY_ERR , +IWL_CD_STTS_DECRYPTION_ERR , +IWL_CD_STTS_DUP , +IWL_CD_STTS_ICV_MIC_ERR , +IWL_CD_STTS_INTERNAL_SNAP_ERR , +IWL_CD_STTS_SEC_PORT_FAIL , +IWL_CD_STTS_BA_OLD_SN , +IWL_CD_STTS_QOS_NULL , +IWL_CD_STTS_MAC_HDR_ERR , +IWL_CD_STTS_MAX_RETRANS , +IWL_CD_STTS_EX_LIFETIME , +IWL_CD_STTS_NOT_USED , +IWL_CD_STTS_REPLAY_ERR , +}; +struct iwl_frame_release {u8 baid;u8 reserved;
drivers/net/wireless/intel/iwlwifi/iwl-trans.h +1 -0
@@ -269,6 +269,7 @@ struct iwl_rx_cmd_buffer {bool _page_stolen;u32 _rx_page_order;unsigned int truesize; +u8 status; };static inline void *rxb_addr (struct iwl_rx_cmd_buffer *r)
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +0 -60
66 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/pcie/rx.c +6 -2
@@ -1198,7 +1198,8 @@ static void iwl_pcie_rx_reuse_rbd(struct iwl_trans *trans,static void iwl_pcie_rx_handle_rb (struct iwl_trans *trans,struct iwl_rxq *rxq,struct iwl_rx_mem_buffer *rxb, -bool emergency) +bool emergency, +int i) {struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans);struct iwl_txq *txq = trans_pcie->txq[trans_pcie->cmd_queue];
@@ -1224,6 +1225,9 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans, .truesize = max_len, }; +if (trans->cfg->device_family >=IWL_DEVICE_FAMILY_22560 ) + rxcb.status = rxq->cd[i].status; + pkt =rxb_addr (&rxcb);if (pkt->len_n_flags ==cpu_to_le32 (FH_RSCSR_FRAME_INVALID )) {
@@ -1430,7 +1434,7 @@ restart: goto out;IWL_DEBUG_RX (trans,"Q %d: HW = %d, SW = %d\n" , rxq->id, r, i); -iwl_pcie_rx_handle_rb (trans, rxq, rxb, emergency); +iwl_pcie_rx_handle_rb (trans, rxq, rxb, emergency, i); i = (i +1 ) & (rxq->queue_size -1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/422 iwlwifi: dont WARN on trying to dump dead firmware
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 84f260251ed8153e84c64eb2c5278ab18d3ddef6 ]
There's no point in warning here, the user will just get an error back to the debugfs file write, and warning just makes it seem like there's an internal consistency problem when in reality the user just happened to hit this at a bad time. Remove the warning.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +3 -4
@@ -1016,7 +1016,7 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,* If the loading of the FW completed successfully, the next step is to * get the SMEM config data. Thus, if fwrt->smem_cfg.num_lmacs is non * zero, the FW was already loaded successully. If the state is "NO_FW" -* in such a case - WARN and exit, since FW may be dead. Otherwise, we +* in such a case - exit, since FW may be dead. Otherwise, we * can try to collect the data, since FW might just not be fully * loaded (no "ALIVE" yet), and the debug data is accessible. *
@@ -1024,9 +1024,8 @@ int iwl_fw_dbg_collect_desc(struct iwl_fw_runtime *fwrt,* config. In such a case, due to HW access problems, we might * collect garbage. */ -if (WARN ((fwrt->trans->state ==IWL_TRANS_NO_FW ) && - fwrt->smem_cfg.num_lmacs, -"Can't collect dbg data when FW isn't alive\n" )) +if (fwrt->trans->state ==IWL_TRANS_NO_FW && + fwrt->smem_cfg.num_lmacs)return -EIO ;if (test_and_set_bit (IWL_FWRT_STATUS_DUMPING , &fwrt->status))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/422 iwlwifi: mvm: avoid sending too many BARs
In reply to Greg Kroah-HartmanFrom: Sara Sharon <[email protected]>
[ Upstream commit 1a19c139be18ed4d6d681049cc48586fae070120 ]
When we receive TX response, we may release a few packets due to a hole that was closed in the transmission window.
However, if that frame failed, we will mark all the released frames as failed and will send multiple BARs.
This affects statistics badly, and cause unnecessary frames transmission.
Instead, mark all the following packets as success, with the desired result of sending a bar for the failed frame only.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +8 -0
@@ -1438,6 +1438,14 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm,break ; } +/* +* If we are freeing multiple frames, mark all the frames +* but the first one as acked, since they were acknowledged +* before +* */ +if (skb_freed >1 ) + info->flags |=IEEE80211_TX_STAT_ACK ; +iwl_mvm_tx_status_check_trigger (mvm, status); info->status.rates[0 ].count = tx_resp->failure_frame +1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/422 media: vicodec: fix out-of-range values when decoding
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit be5a1509af8dd8a78fea24a35fe4a82d4cd0ae70 ]
While decoding you need to make sure you do not get values < 0 or > 255. Note that since this code will also be used in userspace utilities the clamp macro isn't used since that is kernel-only.
--- drivers/media/platform/vicodec/vicodec-codec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/platform/vicodec/vicodec-codec.c +8 -2
@@ -588,8 +588,14 @@ static void fill_decoder_block(u8 *dst, const s16 *input, int stride)int i, j;for (i =0 ; i <8 ; i++) { -for (j =0 ; j <8 ; j++) - *dst++ = *input++; +for (j =0 ; j <8 ; j++, input++, dst++) { +if (*input <0 ) + *dst =0 ; +else if (*input >255 ) + *dst =255 ; +else + *dst = *input; + } dst += stride -8 ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/422 media: i2c: Fix pm_runtime_get_if_in_use() usage in sensor drivers
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit 4d471563d87b2b83e73b8abffb9273950e6d2e36 ]
pm_runtime_get_if_in_use() returns -EINVAL if runtime PM is disabled. This should not be considered an error. Generally the driver has enabled runtime PM already so getting this error due to runtime PM being disabled will not happen.
Instead of checking for lesser or equal to zero, check for zero only. Address this for drivers where this pattern exists.
This patch has been produced using the following command:
$ git grep -l pm_runtime_get_if_in_use -- drivers/media/i2c/ | \ xargs perl -i -pe 's/(pm_runtime_get_if_in_use\(.*\)) \<\= 0/!$1/'
--- drivers/media/i2c/ov13858.c | 2 +- drivers/media/i2c/ov2685.c | 2 +- drivers/media/i2c/ov5670.c | 2 +- drivers/media/i2c/ov5695.c | 2 +- drivers/media/i2c/ov7740.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/media/i2c/ov13858.c +1 -1
@@ -1230,7 +1230,7 @@ static int ov13858_set_ctrl(struct v4l2_ctrl *ctrl)* Applying V4L2 control value only happens * when power is up for streaming */ -if (pm_runtime_get_if_in_use (&client->dev) <=0 ) +if (!pm_runtime_get_if_in_use (&client->dev))return 0 ; ret =0 ;
drivers/media/i2c/ov2685.c +1 -1
@@ -549,7 +549,7 @@ static int ov2685_set_ctrl(struct v4l2_ctrl *ctrl)break ; } -if (pm_runtime_get_if_in_use (&client->dev) <=0 ) +if (!pm_runtime_get_if_in_use (&client->dev))return 0 ;switch (ctrl->id) {
drivers/media/i2c/ov5670.c +1 -1
@@ -2016,7 +2016,7 @@ static int ov5670_set_ctrl(struct v4l2_ctrl *ctrl) }/* V4L2 controls values will be applied only when power is already up */ -if (pm_runtime_get_if_in_use (&client->dev) <=0 ) +if (!pm_runtime_get_if_in_use (&client->dev))return 0 ;switch (ctrl->id) {
drivers/media/i2c/ov5695.c +1 -1
@@ -1110,7 +1110,7 @@ static int ov5695_set_ctrl(struct v4l2_ctrl *ctrl)break ; } -if (pm_runtime_get_if_in_use (&client->dev) <=0 ) +if (!pm_runtime_get_if_in_use (&client->dev))return 0 ;switch (ctrl->id) {
drivers/media/i2c/ov7740.c +1 -1
@@ -510,7 +510,7 @@ static int ov7740_set_ctrl(struct v4l2_ctrl *ctrl)int ret;u8 val =0 ; -if (pm_runtime_get_if_in_use (&client->dev) <=0 ) +if (!pm_runtime_get_if_in_use (&client->dev))return 0 ;switch (ctrl->id) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/422 media: ov772x: Disable clk on error path
In reply to Greg Kroah-HartmanFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit 1d18c2cd9d38ad639b2e00546b9ee638f2cef4b0 ]
If ov772x_power_on() is unable to get GPIO rstb,
the clock is left undisabled.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/i2c/ov772x.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/ov772x.c +1 -0
@@ -896,6 +896,7 @@ static int ov772x_power_on(struct ov772x_priv *priv) GPIOD_OUT_LOW);if (IS_ERR (priv->rstb_gpio)) {dev_info (&client->dev,"Unable to get GPIO \"reset\"" ); +clk_disable_unprepare (priv->clk);return PTR_ERR (priv->rstb_gpio); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/422 ARM: dts: pxa: fix the rtc controller
In reply to Greg Kroah-HartmanFrom: Robert Jarzmik <[email protected]>
[ Upstream commit 24a610eba32a80ed778ea79680b600c3fe73d7de ]
The RTC controller is fed by an external fixed 32kHz clock. Yet the driver wants to acquire this clock, even though it doesn't make any use of it, ie. doesn't get the rate to make calculation.
Therefore, use the exported 32.768kHz clock in the PXA clock tree to make the driver happy and working.
--- arch/arm/boot/dts/pxa25x.dtsi | 4 ++++ arch/arm/boot/dts/pxa27x.dtsi | 4 ++++ 2 files changed, 8 insertions(+)
arch/arm/boot/dts/pxa25x.dtsi +4 -0
@@ -80,6 +80,10 @@ #pwm-cells = <1>; clocks = <&clks CLK_PWM1>; }; + + rtc@40900000 { + clocks = <&clks CLK_OSC32k768>; + }; }; timer@40a00000 {
arch/arm/boot/dts/pxa27x.dtsi +4 -0
@@ -113,6 +113,10 @@ status = "disabled"; }; + + rtc@40900000 { + clocks = <&clks CLK_OSC32k768>; + }; }; clocks {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/422 ARM: dts: pxa: fix power i2c base address
In reply to Greg Kroah-HartmanFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit 8a1ecc01a473b75ab97be9b36f623e4551a6e9ae ]
There is one too many zeroes in the Power I2C base address. Fix this.
--- arch/arm/boot/dts/pxa27x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa27x.dtsi +1 -1
@@ -71,7 +71,7 @@ clocks = <&clks CLK_PWM1>; }; - pwri2c: i2c@40f000180 { + pwri2c: i2c@40f00180 { compatible = "mrvl,pxa-i2c"; reg = <0x40f00180 0x24>; interrupts = <6>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/422 rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
[ Upstream commit 199ba9faca909e77ac533449ecd1248123ce89e7 ]
In gcc8, when the 3rd argument (size) of a call to strncpy() matches the length of the first argument, the compiler warns of the possibility of an unterminated string. Using strlcpy() forces a null at the end.
--- drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c +1 -1
@@ -146,7 +146,7 @@ static int rtl8187_register_led(struct ieee80211_hw *dev, led->dev = dev; led->ledpin = ledpin; led->is_radio = is_radio; -strncpy (led->name, name,sizeof (led->name)); +strlcpy (led->name, name,sizeof (led->name)); led->led_dev.name = led->name; led->led_dev.default_trigger = default_trigger;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/422 mwifiex: do no submit URB in suspended state
In reply to Greg Kroah-HartmanFrom: Ganapathi Bhat <[email protected]>
[ Upstream commit 7bd4628c2f31c51254aa39628ecae521d00d0b90 ]
There is a possible race between USB suspend and main thread:
1. After processing the command response, main thread will submit rx_cmd URB back so as to process next command response, by calling mwifiex_usb_submit_rx_urb.
2. During USB suspend, the suspend handler will check if rx_cmd URB is pending(submitted) and if true, kill this URB.
There is a possible race between #1 and #2, where rx_cmd URB will be submitted by main thread(#1) after the suspend handler check in #2.
To fix this, check if device is already suspended in mwifiex_usb_submit_rx_urb, in which case do not submit the URB.
--- drivers/net/wireless/marvell/mwifiex/usb.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/marvell/mwifiex/usb.c +7 -0
@@ -298,6 +298,13 @@ static int mwifiex_usb_submit_rx_urb(struct urb_context *ctx, int size)struct mwifiex_adapter *adapter = ctx->adapter;struct usb_card_rec *card = (struct usb_card_rec *)adapter->card; +if (test_bit (MWIFIEX_IS_SUSPENDED , &adapter->work_flags)) { +mwifiex_dbg (adapter,ERROR , +"%s: card removed/suspended, EP %d rx_cmd URB submit skipped\n" , + __func__, ctx->ep); +return -1 ; + } +if (card->rx_cmd_ep != ctx->ep) { ctx->skb =dev_alloc_skb (size);if (!ctx->skb) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/422 mwifex: free rx_cmd skb in suspended state
In reply to Greg Kroah-HartmanFrom: Ganapathi Bhat <[email protected]>
[ Upstream commit 33a164fa8a4c91408e0b7738f754cb1a7827c5f2 ]
USB suspend handler will kill the presubmitted rx_cmd URB. This triggers a call to the corresponding URB complete handler, which will free the rx_cmd skb, associated with rx_cmd URB. Due to a possible race betwen suspend handler and main thread, depicted in 'commit bfcacac6c84b ("mwifiex: do no submit URB in suspended state")', it is possible that the rx_cmd skb will fail to get freed. This causes a memory leak, since the resume handler will always allocate a new rx_cmd skb.
To fix this, free the rx_cmd skb in mwifiex_usb_submit_rx_urb, if the device is in suspended state.
--- drivers/net/wireless/marvell/mwifiex/usb.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/marvell/mwifiex/usb.c +6 -0
@@ -299,6 +299,12 @@ static int mwifiex_usb_submit_rx_urb(struct urb_context *ctx, int size)struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;if (test_bit (MWIFIEX_IS_SUSPENDED , &adapter->work_flags)) { +if (card->rx_cmd_ep == ctx->ep) { +mwifiex_dbg (adapter,INFO ,"%s: free rx_cmd skb\n" , + __func__); +dev_kfree_skb_any (ctx->skb); + ctx->skb =NULL ; + }mwifiex_dbg (adapter,ERROR ,"%s: card removed/suspended, EP %d rx_cmd URB submit skipped\n" , __func__, ctx->ep);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/422 brcmfmac: fix wrong strnchr usage
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit cb18e2e9ec71d42409a51b83546686c609780dde ]
strnchr takes arguments in the order of its name: string, max bytes to read, character to search for. Here we're passing '\n' aka 10 as the buffer size, and searching for sizeof(buf) aka BRCMF_DCMD_SMLEN aka 256 (aka '\0', since it's implicitly converted to char) within those 10 bytes.
Just interchanging the last two arguments would still leave a bug, because if we've been successful once, there are not sizeof(buf) characters left after the new value of p.
Since clmver is immediately afterwards passed as a %s argument, I assume that it is actually a properly nul-terminated string. For that case, we have strreplace().
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +1 -3
@@ -296,9 +296,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)/* Replace all newline/linefeed characters with space * character */ - ptr = clmver; -while ((ptr =strnchr (ptr,'\n' ,sizeof (buf))) !=NULL ) - *ptr =' ' ; +strreplace (clmver,'\n' ,' ' );brcmf_dbg (INFO ,"CLM version = %s\n" , clmver); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/422 mt76: Fix comparisons with invalid hardware key index
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 81c8eccc2404d06082025b773f1d90e8c861bc6a ]
With gcc 4.1.2:
drivers/net/wireless/mediatek/mt76/mt76x0/tx.c: In function ‘mt76x0_tx’:
drivers/net/wireless/mediatek/mt76/mt76x0/tx.c:169: warning: comparison is always true due to limited range of data type drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c: In function ‘mt76x2_tx’:
drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c:35: warning: comparison is always true due to limited range of data type
While assigning -1 to a u8 works fine, comparing with -1 does not work as expected.
Fix this by comparing with 0xff, like is already done in some other places.
--- drivers/net/wireless/mediatek/mt76/mt76x0/tx.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/tx.c +1 -1
@@ -166,7 +166,7 @@ void mt76x0_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,if (sta) { msta = (struct mt76_sta *) sta->drv_priv; wcid = &msta->wcid; - }else if (vif && (!info->control.hw_key && wcid->hw_key_idx !=-1 )) { + }else if (vif && (!info->control.hw_key && wcid->hw_key_idx !=0xff )) {struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv; wcid = &mvif->group_wcid;
drivers/net/wireless/mediatek/mt76/mt76x2_tx_common.c +1 -1
@@ -32,7 +32,7 @@ void mt76x2_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, msta = (struct mt76x2_sta *)control->sta->drv_priv; wcid = &msta->wcid;/* sw encrypted frames */ -if (!info->control.hw_key && wcid->hw_key_idx !=-1 ) +if (!info->control.hw_key && wcid->hw_key_idx !=0xff ) control->sta =NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/422 soc: imx: gpc: fix PDN delay
In reply to Greg Kroah-HartmanFrom: Sven Schmitt <[email protected]>
[ Upstream commit 9f4d61d531e0efc9c3283963ae5ef7e314579191 ]
imx6_pm_domain_power_off() reads iso and iso2sw from GPC_PGC_PUPSCR_OFFS which stores the power up delays.
So use GPC_PGC_PDNSCR_OFFS for the correct delays.
--- drivers/soc/imx/gpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/imx/gpc.c +1 -1
@@ -69,7 +69,7 @@ static int imx6_pm_domain_power_off(struct generic_pm_domain *genpd)u32 val;/* Read ISO and ISO2SW power down delays */ -regmap_read (pd->regmap, pd->reg_offs +GPC_PGC_PUPSCR_OFFS , &val); +regmap_read (pd->regmap, pd->reg_offs +GPC_PGC_PDNSCR_OFFS , &val); iso = val &0x3f ; iso2sw = (val >>8 ) &0x3f ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/422 ASoC: rsnd: ssi: Fix issue in dma data address assignment
In reply to Greg Kroah-HartmanFrom: Jiada Wang <[email protected]>
[ Upstream commit 0e289012b47a2de1f029a6b61c75998e2f159dd9 ]
Same SSI device may be used in different dai links, by only having one dma struct in rsnd_ssi, after the first instance's dma config be initilized, the following instances can no longer configure dma, this causes issue, when their dma data address are different from the first instance.
--- sound/soc/sh/rcar/rsnd.h | 1 + sound/soc/sh/rcar/ssi.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
sound/soc/sh/rcar/rsnd.h +1 -0
@@ -438,6 +438,7 @@ struct rsnd_dai_stream {char name[RSND_DAI_NAME_SIZE ];struct snd_pcm_substream *substream;struct rsnd_mod *mod[RSND_MOD_MAX ]; +struct rsnd_mod *dma;struct rsnd_dai *rdai;struct device *dmac_dev;/* for IPMMU */ u32 parent_ssi_status;
sound/soc/sh/rcar/ssi.c +1 -3
@@ -72,7 +72,6 @@struct rsnd_ssi {struct rsnd_mod mod; -struct rsnd_mod *dma;u32 flags;u32 cr_own;
@@ -873,7 +872,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); int ret;/*
@@ -888,7 +886,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,return ret;/* SSI probe might be called many times in MUX multi path */ - ret =rsnd_dma_attach (io, mod, &ssi->dma); + ret =rsnd_dma_attach (io, mod, &io->dma);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/422 net: hns3: Fix for multicast failure
In reply to Greg Kroah-HartmanFrom: Huazhong Tan <[email protected]>
[ Upstream commit fd5f9da3f6583046215d614a87792b46e55785e2 ]
When the lower 24 bits of the IPV6 link-local addresses at both ends are the same, the multicast MAC address for Neigbour Discovery is the same. The multicast for Neigbour Discovery will fail.
This patch fixes it by including the bonding uplink port in the multicast group.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +2 -2
@@ -4374,7 +4374,7 @@ int hclge_add_mc_addr_common(struct hclge_vport *vport,hnae3_set_bit (req.flags,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT0_EN_B ,0 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT1_EN_B ,1 ); -hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,0 ); +hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hclge_prepare_mac_addr (&req, addr); status =hclge_lookup_mac_vlan_tbl (vport, &req, desc, true);if (!status) {
@@ -4441,7 +4441,7 @@ int hclge_rm_mc_addr_common(struct hclge_vport *vport,hnae3_set_bit (req.flags,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT0_EN_B ,0 );hnae3_set_bit (req.entry_type,HCLGE_MAC_VLAN_BIT1_EN_B ,1 ); -hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,0 ); +hnae3_set_bit (req.mc_mac_en,HCLGE_MAC_VLAN_BIT0_EN_B ,1 );hclge_prepare_mac_addr (&req, addr); status =hclge_lookup_mac_vlan_tbl (vport, &req, desc, true);if (!status) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/422 net: hns3: Fix error of checking used vlan id
In reply to Greg Kroah-HartmanFrom: Jian Shen <[email protected]>
[ Upstream commit 54e97d117bafa161b08c6ade243a335d92890d94 ]
PF uses hdev->vlan_table to manage the port vlan table. In function hclge_set_vlan_filter_hw(), it checks whether a vlan id has been used, by foreach all the vport bits. It should use macro HCLGE_VPORT_NUM, not VLAN_N_VID as the foreach condition.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -1
@@ -4784,7 +4784,7 @@ static int hclge_set_vlan_filter_hw(struct hclge_dev *hdev, __be16 proto,return -EINVAL ; } -for_each_set_bit (vport_idx, hdev->vlan_table[vlan_id],VLAN_N_VID ) +for_each_set_bit (vport_idx, hdev->vlan_table[vlan_id],HCLGE_VPORT_NUM ) vport_num++;if ((is_kill && vport_num ==0 ) || (!is_kill && vport_num ==1 ))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/422 net: hns3: Fix for loopback selftest failed problem
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 0f29fc23b21d3cbd966537bfabba07c00466b787 ]
Tqp and mac need to be enabled when doing loopback selftest, ae_algo->ops->start/stop is used to do the job, there is a time window between ae_algo->ops->start/stop and loopback setup, which will cause selftest failed problem when there is frame coming in during that time window.
This patch fixes it by enabling the tqp and mac during loopback setup process.
--- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 17 +------ .../hisilicon/hns3/hns3pf/hclge_main.c | 51 +++++++++++-------- 2 files changed, 31 insertions(+), 37 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +1 -16
@@ -100,41 +100,26 @@ static int hns3_lp_up(struct net_device *ndev, enum hnae3_loop loop_mode)struct hnae3_handle *h =hns3_get_handle (ndev);int ret; -if (!h->ae_algo->ops->start) -return -EOPNOTSUPP ; - ret =hns3_nic_reset_all_ring (h);if (ret)return ret; - ret = h->ae_algo->ops->start (h); -if (ret) { -netdev_err (ndev, -"hns3_lb_up ae start return error: %d\n" , ret); -return ret; - } - ret =hns3_lp_setup (ndev, loop_mode, true);usleep_range (10000 ,20000 ); -return ret; +return 0 ; }static int hns3_lp_down (struct net_device *ndev,enum hnae3_loop loop_mode) { -struct hnae3_handle *h =hns3_get_handle (ndev);int ret; -if (!h->ae_algo->ops->stop) -return -EOPNOTSUPP ; - ret =hns3_lp_setup (ndev, loop_mode, false);if (ret) {netdev_err (ndev,"lb_setup return error: %d\n" , ret);return ret; } - h->ae_algo->ops->stop (h);usleep_range (10000 ,20000 );return 0 ;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +30 -21
78 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/422 net: hns3: Change the dst mac addr of loopback packet
In reply to Greg Kroah-HartmanFrom: Yunsheng Lin <[email protected]>
[ Upstream commit 7f7d9e501f4123e64b130576621d24f9379adc8f ]
Currently, the dst mac addr of loopback packet is the same as the host' mac addr, the SSU component may loop back the packet to host before the packet reaches mac or serdes, which will defect the purpose of mac or serdes selftest.
This patch changes it by adding 0x1f to the last byte of dst mac addr.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +1 -0
@@ -137,6 +137,7 @@ static void hns3_lp_setup_skb(struct sk_buff *skb) packet =skb_put (skb,HNS3_NIC_LB_TEST_PACKET_SIZE );memcpy (ethh->h_dest, ndev->dev_addr,ETH_ALEN ); + ethh->h_dest[5 ] +=0x1f ;eth_zero_addr (ethh->h_source); ethh->h_proto =htons (ETH_P_ARP );skb_reset_mac_header (skb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/422 net/mlx5: Fix atomic_mode enum values
In reply to Greg Kroah-HartmanFrom: Moni Shoua <[email protected]>
[ Upstream commit aa7e80b220f3a543eefbe4b7e2c5d2b73e2e2ef7 ]
The field atomic_mode is 4 bits wide and therefore can hold values from 0x0 to 0xf. Remove the unnecessary 20 bit shift that made the values be incorrect. While that, remove unused enum values.
--- include/linux/mlx5/driver.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
include/linux/mlx5/driver.h +1 -4
@@ -163,10 +163,7 @@ enum mlx5_dcbx_oper_mode { };enum mlx5_dct_atomic_mode { -MLX5_ATOMIC_MODE_DCT_OFF =20 , -MLX5_ATOMIC_MODE_DCT_NONE =0 <<MLX5_ATOMIC_MODE_DCT_OFF , -MLX5_ATOMIC_MODE_DCT_IB_COMP =1 <<MLX5_ATOMIC_MODE_DCT_OFF , -MLX5_ATOMIC_MODE_DCT_CX =2 <<MLX5_ATOMIC_MODE_DCT_OFF , +MLX5_ATOMIC_MODE_DCT_CX =2 , };enum {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/422 net: phy: mscc: read vsc8531,vddmac as an u32
In reply to Greg Kroah-HartmanFrom: Quentin Schulz <[email protected]>
[ Upstream commit a993e0f583c7925adaa7721226ccd7a41e7e63d1 ]
In the DT binding, it is specified nowhere that 'vsc8531,vddmac' is an u16, even though it's read as an u16 in the driver.
Let's update the driver to take into consideration that the 'vsc8531,vddmac' property is of the default type u32.
--- drivers/net/phy/mscc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/phy/mscc.c +3 -3
@@ -111,7 +111,7 @@ struct vsc8531_private {#ifdef CONFIG_OF_MDIO struct vsc8531_edge_rate_table { -u16 vddmac; +u32 vddmac;u8 slowdown[8 ]; };
@@ -376,7 +376,7 @@ out_unlock:static int vsc85xx_edge_rate_magic_get (struct phy_device *phydev) {u8 sd; -u16 vdd; +u32 vdd;int rc, i, j;struct device *dev = &phydev->mdio.dev;struct device_node *of_node = dev->of_node;
@@ -385,7 +385,7 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)if (!of_node)return -ENODEV ; - rc =of_property_read_u16 (of_node,"vsc8531,vddmac" , &vdd); + rc =of_property_read_u32 (of_node,"vsc8531,vddmac" , &vdd);if (rc !=0 ) vdd =MSCC_VDDMAC_3300 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/422 net: phy: mscc: read vsc8531, edge-slowdown as an u32
In reply to Greg Kroah-HartmanFrom: Quentin Schulz <[email protected]>
[ Upstream commit 36c53cf0f46526b898390659b125155939f67892 ]
In the DT binding, it is specified nowhere that 'vsc8531,edge-slowdown' is an u8, even though it's read as an u8 in the driver.
Let's update the driver to take into consideration that the 'vsc8531,edge-slowdown' property is of the default type u32.
--- drivers/net/phy/mscc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/phy/mscc.c +3 -4
@@ -112,7 +112,7 @@ struct vsc8531_private {#ifdef CONFIG_OF_MDIO struct vsc8531_edge_rate_table {u32 vddmac; -u8 slowdown[8 ]; +u32 slowdown[8 ]; }; static const struct vsc8531_edge_rate_table edge_table[] = {
@@ -375,8 +375,7 @@ out_unlock:#ifdef CONFIG_OF_MDIO static int vsc85xx_edge_rate_magic_get (struct phy_device *phydev) { -u8 sd; -u32 vdd; +u32 vdd, sd;int rc, i, j;struct device *dev = &phydev->mdio.dev;struct device_node *of_node = dev->of_node;
@@ -389,7 +388,7 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)if (rc !=0 ) vdd =MSCC_VDDMAC_3300 ; - rc =of_property_read_u8 (of_node,"vsc8531,edge-slowdown" , &sd); + rc =of_property_read_u32 (of_node,"vsc8531,edge-slowdown" , &sd);if (rc !=0 ) sd =0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/422 ARM: dts: meson8: fix the clock controller register size
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit f7f9da89bc4f61e33f7b9f5c75c4efdc1f0455d8 ]
The clock controller registers are not 0x460 wide because the reset controller starts at CBUS 0x4404. This currently overlaps with the clock controller (which is at CBUS 0x4000).
There is no public documentation available on the actual size of the clock controller's register area (also called "HHI"). However, in Amlogic's GPL kernel sources the last "HHI" register is HHI_HDMI_PHY_CNTL2 at CBUS + 0x43a8. 0x400 was chosen because that size doesn't seem unlikely.
--- arch/arm/boot/dts/meson8.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/meson8.dtsi +1 -1
@@ -194,7 +194,7 @@ #clock-cells = <1>; #reset-cells = <1>; compatible = "amlogic,meson8-clkc"; - reg = <0x8000 0x4>, <0x4000 0x460>; + reg = <0x8000 0x4>, <0x4000 0x400>; }; reset: reset-controller@4404 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/422 ARM: dts: meson8b: fix the clock controller register size
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit f31094fe8c16fbd2ca47921acf93b744b045aace ]
The clock controller registers are not 0x460 wide because the reset controller starts at CBUS 0x4404. This currently overlaps with the clock controller (which is at CBUS 0x4000).
There is no public documentation available on the actual size of the clock controller's register area (also called "HHI"). However, in Amlogic's GPL kernel sources the last "HHI" register is HHI_HDMI_PHY_CNTL2 at CBUS + 0x43a8. 0x400 was chosen because that size doesn't seem unlikely.
--- arch/arm/boot/dts/meson8b.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/meson8b.dtsi +1 -1
@@ -163,7 +163,7 @@ #clock-cells = <1>; #reset-cells = <1>; compatible = "amlogic,meson8b-clkc"; - reg = <0x8000 0x4>, <0x4000 0x460>; + reg = <0x8000 0x4>, <0x4000 0x400>; }; reset: reset-controller@4404 {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/422 mtd: rawnand: marvell: use regmap_update_bits() for syscon access
In reply to Greg Kroah-HartmanFrom: Thomas Petazzoni <[email protected]>
[ Upstream commit 88aa3bbfc020d14b13d67af3f5c08aa992d82cd8 ]
The marvell_nfc_init() function fiddles with some bits of a system controller on Armada 7K/8K. However, it does a read/modify/write sequence on GENCONF_CLK_GATING_CTRL and GENCONF_ND_CLK_CTRL, which isn't safe from a concurrency point of view, as the regmap lock isn't taken accross the read/modify/write sequence. To solve this issue, use regmap_update_bits().
While at it, since the "reg" variable is no longer needed for the read/modify/write sequences, get rid of it for the regmap_write() to GENCONF_SOC_DEVICE_MUX, and directly pass the value to be written as argument.
--- drivers/mtd/nand/raw/marvell_nand.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/mtd/nand/raw/marvell_nand.c +11 -12
@@ -2710,24 +2710,23 @@ static int marvell_nfc_init(struct marvell_nfc *nfc)struct regmap *sysctrl_base =syscon_regmap_lookup_by_phandle (np,"marvell,system-controller" ); -u32 reg;if (IS_ERR (sysctrl_base))return PTR_ERR (sysctrl_base); - reg =GENCONF_SOC_DEVICE_MUX_NFC_EN | -GENCONF_SOC_DEVICE_MUX_ECC_CLK_RST | -GENCONF_SOC_DEVICE_MUX_ECC_CORE_RST | -GENCONF_SOC_DEVICE_MUX_NFC_INT_EN ; -regmap_write (sysctrl_base,GENCONF_SOC_DEVICE_MUX , reg); +regmap_write (sysctrl_base,GENCONF_SOC_DEVICE_MUX , +GENCONF_SOC_DEVICE_MUX_NFC_EN | +GENCONF_SOC_DEVICE_MUX_ECC_CLK_RST | +GENCONF_SOC_DEVICE_MUX_ECC_CORE_RST | +GENCONF_SOC_DEVICE_MUX_NFC_INT_EN ); -regmap_read (sysctrl_base,GENCONF_CLK_GATING_CTRL , ®); - reg |=GENCONF_CLK_GATING_CTRL_ND_GATE ; -regmap_write (sysctrl_base,GENCONF_CLK_GATING_CTRL , reg); +regmap_update_bits (sysctrl_base,GENCONF_CLK_GATING_CTRL , +GENCONF_CLK_GATING_CTRL_ND_GATE , +GENCONF_CLK_GATING_CTRL_ND_GATE ); -regmap_read (sysctrl_base,GENCONF_ND_CLK_CTRL , ®); - reg |=GENCONF_ND_CLK_CTRL_EN ; -regmap_write (sysctrl_base,GENCONF_ND_CLK_CTRL , reg); +regmap_update_bits (sysctrl_base,GENCONF_ND_CLK_CTRL , +GENCONF_ND_CLK_CTRL_EN , +GENCONF_ND_CLK_CTRL_EN ); }/* Configure the DMA if appropriate */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/422 mtd: rawnand: fsl_ifc: check result of SRAM initialization
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit 434655af6a187129d8114640443b27d2cecfb979 ]
The SRAM initialization might fail. If that happens further NAND operations won't be successful. Therefore, the chip init routine should fail if the SRAM initialization didn't work.
--- drivers/mtd/nand/raw/fsl_ifc_nand.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/fsl_ifc_nand.c +13 -4
@@ -761,7 +761,7 @@ static const struct nand_controller_ops fsl_ifc_controller_ops = { .attach_chip = fsl_ifc_attach_chip, }; -static void fsl_ifc_sram_init (struct fsl_ifc_mtd *priv) +static int fsl_ifc_sram_init (struct fsl_ifc_mtd *priv) {struct fsl_ifc_ctrl *ctrl = priv->ctrl;struct fsl_ifc_runtime __iomem *ifc_runtime = ctrl->rregs;
@@ -805,12 +805,16 @@ static void fsl_ifc_sram_init(struct fsl_ifc_mtd *priv)wait_event_timeout (ctrl->nand_wait, ctrl->nand_stat,msecs_to_jiffies (IFC_TIMEOUT_MSECS )); -if (ctrl->nand_stat !=IFC_NAND_EVTER_STAT_OPC ) +if (ctrl->nand_stat !=IFC_NAND_EVTER_STAT_OPC ) {pr_err ("fsl-ifc: Failed to Initialise SRAM\n" ); +return -ETIMEDOUT ; + }/* Restore CSOR and CSOR_ext */ ifc_out32 (csor, &ifc_global->csor_cs[cs].csor);ifc_out32 (csor_ext, &ifc_global->csor_cs[cs].csor_ext); + +return 0 ; }static int fsl_ifc_chip_init (struct fsl_ifc_mtd *priv)
@@ -914,8 +918,13 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv) chip->ecc.algo =NAND_ECC_HAMMING ; } -if (ctrl->version >=FSL_IFC_VERSION_1_1_0 ) -fsl_ifc_sram_init (priv); +if (ctrl->version >=FSL_IFC_VERSION_1_1_0 ) { +int ret; + + ret =fsl_ifc_sram_init (priv); +if (ret) +return ret; + }/* * As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/422 mtd: rawnand: fsl_ifc: fixup SRAM init for newer ctrl versions
In reply to Greg Kroah-HartmanFrom: Kurt Kanzenbach <[email protected]>
[ Upstream commit ff8648f29fe58c2d94d32a076d2de7b92be4b485 ]
Newer versions of the IFC controller use a different method of initializing the internal SRAM: Instead of reading from flash, a bit in the NAND configuration register has to be set in order to trigger the self-initializing process.
--- drivers/mtd/nand/raw/fsl_ifc_nand.c | 33 +++++++++++++++++++++++------ include/linux/fsl_ifc.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-)
drivers/mtd/nand/raw/fsl_ifc_nand.c +26 -7
@@ -30,6 +30,7 @@#include <linux/mtd/partitions.h> #include <linux/mtd/nand_ecc.h> #include <linux/fsl_ifc.h> +#include <linux/iopoll.h> #define ERR_BYTE 0xFF/* Value returned for read bytes when read failed */
@@ -769,6 +770,27 @@ static int fsl_ifc_sram_init(struct fsl_ifc_mtd *priv)uint32_t csor =0 , csor_8k =0 , csor_ext =0 ;uint32_t cs = priv->bank; +if (ctrl->version <FSL_IFC_VERSION_1_1_0 ) +return 0 ; + +if (ctrl->version >FSL_IFC_VERSION_1_1_0 ) { +u32 ncfgr, status; +int ret; + +/* Trigger auto initialization */ + ncfgr =ifc_in32 (&ifc_runtime->ifc_nand.ncfgr); +ifc_out32 (ncfgr |IFC_NAND_NCFGR_SRAM_INIT_EN , &ifc_runtime->ifc_nand.ncfgr); + +/* Wait until done */ + ret =readx_poll_timeout (ifc_in32, &ifc_runtime->ifc_nand.ncfgr, + status, !(status &IFC_NAND_NCFGR_SRAM_INIT_EN ), +10 ,IFC_TIMEOUT_MSECS *1000 ); +if (ret) +dev_err (priv->dev,"Failed to initialize SRAM!\n" ); + +return ret; + } +/* Save CSOR and CSOR_ext */ csor =ifc_in32 (&ifc_global->csor_cs[cs].csor); csor_ext =ifc_in32 (&ifc_global->csor_cs[cs].csor_ext);
@@ -825,6 +847,7 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv)struct nand_chip *chip = &priv->chip;struct mtd_info *mtd =nand_to_mtd (&priv->chip);u32 csor; +int ret;/* Fill in fsl_ifc_mtd structure */ mtd->dev.parent = priv->dev;
@@ -918,13 +941,9 @@ static int fsl_ifc_chip_init(struct fsl_ifc_mtd *priv) chip->ecc.algo =NAND_ECC_HAMMING ; } -if (ctrl->version >=FSL_IFC_VERSION_1_1_0 ) { -int ret; - - ret =fsl_ifc_sram_init (priv); -if (ret) -return ret; - } + ret =fsl_ifc_sram_init (priv); +if (ret) +return ret;/* * As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
include/linux/fsl_ifc.h +2 -0
@@ -274,6 +274,8 @@*/ /* Auto Boot Mode */ #define IFC_NAND_NCFGR_BOOT 0x80000000 +/* SRAM Initialization */ +#define IFC_NAND_NCFGR_SRAM_INIT_EN 0x20000000/* Addressing Mode-ROW0+n/COL0 */ #define IFC_NAND_NCFGR_ADDR_MODE_RC0 0x00000000/* Addressing Mode-ROW0+n/COL0+n */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/422 mtd: rawnand: qcom: dont include dma-direct.h
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit ab0fb17c7d46406e1aac2dda265874751946626d ]
A recent commit removed the incorrect use of phys_to_dma from this driver, but failed to remove the dma-direct.h include, so do that now.
--- drivers/mtd/nand/raw/qcom_nandc.c | 1 - 1 file changed, 1 deletion(-)
drivers/mtd/nand/raw/qcom_nandc.c +0 -1
@@ -23,7 +23,6 @@#include <linux/of_device.h> #include <linux/delay.h> #include <linux/dma/qcom_bam_dma.h> -#include <linux/dma-direct.h> /* XXX: drivers shall never use this directly! */ /* NANDc reg offsets */ #define NAND_FLASH_CMD 0x00
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/422 IB/mlx5: Change TX affinity assignment in RoCE LAG mode
In reply to Greg Kroah-HartmanFrom: Majd Dibbiny <[email protected]>
[ Upstream commit c6a21c3864fc7f5febae7d096cd136f397c791f2 ]
In the current code, the TX affinity is per RoCE device, which can cause unfairness between different contexts. e.g. if we open two contexts, and each open 10 QPs concurrently, all of the QPs of the first context might end up on the first port instead of distributed on the two ports as expected
To overcome this unfairness between processes, we maintain per device TX affinity, and per process TX affinity.
The allocation algorithm is as follow:
1. Hold two tx_port_affinity atomic variables, one per RoCE device and one per ucontext. Both initialized to 0.
2. In mlx5_ib_alloc_ucontext do:
2.1. ucontext.tx_port_affinity = device.tx_port_affinity 2.2. device.tx_port_affinity += 1
3. In modify QP INIT2RST:
3.1. qp.tx_port_affinity = ucontext.tx_port_affinity % MLX5_PORT_NUM 3.2. ucontext.tx_port_affinity += 1
--- drivers/infiniband/hw/mlx5/main.c | 8 ++++++ drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ++- drivers/infiniband/hw/mlx5/qp.c | 37 +++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 5 deletions(-)
drivers/infiniband/hw/mlx5/main.c +8 -0
@@ -1823,6 +1823,14 @@ static struct ib_ucontext *mlx5_ib_alloc_ucontext(struct ib_device *ibdev, context->lib_caps = req.lib_caps;print_lib_caps (dev, context->lib_caps); +if (mlx5_lag_is_active (dev->mdev)) { +u8 port =mlx5_core_native_port_num (dev->mdev); + +atomic_set (&context->tx_port_affinity, +atomic_add_return ( +1 , &dev->roce[port].tx_port_affinity)); + } +return &context->ibucontext; out_mdev:
drivers/infiniband/hw/mlx5/mlx5_ib.h +3 -1
@@ -139,6 +139,8 @@ struct mlx5_ib_ucontext {u64 lib_caps;DECLARE_BITMAP (dm_pages,MLX5_MAX_MEMIC_PAGES );u16 devx_uid; +/* For RoCE LAG TX affinity */ +atomic_t tx_port_affinity; };static inline struct mlx5_ib_ucontext *to_mucontext (struct ib_ucontext *ibucontext)
@@ -700,7 +702,7 @@ struct mlx5_roce {rwlock_t netdev_lock;struct net_device *netdev;struct notifier_block nb; -atomic_t next_port; +atomic_t tx_port_affinity;enum ib_port_state last_port_state;struct mlx5_ib_dev *dev;u8 native_port_num;
drivers/infiniband/hw/mlx5/qp.c +33 -4
@@ -2910,6 +2910,37 @@ static int modify_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,return 0 ; } +static unsigned int get_tx_affinity (struct mlx5_ib_dev *dev, +struct mlx5_ib_pd *pd, +struct mlx5_ib_qp_base *qp_base, +u8 port_num) +{ +struct mlx5_ib_ucontext *ucontext =NULL ; +unsigned int tx_port_affinity; + +if (pd && pd->ibpd.uobject && pd->ibpd.uobject->context) + ucontext =to_mucontext (pd->ibpd.uobject->context); + +if (ucontext) { + tx_port_affinity = (unsigned int )atomic_add_return ( +1 , &ucontext->tx_port_affinity) % +MLX5_MAX_PORTS + +1 ; +mlx5_ib_dbg (dev,"Set tx affinity 0x%x to qpn 0x%x ucontext %p\n" , + tx_port_affinity, qp_base->mqp.qpn, ucontext); + }else { + tx_port_affinity = + (unsigned int )atomic_add_return ( +1 , &dev->roce[port_num].tx_port_affinity) % +MLX5_MAX_PORTS + +1 ; +mlx5_ib_dbg (dev,"Set tx affinity 0x%x to qpn 0x%x\n" , + tx_port_affinity, qp_base->mqp.qpn); + } + +return tx_port_affinity; +} + static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr, int attr_mask, enum ib_qp_state cur_state, enum ib_qp_state new_state,
@@ -2975,6 +3006,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,if (!context)return -ENOMEM ; + pd =get_pd (qp); context->flags =cpu_to_be32 (mlx5_st <<16 );if (!(attr_mask &IB_QP_PATH_MIG_STATE )) {
@@ -3003,9 +3035,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, (ibqp->qp_type == IB_QPT_XRC_TGT)) {if (mlx5_lag_is_active (dev->mdev)) {u8 p =mlx5_core_native_port_num (dev->mdev); - tx_affinity = (unsigned int )atomic_add_return (1 , - &dev->roce[p].next_port) % -MLX5_MAX_PORTS +1 ; + tx_affinity =get_tx_affinity (dev, pd, base, p); context->flags |=cpu_to_be32 (tx_affinity <<24 ); } }
@@ -3063,7 +3093,6 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp, goto out; } - pd =get_pd (qp);get_cqs (qp->ibqp.qp_type, qp->ibqp.send_cq, qp->ibqp.recv_cq, &send_cq, &recv_cq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/422 qxl: fix null-pointer crash during suspend
In reply to Greg Kroah-HartmanFrom: Peter Wu <[email protected]>
[ Upstream commit 7948a2b15873319d1bff4d37c09b9f2bf87b9021 ]
"crtc->helper_private" is not initialized by the QXL driver and thus the "crtc_funcs->disable" call would crash (resulting in suspend failure). Fix this by converting the suspend/resume functions to use the drm_mode_config_helper_* helpers.
Tested system sleep with QEMU 3.0 using "echo mem > /sys/power/state". During suspend the following message is visible from QEMU:
spice/server/display-channel.c:2425:display_channel_validate_surface: canvas address is 0x7fd05da68308 for 0 (and is NULL) spice/server/display-channel.c:2426:display_channel_validate_surface: failed on 0
This seems to be triggered by QXL_IO_NOTIFY_CMD after QXL_IO_DESTROY_PRIMARY_ASYNC, but aside from the warning things still seem to work (tested with both the GTK and -spice options).
--- drivers/gpu/drm/qxl/qxl_drv.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +5 -21
@@ -136,20 +136,11 @@ static int qxl_drm_freeze(struct drm_device *dev) {struct pci_dev *pdev = dev->pdev;struct qxl_device *qdev = dev->dev_private; -struct drm_crtc *crtc; - -drm_kms_helper_poll_disable (dev); - -console_lock (); -qxl_fbdev_set_suspend (qdev,1 ); -console_unlock (); +int ret; -/* unpin the front buffers */ -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { -const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; -if (crtc->enabled) - (*crtc_funcs->disable)(crtc); - } + ret =drm_mode_config_helper_suspend (dev); +if (ret) +return ret;qxl_destroy_monitors_object (qdev);qxl_surf_evict (qdev);
@@ -175,14 +166,7 @@ static int qxl_drm_resume(struct drm_device *dev, bool thaw) }qxl_create_monitors_object (qdev); -drm_helper_resume_force_mode (dev); - -console_lock (); -qxl_fbdev_set_suspend (qdev,0 ); -console_unlock (); - -drm_kms_helper_poll_enable (dev); -return 0 ; +return drm_mode_config_helper_resume (dev); }static int qxl_pm_suspend (struct device *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/422 mac80211: fix saving a few HE values
In reply to Greg Kroah-HartmanFrom: Naftali Goldstein <[email protected]>
[ Upstream commit 77cbbc35a49b75969d98edce9400beb21720aa39 ]
After masking the he_oper_params, to get the requested values as integers one must rshift and not lshift. Fix that by using the le32_get_bits() macro.
--- net/mac80211/mlme.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
net/mac80211/mlme.c +7 -10
@@ -3255,19 +3255,16 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, }if (bss_conf->he_support) { -u32 he_oper_params = -le32_to_cpu (elems.he_operation->he_oper_params); + bss_conf->bss_color = +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_BSS_COLOR_MASK ); - bss_conf->bss_color = he_oper_params & -IEEE80211_HE_OPERATION_BSS_COLOR_MASK ; bss_conf->htc_trig_based_pkt_ext = - (he_oper_params & -IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK ) << -IEEE80211_HE_OPERATION_DFLT_PE_DURATION_OFFSET ; +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_DFLT_PE_DURATION_MASK ); bss_conf->frame_time_rts_th = - (he_oper_params & -IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK ) << -IEEE80211_HE_OPERATION_RTS_THRESHOLD_OFFSET ; +le32_get_bits (elems.he_operation->he_oper_params, +IEEE80211_HE_OPERATION_RTS_THRESHOLD_MASK ); bss_conf->multi_sta_back_32bit = sta->sta.he_cap.he_cap_elem.mac_cap_info[2] &
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/422 cfg80211: validate wmm rule when setting
In reply to Greg Kroah-HartmanFrom: Stanislaw Gruszka <[email protected]>
[ Upstream commit 014f5a250fc49fa8c6cd50093e725e71f3ae52da ]
Add validation check for wmm rule when copy rules from fwdb and print error when rule is invalid.
--- net/wireless/reg.c | 64 +++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 29 deletions(-)
net/wireless/reg.c +35 -29
@@ -847,22 +847,36 @@ static bool valid_regdb(const u8 *data, unsigned int size)return true; } -static void set_wmm_rule (struct ieee80211_reg_rule *rrule, -struct fwdb_wmm_rule *wmm) -{ -struct ieee80211_wmm_rule *rule = &rrule->wmm_rule; -unsigned int i; +static void set_wmm_rule (const struct fwdb_header *db, +const struct fwdb_country *country, +const struct fwdb_rule *rule, +struct ieee80211_reg_rule *rrule) +{ +struct ieee80211_wmm_rule *wmm_rule = &rrule->wmm_rule; +struct fwdb_wmm_rule *wmm; +unsigned int i, wmm_ptr; + + wmm_ptr =be16_to_cpu (rule->wmm_ptr) <<2 ; + wmm = (void *)((u8 *)db + wmm_ptr); + +if (!valid_wmm (wmm)) { +pr_err ("Invalid regulatory WMM rule %u-%u in domain %c%c\n" , +be32_to_cpu (rule->start),be32_to_cpu (rule->end), + country->alpha2[0 ], country->alpha2[1 ]); +return ; + }for (i =0 ; i <IEEE80211_NUM_ACS ; i++) { - rule->client[i].cw_min = + wmm_rule->client[i].cw_min =ecw2cw ((wmm->client[i].ecw &0xf0 ) >>4 ); - rule->client[i].cw_max =ecw2cw (wmm->client[i].ecw &0x0f ); - rule->client[i].aifsn = wmm->client[i].aifsn; - rule->client[i].cot =1000 *be16_to_cpu (wmm->client[i].cot); - rule->ap[i].cw_min =ecw2cw ((wmm->ap[i].ecw &0xf0 ) >>4 ); - rule->ap[i].cw_max =ecw2cw (wmm->ap[i].ecw &0x0f ); - rule->ap[i].aifsn = wmm->ap[i].aifsn; - rule->ap[i].cot =1000 *be16_to_cpu (wmm->ap[i].cot); + wmm_rule->client[i].cw_max =ecw2cw (wmm->client[i].ecw &0x0f ); + wmm_rule->client[i].aifsn = wmm->client[i].aifsn; + wmm_rule->client[i].cot = +1000 *be16_to_cpu (wmm->client[i].cot); + wmm_rule->ap[i].cw_min =ecw2cw ((wmm->ap[i].ecw &0xf0 ) >>4 ); + wmm_rule->ap[i].cw_max =ecw2cw (wmm->ap[i].ecw &0x0f ); + wmm_rule->ap[i].aifsn = wmm->ap[i].aifsn; + wmm_rule->ap[i].cot =1000 *be16_to_cpu (wmm->ap[i].cot); } rrule->has_wmm = true;
@@ -870,7 +884,7 @@ static void set_wmm_rule(struct ieee80211_reg_rule *rrule,static int __regdb_query_wmm (const struct fwdb_header *db,const struct fwdb_country *country,int freq, -struct ieee80211_reg_rule *rule) +struct ieee80211_reg_rule *rrule) {unsigned int ptr =be16_to_cpu (country->coll_ptr) <<2 ;struct fwdb_collection *coll = (void *)((u8 *)db + ptr);
@@ -879,18 +893,14 @@ static int __regdb_query_wmm(const struct fwdb_header *db,for (i =0 ; i < coll->n_rules; i++) {__be16 *rules_ptr = (void *)((u8 *)coll +ALIGN (coll->len,2 ));unsigned int rule_ptr =be16_to_cpu (rules_ptr[i]) <<2 ; -struct fwdb_rule *rrule = (void *)((u8 *)db + rule_ptr); -struct fwdb_wmm_rule *wmm; -unsigned int wmm_ptr; +struct fwdb_rule *rule = (void *)((u8 *)db + rule_ptr); - if (rrule->len < offsetofend(struct fwdb_rule, wmm_ptr)) + if (rule->len < offsetofend(struct fwdb_rule, wmm_ptr))continue ; -if (freq >=KHZ_TO_MHZ (be32_to_cpu (rrule->start)) && - freq <=KHZ_TO_MHZ (be32_to_cpu (rrule->end))) { - wmm_ptr =be16_to_cpu (rrule->wmm_ptr) <<2 ; - wmm = (void *)((u8 *)db + wmm_ptr); -set_wmm_rule (rule, wmm); +if (freq >=KHZ_TO_MHZ (be32_to_cpu (rule->start)) && + freq <=KHZ_TO_MHZ (be32_to_cpu (rule->end))) { +set_wmm_rule (db, country, rule, rrule);return 0 ; } }
@@ -972,12 +982,8 @@ static int regdb_query_country(const struct fwdb_header *db, if (rule->len >= offsetofend(struct fwdb_rule, cac_timeout)) rrule->dfs_cac_ms =1000 *be16_to_cpu (rule->cac_timeout); - if (rule->len >= offsetofend(struct fwdb_rule, wmm_ptr)) { -u32 wmm_ptr =be16_to_cpu (rule->wmm_ptr) <<2 ; -struct fwdb_wmm_rule *wmm = (void *)((u8 *)db + wmm_ptr); - -set_wmm_rule (rrule, wmm); - } + if (rule->len >= offsetofend(struct fwdb_rule, wmm_ptr)) +set_wmm_rule (db, country, rule, rrule); }return reg_schedule_apply (regdom);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/422 f2fs: avoid wrong decrypted data from disk
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 0ded69f632bb717be9aeea3ae74e29050fcb060c ]
1. Create a file in an encrypted directory
2. Do GC & drop caches
3. Read stale data before its bio for metapage was not issued yet
--- fs/f2fs/data.c | 18 ++++++++++-------- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 3 +-- fs/f2fs/segment.c | 6 +++++- 4 files changed, 17 insertions(+), 12 deletions(-)
fs/f2fs/data.c +10 -8
@@ -575,9 +575,6 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, ctx->bio = bio; ctx->enabled_steps = post_read_steps; bio->bi_private = ctx; - -/* wait the page to be moved by cleaning */ -f2fs_wait_on_block_writeback (sbi, blkaddr); }return bio;
@@ -592,6 +589,9 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page,if (IS_ERR (bio))return PTR_ERR (bio); +/* wait for GCed page writeback via META_MAPPING */ +f2fs_wait_on_block_writeback (inode, blkaddr); +if (bio_add_page (bio, page,PAGE_SIZE ,0 ) <PAGE_SIZE ) {bio_put (bio);return -EFAULT ;
@@ -1569,6 +1569,12 @@ submit_and_realloc: } } +/* +* If the page is under writeback, we need to wait for +* its completion to see the correct decrypted data. +*/ +f2fs_wait_on_block_writeback (inode, block_nr); +if (bio_add_page (bio, page, blocksize,0 ) < blocksize) goto submit_and_realloc;
@@ -1637,7 +1643,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio)return 0 ;/* wait for GCed page writeback via META_MAPPING */ -f2fs_wait_on_block_writeback (fio->sbi, fio->old_blkaddr); +f2fs_wait_on_block_writeback (inode, fio->old_blkaddr); retry_encrypt: fio->encrypted_page = fscrypt_encrypt_page(inode, fio->page,
@@ -2402,10 +2408,6 @@ repeat:f2fs_wait_on_page_writeback (page,DATA , false); -/* wait for GCed page writeback via META_MAPPING */ -if (f2fs_post_read_required (inode)) -f2fs_wait_on_block_writeback (sbi, blkaddr); -if (len ==PAGE_SIZE ||PageUptodate (page))return 0 ;
fs/f2fs/f2fs.h +1 -1
@@ -2973,7 +2973,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, struct f2fs_io_info *fio, bool add_list);void f2fs_wait_on_page_writeback (struct page *page,enum page_type type,bool ordered); -void f2fs_wait_on_block_writeback (struct f2fs_sb_info *sbi,block_t blkaddr); +void f2fs_wait_on_block_writeback (struct inode *inode,block_t blkaddr);void f2fs_write_data_summaries (struct f2fs_sb_info *sbi,block_t start_blk);void f2fs_write_node_summaries (struct f2fs_sb_info *sbi,block_t start_blk); int f2fs_lookup_journal_in_cursum(struct f2fs_journal *journal, int type,
fs/f2fs/file.c +1 -2
@@ -112,8 +112,7 @@ mapped:f2fs_wait_on_page_writeback (page,DATA , false);/* wait for GCed page writeback via META_MAPPING */ -if (f2fs_post_read_required (inode)) -f2fs_wait_on_block_writeback (sbi, dn.data_blkaddr); +f2fs_wait_on_block_writeback (inode, dn.data_blkaddr); out_sem:up_read (&F2FS_I (inode)->i_mmap_sem);
fs/f2fs/segment.c +5 -1
@@ -3214,10 +3214,14 @@ void f2fs_wait_on_page_writeback(struct page *page, } } -void f2fs_wait_on_block_writeback (struct f2fs_sb_info *sbi,block_t blkaddr) +void f2fs_wait_on_block_writeback (struct inode *inode,block_t blkaddr) { +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *cpage; +if (!f2fs_post_read_required (inode)) +return ; +if (!is_valid_data_blkaddr (sbi, blkaddr))return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/422 net: lan78xx: Bail out if lan78xx_get_endpoints fails
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
[ Upstream commit fa8cd98c06407b5798b927cd7fd14d30f360ed02 ]
We need to bail out if lan78xx_get_endpoints() fails, otherwise the result is overwritten.
--- drivers/net/usb/lan78xx.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/lan78xx.c +5 -0
@@ -2950,6 +2950,11 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)int i; ret =lan78xx_get_endpoints (dev, intf); +if (ret) { +netdev_warn (dev->net,"lan78xx_get_endpoints failed: %d\n" , + ret); +return ret; + } dev->data[0 ] = (unsigned long )kzalloc (sizeof (*pdata),GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/422 rtnetlink: move type calculation out of loop
In reply to Greg Kroah-HartmanFrom: Christian Brauner <[email protected]>
[ Upstream commit 87ccbb1f943625884b824c5560f635dcea8e4510 ]
I don't see how the type - which is one of RTM_{GETADDR,GETROUTE,GETNETCONF} - can change. So do the message type calculation once before entering the for loop.
--- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/rtnetlink.c +1 -1
@@ -3268,13 +3268,13 @@ static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) {int idx;int s_idx = cb->family; +int type = cb->nlh->nlmsg_type -RTM_BASE ;if (s_idx ==0 ) s_idx =1 ;for (idx =1 ; idx <=RTNL_FAMILY_MAX ; idx++) {struct rtnl_link **tab; -int type = cb->nlh->nlmsg_type-RTM_BASE ;struct rtnl_link *link;rtnl_dumpit_func dumpit;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/422 ASoC: sgtl5000: avoid division by zero if lo_vag is zero
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 9ab708aef61f5620113269a9d1bdb1543d1207d0 ]
In the case where lo_vag <= SGTL5000_LINE_OUT_GND_BASE, lo_vag is set to zero and later vol_quot is computed by dividing by lo_vag causing a division by zero error. Fix this by avoiding a zero division and set vol_quot to zero in this specific case so that the lowest setting for i is correctly set.
--- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/sgtl5000.c +1 -1
@@ -1387,7 +1387,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_component *component)* Searching for a suitable index solving this formula: * idx = 40 * log10(vag_val / lo_cagcntrl) + 15 */ - vol_quot = (vag *100 ) / lo_vag; + vol_quot = lo_vag ? (vag *100 ) / lo_vag :0 ; lo_vol =0 ;for (i =0 ; i <ARRAY_SIZE (vol_quot_table); i++) {if (vol_quot >= vol_quot_table[i])
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/422 ath10k: avoid possible memory access violation
In reply to Greg Kroah-HartmanFrom: K.T.VIJAYAKUMAAR <[email protected]>
[ Upstream commit 97c69a70dc2cecb2c3b96a66529e0082dabc2d2c ]
array "ctl_power_table" access index "pream" is initialized with -1 and is raised as a static analysis tool issue. [drivers\net\wireless\ath\ath10k\wmi.c:4719] -> [drivers\net\wireless\ath\ath10k\wmi.c:4730]: (error) Array index -1 is out of bounds.
Since the "pream" index for accessing ctl_power_table array is initialized with -1, there is a chance of memory access violation for the cases below.
1) wmi_pdev_tpc_final_table_event change frequency is between 2483 and 5180
2) pream_idx is out of the enumeration ranges of wmi_tpc_pream_2ghz, wmi_tpc_pream_5ghz
--- drivers/net/wireless/ath/ath10k/wmi.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/ath/ath10k/wmi.c +7 -0
@@ -4785,6 +4785,13 @@ ath10k_wmi_tpc_final_get_rate(struct ath10k *ar, } } +if (pream ==-1 ) { +ath10k_warn (ar,"unknown wmi tpc final index and frequency: %u, %u\n" , + pream_idx,__le32_to_cpu (ev->chan_freq)); + tpc =0 ; + goto out; + } +if (pream ==4 ) tpc =min_t (u8, ev->rates_array[rate_idx], ev->max_reg_allow_pow[ch]);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/422 ARM: dts: exynos: Disable pull control for S5M8767 PMIC
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit ef2ecab9af5feae97c47b7f61cdd96f7f49b2c23 ]
S5M8767 PMIC interrupt line on Exynos5250-based Arndale board has external pull-up resistors, so disable any pull control for it in in controller node. This fixes support for S5M8767 interrupts and enables operation of wakeup from S5M8767 RTC alarm.
--- arch/arm/boot/dts/exynos5250-arndale.dts | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/boot/dts/exynos5250-arndale.dts +9 -0
@@ -170,6 +170,8 @@ reg = <0x66>; interrupt-parent = <&gpx3>; interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&s5m8767_irq>; vinb1-supply = <&main_dc_reg>; vinb2-supply = <&main_dc_reg>;
@@ -530,6 +532,13 @@ cap-sd-highspeed; }; +&pinctrl_0 { + s5m8767_irq: s5m8767-irq { + samsung,pins = "gpx3-2"; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + }; +}; + &rtc { status = "okay"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/422 ath10k: wmi: disable softirqs while calling ieee80211_rx
In reply to Greg Kroah-HartmanFrom: Erik Stromdahl <[email protected]>
[ Upstream commit 37f62c0d5822f631b786b29a1b1069ab714d1a28 ]
This is done in order not to trig the below warning in ieee80211_rx_napi:
WARN_ON_ONCE(softirq_count() == 0);
ieee80211_rx_napi requires that softirq's are disabled during execution.
The High latency bus drivers (SDIO and USB) sometimes call the wmi ep_rx_complete callback from non softirq context, resulting in a trigger of the above warning.
Calling ieee80211_rx_ni with softirq's already disabled (e.g., from softirq context) should be safe as the local_bh_disable and local_bh_enable functions (called from ieee80211_rx_ni) are fully reentrant.
--- drivers/net/wireless/ath/ath10k/wmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi.c +2 -1
@@ -2487,7 +2487,8 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) status->freq, status->band, status->signal, status->rate_idx); -ieee80211_rx (ar->hw, skb); +ieee80211_rx_ni (ar->hw, skb); +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/422 i2c: mediatek: Use DMA safe buffers for i2c transactions
In reply to Greg Kroah-HartmanFrom: Jun Gao <[email protected]>
[ Upstream commit fc66b39fe36acfd06f716e338de7cd8f9550fad2 ]
DMA mode will always be used in i2c transactions, try to allocate a DMA safe buffer if the buf of struct i2c_msg used is not DMA safe.
--- drivers/i2c/busses/i2c-mt65xx.c | 62 +++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-mt65xx.c +55 -7
@@ -441,6 +441,8 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,u16 control_reg;u16 restart_flag =0 ;u32 reg_4g_mode; +u8 *dma_rd_buf =NULL ; +u8 *dma_wr_buf =NULL ;dma_addr_t rpaddr =0 ;dma_addr_t wpaddr =0 ;int ret;
@@ -500,10 +502,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_RD ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_RX , i2c->pdmabase +OFFSET_CON ); - rpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_rd_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_rd_buf) +return -ENOMEM ; + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, msgs->len,DMA_FROM_DEVICE ); -if (dma_mapping_error (i2c->dev, rpaddr)) +if (dma_mapping_error (i2c->dev, rpaddr)) { +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (rpaddr);
@@ -515,10 +525,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else if (i2c->op ==I2C_MASTER_WR ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_TX , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (wpaddr);
@@ -530,16 +548,39 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else {writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; - rpaddr =dma_map_single (i2c->dev, (msgs +1 )->buf, + } + + dma_rd_buf =i2c_get_dma_safe_msg_buf ((msgs +1 ),0 ); +if (!dma_rd_buf) { +dma_unmap_single (i2c->dev, wpaddr, + msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); + +return -ENOMEM ; + } + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, (msgs +1 )->len,DMA_FROM_DEVICE );if (dma_mapping_error (i2c->dev, rpaddr)) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), false); +return -ENOMEM ; }
@@ -578,14 +619,21 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_WR ) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); }else if (i2c->op ==I2C_MASTER_RD ) {dma_unmap_single (i2c->dev, rpaddr, msgs->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, true); }else {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE );dma_unmap_single (i2c->dev, rpaddr, (msgs +1 )->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), true); }if (ret ==0 ) {
Signature · 1 line
2.20.1
Re: [PATCH 4.19 127/422] i2c: mediatek: Use DMA safe buffers for i2c transactions
Hi,
Quoted 10 lines · Greg Kroah-Hartman
From: Jun Gao <[email protected]>
[ Upstream commit
fc66b39fe36acfd06f716e338de7cd8f9550fad2]DMA mode will always be used in i2c transactions, try to allocate a DMA safe buffer if the buf of struct
i2c_msgused is not DMA safe.Signed-off-by Jun Gao <[email protected]>Signed-off-by Wolfram Sang <[email protected]>Signed-off-by Sasha Levin <[email protected]>
This patch requires the following additional commit:
commit bc1a7f75c85e226e82f183d30d75c357f92b6029
Author: Hsin-Yi Wang <[email protected]> Date: Fri Feb 15 17:02:02 2019 +0800
i2c: mediatek: modify threshold passed to i2c_get_dma_safe_msg_buf()
DMA with zero-length transfers doesn't make sense and this HW doesn't support them at all, so increase the threshold.
Please apply this commit.
Best regards,
Nobuhiro
Quoted 130 lines
--- drivers/i2c/busses/i2c-mt65xx.c | 62 +++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 7 deletions(-)drivers/i2c/busses/i2c-mt65xx.c +55
-7@@ -441,6 +441,8 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,u16 control_reg;u16 restart_flag =0 ;u32 reg_4g_mode; +u8 *dma_rd_buf =NULL ; +u8 *dma_wr_buf =NULL ;dma_addr_t rpaddr =0 ;dma_addr_t wpaddr =0 ;int ret;@@ -500,10 +502,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_RD ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_RX , i2c->pdmabase +OFFSET_CON ); - rpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_rd_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_rd_buf) +return -ENOMEM ; + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, msgs->len,DMA_FROM_DEVICE ); -if (dma_mapping_error (i2c->dev, rpaddr)) +if (dma_mapping_error (i2c->dev, rpaddr)) { +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (rpaddr);@@ -515,10 +525,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else if (i2c->op ==I2C_MASTER_WR ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_TX , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (wpaddr);@@ -530,16 +548,39 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else {writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; - rpaddr =dma_map_single (i2c->dev, (msgs +1 )->buf, + } + + dma_rd_buf =i2c_get_dma_safe_msg_buf ((msgs +1 ),0 ); +if (!dma_rd_buf) { +dma_unmap_single (i2c->dev, wpaddr, + msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); + +return -ENOMEM ; + } + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, (msgs +1 )->len,DMA_FROM_DEVICE );if (dma_mapping_error (i2c->dev, rpaddr)) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), false); +return -ENOMEM ; }@@ -578,14 +619,21 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_WR ) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); }else if (i2c->op ==I2C_MASTER_RD ) {dma_unmap_single (i2c->dev, rpaddr, msgs->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, true); }else {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE );dma_unmap_single (i2c->dev, rpaddr, (msgs +1 )->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), true); }if (ret ==0 ) {Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 127/422] i2c: mediatek: Use DMA safe buffers for i2c transactions
Quoted 158 lines · Nobuhiro Iwamatsu
Hi,
Quoted 10 lines · Greg Kroah-Hartman
From: Jun Gao <[email protected]>
[ Upstream commit
fc66b39fe36acfd06f716e338de7cd8f9550fad2]DMA mode will always be used in i2c transactions, try to allocate a DMA safe buffer if the buf of struct
i2c_msgused is not DMA safe.Signed-off-by Jun Gao <[email protected]>Signed-off-by Wolfram Sang <[email protected]>Signed-off-by Sasha Levin <[email protected]>This patch requires the following additional commit:
commit
bc1a7f75c85e226e82f183d30d75c357f92b6029Author: Hsin-Yi Wang <[email protected]> Date: Fri Feb 15 17:02:02 2019 +0800i2c: mediatek: modify threshold passed to
i2c_get_dma_safe_msg_buf()DMA with zero-length transfers doesn't make sense and this HW doesn't support them at all, so increase the threshold.
Fixes fc66b39fe36a ("i2c: mediatek: Use DMA safe buffers for i2c transactions")Signed-off-by Hsin-Yi Wang <[email protected]>[wsa: reworded commit message]Signed-off-by Wolfram Sang <[email protected]>Please apply this commit.
Best regards,
NobuhiroQuoted 123 lines
--- drivers/i2c/busses/i2c-mt65xx.c | 62 +++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 7 deletions(-)drivers/i2c/busses/i2c-mt65xx.c +55
-7@@ -441,6 +441,8 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,u16 control_reg;u16 restart_flag =0 ;u32 reg_4g_mode; +u8 *dma_rd_buf =NULL ; +u8 *dma_wr_buf =NULL ;dma_addr_t rpaddr =0 ;dma_addr_t wpaddr =0 ;int ret;@@ -500,10 +502,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_RD ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_RX , i2c->pdmabase +OFFSET_CON ); - rpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_rd_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_rd_buf) +return -ENOMEM ; + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, msgs->len,DMA_FROM_DEVICE ); -if (dma_mapping_error (i2c->dev, rpaddr)) +if (dma_mapping_error (i2c->dev, rpaddr)) { +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (rpaddr);@@ -515,10 +525,18 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else if (i2c->op ==I2C_MASTER_WR ) {writel (I2C_DMA_INT_FLAG_NONE , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CON_TX , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; + }if (i2c->dev_comp->support_33bits) { reg_4g_mode =mtk_i2c_set_4g_mode (wpaddr);@@ -530,16 +548,39 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs, }else {writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_INT_FLAG );writel (I2C_DMA_CLR_FLAG , i2c->pdmabase +OFFSET_CON ); - wpaddr =dma_map_single (i2c->dev, msgs->buf, + + dma_wr_buf =i2c_get_dma_safe_msg_buf (msgs,0 ); +if (!dma_wr_buf) +return -ENOMEM ; + + wpaddr =dma_map_single (i2c->dev, dma_wr_buf, msgs->len,DMA_TO_DEVICE ); -if (dma_mapping_error (i2c->dev, wpaddr)) +if (dma_mapping_error (i2c->dev, wpaddr)) { +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +return -ENOMEM ; - rpaddr =dma_map_single (i2c->dev, (msgs +1 )->buf, + } + + dma_rd_buf =i2c_get_dma_safe_msg_buf ((msgs +1 ),0 ); +if (!dma_rd_buf) { +dma_unmap_single (i2c->dev, wpaddr, + msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); + +return -ENOMEM ; + } + + rpaddr =dma_map_single (i2c->dev, dma_rd_buf, (msgs +1 )->len,DMA_FROM_DEVICE );if (dma_mapping_error (i2c->dev, rpaddr)) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, false); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), false); +return -ENOMEM ; }@@ -578,14 +619,21 @@ static int mtk_i2c_do_transfer(struct mtk_i2c *i2c, struct i2c_msg *msgs,if (i2c->op ==I2C_MASTER_WR ) {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); }else if (i2c->op ==I2C_MASTER_RD ) {dma_unmap_single (i2c->dev, rpaddr, msgs->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_rd_buf, msgs, true); }else {dma_unmap_single (i2c->dev, wpaddr, msgs->len,DMA_TO_DEVICE );dma_unmap_single (i2c->dev, rpaddr, (msgs +1 )->len,DMA_FROM_DEVICE ); + +i2c_put_dma_safe_msg_buf (dma_wr_buf, msgs, true); +i2c_put_dma_safe_msg_buf (dma_rd_buf, (msgs +1 ), true); }
Quoted 3 lines
Quoted 3 lines
drivers/i2c/busses/i2c-mt65xx.c +0
-0if (ret ==0 ) {Signature · 1 line
2.20.1
Now queued up, thanks.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 128/422 IB/mlx5: Dont hold spin lock while checking device state
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit 6c75520f7e5a6a353f3b332509d205e213d05855 ]
mdev->state device state is not protected by the QP for which WRs are being processed. Therefore, there is no need to hold spin lock while checking mdev state.
Given that device fatal error is unlikely situation, wrap the condition check with unlikely().
Additionally, kernel QP1 is also a kernel ULP for which soft CQEs needs to be generated. Therefore, check for device fatal error before processing QP1 work requests.
--- drivers/infiniband/hw/mlx5/qp.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +12 -14
@@ -4407,6 +4407,12 @@ static int _mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,u8 next_fence =0 ;u8 fence; +if (unlikely (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && + !drain)) { + *bad_wr = wr; +return -EIO ; + } +if (unlikely (ibqp->qp_type ==IB_QPT_GSI ))return mlx5_ib_gsi_post_send (ibqp, wr, bad_wr);
@@ -4416,13 +4422,6 @@ static int _mlx5_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,spin_lock_irqsave (&qp->sq.lock, flags); -if (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && !drain) { - err = -EIO ; - *bad_wr = wr; - nreq =0 ; - goto out; - } -for (nreq =0 ; wr; nreq++, wr = wr->next) {if (unlikely (wr->opcode >=ARRAY_SIZE (mlx5_ib_opcode))) {mlx5_ib_warn (dev,"\n" );
@@ -4737,18 +4736,17 @@ static int _mlx5_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,int ind;int i; +if (unlikely (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && + !drain)) { + *bad_wr = wr; +return -EIO ; + } +if (unlikely (ibqp->qp_type ==IB_QPT_GSI ))return mlx5_ib_gsi_post_recv (ibqp, wr, bad_wr);spin_lock_irqsave (&qp->rq.lock, flags); -if (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR && !drain) { - err = -EIO ; - *bad_wr = wr; - nreq =0 ; - goto out; - } - ind = qp->rq.head & (qp->rq.wqe_cnt -1 );for (nreq =0 ; wr; nreq++, wr = wr->next) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/422 IB/ipoib: Ensure that MTU isnt less than minimum permitted
In reply to Greg Kroah-HartmanFrom: Muhammad Sammar <[email protected]>
[ Upstream commit 142a9c287613560edf5a03c8d142c8b6ebc1995b ]
It is illegal to change MTU to a value lower than the minimum MTU stated in ethernet spec. In addition to that we need to add 4 bytes for encapsulation header (IPOIB_ENCAP_LEN).
Before "ifconfig ib0 mtu 0" command, succeeds while it obviously shouldn't.
--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -1
@@ -243,7 +243,8 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu)return 0 ; } -if (new_mtu >IPOIB_UD_MTU (priv->max_ib_mtu)) +if (new_mtu < (ETH_MIN_MTU +IPOIB_ENCAP_LEN ) || + new_mtu >IPOIB_UD_MTU (priv->max_ib_mtu))return -EINVAL ; priv->admin_mtu = new_mtu;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/422 RDMA/core: Rate limit MAD error messages
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit f9d08f1e1939ad4d92e38bd3dee6842512f5bee6 ]
While registering a mad agent, a user space can trigger various errors and flood the logs.
Therefore, decrease verbosity and rate limit such error messages. While we are at it, use __func__ to print function name.
--- drivers/infiniband/core/mad.c | 72 ++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 35 deletions(-)
drivers/infiniband/core/mad.c +37 -35
@@ -223,30 +223,30 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,/* Validate parameters */ qpn =get_spl_qp_index (qp_type);if (qpn ==-1 ) { -dev_notice (&device->dev, -"ib_register_mad_agent: invalid QP Type %d\n" , - qp_type); +dev_dbg_ratelimited (&device->dev,"%s: invalid QP Type %d\n" , + __func__, qp_type); goto error1; }if (rmpp_version && rmpp_version !=IB_MGMT_RMPP_VERSION ) { -dev_notice (&device->dev, -"ib_register_mad_agent: invalid RMPP Version %u\n" , - rmpp_version); +dev_dbg_ratelimited (&device->dev, +"%s: invalid RMPP Version %u\n" , + __func__, rmpp_version); goto error1; }/* Validate MAD registration request if supplied */ if (mad_reg_req) {if (mad_reg_req->mgmt_class_version >=MAX_MGMT_VERSION ) { -dev_notice (&device->dev, -"ib_register_mad_agent: invalid Class Version %u\n" , - mad_reg_req->mgmt_class_version); +dev_dbg_ratelimited (&device->dev, +"%s: invalid Class Version %u\n" , + __func__, + mad_reg_req->mgmt_class_version); goto error1; }if (!recv_handler) { -dev_notice (&device->dev, -"ib_register_mad_agent: no recv_handler\n" ); +dev_dbg_ratelimited (&device->dev, +"%s: no recv_handler\n" , __func__); goto error1; }if (mad_reg_req->mgmt_class >=MAX_MGMT_CLASS ) {
@@ -256,9 +256,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,*/ if (mad_reg_req->mgmt_class !=IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE ) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid Mgmt Class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid Mgmt Class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }else if (mad_reg_req->mgmt_class ==0 ) {
@@ -266,8 +266,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,* Class 0 is reserved in IBA and is used for * aliasing of IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE */ -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid Mgmt Class 0\n" ); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid Mgmt Class 0\n" , + __func__); goto error1; }else if (is_vendor_class (mad_reg_req->mgmt_class)) {/*
@@ -275,18 +276,19 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,* ensure supplied OUI is not zero */ if (!is_vendor_oui (mad_reg_req->oui)) { -dev_notice (&device->dev, -"ib_register_mad_agent: No OUI specified for class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: No OUI specified for class 0x%x\n" , + __func__, + mad_reg_req->mgmt_class); goto error1; } }/* Make sure class supplied is consistent with RMPP */ if (!ib_is_mad_class_rmpp (mad_reg_req->mgmt_class)) {if (rmpp_version) { -dev_notice (&device->dev, -"ib_register_mad_agent: RMPP version for non-RMPP class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: RMPP version for non-RMPP class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }
@@ -297,9 +299,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, IB_MGMT_CLASS_SUBN_LID_ROUTED) && (mad_reg_req->mgmt_class != IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid SM QP type: class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid SM QP type: class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }else {
@@ -307,9 +309,9 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, IB_MGMT_CLASS_SUBN_LID_ROUTED) || (mad_reg_req->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid GS QP type: class 0x%x\n" , - mad_reg_req->mgmt_class); +dev_dbg_ratelimited (&device->dev, +"%s: Invalid GS QP type: class 0x%x\n" , + __func__, mad_reg_req->mgmt_class); goto error1; } }
@@ -324,18 +326,18 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,/* Validate device and port */ port_priv =ib_get_mad_port (device, port_num);if (!port_priv) { -dev_notice (&device->dev, -"ib_register_mad_agent: Invalid port %d\n" , - port_num); +dev_dbg_ratelimited (&device->dev,"%s: Invalid port %d\n" , + __func__, port_num); ret =ERR_PTR (-ENODEV ); goto error1; } -/* Verify the QP requested is supported. For example, Ethernet devices -* will not have QP0 */ +/* Verify the QP requested is supported. For example, Ethernet devices +* will not have QP0. +*/ if (!port_priv->qp_info[qpn].qp) { -dev_notice (&device->dev, -"ib_register_mad_agent: QP %d not supported\n" , qpn); +dev_dbg_ratelimited (&device->dev,"%s: QP %d not supported\n" , + __func__, qpn); ret =ERR_PTR (-EPROTONOSUPPORT ); goto error1; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/422 RDMA/core: Follow correct unregister order between sysfs and cgroup
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit c715a39541bb399eb03d728a996b224d90ce1336 ]
During register_device() init sequence is,
(a) register with rdma cgroup followed by
(b) register with sysfs
Therefore, unregister_device() sequence should follow the reverse order.
--- drivers/infiniband/core/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/device.c +1 -1
@@ -599,8 +599,8 @@ void ib_unregister_device(struct ib_device *device) }up_read (&lists_rwsem); -ib_device_unregister_rdmacg (device);ib_device_unregister_sysfs (device); +ib_device_unregister_rdmacg (device);mutex_unlock (&device_mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/422 mips: txx9: fix iounmap related issue
In reply to Greg Kroah-HartmanFrom: Ding Xiang <[email protected]>
[ Upstream commit c6e1241a82e6e74d1ae5cc34581dab2ffd6022d0 ]
if device_register return error, iounmap should be called, also iounmap need to call before put_device.
Patchwork: https://patchwork.linux-mips.org/patch/20476/
--- arch/mips/txx9/generic/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/mips/txx9/generic/setup.c +2 -3
@@ -960,12 +960,11 @@ void __init txx9_sramc_init(struct resource *r) goto exit_put; err =sysfs_create_bin_file (&dev->dev.kobj, &dev->bindata_attr);if (err) { -device_unregister (&dev->dev);iounmap (dev->base); -kfree (dev); +device_unregister (&dev->dev); }return ; exit_put: +iounmap (dev->base);put_device (&dev->dev); -return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/422 udf: Fix crash during mount
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit b085fbe2ef7fa7489903c45271ae7b7a52b0f9ab ]
Fix a crash during an attempt to mount a filesystem that has both Unallocated Space Table and Unallocated Space Bitmap. Such filesystem actually violates the UDF standard so we just have to properly detect such situation and refuse to mount such filesystem read-write. When we are at it, verify also other constraints on the allocation information mandated by the standard.
--- fs/udf/super.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 5 deletions(-)
fs/udf/super.c +60 -5
@@ -989,12 +989,62 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index)return bitmap; } +static int check_partition_desc (struct super_block *sb, +struct partitionDesc *p, +struct udf_part_map *map) +{ +bool umap, utable, fmap, ftable; +struct partitionHeaderDesc *phd; + +switch (le32_to_cpu (p->accessType)) { +case PD_ACCESS_TYPE_READ_ONLY : +case PD_ACCESS_TYPE_WRITE_ONCE : +case PD_ACCESS_TYPE_REWRITABLE : +case PD_ACCESS_TYPE_NONE : + goto force_ro; + } + +/* No Partition Header Descriptor? */ +if (strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR02 ) && +strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR03 )) + goto force_ro; + + phd = (struct partitionHeaderDesc *)p->partitionContentsUse; + utable = phd->unallocSpaceTable.extLength; + umap = phd->unallocSpaceBitmap.extLength; + ftable = phd->freedSpaceTable.extLength; + fmap = phd->freedSpaceBitmap.extLength; + +/* No allocation info? */ +if (!utable && !umap && !ftable && !fmap) + goto force_ro; + +/* We don't support blocks that require erasing before overwrite */ +if (ftable || fmap) + goto force_ro; +/* UDF 2.60: 2.3.3 - no mixing of tables & bitmaps, no VAT. */ +if (utable && umap) + goto force_ro; + +if (map->s_partition_type ==UDF_VIRTUAL_MAP15 || + map->s_partition_type ==UDF_VIRTUAL_MAP20 ) + goto force_ro; + +return 0 ; +force_ro: +if (!sb_rdonly (sb)) +return -EACCES ; +UDF_SET_FLAG (sb,UDF_FLAG_RW_INCOMPAT ); +return 0 ; +} +static int udf_fill_partdesc_info (struct super_block *sb,struct partitionDesc *p,int p_index) {struct udf_part_map *map;struct udf_sb_info *sbi =UDF_SB (sb);struct partitionHeaderDesc *phd; +int err; map = &sbi->s_partmaps[p_index];
@@ -1014,8 +1064,16 @@ static int udf_fill_partdesc_info(struct super_block *sb, p_index, map->s_partition_type, map->s_partition_root, map->s_partition_len); -if (strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR02 ) && -strcmp (p->partitionContents.ident,PD_PARTITION_CONTENTS_NSR03 )) + err =check_partition_desc (sb, p, map); +if (err) +return err; + +/* +* Skip loading allocation info it we cannot ever write to the fs. +* This is a correctness thing as we may have decided to force ro mount +* to avoid allocation info we don't support. +*/ +if (UDF_QUERY_FLAG (sb,UDF_FLAG_RW_INCOMPAT ))return 0 ; phd = (struct partitionHeaderDesc *)p->partitionContentsUse;
@@ -1051,9 +1109,6 @@ static int udf_fill_partdesc_info(struct super_block *sb, p_index, bitmap->s_extPosition); } -if (phd->partitionIntegrityTable.extLength) -udf_debug ("partitionIntegrityTable (part %d)\n" , p_index); - if (phd->freedSpaceTable.extLength) { struct kernel_lb_addr loc = { .logicalBlockNum = le32_to_cpu(
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/422 ASoC: dapm: Avoid uninitialised variable warning
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit fc269c0396448cabe1afd648c0b335669aa347b7 ]
Commit 4a75aae17b2a ("ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links") adds loops that iterate over multiple CODECs in snd_soc_dai_link_event. This also introduced a compiler warning for a potentially uninitialised variable in the case no CODECs are present. This should never be the case as the DAI link must by definition contain at least 1 CODEC however probably best to avoid the compiler warning by initialising ret to zero.
--- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-dapm.c +1 -1
@@ -3684,7 +3684,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,struct snd_pcm_hw_params *params =NULL ;struct snd_pcm_runtime *runtime =NULL ;unsigned int fmt; -int ret; +int ret =0 ;if (WARN_ON (!config) || WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/422 ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation
In reply to Greg Kroah-HartmanFrom: Yong Zhi <[email protected]>
[ Upstream commit 3b857472f34faa7d11001afa5e158833812c98d7 ]
Playback of 44.1Khz contents with HDMI plugged returns "Invalid pipe config" because HDMI paths in the FW topology are configured to operate at 48Khz.
This patch filters out sampling rates not supported at hdac_hdmi_create_dais() to let user space SRC to do the converting.
--- sound/soc/codecs/hdac_hdmi.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/codecs/hdac_hdmi.c +6 -0
@@ -1410,6 +1410,12 @@ static int hdac_hdmi_create_dais(struct hdac_device *hdev,if (ret)return ret; +/* Filter out 44.1, 88.2 and 176.4Khz */ + rates &= ~(SNDRV_PCM_RATE_44100 |SNDRV_PCM_RATE_88200 | +SNDRV_PCM_RATE_176400 ); +if (!rates) +return -EINVAL ; +sprintf (dai_name,"intel-hdmi-hifi%d" , i+1 ); hdmi_dais[i].name =devm_kstrdup (&hdev->dev, dai_name,GFP_KERNEL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/422 ata: Disable AHCI ALPM feature for Ampere Computing eMAG SATA
In reply to Greg Kroah-HartmanFrom: Suman Tripathi <[email protected]>
[ Upstream commit 20bdc376b427cb420836f39ee8f281ea85dbaeef ]
Due to hardware errata, Ampere Computing eMAG SATA can't support AHCI ALPM feature. This patch disables the AHCI ALPM feature for eMAG SATA.
--- drivers/ata/ahci_platform.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/ata/ahci_platform.c +14 -1
@@ -33,6 +33,13 @@ static const struct ata_port_info ahci_port_info = { .port_ops = &ahci_platform_ops, }; +static const struct ata_port_info ahci_port_info_nolpm = { + .flags =AHCI_FLAG_COMMON |ATA_FLAG_NO_LPM , + .pio_mask =ATA_PIO4 , + .udma_mask =ATA_UDMA6 , + .port_ops = &ahci_platform_ops, +}; +static struct scsi_host_template ahci_platform_sht = {AHCI_SHT (DRV_NAME ), };
@@ -41,6 +48,7 @@ static int ahci_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct ahci_host_priv *hpriv; +const struct ata_port_info *port;int rc; hpriv = ahci_platform_get_resources(pdev,
@@ -58,7 +66,11 @@ static int ahci_probe(struct platform_device *pdev)if (of_device_is_compatible (dev->of_node,"hisilicon,hisi-ahci" )) hpriv->flags |=AHCI_HFLAG_NO_FBS |AHCI_HFLAG_NO_NCQ ; - rc =ahci_platform_init_host (pdev, hpriv, &ahci_port_info, + port =acpi_device_get_match_data (dev); +if (!port) + port = &ahci_port_info; + + rc =ahci_platform_init_host (pdev, hpriv, port, &ahci_platform_sht);if (rc) goto disable_resources;
@@ -85,6 +97,7 @@ static const struct of_device_id ahci_of_match[] = {MODULE_DEVICE_TABLE (of, ahci_of_match);static const struct acpi_device_id ahci_acpi_match[] = { + {"APMC0D33" , (unsigned long )&ahci_port_info_nolpm }, {ACPI_DEVICE_CLASS (PCI_CLASS_STORAGE_SATA_AHCI ,0xffffff ) }, {}, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/422 of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit f6707fd6241e483f6fea2caae82d876e422bb11a ]
Cache nodes under the cpu node(s) is PowerMac specific according to the comment above, so make the code enforce that.
--- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/base.c +1 -1
@@ -2066,7 +2066,7 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)/* OF on pmac has nodes instead of properties named "l2-cache" * beneath CPU nodes. */ -if (!strcmp (np->type,"cpu" )) +if (IS_ENABLED (CONFIG_PPC_PMAC ) && !strcmp (np->type,"cpu" ))for_each_child_of_node (np, child)if (!strcmp (child->type,"cache" ))return child;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/422 ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit fa0d7dc355c890725b6178dab0cc11b194203afa ]
needed for device variants based on GTA04 board but with different display panel (driver).
--- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04.dtsi +1 -1
@@ -78,7 +78,7 @@ #sound-dai-cells = <0>; }; - spi_lcd { + spi_lcd: spi_lcd { compatible = "spi-gpio"; #address-cells = <0x1>; #size-cells = <0x0>;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/422 ARM: dts: omap3-gta04: fixes for tvout / venc
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit f6591391373dbff2c0200e1055d4ff86191578d2 ]
* fix connector compatibility (composite)
* add comment for gpio1 23
* add proper #address-cells
* we use only one venc_out channel for composite
--- arch/arm/boot/dts/omap3-gta04.dtsi | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap3-gta04.dtsi +7 -3
@@ -131,7 +131,7 @@ }; tv0: connector { - compatible = "svideo-connector"; + compatible = "composite-video-connector"; label = "tv"; port {
@@ -143,7 +143,7 @@ tv_amp: opa362 { compatible = "ti,opa362"; - enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; /* GPIO_23 to enable video out amplifier */ ports { #address-cells = <1>;
@@ -551,10 +551,14 @@ vdda-supply = <&vdac>; + #address-cells = <1>; + #size-cells = <0>; + port { + reg = <0>; venc_out: endpoint { remote-endpoint = <&opa_in>; - ti,channels = <2>; + ti,channels = <1>; ti,invert-polarity; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/422 ARM: dts: omap3-gta04: tvout: enable as display1 alias
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 8905592b6e50cec905e6c6035bbd36201a3bfac1 ]
The omap dss susbystem takes the display aliases to find out which displays exist. To enable tv-out we must define an alias.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap3-gta04.dtsi +1 -0
@@ -28,6 +28,7 @@ aliases { display0 = &lcd; + display1 = &tv0; }; /* fixed 26MHz oscillator */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/422 ARM: dts: omap3-gta04: fix touchscreen tsc2007
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 7384a24248eda140a234d356b6c840701ee9f055 ]
we fix penirq polarity, add penirq pinmux and touchscreen properties.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04.dtsi +17 -1
@@ -283,6 +283,13 @@ OMAP3_CORE1_IOPAD(0x2134, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio112 */ >; }; + + penirq_pins: pinmux_penirq_pins { + pinctrl-single,pins = < + /* here we could enable to wakeup the cpu from suspend by a pen touch */ + OMAP3_CORE1_IOPAD(0x2194, PIN_INPUT_PULLUP | MUX_MODE4) /* gpio160 */ + >; + }; }; &omap3_pmx_core2 {
@@ -423,10 +430,19 @@ tsc2007@48 { compatible = "ti,tsc2007"; reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&penirq_pins>; interrupt-parent = <&gpio6>; interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */ - gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; + gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* GPIO_160 */ ti,x-plate-ohms = <600>; + touchscreen-size-x = <480>; + touchscreen-size-y = <640>; + touchscreen-max-pressure = <1000>; + touchscreen-fuzz-x = <3>; + touchscreen-fuzz-y = <8>; + touchscreen-fuzz-pressure = <10>; + touchscreen-inverted-y; }; /* RFID EEPROM */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/422 ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit fa99c21ecb3cd4021a60d0e8bf880e78b5bd0729 ]
Vendor defined U-Boot has changed the partition scheme a while ago:
* kernel partition 6MB
* file system partition uses the remainder up to end of the NAND
* increased size of the environment partition (to get an OneNAND compatible base address)
* shrink the U-Boot partition
Let's be compatible (e.g. Debian kernel built from upstream).
--- arch/arm/boot/dts/omap3-gta04.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/omap3-gta04.dtsi +6 -6
@@ -619,22 +619,22 @@ bootloaders@80000 { label = "U-Boot"; - reg = <0x80000 0x1e0000>; + reg = <0x80000 0x1c0000>; }; - bootloaders_env@260000 { + bootloaders_env@240000 { label = "U-Boot Env"; - reg = <0x260000 0x20000>; + reg = <0x240000 0x40000>; }; kernel@280000 { label = "Kernel"; - reg = <0x280000 0x400000>; + reg = <0x280000 0x600000>; }; - filesystem@680000 { + filesystem@880000 { label = "File System"; - reg = <0x680000 0xf980000>; + reg = <0x880000 0>; /* 0 = MTDPART_SIZ_FULL */ }; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/422 ARM: dts: omap3-gta04: keep vpll2 always on
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit 1ae00833e30c9b4af5cbfda65d75b1de12f74013 ]
This is needed to make the display and venc work properly. Compare to omap3-beagle.dts.
--- arch/arm/boot/dts/omap3-gta04.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/omap3-gta04.dtsi +6 -0
@@ -548,6 +548,12 @@ regulator-max-microvolt = <3150000>; }; +/* Needed to power the DPI pins */ + +&vpll2 { + regulator-always-on; +}; + &dss { pinctrl-names = "default"; pinctrl-0 = < &dss_dpi_pins >;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/422 f2fs: submit bio after shutdown
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 5ce805869cbed93267ed26552ff76e30f05c91f7 ]
Sometimes, some merged IOs could get a chance to be submitted, resulting in system hang in shutdown test. This issues IOs all the time after shutdown.
--- fs/f2fs/data.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/data.c +2 -0
@@ -543,6 +543,8 @@ skip:if (fio->in_list) goto next; out: +if (is_sbi_flag_set (sbi,SBI_IS_SHUTDOWN )) +__submit_merged_bio (io);up_write (&io->io_rwsem); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/422 failover: Fix error return code in net_failover_create
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 09317da317e55e70ccbe23f65008348a4a1b7c7f ]
if failover_register failed, 'err' code should be set correctly
--- drivers/net/net_failover.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/net_failover.c +3 -1
@@ -765,8 +765,10 @@ struct failover *net_failover_create(struct net_device *standby_dev)netif_carrier_off (failover_dev); failover =failover_register (failover_dev, &net_failover_ops); -if (IS_ERR (failover)) +if (IS_ERR (failover)) { + err =PTR_ERR (failover); goto err_failover_register; + }return failover;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/422 sched/debug: Explicitly cast sched_feat() to bool
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 7e6f4c5d600c1c8e2a1d900e65cab319d9b6782e ]
LLVM has a warning that tags expressions like:
if (foo && non-bool-const)
This pattern triggers for CONFIG_SCHED_DEBUG=n where sched_feat() ends up being whatever bit we select. Avoid the warning with an explicit cast to bool.
--- kernel/sched/sched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/sched.h +1 -1
@@ -1389,7 +1389,7 @@ static const_debug __maybe_unused unsigned int sysctl_sched_features =0 ;#undef SCHED_FEAT -#define sched_feat (x) (sysctl_sched_features & (1UL << __SCHED_FEAT_##x)) +#define sched_feat (x) !!(sysctl_sched_features & (1UL << __SCHED_FEAT_##x))#endif /* SCHED_DEBUG && CONFIG_JUMP_LABEL */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/422 sched/debug: Use symbolic names for task state constants
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit ff28915fd31ccafc0d38e6f84b66df280ed9e86a ]
include/trace/events/sched.h includes <linux/sched.h> (via <linux/sched/numa_balancing.h>) and so knows about the TASK_* constants used to interpret .prev_state. So instead of duplicating the magic numbers make use of the defined macros to ease understanding the mapping from state bits to letters which isn't completely intuitive for an outsider.
--- include/trace/events/sched.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
include/trace/events/sched.h +8 -3
@@ -169,9 +169,14 @@ TRACE_EVENT(sched_switch, (__entry->prev_state & (TASK_REPORT_MAX -1 )) ?__print_flags (__entry->prev_state & (TASK_REPORT_MAX -1 ),"|" , - { 0x01, "S" }, { 0x02, "D" }, { 0x04, "T" }, - { 0x08, "t" }, { 0x10, "X" }, { 0x20, "Z" }, - { 0x40, "P" }, { 0x80, "I" }) : + { TASK_INTERRUPTIBLE, "S" }, + { TASK_UNINTERRUPTIBLE, "D" }, + { __TASK_STOPPED, "T" }, + { __TASK_TRACED, "t" }, + { EXIT_DEAD, "X" }, + { EXIT_ZOMBIE, "Z" }, + { TASK_PARKED, "P" }, + { TASK_DEAD, "I" }) :"R" , __entry->prev_state & TASK_REPORT_MAX ? "+" : "",
Signature · 1 line
2.20.1