mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
Merge tag 'android14-6.1.84_r00' into android14-6.1
This catches the android14-6.1 branch up to the 6.1.84 LTS release. Included in here are the following commits: *1dca1fead9Merge branch 'android14-6.1' into branch 'android14-6.1-lts' *b98ce0fe28ANDROID: GKI: update the abi for tracing changes in 6.1.84 *5f29666f69Revert "timers: Rename del_timer_sync() to timer_delete_sync()" *501c229a8aRevert "media: mc: Add num_links flag to media_pad" *2b84f5eddaRevert "media: mc: Expand MUST_CONNECT flag to always require an enabled link" *2b530e8f5dMerge 6.1.84 into android14-6.1-lts |\ | *347385861cLinux 6.1.84 | *7b970a145ctools/resolve_btfids: fix build with musl libc | *ab062fa3dcUSB: core: Fix deadlock in usb_deauthorize_interface() | *df84d9f779x86/sev: Skip ROM range scans and validation for SEV-SNP guests | *98cfafaf2fscsi: libsas: Fix disk not being scanned in after being removed | *d511040d81scsi: libsas: Add a helper sas_get_sas_addr_and_dev_type() | *8dbc176220scsi: lpfc: Correct size for wqe for memset() | *d8cd93e030scsi: lpfc: Correct size for cmdwqe/rspwqe for memset() | *f2b85a4cc7tls: fix use-after-free on failed backlog decryption | *00f511d716x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled | *f30b3ee9a4scsi: qla2xxx: Delay I/O Abort on PCI error | *65f195232bscsi: qla2xxx: Change debug message during driver unload | *282877633bscsi: qla2xxx: Fix double free of fcport | *09c0ac18cascsi: qla2xxx: Fix command flush on cable pull | *1bcbd100abscsi: qla2xxx: NVME|FCP prefer flag not being honored | *101c1d2d46scsi: qla2xxx: Update manufacturer detail | *14a3ca35c5scsi: qla2xxx: Split FCE|EFT trace control | *3cd58084e4scsi: qla2xxx: Fix N2N stuck connection | *3b9d72442ascsi: qla2xxx: Prevent command send on chip reset | *c223bc352cusb: typec: ucsi: Clear UCSI_CCI_RESET_COMPLETE before reset | *12d0306cecusb: typec: ucsi_acpi: Refactor and fix DELL quirk | *f8704d54c8usb: typec: ucsi: Ack unsupported commands | *959aacfe3ausb: typec: ucsi: Clear EVENT_PENDING under PPM lock | *2d28af770dusb: typec: Return size of buffer if pd_set operation succeeds | *f74c5e0b54usb: udc: remove warning when queue disabled ep | *19ca7ef7d8usb: dwc2: gadget: LPM flow fix | *74cdf12f8dusb: dwc2: gadget: Fix exiting from clock gating | *bc48eb1b53usb: dwc2: host: Fix ISOC flow in DDMA mode | *3294928206usb: dwc2: host: Fix hibernation flow | *4a8a42e16ausb: dwc2: host: Fix remote wakeup from hibernation | *3e284e15b7scsi: sd: Fix TCG OPAL unlock on system resume | *9dac54f081USB: core: Fix deadlock in port "disable" sysfs attribute | *cd20a6e83bUSB: core: Add hub_get() and hub_put() routines | *8416da2df7staging: vc04_services: fix information leak in create_component() | *008bf3d622staging: vc04_services: changen strncpy() to strscpy_pad() | *3678cf67ffscsi: core: Fix unremoved procfs host directory regression | *9d66ae0e7bALSA: sh: aica: reorder cleanup operations to avoid UAF bugs | *6c6a45645ausb: dwc3-am62: fix module unload/reload behavior | *aa1d1ce1adusb: dwc3-am62: Rename private data | *c9006b90baUSB: UAS: return ENODEV when submit urbs fail with device not attached | *916cd2fcbcusb: cdc-wdm: close race between read and workqueue | *181f92abdaRevert "usb: phy: generic: Get the vbus supply" | *fa2b938438Bluetooth: hci_sync: Fix not checking error on hci_cmd_sync_cancel_sync | *7eab7b0218drm/i915/gt: Reset queue_priority_hint on parking | *72e4d3fb72drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode() | *b691954c94drm/amdkfd: fix TLB flush after unmap for GFX9.4.2 | *0161191549drm/vmwgfx: Create debugfs ttm_resource_manager entry only if needed | *46efbdbc95net: ll_temac: platform_get_resource replaced by wrong function | *9acfd8b083nouveau/dmem: handle kcalloc() allocation failure | *6fc218ccd5thermal: devfreq_cooling: Fix perf state when calculate dfc res_util | *244cb8200eblock: Do not force full zone append completion in req_bio_endio() | *ad9cc5e9e5mmc: core: Avoid negative index with array access | *547f4afacemmc: core: Initialize mmc_blk_ioc_data | *a433300285mmc: sdhci-omap: re-tuning is needed after a pm transition to support emmc HS200 mode | *192058bb3ehexagon: vmlinux.lds.S: handle attributes section | *4e79b4a64dexec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack() | *7aa70c4922wifi: iwlwifi: fw: don't always use FW dump trig | *7eeabcea79wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes | *d7387bcb77btrfs: zoned: use zone aware sb location for scrub | *a321a9907cbtrfs: zoned: don't skip block groups with 100% zone unusable | *6b226ae43defi/libstub: Cast away type warning in use of max() | *ca8106fffcx86/efistub: Add missing boot_params for mixed mode compat entry | *bf2ba0b241init: open /initrd.image with O_LARGEFILE | *3372c3ffc3mm/migrate: set swap entry values of THP tail pages properly. | *fe272b6150x86/sev: Fix position dependent variable references in startup code | *77e3de4113x86/Kconfig: Remove CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT | *851ddc3587x86/coco: Get rid of accessor functions | *452a382970x86/coco: Export cc_vendor | *083e750c9fvfio/fsl-mc: Block calling interrupt handler without trigger | *7932db06c8vfio/platform: Create persistent IRQ handlers | *7d29d4c72cvfio/pci: Create persistent INTx handler | *33dc33f560vfio: Introduce interface to flush virqfd inject workqueue | *139dfcc4d7vfio/pci: Disable auto-enable of exclusive INTx IRQ | *6d87a9be22selftests: mptcp: diag: return KSFT_FAIL not test_cnt | *052e4c8987blk-mq: release scheduler resource when request completes | *242006996dblock: Fix page refcounts for unaligned buffers in __bio_release_pages() | *4f2debd9c6tty: serial: imx: Fix broken RS485 | *44b6fb6cdepwm: img: fix pwm clock lookup | *b9d103aca8efi: fix panic in kdump kernel | *21c7c00daex86/fpu: Keep xfd_state in sync with MSR_IA32_XFD | *493ed133b4efi/libstub: fix efi_random_alloc() to allocate memory at alloc_min or higher address | *6417684315kprobes/x86: Use copy_from_kernel_nofault() to read from unsafe address | *dc33e92af3irqchip/renesas-rzg2l: Prevent spurious interrupts when setting trigger type | *573777eb56irqchip/renesas-rzg2l: Rename rzg2l_irq_eoi() | *551ad70e86irqchip/renesas-rzg2l: Rename rzg2l_tint_eoi() | *5dc2cb3eeeirqchip/renesas-rzg2l: Add macro to retrieve TITSR register offset based on register's index | *7775e87f50irqchip/renesas-rzg2l: Flush posted write in irq_eoi() | *0250a68a35irqchip/renesas-rzg2l: Implement restriction when writing ISCR register | *2f67c82ed0printk: Update @console_may_schedule in console_trylock_spinning() | *d7f62fde41iommu/dma: Force swiotlb_max_mapping_size on an untrusted device | *ef80ecc721swiotlb: Fix alignment checks when both allocation and DMA masks are present | *8d8be62a7dminmax: add umin(a, b) and umax(a, b) | *3e5222a179entry: Respect changes to system call number by trace_sys_enter() | *936381380aclocksource/drivers/arm_global_timer: Fix maximum prescaler value | *64c3873cb2iommu: Avoid races around default domain allocations | *6ee02e3559ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2" | *cd1bbca03fnet: tls: handle backlogging of crypto requests | *2149f8a56ex86/efistub: Call mixed mode boot services on the firmware's stack | *7a391de927drm/amd/display: handle range offsets in VRR ranges | *43fe5dc9fai2c: i801: Avoid potential double call to gpiod_remove_lookup_table | *d50fd2f24fiio: accel: adxl367: fix I2C FIFO data register | *5df4c386d3iio: accel: adxl367: fix DEVID read after reset | *155a3d8d8fmm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations | *e5b5948c76tee: optee: Fix kernel panic caused by incorrect error handling | *2cfa00b0e8ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook | *635e23035dALSA: hda/realtek - Add Headset Mic supported Acer NB platform | *18d5fc3c16fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion | *994a1e583cvt: fix unicode buffer corruption when deleting characters | *99cd2d491dmei: me: add arrow lake point H DID | *2d56aca548mei: me: add arrow lake point S DID | *4154e76735misc: lis3lv02d_i2c: Fix regulators getting en-/dis-abled twice on suspend/resume | *d40ab69217tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled | *ccaa4fb8dcusb: port: Don't try to peer unused USB ports based on location | *7664ee8bd8usb: gadget: ncm: Fix handling of zero block length packets | *f42ba91668USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command | *e5b3ad3e8eALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform | *2eadf1adf5drm/i915: Check before removing mm notifier | *7f122486a0drm/amdgpu/pm: Fix the error of pwm1_enable setting | *3a70b1c932tracing: Use .flush() call to wake up readers | *4868c0ecdbKVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region() | *726374dde5KVM: x86: Mark target gfn of emulated atomic instruction as dirty | *d24a79ccdfinit/Kconfig: lower GCC version check for -Warray-bounds | *408837d7efxfrm: Avoid clang fortify warning in copy_to_user_tmpl() | *4f34b79c77Drivers: hv: vmbus: Calculate ring buffer size for more efficient use of memory | *73e4f955b3netfilter: nf_tables: reject constant set with timeout | *72c1efe3f2netfilter: nf_tables: disallow anonymous set with timeout flag | *406b0241d0netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout | *196f198ca6tls: fix race between tx work scheduling and socket close | *36c676e2edplatform/x86: p2sb: On Goldmont only cache P2SB and SPI devfn BAR | *e82dc11315cpufreq: brcmstb-avs-cpufreq: fix up "add check for cpufreq_cpu_get's return value" | *62e06fdd18x86/pm: Work around false positive kmemleak report in msr_build_context() | *3d47eb4057dm snapshot: fix lockup in dm_exception_table_exit | *3070c70a3edrm/amd/display: Fix noise issue on HDMI AV mute | *0581a4dac6drm/amd/display: Return the correct HDCP error code | *589c414138drm/amdgpu: amdgpu_ttm_gart_bind set gtt bound flag | *139845240dahci: asm1064: asm1166: don't limit reported ports | *25bc986570ahci: asm1064: correct count of reported ports | *09c3fa70f6wireguard: netlink: access device through ctx instead of peer | *b7cea3a9afwireguard: netlink: check for dangling peer via is_dead instead of empty list | *97cd43ba82LoongArch: Define the __io_aw() hook as mmiowb() | *77eae2d257LoongArch: Change __my_cpu_offset definition to avoid mis-optimization | *0e21852b88net: hns3: tracing: fix hclgevf trace event strings | *6bcf9d2cadNFSD: Fix nfsd_clid_class use of __string_len() macro | *efd67e570ax86/CPU/AMD: Update the Zenbleed microcode revisions | *9f23176ad7cpufreq: dt: always allocate zeroed cpumask | *bbec4e4d84cifs: open_cached_dir(): add FILE_READ_EA to desired access | *192e9f9078nilfs2: prevent kernel bug at submit_bh_wbc() | *46b832e09dnilfs2: fix failure to detect DAT corruption in btree and direct mappings | *f5bc133ef6f2fs: truncate page cache before clearing flags when aborting atomic write | *1f5124c74af2fs: mark inode dirty for FI_ATOMIC_COMMITTED flag | *af4b1a5aa0Revert "block/mq-deadline: use correct way to throttling write requests" | *50e9f82b1cmemtest: use {READ,WRITE}_ONCE in memory scanning | *fcf7345280drm/vc4: hdmi: do not return negative values from .get_modes() | *ae696b7c00drm/imx/ipuv3: do not return negative values from .get_modes() | *8f914db6fedrm/exynos: do not return negative values from .get_modes() | *191df89d8fdrm/panel: do not return negative error codes from drm_panel_get_modes() | *cb676955d1drm/probe-helper: warn about negative .get_modes() | *b7f6c3630es390/zcrypt: fix reference counting on zcrypt card objects | *d6b5aac451soc: fsl: qbman: Use raw spinlock for cgr_lock | *a621686537soc: fsl: qbman: Always disable interrupts when taking cgr_lock | *b1cf18e5bdring-buffer: Use wait_event_interruptible() in ring_buffer_wait() | *6e0f7e6fb1ring-buffer: Fix full_waiters_pending in poll | *6c2f0e0550ring-buffer: Fix resetting of shortest_full | *1df7dcfb8aring-buffer: Do not set shortest_full when full target is hit | *6615ef6e31ring-buffer: Fix waking up ring buffer readers | *2952d0db18ksmbd: retrieve number of blocks using vfs_getattr in set_file_allocation_info | *4ee09d4099vfio/platform: Disable virqfds on cleanup | *3fe0ac10bdvfio/pci: Lock external INTx masking ops | *f56ba2d484vfio/pci: Remove negative check on unsigned vector | *dcc6b99c61vfio/pci: Consolidate irq cleanup on MSI/MSI-X disable | *0f1e6cd8fbvfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations | *4732ac1c23PCI: hv: Fix ring buffer size calculation | *3d863cf207PCI: dwc: endpoint: Fix advertised resizable BAR size | *04f3652bd0PCI: qcom: Enable BDF to SID translation properly | *a601e7a7fcPCI: qcom: Rename qcom_pcie_config_sid_sm8250() to reflect IP version | *32eaf695d3kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1 | *3abc2d160enfs: fix UAF in direct writes | *f3ed58d7b3sparc32: Fix parport build with sparc32 | *bda2265e6dsparc: Explicitly include correct DT includes | *220778af6cio_uring/net: correctly handle multishot recvmsg retry setup | *3a342fa318PCI/AER: Block runtime suspend when handling errors | *768625f84bspeakup: Fix 8bit characters from direct synth | *bf1eef7fc0usb: gadget: tegra-xudc: Fix USB3 PHY retrieval logic | *9cb3ace502phy: tegra: xusb: Add API to retrieve the port number of phy | *b4139fe933slimbus: core: Remove usage of the deprecated ida_simple_xx() API | *08eceec793nvmem: meson-efuse: fix function pointer type mismatch | *fb1088d51bext4: fix corruption during on-line resize | *b04abf51d7hwmon: (amc6821) add of_match table | *acda20add4landlock: Warn once if a Landlock action is requested while disabled | *03f58a6479drm/etnaviv: Restore some id values | *ad8a4eb663mmc: core: Fix switch on gp3 partition | *1ede7f1d7emm: swap: fix race between free_swap_and_cache() and swapoff() | *509546fc03swap: comments get_swap_device() with usage rule | *dcd51ab42bmac802154: fix llsec key resources release in mac802154_llsec_key_del | *f299404fd8powerpc: xor_vmx: Add '-mhard-float' to CFLAGS | *aab8a0745fdm-raid: fix lockdep waring in "pers->hot_add_disk" | *c9ef367b3ePCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports | *900b81caf0PCI/PM: Drain runtime-idle callbacks before driver removal | *50361c2af7btrfs: fix off-by-one chunk length calculation at contains_pending_extent() | *c13e725657btrfs: qgroup: always free reserved space for extent records | *b8073c069aserial: Lock console when calling into driver before registration | *2496e37adausb: typec: ucsi: Clean up UCSI_CABLE_PROP macros | *371f27c2c8fuse: don't unhash root | *970e8c49f2fuse: fix root lookup with nonzero generation | *bdba49e469mmc: tmio: avoid concurrent runs of mmc_request_done() | *56a2038d00PM: sleep: wakeirq: fix wake irq warning in system suspend | *a43ebdbd39USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M | *ed85c3113aKVM: x86/xen: inject vCPU upcall vector when local APIC is enabled | *8093d6e928USB: serial: option: add MeiG Smart SLM320 product | *d0ab375e73USB: serial: cp210x: add ID for MGP Instruments PDS100 | *b67095647fUSB: serial: add device ID for VeriFone adapter | *a872096454USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB | *33a4aa08d5powerpc/fsl: Fix mfpmr build errors with newer binutils | *b2c898469dusb: xhci: Add error handling in xhci_map_urb_for_dma | *537040c257clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays | *185de0b7cdclk: qcom: mmcc-apq8084: fix terminating of frequency table arrays | *dd92b159c5clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays | *852db52b45clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays | *a7b6523f92PM: suspend: Set mem_sleep_current during kernel command line setup | *56452891e2cpufreq: Limit resolving a frequency to policy min/max | *9477cfeb30md/raid5: fix atomicity violation in raid5_cache_count | *ceffd026f8parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds | *053bb9aab7parisc: Fix csum_ipv6_magic on 64-bit systems | *a5d32783a5parisc: Fix csum_ipv6_magic on 32-bit systems | *3b64d68d90parisc: Fix ip_fast_csum | *6eb684e9c0parisc: Avoid clobbering the C/B bits in the PSW with tophys and tovirt macros | *10857a2412parisc/unaligned: Rewrite 64-bit inline assembly of emulate_ldd() | *ffbfea10d9mtd: rawnand: meson: fix scrambling mode value in command macro | *5d1442eeb9ubi: correct the calculation of fastmap size | *5ecbc7465fubi: Check for too small LEB size in VTBL code | *142d87c958ubifs: Set page uptodate in the correct place | *c8cc05de8efat: fix uninitialized field in nostale filehandles | *428ca0000fbounds: support non-power-of-two CONFIG_NR_CPUS | *03b821647bkasan/test: avoid gcc warning for intentional overflow | *5ea241b193block: Clear zone limits for a non-zoned stacked queue | *719d7f899dext4: correct best extent lstart adjustment logic | *81479bf758selftests/mqueue: Set timeout to 180 seconds | *226fc408c5crypto: qat - resolve race condition during AER recovery | *efffffde33crypto: qat - fix double free during reset | *8557bef80csparc: vDSO: fix return value of __setup handler | *0993f7f85dsparc64: NMI watchdog: fix return value of __setup handler | *605ddb3a6epowerpc/smp: Increase nr_cpu_ids to include the boot CPU | *334fb14389powerpc/smp: Adjust nr_cpu_ids to cover all threads of a core | *14cdbd9440cpufreq: amd-pstate: Fix min_perf assignment in amd_pstate_adjust_perf() | *b54478d203KVM: Always flush async #PF workqueue when vCPU is being destroyed | *e2c545b841media: mc: Expand MUST_CONNECT flag to always require an enabled link | *61656ca92emedia: mc: Rename pad variable to clarify intent | *cff51913c5media: mc: Add num_links flag to media_pad | *f29793c339media: mc: Fix flags handling when creating pad links | *1025ff4e6amedia: mc: Add local pad to pipeline regardless of the link state | *09c1be4d58media: xc4000: Fix atomicity violation in xc4000_get_frequency | *6d21d0356apci_iounmap(): Fix MMIO mapping leak | *12609c76b7serial: max310x: fix NULL pointer dereference in I2C instantiation | *07c3fe923fdrm/vmwgfx: Fix possible null pointer derefence with invalid contexts | *74cd997ba1arm: dts: marvell: Fix maxium->maxim typo in brownstone dts | *dee9c25865smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity() | *d4b1c3b5ecsmack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr() | *a881dd09fdclk: qcom: gcc-sdm845: Add soft dependency on rpmhpd | *9875deeeferemoteproc: virtio: Fix wdg cannot recovery remote processor | *5166fc45d7arm64: dts: qcom: sc7280: Add additional MSI interrupts | *e144e47703media: staging: ipu3-imgu: Set fields before media_entity_pads_init() | *0b812f706fwifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach | *113d5341eetimers: Rename del_timer_sync() to timer_delete_sync() | *2957037c1dtimers: Use del_timer_sync() even on UP | *a50fd98712timers: Update kernel-doc for various functions | *981cf0cab4KVM: x86: Use a switch statement and macros in __feature_translate() | *b6aa21725fKVM: x86: Advertise CPUID.(EAX=7,ECX=2):EDX[5:0] to userspace | *8d70aa0832KVM: x86: Update KVM-only leaf handling to allow for 100% KVM-only leafs | *3769db86adx86/bugs: Use sysfs_emit() | *f1ee75aa66x86/cpu: Support AMD Automatic IBRS * |81cc178d7cRevert "io_uring: drop any code related to SCM_RIGHTS" * |229c1b5f61Revert "Bluetooth: hci_conn: Consolidate code for aborting connections" * |50619421eaRevert "Bluetooth: hci_core: Cancel request on command timeout" * |6147e04a86Revert "Bluetooth: hci_sync: Fix overwriting request callback" * |c0dded0f8bRevert "Bluetooth: fix use-after-free in accessing skb after sending it" * |7386876ffdRevert "Bluetooth: hci_core: Fix missing instances using HCI_MAX_AD_LENGTH" * |0ba60e394bRevert "Bluetooth: Fix eir name length" * |ff903561b7UPSTREAM: tools/resolve_btfids: fix build with musl libc * |0328f7d241Merge 6.1.83 into android14-6.1-lts |\| | *e5cd595e23Linux 6.1.83 | *9b2e8276bfremoteproc: stm32: fix incorrect optional pointers | *4b0c547923x86/efistub: Don't clear BSS twice in mixed mode | *f07ffd18d7x86/efistub: Clear decompressor BSS in native EFI entrypoint | *aa587257e1dm-integrity: align the outgoing bio in integrity_recheck | *92b3c2437ddm io: Support IO priority | *d0980ed818dm: address indent/space issues | *1bf455b2c6selftests: forwarding: Fix ping failure due to short timeout | *766ec94cc5spi: spi-mt65xx: Fix NULL pointer access in interrupt handler | *86c0c154a7net: dsa: mt7530: fix handling of all link-local frames | *f1fa919ea5net: dsa: mt7530: fix link-local frames that ingress vlan filtering ports | *5ff8f56c39bpf: report RCU QS in cpumap kthread | *3890e7008cnet: report RCU QS on threaded NAPI repolling | *f21ddce5b8rcu: add a helper to report consolidated flavor QS | *9683cb6c2cnetfilter: nf_tables: do not compare internal table flags on updates | *5ad233dc73netfilter: nft_set_pipapo: release elements in clone only from destroy path | *29d2550d79octeontx2-af: Use separate handlers for interrupts | *53e6709a2focteontx2-pf: Send UP messages to VF only when VF is up. | *53ae0f3669octeontx2-pf: Use default max_active works instead of one | *e545e4b1c1net: octeontx2: Use alloc_ordered_workqueue() to create ordered workqueues | *a64cc7599eocteontx2: Detect the mbox up or down message via register | *8a231bd4d6octeontx2-af: add mbox to return CPT_AF_FLT_INT info | *8b1140c580octeontx2-af: optimize cpt pf identification | *35d8af38f1octeontx2-af: add mbox for CPT LF reset | *ac3f337f0aocteontx2-af: recover CPT engine when it gets fault | *cf7d8cba63net/bnx2x: Prevent access to a freed page in page_pool | *20e21c3c01dm-integrity: fix a memory leak when rechecking the data | *b29a5055eenet: phy: fix phy_read_poll_timeout argument type in genphy_loopback | *6af7c8a298ipv4: raw: Fix sending packets from raw sockets via IPsec tunnels | *87ca3d940fhsr: Handle failures in module init | *52287ed416rds: introduce acquire/release ordering in acquire/release_in_xmit() | *45a83b220cwireguard: receive: annotate data-race around receiving_counter.counter | *07b6891ca6vdpa/mlx5: Allow CVQ size changes | *80fc9b9c62vdpa_sim: reset must not run | *1d830032bcdrm: Fix drm_fixp2int_round() making it add 0.5 | *be4512b9acnet: dsa: mt7530: prevent possible incorrect XTAL frequency selection | *d343a618bcnet: veth: do not manipulate GRO when using XDP | *ef7eed7e11packet: annotate data-races around ignore_outgoing | *f788073628net: ethernet: mtk_eth_soc: fix PPE hanging issue | *6b62bad2danet: mediatek: mtk_eth_soc: clear MAC_MCR_FORCE_LINK only when MAC is up | *149afee5c7nvme: fix reconnection fail due to reserved tag allocation | *1883ed12d7nvme: add the Apple shared tag workaround to nvme_alloc_io_tag_set | *cb8ae8e5ecnvme: only set reserved_tags in nvme_alloc_io_tag_set for fabrics controllers | *1ed222ca73hsr: Fix uninit-value access in hsr_get_node() | *86d9b04042tcp: Fix refcnt handling in __inet_hash_connect(). | *1ff7ffcac1soc: fsl: dpio: fix kcalloc() argument order | *bd2474a45dnet/sched: taprio: proper TCA_TAPRIO_TC_ENTRY_INDEX check | *abc9b13fd9s390/vtime: fix average steal time calculation | *ec0e06c797octeontx2-af: Use matching wake_up API variant in CGX command interface | *9905a15704rds: tcp: Fix use-after-free of net in reqsk_timer_handler(). | *6df9cf77e0tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge() | *d2034a6b92nouveau: reset the bo resource bus info after an eviction | *d23e49f4e4ASoC: rockchip: i2s-tdm: Fix inaccurate sampling rates | *2ca629b90dusb: gadget: net2272: Use irqflags in the call to net2272_probe_fin | *1d4ff6a8f8staging: greybus: fix get_channel_from_mode() failure path | *d2b48ecc76serial: 8250_exar: Don't remove GPIO device on suspend | *bea2dfd5fartc: mt6397: select IRQ_DOMAIN instead of depending on it | *bc493a56abhwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init() | *c609ce8b3ckconfig: fix infinite loop when expanding a macro at the end of file | *8aa68d9fc2arm64: dts: broadcom: bcmbca: bcm4908: drop invalid switch cells | *ad7362db2ftty: serial: samsung: fix tx_empty() to return TIOCSER_TEMT | *e955764b41serial: max310x: fix syntax error in IRQ error message | *52af9897e7tty: vt: fix 20 vs 0x20 typo in EScsiignore | *22ae3d1063usb: phy: generic: Get the vbus supply | *e660319fc6remoteproc: stm32: Fix incorrect type assignment returned by stm32_rproc_get_loaded_rsc_tablef | *b4f4259563remoteproc: stm32: Fix incorrect type in assignment for va | *0e3aa17499remoteproc: stm32: use correct format strings on 64-bit | *5c594bdbd5comedi: comedi_test: Prevent timers rescheduling during deletion | *b5a579ddf0io_uring/net: correct the type of variable | *31db25e314nfs: fix panic when nfs4_ff_layout_prepare_ds() fails | *76426abf9bafs: Revert "afs: Hide silly-rename files from userspace" | *4fd4a210deperf/x86/amd/core: Avoid register reset when CPU is dead | *889846dfc8f2fs: compress: fix reserve_cblocks counting error when out of space | *a4e063d67ef2fs: compress: relocate some judgments in f2fs_reserve_compress_blocks | *02b6619566f2fs: convert to use sbi directly | *4d5e5a044bNFS: Fix an off by one in root_nfs_cat() | *449684e376f2fs: ro: compress: fix to avoid caching unaligned extent | *aa25e54f44watchdog: stm32_iwdg: initialize default timeout | *b91d54a2c4f2fs: check number of blocks in a current section | *7486973accf2fs: compress: fix to check compress flag w/ .i_sem lock | *18631d43d4NFSv4.2: fix listxattr maximum XDR buffer size | *06e828b3f1NFSv4.2: fix nfs4_listxattr kernel BUG at mm/usercopy.c:102 | *8c0fe010cbnet: sunrpc: Fix an off by one in rpc_sockaddr2uaddr() | *8ede73123cf2fs: compress: fix to check zstd compress level correctly in mount option | *322eb43c0escsi: bfa: Fix function pointer type mismatch for hcb_qe->cbfn | *b0455371ccRDMA/rtrs-clt: Check strnlen return len in sysfs mpath_policy_store() | *aaa8e143bfRDMA/device: Fix a race between mad_client and cm_client init | *987bc93ecdRDMA/hns: Fix mis-modifying default congestion control algorithm | *e85d53ebaescsi: csiostor: Avoid function pointer casts | *fe4de49357f2fs: fix to avoid potential panic during recovery | *98df108a9af2fs: compress: fix to cover f2fs_disable_compressed_file() w/ i_sem | *67eba3e674f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode | *bba2a0ba00f2fs: update blkaddr in __set_data_blkaddr() for cleanup | *ebe3a9f3c2f2fs: introduce get_dnode_addr() to clean up codes | *3c2e2c8059f2fs: delete obsolete FI_DROP_CACHE | *17bfaa58dbf2fs: delete obsolete FI_FIRST_BLOCK_WRITTEN | *621da84f10f2fs: simplify __allocate_data_block | *b5ecf59fbaf2fs: compress: fix to check unreleased compressed cluster | *542c8b3c77f2fs: compress: fix to cover normal cluster write with cp_rwsem | *e54cce8137f2fs: compress: fix to guarantee persisting compressed blocks by CP | *492acea36bf2fs: reduce stack memory cost by using bitfield in struct f2fs_io_info | *e362d00729RDMA/srpt: Do not register event handler until srpt device is fully setup | *ae771b805dRDMA/irdma: Remove duplicate assignment | *0606bedcc3RDMA/irdma: Allow accurate reporting on QP max send/recv WR | *629af0d5feALSA: usb-audio: Stop parsing channels bits when all channels are found. | *fd58b4e3c0ALSA: hda/realtek: fix ALC285 issues on HP Envy x360 laptops | *8c4889a9eaclk: zynq: Prevent null pointer dereference caused by kmalloc failure | *a8b2b26fddclk: Fix clk_core_get NULL dereference | *faa2ba4cebsparc32: Fix section mismatch in leon_pci_grpci | *765f673c0ebacklight: lp8788: Fully initialize backlight_properties during probe | *693c1edfcfbacklight: lm3639: Fully initialize backlight_properties during probe | *6d7e897358backlight: da9052: Fully initialize backlight_properties during probe | *d6e321dcd7backlight: lm3630a: Don't set bl->props.brightness in get_brightness | *491ec4f454backlight: lm3630a: Initialize backlight_properties on init | *dd7f2d0f61leds: sgm3140: Add missing timer cleanup and flash gpio control | *d1f384e4c2leds: aw2013: Unlock mutex before destroying it | *c2c32faae8powerpc/embedded6xx: Fix no previous prototype for avr_uart_send() etc. | *c550f0055cmodules: wait do_free_init correctly | *0189516bb5drm/msm/dpu: add division of drm_display_mode's hskew parameter | *48feaf23f3powerpc/hv-gpci: Fix the H_GET_PERF_COUNTER_INFO hcall return value checks | *a3f22feb22powerpc/pseries: Fix potential memleak in papr_get_attr() | *d2bd30c710drm/mediatek: Fix a null pointer crash in mtk_drm_crtc_finish_page_flip | *e9eee1ce1bgpio: nomadik: fix offset bug in nmk_pmx_set() | *32bfbab72amedia: mediatek: vcodec: avoid -Wcast-function-type-strict warning | *55ca0c7eaemedia: ttpci: fix two memleaks in budget_av_attach | *e04d15c8bbmedia: go7007: fix a memleak in go7007_load_encoder | *107052a8cfmedia: dvb-frontends: avoid stack overflow warnings with clang | *3a1ec89708media: pvrusb2: fix uaf in pvr2_context_set_notify | *0a70199742drm/amdgpu: Fix missing break in ATOM_ARG_IMM Case of atom_get_src_int() | *fcb7e70482HID: amd_sfh: Avoid disabling the interrupt | *c6a05e45deHID: amd_sfh: Update HPD sensor structure elements | *ff4dd05a94ASoC: meson: axg-tdm-interface: add frame rate constraint | *83ee64af9bASoC: meson: axg-tdm-interface: fix mclk setup without mclk-fs | *5ac2ca7a50mtd: rawnand: lpc32xx_mlc: fix irq handler prototype | *438adcd017mtd: maps: physmap-core: fix flash size larger than 32-bit | *82120c9ab4drm/tidss: Fix sync-lost issue with two displays | *c82d434069drm/tidss: Fix initial plane zpos values | *67355a760bcrypto: jitter - fix CRYPTO_JITTERENTROPY help text | *6a2ef97250crypto: arm/sha - fix function cast warnings | *6be122c8d2mfd: altera-sysmgr: Call of_node_put() only when of_parse_phandle() takes a ref | *3eb47e41c2mfd: syscon: Call of_node_put() only when of_parse_phandle() takes a ref | *527480cab5drm/tegra: put drm_gem_object ref on error in tegra_fb_create | *e0b0d1c46aclk: hisilicon: hi3559a: Fix an erroneous devm_kfree() | *d183ee7136clk: hisilicon: hi3519: Release the correct number of gates in hi3519_clk_unregister() | *ce106d8ef0PCI: Mark 3ware-9650SE Root Port Extended Tags as broken | *7a08ebcfd7drm/mediatek: dsi: Fix DSI RGB666 formats and definitions | *2101966b77clk: qcom: dispcc-sdm845: Adjust internal GDSC wait times | *6e93e0f883media: pvrusb2: fix pvr2_stream_callback casts | *7dee677d17media: pvrusb2: remove redundant NULL check | *8e6e28e650media: go7007: add check of return value of go7007_read_addr() | *8df9a3c704media: imx: csc/scaler: fix v4l2_ctrl_handler memory leak | *77301ad7bemedia: sun8i-di: Fix chroma difference threshold | *f4258e5882media: sun8i-di: Fix power on/off sequences | *0dfdf4c1acmedia: sun8i-di: Fix coefficient writes | *acdf24f3d5media: cedrus: h265: Fix configuring bitstream size | *8006813ebdmedia: cedrus: h265: Associate mv col buffers with buffer | *6632a54ac8NTB: fix possible name leak in ntb_register_device() | *298f7f1370NTB: EPF: fix possible memory leak in pci_vntb_probe() | *d133d67e7eASoC: SOF: Add some bounds checking to firmware data | *9a81950417ASoC: SOF: Introduce container struct for SOF firmware | *b494caad9cpowerpc: Force inlining of arch_vmap_p{u/m}d_supported() | *4a00001d22ASoC: meson: t9015: fix function pointer type mismatch | *fe636b9a6eASoC: meson: aiu: fix function pointer type mismatch | *511a6a88b2perf stat: Avoid metric-only segv | *b14524556fALSA: seq: fix function cast warnings | *5342ad8db5clk: renesas: r8a779f0: Correct PFC/GPIO parent clock | *128c04cc04clk: renesas: r8a779g0: Correct PFC/GPIO parent clocks | *4f6274bafdclk: renesas: r8a779g0: Add thermal clock | *bf10ef659bclk: renesas: r8a779g0: Add Audio clocks | *ca9b82755aclk: renesas: r8a779g0: Add CMT clocks | *7d82efd8d3drm/radeon/ni: Fix wrong firmware size logging in ni_init_microcode() | *c264af81addrm/msm/dpu: Only enable DSC_MODE_MULTIPLEX if dsc_merge is enabled | *e4892870a5drm/msm/dpu: fix the programming of INTF_CFG2_DATA_HCTL_EN | *dc84f8c1a3perf thread_map: Free strlist on normal path in thread_map__new_by_tid_str() | *a71f66bd5fcrypto: xilinx - call finalize with bh disabled | *4421c74602PCI: switchtec: Fix an error handling path in switchtec_pci_probe() | *c12efda47dquota: Fix rcu annotations of inode dquot pointers | *7f9e833fc0quota: Fix potential NULL pointer dereference | *fd14781b30quota: simplify drop_dquot_ref() | *6814dc592dclk: qcom: reset: Ensure write completion on reset de/assertion | *1f3e991042clk: qcom: reset: Commonize the de/assert functions | *99cd54167dpinctrl: mediatek: Drop bogus slew rate register range for MT8192 | *f69b926799pinctrl: mediatek: Drop bogus slew rate register range for MT8186 | *437a111f79media: edia: dvbdev: fix a use-after-free | *0c9550b032media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity | *6bf5c2fademedia: v4l2-tpg: fix some memleaks in tpg_alloc | *3828fc3ab8media: em28xx: annotate unchecked call to media_device_register() | *7ae1b0dc12clk: meson: Add missing clocks to axg_clk_regmaps | *83fe9c3f44perf evsel: Fix duplicate initialization of data->id in evsel__parse_sample() | *9310d3de98clk: samsung: exynos850: Propagate SPI IPCLK rate change | *29eaa9246bpinctrl: renesas: r8a779g0: Add missing SCIF_CLK2 pin group/function | *a19403d20epinctrl: renesas: r8a779g0: Add Audio SSI pins, groups, and functions | *29fde8895bdrm/amd/display: Fix potential NULL pointer dereferences in 'dcn10_set_output_transfer_func()' | *d346b3e5b2drm/amd/display: Fix a potential buffer overflow in 'dp_dsc_clock_en_read()' | *fa8810aa5aHID: lenovo: Add middleclick_workaround sysfs knob for cptkbd | *845a478304perf record: Fix possible incorrect free in record__switch_output() | *43f4364c8fPCI/DPC: Print all TLP Prefixes, not just the first | *8ba8db9786media: tc358743: register v4l2 async device only after successful setup | *b17195f1e0dmaengine: tegra210-adma: Update dependency to ARCH_TEGRA | *1eb749a9c3ASoC: amd: acp: Add missing error handling in sof-mach | *f6d51a91b4drm/lima: fix a memleak in lima_heap_alloc | *680c94312edrm/panel-edp: use put_sync in unprepare | *06e3827715drm/rockchip: lvds: do not print scary message when probing defer | *fe790f340edrm/rockchip: lvds: do not overwrite error code | *40624af667drm/vmwgfx: fix a memleak in vmw_gmrid_man_get_node | *758629d348drm: Don't treat 0 as -1 in drm_fixp2int_ceil | *e6ed73bb8edrm/rockchip: inno_hdmi: Fix video timing | *c994fed05cdrm/tegra: output: Fix missing i2c_put_adapter() in the error handling paths of tegra_output_probe() | *f3f407ccbedrm/tegra: rgb: Fix missing clk_put() in the error handling paths of tegra_dc_rgb_probe() | *29f922ae4adrm/tegra: rgb: Fix some error handling paths in tegra_dc_rgb_probe() | *bb459d437ddrm/tegra: hdmi: Fix some error handling paths in tegra_hdmi_probe() | *8bc95d3440drm/tegra: hdmi: Convert to devm_platform_ioremap_resource() | *806dc32deadrm/tegra: dsi: Fix missing pm_runtime_disable() in the error handling path of tegra_dsi_probe() | *a57bbd606adrm/tegra: dsi: Fix some error handling paths in tegra_dsi_probe() | *d3e8c2409adrm/tegra: dsi: Make use of the helper function dev_err_probe() | *f4a1a30f18drm/tegra: dpaux: Fix PM disable depth imbalance in tegra_dpaux_probe | *50c0ad785adrm/tegra: dsi: Add missing check for of_find_device_by_node | *ad10289f68dm: call the resume method on internal suspend | *2b50b4f0d4dm raid: fix false positive for requeue needed during reshape | *b605c3831fbpf: hardcode BPF_PROG_PACK_SIZE to 2MB * num_possible_nodes() | *c9b4e220ddnfp: flower: handle acti_netdevs allocation failure | *b7c2b7eae2net/x25: fix incorrect parameter validation in the x25_getsockopt() function | *440e278cb5net: kcm: fix incorrect parameter validation in the kcm_getsockopt) function | *6bb3c04738udp: fix incorrect parameter validation in the udp_lib_getsockopt() function | *cfea1c9ad4l2tp: fix incorrect parameter validation in the pppol2tp_getsockopt() function | *6ccbd0227fipmr: fix incorrect parameter validation in the ip_mroute_getsockopt() function | *dcdcf9a717tcp: fix incorrect parameter validation in the do_tcp_getsockopt() function | *20fd74fa88OPP: debugfs: Fix warning around icc_get_name() | *877cce250anet: phy: dp83822: Fix RGMII TX delay configuration | *262a77d85eBluetooth: Fix eir name length | *99f30e12e5Bluetooth: hci_core: Fix missing instances using HCI_MAX_AD_LENGTH | *f30e6322bcBluetooth: MGMT: Fix always using HCI_MAX_AD_LENGTH | *8ec278830cnet: hns3: fix port duplex configure error in IMP reset | *b3cf70472anet: hns3: fix kernel crash when 1588 is received on HIP08 devices | *19af2ce84cnet: hns3: fix wrong judgment condition issue | *2a2ff70951net: phy: fix phy_get_internal_delay accessing an empty array | *60044ab848net: ip_tunnel: make sure to pull inner header in ip_tunnel_rcv() | *66e74f2f74ipv6: fib6_rules: flush route cache when rule is changed | *8c91a4bfc7iommu: Fix compilation without CONFIG_IOMMU_INTEL | *586e19c88aiommu/vt-d: Retrieve IOMMU perfmon capability information | *f06899582cbpf: Fix stackmap overflow check on 32-bit arches | *a83fdaeaeabpf: Fix hashtab overflow check on 32-bit arches | *edf7990baabpf: Fix DEVMAP_HASH overflow check on 32-bit arches | *98a2feb8ecs390/cache: prevent rebuild of shared_cpu_list | *9c40281962sr9800: Add check for usbnet_get_endpoints | *715264ad09Bluetooth: fix use-after-free in accessing skb after sending it | *cb8adca52fBluetooth: af_bluetooth: Fix deadlock | *68644bf5ecBluetooth: hci_core: Fix possible buffer overflow | *da77c1d39bBluetooth: hci_sync: Fix overwriting request callback | *1b6cfa4c76Bluetooth: hci_core: Cancel request on command timeout | *6083089ab0Bluetooth: hci_conn: Consolidate code for aborting connections | *ac7a47aaa7Bluetooth: hci_sync: Only allow hci_cmd_sync_queue if running | *1023de27cdBluetooth: Cancel sync command before suspend and power off | *a96738eb21Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional() | *653a17a99dBluetooth: Remove superfluous call to hci_conn_check_pending() | *8beed376c9Bluetooth: mgmt: Remove leftover queuing of power_off work | *e5f04ec442Bluetooth: Remove HCI_POWER_OFF_TIMEOUT | *8499af0616igb: Fix missing time sync events | *34a7b30f56iommu/vt-d: Don't issue ATS Invalidation request when device is disconnected | *48fba9d7f5PCI: Make pci_dev_is_disconnected() helper public for other drivers | *eeaa98f34dwifi: rtw88: 8821c: Fix false alarm count | *2c727f83ebwifi: rtw88: 8821c: Fix beacon loss and disconnect | *33fb18efaeACPI: CPPC: enable AMD CPPC V2 support for family 17h processors | *216712c698mmc: wmt-sdmmc: remove an incorrect release_mem_region() call in the .remove function | *934212a623SUNRPC: fix some memleaks in gssx_dec_option_array | *47635b112ax86, relocs: Ignore relocations in .notes section | *9e8486e46farm64: dts: rockchip: add missing interrupt-names for rk356x vdpu | *5bd963ff48ACPI: scan: Fix device check notification handling | *ed86e1fa7bACPI: resource: Add MAIBENBEN X577 to irq1_edge_low_force_override | *c259c196ebACPI: resource: Do IRQ override on Lunnen Ground laptops | *804db3c1adACPI: resource: Add Infinity laptops to irq1_edge_low_force_override | *24cc77b670arm64: dts: marvell: reorder crypto interrupts on Armada SoCs | *681ba22555ARM: dts: imx6dl-yapp4: Move the internal switch PHYs under the switch node | *28b43ec7e4ARM: dts: imx6dl-yapp4: Fix typo in the QCA switch register address | *23bb0006c9ARM: dts: imx6dl-yapp4: Move phy reset into switch node | *4478f7e5bearm64: dts: allwinner: h6: Add RX DMA channel for SPDIF | *db6e5e16f1pstore: inode: Only d_invalidate() is needed | *be52ee92cepstore: inode: Convert mutex usage to guard(mutex) | *e16c33dd99net: mctp: copy skb ext data when fragmenting | *0820c84be6arm64: dts: renesas: r8a779g0: Correct avb[01] reg sizes | *bea023d846arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes | *efab55e16carm64: dts: renesas: r8a779a0: Update to R-Car Gen4 compatible values | *76cfe86f2darm64: dts: renesas: rzg2l: Add missing interrupts to IRQC nodes | *7f1d9f8bdearm64: dts: renesas: r9a07g043u: Add IRQC node | *96132cc2e1arm64: dts: renesas: r9a07g043: Split out RZ/G2UL SoC specific parts | *5425ac2428ARM: dts: arm: realview: Fix development chip ROM compatible value | *3936e0f81awifi: wilc1000: revert reset line logic flip | *0d276d9f33firmware: arm_scmi: Fix double free in SMC transport cleanup path | *c20211d3dfarm64: dts: mt8195-cherry-tomato: change watchdog reset boot flow | *4c51575705net: ena: Remove ena_select_queue | *2b718bb18fpowercap: dtpm_cpu: Fix error check against freq_qos_add_request() | *88611c1fdcarm64: dts: qcom: sm8150: correct PCIe wake-gpios | *9c23056893arm64: dts: qcom: sm8150: use 'gpios' suffix for PCI GPIOs | *f95febbffearm64: dts: qcom: sdm845-db845c: correct PCIe wake-gpios | *093cec79f0wifi: brcmsmac: avoid function pointer casts | *386c248775iommu/amd: Mark interrupt as managed | *031d2acc42bus: tegra-aconnect: Update dependency to ARCH_TEGRA | *fad9bcd4d7ACPI: processor_idle: Fix memory leak in acpi_processor_power_exit() | *a9545af2a5wifi: wilc1000: prevent use-after-free on vif when cleaning up all interfaces | *e2fed151d5ARM: dts: qcom: msm8974: correct qfprom node size | *8bfc6b840abpf: Mark bpf_spin_{lock,unlock}() helpers with notrace correctly | *1e33bdd023arm64: dts: mediatek: mt7622: add missing "device_type" to memory nodes | *4bc2befb93arm64: dts: mediatek: mt8192: fix vencoder clock name | *fedd55b8a5arm64: dts: mediatek: mt8192-asurada: Remove CrosEC base detection node | *5c77447aa4arm64: dts: mediatek: mt7986: add "#reset-cells" to infracfg | *6606534538arm64: dts: mt8183: Move CrosEC base detection node to kukui-based DTs | *ef71a93eecarm64: dts: mt8183: kukui: Split out keyboard node and describe detachables | *a03ede2282ipv6: mcast: remove one synchronize_net() barrier in ipv6_mc_down() | *21af11fcb0selftests: forwarding: Add missing multicast routing config entries | *4e58093897selftests: forwarding: Add missing config entries | *9b2ca91f6es390/vdso: drop '-fPIC' from LDFLAGS | *8a2f812b4bs390/pai: fix attr_event_free upper limit for pai device drivers | *437af288ecwifi: iwlwifi: mvm: don't set replay counters to 0xff | *b4907fb68dtools/resolve_btfids: Fix cross-compilation to non-host endianness | *0697d4862dtools/resolve_btfids: Refactor set sorting with types from btf_ids.h | *23f96f86depwm: sti: Fix capture for st,pwm-num-chan < st,capture-num-chan | *d73b916bccprintk: Disable passing console lock owner completely during panic() | *a1f57a0127wifi: wfx: fix memory leak when starting AP | *4d99d267dawifi: libertas: fix some memleaks in lbs_allocate_cmd_buffer() | *71cdbd1fcbwifi: ath11k: initialize rx_mcs_80 and rx_mcs_160 before use | *b4bb2291d6net: blackhole_dev: fix build warning for ethh set but not used | *ecab386a8epwm: atmel-hlcdc: Fix clock imbalance related to suspend support | *78b8952e1dpwm: atmel-hlcdc: Use consistent variable naming | *992cbc89b0pwm: atmel-hlcdc: Convert to platform remove callback returning void | *a5fd802a1farm64: dts: imx8mm-venice-gw71xx: fix USB OTG VBUS | *d80bac49aegpio: vf610: allow disabling the vf610 driver | *5666fe7b85wifi: iwlwifi: fix EWRD table validity check | *c855a1a5b7wifi: iwlwifi: dbg-tlv: ensure NUL termination | *9cd961d993wifi: iwlwifi: mvm: report beacon protection failures | *74d0639261wifi: ath9k: delay all of ath9k_wmi_event_tasklet() until init is complete | *fed6a1df67libbpf: Add missing LIBBPF_API annotation to libbpf_set_memlock_rlim API | *4f4f1e2deearm64: dts: imx8mm-kontron: Fix interrupt for RTC on OSM-S i.MX8MM module | *795fb93bdearm64: dts: imx8mm-kontron: Disable pull resistors for SD card signals on BL board | *a4116bd6eearm64: dts: imx8mm-kontron: Disable pull resistors for SD card signals on BL OSM-S board | *ed2186ea40arm64: dts: imx8mm-kontron: Disable pullups for onboard UART signals on BL board | *dde02bf5fcarm64: dts: imx8mm-kontron: Disable pullups for onboard UART signals on BL OSM-S board | *333a02b3bearm64: dts: imx8mm-kontron: Disable pullups for I2C signals on SL/BL i.MX8MM | *8f38b401b4arm64: dts: imx8mm-kontron: Disable pullups for I2C signals on OSM-S i.MX8MM | *4c820998a5pmdomain: qcom: rpmhpd: Drop SA8540P gfx.lvl | *3248f4ae05libbpf: Fix faccessat() usage on Android | *1b3bae282acpufreq: mediatek-hw: Don't error out if supply is not found | *7ab56f24bfaf_unix: Annotate data-race of gc_in_progress in wait_for_unix_gc(). | *6ae1ec0043selftest/bpf: Add map_in_maps with BPF_MAP_TYPE_PERF_EVENT_ARRAY values | *bb21851465libbpf: Apply map_set_def_max_entries() for inner_maps on creation | *c1760abb10bpftool: Silence build warning about calloc() | *d10dbf722dinet_diag: annotate data-races around inet_diag_table[] | *f7dbf2c167sock_diag: annotate data-races around sock_diag_handlers[family] | *60b5b89e41cpufreq: mediatek-hw: Wait for CPU supplies before probing | *b98ed6417ecpufreq: Explicitly include correct DT includes | *e72160cb6ecpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return value | *a81edfc5ecARM: dts: renesas: r8a73a4: Fix external clocks and clock rate | *6798cf0aaawifi: mwifiex: debugfs: Drop unnecessary error check for debugfs_create_dir() | *5a26e6d2a7wifi: wilc1000: fix multi-vif management when deleting a vif | *515cc676dfwifi: wilc1000: do not realloc workqueue everytime an interface is added | *3518cea837wifi: rtl8xxxu: add cancel_work_sync() for c2hcmd_work | *745003b591wifi: wilc1000: fix RCU usage in connect path | *d8766257c2wifi: wilc1000: fix declarations ordering | *b8dd353a1awifi: b43: Disable QoS for bcm4331 | *3033583a78wifi: b43: Stop correct queue in DMA worker when QoS is disabled | *b6b6bdfca8wifi: b43: Stop/wake correct queue in PIO Tx path when QoS is disabled | *c67698325cwifi: b43: Stop/wake correct queue in DMA Tx path when QoS is disabled | *90f089d77ewifi: ath10k: fix NULL pointer dereference in ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev() | *13fa3326efsched/fair: Take the scheduling domain into account in select_idle_core() | *790ae577efsched/fair: Take the scheduling domain into account in select_idle_smt() | *9388721260timekeeping: Fix cross-timestamp interpolation for non-x86 | *8a1d2ecd9btimekeeping: Fix cross-timestamp interpolation corner case decision | *081bf64a7etimekeeping: Fix cross-timestamp interpolation on counter wrap | *3e5e8248c0x86/sme: Fix memory encryption setting if enabled by default and not overridden | *f0439b7d67x86/resctrl: Implement new mba_MBps throttling heuristic | *74ca3ef68daoe: fix the potential use-after-free problem in aoecmd_cfg_pkts | *868ec86861io_uring/net: fix overflow check in io_recvmsg_mshot_prep() | *aba7b2140eio_uring/net: move receive multishot out of the generic msghdr path | *a34fba8c44io_uring/net: unify how recvmsg and sendmsg copy in the msghdr | *28e7fd1c70rtc: test: Fix invalid format specifier. | *d12ffa0308time: test: Fix incorrect format specifier | *188e9aff68lib: memcpy_kunit: Fix an invalid format specifier in an assertion msg | *eaf5eaa406lib/cmdline: Fix an invalid format specifier in an assertion msg | *d6c28aefe9md: Don't clear MD_CLOSING when the raid is about to stop | *283e38fc7dfs/select: rework stack allocation hack for clang | *96436365e5nbd: null check for nla_nest_start | *267a6af608rcu/exp: Handle RCU expedited grace period kworker allocation failure | *f8b89a3672rcu/exp: Fix RCU expedited parallel grace period kworker allocation failure recovery | *ad999aa181s390/dasd: fix double module refcount decrement | *977bb962a1s390/dasd: Use dev_*() for device log messages | *ba0e1cc43es390/dasd: add autoquiesce feature | *7533ed7668fs: Fix rw_hint validation | *e6450d5e46do_sys_name_to_handle(): use kzalloc() to fix kernel-infoleak | *807f991396ASoC: wm8962: Fix up incorrect error message in wm8962_set_fll | *0a5d59ed95ASoC: wm8962: Enable both SPKOUTR_ENA and SPKOUTL_ENA in mono mode | *f11b50b8baASoC: wm8962: Enable oscillator if selecting WM8962_FLL_OSC | *d575eb8747Input: gpio_keys_polled - suppress deferred probe error for gpio | *374709a7e5ASoC: Intel: bytcr_rt5640: Add an extra entry for the Chuwi Vi8 tablet | *9a4fb2bdeearm64: tegra: Set the correct PHY mode for MGBE | *72dbf660e0firewire: core: use long bus reset on gap count error | *2f3ce8fcbfBluetooth: mgmt: Fix limited discoverable off timeout | *567c0411dcBluetooth: rfcomm: Fix null-ptr-deref in rfcomm_check_security | *0e3732d1dfASoC: amd: yc: Fix non-functional mic on Lenovo 21J2 | *05c7c2d198drm/amdgpu: Enable gpu reset for S3 abort cases on Raven series | *5e61a994b2ALSA: hda/realtek - ALC285 reduce pop noise from Headphone port | *b0e50fa810scsi: mpt3sas: Prevent sending diag_reset when the controller is ready | *008985fd35ASoC: amd: yc: Add Lenovo ThinkBook 21J0 into DMI quirk table | *50fbd3a721wifi: mac80211: only call drv_sta_rc_update for uploaded stations | *80656ee2banet: smsc95xx: add support for SYS TEC USB-SPEmodule1 | *ab1be3f1aabtrfs: fix data race at btrfs_use_block_rsv() when accessing block reserve | *995e91c955btrfs: fix data races when accessing the reserved amount of block reserves | *53983d354barm64: dts: Fix dtc interrupt_provider warnings | *b22b54f247dm-verity, dm-crypt: align "struct bvec_iter" correctly | *6fb80b3e75block: sed-opal: handle empty atoms when parsing response | *4492f21263parisc/ftrace: add missing CONFIG_DYNAMIC_FTRACE check | *05896c8ff4net/iucv: fix the allocation size of iucv_path_table array | *f175de546ax86/mm: Disallow vsyscall page read for copy_from_kernel_nofault() | *46c8615de5x86/mm: Move is_vsyscall_vaddr() into asm/vsyscall.h | *d35d346b5driscv: dts: sifive: add missing #interrupt-cells to pmic | *6d4c7bd6dcRDMA/mlx5: Relax DEVX access upon modify commands | *cad82f1671RDMA/mlx5: Fix fortify source warning while accessing Eth segment | *6d6aa6c0bfsoc: microchip: Fix POLARFIRE_SOC_SYS_CTRL input prompt | *0e5b11ff73arm64/sve: Lower the maximum allocation for the SVE ptrace regset | *6ce8cc5e62gen_compile_commands: fix invalid escape sequence warning | *d1614e1fd6HID: multitouch: Add required quirk for Synaptics 0xcddc device | *9a07188311MIPS: Clear Cause.BD in instruction_pointer_set | *f49c513f46x86/xen: Add some null pointer checking to smp.c | *7056108e01ASoC: amd: yc: Fix non-functional mic on Lenovo 82UU | *aa9e9c7764ASoC: rt5645: Make LattePanda board DMI match more precise | *c4b96f7eabselftests: tls: use exact comparison in recv_partial | *d23425dab9perf/arm-cmn: Workaround AmpereOneX errata AC04_MESH_1 (incorrect child count) | *abd34206f3media: rkisp1: Fix IRQ handling due to shared interrupts | *806a0a1819nfsd: Fix creation time serialization order | *96e18f2361NFSD: Add an nfsd4_encode_nfstime4() helper | *37085bbd92NFSD: Fix problem of COMMIT and NFS4ERR_DELAY in infinite loop | *448f1dcd62nfsd: simplify the delayed disposal list code | *0af5ee5181NFSD: Convert filecache to rhltable | *f7ae480886nfsd: allow reaping files still under writeback | *7cc9547633nfsd: update comment over __nfsd_file_cache_purge | *c01b3f0fefnfsd: don't take/put an extra reference when putting a file | *917dadb09enfsd: add some comments to nfsd_file_do_acquire | *ee84c44b4anfsd: don't kill nfsd_files because of lease break error | *8a6c19f157nfsd: simplify test_bit return in NFSD_FILE_KEY_FULL comparator | *fab03e0db0nfsd: NFSD_FILE_KEY_INODE only needs to find GC'ed entries | *19d22c5ba5nfsd: don't open-code clear_and_wake_up_bit | *7762c2d4ccnfsd: allow nfsd_file_get to sanely handle a NULL pointer | *a3812a47a3io_uring: drop any code related to SCM_RIGHTS | *28fe81bcd3io_uring/unix: drop usage of io_uring socket | *1d467e1050md/raid10: prevent soft lockup while flush writes | *7512a70376md: fix data corruption for raid456 when reshape restart while grow up * |96cbfc5879Merge 6.1.82 into android14-6.1-lts |\| | *d7543167afLinux 6.1.82 | *cf4b8c39b9fs/proc: do_task_stat: use sig->stats_lock to gather the threads/children stats | *d95ef75162fs/proc: do_task_stat: use __for_each_thread() | *9793a3bb53getrusage: use sig->stats_lock rather than lock_task_sighand() | *2a304d8c92getrusage: use __for_each_thread() | *d9fe6ef245getrusage: move thread_group_cputime_adjusted() outside of lock_task_sighand() | *eba76e4808getrusage: add the "signal_struct *sig" local variable | *01d992088ddrm/amd/display: Fix MST Null Ptr for RV | *f0b6dc034edrm/amd/display: Wrong colorimetry workaround | *92cdc9d71aselftests: mptcp: decrease BW in simult flows | *b2e92ab17eKVM/x86: Export RFDS_NO and RFDS_CLEAR to guests | *d405b9c03fx86/rfds: Mitigate Register File Data Sampling (RFDS) | *29476fac75Documentation/hw-vuln: Add documentation for RFDS | *8b5760939dx86/mmio: Disable KVM mitigation when X86_FEATURE_CLEAR_CPU_BUF is set | *a28f4d1e0bdrm/amdgpu: Reset IH OVERFLOW_CLEAR bit | *2e3ec80ea7xhci: handle isoc Babble and Buffer Overrun events properly | *9158ea9395xhci: process isoc TD properly when there was a transaction error mid TD. | *a584c7734aselftests: mm: fix map_hugetlb failure on 64K page size systems | *02e16a41e5selftests/mm: switch to bash from sh | *f0c3497082readahead: avoid multiple marked readahead pages | *b0b89b470anfp: flower: add hardware offload check for post ct entry | *4e2f0cae0bnfp: flower: add goto_chain_index for ct entry | *66d663da86drm/amd/display: Fix uninitialized variable usage in core_link_ 'read_dpcd() & write_dpcd()' functions | *35a0d43ceeASoC: codecs: wcd938x: fix headphones volume controls | *5df3b81a56KVM: s390: vsie: fix race during shadow creation | *51c4435688KVM: s390: add stat counter for shadow gmap events | *4346480866netrom: Fix data-races around sysctl_net_busy_read | *cfedde3058netrom: Fix a data-race around sysctl_netrom_link_fails_count | *4c02b9ccbbnetrom: Fix a data-race around sysctl_netrom_routing_control | *498f1d6da1netrom: Fix a data-race around sysctl_netrom_transport_no_activity_timeout | *46803b776dnetrom: Fix a data-race around sysctl_netrom_transport_requested_window_size | *5ac3371382netrom: Fix a data-race around sysctl_netrom_transport_busy_delay | *5deaef2bf5netrom: Fix a data-race around sysctl_netrom_transport_acknowledge_delay | *d28fa5f0e6netrom: Fix a data-race around sysctl_netrom_transport_maximum_tries | *fed835d415netrom: Fix a data-race around sysctl_netrom_transport_timeout | *a47d68d777netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser | *e439607291netrom: Fix a data-race around sysctl_netrom_obsolescence_count_initialiser | *dec82a8fc4netrom: Fix a data-race around sysctl_netrom_default_path_quality | *6e49f3ac43erofs: apply proper VMA alignment for memory mapped files on THP | *39001e3c42netfilter: nf_conntrack_h323: Add protection for bmp length out of range | *bce83144banetfilter: nft_ct: fix l3num expectations with inet pseudo family | *998fd719e6net/rds: fix WARNING in rds_conn_connect_if_down | *7faff12e82net: dsa: microchip: fix register write order in ksz8_ind_write8() | *3420b3ff1fcpumap: Zero-initialise xdp_rxq_info struct before running XDP program | *394334fe2anet/ipv6: avoid possible UAF in ip6_route_mpath_notify() | *63a3c1f3c9igc: avoid returning frame twice in XDP_REDIRECT | *afdd29726anet: ice: Fix potential NULL pointer dereference in ice_bridge_setlink() | *6293ff942eice: virtchnl: stop pretending to support RSS over AQ or registers | *0de693d68bnet: sparx5: Fix use after free inside sparx5_del_mact_entry | *c0b22568a9geneve: make sure to pull inner header in geneve_rx() | *44faf8a482tracing/net_sched: Fix tracepoints that save qdisc_dev() as a string | *5822c02707ice: reorder disabling IRQ and NAPI in ice_qp_dis | *8e23edc54ai40e: disable NAPI right after disabling irqs when handling xsk_pool | *6632e19acbixgbe: {dis, en}able irqs in ixgbe_txrx_ring_{dis, en}able | *ea2a1052f2net: lan78xx: fix runtime PM count underflow on link stop | *850bb48189ceph: switch to corrected encoding of max_xattr_size in mdsmap * |045f29a0bdRevert "usb: gadget: Properly configure the device for remote wakeup" * |2e193db1b4Revert "scsi: sd: usb_storage: uas: Access media prior to querying device properties" * |3011e898b2Revert "Bluetooth: hci_qca: mark OF related data as maybe unused" * |a3778f3e13Revert "Bluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855" * |d9340ec8ddRevert "Bluetooth: btqca: use le32_to_cpu for ver.soc_id" * |b904eebfd4Revert "Bluetooth: btqca: Add WCN3988 support" * |55a316da31Revert "Bluetooth: qca: use switch case for soc type behavior" * |360b41bc65Revert "Bluetooth: qca: add support for WCN7850" * |e075d7f47aRevert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" * |f741d67cedMerge 6.1.81 into android14-6.1-lts |\| | *61adba85ccLinux 6.1.81 | *585a344af6xen/events: close evtchn after mapping cleanup | *8866334e35x86/efistub: Give up if memory attribute protocol returns an error | *2d7ebcb5d8bpf: Derive source IP addr via bpf_*_fib_lookup() | *5fafd8254abpf: Add table ID to bpf_fib_lookup BPF helper | *da67116b74KVM/VMX: Move VERW closer to VMentry for MDS mitigation | *edfaad334aKVM/VMX: Use BT+JNC, i.e. EFLAGS.CF to select VMRESUME vs. VMLAUNCH | *07946d956bx86/bugs: Use ALTERNATIVE() instead of mds_user_clear static key | *2e3087505dx86/entry_32: Add VERW just before userspace transition | *22444d079bx86/entry_64: Add VERW just before userspace transition | *29d3e02fb4x86/bugs: Add asm helpers for executing VERW | *559035e04eRevert "interconnect: Teach lockdep about icc_bw_lock order" | *19ec82b3caRevert "interconnect: Fix locking for runpm vs reclaim" | *0e351d1aa2block: define bvec_iter as __packed __aligned(4) | *c6ff5fb6b1gpio: fix resource unwinding order in error path | *17acece41dgpiolib: Fix the error path order in gpiochip_add_data_with_key() | *a3d369aeb3gpio: 74x164: Enable output pins after registers are reset | *7eb95e0af5powerpc/pseries/iommu: IOMMU table is not initialized for kdump over SR-IOV | *2c96f66cd0phy: freescale: phy-fsl-imx8-mipi-dphy: Fix alias name to use dashes | *c4c795b21daf_unix: Drop oob_skb ref before purging queue in GC. | *2402392bedefi/x86: Fix the missing KASLR_FLAG bit in boot_params->hdr.loadflags | *3a396c409ax86/boot: efistub: Assign global boot_params variable | *8f05493706x86/boot: Rename conflicting 'boot_params' pointer to 'boot_params_ptr' | *86c909d227x86/efistub: Avoid placing the kernel below LOAD_PHYSICAL_ADDR | *1b54062576efi/x86: Avoid physical KASLR on older Dell systems | *2dfaeac3f3x86/efistub: Avoid legacy decompressor when doing EFI boot | *fff7614f57x86/efistub: Perform SNP feature test while running in the firmware | *77330c123dx86/efistub: Prefer EFI memory attributes protocol over DXE services | *5a664585a7x86/decompressor: Factor out kernel decompression and relocation | *350265a753x86/efistub: Perform 4/5 level paging switch from the stub | *476a48cd37efi/libstub: Add limit argument to efi_random_alloc() | *8ff6d88c04efi/libstub: Add memory attribute protocol definitions | *34378d7ad2x86/efistub: Clear BSS in EFI handover protocol entrypoint | *1f3fd81bffx86/decompressor: Avoid magic offsets for EFI handover entrypoint | *f0acafd6f7x86/efistub: Simplify and clean up handover entry code | *33d064aecdefi: efivars: prevent double registration | *e58f2862e9arm64: efi: Limit allocations to 48-bit addressable physical region | *56587affe2nfsd: don't destroy global nfs4_file table in per-net shutdown | *f3ea5ec83dNFSD: replace delayed_work with work_struct for nfsd_client_shrinker | *c479755cb8NFSD: register/unregister of nfsd-client shrinker at nfsd startup/shutdown time | *ce606d5334NFSD: Use set_bit(RQ_DROPME) | *5c6c2fb3c1NFSD: Avoid clashing function prototypes | *eb73733124NFSD: Use only RQ_DROPME to signal the need to drop a reply | *7b2b8a6c75NFSD: add CB_RECALL_ANY tracepoints | *f28dae5463NFSD: add delegation reaper to react to low memory condition | *f30f07ba57NFSD: add support for sending CB_RECALL_ANY | *4481d72a4bNFSD: refactoring courtesy_client_reaper to a generic low memory shrinker | *371e1c1b32trace: Relocate event helper files | *0920deeec6lockd: fix file selection in nlmsvc_cancel_blocked | *ccbf6efab8lockd: ensure we use the correct file descriptor when unlocking | *8973a8f9b7lockd: set missing fl_flags field when retrieving args | *12e63680a7NFSD: Use struct_size() helper in alloc_session() | *8b7be6ef58nfsd: fix up the filecache laundrette scheduling | *e017486dadnfsd: use locks_inode_context helper | *c66f9f22e6lockd: use locks_inode_context helper | *1f76cb66fffilelock: add a new locks_inode_context accessor function | *6b12589f61NFSD: Fix licensing header in filecache.c | *5a1f61516fNFSD: Use rhashtable for managing nfs4_file objects | *49e8d9f465NFSD: Refactor find_file() | *0d4150f5ebNFSD: Clean up find_or_add_file() | *5aa0c564c0NFSD: Add a nfsd4_file_hash_remove() helper | *c8d8876aaeNFSD: Clean up nfsd4_init_file() | *6ee5c4e269NFSD: Update file_hashtbl() helpers | *255ac53d78NFSD: Use const pointers as parameters to fh_ helpers | *fae3f8b554NFSD: Trace delegation revocations | *9fbef7dcd8NFSD: Trace stateids returned via DELEGRETURN | *519a80ea5aNFSD: Clean up nfs4_preprocess_stateid_op() call sites | *e62d8c1281NFSD: Flesh out a documenting comment for filecache.c | *137d20da8eexportfs: use pr_debug for unreachable debug statements | *f82865e2a0nfsd: allow disabling NFSv2 at compile time | *850333a25anfsd: move nfserrno() to vfs.c | *bfef0cfab4nfsd: ignore requests to disable unsupported versions | *0a49efb948NFSD: Remove redundant assignment to variable host_err | *d03a9855cbNFSD: Simplify READ_PLUS | *831e9e63ccNFS: Fix data corruption caused by congestion. | *04dd4403ffdrm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml | *bf0ca988e2decompress: Use 8 byte alignment | *5c4feadb00x86/decompressor: Move global symbol references to C code | *463b51e90cx86/decompressor: Merge trampoline cleanup with switching code | *df3dec320bx86/decompressor: Pass pgtable address to trampoline directly | *e2fa53a04cx86/decompressor: Only call the trampoline when changing paging levels | *364d774597x86/decompressor: Call trampoline directly from C code | *1523291591x86/decompressor: Avoid the need for a stack in the 32-bit trampoline | *6083b4c590x86/decompressor: Use standard calling convention for trampoline | *640f27fc2ex86/decompressor: Call trampoline as a normal function | *99a20f5891x86/decompressor: Assign paging related global variables earlier | *2cca5f519ex86/decompressor: Store boot_params pointer in callee save register | *51a0710218x86/efistub: Branch straight to kernel entry point from C code | *4f3077c3eax86/boot: Robustify calling startup_{32,64}() from the decompressor code | *7bc9533e07x86/efi: Make the deprecated EFI handover protocol optional | *a8901f331befi: verify that variable services are supported | *71c43b714fx86/boot/compressed: Only build mem_encrypt.S if AMD_MEM_ENCRYPT=y | *cac22c9a5ex86/boot/compressed: Adhere to calling convention in get_sev_encryption_bit() | *0912dce9edx86/boot/compressed: Move startup32_check_sev_cbit() out of head_64.S | *e840ae3dc2x86/boot/compressed: Move startup32_check_sev_cbit() into .text | *801873f175x86/boot/compressed: Move startup32_load_idt() out of head_64.S | *2e47116315x86/boot/compressed: Move startup32_load_idt() into .text section | *29134968f7x86/boot/compressed: Pull global variable reference into startup32_load_idt() | *530a4271b7x86/boot/compressed: Avoid touching ECX in startup32_set_idt_entry() | *88035744b9x86/boot/compressed: Simplify IDT/GDT preserve/restore in the EFI thunk | *ef12d049fax86/boot/compressed, efi: Merge multiple definitions of image_offset into one | *beeeb4655dx86/boot/compressed: Move efi32_pe_entry() out of head_64.S | *469b84516cx86/boot/compressed: Move efi32_entry out of head_64.S | *c577208f81x86/boot/compressed: Move efi32_pe_entry into .text section | *d8950e8e20x86/boot/compressed: Move bootargs parsing out of 32-bit startup code | *3bad8dc0aex86/boot/compressed: Move 32-bit entrypoint code into .text section | *bad6e66d07x86/boot/compressed: Rename efi_thunk_64.S to efi-mixed.S | *e7945d93feefi: libstub: use EFI_LOADER_CODE region when moving the kernel in memory | *2d9b3e1ae1RDMA/core: Update CMA destination address on rdma_resolve_addr | *88067197e9RDMA/core: Refactor rdma_bind_addr | *f27d319df0mptcp: fix possible deadlock in subflow diag | *d93fd40c62mptcp: fix double-free on socket dismantle | *a8722cece3mptcp: fix snd_wnd initialization for passive socket | *03ad085eb1selftests: mptcp: join: add ss mptcp support check | *84a3c10a0cmptcp: push at DSS boundaries | *fb7be5e5ecmptcp: map v4 address to v6 when destroying subflow | *53e3f2ee8amptcp: continue marking the first subflow as UNCONNECTED | *fbccc5eb16mptcp: fix duplicate subflow creation | *e641486355mptcp: fix data races on remote_id | *e6e04845c2mptcp: fix data races on local_id | *65742f4bb1x86/cpu/intel: Detect TME keyid bits before setting MTRR mask registers | *c9fa51d4c4x86/e820: Don't reserve SETUP_RNG_SEED in e820 | *396a412001pmdomain: qcom: rpmhpd: Fix enabled_corner aggregation | *249d6ca4ffefivarfs: Request at most 512 bytes for variable names | *76109a226ariscv: add CALLER_ADDRx support | *4974d928d5mmc: sdhci-xenon: fix PHY init clock stability | *c65c475560mmc: sdhci-xenon: add timeout for PHY init complete | *bc9f87a41dmmc: core: Fix eMMC initialization with 1-bit bus connection | *70af82bb9cmmc: mmci: stm32: fix DMA API overlapping mappings warning | *474d521da8dmaengine: fsl-qdma: init irq after reg initialization | *300111cd90dmaengine: ptdma: use consistent DMA masks | *034e2d70b5crypto: arm64/neonbs - fix out-of-bounds access on short input | *237ecf1afedmaengine: fsl-qdma: fix SoC may hang on 16 byte unaligned read | *8dafc066c5drm/buddy: fix range bias | *2e443ed55fRevert "drm/amd/pm: resolve reboot exception for si oland" | *444d70889dbtrfs: send: don't issue unnecessary zero writes for trailing hole | *f590040ce2btrfs: dev-replace: properly validate device names | *c34adc20b9btrfs: fix double free of anonymous device after snapshot creation failure | *930e826962wifi: nl80211: reject iftype change with mesh ID change | *abd32d7f5cgtp: fix use-after-free and null-ptr-deref in gtp_newlink() | *59ed284c7blandlock: Fix asymmetric private inodes referring | *fd3289ab8eALSA: hda/realtek: fix mute/micmute LED For HP mt440 | *4cbbc2f0dbALSA: hda/realtek: Enable Mute LED on HP 840 G8 (MB 8AB8) | *8cec41a350ALSA: firewire-lib: fix to check cycle continuity | *3bfe04c127tomoyo: fix UAF write bug in tomoyo_write_control() | *8f626221e5of: property: fw_devlink: Fix stupid bug in remote-endpoint parsing | *8310080799riscv: Sparse-Memory/vmemmap out-of-bounds fix | *058ed71e0fafs: Fix endless loop in directory parsing | *2f91a96b89fbcon: always restore the old font data in fbcon_do_set_font() | *d36b9a1b4edrm/tegra: Remove existing framebuffer only if we support display | *7f8644b6a8ALSA: Drop leftover snd-rtctimer stuff from Makefile | *cefe18e9ecpower: supply: bq27xxx-i2c: Do not free non existing IRQ | *ddc547dd05efi/capsule-loader: fix incorrect allocation size | *08562ca971tls: fix peeking with sync+async decryption | *40f0f326cftls: decrement decrypt_pending if no async completion will be called | *7d4121b401net: hsr: Use correct offset for HSR TLV values in supervisory HSR frames | *a0222b4817igb: extend PTP timestamp adjustments to i211 | *f2261eb994rtnetlink: fix error logic of IFLA_BRIDGE_FLAGS writing back | *2b1414d5e9netfilter: bridge: confirm multicast packets before passing them up the stack | *b8afc22a11netfilter: let reset rules clean out conntrack entries | *ddf6ee3df3netfilter: nf_tables: allow NFPROTO_INET in nft_(match/target)_validate() | *92b8a3273fBluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT | *67ffc334b9Bluetooth: qca: add support for WCN7850 | *fc47ed389aBluetooth: qca: use switch case for soc type behavior | *9409636132Bluetooth: btqca: Add WCN3988 support | *29059d0f3bBluetooth: btqca: use le32_to_cpu for ver.soc_id | *e5383662fdBluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855 | *eb7b5777d3Bluetooth: hci_qca: mark OF related data as maybe unused | *7b410226d9Bluetooth: qca: Fix wrong event type for patch config command | *2dc94c160eBluetooth: Enforce validation on max value of connection interval | *30a5e812f7Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST | *0b056a52b3Bluetooth: hci_event: Fix wrongly recorded wakeup BD_ADDR | *926405765fBluetooth: hci_sync: Fix accept_list when attempting to suspend | *45085686b9Bluetooth: Avoid potential use-after-free in hci_error_reset | *cad078914bBluetooth: hci_sync: Check the correct flag before starting a scan | *17ccd9798fstmmac: Clear variable when destroying workqueue | *aa58972326uapi: in6: replace temporary label with rfc9486 | *1b4223e807net: lan78xx: fix "softirq work is pending" error | *d77ab053fbnet: usb: dm9601: fix wrong return value in dm9601_mdio_read | *548ab66730veth: try harder when allocating queue memory | *c41548fedelan78xx: enable auto speed configuration for LAN7850 if no EEPROM is detected | *1b0998fdd8ipv6: fix potential "struct net" leak in inet6_rtm_getaddr() | *7985d73961net: veth: clear GRO when clearing XDP even when down | *e85b3c1539cpufreq: intel_pstate: fix pstate limits enforcement for adjust_perf call back | *29360fd328tun: Fix xdp_rxq_info's queue_index when detaching | *a3c8fa54e9net: mctp: take ownership of skb in mctp_local_output | *ab63de24ebnet: ip_tunnel: prevent perpetual headroom growth | *0ac219c4c3netlink: add nla be16/32 types to minlen array | *0b27bf4c49netlink: Fix kernel-infoleak-after-free in __skb_datagram_iter | *65a389ef97mtd: spinand: gigadevice: Fix the get ecc status issue | *87632bc9ecmm: huge_memory: don't force huge page alignment on 32 bit | *afbf1a5cefRDMA/core: Fix multiple -Warray-bounds warnings | *e5f488993biommu/arm-smmu-qcom: Limit the SMR groups to 128 | *329fc4d3f7fs/ntfs3: Fix NULL pointer dereference in 'ni_write_inode' | *b3152afc0efs/ntfs3: Fix NULL dereference in ni_write_inode | *0d04e45c65fs/ntfs3: Add length check in indx_get_root | *976126f2declk: tegra20: fix gcc-7 constant overflow warning | *39c6312009fs/ntfs3: Fix a possible null-pointer dereference in ni_clear() | *e89c84422fiommu/arm-smmu-v3: Acknowledge pri/event queue overflow if any | *8745f3592eiommu/sprd: Release dma buffer to avoid memory leak | *f8faa53637Input: xpad - add constants for GIP interface numbers | *ed9fdc82causb: gadget: Properly configure the device for remote wakeup | *49e734926aARM: dts: imx7s: Drop dma-apb interrupt-names | *0cea0c330aARM: dts: imx: Adjust dma-apbh node name | *507eeaad4dPCI: layerscape: Add workaround for lost link capabilities during reset | *e30f82597bPCI: layerscape: Add the endpoint linkup notifier support | *5dbedec7e5mlxsw: spectrum_acl_tcam: Add missing mutex_destroy() | *174ac6b53amlxsw: spectrum_acl_tcam: Make fini symmetric to init | *00459ae532net: restore alpha order to Ethernet devices in config | *a76072bc73of: overlay: Reorder struct fragment fields kerneldoc | *2a3d40b402af_unix: Fix task hung while purging oob_skb in GC. | *b73dd5f999scsi: sd: usb_storage: uas: Access media prior to querying device properties | *cf33e6ca12scsi: core: Add struct for args to execution functions | *7d34b10786drm/meson: Don't remove bridges which are created by other drivers | *ae5f10ed95drm/meson: fix unbind path if HDMI fails to bind | *b7be6c737anetfilter: nf_tables: disallow timeout for anonymous sets * |1c7c998232ANDROID: add blk_mq_freeze_queue and blk_mq_unfreeze_queue to virtual device symbol list * |d8fcb4c06bRevert "mptcp: fix lockless access in subflow ULP diag" * |290b1bfd85Revert "net: dev: Convert sa_data to flexible array in struct sockaddr" * |9006fc45eeRevert "arp: Prevent overflow in arp_req_get()." * |601ccd855aRevert "usb: roles: fix NULL pointer issue when put module's reference" * |706f6a46d8Revert "usb: roles: don't get/set_role() when usb_role_switch is unregistered" * |563b8244dbMerge 6.1.80 into android14-6.1-lts |\| | *a3eb3a74aaLinux 6.1.80 | *277439e7cafs/ntfs3: Enhance the attribute size check | *f119f2325barp: Prevent overflow in arp_req_get(). | *f8fc1f1d9fahci: Extend ASM1061 43-bit DMA address quirk to other ASM106x parts | *4a37c6c068ata: ahci: add identifiers for ASM2116 series adapters | *70a4a26572mptcp: add needs_id for netlink appending addr | *b03bca8561mptcp: userspace pm send RM_ADDR for ID 0 | *14f1992430mm: zswap: fix missing folio cleanup in writeback race path | *18f614369dfs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio | *7ebeee513fmm/damon/reclaim: fix quota stauts loss due to online tunings | *47467e0481erofs: fix inconsistent per-file compression format | *54407d9bc5erofs: simplify compression configuration parser | *b1301f15ddi2c: imx: when being a target, mark the last read as processed | *5816800533drm/amd/display: Fix memory leak in dm_sw_fini() | *fd7b4f4fdcdrm/syncobj: call drm_syncobj_fence_add_wait when WAIT_AVAILABLE flag is set | *b9196289e3net: phy: realtek: Fix rtl8211f_config_init() for RTL8211F(D)(I)-VD-CG PHY | *37919ef31dFix write to cloned skb in ipv6_hop_ioam() | *9d5523e065phonet/pep: fix racy skb_queue_empty() use | *f556a352fdphonet: take correct lock to peek at the RX queue | *1623161f80net: sparx5: Add spinlock for frame transmission from CPU | *c22ad76cfcnet: mctp: put sock on tag allocation failure | *ea33b81669netfilter: nf_tables: use kzalloc for hook allocation | *f305359186netfilter: nf_tables: register hooks last when adding new chain/flowtable | *26994a04b0netfilter: nf_tables: rename function to destroy hook list | *a6cafdb49anetfilter: nft_flow_offload: release dst in case direct xmit path is used | *012df10717netfilter: nft_flow_offload: reset dst in route object after setting up flow | *9c5662e95anetfilter: flowtable: simplify route logic | *0c9302a6danetfilter: nf_tables: set dormant flag on hook register failure | *bdaf6bbfc1tls: don't skip over different type records from the rx_list | *6756168addtls: stop recv() if initial process_rx_list gave us non-DATA | *ca89b4f503tls: break out of main loop when PEEK gets a non-data record | *4588b13abcbpf, sockmap: Fix NULL pointer dereference in sk_psock_verdict_data_ready() | *11277d1892s390: use the correct count for __iowrite64_copy() | *18580e48e6octeontx2-af: Consider the action set by PF | *6216509a2eplatform/x86: thinkpad_acpi: Only update profile if successfully converted | *38c83c2488arm64/sme: Restore SME registers on exit from suspend | *fd84a5fae0net: dev: Convert sa_data to flexible array in struct sockaddr | *8391b9b651ipv6: sr: fix possible use-after-free and null-ptr-deref | *e8530b170eafs: Increase buffer size in afs_update_volume_status() | *addf5e297ebpf: Fix racing between bpf_timer_cancel_and_free and bpf_timer_cancel | *9a581b17b7ata: ahci_ceva: fix error handling for Xilinx GT PHY support | *e5703735e5ipv6: properly combine dev_base_seq and ipv6.dev_addr_genid | *b43a4fb42fipv4: properly combine dev_base_seq and ipv4.dev_addr_genid | *8e29f988adnet: stmmac: Fix incorrect dereference in interrupt handlers | *25bd33b87fx86/numa: Fix the sort compare func used in numa_fill_memblks() | *ca4a1c00bex86/numa: Fix the address overlap check in numa_fill_memblks() | *b06a3b1cbdnouveau: fix function cast warnings | *729bc77af4dccp/tcp: Unhash sk from ehash for tb2 alloc failure after check_estalblished(). | *91ac2c79e8net: bridge: switchdev: Ensure deferred event delivery on unoffload | *2d5b4b3376net: bridge: switchdev: Skip MDB replays of deferred events on offload | *44148c1c82scsi: jazz_esp: Only build if SCSI core is builtin | *3c31b18a8dscsi: smartpqi: Fix disable_managed_interrupts | *758b8f5e04bpf, scripts: Correct GPL license name | *a9409d33afRDMA/srpt: fix function pointer cast warnings | *5f69c475c1arm64: dts: rockchip: set num-cs property for spi on px30 | *7f31a244c7RDMA/qedr: Fix qedr_create_user_qp error flow | *47e93d2f28iommufd/iova_bitmap: Consider page offset for the pages to be pinned | *c5bc02f60diommufd/iova_bitmap: Switch iova_bitmap::bitmap to an u8 array | *8d3a5cbc1eiommufd/iova_bitmap: Bounds check mapped::pages access | *aee4dcfe17RDMA/srpt: Support specifying the srpt_service_guid parameter | *edc2a9afbeRDMA/irdma: Add AE for too many RNRS | *6f4553096eRDMA/irdma: Set the CQ read threshold for GEN 1 | *429999729dRDMA/irdma: Validate max_send_wr and max_recv_wr | *b2e4a5266eRDMA/irdma: Fix KASAN issue with tasklet | *75a64c641cRDMA/bnxt_re: Return error for SRQ resize | *f0d857ce31IB/hfi1: Fix a memleak in init_credit_return | *a6cada89eeRevert "drm/amd/display: increased min_dcfclk_mhz and min_fclk_mhz" | *71787c665dmptcp: fix lockless access in subflow ULP diag | *9e8e59af3amptcp: add needs_id for userspace appending addr | *42a841a84fmptcp: make userspace_pm_append_new_local_addr static | *2f414a56b3usb: roles: don't get/set_role() when usb_role_switch is unregistered | *0158216805usb: roles: fix NULL pointer issue when put module's reference | *35b604a37eusb: gadget: ncm: Avoid dropping datagrams of properly parsed NTBs | *9a52b694b0usb: cdns3: fix memory double free when handle zero packet | *2134e9906eusb: cdns3: fixed memory use after free at cdns3_gadget_ep_disable() | *c66a800848usb: cdnsp: fixed issue with incorrect detecting CDNSP family controllers | *748cee4417usb: cdnsp: blocked some cdns3 specific code | *4dc87908b1usb: dwc3: gadget: Don't disconnect if not started | *d4c7e4b1b0serial: amba-pl011: Fix DMA transmission in RS485 mode | *d9d2426253erofs: fix refcount on the metabuf used for inode lookup | *943c8b1fccdm-integrity, dm-verity: reduce stack usage for recheck | *545a94ffc2x86/alternative: Make custom return thunk unconditional | *b012dcf39dRevert "x86/alternative: Make custom return thunk unconditional" | *1221b8ea25x86/returnthunk: Allow different return thunks | *786f089086ARM: ep93xx: Add terminator to gpiod_lookup_table | *13cd1daeeal2tp: pass correct message length to ip6_append_data | *2a19e0042bPCI/MSI: Prevent MSI hardware interrupt number truncation | *e90211b1f7irqchip/sifive-plic: Enable interrupt if needed before EOI | *75eaa3666eirqchip/gic-v3-its: Do not assume vPE tables are preallocated | *62f361bfeacrypto: virtio/akcipher - Fix stack overflow on memcpy | *3963f16cc7gtp: fix use-after-free and null-ptr-deref in gtp_genl_dump_pdp() | *3ac3624a74KVM: arm64: vgic-its: Test for valid IRQ in its_sync_lpi_pending_table() | *72fdbc728cKVM: arm64: vgic-its: Test for valid IRQ in MOVALL handler | *6b2ff10390md: Fix missing release of 'active_io' for flush | *8b218e2f0acachefiles: fix memory leak in cachefiles_add_cache() | *9e7fc40377platform/x86: touchscreen_dmi: Allow partial (prefix) matches for ACPI names | *fff39f4962platform/x86: intel-vbtn: Stop calling "VBDL" from notify_handler | *19e5dc2e6bmm: memcontrol: clarify swapaccount=0 deprecation warning | *4c815c3a48mm/damon/lru_sort: fix quota status loss due to online tunings | *2dedda77d4mm/swap: fix race when skipping swapcache | *e3bf0a24e0scsi: core: Consult supported VPD page list prior to fetching page | *f49b20fd01scsi: target: pscsi: Fix bio_put() for error case | *0312171289cxl/pci: Fix disabling memory if DVSEC CXL Range does not match a CFMWS window | *27c1ade606dm-verity: recheck the hash after a failure | *e08c2a8d27dm-crypt: don't modify the data when using authenticated encryption | *906414f459dm-integrity: recheck the integrity tag after a failure | *6437b0b4ddRevert "parisc: Only list existing CPUs in cpu_possible_mask" | *5583552eecdm-crypt: recheck the integrity tag after a failure | *287abdcb9eata: libata-core: Do not try to set sleeping devices to standby | *65c5a1ba2cs390/cio: fix invalid -EBUSY on ccw_device_start | *47647795a6drm/ttm: Fix an invalid freeing on already freed page in error path | *a262b78dd0LoongArch: Disable IRQ before init_fn() for nonboot CPUs | *52dc9a7a57IB/hfi1: Fix sdma.h tx->num_descs off-by-one error | *4aa4ea70f3pmdomain: renesas: r8a77980-sysc: CR7 must be always on | *339ddc983bpmdomain: mediatek: fix race conditions with genpd | *4dd73641d7smb3: clarify mount warning | *db48acce75virtio-blk: Ensure no requests in virtqueues before deleting vqs. | *0947d0d463smb: client: set correct d_type for reparse points under DFS mounts | *8b661fb17bdrm/amdgpu: reset gpu for s3 suspend abort case | *d56edd0f1bdrm/amdgpu: skip to program GFXDEC registers for suspend abort | *6b82ffe7a2firewire: core: send bus reset promptly on gap count error | *c0b07b4237LoongArch: Select HAVE_ARCH_SECCOMP to use the common SECCOMP menu | *c920f604e0LoongArch: Select ARCH_ENABLE_THP_MIGRATION instead of redefining it | *c7ac9c1f7fscsi: ufs: core: Remove the ufshcd_release() in ufshcd_err_handling_prepare() | *75745f2b74scsi: lpfc: Use unsigned type for num_sge | *76ee44af09hwmon: (coretemp) Enlarge per package core count limit | *48a33c3125efi: Don't add memblocks for soft-reserved memory | *700c3f642cefi: runtime: Fix potential overflow of soft-reserved region size | *2bf17c3e13wifi: mac80211: adding missing drv_mgd_complete_tx() call | *4e5bd22870wifi: mac80211: set station RX-NSS on reconfig | *6ed6cdbe88fs/ntfs3: Fix oob in ntfs_listxattr | *5d67a4ff3dfs/ntfs3: Update inode->i_size after success write into compressed file | *32a3974b26fs/ntfs3: Correct function is_rst_area_valid | *0d2f804b9ffs/ntfs3: Prevent generic message "attempt to access beyond end of device" | *1c005ce993fs/ntfs3: use non-movable memory for ntfs3 MFT buffer cache | *ee12c31020fs/ntfs3: Disable ATTR_LIST_ENTRY size check | *50545eb6cdfs/ntfs3: Add NULL ptr dereference checking at the end of attr_allocate_frame() | *95bad562e5fs/ntfs3: Fix detected field-spanning write (size 8) of single field "le->name" | *a9f7d7656ffs/ntfs3: Print warning while fixing hard links count | *25d1694d6efs/ntfs3: Correct hard links updating when dealing with DOS names | *1970b5f204fs/ntfs3: Improve ntfs_dir_count | *9c66843606fs/ntfs3: Modified fix directory element type detection | *b3a996b106Input: i8042 - add Fujitsu Lifebook U728 to i8042 quirk table | *200627f46eext4: correct the hole length returned by ext4_map_blocks() | *be36276cb8smb: client: increase number of PDUs allowed in a compound request | *f9eef0e495nvmet-fc: take ref count on tgtport before delete assoc | *9e6987f893nvmet-fc: avoid deadlock on delete association path | *8b9e453949nvmet-fc: abort command when there is no binding | *67e2ddf232nvmet-fc: hold reference on hostport match | *b833811668nvmet-fc: defer cleanup using RCU properly | *6319ab29d5nvmet-fc: release reference on target port | *16b2b31ba8nvmet-fcloop: swap the list_add_tail arguments | *085195aa90nvme-fc: do not wait in vain when unloading module | *dee697ac53ALSA: usb-audio: Ignore clock selector errors for single connection | *5653a6d65aASoC: wm_adsp: Don't overwrite fwf_name with the default | *bead6ff986drm/amd/display: increased min_dcfclk_mhz and min_fclk_mhz | *41b256f473netfilter: conntrack: check SCTP_CID_SHUTDOWN_ACK for vtag setting in sctp_new | *17fe3616d8misc: open-dice: Fix spurious lockdep warning | *1c57e5ef85Input: xpad - add Lenovo Legion Go controllers | *949296ee62spi: sh-msiof: avoid integer overflow in constants | *4dec3068eaASoC: sunxi: sun4i-spdif: Add support for Allwinner H616 | *c7bdaff0d0ALSA: usb-audio: Check presence of valid altsetting control | *1675aae9e1usb: ucsi_acpi: Quirk to ack a connector change ack cmd | *fbd1cb2a9bnvmet-tcp: fix nvme tcp ida memory leak | *13c1af5f3bregulator: pwm-regulator: Add validity checks in continuous .get_voltage | *9d508c8971dmaengine: ti: edma: Add some null pointer checks to the edma_probe | *3e746c4e48Input: goodix - accept ACPI resources with gpio_count == 3 && gpio_int_idx == 0 | *d639102f4cext4: avoid allocating blocks from corrupted group in ext4_mb_find_by_goal() | *f97e75fa4eext4: avoid allocating blocks from corrupted group in ext4_mb_try_best_found() | *8b40eb2e71ext4: avoid dividing by 0 in mb_update_avg_fragment_size() when block bitmap corrupt | *a600d7f0c1platform/x86: touchscreen_dmi: Add info for the TECLAST X16 Plus tablet | *6c292c2f90MIPS: reserve exception vector space ONLY ONCE | *f48a6eb2e5ahci: add 43-bit DMA address quirk for ASMedia ASM1061 controllers | *2d623c94fbaoe: avoid potential deadlock at set_capacity | *41e137c2c7ahci: asm1166: correct count of reported ports | *a2aa77b5d8cifs: translate network errors on send to -ECONNABORTED | *bba595eb14smb: Work around Clang __bdos() type confusion | *8fc8087410block: Fix WARNING in _copy_from_iter | *f19361d570spi: hisi-sfc-v3xx: Return IRQ_NONE if no interrupts were detected | *f329523f6afbdev: sis: Error out if pixclock equals zero | *070398d32cfbdev: savage: Error out if pixclock equals zero | *eb39bb548bwifi: mac80211: fix race condition on enabling fast-xmit | *e540c44983wifi: cfg80211: fix missing interfaces when dumping | *d3dbfb9d11dmaengine: fsl-qdma: increase size of 'irq_name' | *8dda42b1f2dmaengine: shdma: increase size of 'dev_id' | *b2cb83539ccifs: open_cached_dir should not rely on primary channel | *e717bd4120scsi: target: core: Add TMF to tmr_list handling | *c9ae228cfddmaengine: apple-admac: Keep upper bits of REG_BUS_WIDTH | *0d27ac1779riscv/efistub: Ensure GP-relative addressing is not used | *6967ddd378PCI: dwc: Fix a 64bit bug in dw_pcie_ep_raise_msix_irq() | *5552b7bf26sched/rt: sysctl_sched_rr_timeslice show default timeslice after reset | *89bebf2753sched/rt: Disallow writing invalid values to sched_rt_period_us | *a41f6e170bnet/sched: Retire dsmark qdisc | *09038f47e4net/sched: Retire ATM qdisc | *02149c7cd1net/sched: Retire CBQ qdisc * |5b066041f2ANDROID: add dma_max_mapping_size to virtual_device symbol list. * |3de5fca057ANDROID: add pm_runtime_get_if_active to db845 symbol list * |ff43d92a56Merge 6.1.79 into android14-6.1-lts |/ *81e1dc2f70Linux 6.1.79 *6fd2467518mlxsw: spectrum_acl_tcam: Fix stack corruption *9020513afafs/ntfs3: Add null pointer checks *d028cc6d23arm64: Subscribe Microsoft Azure Cobalt 100 to ARM Neoverse N2 errata *c5d83ac2bfdm: limit the number of targets and parameter size area *13f79a0026nilfs2: replace WARN_ONs for invalid DAT metadata block requests *6589f0f72fnilfs2: fix potential bug in end_buffer_async_write *058d1c5616of: property: Add in-ports/out-ports support to of_graph_get_port_parent() *24ec7504a0sched/membarrier: reduce the ability to hammer on sys_membarrier *d3a5f798bckbuild: Drop -Wdeclaration-after-statement *3c6cc62ce1locking: Introduce __cleanup() based infrastructure *579cfab21bapparmor: Free up __cleanup() name *43ec3c8886dmaengine: ioat: Free up __cleanup() name *a160c3293auserfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb *f3e9758286bpf: Remove trace_printk_lock *95b7476f6fbpf: Do cleanup in bpf_bprintf_cleanup only when needed *f7bbad9561bpf: Add struct for bin_args arg in bpf_bprintf_prepare *989b0ff35fnet: prevent mss overflow in skb_segment() *380aeff204smb: client: fix parsing of SMB3.1.1 POSIX create context *1ae3c59355smb: client: fix potential OOBs in smb2_parse_contexts() *270325fb31RDMA/irdma: Ensure iWarp QP queue memory is OS paged aligned *e1c1bdaa38hrtimer: Ignore slack time for RT tasks in schedule_hrtimeout_range() *51a8f31b93nfsd: don't take fi_lock in nfsd_break_deleg_cb() *e4cf894166nfsd: fix RELEASE_LOCKOWNER *23027309b0parisc: Fix random data corruption from exception handler *ebc442c640netfilter: ipset: Missing gc cancellations fixed *653bc5e6d9netfilter: ipset: fix performance regression in swap operation *e7d2e87abcblock: fix partial zone append completion handling in req_bio_endio() *bb44477d45crypto: lib/mpi - Fix unexpected pointer access in mpi_ec_init *c6feb7f417wifi: mwifiex: fix uninitialized firmware_stat *0a9e803549arm64: dts: qcom: sm8150: fix USB SS wakeup *c0e41c8756arm64: dts: qcom: sdm845: fix USB SS wakeup *2488e0e4bcarm64: dts: qcom: msm8916: Make blsp_dma controlled-remotely *9c84d580dearm64: dts: qcom: msm8916: Enable blsp_dma by default *4753693501bus: moxtet: Add spi device table *1b7b597a69wifi: mwifiex: add extra delay for firmware ready *48b3482320wifi: mwifiex: Support SD8978 chipset *5447e64accARM: dts: imx6q-apalis: add can power-up delay on ixora board *4bf19cef22md: bypass block throttle for superblock update *9a163479ddselftests/mm: Update va_high_addr_switch.sh to check CPU for la57 flag *84df059d24selftests/mm: ksm_tests should only MADV_HUGEPAGE valid memory *944900fe27tls: fix NULL deref on tls_sw_splice_eof() with empty record *0a371ed6f2xfrm: Silence warnings triggerable by bad packets *cf3c891686xfrm: Use xfrm_state selector for BEET input *1e4432d463tracing: Inform kmemleak of saved_cmdlines allocation *c7f9c3e94efs/proc: do_task_stat: move thread_group_cputime_adjusted() outside of lock_task_sighand() *9359ff1a45pmdomain: core: Move the unused cleanup to a _sync initcall *4dd684d4bbcan: j1939: Fix UAF in j1939_sk_match_filter during setsockopt(SO_J1939_FILTER) *aedda066d7can: j1939: prevent deadlock by changing j1939_socks_lock to rwlock *8a72a4689acan: netlink: Fix TDCO calculation using the old data bittiming *08c1948823of: property: fix typo in io-channels *79081197b4mm: hugetlb pages should not be reserved by shmat() if SHM_NORESERVE *2e2c07104bfs,hugetlb: fix NULL pointer dereference in hugetlbs_fill_super *f3f98d7d84ceph: prevent use-after-free in encode_cap_msg() *309ef7de5dhv_netvsc: Register VF in netvsc_probe if NET_DEVICE_REGISTER missed *4888754f3dnet: ethernet: ti: cpsw_new: enable mac_managed_pm to fix mdio *5140c4d5f4s390/qeth: Fix potential loss of L3-IP@ in case of network issues *058fbaf771net: ethernet: ti: cpsw: enable mac_managed_pm to fix mdio *95de4ad173fs: relax mount_setattr() permission checks *3ff3e6a936tools/rtla: Fix Makefile compiler options for clang *4ee28d5a4ftools/rtla: Fix uninitialized bucket/data->bucket_size warning *5ccb527b66tools/rtla: Exit with EXIT_SUCCESS when help is invoked *771b74ce92tools/rtla: Replace setting prio with nice for SCHED_OTHER *d627693e5atools/rtla: Remove unused sched_getattr() function *fcf62f94adASoC: amd: yc: Add DMI quirk for Lenovo Ideapad Pro 5 16ARP8 *00f9fcc0a1mmc: sdhci-pci-o2micro: Fix a warm reboot issue that disk can't be detected by BIOS *09fad23a1azonefs: Improve error handling *ce2b826582irqchip/gic-v3-its: Fix GICv4.1 VPE affinity update *659311f593irqchip/irq-brcmstb-l2: Add write memory barrier before exit *783912cbcewifi: mac80211: reload info pointer in ieee80211_tx_dequeue() *6c84dbe8f8wifi: cfg80211: fix wiphy delayed work queueing *685fc1711cnfp: flower: prevent re-adding mac index for bonded port *57b8478c10nfp: use correct macro for LengthSelect in BAR config *8731fe001acrypto: ccp - Fix null pointer dereference in __sev_platform_shutdown_locked *8494ba2c9enilfs2: fix hang in nilfs_lookup_dirty_data_buffers() *9c9c68d64fnilfs2: fix data corruption in dsync block recovery for small block sizes *35076e3fb4ALSA: hda/conexant: Add quirk for SWS JS201D *53e8abc14eALSA: hda/realtek: fix mute/micmute LED For HP mt645 *a943c7fbdfmmc: slot-gpio: Allow non-sleeping GPIO ro *eae748df18io_uring/net: fix multishot accept overflow handling *aedcefae6cx86/mm/ident_map: Use gbpages only where full GB page should be mapped. *3863ca0522KVM: x86/pmu: Fix type length error when reading pmu->fixed_ctr_ctrl *627339cccdx86/fpu: Stop relying on userspace for info to fault in xsave buffer *8b4025679ex86/Kconfig: Transmeta Crusoe is CPU family 5, not 6 *c194adaa8apowerpc/pseries: fix accuracy of stolen time *42422f8f8cpowerpc/cputable: Add missing PPC_FEATURE_BOOKE on PPC64 Book-E *76d3ad7d02powerpc/64: Set task pt_regs->link to the LR value on scv entry *5e2f407646serial: max310x: prevent infinite while() loop in port startup *0046dd2e9fserial: max310x: fail probe if clock crystal is unstable *7971a029ebserial: max310x: improve crystal stable clock detection *5d89c48337serial: max310x: set default value when reading clock ready bit *c96ce4903bnfp: flower: fix hardware offload for the transfer layer port *ef3d50e884ring-buffer: Clean ring_buffer_poll_wait() error return *48a8ccccffhv_netvsc: Fix race condition between netvsc_probe and netvsc_remove *3ca5a3cdc0drm/amd/display: Preserve original aspect ratio in create stream *e70123fdbedrm/amd/display: Increase frame-larger-than for all display_mode_vba files *8c22b23a27drm/prime: Support page array >= 4GB *fc811d88fbdrm/msm: Wire up tlb ops *ba5f957883xfrm: Remove inner/outer modes from input path *01e9f82058xfrm: Remove inner/outer modes from output path *7505a0ce08ksmbd: free aux buffer if ksmbd_iov_pin_rsp_read fails *9f6087851emedia: rc: bpf attach/detach requires write permission *b79e15569diio: imu: bno055: serdev requires REGMAP *9e105dd8c0iio: imu: adis: ensure proper DMA alignment *18cbe28671iio: adc: ad_sigma_delta: ensure proper DMA alignment *77ba1a86efiio: accel: bma400: Fix a compilation problem *4f10423c0eiio: commom: st_sensors: ensure proper DMA alignment *359f220d0eiio: core: fix memleak in iio_device_register_sysfs *176256ff8aiio: magnetometer: rm3100: add boundary check for the value read from RM3100_REG_TMRC *c794117a33staging: iio: ad5933: fix type mismatch regression *65bf19f55atracing: Fix wasted memory in saved_cmdlines logic *ac894a1e19ext4: avoid bb_free and bb_fragments inconsistency in mb_free_blocks() *185eab3048ext4: fix double-free of blocks due to wrong extents moved_len *4ab56381acmisc: fastrpc: Mark all sessions as invalid in cb_remove *90e09c016dbinder: signal epoll threads of self-work *f33789ca65ALSA: hda/realtek: fix mute/micmute LEDs for HP ZBook Power *6c65eb988dALSA: hda/cs8409: Suppress vmaster control for Dolphin models *a6bc858472ASoC: codecs: wcd938x: handle deferred probe *d27f6d6eacALSA: hda/realtek: Enable headset mic on Vaio VJFE-ADL *5953f2c7f8modpost: Add '.ltext' and '.ltext.*' to TEXT_SECTIONS *064cb9dd10um: Fix adding '-no-pie' for clang *36fbcadc20modpost: Include '.text.*' in TEXT_SECTIONS *519b7da44elinux/init: remove __memexit* annotations *999ecc936amodpost: Don't let "driver"s reference .exit.* *a5767decf7modpost: propagate W=1 build option to modpost *6286435cd0xen-netback: properly sync TX responses *55e891f4a2net: stmmac: do not clear TBS enable bit on link up/down *56440799fcnet: hsr: remove WARN_ONCE() in send_hsr_supervision_frame() *5c0c5ffaednfc: nci: free rx_data_reassembly skb on NCI device cleanup *76690354e6kbuild: Fix changing ELF file type for output of gen_btf for big endian *38acb2e9beALSA: hda/realtek: Apply headset jack quirk for non-bass alc287 thinkpads *e1aae84f42firewire: core: correct documentation of fw_csr_string() kernel API *d0302e2a57lsm: fix the logic in security_inode_getsecctx() *dc3890441cdrm/virtio: Set segment size for virtio_gpu device *ff70e6ff6fRevert "drm/amd: flush any delayed gfxoff on suspend entry" *6bb22ac1d1scsi: Revert "scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock" *75500e7ba2media: Revert "media: rkisp1: Drop IRQF_SHARED" *e373bfc8ecmptcp: check addrs list in userspace_pm_get_local_id *d288d2e3e6mptcp: drop the push_pending field *d50d031919selftests: mptcp: increase timeout to 30 min *fc0e9cff9dselftests: mptcp: add missing kconfig for NF Mangle *2c7337ec22selftests: mptcp: add missing kconfig for NF Filter in v6 *66e142fbe1selftests: mptcp: add missing kconfig for NF Filter *6673d9f1c2mptcp: fix data re-injection from stale subflow *7857e35ef1mptcp: get rid of msk->subflow *3e409fb740modpost: trim leading spaces when processing source files list *491528935ci2c: i801: Fix block process call transactions *0e01ccadfdi2c: pasemi: split driver into two separate modules *4297217bcfpowerpc/kasan: Limit KASAN thread size increase to 32KB *c12920ff9birqchip/loongson-eiointc: Use correct struct type in eiointc_domain_alloc() *083870b029i2c: qcom-geni: Correct I2C TRE sequence *7190353835cifs: fix underflow in parse_server_interfaces() *0c09912dd8powerpc/kasan: Fix addr error caused by page alignment *2aaa9239c9driver core: fw_devlink: Improve detection of overlapping cycles *be76ad74a4media: ir_toy: fix a memleak in irtoy_tx *6616d3c4f8interconnect: qcom: sc8180x: Mark CO0 BCM keepalive *57e2e42ccdusb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend *0ecc97c81eusb: f_mass_storage: forbid async queue when shutdown happen *2888258144USB: hub: check for alternate port before enabling A_ALT_HNP_SUPPORT *9f754d0094usb: ucsi_acpi: Fix command completion handling *d31b886ed6usb: ulpi: Fix debugfs directory leak *3fd6c16ec7usb: ucsi: Add missing ppm_lock *711beb8acfiio: hid-sensor-als: Return 0 for HID_USAGE_SENSOR_TIME_TIMESTAMP *e5c6c8ef3eHID: wacom: Do not register input devices until after hid_hw_start *b71a906a72HID: wacom: generic: Avoid reporting a serial of '0' to userspace *d7d7a0e3b6HID: i2c-hid-of: fix NULL-deref on failed power up *ea09996b37ALSA: hda/realtek: Enable Mute LED on HP Laptop 14-fq0xxx *b23c431e50ALSA: hda/realtek: Fix the external mic not being recognised for Acer Swift 1 SF114-32 *f00e8d0fccparisc: Prevent hung tasks when printing inventory on serial console *607385d75aASoC: amd: yc: Add DMI quirk for MSI Bravo 15 C7VF *30884a44e0dm-crypt, dm-verity: disable tasklets *221da504a5scsi: storvsc: Fix ring buffer size calculation *16b1025eaamm/writeback: fix possible divide-by-zero in wb_dirty_limits(), again *36be97e9ebtracing/trigger: Fix to return error if failed to alloc snapshot *76a42074d0scs: add CONFIG_MMU dependency for vfree_atomic() *7a245b8a2fi40e: Fix waiting for queues of all VSIs to be disabled *1c981792e4i40e: Do not allow untrusted VF to remove administratively set MAC *c638b4afc7MIPS: Add 'memory' clobber to csum_ipv6_magic() inline assembler *4b02c89327nouveau/svm: fix kvcalloc() argument order *20f378f929net: sysfs: Fix /sys/class/net/<iface> path for statistics *1f0d7792e9ASoC: rt5645: Fix deadlock in rt5645_jack_detect_work() *251145e504spi: ppc4xx: Drop write-only variable *727cdd2f3dnet: tls: fix returned read length with async decrypt *20b4ed0348net: tls: fix use-after-free with partial reads and async decrypt *7a3ca06d04tls: fix race between async notify and socket close *2c6841c882net: tls: factor out tls_*crypt_async_wait() *d55eb0b495tls: extract context alloc/initialization out of tls_set_sw_offload *5ad627faedtls/sw: Use splice_eof() to flush *b9357489c4lan966x: Fix crash when adding interface under a lag *65ded4eb22net: openvswitch: limit the number of recursions from action sets *68614f1865of: property: Improve finding the supplier of a remote-endpoint property *4bd106ac1cwifi: iwlwifi: uninitialized variable in iwl_acpi_get_ppag_table() *72d4600a6ewifi: iwlwifi: Fix some error codes *e5ed6c9225KVM: selftests: Fix a semaphore imbalance in the dirty ring logging test *b3557a3697KVM: selftests: Clear dirty ring states between two modes in dirty_log_test *0cf0506400of: unittest: Fix compile in the non-dynamic case *0f081fcfaadriver core: Fix device_link_flag_is_sync_state_only() *02f2b95b00btrfs: don't drop extent_map for free space inode on write error *7ba7f9ed88btrfs: reject encoded write if inode has nodatasum flag set *4d6b2e17b5btrfs: don't reserve space for checksums when writing to nocow files *dfd1f44e49btrfs: send: return EOPNOTSUPP on unknown flags *f98913c07cbtrfs: forbid deleting live subvol qgroup *66b317a2fcbtrfs: do not ASSERT() if the newly created subvolume already got read *a1a7b95895btrfs: forbid creating subvol qgroups *e717aecd2abtrfs: do not delete unused block group if it may be used soon *84b576ad44btrfs: add and use helper to check if block group is used *3af7236d6dupdate workarounds for gcc "asm goto" issue *f70efe54b9work around gcc bugs with 'asm goto' with outputs Change-Id: I531ec605442fd6f262741fec9343f9b9df241319 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
What: /sys/class/<iface>/statistics/collisions
|
What: /sys/class/net/<iface>/statistics/collisions
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -6,7 +6,7 @@ Description:
|
|||||||
Indicates the number of collisions seen by this network device.
|
Indicates the number of collisions seen by this network device.
|
||||||
This value might not be relevant with all MAC layers.
|
This value might not be relevant with all MAC layers.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/multicast
|
What: /sys/class/net/<iface>/statistics/multicast
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -14,7 +14,7 @@ Description:
|
|||||||
Indicates the number of multicast packets received by this
|
Indicates the number of multicast packets received by this
|
||||||
network device.
|
network device.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_bytes
|
What: /sys/class/net/<iface>/statistics/rx_bytes
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -23,7 +23,7 @@ Description:
|
|||||||
See the network driver for the exact meaning of when this
|
See the network driver for the exact meaning of when this
|
||||||
value is incremented.
|
value is incremented.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_compressed
|
What: /sys/class/net/<iface>/statistics/rx_compressed
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -32,7 +32,7 @@ Description:
|
|||||||
network device. This value might only be relevant for interfaces
|
network device. This value might only be relevant for interfaces
|
||||||
that support packet compression (e.g: PPP).
|
that support packet compression (e.g: PPP).
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_crc_errors
|
What: /sys/class/net/<iface>/statistics/rx_crc_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -41,7 +41,7 @@ Description:
|
|||||||
by this network device. Note that the specific meaning might
|
by this network device. Note that the specific meaning might
|
||||||
depend on the MAC layer used by the interface.
|
depend on the MAC layer used by the interface.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_dropped
|
What: /sys/class/net/<iface>/statistics/rx_dropped
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -51,7 +51,7 @@ Description:
|
|||||||
packet processing. See the network driver for the exact
|
packet processing. See the network driver for the exact
|
||||||
meaning of this value.
|
meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_errors
|
What: /sys/class/net/<iface>/statistics/rx_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -59,7 +59,7 @@ Description:
|
|||||||
Indicates the number of receive errors on this network device.
|
Indicates the number of receive errors on this network device.
|
||||||
See the network driver for the exact meaning of this value.
|
See the network driver for the exact meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_fifo_errors
|
What: /sys/class/net/<iface>/statistics/rx_fifo_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -68,7 +68,7 @@ Description:
|
|||||||
network device. See the network driver for the exact
|
network device. See the network driver for the exact
|
||||||
meaning of this value.
|
meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_frame_errors
|
What: /sys/class/net/<iface>/statistics/rx_frame_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -78,7 +78,7 @@ Description:
|
|||||||
on the MAC layer protocol used. See the network driver for
|
on the MAC layer protocol used. See the network driver for
|
||||||
the exact meaning of this value.
|
the exact meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_length_errors
|
What: /sys/class/net/<iface>/statistics/rx_length_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -87,7 +87,7 @@ Description:
|
|||||||
error, oversized or undersized. See the network driver for the
|
error, oversized or undersized. See the network driver for the
|
||||||
exact meaning of this value.
|
exact meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_missed_errors
|
What: /sys/class/net/<iface>/statistics/rx_missed_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -96,7 +96,7 @@ Description:
|
|||||||
due to lack of capacity in the receive side. See the network
|
due to lack of capacity in the receive side. See the network
|
||||||
driver for the exact meaning of this value.
|
driver for the exact meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_nohandler
|
What: /sys/class/net/<iface>/statistics/rx_nohandler
|
||||||
Date: February 2016
|
Date: February 2016
|
||||||
KernelVersion: 4.6
|
KernelVersion: 4.6
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -104,7 +104,7 @@ Description:
|
|||||||
Indicates the number of received packets that were dropped on
|
Indicates the number of received packets that were dropped on
|
||||||
an inactive device by the network core.
|
an inactive device by the network core.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_over_errors
|
What: /sys/class/net/<iface>/statistics/rx_over_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -114,7 +114,7 @@ Description:
|
|||||||
(e.g: larger than MTU). See the network driver for the exact
|
(e.g: larger than MTU). See the network driver for the exact
|
||||||
meaning of this value.
|
meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/rx_packets
|
What: /sys/class/net/<iface>/statistics/rx_packets
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -122,7 +122,7 @@ Description:
|
|||||||
Indicates the total number of good packets received by this
|
Indicates the total number of good packets received by this
|
||||||
network device.
|
network device.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_aborted_errors
|
What: /sys/class/net/<iface>/statistics/tx_aborted_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -132,7 +132,7 @@ Description:
|
|||||||
a medium collision). See the network driver for the exact
|
a medium collision). See the network driver for the exact
|
||||||
meaning of this value.
|
meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_bytes
|
What: /sys/class/net/<iface>/statistics/tx_bytes
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -143,7 +143,7 @@ Description:
|
|||||||
transmitted packets or all packets that have been queued for
|
transmitted packets or all packets that have been queued for
|
||||||
transmission.
|
transmission.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_carrier_errors
|
What: /sys/class/net/<iface>/statistics/tx_carrier_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -152,7 +152,7 @@ Description:
|
|||||||
because of carrier errors (e.g: physical link down). See the
|
because of carrier errors (e.g: physical link down). See the
|
||||||
network driver for the exact meaning of this value.
|
network driver for the exact meaning of this value.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_compressed
|
What: /sys/class/net/<iface>/statistics/tx_compressed
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -161,7 +161,7 @@ Description:
|
|||||||
this might only be relevant for devices that support
|
this might only be relevant for devices that support
|
||||||
compression (e.g: PPP).
|
compression (e.g: PPP).
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_dropped
|
What: /sys/class/net/<iface>/statistics/tx_dropped
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -170,7 +170,7 @@ Description:
|
|||||||
See the driver for the exact reasons as to why the packets were
|
See the driver for the exact reasons as to why the packets were
|
||||||
dropped.
|
dropped.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_errors
|
What: /sys/class/net/<iface>/statistics/tx_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -179,7 +179,7 @@ Description:
|
|||||||
a network device. See the driver for the exact reasons as to
|
a network device. See the driver for the exact reasons as to
|
||||||
why the packets were dropped.
|
why the packets were dropped.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_fifo_errors
|
What: /sys/class/net/<iface>/statistics/tx_fifo_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -188,7 +188,7 @@ Description:
|
|||||||
FIFO error. See the driver for the exact reasons as to why the
|
FIFO error. See the driver for the exact reasons as to why the
|
||||||
packets were dropped.
|
packets were dropped.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_heartbeat_errors
|
What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -197,7 +197,7 @@ Description:
|
|||||||
reported as heartbeat errors. See the driver for the exact
|
reported as heartbeat errors. See the driver for the exact
|
||||||
reasons as to why the packets were dropped.
|
reasons as to why the packets were dropped.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_packets
|
What: /sys/class/net/<iface>/statistics/tx_packets
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
@@ -206,7 +206,7 @@ Description:
|
|||||||
device. See the driver for whether this reports the number of all
|
device. See the driver for whether this reports the number of all
|
||||||
attempted or successful transmissions.
|
attempted or successful transmissions.
|
||||||
|
|
||||||
What: /sys/class/<iface>/statistics/tx_window_errors
|
What: /sys/class/net/<iface>/statistics/tx_window_errors
|
||||||
Date: April 2005
|
Date: April 2005
|
||||||
KernelVersion: 2.6.12
|
KernelVersion: 2.6.12
|
||||||
Contact: netdev@vger.kernel.org
|
Contact: netdev@vger.kernel.org
|
||||||
|
|||||||
@@ -519,6 +519,7 @@ What: /sys/devices/system/cpu/vulnerabilities
|
|||||||
/sys/devices/system/cpu/vulnerabilities/mds
|
/sys/devices/system/cpu/vulnerabilities/mds
|
||||||
/sys/devices/system/cpu/vulnerabilities/meltdown
|
/sys/devices/system/cpu/vulnerabilities/meltdown
|
||||||
/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
|
/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
|
||||||
|
/sys/devices/system/cpu/vulnerabilities/reg_file_data_sampling
|
||||||
/sys/devices/system/cpu/vulnerabilities/retbleed
|
/sys/devices/system/cpu/vulnerabilities/retbleed
|
||||||
/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
|
/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
|
||||||
/sys/devices/system/cpu/vulnerabilities/spectre_v1
|
/sys/devices/system/cpu/vulnerabilities/spectre_v1
|
||||||
|
|||||||
@@ -21,3 +21,4 @@ are configurable at compile, boot or run time.
|
|||||||
cross-thread-rsb.rst
|
cross-thread-rsb.rst
|
||||||
gather_data_sampling.rst
|
gather_data_sampling.rst
|
||||||
srso
|
srso
|
||||||
|
reg-file-data-sampling
|
||||||
|
|||||||
104
Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
Normal file
104
Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
==================================
|
||||||
|
Register File Data Sampling (RFDS)
|
||||||
|
==================================
|
||||||
|
|
||||||
|
Register File Data Sampling (RFDS) is a microarchitectural vulnerability that
|
||||||
|
only affects Intel Atom parts(also branded as E-cores). RFDS may allow
|
||||||
|
a malicious actor to infer data values previously used in floating point
|
||||||
|
registers, vector registers, or integer registers. RFDS does not provide the
|
||||||
|
ability to choose which data is inferred. CVE-2023-28746 is assigned to RFDS.
|
||||||
|
|
||||||
|
Affected Processors
|
||||||
|
===================
|
||||||
|
Below is the list of affected Intel processors [#f1]_:
|
||||||
|
|
||||||
|
=================== ============
|
||||||
|
Common name Family_Model
|
||||||
|
=================== ============
|
||||||
|
ATOM_GOLDMONT 06_5CH
|
||||||
|
ATOM_GOLDMONT_D 06_5FH
|
||||||
|
ATOM_GOLDMONT_PLUS 06_7AH
|
||||||
|
ATOM_TREMONT_D 06_86H
|
||||||
|
ATOM_TREMONT 06_96H
|
||||||
|
ALDERLAKE 06_97H
|
||||||
|
ALDERLAKE_L 06_9AH
|
||||||
|
ATOM_TREMONT_L 06_9CH
|
||||||
|
RAPTORLAKE 06_B7H
|
||||||
|
RAPTORLAKE_P 06_BAH
|
||||||
|
ATOM_GRACEMONT 06_BEH
|
||||||
|
RAPTORLAKE_S 06_BFH
|
||||||
|
=================== ============
|
||||||
|
|
||||||
|
As an exception to this table, Intel Xeon E family parts ALDERLAKE(06_97H) and
|
||||||
|
RAPTORLAKE(06_B7H) codenamed Catlow are not affected. They are reported as
|
||||||
|
vulnerable in Linux because they share the same family/model with an affected
|
||||||
|
part. Unlike their affected counterparts, they do not enumerate RFDS_CLEAR or
|
||||||
|
CPUID.HYBRID. This information could be used to distinguish between the
|
||||||
|
affected and unaffected parts, but it is deemed not worth adding complexity as
|
||||||
|
the reporting is fixed automatically when these parts enumerate RFDS_NO.
|
||||||
|
|
||||||
|
Mitigation
|
||||||
|
==========
|
||||||
|
Intel released a microcode update that enables software to clear sensitive
|
||||||
|
information using the VERW instruction. Like MDS, RFDS deploys the same
|
||||||
|
mitigation strategy to force the CPU to clear the affected buffers before an
|
||||||
|
attacker can extract the secrets. This is achieved by using the otherwise
|
||||||
|
unused and obsolete VERW instruction in combination with a microcode update.
|
||||||
|
The microcode clears the affected CPU buffers when the VERW instruction is
|
||||||
|
executed.
|
||||||
|
|
||||||
|
Mitigation points
|
||||||
|
-----------------
|
||||||
|
VERW is executed by the kernel before returning to user space, and by KVM
|
||||||
|
before VMentry. None of the affected cores support SMT, so VERW is not required
|
||||||
|
at C-state transitions.
|
||||||
|
|
||||||
|
New bits in IA32_ARCH_CAPABILITIES
|
||||||
|
----------------------------------
|
||||||
|
Newer processors and microcode update on existing affected processors added new
|
||||||
|
bits to IA32_ARCH_CAPABILITIES MSR. These bits can be used to enumerate
|
||||||
|
vulnerability and mitigation capability:
|
||||||
|
|
||||||
|
- Bit 27 - RFDS_NO - When set, processor is not affected by RFDS.
|
||||||
|
- Bit 28 - RFDS_CLEAR - When set, processor is affected by RFDS, and has the
|
||||||
|
microcode that clears the affected buffers on VERW execution.
|
||||||
|
|
||||||
|
Mitigation control on the kernel command line
|
||||||
|
---------------------------------------------
|
||||||
|
The kernel command line allows to control RFDS mitigation at boot time with the
|
||||||
|
parameter "reg_file_data_sampling=". The valid arguments are:
|
||||||
|
|
||||||
|
========== =================================================================
|
||||||
|
on If the CPU is vulnerable, enable mitigation; CPU buffer clearing
|
||||||
|
on exit to userspace and before entering a VM.
|
||||||
|
off Disables mitigation.
|
||||||
|
========== =================================================================
|
||||||
|
|
||||||
|
Mitigation default is selected by CONFIG_MITIGATION_RFDS.
|
||||||
|
|
||||||
|
Mitigation status information
|
||||||
|
-----------------------------
|
||||||
|
The Linux kernel provides a sysfs interface to enumerate the current
|
||||||
|
vulnerability status of the system: whether the system is vulnerable, and
|
||||||
|
which mitigations are active. The relevant sysfs file is:
|
||||||
|
|
||||||
|
/sys/devices/system/cpu/vulnerabilities/reg_file_data_sampling
|
||||||
|
|
||||||
|
The possible values in this file are:
|
||||||
|
|
||||||
|
.. list-table::
|
||||||
|
|
||||||
|
* - 'Not affected'
|
||||||
|
- The processor is not vulnerable
|
||||||
|
* - 'Vulnerable'
|
||||||
|
- The processor is vulnerable, but no mitigation enabled
|
||||||
|
* - 'Vulnerable: No microcode'
|
||||||
|
- The processor is vulnerable but microcode is not updated.
|
||||||
|
* - 'Mitigation: Clear Register File'
|
||||||
|
- The processor is vulnerable and the CPU buffer clearing mitigation is
|
||||||
|
enabled.
|
||||||
|
|
||||||
|
References
|
||||||
|
----------
|
||||||
|
.. [#f1] Affected Processors
|
||||||
|
https://www.intel.com/content/www/us/en/developer/topic-technology/software-security-guidance/processors-affected-consolidated-product-cpu-model.html
|
||||||
@@ -484,11 +484,14 @@ Spectre variant 2
|
|||||||
|
|
||||||
Systems which support enhanced IBRS (eIBRS) enable IBRS protection once at
|
Systems which support enhanced IBRS (eIBRS) enable IBRS protection once at
|
||||||
boot, by setting the IBRS bit, and they're automatically protected against
|
boot, by setting the IBRS bit, and they're automatically protected against
|
||||||
Spectre v2 variant attacks, including cross-thread branch target injections
|
Spectre v2 variant attacks.
|
||||||
on SMT systems (STIBP). In other words, eIBRS enables STIBP too.
|
|
||||||
|
|
||||||
Legacy IBRS systems clear the IBRS bit on exit to userspace and
|
On Intel's enhanced IBRS systems, this includes cross-thread branch target
|
||||||
therefore explicitly enable STIBP for that
|
injections on SMT systems (STIBP). In other words, Intel eIBRS enables
|
||||||
|
STIBP, too.
|
||||||
|
|
||||||
|
AMD Automatic IBRS does not protect userspace, and Legacy IBRS systems clear
|
||||||
|
the IBRS bit on exit to userspace, therefore both explicitly enable STIBP.
|
||||||
|
|
||||||
The retpoline mitigation is turned on by default on vulnerable
|
The retpoline mitigation is turned on by default on vulnerable
|
||||||
CPUs. It can be forced on or off by the administrator
|
CPUs. It can be forced on or off by the administrator
|
||||||
@@ -621,9 +624,9 @@ kernel command line.
|
|||||||
retpoline,generic Retpolines
|
retpoline,generic Retpolines
|
||||||
retpoline,lfence LFENCE; indirect branch
|
retpoline,lfence LFENCE; indirect branch
|
||||||
retpoline,amd alias for retpoline,lfence
|
retpoline,amd alias for retpoline,lfence
|
||||||
eibrs enhanced IBRS
|
eibrs Enhanced/Auto IBRS
|
||||||
eibrs,retpoline enhanced IBRS + Retpolines
|
eibrs,retpoline Enhanced/Auto IBRS + Retpolines
|
||||||
eibrs,lfence enhanced IBRS + LFENCE
|
eibrs,lfence Enhanced/Auto IBRS + LFENCE
|
||||||
ibrs use IBRS to protect kernel
|
ibrs use IBRS to protect kernel
|
||||||
|
|
||||||
Not specifying this option is equivalent to
|
Not specifying this option is equivalent to
|
||||||
|
|||||||
@@ -1111,6 +1111,26 @@
|
|||||||
The filter can be disabled or changed to another
|
The filter can be disabled or changed to another
|
||||||
driver later using sysfs.
|
driver later using sysfs.
|
||||||
|
|
||||||
|
reg_file_data_sampling=
|
||||||
|
[X86] Controls mitigation for Register File Data
|
||||||
|
Sampling (RFDS) vulnerability. RFDS is a CPU
|
||||||
|
vulnerability which may allow userspace to infer
|
||||||
|
kernel data values previously stored in floating point
|
||||||
|
registers, vector registers, or integer registers.
|
||||||
|
RFDS only affects Intel Atom processors.
|
||||||
|
|
||||||
|
on: Turns ON the mitigation.
|
||||||
|
off: Turns OFF the mitigation.
|
||||||
|
|
||||||
|
This parameter overrides the compile time default set
|
||||||
|
by CONFIG_MITIGATION_RFDS. Mitigation cannot be
|
||||||
|
disabled when other VERW based mitigations (like MDS)
|
||||||
|
are enabled. In order to disable RFDS mitigation all
|
||||||
|
VERW based mitigations need to be disabled.
|
||||||
|
|
||||||
|
For details see:
|
||||||
|
Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst
|
||||||
|
|
||||||
driver_async_probe= [KNL]
|
driver_async_probe= [KNL]
|
||||||
List of driver names to be probed asynchronously. *
|
List of driver names to be probed asynchronously. *
|
||||||
matches with all driver names. If * is specified, the
|
matches with all driver names. If * is specified, the
|
||||||
@@ -3234,9 +3254,7 @@
|
|||||||
|
|
||||||
mem_encrypt= [X86-64] AMD Secure Memory Encryption (SME) control
|
mem_encrypt= [X86-64] AMD Secure Memory Encryption (SME) control
|
||||||
Valid arguments: on, off
|
Valid arguments: on, off
|
||||||
Default (depends on kernel configuration option):
|
Default: off
|
||||||
on (CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y)
|
|
||||||
off (CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=n)
|
|
||||||
mem_encrypt=on: Activate SME
|
mem_encrypt=on: Activate SME
|
||||||
mem_encrypt=off: Do not activate SME
|
mem_encrypt=off: Do not activate SME
|
||||||
|
|
||||||
@@ -3310,6 +3328,7 @@
|
|||||||
nospectre_bhb [ARM64]
|
nospectre_bhb [ARM64]
|
||||||
nospectre_v1 [X86,PPC]
|
nospectre_v1 [X86,PPC]
|
||||||
nospectre_v2 [X86,PPC,S390,ARM64]
|
nospectre_v2 [X86,PPC,S390,ARM64]
|
||||||
|
reg_file_data_sampling=off [X86]
|
||||||
retbleed=off [X86]
|
retbleed=off [X86]
|
||||||
spec_store_bypass_disable=off [X86,PPC]
|
spec_store_bypass_disable=off [X86,PPC]
|
||||||
spectre_v2_user=off [X86]
|
spectre_v2_user=off [X86]
|
||||||
@@ -5812,9 +5831,9 @@
|
|||||||
retpoline,generic - Retpolines
|
retpoline,generic - Retpolines
|
||||||
retpoline,lfence - LFENCE; indirect branch
|
retpoline,lfence - LFENCE; indirect branch
|
||||||
retpoline,amd - alias for retpoline,lfence
|
retpoline,amd - alias for retpoline,lfence
|
||||||
eibrs - enhanced IBRS
|
eibrs - Enhanced/Auto IBRS
|
||||||
eibrs,retpoline - enhanced IBRS + Retpolines
|
eibrs,retpoline - Enhanced/Auto IBRS + Retpolines
|
||||||
eibrs,lfence - enhanced IBRS + LFENCE
|
eibrs,lfence - Enhanced/Auto IBRS + LFENCE
|
||||||
ibrs - use IBRS to protect kernel
|
ibrs - use IBRS to protect kernel
|
||||||
|
|
||||||
Not specifying this option is equivalent to
|
Not specifying this option is equivalent to
|
||||||
|
|||||||
@@ -221,3 +221,10 @@ stable kernels.
|
|||||||
+----------------+-----------------+-----------------+-----------------------------+
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
| ASR | ASR8601 | #8601001 | N/A |
|
| ASR | ASR8601 | #8601001 | N/A |
|
||||||
+----------------+-----------------+-----------------+-----------------------------+
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
|
| Microsoft | Azure Cobalt 100| #2139208 | ARM64_ERRATUM_2139208 |
|
||||||
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
|
| Microsoft | Azure Cobalt 100| #2067961 | ARM64_ERRATUM_2067961 |
|
||||||
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
|
| Microsoft | Azure Cobalt 100| #2253138 | ARM64_ERRATUM_2253138 |
|
||||||
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
Marvell 8787/8897/8997 (sd8787/sd8897/sd8997/pcie8997) SDIO/PCIE devices
|
Marvell 8787/8897/8978/8997 (sd8787/sd8897/sd8978/sd8997/pcie8997) SDIO/PCIE devices
|
||||||
------
|
------
|
||||||
|
|
||||||
This node provides properties for controlling the Marvell SDIO/PCIE wireless device.
|
This node provides properties for controlling the Marvell SDIO/PCIE wireless device.
|
||||||
@@ -10,7 +10,9 @@ Required properties:
|
|||||||
- compatible : should be one of the following:
|
- compatible : should be one of the following:
|
||||||
* "marvell,sd8787"
|
* "marvell,sd8787"
|
||||||
* "marvell,sd8897"
|
* "marvell,sd8897"
|
||||||
|
* "marvell,sd8978"
|
||||||
* "marvell,sd8997"
|
* "marvell,sd8997"
|
||||||
|
* "nxp,iw416"
|
||||||
* "pci11ab,2b42"
|
* "pci11ab,2b42"
|
||||||
* "pci1b4b,2b42"
|
* "pci1b4b,2b42"
|
||||||
|
|
||||||
|
|||||||
@@ -87,14 +87,14 @@ The state of SME in the Linux kernel can be documented as follows:
|
|||||||
kernel is non-zero).
|
kernel is non-zero).
|
||||||
|
|
||||||
SME can also be enabled and activated in the BIOS. If SME is enabled and
|
SME can also be enabled and activated in the BIOS. If SME is enabled and
|
||||||
activated in the BIOS, then all memory accesses will be encrypted and it will
|
activated in the BIOS, then all memory accesses will be encrypted and it
|
||||||
not be necessary to activate the Linux memory encryption support. If the BIOS
|
will not be necessary to activate the Linux memory encryption support.
|
||||||
merely enables SME (sets bit 23 of the MSR_AMD64_SYSCFG), then Linux can activate
|
|
||||||
memory encryption by default (CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT=y) or
|
If the BIOS merely enables SME (sets bit 23 of the MSR_AMD64_SYSCFG),
|
||||||
by supplying mem_encrypt=on on the kernel command line. However, if BIOS does
|
then memory encryption can be enabled by supplying mem_encrypt=on on the
|
||||||
not enable SME, then Linux will not be able to activate memory encryption, even
|
kernel command line. However, if BIOS does not enable SME, then Linux
|
||||||
if configured to do so by default or the mem_encrypt=on command line parameter
|
will not be able to activate memory encryption, even if configured to do
|
||||||
is specified.
|
so by default or the mem_encrypt=on command line parameter is specified.
|
||||||
|
|
||||||
Secure Nested Paging (SNP)
|
Secure Nested Paging (SNP)
|
||||||
==========================
|
==========================
|
||||||
|
|||||||
@@ -1416,7 +1416,7 @@ execution context provided by the EFI firmware.
|
|||||||
|
|
||||||
The function prototype for the handover entry point looks like this::
|
The function prototype for the handover entry point looks like this::
|
||||||
|
|
||||||
efi_main(void *handle, efi_system_table_t *table, struct boot_params *bp)
|
efi_stub_entry(void *handle, efi_system_table_t *table, struct boot_params *bp)
|
||||||
|
|
||||||
'handle' is the EFI image handle passed to the boot loader by the EFI
|
'handle' is the EFI image handle passed to the boot loader by the EFI
|
||||||
firmware, 'table' is the EFI system table - these are the first two
|
firmware, 'table' is the EFI system table - these are the first two
|
||||||
|
|||||||
@@ -95,6 +95,9 @@ The kernel provides a function to invoke the buffer clearing:
|
|||||||
|
|
||||||
mds_clear_cpu_buffers()
|
mds_clear_cpu_buffers()
|
||||||
|
|
||||||
|
Also macro CLEAR_CPU_BUFFERS can be used in ASM late in exit-to-user path.
|
||||||
|
Other than CFLAGS.ZF, this macro doesn't clobber any registers.
|
||||||
|
|
||||||
The mitigation is invoked on kernel/userspace, hypervisor/guest and C-state
|
The mitigation is invoked on kernel/userspace, hypervisor/guest and C-state
|
||||||
(idle) transitions.
|
(idle) transitions.
|
||||||
|
|
||||||
@@ -138,17 +141,30 @@ Mitigation points
|
|||||||
|
|
||||||
When transitioning from kernel to user space the CPU buffers are flushed
|
When transitioning from kernel to user space the CPU buffers are flushed
|
||||||
on affected CPUs when the mitigation is not disabled on the kernel
|
on affected CPUs when the mitigation is not disabled on the kernel
|
||||||
command line. The migitation is enabled through the static key
|
command line. The mitigation is enabled through the feature flag
|
||||||
mds_user_clear.
|
X86_FEATURE_CLEAR_CPU_BUF.
|
||||||
|
|
||||||
The mitigation is invoked in prepare_exit_to_usermode() which covers
|
The mitigation is invoked just before transitioning to userspace after
|
||||||
all but one of the kernel to user space transitions. The exception
|
user registers are restored. This is done to minimize the window in
|
||||||
is when we return from a Non Maskable Interrupt (NMI), which is
|
which kernel data could be accessed after VERW e.g. via an NMI after
|
||||||
handled directly in do_nmi().
|
VERW.
|
||||||
|
|
||||||
(The reason that NMI is special is that prepare_exit_to_usermode() can
|
**Corner case not handled**
|
||||||
enable IRQs. In NMI context, NMIs are blocked, and we don't want to
|
Interrupts returning to kernel don't clear CPUs buffers since the
|
||||||
enable IRQs with NMIs blocked.)
|
exit-to-user path is expected to do that anyways. But, there could be
|
||||||
|
a case when an NMI is generated in kernel after the exit-to-user path
|
||||||
|
has cleared the buffers. This case is not handled and NMI returning to
|
||||||
|
kernel don't clear CPU buffers because:
|
||||||
|
|
||||||
|
1. It is rare to get an NMI after VERW, but before returning to userspace.
|
||||||
|
2. For an unprivileged user, there is no known way to make that NMI
|
||||||
|
less rare or target it.
|
||||||
|
3. It would take a large number of these precisely-timed NMIs to mount
|
||||||
|
an actual attack. There's presumably not enough bandwidth.
|
||||||
|
4. The NMI in question occurs after a VERW, i.e. when user state is
|
||||||
|
restored and most interesting data is already scrubbed. Whats left
|
||||||
|
is only the data that NMI touches, and that may or may not be of
|
||||||
|
any interest.
|
||||||
|
|
||||||
|
|
||||||
2. C-State transition
|
2. C-State transition
|
||||||
|
|||||||
@@ -10093,6 +10093,7 @@ F: drivers/infiniband/
|
|||||||
F: include/rdma/
|
F: include/rdma/
|
||||||
F: include/trace/events/ib_mad.h
|
F: include/trace/events/ib_mad.h
|
||||||
F: include/trace/events/ib_umad.h
|
F: include/trace/events/ib_umad.h
|
||||||
|
F: include/trace/misc/rdma.h
|
||||||
F: include/uapi/linux/if_infiniband.h
|
F: include/uapi/linux/if_infiniband.h
|
||||||
F: include/uapi/rdma/
|
F: include/uapi/rdma/
|
||||||
F: samples/bpf/ibumad_kern.c
|
F: samples/bpf/ibumad_kern.c
|
||||||
@@ -11181,6 +11182,12 @@ F: fs/nfs_common/
|
|||||||
F: fs/nfsd/
|
F: fs/nfsd/
|
||||||
F: include/linux/lockd/
|
F: include/linux/lockd/
|
||||||
F: include/linux/sunrpc/
|
F: include/linux/sunrpc/
|
||||||
|
F: include/trace/events/rpcgss.h
|
||||||
|
F: include/trace/events/rpcrdma.h
|
||||||
|
F: include/trace/events/sunrpc.h
|
||||||
|
F: include/trace/misc/fs.h
|
||||||
|
F: include/trace/misc/nfs.h
|
||||||
|
F: include/trace/misc/sunrpc.h
|
||||||
F: include/uapi/linux/nfsd/
|
F: include/uapi/linux/nfsd/
|
||||||
F: include/uapi/linux/sunrpc/
|
F: include/uapi/linux/sunrpc/
|
||||||
F: net/sunrpc/
|
F: net/sunrpc/
|
||||||
|
|||||||
8
Makefile
8
Makefile
@@ -1,7 +1,7 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
VERSION = 6
|
VERSION = 6
|
||||||
PATCHLEVEL = 1
|
PATCHLEVEL = 1
|
||||||
SUBLEVEL = 78
|
SUBLEVEL = 84
|
||||||
EXTRAVERSION =
|
EXTRAVERSION =
|
||||||
NAME = Curry Ramen
|
NAME = Curry Ramen
|
||||||
|
|
||||||
@@ -477,8 +477,7 @@ HOSTRUSTC = rustc
|
|||||||
HOSTPKG_CONFIG = pkg-config
|
HOSTPKG_CONFIG = pkg-config
|
||||||
|
|
||||||
KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
|
KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \
|
||||||
-O2 -fomit-frame-pointer -std=gnu11 \
|
-O2 -fomit-frame-pointer -std=gnu11
|
||||||
-Wdeclaration-after-statement
|
|
||||||
KBUILD_USERCFLAGS := $(KBUILD_USERHOSTCFLAGS) $(USERCFLAGS)
|
KBUILD_USERCFLAGS := $(KBUILD_USERHOSTCFLAGS) $(USERCFLAGS)
|
||||||
KBUILD_USERLDFLAGS := $(USERLDFLAGS)
|
KBUILD_USERLDFLAGS := $(USERLDFLAGS)
|
||||||
|
|
||||||
@@ -1046,9 +1045,6 @@ endif
|
|||||||
# arch Makefile may override CC so keep this after arch Makefile is included
|
# arch Makefile may override CC so keep this after arch Makefile is included
|
||||||
NOSTDINC_FLAGS += -nostdinc
|
NOSTDINC_FLAGS += -nostdinc
|
||||||
|
|
||||||
# warn about C99 declaration after statement
|
|
||||||
KBUILD_CFLAGS += -Wdeclaration-after-statement
|
|
||||||
|
|
||||||
# Variable Length Arrays (VLAs) should not be used anywhere in the kernel
|
# Variable Length Arrays (VLAs) should not be used anywhere in the kernel
|
||||||
KBUILD_CFLAGS += -Wvla
|
KBUILD_CFLAGS += -Wvla
|
||||||
|
|
||||||
|
|||||||
@@ -87186,10 +87186,10 @@ member {
|
|||||||
offset: 58176
|
offset: 58176
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0x58d13e53
|
id: 0x58d13a5a
|
||||||
name: "ext_cb"
|
name: "ext_cb"
|
||||||
type_id: 0x3fefb42f
|
type_id: 0x3fefb42f
|
||||||
offset: 1728
|
offset: 1664
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0x50922243
|
id: 0x50922243
|
||||||
@@ -95689,10 +95689,10 @@ member {
|
|||||||
offset: 448
|
offset: 448
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0xabba6f98
|
id: 0xabba6185
|
||||||
name: "full_waiters_pending"
|
name: "full_waiters_pending"
|
||||||
type_id: 0x6d7f5ff6
|
type_id: 0x6d7f5ff6
|
||||||
offset: 712
|
offset: 648
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0xf667dcee
|
id: 0xf667dcee
|
||||||
@@ -194116,10 +194116,10 @@ member {
|
|||||||
type_id: 0x92233392
|
type_id: 0x92233392
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0xfeab2cc0
|
id: 0xfeab2654
|
||||||
name: "time_stamp_abs"
|
name: "time_stamp_abs"
|
||||||
type_id: 0x6d7f5ff6
|
type_id: 0x6d7f5ff6
|
||||||
offset: 1664
|
offset: 1600
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0xd43e1787
|
id: 0xd43e1787
|
||||||
@@ -208154,12 +208154,6 @@ member {
|
|||||||
type_id: 0x74d29cf1
|
type_id: 0x74d29cf1
|
||||||
offset: 2880
|
offset: 2880
|
||||||
}
|
}
|
||||||
member {
|
|
||||||
id: 0x7ab3f5b1
|
|
||||||
name: "wait_index"
|
|
||||||
type_id: 0xfc0e1dbd
|
|
||||||
offset: 640
|
|
||||||
}
|
|
||||||
member {
|
member {
|
||||||
id: 0x7ab3febe
|
id: 0x7ab3febe
|
||||||
name: "wait_index"
|
name: "wait_index"
|
||||||
@@ -208315,10 +208309,10 @@ member {
|
|||||||
offset: 256
|
offset: 256
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0xc133acab
|
id: 0xc133a8ef
|
||||||
name: "waiters_pending"
|
name: "waiters_pending"
|
||||||
type_id: 0x6d7f5ff6
|
type_id: 0x6d7f5ff6
|
||||||
offset: 704
|
offset: 640
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0x3e50f6f4
|
id: 0x3e50f6f4
|
||||||
@@ -208599,10 +208593,10 @@ member {
|
|||||||
type_id: 0xe62ebf07
|
type_id: 0xe62ebf07
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0x3766071b
|
id: 0x37660e3b
|
||||||
name: "wakeup_full"
|
name: "wakeup_full"
|
||||||
type_id: 0x6d7f5ff6
|
type_id: 0x6d7f5ff6
|
||||||
offset: 720
|
offset: 656
|
||||||
}
|
}
|
||||||
member {
|
member {
|
||||||
id: 0xf5741316
|
id: 0xf5741316
|
||||||
@@ -253693,14 +253687,13 @@ struct_union {
|
|||||||
kind: STRUCT
|
kind: STRUCT
|
||||||
name: "rb_irq_work"
|
name: "rb_irq_work"
|
||||||
definition {
|
definition {
|
||||||
bytesize: 96
|
bytesize: 88
|
||||||
member_id: 0xd64000c8
|
member_id: 0xd64000c8
|
||||||
member_id: 0x939cab56
|
member_id: 0x939cab56
|
||||||
member_id: 0x7f337099
|
member_id: 0x7f337099
|
||||||
member_id: 0x7ab3f5b1
|
member_id: 0xc133a8ef
|
||||||
member_id: 0xc133acab
|
member_id: 0xabba6185
|
||||||
member_id: 0xabba6f98
|
member_id: 0x37660e3b
|
||||||
member_id: 0x3766071b
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
struct_union {
|
struct_union {
|
||||||
@@ -255339,7 +255332,7 @@ struct_union {
|
|||||||
kind: STRUCT
|
kind: STRUCT
|
||||||
name: "ring_buffer_per_cpu"
|
name: "ring_buffer_per_cpu"
|
||||||
definition {
|
definition {
|
||||||
bytesize: 496
|
bytesize: 488
|
||||||
member_id: 0x5161b0e6
|
member_id: 0x5161b0e6
|
||||||
member_id: 0x9fc7ddba
|
member_id: 0x9fc7ddba
|
||||||
member_id: 0xd712613b
|
member_id: 0xd712613b
|
||||||
@@ -264827,7 +264820,7 @@ struct_union {
|
|||||||
kind: STRUCT
|
kind: STRUCT
|
||||||
name: "trace_buffer"
|
name: "trace_buffer"
|
||||||
definition {
|
definition {
|
||||||
bytesize: 224
|
bytesize: 216
|
||||||
member_id: 0x2d2d0138
|
member_id: 0x2d2d0138
|
||||||
member_id: 0xe7102ce7
|
member_id: 0xe7102ce7
|
||||||
member_id: 0x9fc7d460
|
member_id: 0x9fc7d460
|
||||||
@@ -264839,8 +264832,8 @@ struct_union {
|
|||||||
member_id: 0x0f3caba2
|
member_id: 0x0f3caba2
|
||||||
member_id: 0x45d166c5
|
member_id: 0x45d166c5
|
||||||
member_id: 0xedbbc0ae
|
member_id: 0xedbbc0ae
|
||||||
member_id: 0xfeab2cc0
|
member_id: 0xfeab2654
|
||||||
member_id: 0x58d13e53
|
member_id: 0x58d13a5a
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
struct_union {
|
struct_union {
|
||||||
@@ -364096,6 +364089,15 @@ elf_symbol {
|
|||||||
type_id: 0x9d27e158
|
type_id: 0x9d27e158
|
||||||
full_name: "dma_map_sgtable"
|
full_name: "dma_map_sgtable"
|
||||||
}
|
}
|
||||||
|
elf_symbol {
|
||||||
|
id: 0xfd190cc3
|
||||||
|
name: "dma_max_mapping_size"
|
||||||
|
is_defined: true
|
||||||
|
symbol_type: FUNCTION
|
||||||
|
crc: 0x4e003fd4
|
||||||
|
type_id: 0x97a9f709
|
||||||
|
full_name: "dma_max_mapping_size"
|
||||||
|
}
|
||||||
elf_symbol {
|
elf_symbol {
|
||||||
id: 0xd140139f
|
id: 0xd140139f
|
||||||
name: "dma_mmap_attrs"
|
name: "dma_mmap_attrs"
|
||||||
@@ -414060,6 +414062,7 @@ interface {
|
|||||||
symbol_id: 0x18b0baef
|
symbol_id: 0x18b0baef
|
||||||
symbol_id: 0x13f645c1
|
symbol_id: 0x13f645c1
|
||||||
symbol_id: 0xb989e3a2
|
symbol_id: 0xb989e3a2
|
||||||
|
symbol_id: 0xfd190cc3
|
||||||
symbol_id: 0xd140139f
|
symbol_id: 0xd140139f
|
||||||
symbol_id: 0x009463a5
|
symbol_id: 0x009463a5
|
||||||
symbol_id: 0x843aec6c
|
symbol_id: 0x843aec6c
|
||||||
|
|||||||
@@ -565,6 +565,7 @@
|
|||||||
pm_runtime_forbid
|
pm_runtime_forbid
|
||||||
pm_runtime_force_resume
|
pm_runtime_force_resume
|
||||||
pm_runtime_force_suspend
|
pm_runtime_force_suspend
|
||||||
|
pm_runtime_get_if_active
|
||||||
__pm_runtime_idle
|
__pm_runtime_idle
|
||||||
__pm_runtime_resume
|
__pm_runtime_resume
|
||||||
pm_runtime_set_autosuspend_delay
|
pm_runtime_set_autosuspend_delay
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
bpf_trace_run4
|
bpf_trace_run4
|
||||||
bpf_trace_run5
|
bpf_trace_run5
|
||||||
bpf_trace_run6
|
bpf_trace_run6
|
||||||
|
blk_mq_freeze_queue
|
||||||
|
blk_mq_unfreeze_queue
|
||||||
bt_err
|
bt_err
|
||||||
bt_info
|
bt_info
|
||||||
bt_warn
|
bt_warn
|
||||||
@@ -87,6 +89,7 @@
|
|||||||
dma_fence_signal_locked
|
dma_fence_signal_locked
|
||||||
dma_free_attrs
|
dma_free_attrs
|
||||||
dmam_alloc_attrs
|
dmam_alloc_attrs
|
||||||
|
dma_max_mapping_size
|
||||||
dma_set_coherent_mask
|
dma_set_coherent_mask
|
||||||
dma_set_mask
|
dma_set_mask
|
||||||
dma_sync_sg_for_device
|
dma_sync_sg_for_device
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ hci_alloc_dev_priv
|
|||||||
hci_cmd_sync
|
hci_cmd_sync
|
||||||
hci_cmd_sync_cancel
|
hci_cmd_sync_cancel
|
||||||
hci_cmd_sync_queue
|
hci_cmd_sync_queue
|
||||||
|
hci_cmd_sync_submit
|
||||||
hci_conn_check_secure
|
hci_conn_check_secure
|
||||||
hci_conn_security
|
hci_conn_security
|
||||||
hci_conn_switch_role
|
hci_conn_switch_role
|
||||||
|
|||||||
@@ -642,6 +642,7 @@ config SHADOW_CALL_STACK
|
|||||||
bool "Shadow Call Stack"
|
bool "Shadow Call Stack"
|
||||||
depends on ARCH_SUPPORTS_SHADOW_CALL_STACK
|
depends on ARCH_SUPPORTS_SHADOW_CALL_STACK
|
||||||
depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
|
depends on DYNAMIC_FTRACE_WITH_ARGS || DYNAMIC_FTRACE_WITH_REGS || !FUNCTION_GRAPH_TRACER
|
||||||
|
depends on MMU
|
||||||
help
|
help
|
||||||
This option enables the compiler's Shadow Call Stack, which
|
This option enables the compiler's Shadow Call Stack, which
|
||||||
uses a shadow stack to protect function return addresses from
|
uses a shadow stack to protect function return addresses from
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
static __always_inline bool arch_static_branch(struct static_key *key,
|
static __always_inline bool arch_static_branch(struct static_key *key,
|
||||||
bool branch)
|
bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
|
asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
|
||||||
"1: \n"
|
"1: \n"
|
||||||
"nop \n"
|
"nop \n"
|
||||||
".pushsection __jump_table, \"aw\" \n"
|
".pushsection __jump_table, \"aw\" \n"
|
||||||
@@ -47,7 +47,7 @@ l_yes:
|
|||||||
static __always_inline bool arch_static_branch_jump(struct static_key *key,
|
static __always_inline bool arch_static_branch_jump(struct static_key *key,
|
||||||
bool branch)
|
bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
|
asm goto(".balign "__stringify(JUMP_LABEL_NOP_SIZE)" \n"
|
||||||
"1: \n"
|
"1: \n"
|
||||||
"b %l[l_yes] \n"
|
"b %l[l_yes] \n"
|
||||||
".pushsection __jump_table, \"aw\" \n"
|
".pushsection __jump_table, \"aw\" \n"
|
||||||
|
|||||||
@@ -451,7 +451,7 @@
|
|||||||
|
|
||||||
/* Direct-mapped development chip ROM */
|
/* Direct-mapped development chip ROM */
|
||||||
pb1176_rom@10200000 {
|
pb1176_rom@10200000 {
|
||||||
compatible = "direct-mapped";
|
compatible = "mtd-rom";
|
||||||
reg = <0x10200000 0x4000>;
|
reg = <0x10200000 0x4000>;
|
||||||
bank-width = <1>;
|
bank-width = <1>;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
reg = <0x80000000 0x2000>;
|
reg = <0x80000000 0x2000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
dma_apbh: dma-apbh@80004000 {
|
dma_apbh: dma-controller@80004000 {
|
||||||
compatible = "fsl,imx23-dma-apbh";
|
compatible = "fsl,imx23-dma-apbh";
|
||||||
reg = <0x80004000 0x2000>;
|
reg = <0x80004000 0x2000>;
|
||||||
interrupts = <0 14 20 0
|
interrupts = <0 14 20 0
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
dma_apbh: dma-apbh@80004000 {
|
dma_apbh: dma-controller@80004000 {
|
||||||
compatible = "fsl,imx28-dma-apbh";
|
compatible = "fsl,imx28-dma-apbh";
|
||||||
reg = <0x80004000 0x2000>;
|
reg = <0x80004000 0x2000>;
|
||||||
interrupts = <82 83 84 85
|
interrupts = <82 83 84 85
|
||||||
|
|||||||
@@ -106,8 +106,6 @@
|
|||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pinctrl_enet>;
|
pinctrl-0 = <&pinctrl_enet>;
|
||||||
phy-mode = "rgmii-id";
|
phy-mode = "rgmii-id";
|
||||||
phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
|
|
||||||
phy-reset-duration = <20>;
|
|
||||||
phy-supply = <&sw2_reg>;
|
phy-supply = <&sw2_reg>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
@@ -120,17 +118,10 @@
|
|||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|
||||||
phy_port2: phy@1 {
|
|
||||||
reg = <1>;
|
|
||||||
};
|
|
||||||
|
|
||||||
phy_port3: phy@2 {
|
|
||||||
reg = <2>;
|
|
||||||
};
|
|
||||||
|
|
||||||
switch@10 {
|
switch@10 {
|
||||||
compatible = "qca,qca8334";
|
compatible = "qca,qca8334";
|
||||||
reg = <10>;
|
reg = <0x10>;
|
||||||
|
reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
|
||||||
|
|
||||||
switch_ports: ports {
|
switch_ports: ports {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
@@ -151,15 +142,30 @@
|
|||||||
eth2: port@2 {
|
eth2: port@2 {
|
||||||
reg = <2>;
|
reg = <2>;
|
||||||
label = "eth2";
|
label = "eth2";
|
||||||
|
phy-mode = "internal";
|
||||||
phy-handle = <&phy_port2>;
|
phy-handle = <&phy_port2>;
|
||||||
};
|
};
|
||||||
|
|
||||||
eth1: port@3 {
|
eth1: port@3 {
|
||||||
reg = <3>;
|
reg = <3>;
|
||||||
label = "eth1";
|
label = "eth1";
|
||||||
|
phy-mode = "internal";
|
||||||
phy-handle = <&phy_port3>;
|
phy-handle = <&phy_port3>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
mdio {
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <0>;
|
||||||
|
|
||||||
|
phy_port2: ethernet-phy@1 {
|
||||||
|
reg = <1>;
|
||||||
|
};
|
||||||
|
|
||||||
|
phy_port3: ethernet-phy@2 {
|
||||||
|
reg = <2>;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -76,6 +76,7 @@
|
|||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pinctrl_enable_can1_power>;
|
pinctrl-0 = <&pinctrl_enable_can1_power>;
|
||||||
regulator-name = "can1_supply";
|
regulator-name = "can1_supply";
|
||||||
|
startup-delay-us = <1000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
reg_can2_supply: regulator-can2-supply {
|
reg_can2_supply: regulator-can2-supply {
|
||||||
@@ -85,6 +86,7 @@
|
|||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pinctrl_enable_can2_power>;
|
pinctrl-0 = <&pinctrl_enable_can2_power>;
|
||||||
regulator-name = "can2_supply";
|
regulator-name = "can2_supply";
|
||||||
|
startup-delay-us = <1000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -150,7 +150,7 @@
|
|||||||
interrupt-parent = <&gpc>;
|
interrupt-parent = <&gpc>;
|
||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
dma_apbh: dma-apbh@110000 {
|
dma_apbh: dma-controller@110000 {
|
||||||
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
|
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
|
||||||
reg = <0x00110000 0x2000>;
|
reg = <0x00110000 0x2000>;
|
||||||
interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
|||||||
@@ -209,7 +209,7 @@
|
|||||||
power-domains = <&pd_pu>;
|
power-domains = <&pd_pu>;
|
||||||
};
|
};
|
||||||
|
|
||||||
dma_apbh: dma-apbh@1804000 {
|
dma_apbh: dma-controller@1804000 {
|
||||||
compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";
|
compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";
|
||||||
reg = <0x01804000 0x2000>;
|
reg = <0x01804000 0x2000>;
|
||||||
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
|||||||
@@ -164,7 +164,7 @@
|
|||||||
<0x00a06000 0x2000>;
|
<0x00a06000 0x2000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
dma_apbh: dma-apbh@1804000 {
|
dma_apbh: dma-controller@1804000 {
|
||||||
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
|
compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
|
||||||
reg = <0x01804000 0x2000>;
|
reg = <0x01804000 0x2000>;
|
||||||
interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
|||||||
@@ -1267,14 +1267,13 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
dma_apbh: dma-apbh@33000000 {
|
dma_apbh: dma-controller@33000000 {
|
||||||
compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh";
|
compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh";
|
||||||
reg = <0x33000000 0x2000>;
|
reg = <0x33000000 0x2000>;
|
||||||
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3";
|
|
||||||
#dma-cells = <1>;
|
#dma-cells = <1>;
|
||||||
dma-channels = <4>;
|
dma-channels = <4>;
|
||||||
clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>;
|
clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>;
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
&twsi1 {
|
&twsi1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
pmic: max8925@3c {
|
pmic: max8925@3c {
|
||||||
compatible = "maxium,max8925";
|
compatible = "maxim,max8925";
|
||||||
reg = <0x3c>;
|
reg = <0x3c>;
|
||||||
interrupts = <1>;
|
interrupts = <1>;
|
||||||
interrupt-parent = <&intcmux4>;
|
interrupt-parent = <&intcmux4>;
|
||||||
|
|||||||
@@ -1134,7 +1134,7 @@
|
|||||||
|
|
||||||
qfprom: qfprom@fc4bc000 {
|
qfprom: qfprom@fc4bc000 {
|
||||||
compatible = "qcom,msm8974-qfprom", "qcom,qfprom";
|
compatible = "qcom,msm8974-qfprom", "qcom,qfprom";
|
||||||
reg = <0xfc4bc000 0x1000>;
|
reg = <0xfc4bc000 0x2100>;
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
tsens_calib: calib@d0 {
|
tsens_calib: calib@d0 {
|
||||||
|
|||||||
@@ -209,6 +209,18 @@
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&extal1_clk {
|
||||||
|
clock-frequency = <26000000>;
|
||||||
|
};
|
||||||
|
|
||||||
|
&extal2_clk {
|
||||||
|
clock-frequency = <48000000>;
|
||||||
|
};
|
||||||
|
|
||||||
|
&extalr_clk {
|
||||||
|
clock-frequency = <32768>;
|
||||||
|
};
|
||||||
|
|
||||||
&pfc {
|
&pfc {
|
||||||
scifa0_pins: scifa0 {
|
scifa0_pins: scifa0 {
|
||||||
groups = "scifa0_data";
|
groups = "scifa0_data";
|
||||||
|
|||||||
@@ -450,17 +450,20 @@
|
|||||||
extalr_clk: extalr {
|
extalr_clk: extalr {
|
||||||
compatible = "fixed-clock";
|
compatible = "fixed-clock";
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <32768>;
|
/* This value must be overridden by the board. */
|
||||||
|
clock-frequency = <0>;
|
||||||
};
|
};
|
||||||
extal1_clk: extal1 {
|
extal1_clk: extal1 {
|
||||||
compatible = "fixed-clock";
|
compatible = "fixed-clock";
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <25000000>;
|
/* This value must be overridden by the board. */
|
||||||
|
clock-frequency = <0>;
|
||||||
};
|
};
|
||||||
extal2_clk: extal2 {
|
extal2_clk: extal2 {
|
||||||
compatible = "fixed-clock";
|
compatible = "fixed-clock";
|
||||||
#clock-cells = <0>;
|
#clock-cells = <0>;
|
||||||
clock-frequency = <48000000>;
|
/* This value must be overridden by the board. */
|
||||||
|
clock-frequency = <0>;
|
||||||
};
|
};
|
||||||
fsiack_clk: fsiack {
|
fsiack_clk: fsiack {
|
||||||
compatible = "fixed-clock";
|
compatible = "fixed-clock";
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
|
|
||||||
#include "sha256_glue.h"
|
#include "sha256_glue.h"
|
||||||
|
|
||||||
asmlinkage void sha256_block_data_order(u32 *digest, const void *data,
|
asmlinkage void sha256_block_data_order(struct sha256_state *state,
|
||||||
unsigned int num_blks);
|
const u8 *data, int num_blks);
|
||||||
|
|
||||||
int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data,
|
int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data,
|
||||||
unsigned int len)
|
unsigned int len)
|
||||||
@@ -33,23 +33,20 @@ int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data,
|
|||||||
/* make sure casting to sha256_block_fn() is safe */
|
/* make sure casting to sha256_block_fn() is safe */
|
||||||
BUILD_BUG_ON(offsetof(struct sha256_state, state) != 0);
|
BUILD_BUG_ON(offsetof(struct sha256_state, state) != 0);
|
||||||
|
|
||||||
return sha256_base_do_update(desc, data, len,
|
return sha256_base_do_update(desc, data, len, sha256_block_data_order);
|
||||||
(sha256_block_fn *)sha256_block_data_order);
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(crypto_sha256_arm_update);
|
EXPORT_SYMBOL(crypto_sha256_arm_update);
|
||||||
|
|
||||||
static int crypto_sha256_arm_final(struct shash_desc *desc, u8 *out)
|
static int crypto_sha256_arm_final(struct shash_desc *desc, u8 *out)
|
||||||
{
|
{
|
||||||
sha256_base_do_finalize(desc,
|
sha256_base_do_finalize(desc, sha256_block_data_order);
|
||||||
(sha256_block_fn *)sha256_block_data_order);
|
|
||||||
return sha256_base_finish(desc, out);
|
return sha256_base_finish(desc, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
int crypto_sha256_arm_finup(struct shash_desc *desc, const u8 *data,
|
int crypto_sha256_arm_finup(struct shash_desc *desc, const u8 *data,
|
||||||
unsigned int len, u8 *out)
|
unsigned int len, u8 *out)
|
||||||
{
|
{
|
||||||
sha256_base_do_update(desc, data, len,
|
sha256_base_do_update(desc, data, len, sha256_block_data_order);
|
||||||
(sha256_block_fn *)sha256_block_data_order);
|
|
||||||
return crypto_sha256_arm_final(desc, out);
|
return crypto_sha256_arm_final(desc, out);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(crypto_sha256_arm_finup);
|
EXPORT_SYMBOL(crypto_sha256_arm_finup);
|
||||||
|
|||||||
@@ -25,27 +25,25 @@ MODULE_ALIAS_CRYPTO("sha512");
|
|||||||
MODULE_ALIAS_CRYPTO("sha384-arm");
|
MODULE_ALIAS_CRYPTO("sha384-arm");
|
||||||
MODULE_ALIAS_CRYPTO("sha512-arm");
|
MODULE_ALIAS_CRYPTO("sha512-arm");
|
||||||
|
|
||||||
asmlinkage void sha512_block_data_order(u64 *state, u8 const *src, int blocks);
|
asmlinkage void sha512_block_data_order(struct sha512_state *state,
|
||||||
|
u8 const *src, int blocks);
|
||||||
|
|
||||||
int sha512_arm_update(struct shash_desc *desc, const u8 *data,
|
int sha512_arm_update(struct shash_desc *desc, const u8 *data,
|
||||||
unsigned int len)
|
unsigned int len)
|
||||||
{
|
{
|
||||||
return sha512_base_do_update(desc, data, len,
|
return sha512_base_do_update(desc, data, len, sha512_block_data_order);
|
||||||
(sha512_block_fn *)sha512_block_data_order);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sha512_arm_final(struct shash_desc *desc, u8 *out)
|
static int sha512_arm_final(struct shash_desc *desc, u8 *out)
|
||||||
{
|
{
|
||||||
sha512_base_do_finalize(desc,
|
sha512_base_do_finalize(desc, sha512_block_data_order);
|
||||||
(sha512_block_fn *)sha512_block_data_order);
|
|
||||||
return sha512_base_finish(desc, out);
|
return sha512_base_finish(desc, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
int sha512_arm_finup(struct shash_desc *desc, const u8 *data,
|
int sha512_arm_finup(struct shash_desc *desc, const u8 *data,
|
||||||
unsigned int len, u8 *out)
|
unsigned int len, u8 *out)
|
||||||
{
|
{
|
||||||
sha512_base_do_update(desc, data, len,
|
sha512_base_do_update(desc, data, len, sha512_block_data_order);
|
||||||
(sha512_block_fn *)sha512_block_data_order);
|
|
||||||
return sha512_arm_final(desc, out);
|
return sha512_arm_final(desc, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
|
static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto("1:\n\t"
|
asm goto("1:\n\t"
|
||||||
WASM(nop) "\n\t"
|
WASM(nop) "\n\t"
|
||||||
".pushsection __jump_table, \"aw\"\n\t"
|
".pushsection __jump_table, \"aw\"\n\t"
|
||||||
".word 1b, %l[l_yes], %c0\n\t"
|
".word 1b, %l[l_yes], %c0\n\t"
|
||||||
@@ -25,7 +25,7 @@ l_yes:
|
|||||||
|
|
||||||
static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
|
static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto("1:\n\t"
|
asm goto("1:\n\t"
|
||||||
WASM(b) " %l[l_yes]\n\t"
|
WASM(b) " %l[l_yes]\n\t"
|
||||||
".pushsection __jump_table, \"aw\"\n\t"
|
".pushsection __jump_table, \"aw\"\n\t"
|
||||||
".word 1b, %l[l_yes], %c0\n\t"
|
".word 1b, %l[l_yes], %c0\n\t"
|
||||||
|
|||||||
@@ -339,6 +339,7 @@ static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = {
|
|||||||
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
|
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
|
||||||
GPIO_LOOKUP_IDX("G", 0, NULL, 1,
|
GPIO_LOOKUP_IDX("G", 0, NULL, 1,
|
||||||
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
|
GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),
|
||||||
|
{ }
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -291,6 +291,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&spdif {
|
&spdif {
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&spdif_tx_pin>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -166,6 +166,8 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&spdif {
|
&spdif {
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&spdif_tx_pin>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -406,6 +406,7 @@
|
|||||||
function = "spi1";
|
function = "spi1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/omit-if-no-ref/
|
||||||
spdif_tx_pin: spdif-tx-pin {
|
spdif_tx_pin: spdif-tx-pin {
|
||||||
pins = "PH7";
|
pins = "PH7";
|
||||||
function = "spdif";
|
function = "spdif";
|
||||||
@@ -655,10 +656,8 @@
|
|||||||
clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>;
|
clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>;
|
||||||
clock-names = "apb", "spdif";
|
clock-names = "apb", "spdif";
|
||||||
resets = <&ccu RST_BUS_SPDIF>;
|
resets = <&ccu RST_BUS_SPDIF>;
|
||||||
dmas = <&dma 2>;
|
dmas = <&dma 2>, <&dma 2>;
|
||||||
dma-names = "tx";
|
dma-names = "rx", "tx";
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&spdif_tx_pin>;
|
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,6 @@
|
|||||||
msix: msix@fbe00000 {
|
msix: msix@fbe00000 {
|
||||||
compatible = "al,alpine-msix";
|
compatible = "al,alpine-msix";
|
||||||
reg = <0x0 0xfbe00000 0x0 0x100000>;
|
reg = <0x0 0xfbe00000 0x0 0x100000>;
|
||||||
interrupt-controller;
|
|
||||||
msi-controller;
|
msi-controller;
|
||||||
al,msi-base-spi = <160>;
|
al,msi-base-spi = <160>;
|
||||||
al,msi-num-spis = <160>;
|
al,msi-num-spis = <160>;
|
||||||
|
|||||||
@@ -351,7 +351,6 @@
|
|||||||
msix: msix@fbe00000 {
|
msix: msix@fbe00000 {
|
||||||
compatible = "al,alpine-msix";
|
compatible = "al,alpine-msix";
|
||||||
reg = <0x0 0xfbe00000 0x0 0x100000>;
|
reg = <0x0 0xfbe00000 0x0 0x100000>;
|
||||||
interrupt-controller;
|
|
||||||
msi-controller;
|
msi-controller;
|
||||||
al,msi-base-spi = <336>;
|
al,msi-base-spi = <336>;
|
||||||
al,msi-num-spis = <959>;
|
al,msi-num-spis = <959>;
|
||||||
|
|||||||
@@ -180,9 +180,6 @@
|
|||||||
brcm,num-gphy = <5>;
|
brcm,num-gphy = <5>;
|
||||||
brcm,num-rgmii-ports = <2>;
|
brcm,num-rgmii-ports = <2>;
|
||||||
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
ports: ports {
|
ports: ports {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|||||||
@@ -584,6 +584,7 @@
|
|||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
gpio-controller;
|
gpio-controller;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
#interrupt-cells = <2>;
|
||||||
interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -442,6 +442,7 @@
|
|||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
gpio-controller;
|
gpio-controller;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
#interrupt-cells = <2>;
|
||||||
interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
gpio-ranges = <&pinmux 0 0 16>,
|
gpio-ranges = <&pinmux 0 0 16>,
|
||||||
<&pinmux 16 71 2>,
|
<&pinmux 16 71 2>,
|
||||||
|
|||||||
@@ -294,8 +294,8 @@
|
|||||||
|
|
||||||
pinctrl_i2c4: i2c4grp {
|
pinctrl_i2c4: i2c4grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x400001c3
|
MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x40000083
|
||||||
MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x400001c3
|
MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x40000083
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -313,19 +313,19 @@
|
|||||||
|
|
||||||
pinctrl_uart1: uart1grp {
|
pinctrl_uart1: uart1grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SAI2_RXC_UART1_DCE_RX 0x140
|
MX8MM_IOMUXC_SAI2_RXC_UART1_DCE_RX 0x0
|
||||||
MX8MM_IOMUXC_SAI2_RXFS_UART1_DCE_TX 0x140
|
MX8MM_IOMUXC_SAI2_RXFS_UART1_DCE_TX 0x0
|
||||||
MX8MM_IOMUXC_SAI2_RXD0_UART1_DCE_RTS_B 0x140
|
MX8MM_IOMUXC_SAI2_RXD0_UART1_DCE_RTS_B 0x0
|
||||||
MX8MM_IOMUXC_SAI2_TXFS_UART1_DCE_CTS_B 0x140
|
MX8MM_IOMUXC_SAI2_TXFS_UART1_DCE_CTS_B 0x0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_uart2: uart2grp {
|
pinctrl_uart2: uart2grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SAI3_TXFS_UART2_DCE_RX 0x140
|
MX8MM_IOMUXC_SAI3_TXFS_UART2_DCE_RX 0x0
|
||||||
MX8MM_IOMUXC_SAI3_TXC_UART2_DCE_TX 0x140
|
MX8MM_IOMUXC_SAI3_TXC_UART2_DCE_TX 0x0
|
||||||
MX8MM_IOMUXC_SAI3_RXD_UART2_DCE_RTS_B 0x140
|
MX8MM_IOMUXC_SAI3_RXD_UART2_DCE_RTS_B 0x0
|
||||||
MX8MM_IOMUXC_SAI3_RXC_UART2_DCE_CTS_B 0x140
|
MX8MM_IOMUXC_SAI3_RXC_UART2_DCE_CTS_B 0x0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -337,40 +337,40 @@
|
|||||||
|
|
||||||
pinctrl_usdhc2: usdhc2grp {
|
pinctrl_usdhc2: usdhc2grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x190
|
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x90
|
||||||
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d0
|
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d0
|
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d0
|
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0
|
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0
|
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019
|
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19
|
||||||
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0
|
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
|
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x194
|
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x94
|
||||||
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d4
|
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d4
|
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d4
|
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4
|
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4
|
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019
|
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19
|
||||||
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0
|
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
|
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x196
|
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x96
|
||||||
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d6
|
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d6
|
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d6
|
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6
|
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6
|
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019
|
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19
|
||||||
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0
|
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -277,8 +277,8 @@
|
|||||||
|
|
||||||
pinctrl_i2c4: i2c4grp {
|
pinctrl_i2c4: i2c4grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x400001c3
|
MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x40000083
|
||||||
MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x400001c3
|
MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x40000083
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -290,19 +290,19 @@
|
|||||||
|
|
||||||
pinctrl_uart1: uart1grp {
|
pinctrl_uart1: uart1grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SAI2_RXC_UART1_DCE_RX 0x140
|
MX8MM_IOMUXC_SAI2_RXC_UART1_DCE_RX 0x0
|
||||||
MX8MM_IOMUXC_SAI2_RXFS_UART1_DCE_TX 0x140
|
MX8MM_IOMUXC_SAI2_RXFS_UART1_DCE_TX 0x0
|
||||||
MX8MM_IOMUXC_SAI2_RXD0_UART1_DCE_RTS_B 0x140
|
MX8MM_IOMUXC_SAI2_RXD0_UART1_DCE_RTS_B 0x0
|
||||||
MX8MM_IOMUXC_SAI2_TXFS_UART1_DCE_CTS_B 0x140
|
MX8MM_IOMUXC_SAI2_TXFS_UART1_DCE_CTS_B 0x0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_uart2: uart2grp {
|
pinctrl_uart2: uart2grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SAI3_TXFS_UART2_DCE_RX 0x140
|
MX8MM_IOMUXC_SAI3_TXFS_UART2_DCE_RX 0x0
|
||||||
MX8MM_IOMUXC_SAI3_TXC_UART2_DCE_TX 0x140
|
MX8MM_IOMUXC_SAI3_TXC_UART2_DCE_TX 0x0
|
||||||
MX8MM_IOMUXC_SAI3_RXD_UART2_DCE_RTS_B 0x140
|
MX8MM_IOMUXC_SAI3_RXD_UART2_DCE_RTS_B 0x0
|
||||||
MX8MM_IOMUXC_SAI3_RXC_UART2_DCE_CTS_B 0x140
|
MX8MM_IOMUXC_SAI3_RXC_UART2_DCE_CTS_B 0x0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -314,40 +314,40 @@
|
|||||||
|
|
||||||
pinctrl_usdhc2: usdhc2grp {
|
pinctrl_usdhc2: usdhc2grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x190
|
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x90
|
||||||
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d0
|
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d0
|
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d0
|
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0
|
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0
|
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d0
|
||||||
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019
|
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19
|
||||||
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0
|
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
|
pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x194
|
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x94
|
||||||
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d4
|
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d4
|
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d4
|
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4
|
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4
|
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d4
|
||||||
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019
|
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19
|
||||||
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0
|
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
|
pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x196
|
MX8MM_IOMUXC_SD2_CLK_USDHC2_CLK 0x96
|
||||||
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d6
|
MX8MM_IOMUXC_SD2_CMD_USDHC2_CMD 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d6
|
MX8MM_IOMUXC_SD2_DATA0_USDHC2_DATA0 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d6
|
MX8MM_IOMUXC_SD2_DATA1_USDHC2_DATA1 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6
|
MX8MM_IOMUXC_SD2_DATA2_USDHC2_DATA2 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6
|
MX8MM_IOMUXC_SD2_DATA3_USDHC2_DATA3 0x1d6
|
||||||
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x019
|
MX8MM_IOMUXC_SD2_CD_B_GPIO2_IO12 0x19
|
||||||
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0x1d0
|
MX8MM_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xd0
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -205,7 +205,7 @@
|
|||||||
reg = <0x52>;
|
reg = <0x52>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pinctrl_rtc>;
|
pinctrl-0 = <&pinctrl_rtc>;
|
||||||
interrupts-extended = <&gpio4 1 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts-extended = <&gpio4 1 IRQ_TYPE_LEVEL_LOW>;
|
||||||
trickle-diode-disable;
|
trickle-diode-disable;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -247,8 +247,8 @@
|
|||||||
|
|
||||||
pinctrl_i2c1: i2c1grp {
|
pinctrl_i2c1: i2c1grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL 0x400001c3
|
MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL 0x40000083
|
||||||
MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA 0x400001c3
|
MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA 0x40000083
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -237,8 +237,8 @@
|
|||||||
|
|
||||||
pinctrl_i2c1: i2c1grp {
|
pinctrl_i2c1: i2c1grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL 0x400001c3
|
MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL 0x40000083
|
||||||
MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA 0x400001c3
|
MX8MM_IOMUXC_I2C1_SDA_I2C1_SDA 0x40000083
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -47,17 +47,6 @@
|
|||||||
gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
|
gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
reg_usb_otg1_vbus: regulator-usb-otg1 {
|
|
||||||
pinctrl-names = "default";
|
|
||||||
pinctrl-0 = <&pinctrl_reg_usb1_en>;
|
|
||||||
compatible = "regulator-fixed";
|
|
||||||
regulator-name = "usb_otg1_vbus";
|
|
||||||
gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
|
|
||||||
enable-active-high;
|
|
||||||
regulator-min-microvolt = <5000000>;
|
|
||||||
regulator-max-microvolt = <5000000>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* off-board header */
|
/* off-board header */
|
||||||
@@ -146,9 +135,10 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
&usbotg1 {
|
&usbotg1 {
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&pinctrl_usbotg1>;
|
||||||
dr_mode = "otg";
|
dr_mode = "otg";
|
||||||
over-current-active-low;
|
over-current-active-low;
|
||||||
vbus-supply = <®_usb_otg1_vbus>;
|
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -206,14 +196,6 @@
|
|||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl_reg_usb1_en: regusb1grp {
|
|
||||||
fsl,pins = <
|
|
||||||
MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10 0x41
|
|
||||||
MX8MM_IOMUXC_GPIO1_IO12_GPIO1_IO12 0x141
|
|
||||||
MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC 0x41
|
|
||||||
>;
|
|
||||||
};
|
|
||||||
|
|
||||||
pinctrl_spi2: spi2grp {
|
pinctrl_spi2: spi2grp {
|
||||||
fsl,pins = <
|
fsl,pins = <
|
||||||
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
|
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
|
||||||
@@ -236,4 +218,11 @@
|
|||||||
MX8MM_IOMUXC_UART3_TXD_UART3_DCE_TX 0x140
|
MX8MM_IOMUXC_UART3_TXD_UART3_DCE_TX 0x140
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pinctrl_usbotg1: usbotg1grp {
|
||||||
|
fsl,pins = <
|
||||||
|
MX8MM_IOMUXC_GPIO1_IO12_GPIO1_IO12 0x141
|
||||||
|
MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC 0x41
|
||||||
|
>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -124,7 +124,6 @@
|
|||||||
amba {
|
amba {
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
#interrupt-cells = <3>;
|
|
||||||
|
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
|
|||||||
@@ -124,7 +124,6 @@
|
|||||||
amba {
|
amba {
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
#interrupt-cells = <3>;
|
|
||||||
|
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
interrupt-parent = <&gic>;
|
interrupt-parent = <&gic>;
|
||||||
|
|||||||
@@ -426,14 +426,14 @@
|
|||||||
crypto: crypto@90000 {
|
crypto: crypto@90000 {
|
||||||
compatible = "inside-secure,safexcel-eip97ies";
|
compatible = "inside-secure,safexcel-eip97ies";
|
||||||
reg = <0x90000 0x20000>;
|
reg = <0x90000 0x20000>;
|
||||||
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
|
<GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
interrupt-names = "mem", "ring0", "ring1",
|
<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
"ring2", "ring3", "eip";
|
interrupt-names = "ring0", "ring1", "ring2",
|
||||||
|
"ring3", "eip", "mem";
|
||||||
clocks = <&nb_periph_clk 15>;
|
clocks = <&nb_periph_clk 15>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -133,7 +133,6 @@
|
|||||||
|
|
||||||
odmi: odmi@300000 {
|
odmi: odmi@300000 {
|
||||||
compatible = "marvell,odmi-controller";
|
compatible = "marvell,odmi-controller";
|
||||||
interrupt-controller;
|
|
||||||
msi-controller;
|
msi-controller;
|
||||||
marvell,odmi-frames = <4>;
|
marvell,odmi-frames = <4>;
|
||||||
reg = <0x300000 0x4000>,
|
reg = <0x300000 0x4000>,
|
||||||
|
|||||||
@@ -506,14 +506,14 @@
|
|||||||
CP11X_LABEL(crypto): crypto@800000 {
|
CP11X_LABEL(crypto): crypto@800000 {
|
||||||
compatible = "inside-secure,safexcel-eip197b";
|
compatible = "inside-secure,safexcel-eip197b";
|
||||||
reg = <0x800000 0x200000>;
|
reg = <0x800000 0x200000>;
|
||||||
interrupts = <87 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <88 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<88 IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
<89 IRQ_TYPE_LEVEL_HIGH>,
|
<89 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<90 IRQ_TYPE_LEVEL_HIGH>,
|
<90 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<91 IRQ_TYPE_LEVEL_HIGH>,
|
<91 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<92 IRQ_TYPE_LEVEL_HIGH>;
|
<92 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
interrupt-names = "mem", "ring0", "ring1",
|
<87 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
"ring2", "ring3", "eip";
|
interrupt-names = "ring0", "ring1", "ring2", "ring3",
|
||||||
|
"eip", "mem";
|
||||||
clock-names = "core", "reg";
|
clock-names = "core", "reg";
|
||||||
clocks = <&CP11X_LABEL(clk) 1 26>,
|
clocks = <&CP11X_LABEL(clk) 1 26>,
|
||||||
<&CP11X_LABEL(clk) 1 17>;
|
<&CP11X_LABEL(clk) 1 17>;
|
||||||
|
|||||||
@@ -74,6 +74,7 @@
|
|||||||
|
|
||||||
memory@40000000 {
|
memory@40000000 {
|
||||||
reg = <0 0x40000000 0 0x40000000>;
|
reg = <0 0x40000000 0 0x40000000>;
|
||||||
|
device_type = "memory";
|
||||||
};
|
};
|
||||||
|
|
||||||
reg_1p8v: regulator-1p8v {
|
reg_1p8v: regulator-1p8v {
|
||||||
|
|||||||
@@ -56,6 +56,7 @@
|
|||||||
|
|
||||||
memory@40000000 {
|
memory@40000000 {
|
||||||
reg = <0 0x40000000 0 0x20000000>;
|
reg = <0 0x40000000 0 0x20000000>;
|
||||||
|
device_type = "memory";
|
||||||
};
|
};
|
||||||
|
|
||||||
reg_1p8v: regulator-1p8v {
|
reg_1p8v: regulator-1p8v {
|
||||||
|
|||||||
@@ -110,6 +110,7 @@
|
|||||||
compatible = "mediatek,mt7986-infracfg", "syscon";
|
compatible = "mediatek,mt7986-infracfg", "syscon";
|
||||||
reg = <0 0x10001000 0 0x1000>;
|
reg = <0 0x10001000 0 0x1000>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
|
#reset-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
wed_pcie: wed-pcie@10003000 {
|
wed_pcie: wed-pcie@10003000 {
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mt8183-kukui.dtsi"
|
#include "mt8183-kukui.dtsi"
|
||||||
|
/* Must come after mt8183-kukui.dtsi to modify cros_ec */
|
||||||
|
#include <arm/cros-ec-keyboard.dtsi>
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
panel: panel {
|
panel: panel {
|
||||||
|
|||||||
@@ -372,6 +372,16 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&cros_ec {
|
||||||
|
cbas {
|
||||||
|
compatible = "google,cros-cbas";
|
||||||
|
};
|
||||||
|
|
||||||
|
keyboard-controller {
|
||||||
|
compatible = "google,cros-ec-keyb-switches";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
&qca_wifi {
|
&qca_wifi {
|
||||||
qcom,ath10k-calibration-variant = "GO_KAKADU";
|
qcom,ath10k-calibration-variant = "GO_KAKADU";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -339,6 +339,16 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&cros_ec {
|
||||||
|
cbas {
|
||||||
|
compatible = "google,cros-cbas";
|
||||||
|
};
|
||||||
|
|
||||||
|
keyboard-controller {
|
||||||
|
compatible = "google,cros-ec-keyb-switches";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
&qca_wifi {
|
&qca_wifi {
|
||||||
qcom,ath10k-calibration-variant = "GO_KODAMA";
|
qcom,ath10k-calibration-variant = "GO_KODAMA";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -343,6 +343,16 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&cros_ec {
|
||||||
|
cbas {
|
||||||
|
compatible = "google,cros-cbas";
|
||||||
|
};
|
||||||
|
|
||||||
|
keyboard-controller {
|
||||||
|
compatible = "google,cros-ec-keyb-switches";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
&qca_wifi {
|
&qca_wifi {
|
||||||
qcom,ath10k-calibration-variant = "LE_Krane";
|
qcom,ath10k-calibration-variant = "LE_Krane";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -896,10 +896,6 @@
|
|||||||
google,usb-port-id = <0>;
|
google,usb-port-id = <0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
cbas {
|
|
||||||
compatible = "google,cros-cbas";
|
|
||||||
};
|
|
||||||
|
|
||||||
typec {
|
typec {
|
||||||
compatible = "google,cros-ec-typec";
|
compatible = "google,cros-ec-typec";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
@@ -999,5 +995,4 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#include <arm/cros-ec-keyboard.dtsi>
|
|
||||||
#include <arm/cros-ec-sbs.dtsi>
|
#include <arm/cros-ec-sbs.dtsi>
|
||||||
|
|||||||
@@ -819,10 +819,6 @@
|
|||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|
||||||
base_detection: cbas {
|
|
||||||
compatible = "google,cros-cbas";
|
|
||||||
};
|
|
||||||
|
|
||||||
cros_ec_pwm: pwm {
|
cros_ec_pwm: pwm {
|
||||||
compatible = "google,cros-ec-pwm";
|
compatible = "google,cros-ec-pwm";
|
||||||
#pwm-cells = <1>;
|
#pwm-cells = <1>;
|
||||||
|
|||||||
@@ -1539,7 +1539,7 @@
|
|||||||
mediatek,scp = <&scp>;
|
mediatek,scp = <&scp>;
|
||||||
power-domains = <&spm MT8192_POWER_DOMAIN_VENC>;
|
power-domains = <&spm MT8192_POWER_DOMAIN_VENC>;
|
||||||
clocks = <&vencsys CLK_VENC_SET1_VENC>;
|
clocks = <&vencsys CLK_VENC_SET1_VENC>;
|
||||||
clock-names = "venc-set1";
|
clock-names = "venc_sel";
|
||||||
assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>;
|
assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>;
|
||||||
assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D4>;
|
assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D4>;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,3 +13,7 @@
|
|||||||
&ts_10 {
|
&ts_10 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&watchdog {
|
||||||
|
/delete-property/ mediatek,disable-extrst;
|
||||||
|
};
|
||||||
|
|||||||
@@ -33,3 +33,7 @@
|
|||||||
&ts_10 {
|
&ts_10 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&watchdog {
|
||||||
|
/delete-property/ mediatek,disable-extrst;
|
||||||
|
};
|
||||||
|
|||||||
@@ -34,3 +34,7 @@
|
|||||||
&ts_10 {
|
&ts_10 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&watchdog {
|
||||||
|
/delete-property/ mediatek,disable-extrst;
|
||||||
|
};
|
||||||
|
|||||||
@@ -111,6 +111,7 @@
|
|||||||
compatible = "mediatek,mt6360";
|
compatible = "mediatek,mt6360";
|
||||||
reg = <0x34>;
|
reg = <0x34>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
#interrupt-cells = <1>;
|
||||||
interrupts-extended = <&pio 101 IRQ_TYPE_EDGE_FALLING>;
|
interrupts-extended = <&pio 101 IRQ_TYPE_EDGE_FALLING>;
|
||||||
interrupt-names = "IRQB";
|
interrupt-names = "IRQB";
|
||||||
|
|
||||||
|
|||||||
@@ -2024,7 +2024,7 @@
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
phy-handle = <&mgbe0_phy>;
|
phy-handle = <&mgbe0_phy>;
|
||||||
phy-mode = "usxgmii";
|
phy-mode = "10gbase-r";
|
||||||
|
|
||||||
mdio {
|
mdio {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
|||||||
@@ -169,10 +169,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&blsp_dma {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
&blsp_i2c2 {
|
&blsp_i2c2 {
|
||||||
/* On Low speed expansion */
|
/* On Low speed expansion */
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|||||||
@@ -1522,7 +1522,7 @@
|
|||||||
clock-names = "bam_clk";
|
clock-names = "bam_clk";
|
||||||
#dma-cells = <1>;
|
#dma-cells = <1>;
|
||||||
qcom,ee = <0>;
|
qcom,ee = <0>;
|
||||||
status = "disabled";
|
qcom,controlled-remotely;
|
||||||
};
|
};
|
||||||
|
|
||||||
blsp1_uart1: serial@78af000 {
|
blsp1_uart1: serial@78af000 {
|
||||||
|
|||||||
@@ -2028,8 +2028,16 @@
|
|||||||
ranges = <0x01000000 0x0 0x00000000 0x0 0x40200000 0x0 0x100000>,
|
ranges = <0x01000000 0x0 0x00000000 0x0 0x40200000 0x0 0x100000>,
|
||||||
<0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>;
|
<0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>;
|
||||||
|
|
||||||
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
interrupt-names = "msi";
|
<GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 309 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 312 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 313 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
interrupt-names = "msi0", "msi1", "msi2", "msi3",
|
||||||
|
"msi4", "msi5", "msi6", "msi7";
|
||||||
#interrupt-cells = <1>;
|
#interrupt-cells = <1>;
|
||||||
interrupt-map-mask = <0 0 0 0x7>;
|
interrupt-map-mask = <0 0 0 0x7>;
|
||||||
interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>,
|
interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
|||||||
@@ -532,7 +532,7 @@
|
|||||||
&pcie0 {
|
&pcie0 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
|
perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
|
||||||
enable-gpio = <&tlmm 134 GPIO_ACTIVE_HIGH>;
|
wake-gpios = <&tlmm 134 GPIO_ACTIVE_HIGH>;
|
||||||
|
|
||||||
vddpe-3v3-supply = <&pcie0_3p3v_dual>;
|
vddpe-3v3-supply = <&pcie0_3p3v_dual>;
|
||||||
|
|
||||||
|
|||||||
@@ -4049,7 +4049,7 @@
|
|||||||
assigned-clock-rates = <19200000>, <150000000>;
|
assigned-clock-rates = <19200000>, <150000000>;
|
||||||
|
|
||||||
interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
|
<&pdc_intc 6 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&pdc_intc 8 IRQ_TYPE_EDGE_BOTH>,
|
<&pdc_intc 8 IRQ_TYPE_EDGE_BOTH>,
|
||||||
<&pdc_intc 9 IRQ_TYPE_EDGE_BOTH>;
|
<&pdc_intc 9 IRQ_TYPE_EDGE_BOTH>;
|
||||||
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
||||||
@@ -4100,7 +4100,7 @@
|
|||||||
assigned-clock-rates = <19200000>, <150000000>;
|
assigned-clock-rates = <19200000>, <150000000>;
|
||||||
|
|
||||||
interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
|
<&pdc_intc 7 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&pdc_intc 10 IRQ_TYPE_EDGE_BOTH>,
|
<&pdc_intc 10 IRQ_TYPE_EDGE_BOTH>,
|
||||||
<&pdc_intc 11 IRQ_TYPE_EDGE_BOTH>;
|
<&pdc_intc 11 IRQ_TYPE_EDGE_BOTH>;
|
||||||
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
||||||
|
|||||||
@@ -1822,8 +1822,8 @@
|
|||||||
phys = <&pcie0_lane>;
|
phys = <&pcie0_lane>;
|
||||||
phy-names = "pciephy";
|
phy-names = "pciephy";
|
||||||
|
|
||||||
perst-gpio = <&tlmm 35 GPIO_ACTIVE_HIGH>;
|
perst-gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
|
||||||
enable-gpio = <&tlmm 37 GPIO_ACTIVE_HIGH>;
|
wake-gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
|
||||||
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pcie0_default_state>;
|
pinctrl-0 = <&pcie0_default_state>;
|
||||||
@@ -1925,7 +1925,7 @@
|
|||||||
phys = <&pcie1_lane>;
|
phys = <&pcie1_lane>;
|
||||||
phy-names = "pciephy";
|
phy-names = "pciephy";
|
||||||
|
|
||||||
perst-gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
|
perst-gpios = <&tlmm 102 GPIO_ACTIVE_HIGH>;
|
||||||
enable-gpio = <&tlmm 104 GPIO_ACTIVE_HIGH>;
|
enable-gpio = <&tlmm 104 GPIO_ACTIVE_HIGH>;
|
||||||
|
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
@@ -3629,7 +3629,7 @@
|
|||||||
assigned-clock-rates = <19200000>, <200000000>;
|
assigned-clock-rates = <19200000>, <200000000>;
|
||||||
|
|
||||||
interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&intc GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,
|
<&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&pdc 8 IRQ_TYPE_EDGE_BOTH>,
|
<&pdc 8 IRQ_TYPE_EDGE_BOTH>,
|
||||||
<&pdc 9 IRQ_TYPE_EDGE_BOTH>;
|
<&pdc 9 IRQ_TYPE_EDGE_BOTH>;
|
||||||
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
||||||
@@ -3678,7 +3678,7 @@
|
|||||||
assigned-clock-rates = <19200000>, <200000000>;
|
assigned-clock-rates = <19200000>, <200000000>;
|
||||||
|
|
||||||
interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&intc GIC_SPI 487 IRQ_TYPE_LEVEL_HIGH>,
|
<&pdc 7 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<&pdc 10 IRQ_TYPE_EDGE_BOTH>,
|
<&pdc 10 IRQ_TYPE_EDGE_BOTH>,
|
||||||
<&pdc 11 IRQ_TYPE_EDGE_BOTH>;
|
<&pdc 11 IRQ_TYPE_EDGE_BOTH>;
|
||||||
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
interrupt-names = "hs_phy_irq", "ss_phy_irq",
|
||||||
|
|||||||
@@ -656,8 +656,8 @@
|
|||||||
|
|
||||||
avb0: ethernet@e6800000 {
|
avb0: ethernet@e6800000 {
|
||||||
compatible = "renesas,etheravb-r8a779a0",
|
compatible = "renesas,etheravb-r8a779a0",
|
||||||
"renesas,etheravb-rcar-gen3";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6800000 0 0x800>;
|
reg = <0 0xe6800000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
@@ -704,8 +704,8 @@
|
|||||||
|
|
||||||
avb1: ethernet@e6810000 {
|
avb1: ethernet@e6810000 {
|
||||||
compatible = "renesas,etheravb-r8a779a0",
|
compatible = "renesas,etheravb-r8a779a0",
|
||||||
"renesas,etheravb-rcar-gen3";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6810000 0 0x800>;
|
reg = <0 0xe6810000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
@@ -752,7 +752,7 @@
|
|||||||
|
|
||||||
avb2: ethernet@e6820000 {
|
avb2: ethernet@e6820000 {
|
||||||
compatible = "renesas,etheravb-r8a779a0",
|
compatible = "renesas,etheravb-r8a779a0",
|
||||||
"renesas,etheravb-rcar-gen3";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6820000 0 0x1000>;
|
reg = <0 0xe6820000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
@@ -800,7 +800,7 @@
|
|||||||
|
|
||||||
avb3: ethernet@e6830000 {
|
avb3: ethernet@e6830000 {
|
||||||
compatible = "renesas,etheravb-r8a779a0",
|
compatible = "renesas,etheravb-r8a779a0",
|
||||||
"renesas,etheravb-rcar-gen3";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6830000 0 0x1000>;
|
reg = <0 0xe6830000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 331 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
@@ -848,7 +848,7 @@
|
|||||||
|
|
||||||
avb4: ethernet@e6840000 {
|
avb4: ethernet@e6840000 {
|
||||||
compatible = "renesas,etheravb-r8a779a0",
|
compatible = "renesas,etheravb-r8a779a0",
|
||||||
"renesas,etheravb-rcar-gen3";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6840000 0 0x1000>;
|
reg = <0 0xe6840000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
@@ -896,7 +896,7 @@
|
|||||||
|
|
||||||
avb5: ethernet@e6850000 {
|
avb5: ethernet@e6850000 {
|
||||||
compatible = "renesas,etheravb-r8a779a0",
|
compatible = "renesas,etheravb-r8a779a0",
|
||||||
"renesas,etheravb-rcar-gen3";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6850000 0 0x1000>;
|
reg = <0 0xe6850000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
@@ -1019,7 +1019,7 @@
|
|||||||
|
|
||||||
msiof0: spi@e6e90000 {
|
msiof0: spi@e6e90000 {
|
||||||
compatible = "renesas,msiof-r8a779a0",
|
compatible = "renesas,msiof-r8a779a0",
|
||||||
"renesas,rcar-gen3-msiof";
|
"renesas,rcar-gen4-msiof";
|
||||||
reg = <0 0xe6e90000 0 0x0064>;
|
reg = <0 0xe6e90000 0 0x0064>;
|
||||||
interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cpg CPG_MOD 618>;
|
clocks = <&cpg CPG_MOD 618>;
|
||||||
@@ -1034,7 +1034,7 @@
|
|||||||
|
|
||||||
msiof1: spi@e6ea0000 {
|
msiof1: spi@e6ea0000 {
|
||||||
compatible = "renesas,msiof-r8a779a0",
|
compatible = "renesas,msiof-r8a779a0",
|
||||||
"renesas,rcar-gen3-msiof";
|
"renesas,rcar-gen4-msiof";
|
||||||
reg = <0 0xe6ea0000 0 0x0064>;
|
reg = <0 0xe6ea0000 0 0x0064>;
|
||||||
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cpg CPG_MOD 619>;
|
clocks = <&cpg CPG_MOD 619>;
|
||||||
@@ -1049,7 +1049,7 @@
|
|||||||
|
|
||||||
msiof2: spi@e6c00000 {
|
msiof2: spi@e6c00000 {
|
||||||
compatible = "renesas,msiof-r8a779a0",
|
compatible = "renesas,msiof-r8a779a0",
|
||||||
"renesas,rcar-gen3-msiof";
|
"renesas,rcar-gen4-msiof";
|
||||||
reg = <0 0xe6c00000 0 0x0064>;
|
reg = <0 0xe6c00000 0 0x0064>;
|
||||||
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cpg CPG_MOD 620>;
|
clocks = <&cpg CPG_MOD 620>;
|
||||||
@@ -1064,7 +1064,7 @@
|
|||||||
|
|
||||||
msiof3: spi@e6c10000 {
|
msiof3: spi@e6c10000 {
|
||||||
compatible = "renesas,msiof-r8a779a0",
|
compatible = "renesas,msiof-r8a779a0",
|
||||||
"renesas,rcar-gen3-msiof";
|
"renesas,rcar-gen4-msiof";
|
||||||
reg = <0 0xe6c10000 0 0x0064>;
|
reg = <0 0xe6c10000 0 0x0064>;
|
||||||
interrupts = <GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 248 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cpg CPG_MOD 621>;
|
clocks = <&cpg CPG_MOD 621>;
|
||||||
@@ -1079,7 +1079,7 @@
|
|||||||
|
|
||||||
msiof4: spi@e6c20000 {
|
msiof4: spi@e6c20000 {
|
||||||
compatible = "renesas,msiof-r8a779a0",
|
compatible = "renesas,msiof-r8a779a0",
|
||||||
"renesas,rcar-gen3-msiof";
|
"renesas,rcar-gen4-msiof";
|
||||||
reg = <0 0xe6c20000 0 0x0064>;
|
reg = <0 0xe6c20000 0 0x0064>;
|
||||||
interrupts = <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cpg CPG_MOD 622>;
|
clocks = <&cpg CPG_MOD 622>;
|
||||||
@@ -1094,7 +1094,7 @@
|
|||||||
|
|
||||||
msiof5: spi@e6c28000 {
|
msiof5: spi@e6c28000 {
|
||||||
compatible = "renesas,msiof-r8a779a0",
|
compatible = "renesas,msiof-r8a779a0",
|
||||||
"renesas,rcar-gen3-msiof";
|
"renesas,rcar-gen4-msiof";
|
||||||
reg = <0 0xe6c28000 0 0x0064>;
|
reg = <0 0xe6c28000 0 0x0064>;
|
||||||
interrupts = <GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cpg CPG_MOD 623>;
|
clocks = <&cpg CPG_MOD 623>;
|
||||||
|
|||||||
@@ -337,7 +337,7 @@
|
|||||||
avb0: ethernet@e6800000 {
|
avb0: ethernet@e6800000 {
|
||||||
compatible = "renesas,etheravb-r8a779g0",
|
compatible = "renesas,etheravb-r8a779g0",
|
||||||
"renesas,etheravb-rcar-gen4";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6800000 0 0x800>;
|
reg = <0 0xe6800000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
@@ -384,7 +384,7 @@
|
|||||||
avb1: ethernet@e6810000 {
|
avb1: ethernet@e6810000 {
|
||||||
compatible = "renesas,etheravb-r8a779g0",
|
compatible = "renesas,etheravb-r8a779g0",
|
||||||
"renesas,etheravb-rcar-gen4";
|
"renesas,etheravb-rcar-gen4";
|
||||||
reg = <0 0xe6810000 0 0x800>;
|
reg = <0 0xe6810000 0 0x1000>;
|
||||||
interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>,
|
interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
||||||
/*
|
/*
|
||||||
* Device Tree Source for the RZ/G2UL SoC
|
* Device Tree Source for the RZ/Five and RZ/G2UL SoCs
|
||||||
*
|
*
|
||||||
* Copyright (C) 2022 Renesas Electronics Corp.
|
* Copyright (C) 2022 Renesas Electronics Corp.
|
||||||
*/
|
*/
|
||||||
@@ -68,36 +68,8 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
cpus {
|
|
||||||
#address-cells = <1>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
|
|
||||||
cpu0: cpu@0 {
|
|
||||||
compatible = "arm,cortex-a55";
|
|
||||||
reg = <0>;
|
|
||||||
device_type = "cpu";
|
|
||||||
#cooling-cells = <2>;
|
|
||||||
next-level-cache = <&L3_CA55>;
|
|
||||||
enable-method = "psci";
|
|
||||||
clocks = <&cpg CPG_CORE R9A07G043_CLK_I>;
|
|
||||||
operating-points-v2 = <&cluster0_opp>;
|
|
||||||
};
|
|
||||||
|
|
||||||
L3_CA55: cache-controller-0 {
|
|
||||||
compatible = "cache";
|
|
||||||
cache-unified;
|
|
||||||
cache-size = <0x40000>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
psci {
|
|
||||||
compatible = "arm,psci-1.0", "arm,psci-0.2";
|
|
||||||
method = "smc";
|
|
||||||
};
|
|
||||||
|
|
||||||
soc: soc {
|
soc: soc {
|
||||||
compatible = "simple-bus";
|
compatible = "simple-bus";
|
||||||
interrupt-parent = <&gic>;
|
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
#size-cells = <2>;
|
#size-cells = <2>;
|
||||||
ranges;
|
ranges;
|
||||||
@@ -545,12 +517,6 @@
|
|||||||
sysc: system-controller@11020000 {
|
sysc: system-controller@11020000 {
|
||||||
compatible = "renesas,r9a07g043-sysc";
|
compatible = "renesas,r9a07g043-sysc";
|
||||||
reg = <0 0x11020000 0 0x10000>;
|
reg = <0 0x11020000 0 0x10000>;
|
||||||
interrupts = <SOC_PERIPHERAL_IRQ(42) IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
<SOC_PERIPHERAL_IRQ(43) IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
<SOC_PERIPHERAL_IRQ(44) IRQ_TYPE_LEVEL_HIGH>,
|
|
||||||
<SOC_PERIPHERAL_IRQ(45) IRQ_TYPE_LEVEL_HIGH>;
|
|
||||||
interrupt-names = "lpm_int", "ca55stbydone_int",
|
|
||||||
"cm33stbyr_int", "ca55_deny";
|
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -603,16 +569,6 @@
|
|||||||
dma-channels = <16>;
|
dma-channels = <16>;
|
||||||
};
|
};
|
||||||
|
|
||||||
gic: interrupt-controller@11900000 {
|
|
||||||
compatible = "arm,gic-v3";
|
|
||||||
#interrupt-cells = <3>;
|
|
||||||
#address-cells = <0>;
|
|
||||||
interrupt-controller;
|
|
||||||
reg = <0x0 0x11900000 0 0x40000>,
|
|
||||||
<0x0 0x11940000 0 0x60000>;
|
|
||||||
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_LOW>;
|
|
||||||
};
|
|
||||||
|
|
||||||
sdhi0: mmc@11c00000 {
|
sdhi0: mmc@11c00000 {
|
||||||
compatible = "renesas,sdhi-r9a07g043",
|
compatible = "renesas,sdhi-r9a07g043",
|
||||||
"renesas,rcar-gen3-sdhi";
|
"renesas,rcar-gen3-sdhi";
|
||||||
@@ -893,12 +849,4 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
timer {
|
|
||||||
compatible = "arm,armv8-timer";
|
|
||||||
interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
|
|
||||||
<&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
|
|
||||||
<&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
|
|
||||||
<&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,3 +10,139 @@
|
|||||||
#define SOC_PERIPHERAL_IRQ(nr) GIC_SPI nr
|
#define SOC_PERIPHERAL_IRQ(nr) GIC_SPI nr
|
||||||
|
|
||||||
#include "r9a07g043.dtsi"
|
#include "r9a07g043.dtsi"
|
||||||
|
|
||||||
|
/ {
|
||||||
|
cpus {
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <0>;
|
||||||
|
|
||||||
|
cpu0: cpu@0 {
|
||||||
|
compatible = "arm,cortex-a55";
|
||||||
|
reg = <0>;
|
||||||
|
device_type = "cpu";
|
||||||
|
#cooling-cells = <2>;
|
||||||
|
next-level-cache = <&L3_CA55>;
|
||||||
|
enable-method = "psci";
|
||||||
|
clocks = <&cpg CPG_CORE R9A07G043_CLK_I>;
|
||||||
|
operating-points-v2 = <&cluster0_opp>;
|
||||||
|
};
|
||||||
|
|
||||||
|
L3_CA55: cache-controller-0 {
|
||||||
|
compatible = "cache";
|
||||||
|
cache-unified;
|
||||||
|
cache-size = <0x40000>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
psci {
|
||||||
|
compatible = "arm,psci-1.0", "arm,psci-0.2";
|
||||||
|
method = "smc";
|
||||||
|
};
|
||||||
|
|
||||||
|
timer {
|
||||||
|
compatible = "arm,armv8-timer";
|
||||||
|
interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
|
||||||
|
<&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
|
||||||
|
<&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
|
||||||
|
<&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
&soc {
|
||||||
|
interrupt-parent = <&gic>;
|
||||||
|
|
||||||
|
irqc: interrupt-controller@110a0000 {
|
||||||
|
compatible = "renesas,r9a07g043u-irqc",
|
||||||
|
"renesas,rzg2l-irqc";
|
||||||
|
reg = <0 0x110a0000 0 0x10000>;
|
||||||
|
#interrupt-cells = <2>;
|
||||||
|
#address-cells = <0>;
|
||||||
|
interrupt-controller;
|
||||||
|
interrupts = <SOC_PERIPHERAL_IRQ(0) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(1) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(2) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(3) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(4) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(5) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(6) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(7) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(8) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(444) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(445) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(446) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(447) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(448) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(449) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(450) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(451) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(452) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(453) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(454) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(455) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(456) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(457) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(458) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(459) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(460) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(461) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(462) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(463) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(464) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(465) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(466) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(467) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(468) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(469) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(470) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(471) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(472) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(473) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(474) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(475) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(25) IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(34) IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(35) IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(36) IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(37) IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(38) IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(39) IRQ_TYPE_EDGE_RISING>;
|
||||||
|
interrupt-names = "nmi",
|
||||||
|
"irq0", "irq1", "irq2", "irq3",
|
||||||
|
"irq4", "irq5", "irq6", "irq7",
|
||||||
|
"tint0", "tint1", "tint2", "tint3",
|
||||||
|
"tint4", "tint5", "tint6", "tint7",
|
||||||
|
"tint8", "tint9", "tint10", "tint11",
|
||||||
|
"tint12", "tint13", "tint14", "tint15",
|
||||||
|
"tint16", "tint17", "tint18", "tint19",
|
||||||
|
"tint20", "tint21", "tint22", "tint23",
|
||||||
|
"tint24", "tint25", "tint26", "tint27",
|
||||||
|
"tint28", "tint29", "tint30", "tint31",
|
||||||
|
"bus-err", "ec7tie1-0", "ec7tie2-0",
|
||||||
|
"ec7tiovf-0", "ec7tie1-1", "ec7tie2-1",
|
||||||
|
"ec7tiovf-1";
|
||||||
|
clocks = <&cpg CPG_MOD R9A07G043_IA55_CLK>,
|
||||||
|
<&cpg CPG_MOD R9A07G043_IA55_PCLK>;
|
||||||
|
clock-names = "clk", "pclk";
|
||||||
|
power-domains = <&cpg>;
|
||||||
|
resets = <&cpg R9A07G043_IA55_RESETN>;
|
||||||
|
};
|
||||||
|
|
||||||
|
gic: interrupt-controller@11900000 {
|
||||||
|
compatible = "arm,gic-v3";
|
||||||
|
#interrupt-cells = <3>;
|
||||||
|
#address-cells = <0>;
|
||||||
|
interrupt-controller;
|
||||||
|
reg = <0x0 0x11900000 0 0x40000>,
|
||||||
|
<0x0 0x11940000 0 0x60000>;
|
||||||
|
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_LOW>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
&sysc {
|
||||||
|
interrupts = <SOC_PERIPHERAL_IRQ(42) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(43) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(44) IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<SOC_PERIPHERAL_IRQ(45) IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
interrupt-names = "lpm_int", "ca55stbydone_int",
|
||||||
|
"cm33stbyr_int", "ca55_deny";
|
||||||
|
};
|
||||||
|
|||||||
@@ -698,7 +698,27 @@
|
|||||||
<GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>;
|
<GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 25 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 34 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 35 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 36 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 37 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 38 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 39 IRQ_TYPE_EDGE_RISING>;
|
||||||
|
interrupt-names = "nmi", "irq0", "irq1", "irq2", "irq3",
|
||||||
|
"irq4", "irq5", "irq6", "irq7",
|
||||||
|
"tint0", "tint1", "tint2", "tint3",
|
||||||
|
"tint4", "tint5", "tint6", "tint7",
|
||||||
|
"tint8", "tint9", "tint10", "tint11",
|
||||||
|
"tint12", "tint13", "tint14", "tint15",
|
||||||
|
"tint16", "tint17", "tint18", "tint19",
|
||||||
|
"tint20", "tint21", "tint22", "tint23",
|
||||||
|
"tint24", "tint25", "tint26", "tint27",
|
||||||
|
"tint28", "tint29", "tint30", "tint31",
|
||||||
|
"bus-err", "ec7tie1-0", "ec7tie2-0",
|
||||||
|
"ec7tiovf-0", "ec7tie1-1", "ec7tie2-1",
|
||||||
|
"ec7tiovf-1";
|
||||||
clocks = <&cpg CPG_MOD R9A07G044_IA55_CLK>,
|
clocks = <&cpg CPG_MOD R9A07G044_IA55_CLK>,
|
||||||
<&cpg CPG_MOD R9A07G044_IA55_PCLK>;
|
<&cpg CPG_MOD R9A07G044_IA55_PCLK>;
|
||||||
clock-names = "clk", "pclk";
|
clock-names = "clk", "pclk";
|
||||||
|
|||||||
@@ -704,7 +704,27 @@
|
|||||||
<GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>,
|
<GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
<GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>;
|
<GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 25 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 34 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 35 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 36 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 37 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 38 IRQ_TYPE_EDGE_RISING>,
|
||||||
|
<GIC_SPI 39 IRQ_TYPE_EDGE_RISING>;
|
||||||
|
interrupt-names = "nmi", "irq0", "irq1", "irq2", "irq3",
|
||||||
|
"irq4", "irq5", "irq6", "irq7",
|
||||||
|
"tint0", "tint1", "tint2", "tint3",
|
||||||
|
"tint4", "tint5", "tint6", "tint7",
|
||||||
|
"tint8", "tint9", "tint10", "tint11",
|
||||||
|
"tint12", "tint13", "tint14", "tint15",
|
||||||
|
"tint16", "tint17", "tint18", "tint19",
|
||||||
|
"tint20", "tint21", "tint22", "tint23",
|
||||||
|
"tint24", "tint25", "tint26", "tint27",
|
||||||
|
"tint28", "tint29", "tint30", "tint31",
|
||||||
|
"bus-err", "ec7tie1-0", "ec7tie2-0",
|
||||||
|
"ec7tiovf-0", "ec7tie1-1", "ec7tie2-1",
|
||||||
|
"ec7tiovf-1";
|
||||||
clocks = <&cpg CPG_MOD R9A07G054_IA55_CLK>,
|
clocks = <&cpg CPG_MOD R9A07G054_IA55_CLK>,
|
||||||
<&cpg CPG_MOD R9A07G054_IA55_PCLK>;
|
<&cpg CPG_MOD R9A07G054_IA55_PCLK>;
|
||||||
clock-names = "clk", "pclk";
|
clock-names = "clk", "pclk";
|
||||||
|
|||||||
@@ -251,6 +251,7 @@
|
|||||||
gpio-controller;
|
gpio-controller;
|
||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
#interrupt-cells = <2>;
|
||||||
interrupt-parent = <&gpio6>;
|
interrupt-parent = <&gpio6>;
|
||||||
interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
|
||||||
|
|
||||||
@@ -311,6 +312,7 @@
|
|||||||
gpio-controller;
|
gpio-controller;
|
||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
#interrupt-cells = <2>;
|
||||||
interrupt-parent = <&gpio6>;
|
interrupt-parent = <&gpio6>;
|
||||||
interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
|
||||||
};
|
};
|
||||||
@@ -331,6 +333,7 @@
|
|||||||
gpio-controller;
|
gpio-controller;
|
||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
#interrupt-cells = <2>;
|
||||||
interrupt-parent = <&gpio7>;
|
interrupt-parent = <&gpio7>;
|
||||||
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
|
||||||
};
|
};
|
||||||
@@ -341,6 +344,7 @@
|
|||||||
gpio-controller;
|
gpio-controller;
|
||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
#interrupt-cells = <2>;
|
||||||
interrupt-parent = <&gpio5>;
|
interrupt-parent = <&gpio5>;
|
||||||
interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
|
interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -607,6 +607,7 @@
|
|||||||
clock-names = "spiclk", "apb_pclk";
|
clock-names = "spiclk", "apb_pclk";
|
||||||
dmas = <&dmac 12>, <&dmac 13>;
|
dmas = <&dmac 12>, <&dmac 13>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
|
num-cs = <2>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&spi0_clk &spi0_csn &spi0_miso &spi0_mosi>;
|
pinctrl-0 = <&spi0_clk &spi0_csn &spi0_miso &spi0_mosi>;
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
@@ -622,6 +623,7 @@
|
|||||||
clock-names = "spiclk", "apb_pclk";
|
clock-names = "spiclk", "apb_pclk";
|
||||||
dmas = <&dmac 14>, <&dmac 15>;
|
dmas = <&dmac 14>, <&dmac 15>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
|
num-cs = <2>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&spi1_clk &spi1_csn0 &spi1_csn1 &spi1_miso &spi1_mosi>;
|
pinctrl-0 = <&spi1_clk &spi1_csn0 &spi1_csn1 &spi1_miso &spi1_mosi>;
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
|
|||||||
@@ -596,6 +596,7 @@
|
|||||||
compatible = "rockchip,rk3568-vpu";
|
compatible = "rockchip,rk3568-vpu";
|
||||||
reg = <0x0 0xfdea0000 0x0 0x800>;
|
reg = <0x0 0xfdea0000 0x0 0x800>;
|
||||||
interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
interrupt-names = "vdpu";
|
||||||
clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
|
clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
|
||||||
clock-names = "aclk", "hclk";
|
clock-names = "aclk", "hclk";
|
||||||
iommus = <&vdpu_mmu>;
|
iommus = <&vdpu_mmu>;
|
||||||
|
|||||||
@@ -227,8 +227,19 @@ static int ctr_encrypt(struct skcipher_request *req)
|
|||||||
src += blocks * AES_BLOCK_SIZE;
|
src += blocks * AES_BLOCK_SIZE;
|
||||||
}
|
}
|
||||||
if (nbytes && walk.nbytes == walk.total) {
|
if (nbytes && walk.nbytes == walk.total) {
|
||||||
|
u8 buf[AES_BLOCK_SIZE];
|
||||||
|
u8 *d = dst;
|
||||||
|
|
||||||
|
if (unlikely(nbytes < AES_BLOCK_SIZE))
|
||||||
|
src = dst = memcpy(buf + sizeof(buf) - nbytes,
|
||||||
|
src, nbytes);
|
||||||
|
|
||||||
neon_aes_ctr_encrypt(dst, src, ctx->enc, ctx->key.rounds,
|
neon_aes_ctr_encrypt(dst, src, ctx->enc, ctx->key.rounds,
|
||||||
nbytes, walk.iv);
|
nbytes, walk.iv);
|
||||||
|
|
||||||
|
if (unlikely(nbytes < AES_BLOCK_SIZE))
|
||||||
|
memcpy(d, dst, nbytes);
|
||||||
|
|
||||||
nbytes = 0;
|
nbytes = 0;
|
||||||
}
|
}
|
||||||
kernel_neon_end();
|
kernel_neon_end();
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ alternative_has_feature_likely(unsigned long feature)
|
|||||||
compiletime_assert(feature < ARM64_NCAPS,
|
compiletime_assert(feature < ARM64_NCAPS,
|
||||||
"feature must be < ARM64_NCAPS");
|
"feature must be < ARM64_NCAPS");
|
||||||
|
|
||||||
asm_volatile_goto(
|
asm goto(
|
||||||
ALTERNATIVE_CB("b %l[l_no]", %[feature], alt_cb_patch_nops)
|
ALTERNATIVE_CB("b %l[l_no]", %[feature], alt_cb_patch_nops)
|
||||||
:
|
:
|
||||||
: [feature] "i" (feature)
|
: [feature] "i" (feature)
|
||||||
@@ -248,7 +248,7 @@ alternative_has_feature_unlikely(unsigned long feature)
|
|||||||
compiletime_assert(feature < ARM64_NCAPS,
|
compiletime_assert(feature < ARM64_NCAPS,
|
||||||
"feature must be < ARM64_NCAPS");
|
"feature must be < ARM64_NCAPS");
|
||||||
|
|
||||||
asm_volatile_goto(
|
asm goto(
|
||||||
ALTERNATIVE("nop", "b %l[l_yes]", %[feature])
|
ALTERNATIVE("nop", "b %l[l_yes]", %[feature])
|
||||||
:
|
:
|
||||||
: [feature] "i" (feature)
|
: [feature] "i" (feature)
|
||||||
|
|||||||
@@ -61,6 +61,7 @@
|
|||||||
#define ARM_CPU_IMP_HISI 0x48
|
#define ARM_CPU_IMP_HISI 0x48
|
||||||
#define ARM_CPU_IMP_APPLE 0x61
|
#define ARM_CPU_IMP_APPLE 0x61
|
||||||
#define ARM_CPU_IMP_AMPERE 0xC0
|
#define ARM_CPU_IMP_AMPERE 0xC0
|
||||||
|
#define ARM_CPU_IMP_MICROSOFT 0x6D
|
||||||
|
|
||||||
#define ARM_CPU_PART_AEM_V8 0xD0F
|
#define ARM_CPU_PART_AEM_V8 0xD0F
|
||||||
#define ARM_CPU_PART_FOUNDATION 0xD00
|
#define ARM_CPU_PART_FOUNDATION 0xD00
|
||||||
@@ -128,6 +129,8 @@
|
|||||||
|
|
||||||
#define AMPERE_CPU_PART_AMPERE1 0xAC3
|
#define AMPERE_CPU_PART_AMPERE1 0xAC3
|
||||||
|
|
||||||
|
#define MICROSOFT_CPU_PART_AZURE_COBALT_100 0xD49 /* Based on r0p0 of ARM Neoverse N2 */
|
||||||
|
|
||||||
#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)
|
#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)
|
||||||
#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
|
#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
|
||||||
#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
|
#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
|
||||||
@@ -179,6 +182,7 @@
|
|||||||
#define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)
|
#define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)
|
||||||
#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX)
|
#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX)
|
||||||
#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)
|
#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)
|
||||||
|
#define MIDR_MICROSOFT_AZURE_COBALT_100 MIDR_CPU_MODEL(ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_AZURE_COBALT_100)
|
||||||
|
|
||||||
/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */
|
/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */
|
||||||
#define MIDR_FUJITSU_ERRATUM_010001 MIDR_FUJITSU_A64FX
|
#define MIDR_FUJITSU_ERRATUM_010001 MIDR_FUJITSU_A64FX
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ static inline void free_screen_info(struct screen_info *si)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#define EFI_ALLOC_ALIGN SZ_64K
|
#define EFI_ALLOC_ALIGN SZ_64K
|
||||||
|
#define EFI_ALLOC_LIMIT ((1UL << 48) - 1)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* On ARM systems, virtually remapped UEFI runtime services are set up in two
|
* On ARM systems, virtually remapped UEFI runtime services are set up in two
|
||||||
|
|||||||
@@ -36,13 +36,13 @@
|
|||||||
* When we defined the maximum SVE vector length we defined the ABI so
|
* When we defined the maximum SVE vector length we defined the ABI so
|
||||||
* that the maximum vector length included all the reserved for future
|
* that the maximum vector length included all the reserved for future
|
||||||
* expansion bits in ZCR rather than those just currently defined by
|
* expansion bits in ZCR rather than those just currently defined by
|
||||||
* the architecture. While SME follows a similar pattern the fact that
|
* the architecture. Using this length to allocate worst size buffers
|
||||||
* it includes a square matrix means that any allocations that attempt
|
* results in excessively large allocations, and this effect is even
|
||||||
* to cover the maximum potential vector length (such as happen with
|
* more pronounced for SME due to ZA. Define more suitable VLs for
|
||||||
* the regset used for ptrace) end up being extremely large. Define
|
* these situations.
|
||||||
* the much lower actual limit for use in such situations.
|
|
||||||
*/
|
*/
|
||||||
#define SME_VQ_MAX 16
|
#define ARCH_SVE_VQ_MAX ((ZCR_ELx_LEN_MASK >> ZCR_ELx_LEN_SHIFT) + 1)
|
||||||
|
#define SME_VQ_MAX ((SMCR_ELx_LEN_MASK >> SMCR_ELx_LEN_SHIFT) + 1)
|
||||||
|
|
||||||
struct task_struct;
|
struct task_struct;
|
||||||
|
|
||||||
@@ -343,6 +343,7 @@ extern void sme_alloc(struct task_struct *task, bool flush);
|
|||||||
extern unsigned int sme_get_vl(void);
|
extern unsigned int sme_get_vl(void);
|
||||||
extern int sme_set_current_vl(unsigned long arg);
|
extern int sme_set_current_vl(unsigned long arg);
|
||||||
extern int sme_get_current_vl(void);
|
extern int sme_get_current_vl(void);
|
||||||
|
extern void sme_suspend_exit(void);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return how many bytes of memory are required to store the full SME
|
* Return how many bytes of memory are required to store the full SME
|
||||||
@@ -372,6 +373,7 @@ static inline int sme_max_vl(void) { return 0; }
|
|||||||
static inline int sme_max_virtualisable_vl(void) { return 0; }
|
static inline int sme_max_virtualisable_vl(void) { return 0; }
|
||||||
static inline int sme_set_current_vl(unsigned long arg) { return -EINVAL; }
|
static inline int sme_set_current_vl(unsigned long arg) { return -EINVAL; }
|
||||||
static inline int sme_get_current_vl(void) { return -EINVAL; }
|
static inline int sme_get_current_vl(void) { return -EINVAL; }
|
||||||
|
static inline void sme_suspend_exit(void) { }
|
||||||
|
|
||||||
static inline size_t za_state_size(struct task_struct const *task)
|
static inline size_t za_state_size(struct task_struct const *task)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
static __always_inline bool arch_static_branch(struct static_key *key,
|
static __always_inline bool arch_static_branch(struct static_key *key,
|
||||||
bool branch)
|
bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto(
|
asm goto(
|
||||||
"1: nop \n\t"
|
"1: nop \n\t"
|
||||||
" .pushsection __jump_table, \"aw\" \n\t"
|
" .pushsection __jump_table, \"aw\" \n\t"
|
||||||
" .align 3 \n\t"
|
" .align 3 \n\t"
|
||||||
@@ -35,7 +35,7 @@ l_yes:
|
|||||||
static __always_inline bool arch_static_branch_jump(struct static_key *key,
|
static __always_inline bool arch_static_branch_jump(struct static_key *key,
|
||||||
bool branch)
|
bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto(
|
asm goto(
|
||||||
"1: b %l[l_yes] \n\t"
|
"1: b %l[l_yes] \n\t"
|
||||||
" .pushsection __jump_table, \"aw\" \n\t"
|
" .pushsection __jump_table, \"aw\" \n\t"
|
||||||
" .align 3 \n\t"
|
" .align 3 \n\t"
|
||||||
|
|||||||
@@ -390,6 +390,7 @@ static const struct midr_range erratum_1463225[] = {
|
|||||||
static const struct midr_range trbe_overwrite_fill_mode_cpus[] = {
|
static const struct midr_range trbe_overwrite_fill_mode_cpus[] = {
|
||||||
#ifdef CONFIG_ARM64_ERRATUM_2139208
|
#ifdef CONFIG_ARM64_ERRATUM_2139208
|
||||||
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
|
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
|
||||||
|
MIDR_ALL_VERSIONS(MIDR_MICROSOFT_AZURE_COBALT_100),
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_ARM64_ERRATUM_2119858
|
#ifdef CONFIG_ARM64_ERRATUM_2119858
|
||||||
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
|
||||||
@@ -403,6 +404,7 @@ static const struct midr_range trbe_overwrite_fill_mode_cpus[] = {
|
|||||||
static const struct midr_range tsb_flush_fail_cpus[] = {
|
static const struct midr_range tsb_flush_fail_cpus[] = {
|
||||||
#ifdef CONFIG_ARM64_ERRATUM_2067961
|
#ifdef CONFIG_ARM64_ERRATUM_2067961
|
||||||
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
|
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
|
||||||
|
MIDR_ALL_VERSIONS(MIDR_MICROSOFT_AZURE_COBALT_100),
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_ARM64_ERRATUM_2054223
|
#ifdef CONFIG_ARM64_ERRATUM_2054223
|
||||||
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
|
||||||
@@ -415,6 +417,7 @@ static const struct midr_range tsb_flush_fail_cpus[] = {
|
|||||||
static struct midr_range trbe_write_out_of_range_cpus[] = {
|
static struct midr_range trbe_write_out_of_range_cpus[] = {
|
||||||
#ifdef CONFIG_ARM64_ERRATUM_2253138
|
#ifdef CONFIG_ARM64_ERRATUM_2253138
|
||||||
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
|
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
|
||||||
|
MIDR_ALL_VERSIONS(MIDR_MICROSOFT_AZURE_COBALT_100),
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_ARM64_ERRATUM_2224489
|
#ifdef CONFIG_ARM64_ERRATUM_2224489
|
||||||
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
|
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
|
||||||
|
|||||||
@@ -1347,6 +1347,20 @@ void __init sme_setup(void)
|
|||||||
get_sme_default_vl());
|
get_sme_default_vl());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void sme_suspend_exit(void)
|
||||||
|
{
|
||||||
|
u64 smcr = 0;
|
||||||
|
|
||||||
|
if (!system_supports_sme())
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (system_supports_fa64())
|
||||||
|
smcr |= SMCR_ELx_FA64;
|
||||||
|
|
||||||
|
write_sysreg_s(smcr, SYS_SMCR_EL1);
|
||||||
|
write_sysreg_s(0, SYS_SMPRI_EL1);
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_ARM64_SME */
|
#endif /* CONFIG_ARM64_SME */
|
||||||
|
|
||||||
static void sve_init_regs(void)
|
static void sve_init_regs(void)
|
||||||
|
|||||||
@@ -1452,7 +1452,8 @@ static const struct user_regset aarch64_regsets[] = {
|
|||||||
#ifdef CONFIG_ARM64_SVE
|
#ifdef CONFIG_ARM64_SVE
|
||||||
[REGSET_SVE] = { /* Scalable Vector Extension */
|
[REGSET_SVE] = { /* Scalable Vector Extension */
|
||||||
.core_note_type = NT_ARM_SVE,
|
.core_note_type = NT_ARM_SVE,
|
||||||
.n = DIV_ROUND_UP(SVE_PT_SIZE(SVE_VQ_MAX, SVE_PT_REGS_SVE),
|
.n = DIV_ROUND_UP(SVE_PT_SIZE(ARCH_SVE_VQ_MAX,
|
||||||
|
SVE_PT_REGS_SVE),
|
||||||
SVE_VQ_BYTES),
|
SVE_VQ_BYTES),
|
||||||
.size = SVE_VQ_BYTES,
|
.size = SVE_VQ_BYTES,
|
||||||
.align = SVE_VQ_BYTES,
|
.align = SVE_VQ_BYTES,
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
#include <asm/daifflags.h>
|
#include <asm/daifflags.h>
|
||||||
#include <asm/debug-monitors.h>
|
#include <asm/debug-monitors.h>
|
||||||
#include <asm/exec.h>
|
#include <asm/exec.h>
|
||||||
|
#include <asm/fpsimd.h>
|
||||||
#include <asm/mte.h>
|
#include <asm/mte.h>
|
||||||
#include <asm/memory.h>
|
#include <asm/memory.h>
|
||||||
#include <asm/mmu_context.h>
|
#include <asm/mmu_context.h>
|
||||||
@@ -77,6 +78,8 @@ void notrace __cpu_suspend_exit(void)
|
|||||||
*/
|
*/
|
||||||
spectre_v4_enable_mitigation(NULL);
|
spectre_v4_enable_mitigation(NULL);
|
||||||
|
|
||||||
|
sme_suspend_exit();
|
||||||
|
|
||||||
/* Restore additional feature-specific configuration */
|
/* Restore additional feature-specific configuration */
|
||||||
ptrauth_suspend_exit();
|
ptrauth_suspend_exit();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,11 +68,9 @@ VDSO_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
|
|||||||
-fno-strict-aliasing -fno-common \
|
-fno-strict-aliasing -fno-common \
|
||||||
-Werror-implicit-function-declaration \
|
-Werror-implicit-function-declaration \
|
||||||
-Wno-format-security \
|
-Wno-format-security \
|
||||||
-Wdeclaration-after-statement \
|
|
||||||
-std=gnu11
|
-std=gnu11
|
||||||
VDSO_CFLAGS += -O2
|
VDSO_CFLAGS += -O2
|
||||||
# Some useful compiler-dependent flags from top-level Makefile
|
# Some useful compiler-dependent flags from top-level Makefile
|
||||||
VDSO_CFLAGS += $(call cc32-option,-Wdeclaration-after-statement,)
|
|
||||||
VDSO_CFLAGS += $(call cc32-option,-Wno-pointer-sign)
|
VDSO_CFLAGS += $(call cc32-option,-Wno-pointer-sign)
|
||||||
VDSO_CFLAGS += -fno-strict-overflow
|
VDSO_CFLAGS += -fno-strict-overflow
|
||||||
VDSO_CFLAGS += $(call cc32-option,-Werror=strict-prototypes)
|
VDSO_CFLAGS += $(call cc32-option,-Werror=strict-prototypes)
|
||||||
|
|||||||
@@ -462,6 +462,9 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu)
|
|||||||
}
|
}
|
||||||
|
|
||||||
irq = vgic_get_irq(vcpu->kvm, NULL, intids[i]);
|
irq = vgic_get_irq(vcpu->kvm, NULL, intids[i]);
|
||||||
|
if (!irq)
|
||||||
|
continue;
|
||||||
|
|
||||||
raw_spin_lock_irqsave(&irq->irq_lock, flags);
|
raw_spin_lock_irqsave(&irq->irq_lock, flags);
|
||||||
irq->pending_latch = pendmask & (1U << bit_nr);
|
irq->pending_latch = pendmask & (1U << bit_nr);
|
||||||
vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
|
vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
|
||||||
@@ -1427,6 +1430,8 @@ static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its,
|
|||||||
|
|
||||||
for (i = 0; i < irq_count; i++) {
|
for (i = 0; i < irq_count; i++) {
|
||||||
irq = vgic_get_irq(kvm, NULL, intids[i]);
|
irq = vgic_get_irq(kvm, NULL, intids[i]);
|
||||||
|
if (!irq)
|
||||||
|
continue;
|
||||||
|
|
||||||
update_affinity(irq, vcpu2);
|
update_affinity(irq, vcpu2);
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
static __always_inline bool arch_static_branch(struct static_key *key,
|
static __always_inline bool arch_static_branch(struct static_key *key,
|
||||||
bool branch)
|
bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto(
|
asm goto(
|
||||||
"1: nop32 \n"
|
"1: nop32 \n"
|
||||||
" .pushsection __jump_table, \"aw\" \n"
|
" .pushsection __jump_table, \"aw\" \n"
|
||||||
" .align 2 \n"
|
" .align 2 \n"
|
||||||
@@ -29,7 +29,7 @@ label:
|
|||||||
static __always_inline bool arch_static_branch_jump(struct static_key *key,
|
static __always_inline bool arch_static_branch_jump(struct static_key *key,
|
||||||
bool branch)
|
bool branch)
|
||||||
{
|
{
|
||||||
asm_volatile_goto(
|
asm goto(
|
||||||
"1: bsr32 %l[label] \n"
|
"1: bsr32 %l[label] \n"
|
||||||
" .pushsection __jump_table, \"aw\" \n"
|
" .pushsection __jump_table, \"aw\" \n"
|
||||||
" .align 2 \n"
|
" .align 2 \n"
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ SECTIONS
|
|||||||
STABS_DEBUG
|
STABS_DEBUG
|
||||||
DWARF_DEBUG
|
DWARF_DEBUG
|
||||||
ELF_DETAILS
|
ELF_DETAILS
|
||||||
|
.hexagon.attributes 0 : { *(.hexagon.attributes) }
|
||||||
|
|
||||||
DISCARDS
|
DISCARDS
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ config LOONGARCH
|
|||||||
select ARCH_BINFMT_ELF_STATE
|
select ARCH_BINFMT_ELF_STATE
|
||||||
select ARCH_ENABLE_MEMORY_HOTPLUG
|
select ARCH_ENABLE_MEMORY_HOTPLUG
|
||||||
select ARCH_ENABLE_MEMORY_HOTREMOVE
|
select ARCH_ENABLE_MEMORY_HOTREMOVE
|
||||||
|
select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
|
||||||
select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
|
select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
|
||||||
select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
|
select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
|
||||||
select ARCH_HAS_PTE_SPECIAL
|
select ARCH_HAS_PTE_SPECIAL
|
||||||
@@ -80,6 +81,7 @@ config LOONGARCH
|
|||||||
select GPIOLIB
|
select GPIOLIB
|
||||||
select HAVE_ARCH_AUDITSYSCALL
|
select HAVE_ARCH_AUDITSYSCALL
|
||||||
select HAVE_ARCH_MMAP_RND_BITS if MMU
|
select HAVE_ARCH_MMAP_RND_BITS if MMU
|
||||||
|
select HAVE_ARCH_SECCOMP
|
||||||
select HAVE_ARCH_SECCOMP_FILTER
|
select HAVE_ARCH_SECCOMP_FILTER
|
||||||
select HAVE_ARCH_TRACEHOOK
|
select HAVE_ARCH_TRACEHOOK
|
||||||
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
|
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
|
||||||
@@ -461,23 +463,6 @@ config PHYSICAL_START
|
|||||||
specified in the "crashkernel=YM@XM" command line boot parameter
|
specified in the "crashkernel=YM@XM" command line boot parameter
|
||||||
passed to the panic-ed kernel).
|
passed to the panic-ed kernel).
|
||||||
|
|
||||||
config SECCOMP
|
|
||||||
bool "Enable seccomp to safely compute untrusted bytecode"
|
|
||||||
depends on PROC_FS
|
|
||||||
default y
|
|
||||||
help
|
|
||||||
This kernel feature is useful for number crunching applications
|
|
||||||
that may need to compute untrusted bytecode during their
|
|
||||||
execution. By using pipes or other transports made available to
|
|
||||||
the process as file descriptors supporting the read/write
|
|
||||||
syscalls, it's possible to isolate those applications in
|
|
||||||
their own address space using seccomp. Once seccomp is
|
|
||||||
enabled via /proc/<pid>/seccomp, it cannot be disabled
|
|
||||||
and the task is only allowed to execute a few safe syscalls
|
|
||||||
defined by each seccomp mode.
|
|
||||||
|
|
||||||
If unsure, say Y. Only embedded should say N here.
|
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
config ARCH_SELECT_MEMORY_MODEL
|
config ARCH_SELECT_MEMORY_MODEL
|
||||||
@@ -495,10 +480,6 @@ config ARCH_SPARSEMEM_ENABLE
|
|||||||
or have huge holes in the physical address space for other reasons.
|
or have huge holes in the physical address space for other reasons.
|
||||||
See <file:Documentation/mm/numa.rst> for more.
|
See <file:Documentation/mm/numa.rst> for more.
|
||||||
|
|
||||||
config ARCH_ENABLE_THP_MIGRATION
|
|
||||||
def_bool y
|
|
||||||
depends on TRANSPARENT_HUGEPAGE
|
|
||||||
|
|
||||||
config ARCH_MEMORY_PROBE
|
config ARCH_MEMORY_PROBE
|
||||||
def_bool y
|
def_bool y
|
||||||
depends on MEMORY_HOTPLUG
|
depends on MEMORY_HOTPLUG
|
||||||
|
|||||||
@@ -72,6 +72,8 @@ extern void __memcpy_fromio(void *to, const volatile void __iomem *from, size_t
|
|||||||
#define memcpy_fromio(a, c, l) __memcpy_fromio((a), (c), (l))
|
#define memcpy_fromio(a, c, l) __memcpy_fromio((a), (c), (l))
|
||||||
#define memcpy_toio(c, a, l) __memcpy_toio((c), (a), (l))
|
#define memcpy_toio(c, a, l) __memcpy_toio((c), (a), (l))
|
||||||
|
|
||||||
|
#define __io_aw() mmiowb()
|
||||||
|
|
||||||
#include <asm-generic/io.h>
|
#include <asm-generic/io.h>
|
||||||
|
|
||||||
#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
|
#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user