Linux 5.10.198
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.10.198 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/am335x-guardian.dts | 9 arch/arm/boot/dts/am3517-evm.dts | 2 arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 2 arch/arm/boot/dts/motorola-mapphone-common.dtsi | 33 arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 6 arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi | 6 arch/arm/boot/dts/omap3-cm-t3517.dts | 12 arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 3 arch/arm/boot/dts/omap3-gta04.dtsi | 8 arch/arm/boot/dts/omap3-ldp.dts | 2 arch/arm/boot/dts/omap3-n900.dts | 40 arch/arm/boot/dts/omap3-zoom3.dts | 44 arch/arm/boot/dts/omap4-cpu-thermal.dtsi | 29 arch/arm/boot/dts/omap443x.dtsi | 1 arch/arm/boot/dts/omap4460.dtsi | 1 arch/arm/boot/dts/omap5-cm-t54.dts | 64 arch/arm64/include/asm/cputype.h | 2 arch/mips/alchemy/devboards/db1000.c | 4 arch/mips/alchemy/devboards/db1200.c | 6 arch/mips/alchemy/devboards/db1300.c | 4 arch/parisc/include/asm/ldcw.h | 36 arch/parisc/include/asm/ropes.h | 3 arch/parisc/include/asm/spinlock_types.h | 5 arch/parisc/kernel/drivers.c | 2 arch/parisc/kernel/irq.c | 2 arch/powerpc/kernel/hw_breakpoint.c | 7 arch/powerpc/perf/hv-24x7.c | 2 arch/x86/kernel/cpu/bugs.c | 4 arch/xtensa/boot/Makefile | 3 arch/xtensa/boot/lib/zmem.c | 5 arch/xtensa/include/asm/core.h | 4 arch/xtensa/platforms/iss/network.c | 4 block/blk-core.c | 2 block/blk-sysfs.c | 2 drivers/acpi/device_pm.c | 29 drivers/ata/ahci.c | 111 drivers/ata/ahci_brcm.c | 2 drivers/ata/ahci_xgene.c | 4 drivers/ata/libahci.c | 49 drivers/ata/libata-core.c | 41 drivers/ata/libata-eh.c | 13 drivers/ata/libata-sata.c | 2 drivers/ata/libata-scsi.c | 2 drivers/ata/libata-transport.c | 9 drivers/ata/libata.h | 2 drivers/base/regmap/regcache-rbtree.c | 3 drivers/block/rbd.c | 412 +- drivers/bus/ti-sysc.c | 31 drivers/char/agp/parisc-agp.c | 2 drivers/clk/imx/clk-pll14xx.c | 2 drivers/clk/tegra/clk-bpmp.c | 2 drivers/gpio/gpio-aspeed.c | 2 drivers/gpio/gpio-pmic-eic-sprd.c | 1 drivers/gpio/gpio-pxa.c | 1 drivers/gpio/gpio-tb10x.c | 6 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 drivers/i2c/busses/i2c-i801.c | 1 drivers/i2c/busses/i2c-npcm7xx.c | 17 drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 drivers/infiniband/core/cma.c | 2 drivers/infiniband/core/cma_configfs.c | 2 drivers/infiniband/core/nldev.c | 1 drivers/infiniband/core/uverbs_main.c | 2 drivers/infiniband/hw/mlx4/sysfs.c | 2 drivers/infiniband/hw/mlx5/main.c | 2 drivers/infiniband/sw/siw/siw_cm.c | 16 drivers/input/serio/i8042-acpipnpio.h | 1597 ++++++++++ drivers/input/serio/i8042-x86ia64io.h | 1590 --------- drivers/input/serio/i8042.h | 2 drivers/md/dm-zoned-target.c | 15 drivers/media/platform/qcom/venus/core.c | 12 drivers/media/platform/qcom/venus/core.h | 11 drivers/media/platform/qcom/venus/firmware.c | 28 drivers/media/platform/qcom/venus/hfi_venus.c | 94 drivers/media/platform/qcom/venus/hfi_venus_io.h | 114 drivers/media/platform/qcom/venus/pm_helpers.c | 12 drivers/mmc/host/renesas_sdhi_core.c | 37 drivers/mmc/host/tmio_mmc.h | 1 drivers/mmc/host/tmio_mmc_core.c | 8 drivers/mtd/ubi/build.c | 7 drivers/net/dsa/mv88e6xxx/chip.c | 6 drivers/net/dsa/mv88e6xxx/global1.c | 31 drivers/net/dsa/mv88e6xxx/global1.h | 1 drivers/net/dsa/mv88e6xxx/global2.c | 2 drivers/net/dsa/mv88e6xxx/global2.h | 1 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 drivers/net/ethernet/qlogic/qed/qed_ll2.h | 2 drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 7 drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 drivers/net/team/team.c | 10 drivers/net/thunderbolt.c | 3 drivers/net/usb/smsc75xx.c | 4 drivers/net/wan/fsl_ucc_hdlc.c | 12 drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 6 drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c | 4 drivers/net/wireless/marvell/mwifiex/sta_rx.c | 16 drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c | 7 drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c | 13 drivers/nvme/host/pci.c | 149 drivers/of/dynamic.c | 6 drivers/parisc/iosapic.c | 4 drivers/parisc/iosapic_private.h | 4 drivers/pci/controller/dwc/pcie-qcom.c | 2 drivers/platform/mellanox/Kconfig | 1 drivers/platform/x86/intel_scu_ipc.c | 66 drivers/power/supply/ucs1002_power.c | 3 drivers/s390/scsi/zfcp_aux.c | 9 drivers/scsi/pm8001/pm8001_hwi.c | 2 drivers/scsi/pm8001/pm80xx_hwi.c | 4 drivers/scsi/qedf/qedf_io.c | 10 drivers/scsi/qedf/qedf_main.c | 7 drivers/spi/spi-nxp-fspi.c | 7 drivers/spi/spi-zynqmp-gqspi.c | 24 drivers/target/target_core_device.c | 11 drivers/tty/n_gsm.c | 4 drivers/tty/serial/8250/8250_port.c | 5 drivers/video/fbdev/Kconfig | 2 drivers/watchdog/iTCO_wdt.c | 26 drivers/xen/events/events_base.c | 87 fs/binfmt_elf_fdpic.c | 5 fs/btrfs/extent_io.c | 8 fs/btrfs/super.c | 2 fs/ext4/ext4.h | 2 fs/ext4/mballoc.c | 138 fs/nfs/direct.c | 8 fs/nfs/flexfilelayout/flexfilelayout.c | 1 fs/nfs/nfs4proc.c | 4 fs/nfs/nfs4state.c | 47 fs/nfs/sysfs.c | 16 fs/nfs/write.c | 23 fs/nilfs2/gcinode.c | 6 fs/proc/task_nommu.c | 27 include/linux/acpi.h | 5 include/linux/bpf.h | 2 include/linux/btf_ids.h | 2 include/linux/cgroup.h | 3 include/linux/if_team.h | 2 include/linux/libata.h | 4 include/linux/netfilter/nf_conntrack_sctp.h | 1 include/linux/nfs_page.h | 4 include/linux/seqlock.h | 104 include/net/netfilter/ipv4/nf_reject.h | 4 include/net/netfilter/ipv6/nf_reject.h | 5 include/net/netfilter/nf_tables.h | 136 include/net/tcp.h | 6 include/uapi/linux/bpf.h | 4 include/uapi/linux/netfilter/nf_tables.h | 2 kernel/bpf/queue_stack_maps.c | 21 kernel/dma/debug.c | 20 kernel/sched/cpuacct.c | 84 kernel/trace/ring_buffer.c | 42 kernel/trace/trace.c | 27 kernel/trace/trace.h | 2 kernel/trace/trace_events.c | 6 kernel/trace/trace_events_inject.c | 3 mm/frame_vector.c | 6 net/bridge/br_forward.c | 4 net/bridge/br_input.c | 4 net/core/neighbour.c | 4 net/dccp/ipv4.c | 9 net/dccp/ipv6.c | 9 net/ipv4/netfilter/ipt_REJECT.c | 3 net/ipv4/netfilter/nf_reject_ipv4.c | 6 net/ipv4/netfilter/nft_reject_ipv4.c | 3 net/ipv4/route.c | 4 net/ipv4/tcp_input.c | 13 net/ipv4/tcp_output.c | 7 net/ipv6/netfilter/ip6t_REJECT.c | 2 net/ipv6/netfilter/nf_reject_ipv6.c | 5 net/ipv6/netfilter/nft_reject_ipv6.c | 3 net/l2tp/l2tp_ip6.c | 2 net/ncsi/ncsi-aen.c | 5 net/netfilter/ipset/ip_set_core.c | 12 net/netfilter/ipvs/ip_vs_sync.c | 4 net/netfilter/nf_conntrack_proto_sctp.c | 43 net/netfilter/nf_tables_api.c | 436 ++ net/netfilter/nf_tables_core.c | 2 net/netfilter/nf_tables_trace.c | 6 net/netfilter/nft_exthdr.c | 193 + net/netfilter/nft_flow_offload.c | 2 net/netfilter/nft_payload.c | 10 net/netfilter/nft_reject_inet.c | 6 net/netfilter/nft_set_hash.c | 87 net/netfilter/nft_set_pipapo.c | 115 net/netfilter/nft_set_rbtree.c | 199 - net/netfilter/nft_synproxy.c | 4 net/netfilter/nft_tproxy.c | 4 net/nfc/llcp_core.c | 2 net/rds/rdma_transport.c | 8 net/rds/tcp_connect.c | 2 net/sctp/associola.c | 3 net/sctp/socket.c | 1 net/socket.c | 29 net/sunrpc/clnt.c | 4 net/tipc/crypto.c | 4 scripts/mod/file2alias.c | 2 security/integrity/ima/Kconfig | 21 security/smack/smack.h | 1 security/smack/smack_lsm.c | 65 sound/pci/hda/hda_intel.c | 1 sound/soc/fsl/imx-audmix.c | 2 sound/soc/meson/axg-spdifin.c | 49 tools/include/linux/btf_ids.h | 2 tools/include/uapi/linux/bpf.h | 4 tools/perf/util/Build | 6 tools/power/cpupower/Makefile | 8 tools/power/cpupower/bench/Makefile | 2 tools/testing/selftests/ftrace/test.d/instances/instance-event.tc | 2 tools/testing/selftests/kselftest_deps.sh | 77 tools/testing/selftests/net/tls.c | 11 213 files changed, 4351 insertions(+), 3187 deletions(-)
Adam Ford (1):
bus: ti-sysc: Fix missing AM35xx SoC matching
Ahmed S. Darwish (1):
seqlock: Prefix internal seqcount_t-only macros with a "do_"
Alexandra Diupina (1):
drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
Andrey Ryabinin (1):
sched/cpuacct: Fix user/system in shown cpuacct.usage*
Andy Shevchenko (1):
serial: 8250_port: Check IRQ data before use
Arnaldo Carvalho de Melo (1):
perf build: Define YYNOMEM as YYNOABORT for bison < 3.81
Arnd Bergmann (3):
seqlock: avoid -Wshadow warnings
wifi: iwlwifi: dbg_ini: fix structure packing
ima: rework CONFIG_IMA dependency block
Artem Chernyshev (1):
net: rds: Fix possible NULL-pointer dereference
Bartosz Golaszewski (1):
gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
Ben Wolsieffer (2):
proc: nommu: /proc/<pid>/maps: release mmap read lock
net: stmmac: dwmac-stm32: fix resume on STM32 MCU
Benjamin Coddington (2):
NFS: Cleanup unused rpc_clnt variable
NFS: rename nfs_client_kset to nfs_kset
Benjamin Gray (1):
powerpc/watchpoints: Disable preemption in thread_change_pc()
Bernard Metzler (1):
RDMA/siw: Fix connection failure handling
Bryan O'Donoghue (3):
media: venus: core: Add io base variables for each block
media: venus: hfi,pm,firmware: Convert to block relative addressing
media: venus: core: Add differentiator IS_V6(core)
Carl Philipp Klemm (1):
ARM: dts: motorola-mapphone: Add 1.2GHz OPP
Chengfeng Ye (1):
tipc: fix a potential deadlock on &tx->lock
Chengming Zhou (3):
sched/cpuacct: Fix charge percpu cpuusage sched/cpuacct: Optimize away RCU read lock
cgroup: Fix suspicious rcu_dereference_check() usage warning
Christoph Hellwig (3):
MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled
nvme-pci: factor the iod mempool creation into a helper
nvme-pci: factor out a nvme_pci_alloc_dev helper
Christophe JAILLET (2):
gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() IB/mlx4: Fix the size of a buffer in add_port_entries()
Damien Le Moal (3):
ata: libata-core: Fix ata_port_request_pm() locking
ata: libata-core: Fix port and device removal
ata: libata-core: Do not register PM operations for SAS ports
Dan Carpenter (3):
power: supply: ucs1002: fix error code in ucs1002_get_property()
net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns()
of: dynamic: Fix potential memory leak in of_changeset_action()
Daniel Starke (1):
Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux"
David Howells (1):
ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
David Thompson (1):
platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig
Dikshita Agarwal (2):
media: venus: hfi: Define additional 6xx registers
media: venus: hfi: Add a 6xx boot logic
Dinghao Liu (2):
spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe
scsi: zfcp: Fix a double put in zfcp_port_enqueue()
Dmitry Monakhov (1):
ext4: mark group as trimmed only if it was fully scanned
Duje Mihanović (1):
gpio: pxa: disable pinctrl calls for MMP_GPIO
Eric Dumazet (3):
dccp: fix dccp_v4_err()/dccp_v6_err() again
net: bridge: use DEV_STATS_INC()
net: fix possible store tearing in neigh_periodic_work()
Fabio Estevam (1):
net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
Fedor Pchelkin (1):
dm zoned: free dmz->ddev array in dmz_put_zoned_devices
Felix Fietkau (1):
wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
Florian Westphal (10):
netfilter: nf_tables: don't skip expired elements during walk
netfilter: nf_tables: don't fail inserts if duplicate has expired
netfilter: nf_tables: defer gc run if previous batch is still pending
netfilter: nf_tables: fix memleak when more than 255 elements expired
netfilter: nf_tables: add and use nft_sk helper
netfilter: nf_tables: add and use nft_thoff helper
netfilter: exthdr: add support for tcp option removal
netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
netfilter: nf_tables: fix kdoc warnings after gc rework
netfilter: nftables: exthdr: fix 4-byte stack OOB write
Geert Uytterhoeven (1):
ARM: dts: motorola-mapphone: Drop second ti,wlcore compatible value
Gireesh Hiremath (1):
ARM: dts: am335x: Guardian: Update beeper label
Greg Kroah-Hartman (3):
Revert "clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz"
Revert "PCI: qcom: Disable write access to read only registers for IP v2.3.3"
Linux 5.10.198Greg Ungerer (1):
fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
Gustavo A. R. Silva (2):
qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
wifi: mwifiex: Fix tlv_buf_left calculation
Han Xu (1):
spi: nxp-fspi: reset the FLSHxCR1 registers
Hannes Reinecke (1):
ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones
Hans Verkuil (1):
media: vb2: frame_vector.c: replace WARN_ONCE with a comment
Heiner Kallweit (1):
i2c: i801: unregister tco_pdev in i801_probe() error path
Helge Deller (4):
parisc: sba: Fix compile warning wrt list of SBA devices
parisc: iosapic.c: Fix sparse warnings
parisc: drivers: Fix sparse warning
parisc: irq: Make irq_stack_union static to avoid sparse warning
Huacai Chen (1):
Input: i8042 - rename i8042-x86ia64io.h to i8042-acpipnpio.h
Ilya Dryomov (4):
rbd: move rbd_dev_refresh() definition
rbd: decouple header read-in from updating rbd_dev->header
rbd: decouple parent info read-in from updating rbd_dev
rbd: take header_rwsem in rbd_dev_refresh() only when updating
Irvin Cote (1):
nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev
Ivan Babrou (1):
cpupower: add Makefile dependencies for install targets
Ivan Vecera (1):
i40e: Fix VF VLAN offloading when port VLAN is configured
Jan Engelhardt (1):
netfilter: use actual socket sk for REJECT action
Jan Kara (2):
ext4: move setting of trimmed bit into ext4_try_to_trim_range()
ext4: do not let fstrim block system suspend
Javed Hasan (1):
scsi: qedf: Add synchronization between I/O completions and abort
Jeremy Cline (1):
net: nfc: llcp: Add lock when modifying device list
Jerome Brunet (1):
ASoC: meson: spdifin: start hw on dai probe
Jian Shen (1):
net: hns3: only enable unicast promisc when mac table full
Jie Wang (1):
net: hns3: add 5ms delay before clear firmware reset irq source
Jiri Olsa (1):
bpf: Fix BTF_ID symbol generation collision
Johan Hovold (1):
spi: zynqmp-gqspi: fix clock imbalance on probe failure
John David Anglin (1):
parisc: Restore __ldcw_align for PA-RISC 2.0 processors
Johnathan Mantey (1):
ncsi: Propagate carrier gain/loss events to the NCSI controller
Jordan Rife (2):
net: replace calls to sock->ops->connect() with kernel_connect()
net: prevent rewrite of msg_name in sock_sendmsg()
Josef Bacik (1):
btrfs: properly report 0 avail for very full file systems
Josh Poimboeuf (2):
x86/srso: Fix srso_show_state() side effect x86/srso: Fix SBPB enablement for spec_rstack_overflow=off
Jozsef Kadlecsik (1):
netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
Juergen Gross (1):
xen/events: replace evtchn_rwlock with RCU
Julien Panis (1):
bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset()
Junxiao Bi (1):
scsi: target: core: Fix deadlock due to recursive locking
Kailang Yang (1):
ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q
Kajol Jain (1):
powerpc/perf/hv-24x7: Update domain value check
Kees Cook (1):
selftests/tls: Add {} to avoid static checker warning
Kemeng Shi (1):
ext4: replace the traditional ternary conditional operator with with max()/min()
Konrad Dybcio (1):
media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
Konstantin Meskhidze (1):
RDMA/uverbs: Fix typo of sizeof argument
Krzysztof Kozlowski (1):
ARM: dts: omap: correct indentation
Kyle Zeng (1):
ipv4: fix null-deref in ipv4_link_failure
Leon Hwang (1):
bpf: Fix tr dereferencing
Leon Romanovsky (2):
RDMA/core: Require admin capabilities to set system parameters RDMA/cma: Fix truncation compilation warning in make_cma_ports
Lukas Bulwahn (1):
ext4: scope ret locally in ext4_try_to_trim_range()
Lukas Czerner (1):
ext4: change s_last_trim_minblks type to unsigned long
Mario Limonciello (2):
ata: ahci: Rename board_ahci_mobile
ACPI: Check StorageD3Enable _DSD property in ACPI code
Mark Zhang (1):
RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
Matthias Schiffer (1):
ata: libata-sata: increase PMP SRST timeout to 10s
Mauricio Faria de Oliveira (1):
modpost: add missing else to the "of" check
Max Filippov (2):
xtensa: add default definition for XCHAL_HAVE_DIV32
xtensa: boot/lib: fix function prototypes
Michal Grzedzicki (2):
scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command
scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG commandMika Westerberg (3):
watchdog: iTCO_wdt: No need to stop the timer in probe
watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running
net: thunderbolt: Fix TCPv6 GSO checksum calculation
Ming Lei (1):
block: fix use-after-free of q->q_usage_counter
Nathan Chancellor (1):
drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap()
Neal Cardwell (2):
tcp: fix quick-ack counting to count actual ACKs of new data
tcp: fix delayed ACKs for MSS boundary condition
Nick Desaulniers (1):
bpf: Fix BTF_ID symbol generation collision in tools/
Niklas Cassel (2):
ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES
Oleksandr Tymoshenko (1):
ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
Pablo Neira Ayuso (18):
netfilter: nf_tables: integrate pipapo into commit protocol
netfilter: nf_tables: GC transaction API to avoid race with control plane
netfilter: nf_tables: adapt set backend to use GC transaction API
netfilter: nft_set_hash: mark set element as dead when deleting from packet path
netfilter: nf_tables: remove busy mark and gc batch API
netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path
netfilter: nf_tables: GC transaction race with netns dismantle
netfilter: nf_tables: GC transaction race with abort path
netfilter: nf_tables: use correct lock to protect gc_list
netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction
netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention
netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails
netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration
netfilter: nf_tables: disallow element removal on anonymous sets
netfilter: nf_tables: unregister flowtable hooks on netns exit
netfilter: nf_tables: double hook unregistration in netns path
netfilter: nft_exthdr: break evaluation if setting TCP option fails
netfilter: nf_tables: disallow rule removal from chain binding
Pan Bian (1):
nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
Paul Menzel (2):
ata: libata: Rename link flag ATA_LFLAG_NO_DB_DELAY
ata: ahci: Add support for AMD A85 FCH (Hudson D4)
Peter Zijlstra (1):
seqlock: Rename __seqprop() users
Phil Sutter (3):
netfilter: nft_exthdr: Support SCTP chunks
netfilter: nft_exthdr: Search chunks in SCTP packets only
netfilter: nft_exthdr: Fix for unsafe packet data read
Pin-yen Lin (1):
wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
Pratyush Yadav (1):
nvme-pci: do not set the NUMA node of device if it has none
Qu Wenruo (1):
btrfs: reset destination buffer when read_extent_buffer() gets invalid range
Randy Dunlap (2):
xtensa: iss/network: make functions static
xtensa: boot: don't add include-dirs
Ricardo B. Marliere (1):
selftests: fix dependency checker script
Richard Fitzgerald (1):
regmap: rbtree: Fix wrong register marked as in-cache when creating new node
Rob Herring (1):
arm64: Add Cortex-A520 CPU part definition
Roberto Sassu (2):
smack: Record transmuting in smk_transmuted
smack: Retrieve transmuting information in smack_inode_getsecurity()
Sabrina Dubroca (1):
selftests: tls: swap the TX and RX sockets in some tests
Sebastian Andrzej Siewior (2):
locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()
bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI
Sergey Senozhatsky (1):
dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock
Shay Drory (1):
RDMA/mlx5: Fix NULL string error
Shengjiu Wang (1):
ASoC: imx-audmix: Fix return error with devm_clk_get()
Shigeru Yoshida (1):
net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
Stanislav Fomichev (1):
bpf: Clarify error expectations from bpf_clone_redirect
Stephen Boyd (4):
platform/x86: intel_scu_ipc: Check status after timeout in busy_loop() platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt() platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command() platform/x86: intel_scu_ipc: Fail IPC send if still busy
Steven Rostedt (Google) (4):
tracing: Increase trace array ref count on enable and filter files
tracing: Have event inject files inc the trace array ref count
ring-buffer: Do not attempt to read past "commit"
ring-buffer: Update "shortest_full" in polling
Szuying Chen (1):
ata: libahci: clear pending interrupt status
Thomas Zimmermann (1):
fbdev/sh7760fb: Depend on FB=y
Timo Alho (1):
clk: tegra: fix error return case for recalc_rate
Toke Høiland-Jørgensen (1):
bpf: Avoid deadlock when using queue and stack maps from NMI
Tony Lindgren (5):
ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4
ARM: dts: motorola-mapphone: Configure lower temperature passive cooling
ARM: dts: Unify pwm-omap-dmtimer node names
ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot
bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up
Trond Myklebust (6):
NFS: Use the correct commit info in nfs_join_page_group() NFS/pNFS: Report EINVAL errors from connect() to the server
SUNRPC: Mark the cred for revalidation if the server rejects it Revert "SUNRPC dont update timeout value on connection reset"
NFSv4: Fix a state manager thread deadlock regression
NFSv4: Fix a nfs4_state_manager() race
Vishal Goel (1):
Smack:- Use overlay inode label in smack_inode_copy_up()
Vlastimil Babka (1):
ring-buffer: remove obsolete comment for free_buffer_page()
Wang Jianchao (2):
ext4: remove the 'group' parameter of ext4_trim_extent
ext4: add new helper interface ext4_try_to_trim_range()
Wenhua Lin (1):
gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip
Werner Fischer (1):
ata: ahci: Add Elkhart Lake AHCI controller
Werner Sembach (1):
Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN
William A. Kennington III (1):
i2c: npcm7xx: Fix callback completion ordering
Wolfram Sang (5):
mmc: renesas_sdhi: probe into TMIO after SCC parameters have been setup
mmc: renesas_sdhi: populate SCC pointer at the proper place
mmc: tmio: support custom irq masks
mmc: renesas_sdhi: register irqs before registering controller
mmc: renesas_sdhi: only reset SCC when its pointer is populated
Xiao Liang (1):
netfilter: nft_exthdr: Fix non-linear header modification
Xiaoke Wang (1):
i2c: mux: demux-pinctrl: check the return value of devm_kstrdup()
Xin Long (3):
netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp
sctp: update transport state when processing a dupcook packet
sctp: update hb timer immediately after users change hb_interval
Zheng Yejian (3):
selftests/ftrace: Correctly enable event in instance-event.tc
ring-buffer: Avoid softlockup in ring_buffer_resize()
ring-buffer: Fix bytes info in per_cpu buffer stats
Zhihao Cheng (1):
ubi: Refuse attaching if mtd's erasesize is 0
Ziyang Xuan (1):
team: fix null-ptr-deref when team device type is changed
Greg Kroah-Hartman
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 197 +SUBLEVEL = 198 EXTRAVERSION = NAME = Dare mighty things
arch/arm/boot/dts/am335x-guardian.dts +5 -4
@@ -100,11 +100,12 @@ panel-info { }; - pwm7: dmtimer-pwm { + guardian_beeper: pwm-7 { compatible = "ti,omap-dmtimer-pwm"; + #pwm-cells = <3>; ti,timers = <&timer7>; pinctrl-names = "default"; - pinctrl-0 = <&dmtimer7_pins>; + pinctrl-0 = <&guardian_beeper_pins>; ti,clock-source = <0x01>; };
@@ -343,9 +344,9 @@ AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3) >; }; - dmtimer7_pins: pinmux_dmtimer7_pins { + guardian_beeper_pins: pinmux_dmtimer7_pins { pinctrl-single,pins = < - AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE5) + AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE5) /* (E18) timer7 */ >; };
arch/arm/boot/dts/am3517-evm.dts +1 -1
@@ -150,7 +150,7 @@ bl: backlight { enable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */ }; - pwm11: dmtimer-pwm@11 { + pwm11: pwm-11 { compatible = "ti,omap-dmtimer-pwm"; pinctrl-names = "default"; pinctrl-0 = <&pwm_pins>;
arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi +1 -1
@@ -59,7 +59,7 @@ led2 { }; }; - pwm10: dmtimer-pwm { + pwm10: pwm-10 { compatible = "ti,omap-dmtimer-pwm"; pinctrl-names = "default"; pinctrl-0 = <&pwm_pins>;
arch/arm/boot/dts/motorola-mapphone-common.dtsi +28 -5
@@ -156,7 +156,7 @@ soundcard { dais = <&mcbsp2_port>, <&mcbsp3_port>; }; - pwm8: dmtimer-pwm-8 { + pwm8: pwm-8 { pinctrl-names = "default"; pinctrl-0 = <&vibrator_direction_pin>;
@@ -166,7 +166,7 @@ pwm8: dmtimer-pwm-8 { ti,clock-source = <0x01>; }; - pwm9: dmtimer-pwm-9 { + pwm9: pwm-9 { pinctrl-names = "default"; pinctrl-0 = <&vibrator_enable_pin>;
@@ -192,6 +192,29 @@ backlight: backlight { }; }; +&cpu_thermal { + polling-delay = <10000>; /* milliseconds */ +}; + +&cpu_alert0 { + temperature = <80000>; /* millicelsius */ +}; + +&cpu0 { + /* + * Note that the 1.2GiHz mode is enabled for all SoC variants for + * the Motorola Android Linux v3.0.8 based kernel. + */ + operating-points = < + /* kHz uV */ + 300000 1025000 + 600000 1200000 + 800000 1313000 + 1008000 1375000 + 1200000 1375000 + >; +}; + &dss { status = "okay"; };
@@ -384,7 +407,7 @@ &mmc3 { #address-cells = <1>; #size-cells = <0>; wlcore: wlcore@2 { - compatible = "ti,wl1285", "ti,wl1283"; + compatible = "ti,wl1285"; reg = <2>; /* gpio_100 with gpmc_wait2 pad as wakeirq */ interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,
@@ -716,12 +739,12 @@ &rng_target { /* Configure pwm clock source for timers 8 & 9 */ &timer8 { assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>; - assigned-clock-parents = <&sys_clkin_ck>; + assigned-clock-parents = <&sys_32k_ck>; }; &timer9 { assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>; - assigned-clock-parents = <&sys_clkin_ck>; + assigned-clock-parents = <&sys_32k_ck>; }; /*
arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi +3 -3
@@ -8,9 +8,9 @@ / { vddvario: regulator-vddvario { - compatible = "regulator-fixed"; - regulator-name = "vddvario"; - regulator-always-on; + compatible = "regulator-fixed"; + regulator-name = "vddvario"; + regulator-always-on; }; vdd33a: regulator-vdd33a {
arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi +3 -3
@@ -12,9 +12,9 @@ / { vddvario: regulator-vddvario { - compatible = "regulator-fixed"; - regulator-name = "vddvario"; - regulator-always-on; + compatible = "regulator-fixed"; + regulator-name = "vddvario"; + regulator-always-on; }; vdd33a: regulator-vdd33a {
arch/arm/boot/dts/omap3-cm-t3517.dts +6 -6
@@ -11,12 +11,12 @@ / { model = "CompuLab CM-T3517"; compatible = "compulab,omap3-cm-t3517", "ti,am3517", "ti,omap3"; - vmmc: regulator-vmmc { - compatible = "regulator-fixed"; - regulator-name = "vmmc"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; + vmmc: regulator-vmmc { + compatible = "regulator-fixed"; + regulator-name = "vmmc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; wl12xx_vmmc2: wl12xx_vmmc2 { compatible = "regulator-fixed";
arch/arm/boot/dts/omap3-cpu-thermal.dtsi +1 -2
@@ -15,8 +15,7 @@ cpu_thermal: cpu_thermal { polling-delay = <1000>; /* milliseconds */ coefficients = <0 20000>; - /* sensor ID */ - thermal-sensors = <&bandgap 0>; + thermal-sensors = <&bandgap>; cpu_trips: trips { cpu_alert0: cpu_alert {
arch/arm/boot/dts/omap3-gta04.dtsi +4 -4
@@ -147,7 +147,7 @@ backlight: backlight { pinctrl-0 = <&backlight_pins>; }; - pwm11: dmtimer-pwm { + pwm11: pwm-11 { compatible = "ti,omap-dmtimer-pwm"; ti,timers = <&timer11>; #pwm-cells = <3>;
@@ -332,7 +332,7 @@ OMAP3_CORE1_IOPAD(0x2106, PIN_OUTPUT | MUX_MODE0) /* dss_data21.dss_data21 */ OMAP3_CORE1_IOPAD(0x2108, PIN_OUTPUT | MUX_MODE0) /* dss_data22.dss_data22 */ OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE0) /* dss_data23.dss_data23 */ >; - }; + }; gps_pins: pinmux_gps_pins { pinctrl-single,pins = <
@@ -866,8 +866,8 @@ &mcbsp4 { /* GSM voice PCM */ }; &hdqw1w { - pinctrl-names = "default"; - pinctrl-0 = <&hdq_pins>; + pinctrl-names = "default"; + pinctrl-0 = <&hdq_pins>; }; /* image signal processor within OMAP3 SoC */
arch/arm/boot/dts/omap3-ldp.dts +1 -1
@@ -301,5 +301,5 @@ &usb_otg_hs { &vaux1 { /* Needed for ads7846 */ - regulator-name = "vcc"; + regulator-name = "vcc"; };
arch/arm/boot/dts/omap3-n900.dts +20 -20
@@ -156,7 +156,7 @@ battery: n900-battery { io-channel-names = "temp", "bsi", "vbat"; }; - pwm9: dmtimer-pwm { + pwm9: pwm-9 { compatible = "ti,omap-dmtimer-pwm"; #pwm-cells = <3>; ti,timers = <&timer9>;
@@ -236,27 +236,27 @@ gpmc_pins: pinmux_gpmc_pins { pinctrl-single,pins = < /* address lines */ - OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0) /* gpmc_a1.gpmc_a1 */ - OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0) /* gpmc_a2.gpmc_a2 */ - OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0) /* gpmc_a3.gpmc_a3 */ + OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0) /* gpmc_a1.gpmc_a1 */ + OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0) /* gpmc_a2.gpmc_a2 */ + OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0) /* gpmc_a3.gpmc_a3 */ /* data lines, gpmc_d0..d7 not muxable according to TRM */ - OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0) /* gpmc_d8.gpmc_d8 */ - OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0) /* gpmc_d9.gpmc_d9 */ - OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0) /* gpmc_d10.gpmc_d10 */ - OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0) /* gpmc_d11.gpmc_d11 */ - OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0) /* gpmc_d12.gpmc_d12 */ - OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0) /* gpmc_d13.gpmc_d13 */ - OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0) /* gpmc_d14.gpmc_d14 */ - OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0) /* gpmc_d15.gpmc_d15 */ + OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0) /* gpmc_d8.gpmc_d8 */ + OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0) /* gpmc_d9.gpmc_d9 */ + OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0) /* gpmc_d10.gpmc_d10 */ + OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0) /* gpmc_d11.gpmc_d11 */ + OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0) /* gpmc_d12.gpmc_d12 */ + OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0) /* gpmc_d13.gpmc_d13 */ + OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0) /* gpmc_d14.gpmc_d14 */ + OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0) /* gpmc_d15.gpmc_d15 */ /* * gpmc_ncs0, gpmc_nadv_ale, gpmc_noe, gpmc_nwe, gpmc_wait0 not muxable * according to TRM. OneNAND seems to require PIN_INPUT on clock. */ - OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0) /* gpmc_ncs1.gpmc_ncs1 */ - OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0) /* gpmc_clk.gpmc_clk */ - >; + OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0) /* gpmc_ncs1.gpmc_ncs1 */ + OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0) /* gpmc_clk.gpmc_clk */ + >; }; i2c1_pins: pinmux_i2c1_pins {
@@ -738,12 +738,12 @@ tpa6130a2: tpa6130a2@60 { si4713: si4713@63 { compatible = "silabs,si4713"; - reg = <0x63>; + reg = <0x63>; - interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */ - reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */ - vio-supply = <&vio>; - vdd-supply = <&vaux1>; + interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */ + reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */ + vio-supply = <&vio>; + vdd-supply = <&vaux1>; }; bq24150a: bq24150a@6b {
arch/arm/boot/dts/omap3-zoom3.dts +22 -22
81 lines not on this page · raw message
arch/arm/boot/dts/omap4-cpu-thermal.dtsi +16 -13
@@ -15,21 +15,24 @@ cpu_thermal: cpu_thermal { polling-delay-passive = <250>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */ - /* sensor ID */ - thermal-sensors = <&bandgap 0>; + /* + * See 44xx files for single sensor addressing, omap5 and dra7 need + * also sensor ID for addressing. + */ + thermal-sensors = <&bandgap 0>; cpu_trips: trips { - cpu_alert0: cpu_alert { - temperature = <100000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "passive"; - }; - cpu_crit: cpu_crit { - temperature = <125000>; /* millicelsius */ - hysteresis = <2000>; /* millicelsius */ - type = "critical"; - }; - }; + cpu_alert0: cpu_alert { + temperature = <100000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + cpu_crit: cpu_crit { + temperature = <125000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; cpu_cooling_maps: cooling-maps { map0 {
arch/arm/boot/dts/omap443x.dtsi +1 -0
@@ -72,6 +72,7 @@ abb_iva: regulator-abb-iva { }; &cpu_thermal { + thermal-sensors = <&bandgap>; coefficients = <0 20000>; };
arch/arm/boot/dts/omap4460.dtsi +1 -0
@@ -89,6 +89,7 @@ abb_iva: regulator-abb-iva { }; &cpu_thermal { + thermal-sensors = <&bandgap>; coefficients = <348 (-9301)>; };
arch/arm/boot/dts/omap5-cm-t54.dts +32 -32
76 lines not on this page · raw message
arch/arm64/include/asm/cputype.h +2 -0
@@ -79,6 +79,7 @@#define ARM_CPU_PART_CORTEX_A78AE 0xD42#define ARM_CPU_PART_CORTEX_X1 0xD44#define ARM_CPU_PART_CORTEX_A510 0xD46 +#define ARM_CPU_PART_CORTEX_A520 0xD80#define ARM_CPU_PART_CORTEX_A710 0xD47#define ARM_CPU_PART_CORTEX_X2 0xD48#define ARM_CPU_PART_NEOVERSE_N2 0xD49
@@ -130,6 +131,7 @@#define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)#define MIDR_CORTEX_X1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)#define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510) +#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520)#define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)#define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2)#define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2)
arch/mips/alchemy/devboards/db1000.c +4 -0
@@ -164,6 +164,7 @@ static struct platform_device db1x00_audio_dev = {/******************************************************************************/ +#ifdef CONFIG_MMC_AU1X static irqreturn_t db1100_mmc_cd (int irq,void *ptr) {mmc_detect_change (ptr,msecs_to_jiffies (500 ));
@@ -369,6 +370,7 @@ static struct platform_device db1100_mmc1_dev = { .num_resources = ARRAY_SIZE(au1100_mmc1_res), .resource = au1100_mmc1_res, }; +#endif /* CONFIG_MMC_AU1X */ /******************************************************************************/
@@ -432,8 +434,10 @@ static struct platform_device *db1x00_devs[] = {static struct platform_device *db1100_devs[] = { &au1100_lcd_device, +#ifdef CONFIG_MMC_AU1X &db1100_mmc0_dev, &db1100_mmc1_dev, +#endif };int __init db1000_dev_setup (void )
arch/mips/alchemy/devboards/db1200.c +6 -0
@@ -326,6 +326,7 @@ static struct platform_device db1200_ide_dev = {/**********************************************************************/ +#ifdef CONFIG_MMC_AU1X /* SD carddetects: they're supposed to be edge-triggered, but ack * doesn't seem to work (CPLD Rev 2). Instead, the screaming one * is disabled and its counterpart enabled. The 200ms timeout is
@@ -584,6 +585,7 @@ static struct platform_device pb1200_mmc1_dev = { .num_resources = ARRAY_SIZE(au1200_mmc1_res), .resource = au1200_mmc1_res, }; +#endif /* CONFIG_MMC_AU1X */ /**********************************************************************/
@@ -751,7 +753,9 @@ static struct platform_device db1200_audiodma_dev = {static struct platform_device *db1200_devs[]__initdata = {NULL ,/* PSC0, selected by S6.8 */ &db1200_ide_dev, +#ifdef CONFIG_MMC_AU1X &db1200_mmc0_dev, +#endif &au1200_lcd_dev, &db1200_eth_dev, &db1200_nand_dev,
@@ -762,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = { };static struct platform_device *pb1200_devs[]__initdata = { +#ifdef CONFIG_MMC_AU1X &pb1200_mmc1_dev, +#endif };/* Some peripheral base addresses differ on the PB1200 */
arch/mips/alchemy/devboards/db1300.c +4 -0
@@ -450,6 +450,7 @@ static struct platform_device db1300_ide_dev = {/**********************************************************************/ +#ifdef CONFIG_MMC_AU1X static irqreturn_t db1300_mmc_cd (int irq,void *ptr) {disable_irq_nosync (irq);
@@ -632,6 +633,7 @@ static struct platform_device db1300_sd0_dev = { .resource = au1300_sd0_res, .num_resources = ARRAY_SIZE(au1300_sd0_res), }; +#endif /* CONFIG_MMC_AU1X */ /**********************************************************************/
@@ -776,8 +778,10 @@ static struct platform_device *db1300_dev[] __initdata = { &db1300_5waysw_dev, &db1300_nand_dev, &db1300_ide_dev, +#ifdef CONFIG_MMC_AU1X &db1300_sd0_dev, &db1300_sd1_dev, +#endif &db1300_lcd_dev, &db1300_ac97_dev, &db1300_i2s_dev,
arch/parisc/include/asm/ldcw.h +20 -16
@@ -2,14 +2,28 @@#ifndef __PARISC_LDCW_H#define __PARISC_LDCW_H -#ifndef CONFIG_PA20 /* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data, and GCC only guarantees 8-byte alignment for stack locals, we can't be assured of 16-byte alignment for atomic lock data even if we specify "__attribute ((aligned(16)))" in the type declaration. So, we use a struct containing an array of four ints for the atomic lock type and dynamically select the 16-byte aligned int from the array -for the semaphore. */ +for the semaphore. */ + +/* From: "Jim Hull" <jim.hull of hp.com> +I've attached a summary of the change, but basically, for PA 2.0, as +long as the ",CO" (coherent operation) completer is implemented, then the +16-byte alignment requirement for ldcw and ldcd is relaxed, and instead +they only require "natural" alignment (4-byte for ldcw, 8-byte for +ldcd). + +Although the cache control hint is accepted by all PA 2.0 processors, +it is only implemented on PA8800/PA8900 CPUs. Prior PA8X00 CPUs still +require 16-byte alignment. If the address is unaligned, the operation +of the instruction is undefined. The ldcw instruction does not generate +unaligned data reference traps so misaligned accesses are not detected. +This hid the problem for years. So, restore the 16-byte alignment dropped +by Kyle McMartin in "Remove __ldcw_align for PA-RISC 2.0 processors". */ #define __PA_LDCW_ALIGNMENT 16#define __PA_LDCW_ALIGN_ORDER 4
@@ -19,22 +33,12 @@ & ~(__PA_LDCW_ALIGNMENT -1 ); \ (volatile unsigned int *) __ret; \ }) -#define __LDCW "ldcw" -#else /*CONFIG_PA20*/ -/* From: "Jim Hull" <jim.hull of hp.com> -I've attached a summary of the change, but basically, for PA 2.0, as -long as the ",CO" (coherent operation) completer is specified, then the -16-byte alignment requirement for ldcw and ldcd is relaxed, and instead -they only require "natural" alignment (4-byte for ldcw, 8-byte for -ldcd). */ - -#define __PA_LDCW_ALIGNMENT 4 -#define __PA_LDCW_ALIGN_ORDER 2 -#define __ldcw_align (a) (&(a)->slock) +#ifdef CONFIG_PA20 #define __LDCW "ldcw,co" - -#endif /*!CONFIG_PA20*/ +#else +#define __LDCW "ldcw" +#endif /* LDCW, the only atomic read-write operation PA-RISC has. *sigh*. We don't explicitly expose that "*a" may be written as reload
arch/parisc/include/asm/ropes.h +3 -0
@@ -86,6 +86,9 @@ struct sba_device {struct ioc ioc[MAX_IOC ]; }; +/* list of SBA's in system, see drivers/parisc/sba_iommu.c */ +extern struct sba_device *sba_list; +#define ASTRO_RUNWAY_PORT 0x582#define IKE_MERCED_PORT 0x803#define REO_MERCED_PORT 0x804
arch/parisc/include/asm/spinlock_types.h +0 -5
@@ -3,13 +3,8 @@#define __ASM_SPINLOCK_TYPES_Htypedef struct { -#ifdef CONFIG_PA20 -volatile unsigned int slock; -# define __ARCH_SPIN_LOCK_UNLOCKED { 1 } -#else volatile unsigned int lock[4 ];# define __ARCH_SPIN_LOCK_UNLOCKED { { 1, 1, 1, 1 } } -#endif }arch_spinlock_t ;
arch/parisc/kernel/drivers.c +1 -1
@@ -925,9 +925,9 @@ static __init void qemu_header(void)pr_info ("#define PARISC_MODEL \"%s\"\n\n" , boot_cpu_data.pdc.sys_model_name); +#define p ((unsigned long *)&boot_cpu_data.pdc.model)pr_info ("#define PARISC_PDC_MODEL 0x%lx, 0x%lx, 0x%lx, " "0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx\n\n" , - #define p ((unsigned long *)&boot_cpu_data.pdc.model) p[0 ], p[1 ], p[2 ], p[3 ], p[4 ], p[5 ], p[6 ], p[7 ], p[8 ]);#undef p
arch/parisc/kernel/irq.c +1 -1
@@ -388,7 +388,7 @@ union irq_stack_union {volatile unsigned int lock[1 ]; }; -DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = { +static DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = { .slock = {1 ,1 ,1 ,1 }, };#endif
arch/powerpc/kernel/hw_breakpoint.c +6 -1
@@ -479,11 +479,13 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)struct arch_hw_breakpoint *info;int i; +preempt_disable (); +for (i =0 ; i <nr_wp_slots (); i++) {if (unlikely (tsk->thread.last_hit_ubp[i])) goto reset; } -return ; + goto out; reset: regs->msr &= ~MSR_SE ;
@@ -492,6 +494,9 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)__set_breakpoint (i, info); tsk->thread.last_hit_ubp[i] =NULL ; } + +out: +preempt_enable (); }static bool is_larx_stcx_instr (int type)
arch/powerpc/perf/hv-24x7.c +1 -1
@@ -1410,7 +1410,7 @@ static int h_24x7_event_init(struct perf_event *event) } domain =event_get_domain (event); -if (domain >=HV_PERF_DOMAIN_MAX ) { +if (domain ==0 || domain >=HV_PERF_DOMAIN_MAX ) {pr_devel ("invalid domain %d\n" , domain);return -EINVAL ; }
arch/x86/kernel/cpu/bugs.c +2 -2
@@ -2344,7 +2344,7 @@ static void __init srso_select_mitigation(void)switch (srso_cmd) {case SRSO_CMD_OFF : -return ; + goto pred_cmd;case SRSO_CMD_MICROCODE :if (has_microcode) {
@@ -2622,7 +2622,7 @@ static ssize_t srso_show_state(char *buf)return sysfs_emit (buf,"%s%s\n" , srso_strings[srso_mitigation], - (cpu_has_ibpb_brtype_microcode () ?"" :", no microcode" )); +boot_cpu_has (X86_FEATURE_IBPB_BRTYPE ) ?"" :", no microcode" ); } static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,
arch/xtensa/boot/Makefile +1 -2
@@ -9,8 +9,7 @@ # KBUILD_CFLAGS used when building rest of boot (takes effect recursively) -KBUILD_CFLAGS += -fno-builtin -Iarch/$(ARCH)/boot/include -HOSTFLAGS += -Iarch/$(ARCH)/boot/include +KBUILD_CFLAGS += -fno-builtin BIG_ENDIAN := $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
arch/xtensa/boot/lib/zmem.c +3 -2
@@ -4,13 +4,14 @@/* bits taken from ppc */ extern void *avail_ram, *end_avail; +void gunzip (void *dst,int dstlen,unsigned char *src,int *lenp); -void exit (void ) +static void exit (void ) {for (;;); } -void *zalloc (unsigned size) +static void *zalloc (unsigned int size) {void *p = avail_ram;
arch/xtensa/include/asm/core.h +4 -0
@@ -6,6 +6,10 @@#include <variant/core.h> +#ifndef XCHAL_HAVE_DIV32 +#define XCHAL_HAVE_DIV32 0 +#endif +#ifndef XCHAL_HAVE_EXCLUSIVE #define XCHAL_HAVE_EXCLUSIVE 0#endif
arch/xtensa/platforms/iss/network.c +2 -2
@@ -204,7 +204,7 @@ static int tuntap_write(struct iss_net_private *lp, struct sk_buff **skb)return simc_write (lp->tp.info.tuntap.fd, (*skb)->data, (*skb)->len); } -unsigned short tuntap_protocol (struct sk_buff *skb) +static unsigned short tuntap_protocol (struct sk_buff *skb) {return eth_type_trans (skb, skb->dev); }
@@ -477,7 +477,7 @@ static int iss_net_change_mtu(struct net_device *dev, int new_mtu)return -EINVAL ; } -void iss_net_user_timer_expire (struct timer_list *unused) +static void iss_net_user_timer_expire (struct timer_list *unused) { }
block/blk-core.c +0 -2
@@ -414,8 +414,6 @@ void blk_cleanup_queue(struct request_queue *q)blk_mq_sched_free_requests (q);mutex_unlock (&q->sysfs_lock); -percpu_ref_exit (&q->q_usage_counter); -/* @q is and will stay empty, shutdown and put */ blk_put_queue (q); }
block/blk-sysfs.c +2 -0
@@ -726,6 +726,8 @@ static void blk_free_queue_rcu(struct rcu_head *rcu_head) { struct request_queue *q = container_of(rcu_head, struct request_queue, rcu_head); + +percpu_ref_exit (&q->q_usage_counter);kmem_cache_free (blk_requestq_cachep, q); }
drivers/acpi/device_pm.c +29 -0
@@ -1326,4 +1326,33 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) return 1; }EXPORT_SYMBOL_GPL (acpi_dev_pm_attach); + +/** +* acpi_storage_d3 - Check if D3 should be used in the suspend path +* @dev: Device to check +* +* Return %true if the platform firmware wants @dev to be programmed +* into D3hot or D3cold (if supported) in the suspend path, or %false +* when there is no specific preference. On some platforms, if this +* hint is ignored, @dev may remain unresponsive after suspending the +* platform as a whole. +* +* Although the property has storage in the name it actually is +* applied to the PCIe slot and plugging in a non-storage device the +* same platform restrictions will likely apply. +*/ +bool acpi_storage_d3 (struct device *dev) +{ +struct acpi_device *adev =ACPI_COMPANION (dev); +u8 val; + +if (!adev) +return false; +if (fwnode_property_read_u8 (acpi_fwnode_handle (adev),"StorageD3Enable" , + &val)) +return false; +return val ==1 ; +} +EXPORT_SYMBOL_GPL (acpi_storage_d3); +#endif /* CONFIG_PM */
drivers/ata/ahci.c +60 -51
208 lines not on this page · raw message
drivers/ata/ahci_brcm.c +1 -1
@@ -332,7 +332,7 @@ static struct ata_port_operations ahci_brcm_platform_ops = {static const struct ata_port_info ahci_brcm_port_info = { .flags =AHCI_FLAG_COMMON |ATA_FLAG_NO_DIPM , - .link_flags =ATA_LFLAG_NO_DB_DELAY , + .link_flags =ATA_LFLAG_NO_DEBOUNCE_DELAY , .pio_mask =ATA_PIO4 , .udma_mask =ATA_UDMA6 , .port_ops = &ahci_brcm_platform_ops,
drivers/ata/ahci_xgene.c +0 -4
@@ -588,8 +588,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)void __iomem *mmio;u32 irq_stat, irq_masked; -VPRINTK ("ENTER\n" ); - hpriv = host->private_data; mmio = hpriv->mmio;
@@ -612,8 +610,6 @@ static irqreturn_t xgene_ahci_irq_intr(int irq, void *dev_instance)spin_unlock (&host->lock); -VPRINTK ("EXIT\n" ); -return IRQ_RETVAL (rc); }
drivers/ata/libahci.c +25 -24
106 lines not on this page · raw message
drivers/ata/libata-core.c +30 -11
75 lines not on this page · raw message
drivers/ata/libata-eh.c +3 -10
@@ -2703,18 +2703,11 @@ int ata_eh_reset(struct ata_link *link, int classify,postreset (slave, classes); } -/* -* Some controllers can't be frozen very well and may set spurious -* error conditions during reset. Clear accumulated error -* information and re-thaw the port if frozen. As reset is the -* final recovery action and we cross check link onlineness against -* device classification later, no hotplug event is lost by this. -*/ +/* clear cached SError */ spin_lock_irqsave (link->ap->lock, flags); -memset (&link->eh_info,0 ,sizeof (link->eh_info)); + link->eh_info.serror =0 ;if (slave) -memset (&slave->eh_info,0 ,sizeof (link->eh_info)); - ap->pflags &= ~ATA_PFLAG_EH_PENDING ; + slave->eh_info.serror =0 ;spin_unlock_irqrestore (link->ap->lock, flags);if (ap->pflags &ATA_PFLAG_FROZEN )
drivers/ata/libata-sata.c +1 -1
@@ -317,7 +317,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,* immediately after resuming. Delay 200ms before * debouncing. */ -if (!(link->flags &ATA_LFLAG_NO_DB_DELAY )) +if (!(link->flags &ATA_LFLAG_NO_DEBOUNCE_DELAY ))ata_msleep (link->ap,200 );/* is SControl restored correctly? */
drivers/ata/libata-scsi.c +1 -1
@@ -4259,7 +4259,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)break ;case MAINTENANCE_IN : -if (scsicmd[1 ] ==MI_REPORT_SUPPORTED_OPERATION_CODES ) +if ((scsicmd[1 ] &0x1f ) ==MI_REPORT_SUPPORTED_OPERATION_CODES )ata_scsi_rbuf_fill (&args, ata_scsiop_maint_in);else ata_scsi_set_invalid_field (dev, cmd,1 ,0xff );
drivers/ata/libata-transport.c +8 -1
@@ -266,6 +266,10 @@ void ata_tport_delete(struct ata_port *ap)put_device (dev); } +static const struct device_type ata_port_sas_type = { + .name =ATA_PORT_TYPE_NAME , +}; +/** ata_tport_add - initialize a transport ATA port structure * * @parent: parent device
@@ -283,7 +287,10 @@ int ata_tport_add(struct device *parent,struct device *dev = &ap->tdev;device_initialize (dev); - dev->type = &ata_port_type; +if (ap->flags &ATA_FLAG_SAS_HOST ) + dev->type = &ata_port_sas_type; +else + dev->type = &ata_port_type; dev->parent = parent;ata_host_get (ap->host);
drivers/ata/libata.h +2 -0
@@ -30,6 +30,8 @@ enum { ATA_DNXFER_QUIET = (1 << 31), }; +#define ATA_PORT_TYPE_NAME "ata_port" +extern atomic_t ata_print_id;extern int atapi_passthru16;extern int libata_fua;
drivers/base/regmap/regcache-rbtree.c +2 -1
@@ -453,7 +453,8 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,if (!rbnode)return -ENOMEM ;regcache_rbtree_set_register (map, rbnode, - reg - rbnode->base_reg, value); + (reg - rbnode->base_reg) / map->reg_stride, + value);regcache_rbtree_insert (map, &rbtree_ctx->root, rbnode); rbtree_ctx->cached_rbnode = rbnode; }
drivers/block/rbd.c +225 -187
654 lines not on this page · raw message
drivers/bus/ti-sysc.c +22 -9
@@ -38,6 +38,7 @@ enum sysc_soc {SOC_2420 ,SOC_2430 ,SOC_3430 , +SOC_AM35 ,SOC_3630 ,SOC_4430 , SOC_4460,
@@ -1113,6 +1114,11 @@ static int sysc_enable_module(struct device *dev)if (ddata->cfg.quirks & (SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_SWSUP_SIDLE_ACT )) { best_mode =SYSC_IDLE_NO ; + +/* Clear WAKEUP */ +if (regbits->enwkup_shift >=0 && + ddata->cfg.sysc_val &BIT (regbits->enwkup_shift)) + reg &= ~BIT (regbits->enwkup_shift); }else { best_mode =fls (ddata->cfg.sidlemodes) -1 ;if (best_mode >SYSC_IDLE_MASK ) {
@@ -1233,6 +1239,13 @@ static int sysc_disable_module(struct device *dev) } } +if (ddata->cfg.quirks &SYSC_QUIRK_SWSUP_SIDLE_ACT ) { +/* Set WAKEUP */ +if (regbits->enwkup_shift >=0 && + ddata->cfg.sysc_val &BIT (regbits->enwkup_shift)) + reg |=BIT (regbits->enwkup_shift); + } + reg &= ~(SYSC_IDLE_MASK << regbits->sidle_shift); reg |= best_mode << regbits->sidle_shift; if (regbits->autoidle_shift >= 0 &&
@@ -1496,16 +1509,16 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {SYSC_QUIRK ("smartreflex" ,0 , -ENODEV ,0x38 , -ENODEV ,0x00000000 ,0xffffffff ,SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x00000046 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x00000052 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),/* Uarts on omap4 and later */ SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x50411e03 ,0xffff00ff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x47422e03 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),SYSC_QUIRK ("uart" ,0 ,0x50 ,0x54 ,0x58 ,0x47424e03 ,0xffffffff , -SYSC_QUIRK_SWSUP_SIDLE |SYSC_QUIRK_LEGACY_IDLE ), +SYSC_QUIRK_SWSUP_SIDLE_ACT |SYSC_QUIRK_LEGACY_IDLE ),/* Quirks that need to be set based on the module address */ SYSC_QUIRK("mcpdm", 0x40132000, 0, 0x10, -ENODEV, 0x50000800, 0xffffffff,
@@ -1818,7 +1831,7 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata)dev_warn (ddata->dev,"%s: timed out %08x !+ %08x\n" , __func__, val, irq_mask); -if (sysc_soc->soc ==SOC_3430 ) { +if (sysc_soc->soc ==SOC_3430 || sysc_soc->soc ==SOC_AM35 ) {/* Clear DSS_SDI_CONTROL */ sysc_write (ddata,0x44 ,0 );
@@ -2085,8 +2098,7 @@ static int sysc_reset(struct sysc *ddata) }if (ddata->cfg.srst_udelay) -usleep_range (ddata->cfg.srst_udelay, - ddata->cfg.srst_udelay *2 ); +fsleep (ddata->cfg.srst_udelay);if (ddata->post_reset_quirk) ddata->post_reset_quirk (ddata);
@@ -2960,6 +2972,7 @@ static void ti_sysc_idle(struct work_struct *work)static const struct soc_device_attribute sysc_soc_match[] = {SOC_FLAG ("OMAP242*" ,SOC_2420 ),SOC_FLAG ("OMAP243*" ,SOC_2430 ), +SOC_FLAG ("AM35*" ,SOC_AM35 ),SOC_FLAG ("OMAP3[45]*" ,SOC_3430 ),SOC_FLAG ("OMAP3[67]*" ,SOC_3630 ),SOC_FLAG ("OMAP443*" ,SOC_4430 ),
@@ -3147,7 +3160,7 @@ static int sysc_check_active_timer(struct sysc *ddata)* can be dropped if we stop supporting old beagleboard revisions * A to B4 at some point. */ -if (sysc_soc->soc ==SOC_3430 ) +if (sysc_soc->soc ==SOC_3430 || sysc_soc->soc ==SOC_AM35 ) error = -ENXIO ;else error = -EBUSY ;
drivers/char/agp/parisc-agp.c +0 -2
@@ -394,8 +394,6 @@ find_quicksilver(struct device *dev, void *data)static int __init parisc_agp_init (void ) { -extern struct sba_device *sba_list; -int err =-1 ;struct parisc_device *sba =NULL , *lba =NULL ;struct lba_device *lbadev =NULL ;
drivers/clk/imx/clk-pll14xx.c +2 -0
@@ -60,6 +60,8 @@ static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = {PLL_1443X_RATE (650000000U ,325 ,3 ,2 ,0 ),PLL_1443X_RATE (594000000U ,198 ,2 ,2 ,0 ),PLL_1443X_RATE (519750000U ,173 ,2 ,2 ,16384 ), +PLL_1443X_RATE (393216000U ,262 ,2 ,3 ,9437 ), + PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), }; struct imx_pll14xx_clk imx_1443x_pll = {
drivers/clk/tegra/clk-bpmp.c +1 -1
@@ -159,7 +159,7 @@ static unsigned long tegra_bpmp_clk_recalc_rate(struct clk_hw *hw, err =tegra_bpmp_clk_transfer (clk->bpmp, &msg);if (err <0 ) -return err; +return 0 ;return response.rate; }
drivers/gpio/gpio-aspeed.c +1 -1
@@ -966,7 +966,7 @@ static int aspeed_gpio_set_config(struct gpio_chip *chip, unsigned int offset,else if (param ==PIN_CONFIG_BIAS_DISABLE || param ==PIN_CONFIG_BIAS_PULL_DOWN || param ==PIN_CONFIG_DRIVE_STRENGTH ) -return pinctrl_gpio_set_config (offset, config); +return pinctrl_gpio_set_config (chip->base + offset, config);else if (param ==PIN_CONFIG_DRIVE_OPEN_DRAIN || param ==PIN_CONFIG_DRIVE_OPEN_SOURCE )/* Return -ENOTSUPP to trigger emulation, as per datasheet */
drivers/gpio/gpio-pmic-eic-sprd.c +1 -0
@@ -338,6 +338,7 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev) pmic_eic->chip.set_config = sprd_pmic_eic_set_config; pmic_eic->chip.set = sprd_pmic_eic_set; pmic_eic->chip.get = sprd_pmic_eic_get; + pmic_eic->chip.can_sleep = true; pmic_eic->intc.name =dev_name (&pdev->dev); pmic_eic->intc.irq_mask = sprd_pmic_eic_irq_mask;
drivers/gpio/gpio-pxa.c +1 -0
@@ -243,6 +243,7 @@ static bool pxa_gpio_has_pinctrl(void)switch (gpio_type) {case PXA3XX_GPIO :case MMP2_GPIO : +case MMP_GPIO :return false;default :
drivers/gpio/gpio-tb10x.c +5 -1
@@ -195,7 +195,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev) handle_edge_irq,IRQ_NOREQUEST ,IRQ_NOPROBE , IRQ_GC_INIT_MASK_CACHE);if (ret) -return ret; + goto err_remove_domain; gc = tb10x_gpio->domain->gc->gc[0 ]; gc->reg_base = tb10x_gpio->base;
@@ -209,6 +209,10 @@ static int tb10x_gpio_probe(struct platform_device *pdev) }return 0 ; + +err_remove_domain: +irq_domain_remove (tb10x_gpio->domain); +return ret; }static int tb10x_gpio_remove (struct platform_device *pdev)
drivers/gpu/drm/mediatek/mtk_drm_gem.c +1 -1
@@ -252,7 +252,7 @@ void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj)if (!mtk_gem->kvaddr) {kfree (sgt);kfree (mtk_gem->pages); -return -ENOMEM ; +return NULL ; } out:kfree (sgt);
drivers/i2c/busses/i2c-i801.c +1 -0
@@ -1907,6 +1907,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) "SMBus I801 adapter at %04lx", priv->smba); err =i2c_add_adapter (&priv->adapter);if (err) { +platform_device_unregister (priv->tco_pdev);i801_acpi_remove (priv);return err; }
drivers/i2c/busses/i2c-npcm7xx.c +7 -10
@@ -675,6 +675,7 @@ static void npcm_i2c_callback(struct npcm_i2c *bus, {struct i2c_msg *msgs;int msgs_num; +bool do_complete = false; msgs = bus->msgs; msgs_num = bus->msgs_num;
@@ -701,23 +702,17 @@ static void npcm_i2c_callback(struct npcm_i2c *bus, msgs[1].flags & I2C_M_RD) msgs[1 ].len = info; } -if (completion_done (&bus->cmd_complete) == false) -complete (&bus->cmd_complete); -break ; - + do_complete = true; +break ;case I2C_NACK_IND :/* MASTER transmit got a NACK before tx all bytes */ bus->cmd_err = -ENXIO ; -if (bus->master_or_slave ==I2C_MASTER ) -complete (&bus->cmd_complete); - + do_complete = true;break ;case I2C_BUS_ERR_IND :/* Bus error */ bus->cmd_err = -EAGAIN ; -if (bus->master_or_slave ==I2C_MASTER ) -complete (&bus->cmd_complete); - + do_complete = true;break ;case I2C_WAKE_UP_IND :/* I2C wake up */
@@ -731,6 +726,8 @@ static void npcm_i2c_callback(struct npcm_i2c *bus,if (bus->slave) bus->master_or_slave =I2C_SLAVE ;#endif +if (do_complete) +complete (&bus->cmd_complete); }static u8 npcm_i2c_fifo_usage (struct npcm_i2c *bus)
drivers/i2c/muxes/i2c-demux-pinctrl.c +4 -0
@@ -243,6 +243,10 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) props[i].name =devm_kstrdup (&pdev->dev,"status" ,GFP_KERNEL ); props[i].value =devm_kstrdup (&pdev->dev,"ok" ,GFP_KERNEL ); +if (!props[i].name || !props[i].value) { + err = -ENOMEM ; + goto err_rollback; + } props[i].length =3 ;of_changeset_init (&priv->chan[i].chgset);
drivers/infiniband/core/cma.c +1 -1
@@ -4723,7 +4723,7 @@ static int cma_iboe_join_multicast(struct rdma_id_private *id_priv,int err =0 ;struct sockaddr *addr = (struct sockaddr *)&mc->addr;struct net_device *ndev =NULL ; -struct ib_sa_multicast ib; +struct ib_sa_multicast ib = {};enum ib_gid_type gid_type;bool send_only;
drivers/infiniband/core/cma_configfs.c +1 -1
@@ -221,7 +221,7 @@ static int make_cma_ports(struct cma_dev_group *cma_dev_group, }for (i =0 ; i < ports_num; i++) { -char port_str[10 ]; +char port_str[11 ]; ports[i].port_num = i +1 ;snprintf (port_str,sizeof (port_str),"%u" , i +1 );
drivers/infiniband/core/nldev.c +1 -0
@@ -2148,6 +2148,7 @@ static const struct rdma_nl_cbs nldev_cb_table[RDMA_NLDEV_NUM_OPS] = { }, [RDMA_NLDEV_CMD_SYS_SET] = { .doit = nldev_set_sys_set_doit, + .flags = RDMA_NL_ADMIN_PERM, }, [RDMA_NLDEV_CMD_STAT_SET] = { .doit = nldev_stat_set_doit,
drivers/infiniband/core/uverbs_main.c +1 -1
@@ -535,7 +535,7 @@ static ssize_t verify_hdr(struct ib_uverbs_cmd_hdr *hdr,if (hdr->in_words *4 != count)return -EINVAL ; -if (count < method_elm->req_size +sizeof (hdr)) { +if (count < method_elm->req_size +sizeof (*hdr)) {/* * rdma-core v18 and v19 have a bug where they send DESTROY_CQ * with a 16 byte write instead of 24. Old kernels didn't
drivers/infiniband/hw/mlx4/sysfs.c +1 -1
@@ -221,7 +221,7 @@ void del_sysfs_port_mcg_attr(struct mlx4_ib_dev *device, int port_num,static int add_port_entries (struct mlx4_ib_dev *device,int port_num) {int i; -char buff[11 ]; +char buff[12 ];struct mlx4_ib_iov_port *port =NULL ;int ret =0 ;struct ib_port_attr attr;
drivers/infiniband/hw/mlx5/main.c +1 -1
@@ -2069,7 +2069,7 @@ static inline char *mmap_cmd2str(enum mlx5_ib_mmap_cmd cmd)case MLX5_IB_MMAP_DEVICE_MEM :return "Device Memory" ;default : -return NULL ; +return "Unknown" ; } }
drivers/infiniband/sw/siw/siw_cm.c +12 -4
@@ -973,6 +973,7 @@ static void siw_accept_newconn(struct siw_cep *cep)siw_cep_put (cep); new_cep->listen_cep =NULL ;if (rv) { +siw_cancel_mpatimer (new_cep);siw_cep_set_free (new_cep); goto error; }
@@ -1097,9 +1098,12 @@ static void siw_cm_work_handler(struct work_struct *w)/* * Socket close before MPA request received. */ -siw_dbg_cep (cep,"no mpareq: drop listener\n" ); -siw_cep_put (cep->listen_cep); - cep->listen_cep =NULL ; +if (cep->listen_cep) { +siw_dbg_cep (cep, +"no mpareq: drop listener\n" ); +siw_cep_put (cep->listen_cep); + cep->listen_cep =NULL ; + } } } release_cep =1 ;
@@ -1222,7 +1226,11 @@ static void siw_cm_llp_data_ready(struct sock *sk)if (!cep) goto out; -siw_dbg_cep (cep,"state: %d\n" , cep->state); +siw_dbg_cep (cep,"cep state: %d, socket state %d\n" , + cep->state, sk->sk_state); + +if (sk->sk_state !=TCP_ESTABLISHED ) + goto out;switch (cep->state) {case SIW_EPSTATE_RDMA_MODE :
drivers/input/serio/i8042-acpipnpio.h new file +1597 -0
752 lines not on this page · raw message
drivers/input/serio/i8042-x86ia64io.h deleted +0 -1590
1,590 lines not on this page · raw message
drivers/media/platform/qcom/venus/core.c +12 -0
Lines of this file are not shown. View the raw message.
drivers/media/platform/qcom/venus/core.h +11 -0
Lines of this file are not shown. View the raw message.
drivers/media/platform/qcom/venus/firmware.c +14 -14
Lines of this file are not shown. View the raw message.
drivers/media/platform/qcom/venus/hfi_venus.c +55 -39
94 lines not on this page · raw message
drivers/media/platform/qcom/venus/hfi_venus_io.h +73 -41
114 lines not on this page · raw message
drivers/media/platform/qcom/venus/pm_helpers.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +6 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qed/qed_ll2.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c +5 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/ti/am65-cpsw-nuss.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/fw/error-dump.h +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/sta_rx.c +9 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c +0 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c +11 -2
Lines of this file are not shown. View the raw message.
drivers/nvme/host/pci.c +63 -86
149 lines not on this page · raw message
drivers/platform/x86/intel_scu_ipc.c +40 -26
66 lines not on this page · raw message
drivers/xen/events/events_base.c +46 -41
87 lines not on this page · raw message
fs/ext4/mballoc.c +82 -56
138 lines not on this page · raw message
fs/nfs/nfs4state.c +32 -15
47 lines not on this page · raw message
include/linux/netfilter/nf_conntrack_sctp.h +1 -0
Lines of this file are not shown. View the raw message.
include/linux/seqlock.h +52 -52
104 lines not on this page · raw message
include/net/netfilter/nf_tables.h +61 -75
136 lines not on this page · raw message
include/uapi/linux/netfilter/nf_tables.h +2 -0
Lines of this file are not shown. View the raw message.
kernel/sched/cpuacct.c +34 -50
84 lines not on this page · raw message
kernel/trace/ring_buffer.c +25 -17
42 lines not on this page · raw message
net/netfilter/nf_conntrack_proto_sctp.c +33 -10
43 lines not on this page · raw message
net/netfilter/nf_tables_api.c +377 -59
436 lines not on this page · raw message
net/netfilter/nft_exthdr.c +174 -19
193 lines not on this page · raw message
net/netfilter/nft_set_hash.c +56 -31
87 lines not on this page · raw message
net/netfilter/nft_set_pipapo.c +78 -37
115 lines not on this page · raw message
net/netfilter/nft_set_rbtree.c +125 -74
199 lines not on this page · raw message
security/smack/smack_lsm.c +48 -17
65 lines not on this page · raw message
sound/soc/meson/axg-spdifin.c +17 -32
49 lines not on this page · raw message
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +1 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kselftest_deps.sh +65 -12
77 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.