Commit Graph

1156099 Commits

Author SHA1 Message Date
Greg Kroah-Hartman
0a1364ec1f ANDROID: GKI: arm64: drop CONFIG_DEBUG_PREEMPT forced disable
In commit db4677b350 ("lib/Kconfig.debug: do not enable DEBUG_PREEMPT
by default"), DEBUG_PREEMPT is not enabled by default, so our explicit
turning it off is no longer needed.  This fixes the arm64 gki builds.

Fixes: db4677b350 ("lib/Kconfig.debug: do not enable DEBUG_PREEMPT by default")
Change-Id: I4491bceb3735d966731717f13b1e2395c9b7206a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-03 16:24:15 +00:00
Greg Kroah-Hartman
788e35fdea Merge 6.1.60 into android14-6.1-lts
Changes in 6.1.60
	lib/Kconfig.debug: do not enable DEBUG_PREEMPT by default
	igc: remove I226 Qbv BaseTime restriction
	igc: enable Qbv configuration for 2nd GCL
	igc: Remove reset adapter task for i226 during disable tsn config
	igc: Add qbv_config_change_errors counter
	igc: Add condition for qbv_config_change_errors counter
	igc: Fix race condition in PTP tx code
	Bluetooth: hci_event: Ignore NULL link key
	Bluetooth: Reject connection with the device which has same BD_ADDR
	Bluetooth: Fix a refcnt underflow problem for hci_conn
	Bluetooth: vhci: Fix race when opening vhci device
	Bluetooth: hci_event: Fix coding style
	Bluetooth: avoid memcmp() out of bounds warning
	ice: fix over-shifted variable
	ice: reset first in crash dump kernels
	net/smc: return the right falback reason when prefix checks fail
	btrfs: fix stripe length calculation for non-zoned data chunk allocation
	nfc: nci: fix possible NULL pointer dereference in send_acknowledge()
	regmap: fix NULL deref on lookup
	KVM: x86: Mask LVTPC when handling a PMI
	x86/sev: Disable MMIO emulation from user mode
	x86/sev: Check IOBM for IOIO exceptions from user-space
	x86/sev: Check for user-space IOIO pointing to kernel space
	x86/fpu: Allow caller to constrain xfeatures when copying to uabi buffer
	KVM: x86: Constrain guest-supported xfeatures only at KVM_GET_XSAVE{2}
	x86: KVM: SVM: add support for Invalid IPI Vector interception
	x86: KVM: SVM: refresh AVIC inhibition in svm_leave_nested()
	audit,io_uring: io_uring openat triggers audit reference count underflow
	tcp: check mptcp-level constraints for backlog coalescing
	mptcp: more conservative check for zero probes
	fs/ntfs3: Fix possible null-pointer dereference in hdr_find_e()
	fs/ntfs3: fix panic about slab-out-of-bounds caused by ntfs_list_ea()
	fs/ntfs3: fix deadlock in mark_as_free_ex
	netfilter: nft_payload: fix wrong mac header matching
	nvmet-tcp: Fix a possible UAF in queue intialization setup
	drm/i915: Retry gtt fault when out of fence registers
	drm/mediatek: Correctly free sg_table in gem prime vmap
	ALSA: hda/realtek - Fixed ASUS platform headset Mic issue
	ALSA: hda/realtek: Add quirk for ASUS ROG GU603ZV
	ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq5xxx
	ASoC: codecs: wcd938x-sdw: fix use after free on driver unbind
	ASoC: codecs: wcd938x-sdw: fix runtime PM imbalance on probe errors
	ASoC: codecs: wcd938x: drop bogus bind error handling
	ASoC: codecs: wcd938x: fix unbind tear down order
	ASoC: codecs: wcd938x: fix resource leaks on bind errors
	qed: fix LL2 RX buffer allocation
	xfrm: fix a data-race in xfrm_lookup_with_ifid()
	xfrm: fix a data-race in xfrm_gen_index()
	xfrm: interface: use DEV_STATS_INC()
	wifi: cfg80211: use system_unbound_wq for wiphy work
	net: ipv4: fix return value check in esp_remove_trailer
	net: ipv6: fix return value check in esp_remove_trailer
	net: rfkill: gpio: prevent value glitch during probe
	tcp: fix excessive TLP and RACK timeouts from HZ rounding
	tcp: tsq: relax tcp_small_queue_check() when rtx queue contains a single skb
	tcp: Fix listen() warning with v4-mapped-v6 address.
	tun: prevent negative ifindex
	ipv4: fib: annotate races around nh->nh_saddr_genid and nh->nh_saddr
	net: usb: smsc95xx: Fix an error code in smsc95xx_reset()
	octeon_ep: update BQL sent bytes before ringing doorbell
	i40e: prevent crash on probe if hw registers have invalid values
	net: dsa: bcm_sf2: Fix possible memory leak in bcm_sf2_mdio_register()
	bonding: Return pointer to data after pull on skb
	net/sched: sch_hfsc: upgrade 'rt' to 'sc' when it becomes a inner curve
	neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section
	selftests: openvswitch: Catch cases where the tests are killed
	selftests: netfilter: Run nft_audit.sh in its own netns
	netfilter: nft_set_rbtree: .deactivate fails if element has expired
	netlink: Correct offload_xstats size
	netfilter: nf_tables: do not remove elements if set backend implements .abort
	netfilter: nf_tables: revert do not remove elements if set backend implements .abort
	net: phy: bcm7xxx: Add missing 16nm EPHY statistics
	net: pktgen: Fix interface flags printing
	net: avoid UAF on deleted altname
	net: fix ifname in netlink ntf during netns move
	net: check for altname conflicts when changing netdev's netns
	selftests/mm: fix awk usage in charge_reserved_hugetlb.sh and hugetlb_reparenting_test.sh that may cause error
	usb: misc: onboard_usb_hub: add Genesys Logic GL850G hub support
	usb: misc: onboard_usb_hub: add Genesys Logic GL852G hub support
	usb: misc: onboard_usb_hub: add Genesys Logic GL3523 hub support
	usb: misc: onboard_hub: add support for Microchip USB2412 USB 2.0 hub
	serial: Move uart_change_speed() earlier
	serial: Rename uart_change_speed() to uart_change_line_settings()
	serial: Reduce spinlocked portion of uart_rs485_config()
	serial: 8250: omap: Fix imprecise external abort for omap_8250_pm()
	serial: 8250_omap: Fix errors with no_console_suspend
	iio: core: introduce iio_device_{claim|release}_buffer_mode() APIs
	iio: cros_ec: fix an use-after-free in cros_ec_sensors_push_data()
	iio: adc: ad7192: Simplify using devm_regulator_get_enable()
	iio: adc: ad7192: Correct reference voltage
	pwr-mlxbf: extend Kconfig to include gpio-mlxbf3 dependency
	ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone
	fs-writeback: do not requeue a clean inode having skipped pages
	btrfs: prevent transaction block reserve underflow when starting transaction
	btrfs: return -EUCLEAN for delayed tree ref with a ref count not equals to 1
	btrfs: initialize start_slot in btrfs_log_prealloc_extents
	i2c: mux: Avoid potential false error message in i2c_mux_add_adapter
	overlayfs: set ctime when setting mtime and atime
	gpio: timberdale: Fix potential deadlock on &tgpio->lock
	ata: libata-core: Fix compilation warning in ata_dev_config_ncq()
	ata: libata-eh: Fix compilation warning in ata_eh_link_report()
	tracing: relax trace_event_eval_update() execution with cond_resched()
	wifi: mwifiex: Sanity check tlv_len and tlv_bitmap_len
	wifi: iwlwifi: Ensure ack flag is properly cleared.
	HID: logitech-hidpp: Add Bluetooth ID for the Logitech M720 Triathlon mouse
	HID: holtek: fix slab-out-of-bounds Write in holtek_kbd_input_event
	Bluetooth: btusb: add shutdown function for QCA6174
	Bluetooth: Avoid redundant authentication
	Bluetooth: hci_core: Fix build warnings
	wifi: cfg80211: Fix 6GHz scan configuration
	wifi: mac80211: work around Cisco AP 9115 VHT MPDU length
	wifi: mac80211: allow transmitting EAPOL frames with tainted key
	wifi: cfg80211: avoid leaking stack data into trace
	regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()"
	sky2: Make sure there is at least one frag_addr available
	ipv4/fib: send notify when delete source address routes
	drm: panel-orientation-quirks: Add quirk for One Mix 2S
	btrfs: fix some -Wmaybe-uninitialized warnings in ioctl.c
	btrfs: error out when COWing block using a stale transaction
	btrfs: error when COWing block from a root that is being deleted
	btrfs: error out when reallocating block for defrag using a stale transaction
	drm/amd/pm: add unique_id for gc 11.0.3
	HID: multitouch: Add required quirk for Synaptics 0xcd7e device
	HID: nintendo: reinitialize USB Pro Controller after resuming from suspend
	platform/x86: touchscreen_dmi: Add info for the Positivo C4128B
	cpufreq: schedutil: Update next_freq when cpufreq_limits change
	fprobe: Pass entry_data to handlers
	fprobe: Add nr_maxactive to specify rethook_node pool size
	fprobe: Fix to ensure the number of active retprobes is not zero
	net: xfrm: skip policies marked as dead while reinserting policies
	xfrm6: fix inet6_dev refcount underflow problem
	net/mlx5: E-switch, register event handler before arming the event
	net/mlx5: Handle fw tracer change ownership event based on MTRC
	net/mlx5e: Don't offload internal port if filter device is out device
	net/tls: split tls_rx_reader_lock
	tcp: allow again tcp_disconnect() when threads are waiting
	ice: Remove redundant pci_enable_pcie_error_reporting()
	Bluetooth: hci_event: Fix using memcmp when comparing keys
	selftests: openvswitch: Add version check for pyroute2
	tcp_bpf: properly release resources on error paths
	net/smc: fix smc clc failed issue when netdevice not in init_net
	mtd: rawnand: qcom: Unmap the right resource upon probe failure
	mtd: rawnand: pl353: Ensure program page operations are successful
	mtd: rawnand: marvell: Ensure program page operations are successful
	mtd: rawnand: arasan: Ensure program page operations are successful
	mtd: spinand: micron: correct bitmask for ecc status
	mtd: physmap-core: Restore map_rom fallback
	dt-bindings: mmc: sdhci-msm: correct minimum number of clocks
	mmc: sdhci-pci-gli: fix LPM negotiation so x86/S0ix SoCs can suspend
	mmc: mtk-sd: Use readl_poll_timeout_atomic in msdc_reset_hw
	mmc: core: sdio: hold retuning if sdio in 1-bit mode
	mmc: core: Capture correct oemid-bits for eMMC cards
	Revert "pinctrl: avoid unsafe code pattern in find_pinctrl()"
	pNFS: Fix a hang in nfs4_evict_inode()
	pNFS/flexfiles: Check the layout validity in ff_layout_mirror_prepare_stats
	NFSv4.1: fixup use EXCHGID4_FLAG_USE_PNFS_DS for DS server
	ACPI: irq: Fix incorrect return value in acpi_register_gsi()
	nfs42: client needs to strip file mode's suid/sgid bit after ALLOCATE op
	nvme: sanitize metadata bounce buffer for reads
	nvme-pci: add BOGUS_NID for Intel 0a54 device
	nvmet-auth: complete a request only after freeing the dhchap pointers
	nvme-rdma: do not try to stop unallocated queues
	KVM: x86/mmu: Stop zapping invalidated TDP MMU roots asynchronously
	HID: input: map battery system charging
	USB: serial: option: add Telit LE910C4-WWX 0x1035 composition
	USB: serial: option: add entry for Sierra EM9191 with new firmware
	USB: serial: option: add Fibocom to DELL custom modem FM101R-GL
	perf: Disallow mis-matched inherited group reads
	s390/pci: fix iommu bitmap allocation
	selftests/ftrace: Add new test case which checks non unique symbol
	s390/cio: fix a memleak in css_alloc_subchannel
	platform/surface: platform_profile: Propagate error if profile registration fails
	platform/x86: intel-uncore-freq: Conditionally create attribute for read frequency
	platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e
	platform/x86: asus-wmi: Only map brightness codes when using asus-wmi backlight control
	platform/x86: asus-wmi: Map 0x2a code, Ignore 0x2b and 0x2c events
	gpio: vf610: set value before the direction to avoid a glitch
	ASoC: pxa: fix a memory leak in probe()
	drm/bridge: ti-sn65dsi86: Associate DSI device lifetime with auxiliary device
	serial: 8250: omap: Move uart_write() inside PM section
	serial: 8250: omap: convert to modern PM ops
	kallsyms: Reduce the memory occupied by kallsyms_seqs_of_names[]
	kallsyms: Add helper kallsyms_on_each_match_symbol()
	tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols
	gpio: vf610: make irq_chip immutable
	gpio: vf610: mask the gpio irq in system suspend and support wakeup
	phy: mapphone-mdm6600: Fix runtime disable on probe
	phy: mapphone-mdm6600: Fix runtime PM for remove
	phy: mapphone-mdm6600: Fix pinctrl_pm handling for sleep pins
	net: move altnames together with the netdevice
	Bluetooth: hci_sock: fix slab oob read in create_monitor_event
	Bluetooth: hci_sock: Correctly bounds check and pad HCI_MON_NEW_INDEX name
	mptcp: avoid sending RST when closing the initial subflow
	selftests: mptcp: join: correctly check for no RST
	selftests: mptcp: join: no RST when rm subflow/addr
	Linux 6.1.60

Change-Id: I85a246fd8800df019794b531f5befe0a84a3e138
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-03 16:23:47 +00:00
Greg Kroah-Hartman
316250b759 Revert "net: macsec: indicate next pn update when offloading"
This reverts commit 0d86ad068c which is
commit 0412cc846a upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: Ib59e80373b59f1e88b36f676ddd3a34832af7dfd
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-03 09:52:15 +00:00
Greg Kroah-Hartman
394fcccbe1 Revert "net: phy: mscc: macsec: reject PN update requests"
This reverts commit a698195f3a which is
commit e0a8c918da upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8176a4f67c346aa762721515bd797078581eef1b
2023-11-03 09:52:12 +00:00
Greg Kroah-Hartman
a36206a6bb Revert "net/mlx5e: macsec: use update_pn flag instead of PN comparation"
This reverts commit 89be6ad344 which is
commit fde2f2d7f2 upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: Icb4a02c431ae7caeb4669c205d016e991b7d935a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-03 09:52:08 +00:00
Greg Kroah-Hartman
b0e44b2726 Revert "tcp: enforce receive buffer memory limits by allowing the tcp window to shrink"
This reverts commit 0796c53424 which is
commit b650d953cd upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: I6d4865da903caac56dbca2c7c0cfca14622760d4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-03 09:52:01 +00:00
Greg Kroah-Hartman
3858124ea0 Merge 6.1.59 into android14-6.1-lts
Changes in 6.1.59
	net: mana: Fix TX CQE error handling
	mptcp: fix delegated action races
	drm/i915: Don't set PIPE_CONTROL_FLUSH_L3 for aux inval
	RDMA/cxgb4: Check skb value for failure to allocate
	perf/arm-cmn: Fix the unhandled overflow status of counter 4 to 7
	platform/x86: think-lmi: Fix reference leak
	platform/x86: hp-wmi:: Mark driver struct with __refdata to prevent section mismatch warning
	scsi: Do not rescan devices with a suspended queue
	HID: logitech-hidpp: Fix kernel crash on receiver USB disconnect
	quota: Fix slow quotaoff
	ASoC: amd: yc: Fix non-functional mic on Lenovo 82YM
	ata: libata-scsi: Disable scsi device manage_system_start_stop
	net: prevent address rewrite in kernel_bind()
	arm64: dts: qcom: sm8150: extend the size of the PDC resource
	dt-bindings: interrupt-controller: renesas,rzg2l-irqc: Update description for '#interrupt-cells' property
	irqchip: renesas-rzg2l: Fix logic to clear TINT interrupt source
	KEYS: trusted: Remove redundant static calls usage
	ALSA: usb-audio: Fix microphone sound on Opencomm2 Headset
	ALSA: usb-audio: Fix microphone sound on Nexigo webcam.
	ALSA: hda/realtek: Change model for Intel RVP board
	ASoC: SOF: amd: fix for firmware reload failure after playback
	ASoC: simple-card-utils: fixup simple_util_startup() error handling
	ASoC: Intel: soc-acpi: Add entry for HDMI_In capture support in MTL match table
	ASoC: Intel: sof_sdw: add support for SKU 0B14
	ASoC: Intel: soc-acpi: Add entry for sof_es8336 in MTL match table.
	ASoC: Use of_property_read_bool() for boolean properties
	ASoC: fsl_sai: MCLK bind with TX/RX enable bit
	ASoC: fsl_sai: Don't disable bitclock for i.MX8MP
	ALSA: hda/realtek: Add quirk for HP Victus 16-d1xxx to enable mute LED
	ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx
	ALSA: hda/realtek - ALC287 I2S speaker platform support
	ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP
	pinctrl: nuvoton: wpcm450: fix out of bounds write
	drm/msm/dp: do not reinitialize phy unless retry during link training
	drm/msm/dsi: skip the wait for video mode done if not applicable
	drm/msm/dsi: fix irq_of_parse_and_map() error checking
	drm/msm/dpu: change _dpu_plane_calc_bw() to use u64 to avoid overflow
	drm/msm/dp: Add newlines to debug printks
	phy: lynx-28g: cancel the CDR check work item on the remove path
	phy: lynx-28g: lock PHY while performing CDR lock workaround
	phy: lynx-28g: serialize concurrent phy_set_mode_ext() calls to shared registers
	net: dsa: qca8k: fix potential MDIO bus conflict when accessing internal PHYs via management frames
	can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior
	can: sun4i_can: Only show Kconfig if ARCH_SUNXI is set
	arm64: dts: mediatek: mt8195: Set DSU PMU status to fail
	ravb: Fix up dma_free_coherent() call in ravb_remove()
	ravb: Fix use-after-free issue in ravb_tx_timeout_work()
	ieee802154: ca8210: Fix a potential UAF in ca8210_probe
	mlxsw: fix mlxsw_sp2_nve_vxlan_learning_set() return type
	xen-netback: use default TX queue size for vifs
	riscv, bpf: Factor out emit_call for kernel and bpf context
	riscv, bpf: Sign-extend return values
	drm/vmwgfx: fix typo of sizeof argument
	bpf: Fix verifier log for async callback return values
	net: refine debug info in skb_checksum_help()
	net: macsec: indicate next pn update when offloading
	net: phy: mscc: macsec: reject PN update requests
	net/mlx5e: macsec: use update_pn flag instead of PN comparation
	ixgbe: fix crash with empty VF macvlan list
	net/mlx5e: Again mutually exclude RX-FCS and RX-port-timestamp
	net: nfc: fix races in nfc_llcp_sock_get() and nfc_llcp_sock_get_sn()
	net/smc: Fix pos miscalculation in statistics
	pinctrl: renesas: rzn1: Enable missing PINMUX
	nfc: nci: assert requested protocol is valid
	workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask()
	tcp: enforce receive buffer memory limits by allowing the tcp window to shrink
	dmaengine: stm32-mdma: abort resume if no ongoing transfer
	dmaengine: stm32-dma: fix stm32_dma_prep_slave_sg in case of MDMA chaining
	dmaengine: stm32-dma: fix residue in case of MDMA chaining
	dmaengine: stm32-mdma: use Link Address Register to compute residue
	dmaengine: stm32-mdma: set in_flight_bytes in case CRQA flag is set
	usb: xhci: xhci-ring: Use sysdev for mapping bounce buffer
	net: usb: dm9601: fix uninitialized variable use in dm9601_mdio_read
	usb: dwc3: Soft reset phy on probe for host
	usb: cdns3: Modify the return value of cdns_set_active () to void when CONFIG_PM_SLEEP is disabled
	usb: hub: Guard against accesses to uninitialized BOS descriptors
	usb: musb: Get the musb_qh poniter after musb_giveback
	usb: musb: Modify the "HWVers" register address
	iio: pressure: bmp280: Fix NULL pointer exception
	iio: imu: bno055: Fix missing Kconfig dependencies
	iio: adc: imx8qxp: Fix address for command buffer registers
	iio: dac: ad3552r: Correct device IDs
	iio: admv1013: add mixer_vgate corner cases
	iio: pressure: dps310: Adjust Timeout Settings
	iio: pressure: ms5611: ms5611_prom_is_valid false negative bug
	iio: addac: Kconfig: update ad74413r selections
	arm64: dts: mediatek: mt8195-demo: fix the memory size to 8GB
	arm64: dts: mediatek: mt8195-demo: update and reorder reserved memory regions
	drm/atomic-helper: relax unregistered connector check
	drm/amdgpu: add missing NULL check
	drm/amd/display: Don't set dpms_off for seamless boot
	ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA
	ACPI: EC: Add quirk for the HP Pavilion Gaming 15-dk1xxx
	ksmbd: not allow to open file if delelete on close bit is set
	perf/x86/lbr: Filter vsyscall addresses
	x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs
	mcb: remove is_added flag from mcb_device struct
	thunderbolt: Workaround an IOMMU fault on certain systems with Intel Maple Ridge
	thunderbolt: Check that lane 1 is in CL0 before enabling lane bonding
	thunderbolt: Restart XDomain discovery handshake after failure
	powerpc/47x: Fix 47x syscall return crash
	libceph: use kernel_connect()
	ceph: fix incorrect revoked caps assert in ceph_fill_file_size()
	ceph: fix type promotion bug on 32bit systems
	Input: powermate - fix use-after-free in powermate_config_complete
	Input: psmouse - fix fast_reconnect function for PS/2 mode
	Input: xpad - add PXN V900 support
	Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table
	Input: goodix - ensure int GPIO is in input for gpio_count == 1 && gpio_int_idx == 0 case
	tee: amdtee: fix use-after-free vulnerability in amdtee_close_session
	mctp: perform route lookups under a RCU read-side lock
	nfp: flower: avoid rmmod nfp crash issues
	usb: typec: ucsi: Use GET_CAPABILITY attributes data to set power supply scope
	cgroup: Remove duplicates in cgroup v1 tasks file
	dma-buf: add dma_fence_timestamp helper
	pinctrl: avoid unsafe code pattern in find_pinctrl()
	scsi: ufs: core: Correct clear TM error log
	counter: chrdev: fix getting array extensions
	counter: microchip-tcb-capture: Fix the use of internal GCLK logic
	usb: typec: altmodes/displayport: Signal hpd low when exiting mode
	usb: typec: ucsi: Clear EVENT_PENDING bit if ucsi_send_command fails
	usb: gadget: udc-xilinx: replace memcpy with memcpy_toio
	usb: gadget: ncm: Handle decoding of multiple NTB's in unwrap call
	usb: cdnsp: Fixes issue with dequeuing not queued requests
	x86/alternatives: Disable KASAN in apply_alternatives()
	dmaengine: idxd: use spin_lock_irqsave before wait_event_lock_irq
	dmaengine: mediatek: Fix deadlock caused by synchronize_irq()
	powerpc/8xx: Fix pte_access_permitted() for PAGE_NONE
	powerpc/64e: Fix wrong test in __ptep_test_and_clear_young()
	ALSA: hda/realtek - Fixed two speaker platform
	Linux 6.1.59

Change-Id: Iaae6736993c003cc47f495f275591bbb924f986e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 09:17:36 +00:00
Greg Kroah-Hartman
d58a224aca Merge 6.1.58 into android14-6.1-lts
Changes in 6.1.58
	Revert "NFS: More fixes for nfs_direct_write_reschedule_io()"
	Revert "NFS: Use the correct commit info in nfs_join_page_group()"
	Revert "NFS: More O_DIRECT accounting fixes for error paths"
	Revert "NFS: Fix O_DIRECT locking issues"
	Revert "NFS: Fix error handling for O_DIRECT write scheduling"
	lib/test_meminit: fix off-by-one error in test_pages()
	Linux 6.1.58

Change-Id: I4022c198204b94b8846aa347404d8d9d26eb9a63
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 09:04:04 +00:00
Greg Kroah-Hartman
d0be54afac ANDROID: mm/mempolicy.c fix up conversion to queue_folios_pte_range
In commit dc0a8466cd ("mm/mempolicy: convert queue_pages_pte_range()
to queue_folios_pte_range()"), queue_folios_pte_range was used, but due
to other upstream changes backported to the android14-6.1 branch, not
all of them were caught.  This fixes up the remaining instance, fixing
the build.

Fixes: dc0a8466cd ("mm/mempolicy: convert queue_pages_pte_range() to queue_folios_pte_range()")
Change-Id: I007bd7ad6a1e848d715b7a5a06a98d3603238148
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
c8da9c614c Revert "net: add sysctl accept_ra_min_rtr_lft"
This reverts commit ec4162bb70 which is
commit 1671bcfd76 upstream.

It breaks the Android ABI, and is already merged in the non-LTS branch
in an abi-safe way.

Bug: 161946584
Change-Id: Ie689c535c1f7c1c4a1e6af6805f400da625104c7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
ee96408e49 Revert "net: change accept_ra_min_rtr_lft to affect all RA lifetimes"
This reverts commit bad004c384 which is
commit 5027d54a9c upstream.

It breaks the Android ABI, and is already merged in the non-LTS branch
in an abi-safe way.

Bug: 161946584
Change-Id: I9f0f611a3ecbae0ae154ae465ff7472d8e98a1d8
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
d9fef973fe Revert "net: release reference to inet6_dev pointer"
This reverts commit b691264274 which is
commit 5cb249686e upstream.

It breaks the Android ABI, and is already merged in the non-LTS branch
in an abi-safe way.

Bug: 161946584
Change-Id: I563f7eb7ffb01d9681f6a1dbb0252ca32b94f856
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
a39cabc386 Revert "ata,scsi: do not issue START STOP UNIT on resume"
This reverts commit dc3354c961 which is
commit 0a85890559 upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I667c8e367971886e847b2240d2c1efcf6a2fe92c
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
88af92d5d2 Revert "scsi: sd: Differentiate system and runtime start/stop management"
This reverts commit 8de6d8449a which is
commit 3cc2ffe5c1 upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: I080e6f1bf683bb4b40e1178835d07284e2578ae5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
d2a83cf376 Revert "scsi: sd: Do not issue commands to suspended disks on shutdown"
This reverts commit deacabef68 which is
commit 99398d2070 upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: I0134634ac6acd636d23f65d3f1bc4d3b57ff1206
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
66a17692b1 Revert "wifi: cfg80211: fix cqm_config access race"
This reverts commit c797498e86 which is
commit 37c20b2eff upstream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: Ida8b8621fb3099fd1b40aae5ad481139e7d7f173
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:05 +00:00
Greg Kroah-Hartman
92a425f8ff Revert "netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp"
This reverts commit 00d35e6b16 which is
commit 8e56b063c8 uptream.

It breaks the Android ABI so revert it for now, if it is needed in the
future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: Ia03ea49365e6ce063194738b22f77d2a403ea3a4
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:04 +00:00
Greg Kroah-Hartman
2e4a779114 Revert "arm64: errata: Add Cortex-A520 speculative unprivileged load workaround"
This reverts commit 6e3ae2927b which is
commit 471470bc70 upstream.

This change breaks the Android ABI, if it is needed in the future, it
can be brought back in an abi-safe way.

Change-Id: I1f79c77da78e5a0edde2bdebb862e4c9855175a0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:06:04 +00:00
Greg Kroah-Hartman
c259cc9cb4 Merge 6.1.57 into android14-6.1-lts
Changes in 6.1.57
	spi: zynqmp-gqspi: fix clock imbalance on probe failure
	ASoC: soc-utils: Export snd_soc_dai_is_dummy() symbol
	ASoC: tegra: Fix redundant PLLA and PLLA_OUT0 updates
	mptcp: rename timer related helper to less confusing names
	mptcp: fix dangling connection hang-up
	mptcp: annotate lockless accesses to sk->sk_err
	mptcp: move __mptcp_error_report in protocol.c
	mptcp: process pending subflow error on close
	ata,scsi: do not issue START STOP UNIT on resume
	scsi: sd: Differentiate system and runtime start/stop management
	scsi: sd: Do not issue commands to suspended disks on shutdown
	scsi: core: Improve type safety of scsi_rescan_device()
	scsi: Do not attempt to rescan suspended devices
	ata: libata-scsi: Fix delayed scsi_rescan_device() execution
	NFS: Cleanup unused rpc_clnt variable
	NFS: rename nfs_client_kset to nfs_kset
	NFSv4: Fix a state manager thread deadlock regression
	mm/memory: add vm_normal_folio()
	mm/mempolicy: convert queue_pages_pmd() to queue_folios_pmd()
	mm/mempolicy: convert queue_pages_pte_range() to queue_folios_pte_range()
	mm/mempolicy: convert migrate_page_add() to migrate_folio_add()
	mm: mempolicy: keep VMA walk if both MPOL_MF_STRICT and MPOL_MF_MOVE are specified
	mm/page_alloc: always remove pages from temporary list
	mm/page_alloc: leave IRQs enabled for per-cpu page allocations
	mm: page_alloc: fix CMA and HIGHATOMIC landing on the wrong buddy list
	ring-buffer: remove obsolete comment for free_buffer_page()
	ring-buffer: Fix bytes info in per_cpu buffer stats
	btrfs: use struct qstr instead of name and namelen pairs
	btrfs: setup qstr from dentrys using fscrypt helper
	btrfs: use struct fscrypt_str instead of struct qstr
	Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return"
	arm64: Avoid repeated AA64MMFR1_EL1 register read on pagefault path
	net: add sysctl accept_ra_min_rtr_lft
	net: change accept_ra_min_rtr_lft to affect all RA lifetimes
	net: release reference to inet6_dev pointer
	arm64: cpufeature: Fix CLRBHB and BC detection
	drm/amd/display: Adjust the MST resume flow
	iommu/arm-smmu-v3: Set TTL invalidation hint better
	iommu/arm-smmu-v3: Avoid constructing invalid range commands
	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
	block: fix use-after-free of q->q_usage_counter
	hwmon: (nzxt-smart2) Add device id
	hwmon: (nzxt-smart2) add another USB ID
	i40e: fix the wrong PTP frequency calculation
	scsi: zfcp: Fix a double put in zfcp_port_enqueue()
	iommu/vt-d: Avoid memory allocation in iommu_suspend()
	vringh: don't use vringh_kiov_advance() in vringh_iov_xfer()
	net: ethernet: mediatek: disable irq before schedule napi
	mptcp: userspace pm allow creating id 0 subflow
	qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
	Bluetooth: hci_codec: Fix leaking content of local_codecs
	Bluetooth: hci_sync: Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER
	wifi: mwifiex: Fix tlv_buf_left calculation
	md/raid5: release batch_last before waiting for another stripe_head
	PCI: qcom: Fix IPQ8074 enumeration
	net: replace calls to sock->ops->connect() with kernel_connect()
	net: prevent rewrite of msg_name in sock_sendmsg()
	drm/amd: Fix detection of _PR3 on the PCIe root port
	drm/amd: Fix logic error in sienna_cichlid_update_pcie_parameters()
	arm64: Add Cortex-A520 CPU part definition
	arm64: errata: Add Cortex-A520 speculative unprivileged load workaround
	HID: sony: Fix a potential memory leak in sony_probe()
	ubi: Refuse attaching if mtd's erasesize is 0
	erofs: fix memory leak of LZMA global compressed deduplication
	wifi: iwlwifi: dbg_ini: fix structure packing
	wifi: iwlwifi: mvm: Fix a memory corruption issue
	wifi: cfg80211: hold wiphy lock in auto-disconnect
	wifi: cfg80211: move wowlan disable under locks
	wifi: cfg80211: add a work abstraction with special semantics
	wifi: cfg80211: fix cqm_config access race
	wifi: cfg80211: add missing kernel-doc for cqm_rssi_work
	wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
	leds: Drop BUG_ON check for LED_COLOR_ID_MULTI
	bpf: Fix tr dereferencing
	regulator: mt6358: Drop *_SSHUB regulators
	regulator: mt6358: Use linear voltage helpers for single range regulators
	regulator: mt6358: split ops for buck and linear range LDO regulators
	Bluetooth: Delete unused hci_req_prepare_suspend() declaration
	Bluetooth: ISO: Fix handling of listen for unicast
	drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
	wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
	perf/x86/amd/core: Fix overflow reset on hotplug
	regmap: rbtree: Fix wrong register marked as in-cache when creating new node
	wifi: mac80211: fix potential key use-after-free
	perf/x86/amd: Do not WARN() on every IRQ
	iommu/mediatek: Fix share pgtable for iova over 4GB
	regulator/core: regulator_register: set device->class earlier
	ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
	scsi: target: core: Fix deadlock due to recursive locking
	ima: rework CONFIG_IMA dependency block
	NFSv4: Fix a nfs4_state_manager() race
	bpf: tcp_read_skb needs to pop skb regardless of seq
	bpf, sockmap: Do not inc copied_seq when PEEK flag set
	bpf, sockmap: Reject sk_msg egress redirects to non-TCP sockets
	modpost: add missing else to the "of" check
	net: fix possible store tearing in neigh_periodic_work()
	bpf: Add BPF_FIB_LOOKUP_SKIP_NEIGH for bpf_fib_lookup
	neighbour: annotate lockless accesses to n->nud_state
	neighbour: switch to standard rcu, instead of rcu_bh
	neighbour: fix data-races around n->output
	ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
	ptp: ocp: Fix error handling in ptp_ocp_device_init
	net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
	ipv6: tcp: add a missing nf_reset_ct() in 3WHS handling
	net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
	net: nfc: llcp: Add lock when modifying device list
	net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns()
	ibmveth: Remove condition to recompute TCP header checksum.
	netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp
	selftests: netfilter: Test nf_tables audit logging
	selftests: netfilter: Extend nft_audit.sh
	netfilter: nf_tables: Deduplicate nft_register_obj audit logs
	netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
	ipv4: Set offload_failed flag in fibmatch results
	net: stmmac: dwmac-stm32: fix resume on STM32 MCU
	tipc: fix a potential deadlock on &tx->lock
	tcp: fix quick-ack counting to count actual ACKs of new data
	tcp: fix delayed ACKs for MSS boundary condition
	sctp: update transport state when processing a dupcook packet
	sctp: update hb timer immediately after users change hb_interval
	netlink: split up copies in the ack construction
	netlink: Fix potential skb memleak in netlink_ack
	netlink: annotate data-races around sk->sk_err
	HID: sony: remove duplicate NULL check before calling usb_free_urb()
	HID: intel-ish-hid: ipc: Disable and reenable ACPI GPE bit
	intel_idle: add Emerald Rapids Xeon support
	smb: use kernel_connect() and kernel_bind()
	parisc: Fix crash with nr_cpus=1 option
	dm zoned: free dmz->ddev array in dmz_put_zoned_devices
	RDMA/core: Require admin capabilities to set system parameters
	of: dynamic: Fix potential memory leak in of_changeset_action()
	IB/mlx4: Fix the size of a buffer in add_port_entries()
	gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
	gpio: pxa: disable pinctrl calls for MMP_GPIO
	RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
	RDMA/cma: Fix truncation compilation warning in make_cma_ports
	RDMA/uverbs: Fix typo of sizeof argument
	RDMA/srp: Do not call scsi_done() from srp_abort()
	RDMA/siw: Fix connection failure handling
	RDMA/mlx5: Fix mutex unlocking on error flow for steering anchor creation
	RDMA/mlx5: Fix NULL string error
	x86/sev: Use the GHCB protocol when available for SNP CPUID requests
	ksmbd: fix race condition between session lookup and expire
	ksmbd: fix uaf in smb20_oplock_break_ack
	parisc: Restore __ldcw_align for PA-RISC 2.0 processors
	ipv6: remove nexthop_fib6_nh_bh()
	vrf: Fix lockdep splat in output path
	btrfs: fix an error handling path in btrfs_rename()
	btrfs: fix fscrypt name leak after failure to join log transaction
	netlink: remove the flex array from struct nlmsghdr
	btrfs: file_remove_privs needs an exclusive lock in direct io write
	ipv6: remove one read_lock()/read_unlock() pair in rt6_check_neigh()
	xen/events: replace evtchn_rwlock with RCU
	Linux 6.1.57

Change-Id: I2c200264df72a9043d91d31479c91b0d7f94863e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-02 07:05:54 +00:00
Greg Kroah-Hartman
064668b55e Revert "video/aperture: Only remove sysfb on the default vga pci device"
This reverts commit 485ec8f8e1 which is
commit 5ae3716cfd upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: Iec66232fff97b07fd0c57975e8b1785710cfb395
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:38:59 +00:00
Greg Kroah-Hartman
900112a6dc Revert "drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers"
This reverts commit cd1f889c99 which is
commit c1ebead360 upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: Id6345a15790f5e3209485004ebe071119684859b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:38:49 +00:00
Greg Kroah-Hartman
c0584fbc45 Revert "fbdev/radeon: use pci aperture helpers"
This reverts commit 6db53af154 which is
commit 9b539c4d1b upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: If14dd22c006f9d09857175a60c7f684409242515
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:38:35 +00:00
Greg Kroah-Hartman
3e052a378b Revert "drm/gma500: Use drm_aperture_remove_conflicting_pci_framebuffers"
This reverts commit cccfcbb9e5 which is
commit 80e993988b upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: I98437f0d8222293d93ad48311e8b719931f68c75
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:38:25 +00:00
Greg Kroah-Hartman
6603cc468d Revert "drm/aperture: Remove primary argument"
This reverts commit 437e99f2a1 which is
commit 62aeaeaa1b upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: I04e3476f9417cb019108f2bbb3dd277691ca027d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:38:16 +00:00
Greg Kroah-Hartman
33b12f8e48 Revert "video/aperture: Only kick vgacon when the pdev is decoding vga"
This reverts commit 4aad3b82b9 which is
commit 7450cd235b upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: Id7b85df6d6bdffc3f6d2c32a1599d2d9bbc9f062
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:38:07 +00:00
Greg Kroah-Hartman
a81c232edd Revert "video/aperture: Move vga handling to pci function"
This reverts commit 28916927b7 which is
commit f1d599d315 upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: Iffad2c2b492da2aa7b87dba8d9bd792be74b3b58
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:37:54 +00:00
Greg Kroah-Hartman
aa5b12e90a Revert "fs/nls: make load_nls() take a const parameter"
This reverts commit 952af5cfd5 which is
commit c1ed39ec11 upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: I3ecb25cbffc28bc20e7e398ba4b36c71bf54a0bc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 14:32:18 +00:00
Greg Kroah-Hartman
7bcb060a61 Revert "dm: fix a race condition in retrieve_deps"
This reverts commit dbf1a71985 which is
commit f6007dce0c upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: Ief37eab88188180ba9884987d9731b10d1527051
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-11-01 07:16:49 +00:00
Greg Kroah-Hartman
d07ffd5565 Merge branch 'android14-6.1' into branch 'android14-6.1-lts'
This catches the android14-6.1-lts branch up with a lot of changes that
have only gone into the android14-6.1 branch to make testing easier and
to track more symbols properly.

This includes the following commits:

* 171c27ba1f BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor
* bb0173a1da BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation
* 5c4815f5b6 UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()
* 5a05f2e755 UPSTREAM: usb: gadget: function: Remove unused declarations
* defd93f219 UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump
* 82fe654f56 UPSTREAM: mm/page_alloc: use write_seqlock_irqsave() instead write_seqlock() + local_irq_save().
* ed6694a682 UPSTREAM: cpuidle: teo: Update idle duration estimate when choosing shallower state
* d8e99e1af8 BACKPORT: Revert "PCI: dwc: Wait for link up only if link is started"
* 841ad9b9b3 UPSTREAM: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
* 17e456ce41 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
* 5ba644e8a0 BACKPORT: usb: typec: altmodes/displayport: Signal hpd low when exiting mode
* 9e4f6e1ef8 ANDROID: KVM: arm64: Fix KVM_HOST_S2_DEFAULT_MMIO_PTE encoding
* 5418491fa5 ANDROID: Update the ABI symbol list
* b821a3c8fc ANDROID: fs/proc: Perform priority inheritance around access_remote_vm()
* 37c1a91404 UPSTREAM: serial: 8250_dw: fall back to poll if there's no interrupt
*   35361bdac2 Merge "Merge tag 'android14-6.1.43_r00' into android14-6.1" into android14-6.1
|\
| * 769612f594 Merge tag 'android14-6.1.43_r00' into android14-6.1
* | 034b4b4f1b ANDROID: Update the ABI representation
* | 0947464633 ANDROID: power: Add vendor hook for suspend
|/
* b783e85610 ANDROID: Update the ABI symbol list
* 2c609cab0b UPSTREAM: of: reserved-mem: print out reserved-mem details during boot
* ff2563f384 ANDROID: GKI: Update symbol list for xiaomi "abi_gki_aarch64_xiaomi"
* 7542b3bef7 ANDROID: Update symbols list and ABI for qcom
* 63d4231d85 ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate
* 09641ca77f ANDROID: GKI: Update oplus symbol list update oplus symbol list for Addding hooks for adjusting alloc_flags
* 0b20035778 ANDROID: vendor_hooks: Add hooks for adjusting alloc_flags
* 367ce30ddc UPSTREAM: libceph: harden msgr2.1 frame segment length checks
* debc1e0486 ANDROID: Update the ABI symbol list
* 401b78ce87 ANDROID: mm: Add vendor hook in filemap_get_folio()
* 1b3269beea UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
* a9c65c7efb UPSTREAM: netfilter: ipset: Add schedule point in call_ad().
* cd4ea97d2a UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
* a4ccba8bdc UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
* 8a67c06094 ANDROID: GKI: fix ABI breakage in struct hid_device
* 28ee91ed2b UPSTREAM: HID: input: map battery system charging
* 2dd1c535d1 FROMGIT: maple_tree: add GFP_KERNEL to allocations in mas_expected_entries()
* faa4efd6b1 UPSTREAM: maple_tree: replace data before marking dead in split and spanning store
* 47e3b4920d UPSTREAM: maple_tree: change mas_adopt_children() parent usage
* e0f829b74b UPSTREAM: maple_tree: introduce mas_tree_parent() definition
* e69d6570ed UPSTREAM: maple_tree: introduce mas_put_in_tree()
* d2e45cee2d UPSTREAM: maple_tree: reorder replacement of nodes to avoid live lock
* 545cc51b9f ANDROID: GKI: add allowed list for Exynosauto SoC
* f51787dfb7 ANDROID: Update the ABI symbol list
* 1b71e8ef45 ANDROID: Update the ABI symbol list
* 908a530787 ANDROID: KVM: Update nVHE stack size to 8KB
* 53771c1826 ANDROID: Update the ABI symbol list
* a22ff19ff6 ANDROID: mm: Add vendor hook in rmqueue()
* 09ca291e0a FROMLIST: virt: geniezone: Add memory pin/unpin support
* 7cc3767c2a FROMLIST: virt: geniezone: Add block-based demand paging support
* 3fcc07ee5f FROMLIST: virt: geniezone: Add demand paging support
* 6a1a30896d ANDROID: virt: geniezone: Refactoring memory region support
* 9f64b18da1 ANDROID: virt: geniezone: Refactor code comments from mainline v6 accordingly
* 544b128747 ANDROID: virt: geniezone: Refactoring vgic to align with upstream v6
* f9291d7af0 ANDROID: virt: geniezone: Refactoring vcpu to align with upstream v6
* e348fe6d2d ANDROID: virt: geniezone: Refactoring vm capability to align with upstream v6
* fb3444af07 ANDROID: virt: geniezone: Refactoring irqfd to align with upstream v6
* 7e1cb3bdec ANDROID: sched: Add EXPORT_SYMBOL_GPL for sched_wakeup
* 73cee74111 ANDROID: vendor_hooks: Export direct reclaim trace points
* fca353bdc0 ANDROID: mm: freeing MIGRATE_ISOLATE page instantly
* 08351370ec ANDROID: KVM: arm64: Allow setting device attr in stage-2 PTEs
* b25aabd50a ANDROID: KVM: arm64: Fix hyp tracing build dependencies
* f82e080810 ANDROID: abi_gki_aarch64_qcom: update abi symbols
* 2fff9f7cd4 ANDROID: vendor hooks: Enable Vendor hook to register smmu driver to dedicated iommu bus defined by vendor.
* fadd504206 UPSTREAM: netfilter: xt_sctp: validate the flag_info count
* 1c90408931 UPSTREAM: mm/mglru: make memcg_lru->lock irq safe
* 87cd3d689e UPSTREAM: iommu/amd: Fix possible memory leak of 'domain'
* e5f37a2c46 UPSTREAM: selftests/tc-testing: Remove configs that no longer exist
* 7c793b4d8f ANDROID: abi_gki_aarch64_qcom: update abi symbols
* bf51ba7b3c ANDROID: ABI: Update symbol list for imx
* 1e6a9aeb14 ANDROID: GKI: add allowed list for Exynosauto SoC
* a338830fde UPSTREAM: ufs: core: wlun send SSU timeout recovery
* fd2e98c6f5 UPSTREAM: PM: domains: fix integer overflow issues in genpd_parse_state()
* e3e2ece8a0 ANDROID: mm: vh for compaction begin/end
* 2176509c4d UPSTREAM: netfilter: xt_u32: validate user space input
* 132b47119e UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
* 8c3b0a3493 UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
* 4181951d21 UPSTREAM: net/sched: Retire rsvp classifier
* acb0728638 UPSTREAM: usb: core: stop USB enumeration if too many retries
* 8b1bd87917 ANDROID: KVM: arm64: Add missing hyp events for forwarded SMCs
* f4812c6864 ANDROID: KVM: arm64: Store hyp address in the host fp state array
* 6334225e9b ANDROID: KVM: arm64: Allocate host fp/simd state later in initialization
* 83ebd50235 UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding
* 7d088a3e4f UPSTREAM: fs/smb/client: Reset password pointer to NULL
* 2807a43b69 ANDROID: Update the ABI symbol list
* 368b752997 FROMGIT: usb: typec: ucsi: Clear EVENT_PENDING bit if ucsi_send_command fails
* 4fcc13c1ff ANDROID: mm: add missing check in the backport for handling faults under VMA lock
* 1fe248991f ANDROID: Update the ABI symbol list
* 4301901382 ANDROID: Update STG for ANDROID_KABI_USE(1, unsigned int saved_state)
* 22cd8e0def FROMGIT: freezer,sched: Use saved_state to reduce some spurious wakeups
* 457e65696a BACKPORT: FROMGIT: sched/core: Remove ifdeffery for saved_state
* 3437652fa2 BACKPORT: erofs: set block size to the on-disk block size
* e84c93fd42 BACKPORT: erofs: avoid hardcoded blocksize for subpage block support
* 36496d09e8 BACKPORT: erofs: get rid of z_erofs_do_map_blocks() forward declaration
* cee0694362 BACKPORT: erofs: get rid of erofs_inode_datablocks()
* f7d9c7d0b4 BACKPORT: erofs: simplify iloc()
* 7d42260e5c ANDROID: Update the ABI symbol list
* 324c8522f9 ANDROID: Update symbol list for mtk
* 30d86f760c ANDROID: mm: Add vendor hooks for recording when kswapd finishing the reclaim job
* 0deb7bb73e ANDROID: mm: Add vendor hooks for __alloc_pages_slowpath
* 5c2855fbce ANDROID: mm: Add vendor hook for compact pages work.
* 4e10001b7c ANDROID: Update the ABI symbol list
* 2434dece1f FROMGIT: usb: gadget: u_serial: Add null pointer check in gserial_suspend
* 5f8aa27248 ANDROID: Update the ABI symbol list
* f7e7874d9b BACKPORT: usb: typec: bus: verify partner exists in typec_altmode_attention
* 5cb3b26d79 ANDROID: ABI: Update the pixel symbol list and stg
* cf1ba6a102 UPSTREAM: shmem: fix smaps BUG sleeping while atomic
* 52824b718c UPSTREAM: blk-ioprio: Introduce promote-to-rt policy
* dce1834895 ANDROID: ABI: Update oplus symbol list
* 89815ec103 ANDROID: GKI: export symbols to do reverse mapping within memcg and modify lru stats
* 45fe413fdf ANDROID: gki_defconfig: Enable CONFIG_BLK_CGROUP_IOPRIO
* c240f4ed00 ANDROID: gunyah: Convert mutex_lock_interruptible to mutex_lock
* 6305df8009 UPSTREAM: bpf, sockmap: fix deadlocks in the sockhash and sockmap
* 7999b48d76 UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
* 709dc094e3 UPSTREAM: ARM: ptrace: Restore syscall skipping for tracers
* ea494b2716 UPSTREAM: ARM: ptrace: Restore syscall restart tracing
* b374d94195 Revert "BACKPORT: FROMGIT: usb: gadget: udc: Handle gadget_connect failure during bind operation"
* ae5ea9043d ANDROID: Move microdroid and crashdump defconfigs to common
* b548c046c7 UPSTREAM: net: prevent skb corruption on frag list segmentation
* 060ebb378d ANDROID: ABI: Update oplus symbol list
* f451f4a599 ANDROID: vendor_hooks: Add hooks for oem percpu-rwsem optimaton
* a3cb85bffe ANDROID: ABI: Update oplus symbol list
* 740a51391b ANDROID: vendor_hooks: Add hooks for binder
* c6724bfeda ANDROID: uid_sys_stat: instead update_io_stats_uid_locked to update_io_stats_uid
* 97f2f8a065 ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained locks for each hlist in hash_table.
* 9290fc3e8d ANDROID: Flush deferred probe list before dropping host priv
* 6625133137 ANDROID: KVM: arm64: Don't force pte mappings in [n]VHE guest stage-2
* 2f2c035453 UPSTREAM: usb: gadget: u_serial: Add null pointer check in gs_start_io
* ac9005946a UPSTREAM: sched: Consider task_struct::saved_state in wait_task_inactive()
* b52b33e912 UPSTREAM: sched: Unconditionally use full-fat wait_task_inactive()
* 8465ef2b4f ANDROID: GKI: Update symbol list for ASUS
* 1e4c6e5048 UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
* 40b46d8656 UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
* d8f69aade5 UPSTREAM: iommu/of: mark an unused function as __maybe_unused
* a032fbc776 UPSTREAM: iommu: dma: Use of_iommu_get_resv_regions()
* 693c712967 UPSTREAM: iommu: Implement of_iommu_get_resv_regions()
* e9603e85ac UPSTREAM: dt-bindings: reserved-memory: Document iommu-addresses
* 64ed291347 UPSTREAM: of: Introduce of_translate_dma_region()
* 536996aa30 ANDROID: GKI: Add rockchip fragment and build.config
* 6a10b34387 ANDROID: GKI: Add symbols for rockchip v4l2
* 3e3c6debe4 ANDROID: GKI: Add hid and usb symbols for rockchip
* 53162778e7 ANDROID: GKI: Add cdc symbols for rockchip
* b09b06dcf1 ANDROID: GKI: Add symbols for rockchip sdhci
* 62d64a59d9 ANDROID: GKI: Add symbols for rockchip devfreq
* 9c9ee611cf ANDROID: GKI: Add crypto symbols for rockchip
* 7246ecec46 ANDROID: GKI: Add rockchip drm symbols and abi
* 2f3d6aa0c9 ANDROID: GKI: Add initial abi for rockchip
* 1e26ba1901 ANDROID: GKI: Add initial rockchip symbol list
* 404360f6d3 FROMLIST: clk: clk-fractional-divider: Export clk_fractional_divider_general_approximation API
* c3d6c235b2 UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
* d3212c2dba UPSTREAM: sched/rt: Fix bad task migration for rt tasks
* 215e38e517 ANDROID: GKI: Add ASUS symbol list
* e52e60e3ed UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
* bbc9d3bc0b ANDROID: vendor_hooks: mm: Add tune_swappiness vendor hook in get_swappiness()
* 7024c9cd28 ANDROID: ABI: Update symbols to unisoc whitelist
* de3e9f3111 ANDROID: ABI: Add to QCOM symbols list
* 85902d60cd ANDROID: ABI: update symbol list for galaxy
* c2ac612610 BACKPORT: printk: ringbuffer: Fix truncating buffer size min_t cast
* 7579b22626 ANDROID: GKI: Add symbols to symbol list for oplus
* 6e5f182128 ANDROID: signal: Add vendor hook for memory reap
* 3a51a61927 ANDROID: abi_gki_aarch64_qcom: white list symbols for mglru overshoot
* 0500235e3f ANDROID: vendor_hook: Add vendor hook to decide scan abort policy
* e6ed59127c UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
* 2eb5b31ac1 FROMLIST: ufs: core: fix abnormal scale up after last cmd finish
* 89434cbd2d FROMLIST: ufs: core: fix abnormal scale up after scale down
* e490b62fed FROMLIST: ufs: core: only suspend clock scaling if scale down
* 3ffb038098 ANDROID: GKI: update ABI definition
* e2fa9ebcae UPSTREAM: zsmalloc: allow only one active pool compaction context
* 478ec4dbea ANDROID: GKI: Update Tuxera symbol list
* cd94fe67fd ANDROID: ABI: Update symbols to qcom whitelist
* 68eefde2d3 UPSTREAM: usb: typec: tcpm: set initial svdm version based on pd revision
* a68bd01493 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
* 20ecb229c5 ANDROID: cpuidle: teo: Export a function that allows modifying util_threshold
* 2490ab50e7 ANDROID: sched: Add vendor hook for rt util update
* 6d97f75abc ANDROID: sched: Add vendor hook for util-update related functions
* e08c5de06e ANDROID: sched: Add vendor hooks for override sugov behavior
* 5762974151 ANDROID: Add new hook to enable overriding uclamp_validate()
* b57e3c1d99 ANDROID: sched/uclamp: Don't enable uclamp_is_used static key by in-kernel requests
* 2b25d535d0 ANDROID: topology: Add vendor hook for use_amu_fie
* eb9686932b ANDROID: sched: Export symbols needed for vendor hooks
* 84131c988b ANDROID: Update symbol list for Exynos Auto SoCs
* 3367abadff UPSTREAM: netfilter: nf_tables: deactivate catchall elements in next generation
* a891f77b7b ANDROID: GKI: Update symbols to symbol list
* 4d8d9522db ANDROID: GKI: Export four symbols in file net/core/net-trace.c
* 3973acfed0 UPSTREAM: blk-ioc: fix recursive spin_lock/unlock_irq() in ioc_clear_queue()
* 523bfe8539 ANDROID: fuse-bpf: Align data structs for 32-bit kernels
* 9f5a84b955 ANDROID: GKI: Update symbol list for xiaomi
* 176d72d941 ANDROID: vendor_hooks: export cgroup_threadgroup_rwsem
* 1fb9e95d46 ANDROID: GKI: add symbol list file for meizu
* 8fb9de0877 ANDROID: fuse-bpf: Get correct inode in mkdir
* 0fdb44964c ANDROID: ABI: Update allowed list for QCOM
* 404522c763 UPSTREAM: blk-ioc: protect ioc_destroy_icq() by 'queue_lock'
* bd0308e36b ANDROID: GKI: Update symbols to symbol list
* 87647c0c54 ANDROID: uid_sys_stats: Use llist for deferred work
* 4b3ab91671 UPSTREAM: net: nfc: Fix use-after-free caused by nfc_llcp_find_local
* c603880bd5 UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
* d95b2b008e UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
* b15c3a3df0 UPSTREAM: usb: typec: ucsi: Fix command cancellation
* 0c34d588af UPSTREAM: locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock
* 20266a0652 ANDROID: kleaf: Remove ptp_kvm.ko from i386 modules
* ce18fe6f29 ANDROID: GKI: Add symbols to symbol list for oplus
* 8e6550add2 ANDROID: vendor_hooks: Add tune swappiness hook in get_scan_count()
* dd87a7122c ANDROID: GKI: Update symbol list for VIVO
* 638804ea1c ANDROID: kleaf: get_gki_modules_list add i386 option
* 264e2973a4 ANDROID: arm as an option for get_gki_modules_list
* 37edfbc5c4 UPSTREAM: um: Only disable SSE on clang to work around old GCC bugs
* 2a13641a14 ANDROID: GKI: Update abi_gki_aarch64_qcom for page_owner symbols
* f08623648a ANDROID: mm: Export page_owner_inited and __set_page_owner
* e44e3955f7 ANDROID: Use alias for old rules.
* 67018dd4e4 ANDROID: virt: geniezone: Enable as GKI module for arm64
* 9a399ca713 ANDROID: Add arch specific gki module list targets
* 3e079b7691 FROMLIST: virt: geniezone: Add dtb config support
* 39bd65ec1d FROMLIST: virt: geniezone: Add memory region support
* c26057e351 FROMLIST: virt: geniezone: Add ioeventfd support
* e73a5222e6 FROMLIST: virt: geniezone: Add irqfd support
* 7427b76faa FROMLIST: virt: geniezone: Add irqchip support for virtual interrupt injection
* 540cff0872 FROMLIST: virt: geniezone: Add vcpu support
* 6ce86d075e FROMLIST: virt: geniezone: Add GenieZone hypervisor support
* 40107a0081 FROMLIST: dt-bindings: hypervisor: Add MediaTek GenieZone hypervisor
* beaffb638b FROMLIST: docs: geniezone: Introduce GenieZone hypervisor
* e0c4636bd2 UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* ec1f17ddac UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
* 0adc759b0c UPSTREAM: exfat: check if filename entries exceeds max filename length
* f4ba064f76 UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* 5b0878fc61 ANDROID: abi_gki_aarch64_qcom: update abi symbols
* 7551a1a2a1 ANDROID: cgroup: Add android_rvh_cgroup_force_kthread_migration
* cd018c99fa FROMGIT: pstore/ram: Check start of empty przs during init
* ffaab71302 UPSTREAM: erofs: avoid infinite loop in z_erofs_do_read_page() when reading beyond EOF
* 8497f46a87 UPSTREAM: erofs: avoid useless loops in z_erofs_pcluster_readmore() when reading beyond EOF
* 2f805fb912 UPSTREAM: erofs: Fix detection of atomic context
* cc6111a287 UPSTREAM: erofs: fix compact 4B support for 16k block size
* f11ccb03a0 UPSTREAM: erofs: kill hooked chains to avoid loops on deduplicated compressed images
* 7521b904dc UPSTREAM: erofs: fix potential overflow calculating xattr_isize
* 6ec6eee87e UPSTREAM: erofs: stop parsing non-compact HEAD index if clusterofs is invalid
* 9089c10d9c UPSTREAM: erofs: initialize packed inode after root inode is assigned
* 797dac42cc ANDROID: GKI: Update ABI for zsmalloc fixes
* cb440cecb2 BACKPORT: zsmalloc: fix races between modifications of fullness and isolated
* c0e84be923 ANDROID: ABI: Update symbols to unisoc whitelist for A14-6.1
* 5ef132d564 UPSTREAM: zsmalloc: consolidate zs_pool's migrate_lock and size_class's locks
* ec6b3d552a UPSTREAM: netfilter: nfnetlink_log: always add a timestamp
* 4db95aa21a ANDROID: virt: gunyah: Do not allocate irq for GH_RM_RESOURCE_NO_VIRQ
* 2d1d3be2ba ANDROID: GKI: Add Tuxera symbol list
* 20d8a89758 ANDROID: ABI: Update oplus symbol list
* 7afa84fbb9 ANDROID: vendor_hooks: Add hooks for waking up and exiting control
* 9ca47685c5 ANDROID: GKI: Update symbol list for xiaomi
* 2d7f87b0ff ANDROID: vendor_hooks:vendor hook for percpu-rwsem
* 63af84cffe ANDROID: fips140: fix the error injection module parameters
* 71bedf9d9c BACKPORT: blk-crypto: dynamically allocate fallback profile
* 086befddbe UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* ecd8d8a208 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* 6923dcc21d UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer

Change-Id: Idc01a15f70d151d08c30ee23c2939260764e428b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-10-31 17:20:05 +00:00
Shuzhen Wang
171c27ba1f BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor
In case the uvc gadget is super speed plus, the corresponding config
descriptor wasn't initialized. As a result, the host will not recognize
the devices when using super speed plus connection.

This patch initializes them to super speed descriptors.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Shuzhen Wang <shuzhenwang@google.com>
Link: https://lore.kernel.org/r/20231027183440.1994315-1-shuzhenwang@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 301887900
Change-Id: I79c699bafaf959990da3a8101c8bfe0f8dabf72f
(cherry picked from commit c70793fb7632a153862ee9060e6d48131469a29c
 https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
[arakesh: Resolved minor merge conflicts in f_uvc.c]
Signed-off-by: Avichal Rakesh <arakesh@google.com>
2023-10-31 16:02:23 +00:00
Linyu Yuan
bb0173a1da BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation
Take f_midi_bind() for example,  when composite layer call it, it will
allocate hs descriptor by calling gadget_is_dualspeed() API to check
gadget max support speed capability, but most other gadget function didn't
do like this.

To follow other function drivers, it is safe to remove the check which
mean support all possible link speed by default in function driver.

Similar change apply to midi2 and uvc.

Also in midi and midi2, as there is no descriptor difference between
super speed and super speed plus, follow other gadget function drivers,
do not allocate descriptor for super speed plus, composite layer will
handle it properly.

Signed-off-by: Linyu Yuan <quic_linyyuan@quicinc.com>
Link: https://lore.kernel.org/r/20230803091053.9714-5-quic_linyyuan@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 301887900
Change-Id: I8b287266b3973c66e559bd3eea9adbe95e051be7
(cherry picked from commit 46decc82ff
 https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
[arakesh: f_midi2.c doesn't exist, so dropped those changes]
Signed-off-by: Avichal Rakesh <arakesh@google.com>
2023-10-31 16:02:23 +00:00
Linyu Yuan
5c4815f5b6 UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()
when call uvc_function_bind(), gadget still have no connection speed,
just follow other gadget function, use fs endpoint descriptor to allocate
a video endpoint, remove gadget_is_{super|dual}speed() API call.

Signed-off-by: Linyu Yuan <quic_linyyuan@quicinc.com>
Link: https://lore.kernel.org/r/20230803091053.9714-4-quic_linyyuan@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 301887900
Change-Id: I076e51716e4bab7a70a43ad3e080b4c4e110c9db
(cherry picked from commit 3c5b006f3e
 https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Signed-off-by: Avichal Rakesh <arakesh@google.com>
2023-10-31 16:02:23 +00:00
Yue Haibing
5a05f2e755 UPSTREAM: usb: gadget: function: Remove unused declarations
These declarations are not implemented anymore, remove them.

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20230818124025.51576-1-yuehaibing@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 301887900
Change-Id: Ib1ac4d7ecada70d467cd9b2d688f13ba3797a05c
(cherry picked from commit ae25761157
 https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Signed-off-by: Avichal Rakesh <arakesh@google.com>
2023-10-31 16:02:23 +00:00
Avichal Rakesh
defd93f219 UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump
This patch elaborates on some of the edge cases handled by
video_pump around setting no_interrupt flag, and brings the
code style in line with rest of the file.

Link: https://lore.kernel.org/20230602151916.GH26944@pendragon.ideasonboard.com/
Signed-off-by: Avichal Rakesh <arakesh@google.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Message-ID: <20230602220455.313801-1-arakesh@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 301887900
Change-Id: Ie5f28e8d8f55158e32e0ff03b79f0f18cce7d6af
(cherry picked from commit 5ae8a35459
 https://kernel.googlesource.com/pub/scm/linux/kernel/git/gregkh/usb usb-next)
Signed-off-by: Avichal Rakesh <arakesh@google.com>
2023-10-31 16:02:23 +00:00
Sebastian Andrzej Siewior
82fe654f56 UPSTREAM: mm/page_alloc: use write_seqlock_irqsave() instead write_seqlock() + local_irq_save().
__build_all_zonelists() acquires zonelist_update_seq by first disabling
interrupts via local_irq_save() and then acquiring the seqlock with
write_seqlock().  This is troublesome and leads to problems on PREEMPT_RT.
The problem is that the inner spinlock_t becomes a sleeping lock on
PREEMPT_RT and must not be acquired with disabled interrupts.

The API provides write_seqlock_irqsave() which does the right thing in one
step.  printk_deferred_enter() has to be invoked in non-migrate-able
context to ensure that deferred printing is enabled and disabled on the
same CPU.  This is the case after zonelist_update_seq has been acquired.

There was discussion on the first submission that the order should be:
	local_irq_disable();
	printk_deferred_enter();
	write_seqlock();

to avoid pitfalls like having an unaccounted printk() coming from
write_seqlock_irqsave() before printk_deferred_enter() is invoked.  The
only origin of such a printk() can be a lockdep splat because the lockdep
annotation happens after the sequence count is incremented.  This is
exceptional and subject to change.

It was also pointed that PREEMPT_RT can be affected by the printk problem
since its write_seqlock_irqsave() does not really disable interrupts.
This isn't the case because PREEMPT_RT's printk implementation differs
from the mainline implementation in two important aspects:

- Printing happens in a dedicated threads and not at during the
  invocation of printk().
- In emergency cases where synchronous printing is used, a different
  driver is used which does not use tty_port::lock.

Acquire zonelist_update_seq with write_seqlock_irqsave() and then defer
printk output.

Bug: 254441685
Link: https://lkml.kernel.org/r/20230623201517.yw286Knb@linutronix.de
Fixes: 1007843a91 ("mm/page_alloc: fix potential deadlock on zonelist_update_seq seqlock")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
(cherry picked from commit a2ebb51575)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ib40406942a4ba9ae9d6e2044077043aa1455a0a7
2023-10-31 10:52:09 +00:00
Rafael J. Wysocki
ed6694a682 UPSTREAM: cpuidle: teo: Update idle duration estimate when choosing shallower state
The TEO governor takes CPU utilization into account by refining idle state
selection when the utilization is above a certain threshold.  This is done by
choosing an idle state shallower than the previously selected one.

However, when doing this, the idle duration estimate needs to be
adjusted so as to prevent the scheduler tick from being stopped when the
candidate idle state is shallow, which may lead to excessive energy
usage if the CPU is not woken up quickly enough going forward.
Moreover, if the scheduler tick has been stopped already and the new
idle duration estimate is too small, the replacement candidate state
cannot be used.

Modify the relevant code to take the above observations into account.

Bug: 254441685
Fixes: 9ce0f7c4bc ("cpuidle: teo: Introduce util-awareness")
Link: https://lore.kernel.org/linux-pm/CAJZ5v0jJxHj65r2HXBTd3wfbZtsg=_StzwO1kA5STDnaPe_dWA@mail.gmail.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-and-tested-by: Kajetan Puchalski <kajetan.puchalski@arm.com>
(cherry picked from commit 3f0b0966b3)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I4f944d1b825f721dae7c406c73bac2a683d94cd6
2023-10-31 10:38:50 +00:00
Johan Hovold
d8e99e1af8 BACKPORT: Revert "PCI: dwc: Wait for link up only if link is started"
This reverts commit da56a1bfba.

Bjorn Andersson, Fabio Estevam, Xiaolei Wang, and Jon Hunter reported that
da56a1bfba ("PCI: dwc: Wait for link up only if link is started") broke
controller probing by returning an error in case the link does not come up
during host initialisation, for example when the slot is empty.

As explained in commit 886a9c1347 ("PCI: dwc: Move link handling into
common code") and as indicated by the comment "Ignore errors, the link may
come up later" in the code, waiting for link up and ignoring errors is the
intended behaviour:

  Let's standardize this to succeed as there are usecases where devices
  (and the link) appear later even without hotplug. For example, a
  reconfigured FPGA device.

Reverting the offending commit specifically fixes a regression on Qualcomm
platforms like the Lenovo ThinkPad X13s which no longer reach the
interconnect sync state if a slot does not have a device populated (e.g. an
optional modem).

Note that enabling asynchronous probing by default as was done for Qualcomm
platforms by commit c0e1eb441b ("PCI: qcom: Enable async probe by
default"), should take care of any related boot time concerns.

Finally, note that the intel-gw driver is the only driver currently not
providing a .start_link() callback and instead starts the link in its
.host_init() callback, which may avoid an additional one-second timeout
during probe by making the link-up wait conditional. If anyone cares, that
can be done in a follow-up patch with a proper motivation.

Bug: 254441685
[bhelgaas: add Fabio Estevam, Xiaolei Wang, Jon Hunter reports]
Fixes: da56a1bfba ("PCI: dwc: Wait for link up only if link is started")
Link: https://lore.kernel.org/r/20230706082610.26584-1-johan+linaro@kernel.org
Reported-by: Bjorn Andersson <quic_bjorande@quicinc.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reported-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20230704122635.1362156-1-festevam@gmail.com/
Reported-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Link: https://lore.kernel.org/r/20230705010624.3912934-1-xiaolei.wang@windriver.com/
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/6ca287a1-6c7c-7b90-9022-9e73fb82b564@nvidia.com
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Cc: Sajid Dalvi <sdalvi@google.com>
Cc: Ajay Agarwal <ajayagarwal@google.com>
(cherry picked from commit c5097b9869)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I7047644c007ccc7c734e8531b054033e5ac066d7
2023-10-31 10:38:50 +00:00
Yoshihiro Shimoda
841ad9b9b3 UPSTREAM: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
[ Upstream commit 3971442870 ]

The ravb_stop() should call cancel_work_sync(). Otherwise,
ravb_tx_timeout_work() is possible to use the freed priv after
ravb_remove() was called like below:

CPU0			CPU1
			ravb_tx_timeout()
ravb_remove()
unregister_netdev()
free_netdev(ndev)
// free priv
			ravb_tx_timeout_work()
			// use priv

unregister_netdev() will call .ndo_stop() so that ravb_stop() is
called. And, after phy_stop() is called, netif_carrier_off()
is also called. So that .ndo_tx_timeout() will not be called
after phy_stop().

Bug: 289003868
Fixes: c156633f13 ("Renesas Ethernet AVB driver proper")
Reported-by: Zheng Wang <zyytlz.wz@163.com>
Closes: https://lore.kernel.org/netdev/20230725030026.1664873-1-zyytlz.wz@163.com/
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20231005011201.14368-3-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 6f6fa8061f)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I36fcd769d93817adaa04162cae0b54b1addbb9bf
2023-10-30 17:46:48 +00:00
Yoshihiro Shimoda
17e456ce41 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
[ Upstream commit e6864af614 ]

In ravb_remove(), dma_free_coherent() should be call after
unregister_netdev(). Otherwise, this controller is possible to use
the freed buffer.

Bug: 289003868
Fixes: c156633f13 ("Renesas Ethernet AVB driver proper")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20231005011201.14368-2-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 3f9295ad7f)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I8e7da5816f715307c7d8bcd881a2a5ecb52439bb
2023-10-30 17:46:48 +00:00
RD Babiera
5ba644e8a0 BACKPORT: usb: typec: altmodes/displayport: Signal hpd low when exiting mode
Upon receiving an ACK for a sent EXIT_MODE message, the DisplayPort
driver currently resets the status and configuration of the port
partner. The hpd signal is not updated despite being part of the
status, so the Display stack can still transmit video despite
typec_altmode_exit placing the lanes in a Safe State.

Set hpd to low when a sent EXIT_MODE message is ACK'ed.

Fixes: 0e3bb7d689 ("usb: typec: Add driver for DisplayPort alternate mode")
Cc: stable@vger.kernel.org
Signed-off-by: RD Babiera <rdbabiera@google.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20231009210057.3773877-2-rdbabiera@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 297208252
Bug: 308184880
(cherry picked from commit 89434b069e)
[rd: removed unused call to drm_connector_oob_hotplug_event]
Signed-off-by: RD Babiera <rdbabiera@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:d7e80ace6b420b90b0fd2d442fef2e783bbe406d)
Merged-In: Iad61fa4db6b126db7fc3bd717b60c2ca35da1311
Change-Id: Iad61fa4db6b126db7fc3bd717b60c2ca35da1311
2023-10-30 17:20:56 +00:00
Will Deacon
9e4f6e1ef8 ANDROID: KVM: arm64: Fix KVM_HOST_S2_DEFAULT_MMIO_PTE encoding
Commit b489c53001 ("ANDROID: KVM: arm64: Allow setting {P,U}XN in
stage-2 PTEs") changed KVM_PTE_LEAF_ATTR_HI_S2_XN to refer to the XN
field of the pte (i.e. bits 54:53) instead of just bit 54 and forgot
to update KVM_HOST_S2_DEFAULT_MMIO_PTE in the process.

Consequently, coalescing will fail to apply to default MMIO ptes and
may inadvertently trigger for ptes marked as UXN. Fix the mask.

Cc: Quentin Perret <qperret@google.com>
Cc: Sebastian Ene <sebastianene@google.com>
Bug: 308395502
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I4f85eae7ccee008a1161e09739c1fd4f3e1b6e2b
2023-10-30 11:11:20 +00:00
Jacky Liu
5418491fa5 ANDROID: Update the ABI symbol list
Adding the following symbols:
  - __traceiter_android_vh_prio_inheritance
  - __traceiter_android_vh_prio_restore
  - __tracepoint_android_vh_prio_inheritance
  - __tracepoint_android_vh_prio_restore

Bug: 289412815
Change-Id: I1954c3f2b9d41c3d04050c3fe1b8f35a4efff97a
Signed-off-by: Jacky Liu <qsliu@google.com>
2023-10-28 00:27:06 +00:00
Qais Yousef
b821a3c8fc ANDROID: fs/proc: Perform priority inheritance around access_remote_vm()
It holds mmap_sem lock which is a hot path. Some debug daemons can end
up holding this lock to get the cmdline of a process, which can result
in slowing down this process.

Add hooks around the calls to allow vendors to implement a simple prio
inheritance scheme to deal with this.

Bug: 289412815
Signed-off-by: Qais Yousef <qyousef@google.com>
Change-Id: I160637b30e5bd58d5978b25be8a21ce025175ec3
2023-10-28 00:27:06 +00:00
Greg Kroah-Hartman
2950de8b2d Merge 6.1.56 into android14-6.1-lts
Changes in 6.1.56
	NFS: Fix error handling for O_DIRECT write scheduling
	NFS: Fix O_DIRECT locking issues
	NFS: More O_DIRECT accounting fixes for error paths
	NFS: Use the correct commit info in nfs_join_page_group()
	NFS: More fixes for nfs_direct_write_reschedule_io()
	NFS/pNFS: Report EINVAL errors from connect() to the server
	SUNRPC: Mark the cred for revalidation if the server rejects it
	NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server
	NFSv4.1: fix pnfs MDS=DS session trunking
	media: v4l: Use correct dependency for camera sensor drivers
	media: via: Use correct dependency for camera sensor drivers
	netfs: Only call folio_start_fscache() one time for each folio
	dm: fix a race condition in retrieve_deps
	btrfs: improve error message after failure to add delayed dir index item
	btrfs: remove BUG() after failure to insert delayed dir index item
	ext4: replace the traditional ternary conditional operator with with max()/min()
	ext4: move setting of trimmed bit into ext4_try_to_trim_range()
	ext4: do not let fstrim block system suspend
	netfilter: nf_tables: don't skip expired elements during walk
	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: don't fail inserts if duplicate has expired
	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: nf_tables: defer gc run if previous batch is still pending
	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: call nft_trans_gc_queue_sync() in catchall GC
	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: fix memleak when more than 255 elements expired
	ASoC: meson: spdifin: start hw on dai probe
	netfilter: nf_tables: disallow element removal on anonymous sets
	bpf: Avoid deadlock when using queue and stack maps from NMI
	ASoC: rt5640: Revert "Fix sleep in atomic context"
	ASoC: rt5640: Fix IRQ not being free-ed for HDA jack detect mode
	ALSA: hda/realtek: Splitting the UX3402 into two separate models
	netfilter: conntrack: fix extension size table
	selftests: tls: swap the TX and RX sockets in some tests
	net/core: Fix ETH_P_1588 flow dissector
	ASoC: hdaudio.c: Add missing check for devm_kstrdup
	ASoC: imx-audmix: Fix return error with devm_clk_get()
	octeon_ep: fix tx dma unmap len values in SG
	iavf: do not process adminq tasks when __IAVF_IN_REMOVE_TASK is set
	ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful
	iavf: add iavf_schedule_aq_request() helper
	iavf: schedule a request immediately after add/delete vlan
	i40e: Fix VF VLAN offloading when port VLAN is configured
	netfilter, bpf: Adjust timeouts of non-confirmed CTs in bpf_ct_insert_entry()
	ionic: fix 16bit math issue when PAGE_SIZE >= 64KB
	igc: Fix infinite initialization loop with early XDP redirect
	ipv4: fix null-deref in ipv4_link_failure
	scsi: iscsi_tcp: restrict to TCP sockets
	powerpc/perf/hv-24x7: Update domain value check
	dccp: fix dccp_v4_err()/dccp_v6_err() again
	x86/mm, kexec, ima: Use memblock_free_late() from ima_free_kexec_buffer()
	net: hsr: Properly parse HSRv1 supervisor frames.
	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
	x86/srso: Fix srso_show_state() side effect
	x86/srso: Fix SBPB enablement for spec_rstack_overflow=off
	net: hns3: add cmdq check for vf periodic service task
	net: hns3: fix GRE checksum offload issue
	net: hns3: only enable unicast promisc when mac table full
	net: hns3: fix fail to delete tc flower rules during reset issue
	net: hns3: add 5ms delay before clear firmware reset irq source
	net: bridge: use DEV_STATS_INC()
	team: fix null-ptr-deref when team device type is changed
	net: rds: Fix possible NULL-pointer dereference
	netfilter: nf_tables: disable toggling dormant table state more than once
	netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
	i915/pmu: Move execlist stats initialization to execlist specific setup
	locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()
	net: ena: Flush XDP packets on error.
	bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI
	octeontx2-pf: Do xdp_do_flush() after redirects.
	igc: Expose tx-usecs coalesce setting to user
	proc: nommu: /proc/<pid>/maps: release mmap read lock
	proc: nommu: fix empty /proc/<pid>/maps
	cifs: Fix UAF in cifs_demultiplex_thread()
	gpio: tb10x: Fix an error handling path in tb10x_gpio_probe()
	i2c: mux: demux-pinctrl: check the return value of devm_kstrdup()
	i2c: mux: gpio: Add missing fwnode_handle_put()
	i2c: xiic: Correct return value check for xiic_reinit()
	ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2
	ARM: dts: samsung: exynos4210-i9100: Fix LCD screen's physical size
	ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen
	ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names
	ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode
	f2fs: optimize iteration over sparse directories
	f2fs: get out of a repeat loop when getting a locked data page
	s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_CLR2SECK2 IOCTL
	arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved
	wifi: ath11k: fix tx status reporting in encap offload mode
	wifi: ath11k: Cleanup mac80211 references on failure during tx_complete
	scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called
	scsi: qla2xxx: Use raw_smp_processor_id() instead of smp_processor_id()
	drm/amdkfd: Flush TLB after unmapping for GFX v9.4.3
	drm/amdkfd: Insert missing TLB flush on GFX10 and later
	btrfs: reset destination buffer when read_extent_buffer() gets invalid range
	vfio/mdev: Fix a null-ptr-deref bug for mdev_unregister_parent()
	MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled
	spi: spi-gxp: BUG: Correct spi write return value
	drm/bridge: ti-sn65dsi83: Do not generate HFP/HBP/HSA and EOT packet
	bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset()
	bus: ti-sysc: Fix missing AM35xx SoC matching
	firmware: arm_scmi: Harden perf domain info access
	firmware: arm_scmi: Fixup perf power-cost/microwatt support
	power: supply: mt6370: Fix missing error code in mt6370_chg_toggle_cfo()
	clk: sprd: Fix thm_parents incorrect configuration
	clk: tegra: fix error return case for recalc_rate
	ARM: dts: omap: correct indentation
	ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4
	ARM: dts: Unify pwm-omap-dmtimer node names
	ARM: dts: Unify pinctrl-single pin group nodes for omap4
	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
	power: supply: ucs1002: fix error code in ucs1002_get_property()
	firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels()
	xtensa: add default definition for XCHAL_HAVE_DIV32
	xtensa: iss/network: make functions static
	xtensa: boot: don't add include-dirs
	xtensa: umulsidi3: fix conditional expression
	xtensa: boot/lib: fix function prototypes
	power: supply: rk817: Fix node refcount leak
	selftests/powerpc: Use CLEAN macro to fix make warning
	selftests/powerpc: Pass make context to children
	selftests/powerpc: Fix emit_tests to work with run_kselftest.sh
	soc: imx8m: Enable OCOTP clock for imx8mm before reading registers
	arm64: dts: imx: Add imx8mm-prt8mm.dtb to build
	firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND
	gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip
	i2c: npcm7xx: Fix callback completion ordering
	x86/reboot: VMCLEAR active VMCSes before emergency reboot
	ceph: drop messages from MDS when unmounting
	dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock
	bpf: Annotate bpf_long_memcpy with data_race
	spi: sun6i: reduce DMA RX transfer width to single byte
	spi: sun6i: fix race between DMA RX transfer completion and RX FIFO drain
	nvme-fc: Prevent null pointer dereference in nvme_fc_io_getuuid()
	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
	scsi: qedf: Add synchronization between I/O completions and abort
	scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock
	scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command
	selftests/ftrace: Correctly enable event in instance-event.tc
	ring-buffer: Avoid softlockup in ring_buffer_resize()
	btrfs: assert delayed node locked when removing delayed item
	selftests: fix dependency checker script
	ring-buffer: Do not attempt to read past "commit"
	net/smc: bugfix for smcr v2 server connect success statistic
	ata: sata_mv: Fix incorrect string length computation in mv_dump_mem()
	platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig
	platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode
	thermal/of: add missing of_node_put()
	drm/amd/display: Don't check registers, if using AUX BL control
	drm/amdgpu/soc21: don't remap HDP registers for SR-IOV
	drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV
	drm/amdgpu: Handle null atom context in VBIOS info ioctl
	riscv: errata: fix T-Head dcache.cva encoding
	scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command
	scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command
	smb3: correct places where ENOTSUPP is used instead of preferred EOPNOTSUPP
	ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
	spi: nxp-fspi: reset the FLSHxCR1 registers
	spi: stm32: add a delay before SPI disable
	ASoC: fsl: imx-pcm-rpmsg: Add SNDRV_PCM_INFO_BATCH flag
	spi: intel-pci: Add support for Granite Rapids SPI serial flash
	bpf: Clarify error expectations from bpf_clone_redirect
	ALSA: hda: intel-sdw-acpi: Use u8 type for link index
	ASoC: cs42l42: Ensure a reset pulse meets minimum pulse width.
	ASoC: cs42l42: Don't rely on GPIOD_OUT_LOW to set RESET initially low
	firmware: cirrus: cs_dsp: Only log list of algorithms in debug build
	memblock tests: fix warning: "__ALIGN_KERNEL" redefined
	memblock tests: fix warning ‘struct seq_file’ declared inside parameter list
	ASoC: imx-rpmsg: Set ignore_pmdown_time for dai_link
	media: vb2: frame_vector.c: replace WARN_ONCE with a comment
	NFSv4.1: fix zero value filehandle in post open getattr
	ASoC: SOF: Intel: MTL: Reduce the DSP init timeout
	powerpc/watchpoints: Disable preemption in thread_change_pc()
	powerpc/watchpoint: Disable pagefaults when getting user instruction
	powerpc/watchpoints: Annotate atomic context in more places
	ncsi: Propagate carrier gain/loss events to the NCSI controller
	net: hsr: Add __packed to struct hsr_sup_tlv.
	tsnep: Fix NAPI scheduling
	tsnep: Fix NAPI polling with budget 0
	LoongArch: Set all reserved memblocks on Node#0 at initialization
	fbdev/sh7760fb: Depend on FB=y
	perf build: Define YYNOMEM as YYNOABORT for bison < 3.81
	nvme-pci: factor the iod mempool creation into a helper
	nvme-pci: factor out a nvme_pci_alloc_dev helper
	nvme-pci: do not set the NUMA node of device if it has none
	wifi: ath11k: Don't drop tx_status when peer cannot be found
	scsi: qla2xxx: Fix NULL pointer dereference in target mode
	nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev
	smack: Record transmuting in smk_transmuted
	smack: Retrieve transmuting information in smack_inode_getsecurity()
	iommu/arm-smmu-v3: Fix soft lockup triggered by arm_smmu_mm_invalidate_range
	x86/sgx: Resolves SECS reclaim vs. page fault for EAUG race
	x86/srso: Add SRSO mitigation for Hygon processors
	KVM: SVM: INTERCEPT_RDTSCP is never intercepted anyway
	KVM: SVM: Fix TSC_AUX virtualization setup
	KVM: x86/mmu: Open code leaf invalidation from mmu_notifier
	KVM: x86/mmu: Do not filter address spaces in for_each_tdp_mmu_root_yield_safe()
	mptcp: fix bogus receive window shrinkage with multiple subflows
	misc: rtsx: Fix some platforms can not boot and move the l1ss judgment to probe
	Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux"
	serial: 8250_port: Check IRQ data before use
	nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
	netfilter: nf_tables: disallow rule removal from chain binding
	ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q
	LoongArch: Define relocation types for ABI v2.10
	LoongArch: numa: Fix high_memory calculation
	ata: libata-scsi: link ata port and scsi device
	ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES
	io_uring/fs: remove sqe->rw_flags checking from LINKAT
	i2c: i801: unregister tco_pdev in i801_probe() error path
	ASoC: amd: yc: Fix non-functional mic on Lenovo 82QF and 82UG
	kernel/sched: Modify initial boot task idle setup
	sched/rt: Fix live lock between select_fallback_rq() and RT push
	netfilter: nf_tables: fix kdoc warnings after gc rework
	Revert "SUNRPC dont update timeout value on connection reset"
	timers: Tag (hr)timer softirq as hotplug safe
	drm/tests: Fix incorrect argument in drm_test_mm_insert_range
	arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y
	mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions()
	mm/slab_common: fix slab_caches list corruption after kmem_cache_destroy()
	mm: memcontrol: fix GFP_NOFS recursion in memory.high enforcement
	ring-buffer: Update "shortest_full" in polling
	btrfs: properly report 0 avail for very full file systems
	media: uvcvideo: Fix OOB read
	bpf: Add override check to kprobe multi link attach
	bpf: Fix BTF_ID symbol generation collision
	bpf: Fix BTF_ID symbol generation collision in tools/
	net: thunderbolt: Fix TCPv6 GSO checksum calculation
	fs/smb/client: Reset password pointer to NULL
	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
	ata: libata-sata: increase PMP SRST timeout to 10s
	drm/i915/gt: Fix reservation address in ggtt_reserve_guc_top
	power: supply: rk817: Add missing module alias
	power: supply: ab8500: Set typing and props
	fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
	drm/amdkfd: Use gpu_offset for user queue's wptr
	drm/meson: fix memory leak on ->hpd_notify callback
	memcg: drop kmem.limit_in_bytes
	mm, memcg: reconsider kmem.limit_in_bytes deprecation
	ASoC: amd: yc: Fix a non-functional mic on Lenovo 82TL
	Linux 6.1.56

Change-Id: Id110614d91d6d60fb6c7622c5af82f219a84a30f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-10-27 09:17:04 +00:00
Greg Kroah-Hartman
320c8b56ff ANDROID: GKI: db845c: add new dma_buf symbols to list
In commit 8332311cd0 ("misc: fastrpc: Fix incorrect DMA mapping unmap
request"), the symbols dma_buf_map_attachment_unlocked and
dma_buf_unmap_attachment_unlocked are now required to be used by the
db845c target, so add them to the symbol list to fix up the build.

2 function symbol(s) added
  'struct sg_table* dma_buf_map_attachment_unlocked(struct dma_buf_attachment*, enum dma_data_direction)'
  'void dma_buf_unmap_attachment_unlocked(struct dma_buf_attachment*, struct sg_table*, enum dma_data_direction)'

Fixes: 8332311cd0 ("misc: fastrpc: Fix incorrect DMA mapping unmap request")
Change-Id: Ib634cfa9a88a6708893a938a7d48d542db5b7b61
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-10-27 09:02:43 +00:00
Jisheng Zhang
37c1a91404 UPSTREAM: serial: 8250_dw: fall back to poll if there's no interrupt
When there's no irq(this can be due to various reasons, for example,
no irq from HW support, or we just want to use poll solution, and so
on), falling back to poll is still better than no support at all.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20230806092056.2467-3-jszhang@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 305779335
Change-Id: I1c9f007883e1c203c1ca63dfe0b4f923c5c56f15
(cherry picked from commit 22130dae05)
Signed-off-by: Jacky Liu <qsliu@google.com>
2023-10-27 15:00:34 +08:00
Treehugger Robot
35361bdac2 Merge "Merge tag 'android14-6.1.43_r00' into android14-6.1" into android14-6.1 2023-10-26 21:35:43 +00:00
Greg Kroah-Hartman
1c5ec1e54d Merge 6.1.55 into android14-6.1-lts
Changes in 6.1.55
	autofs: fix memory leak of waitqueues in autofs_catatonic_mode
	btrfs: output extra debug info if we failed to find an inline backref
	locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock
	ACPICA: Add AML_NO_OPERAND_RESOLVE flag to Timer
	kernel/fork: beware of __put_task_struct() calling context
	rcuscale: Move rcu_scale_writer() schedule_timeout_uninterruptible() to _idle()
	scftorture: Forgive memory-allocation failure if KASAN
	ACPI: video: Add backlight=native DMI quirk for Lenovo Ideapad Z470
	perf/smmuv3: Enable HiSilicon Erratum 162001900 quirk for HIP08/09
	perf/imx_ddr: speed up overflow frequency of cycle
	hw_breakpoint: fix single-stepping when using bpf_overflow_handler
	ACPI: x86: s2idle: Catch multiple ACPI_TYPE_PACKAGE objects
	selftests/nolibc: fix up kernel parameters support
	devlink: remove reload failed checks in params get/set callbacks
	crypto: lrw,xts - Replace strlcpy with strscpy
	ice: Don't tx before switchdev is fully configured
	wifi: ath9k: fix fortify warnings
	wifi: ath9k: fix printk specifier
	wifi: mwifiex: fix fortify warning
	mt76: mt7921: don't assume adequate headroom for SDIO headers
	wifi: wil6210: fix fortify warnings
	can: sun4i_can: Add acceptance register quirk
	can: sun4i_can: Add support for the Allwinner D1
	net: Use sockaddr_storage for getsockopt(SO_PEERNAME).
	net/ipv4: return the real errno instead of -EINVAL
	crypto: lib/mpi - avoid null pointer deref in mpi_cmp_ui()
	Bluetooth: Fix hci_suspend_sync crash
	netlink: convert nlk->flags to atomic flags
	tpm_tis: Resend command to recover from data transfer errors
	mmc: sdhci-esdhc-imx: improve ESDHC_FLAG_ERR010450
	alx: fix OOB-read compiler warning
	wifi: mac80211: check S1G action frame size
	netfilter: ebtables: fix fortify warnings in size_entry_mwt()
	wifi: cfg80211: reject auth/assoc to AP with our address
	wifi: cfg80211: ocb: don't leave if not joined
	wifi: mac80211: check for station first in client probe
	wifi: mac80211_hwsim: drop short frames
	libbpf: Free btf_vmlinux when closing bpf_object
	drm/bridge: tc358762: Instruct DSI host to generate HSE packets
	drm/edid: Add quirk for OSVR HDK 2.0
	arm64: dts: qcom: sm6125-pdx201: correct ramoops pmsg-size
	arm64: dts: qcom: sm6350: correct ramoops pmsg-size
	arm64: dts: qcom: sm8150-kumano: correct ramoops pmsg-size
	arm64: dts: qcom: sm8250-edo: correct ramoops pmsg-size
	samples/hw_breakpoint: Fix kernel BUG 'invalid opcode: 0000'
	drm/amd/display: Fix underflow issue on 175hz timing
	ASoC: SOF: topology: simplify code to prevent static analysis warnings
	ASoC: Intel: sof_sdw: Update BT offload config for soundwire config
	ALSA: hda: intel-dsp-cfg: add LunarLake support
	drm/amd/display: Use DTBCLK as refclk instead of DPREFCLK
	drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN31
	drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN314
	drm/exynos: fix a possible null-pointer dereference due to data race in exynos_drm_crtc_atomic_disable()
	drm/mediatek: dp: Change logging to dev for mtk_dp_aux_transfer()
	bus: ti-sysc: Configure uart quirks for k3 SoC
	md: raid1: fix potential OOB in raid1_remove_disk()
	ext2: fix datatype of block number in ext2_xattr_set2()
	fs/jfs: prevent double-free in dbUnmount() after failed jfs_remount()
	jfs: fix invalid free of JFS_IP(ipimap)->i_imap in diUnmount
	PCI: dwc: Provide deinit callback for i.MX
	ARM: 9317/1: kexec: Make smp stop calls asynchronous
	powerpc/pseries: fix possible memory leak in ibmebus_bus_init()
	PCI: vmd: Disable bridge window for domain reset
	PCI: fu740: Set the number of MSI vectors
	media: mdp3: Fix resource leaks in of_find_device_by_node
	media: dvb-usb-v2: af9035: Fix null-ptr-deref in af9035_i2c_master_xfer
	media: dw2102: Fix null-ptr-deref in dw2102_i2c_transfer()
	media: af9005: Fix null-ptr-deref in af9005_i2c_xfer
	media: anysee: fix null-ptr-deref in anysee_master_xfer
	media: az6007: Fix null-ptr-deref in az6007_i2c_xfer()
	media: dvb-usb-v2: gl861: Fix null-ptr-deref in gl861_i2c_master_xfer
	scsi: lpfc: Abort outstanding ELS cmds when mailbox timeout error is detected
	media: tuners: qt1010: replace BUG_ON with a regular error
	media: pci: cx23885: replace BUG with error return
	usb: cdns3: Put the cdns set active part outside the spin lock
	usb: gadget: fsl_qe_udc: validate endpoint index for ch9 udc
	tools: iio: iio_generic_buffer: Fix some integer type and calculation
	scsi: target: iscsi: Fix buffer overflow in lio_target_nacl_info_show()
	serial: cpm_uart: Avoid suspicious locking
	misc: open-dice: make OPEN_DICE depend on HAS_IOMEM
	usb: ehci: add workaround for chipidea PORTSC.PEC bug
	usb: chipidea: add workaround for chipidea PEC bug
	media: pci: ipu3-cio2: Initialise timing struct to avoid a compiler warning
	kobject: Add sanity check for kset->kobj.ktype in kset_register()
	interconnect: Fix locking for runpm vs reclaim
	printk: Keep non-panic-CPUs out of console lock
	printk: Consolidate console deferred printing
	dma-buf: Add unlocked variant of attachment-mapping functions
	misc: fastrpc: Prepare to dynamic dma-buf locking specification
	misc: fastrpc: Fix incorrect DMA mapping unmap request
	MIPS: Use "grep -E" instead of "egrep"
	btrfs: add a helper to read the superblock metadata_uuid
	btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super
	block: factor out a bvec_set_page helper
	nvmet: use bvec_set_page to initialize bvecs
	nvmet-tcp: pass iov_len instead of sg->length to bvec_set_page()
	drm: gm12u320: Fix the timeout usage for usb_bulk_msg()
	scsi: qla2xxx: Fix NULL vs IS_ERR() bug for debugfs_create_dir()
	selftests: tracing: Fix to unmount tracefs for recovering environment
	x86/ibt: Suppress spurious ENDBR
	riscv: kexec: Align the kexeced kernel entry
	scsi: target: core: Fix target_cmd_counter leak
	scsi: lpfc: Fix the NULL vs IS_ERR() bug for debugfs_create_file()
	panic: Reenable preemption in WARN slowpath
	x86/boot/compressed: Reserve more memory for page tables
	x86/purgatory: Remove LTO flags
	samples/hw_breakpoint: fix building without module unloading
	md/raid1: fix error: ISO C90 forbids mixed declarations
	Revert "SUNRPC: Fail faster on bad verifier"
	attr: block mode changes of symlinks
	ovl: fix failed copyup of fileattr on a symlink
	ovl: fix incorrect fdput() on aio completion
	io_uring/net: fix iter retargeting for selected buf
	nvme: avoid bogus CRTO values
	md: Put the right device in md_seq_next
	Revert "drm/amd: Disable S/G for APUs when 64GB or more host memory"
	dm: don't attempt to queue IO under RCU protection
	btrfs: fix lockdep splat and potential deadlock after failure running delayed items
	btrfs: fix a compilation error if DEBUG is defined in btree_dirty_folio
	btrfs: release path before inode lookup during the ino lookup ioctl
	btrfs: check for BTRFS_FS_ERROR in pending ordered assert
	tracing: Have tracing_max_latency inc the trace array ref count
	tracing: Have event inject files inc the trace array ref count
	tracing: Increase trace array ref count on enable and filter files
	tracing: Have current_trace inc the trace array ref count
	tracing: Have option files inc the trace array ref count
	selinux: fix handling of empty opts in selinux_fs_context_submount()
	nfsd: fix change_info in NFSv4 RENAME replies
	tracefs: Add missing lockdown check to tracefs_create_dir()
	i2c: aspeed: Reset the i2c controller when timeout occurs
	ata: libata: disallow dev-initiated LPM transitions to unsupported states
	ata: libahci: clear pending interrupt status
	scsi: megaraid_sas: Fix deadlock on firmware crashdump
	scsi: pm8001: Setup IRQs on resume
	ext4: fix rec_len verify error
	drm/amd/display: fix the white screen issue when >= 64GB DRAM
	Revert "memcg: drop kmem.limit_in_bytes"
	drm/amdgpu: fix amdgpu_cs_p1_user_fence
	net/sched: Retire rsvp classifier
	interconnect: Teach lockdep about icc_bw_lock order
	Linux 6.1.55

Change-Id: I95193a57879a13b04b5ac8647a24e6d8304fcb0e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2023-10-26 18:58:32 +00:00
Ziyi Cui
034b4b4f1b ANDROID: Update the ABI representation
2 function symbol(s) added
  'int __traceiter_android_vh_early_resume_begin(void *, void *)'
  'int __traceiter_android_vh_resume_end(void *, void *)'

2 variable symbol(s) added
  'struct tracepoint __tracepoint_android_vh_early_resume_begin'
  'struct tracepoint __tracepoint_android_vh_resume_end'

Bug: 232541623
Change-Id: Icf84b6fe59c252eb587726891d4ba5a6307e39ae
Signed-off-by: Ziyi Cui <ziyic@google.com>
2023-10-26 18:10:06 +00:00
Rick Yiu
0947464633 ANDROID: power: Add vendor hook for suspend
The purpose of this vendor hook is to calculating
the total resume latency for device, CPU and
console, etc. Current vendor hook only supports
individual resume latency for device, each individual
CPU, etc, but lacking of the total resume latency tracing.

Bug: 232541623
Change-Id: Idd7c999dcd822cc0f7747baa11ec200eed5f5172
Signed-off-by: Sophia Wang <yodagump@google.com>
Signed-off-by: Rick Yiu <rickyiu@google.com>
2023-10-26 18:10:06 +00:00