Merge tag 'android14-6.1.68_r00' into branch 'android14-6.1'
This merges the changes up to 6.1.68 LTS into the android14-6.1 branch. Included in here are the following commits: *8968561242
ANDROID: fix crc error in put_cmsg caused in 6.1.68 *c077094653
Revert "hrtimers: Push pending hrtimers away from outgoing CPU earlier" *e0690152b8
Revert "drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group" *c9b484c69d
Merge 6.1.68 into android14-6.1-lts |\ | *ba6f5fb465
Linux 6.1.68 | *f38b4e99e2
drm/i915: Skip some timing checks on BXT/GLK DSI transcoders | *d9ef7b05cc
drm/i915/sdvo: stop caching has_hdmi_monitor in struct intel_sdvo | *cf70d62ace
drm/i915/lvds: Use REG_BIT() & co. | *e6d55cf493
drm/i915/display: Drop check for doublescan mode in modevalid | *9c322aaf28
riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE | *189c2a8293
netfilter: nft_set_pipapo: skip inactive elements during set walk | *b4e440cf60
MIPS: Loongson64: Enable DMA noncoherent support | *d52a5178cb
MIPS: Loongson64: Handle more memory types passed from firmware | *8d18a01585
MIPS: Loongson64: Reserve vgabios memory on boot | *2b9b2d28a9
KVM: SVM: Update EFER software model on CR0 trap for SEV-ES | *6d6314c3db
KVM: s390/mm: Properly reset no-dat | *be297475ca
MIPS: kernel: Clear FPU states when setting up kernel threads | *358bd5f436
cifs: Fix flushing, invalidation and file size with FICLONE | *18b02e4343
cifs: Fix flushing, invalidation and file size with copy_file_range() | *69540c108d
USB: gadget: core: adjust uevent timing on gadget unbind | *2467f4f8cb
x86/CPU/AMD: Check vendor in the AMD microcode callback | *0553d52908
devcoredump: Send uevent once devcd is ready | *74799b43d8
serial: 8250_omap: Add earlycon support for the AM654 UART controller | *d59dafa9eb
serial: 8250: 8250_omap: Do not start RX DMA on THRI interrupt | *638a6cbace
serial: 8250: 8250_omap: Clear UART_HAS_RHR_IT_DIS bit | *f434703fb8
serial: sc16is7xx: address RX timeout interrupt errata | *a8027753ab
ARM: PL011: Fix DMA support | *c909ce57d0
usb: typec: class: fix typec_altmode_put_partner to put plugs | *b12ccef705
smb: client: fix potential NULL deref in parse_dfs_referrals() | *f48430635b
Revert "xhci: Loosen RPM as default policy to cover for AMD xHC 1.1" | *9ce109b748
cifs: Fix non-availability of dedup breaking generic/304 | *8e25331ea5
parport: Add support for Brainboxes IX/UC/PX parallel cards | *bee9affd37
serial: 8250_dw: Add ACPI ID for Granite Rapids-D UART | *16da1f84f5
usb: gadget: f_hid: fix report descriptor allocation | *c8bf22e0d0
drm/amdgpu: Update EEPROM I2C address for smu v13_0_0 | *8750977871
drm/amdgpu: Add I2C EEPROM support on smu v13_0_6 | *4ccb34d431
drm/amdgpu: simplify amdgpu_ras_eeprom.c | *af6b1f1156
drm/amdgpu: Return from switch early for EEPROM I2C address | *a3049c9a30
drm/amdgpu: Remove second moot switch to set EEPROM I2C address | *30289057ef
drm/amdgpu: Add support for RAS table at 0x40000 | *c67c553b4d
drm/amdgpu: Decouple RAS EEPROM addresses from chips | *ee9efcdc76
drm/amdgpu: Remove redundant I2C EEPROM address | *a945568638
drm/amdgpu: Add EEPROM I2C address support for ip discovery | *f549f837b9
drm/amdgpu: Update ras eeprom support for smu v13_0_0 and v13_0_10 | *458affed06
drm/amdgpu: correct the amdgpu runtime dereference usage count | *41c5dd545e
drm/amd/amdgpu: Fix warnings in amdgpu/amdgpu_display.c | *613eaee445
drm/amdgpu: fix memory overflow in the IB test | *1705927a10
gpiolib: sysfs: Fix error handling on failed export | *4b716fcacd
x86/sev: Fix kernel crash due to late update to read-only ghcb_version | *06dec254c5
perf: Fix perf_event_validate_size() | *b0c195a825
arm64: dts: mt8183: kukui: Fix underscores in node names | *8a3d746c7e
arm64: dts: mediatek: add missing space before { | *5656634ce0
parisc: Fix asm operand number out of range build error in bug table | *f9e9e156db
parisc: Reduce size of the bug_table on 64-bit kernel by half | *8479f5ca8b
tracing: Stop current tracer when resizing buffer | *df4aa7e84d
tracing: Set actual size after ring buffer resize | *07ad456e1c
ring-buffer: Force absolute timestamp on discard of event | *40421e0cf3
LoongArch: BPF: Don't sign extend function return value | *ebb09d58df
LoongArch: BPF: Don't sign extend memory load operand | *066dcd87b9
misc: mei: client.c: fix problem of return '-EOVERFLOW' in mei_cl_write | *d78789ba21
misc: mei: client.c: return negative error code in mei_cl_write | *672976c28e
hwtracing: hisi_ptt: Add dummy callback pmu::read() | *0b80e6af0d
coresight: etm4x: Remove bogous __exit annotation for some functions | *766b29f614
coresight: etm4x: Make etm4_remove_dev() return void | *920f84a6e8
binder: fix memory leaks of spam and pending work | *18847b6bba
arm64: dts: mediatek: mt8183-evb: Fix unit_address_vs_reg warning on ntc | *c428285eab
arm64: dts: mediatek: mt8183: Move thermal-zones to the root node | *bdd7508661
arm64: dts: mediatek: mt8183: Fix unit address for scp reserved memory | *66398d1856
arm64: dts: mediatek: mt8195: Fix PM suspend/resume with venc clocks | *e1d4f02a68
arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names | *ff566a8d76
arm64: dts: mediatek: cherry: Fix interrupt cells for MT6360 on I2C7 | *6d50aa9656
arm64: dts: mediatek: mt8183-kukui-jacuzzi: fix dsi unnecessary cells properties | *c2adea3191
arm64: dts: mediatek: mt7622: fix memory node warning check | *515d971cd2
md/raid6: use valid sector values to determine if an I/O should wait on the reshape | *4132cc3a3a
powercap: DTPM: Fix missing cpufreq_cpu_put() calls | *686cc4de09
mm: fix oops when filemap_map_pmd() without prealloc_pte | *574a6db80f
hugetlb: fix null-ptr-deref in hugetlb_vma_lock_write | *f5e6958919
platform/surface: aggregator: fix recv_buf() return value | *bcd50a3bd6
regmap: fix bogus error on regcache_sync success | *1c1c6d5c7e
r8169: fix rtl8125b PAUSE frames blasting when suspended | *6a71d77856
packet: Move reference count in packet_sock to atomic_long_t | *15c251f814
tracing: Fix a possible race when disabling buffered events | *b00b500916
tracing: Fix incomplete locking when disabling buffered events | *6e0d6c685b
tracing: Disable snapshot buffer when stopping instance tracers | *20fd56ca2e
tracing: Always update snapshot buffer size | *f33d663db0
checkstack: fix printed address | *4c00f01832
cgroup_freezer: cgroup_freezing: Check if not frozen | *3907e9cc85
nilfs2: prevent WARNING in nilfs_sufile_set_segment_usage() | *c344e99dd8
nilfs2: fix missing error check for sb_set_blocksize call | *d2558e726e
ring-buffer: Test last update in 32bit version of __rb_time_read() | *c4dcc915ea
ALSA: hda/realtek: Add Framework laptop 16 to quirks | *0675fe3b32
ALSA: hda/realtek: add new Framework laptop to quirks | *8b23707c8a
ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5 | *dc1141ae5c
ALSA: pcm: fix out-of-bounds in snd_pcm_state_names | *bb43c57c3d
ALSA: usb-audio: Add Pioneer DJM-450 mixer controls | *bfe5a5e2f9
io_uring: fix mutex_unlock with unreferenced ctx | *8bba38f7a0
nvme-pci: Add sleep quirk for Kingston drives | *f2f57f51b5
io_uring/af_unix: disable sending io_uring over sockets | *515c25be77
ASoC: amd: yc: Fix non-functional mic on ASUS E1504FA | *0fcfc90c86
kprobes: consistent rcu api usage for kretprobe holder | *a5325a055f
rethook: Use __rcu pointer for rethook::handler | *68bc7b2003
iommu: Avoid more races around device probe | *3c796895b4
md: don't leave 'MD_RECOVERY_FROZEN' in error path of md_set_readonly() | *5255ded034
md: introduce md_ro_state | *a38c1e766f
riscv: fix misaligned access handling of C.SWSP and C.SDSP | *8b41bdcc22
ARM: dts: imx28-xea: Pass the 'model' property | *282b5acd58
ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt | *12ac3b0ab8
ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init | *4d8cc87d18
scsi: be2iscsi: Fix a memleak in beiscsi_init_wrb_handle() | *bc5b79df6d
tracing: Fix a warning when allocating buffered events fails | *fc2d811d31
ARM: dts: imx6ul-pico: Describe the Ethernet PHY clock | *22143a0e5a
arm64: dts: imx8mp: imx8mq: Add parkmode-disable-ss-quirk on DWC3 | *8dd0e20b41
arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb | *188de9839f
drm/bridge: tc358768: select CONFIG_VIDEOMODE_HELPERS | *1ff56298ab
RDMA/irdma: Avoid free the non-cqp_request scratch | *0a929e8375
RDMA/core: Fix umem iterator when PAGE_SIZE is greater then HCA pgsz | *ebcb4e19d3
ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate | *2358e53208
hwmon: (nzxt-kraken2) Fix error handling path in kraken2_probe() | *3baaba7908
ASoC: codecs: lpass-tx-macro: set active_decimator correct default value | *c11b7e26d2
hwmon: (acpi_power_meter) Fix 4.29 MW bug | *19269741c3
RDMA/irdma: Fix UAF in irdma_sc_ccq_get_cqe_info() | *439857e2fe
RDMA/irdma: Refactor error handling in create CQP | *59a022a869
RDMA/bnxt_re: Correct module description string | *7ed498095c
RDMA/rtrs-clt: Remove the warnings for req in_use check | *03095a6440
RDMA/rtrs-clt: Fix the max_send_wr setting | *233c32bcf0
RDMA/rtrs-srv: Destroy path files after making sure no IOs in-flight | *7be574c34d
RDMA/rtrs-srv: Free srv_mr iu only when always_invalidate is true | *9dd976c435
RDMA/rtrs-srv: Check return values while processing info request | *3910ccbf25
RDMA/rtrs-clt: Start hb after path_up | *1e46485045
RDMA/rtrs-srv: Do not unconditionally enable irq | *4a8774a633
ASoC: fsl_sai: Fix no frame sync clock issue on i.MX8MP | *3166c76d1d
arm64: dts: rockchip: Expand reg size of vdec node for RK3399 | *aa9ae3dffc
arm64: dts: rockchip: Expand reg size of vdec node for RK3328 | *945bfe4e0b
RDMA/irdma: Add wait for suspend on SQD | *0b0afd4e14
RDMA/irdma: Do not modify to SQD on error | *9d005ea01e
RDMA/hns: Fix unnecessary err return when using invalid congest control algorithm | *1c9561b438
tee: optee: Fix supplicant based device enumeration | *5fd29433b2
mm/damon/sysfs: eliminate potential uninitialized variable warning | *b5ca945612
drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group | *07c8229c02
psample: Require 'CAP_NET_ADMIN' when joining "packets" group | *af39b80173
bpf: sockmap, updating the sg structure should also update curr | *008b807fe4
tcp: do not accept ACK of bytes we never sent | *7a63521ed0
netfilter: xt_owner: Fix for unsafe access of sk->sk_socket | *3176160c22
netfilter: nf_tables: validate family when identifying table via handle | *96f8654b70
netfilter: nf_tables: bail out on mismatching dynset and set expressions | *c9704c2619
netfilter: nf_tables: fix 'exist' matching on bigendian arches | *0bfbfd9423
netfilter: nft_exthdr: add boolean DCCP option matching | *9225a4566b
dt-bindings: interrupt-controller: Allow #power-domain-cells | *6b9e78d6c6
octeontx2-af: Update Tx link register range | *9be8f66ea8
octeontx2-af: Add missing mcs flr handler call | *d54470adfc
octeontx2-af: Fix mcs stats register address | *90773de073
octeontx2-af: Fix mcs sa cam entries size | *0c8baa37bf
octeontx2-af: Adjust Tx credits when MCS external bypass is disabled | *d2689aea4f
net: hns: fix fake link up on xge port | *217cc7f6a6
net: hns: fix wrong head when modify the tx feature when sending packets | *87559196c3
net: atlantic: Fix NULL dereference of skb pointer in | *64c78c57e3
ipv4: ip_gre: Avoid skb_pull() failure in ipgre_xmit() | *ce3c5acb59
ionic: Fix dim work handling in split interrupt mode | *a92719900f
ionic: fix snprintf format length warning | *c91685ac1b
tcp: fix mid stream window clamp. | *9fc81912fc
net: bnxt: fix a potential use-after-free in bnxt_init_tc | *0d33871b66
iavf: validate tx_coalesce_usecs even if rx_coalesce_usecs is zero | *75fd86e541
i40e: Fix unexpected MFS warning message | *ba6eb3a77a
octeontx2-af: fix a use-after-free in rvu_npa_register_reporters | *2c0cbb97b1
xsk: Skip polling event check for unbound socket | *ed7e211b67
net: stmmac: fix FPE events losing | *1a41ffc4dc
octeontx2-pf: consider both Rx and Tx packet stats for adaptive interrupt coalescing | *8d034da825
arcnet: restoring support for multiple Sohard Arcnet cards | *3c32379695
platform/mellanox: Check devm_hwmon_device_register_with_groups() return value | *29d82b366a
platform/mellanox: Add null pointer checks for devm_kasprintf() | *646f1e9c19
mlxbf-bootctl: correctly identify secure boot with development keys | *ef91309a57
r8152: Add RTL8152_INACCESSIBLE to r8153_aldps_en() | *d11ef4d3dd
r8152: Add RTL8152_INACCESSIBLE to r8153_pre_firmware_1() | *284cd311bb
r8152: Add RTL8152_INACCESSIBLE to r8156b_wait_loading_flash() | *0823990da7
r8152: Add RTL8152_INACCESSIBLE checks to more loops | *3759e73556
r8152: Rename RTL8152_UNPLUG to RTL8152_INACCESSIBLE | *ecb5068f55
hv_netvsc: rndis_filter needs to select NLS | *80de965ca5
octeontx2-af: Check return value of nix_get_nixlf before using nixlf | *f565044d1d
octeontx2-pf: Add missing mutex lock in otx2_get_pauseparam | *a3f5de10b5
ipv6: fix potential NULL deref in fib6_add() | *e2b202821d
platform/x86: wmi: Skip blocks with zero instances | *b536601d05
of: dynamic: Fix of_reconfig_get_state_change() return value documentation | *76b9ea6f54
platform/x86: asus-wmi: Move i8042 filter install to shared asus-wmi code | *3453531284
dt: dt-extract-compatibles: Don't follow symlinks when walking tree | *8a124b9e78
dt: dt-extract-compatibles: Handle cfile arguments in generator function | *cde700ceb0
x86/tdx: Allow 32-bit emulation by default | *e09d243a51
x86/entry: Do not allow external 0x80 interrupts | *d5f999317e
x86/entry: Convert INT 0x80 emulation to IDTENTRY | *b8ec27ae22
x86/coco: Disable 32-bit emulation by default on TDX and SEV | *0870f19b54
x86: Introduce ia32_enabled() | *9046665bef
drm/amdgpu: correct chunk_ptr to a pointer to chunk. | *18209382db
kconfig: fix memory leak from range properties | *bcc2abaa40
tg3: Increment tx_dropped in tg3_tso_bug() | *9bbc655e18
tg3: Move the [rt]x_dropped counters to tg3_napi | *62c6d82bac
zstd: Fix array-index-out-of-bounds UBSAN warning | *875ee3a09e
netfilter: ipset: fix race condition between swap/destroy and kernel side add/del/test | *6025052bbf
i2c: designware: Fix corrupted memory seen in the ISR | *75b5016ce3
hrtimers: Push pending hrtimers away from outgoing CPU earlier | *8ea2b4ba9b
vdpa/mlx5: preserve CVQ vringh index * |2af1386be0
Merge "Merge 6.1.67 into android14-6.1-lts" into android14-6.1-lts |\ \ | * |0292321d13
Merge 6.1.67 into android14-6.1-lts | |\| | | *e7cddbb41b
Linux 6.1.67 | | *db46c77f3d
Revert "wifi: cfg80211: fix CQM for non-range use" | * |c539451364
Revert "mmc: core: add helpers mmc_regulator_enable/disable_vqmmc" | * |975d5f2ae9
Revert "mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled" * | |44affaea1e
Revert "mmc: core: add helpers mmc_regulator_enable/disable_vqmmc" * | |c49b4a744f
Revert "mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled" * | |59f96234bf
Merge "Merge 6.1.66 into android14-6.1-lts" into android14-6.1-lts |\| | | * |6b1e1d37f1
Merge 6.1.66 into android14-6.1-lts | |\| | | *6c6a6c7e21
Linux 6.1.66 | | *ea574927fc
iomap: update ki_pos a little later in iomap_dio_complete | | *adf0ecebf0
x86/apic/msi: Fix misconfigured non-maskable MSI quirk | | *b3b839fb63
x86/xen: fix percpu vcpu_info allocation | | *00bc8b2cf4
xen: simplify evtchn_do_upcall() call maze | | *9311a0ff38
xen: Allow platform PCI interrupt to be shared | | *402b832346
r8169: fix deadlock on RTL8125 in jumbo mtu mode | | *22ee0ddb2a
r8169: disable ASPM in case of tx timeout | | *10ce630100
drm/amd/display: Fix MPCC 1DLUT programming | | *8332cb6c63
drm/amd/display: Fix the delta clamping for shaper LUT | | *442a4d4d01
drm/amd/display: clean code-style issues in dcn30_set_mpc_shaper_3dlut | | *6cd7362721
drm/amd/display: Expand kernel doc for DC | | *8b01195be4
mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled | | *38d3216032
mmc: core: add helpers mmc_regulator_enable/disable_vqmmc | | *0e0a951668
drm/amd/pm: fix a memleak in aldebaran_tables_init | | *59862b8692
iommu/vt-d: Make context clearing consistent with context mapping | | *ee2c224769
iommu/vt-d: Disable PCI ATS in legacy passthrough mode | | *8f39d297a2
iommu/vt-d: Add device_block_translation() helper | | *3787b3168b
iommu/vt-d: Allocate pasid table in device probe path | | *681aeeda41
iommu/vt-d: Omit devTLB invalidation requests when TES=0 | | *8aaed5b81d
cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily | | *d3788f6e9d
cpufreq: imx6q: don't warn for disabling a non-existing frequency | | *195514bda6
drm/amd/display: Guard against invalid RPTR/WPTR being set | | *395a63ca1a
drm/amd/display: Restore rptr/wptr for DMCUB as workaround | | *4ec4508db9
spi: Fix null dereference on suspend | | *b57eebfb80
fbdev: stifb: Make the STI next font pointer a 32-bit signed offset | | *5bc8d96fed
PCI: qcom-ep: Add dedicated callback for writing to DBI2 registers | | *10c3d86fea
octeontx2-af: Initialize 'cntr_val' to fix uninitialized symbol error | | *1c8f75ee92
PCI: Lengthen reset delay for VideoPropulsion Torrent QN16e card | | *7545ddda9c
KVM: x86: Fix lapic timer interrupt lost after loading a snapshot. | | *21feaf558f
net: ravb: Keep reverse order of operations in ravb_remove() | | *8d04278ff4
net: ravb: Stop DMA in case of failures on ravb_open() | | *52b751686c
net: ravb: Start TX queues after HW initialization succeeded | | *e2db25d16c
net: ravb: Make write access to CXR35 first before accessing other EMAC registers | | *f5c649ce79
net: ravb: Use pm_runtime_resume_and_get() | | *149b2fe12a
net: ravb: Check return value of reset_control_deassert() | | *7ed2e4c2d0
ravb: Fix races between ravb_tx_timeout_work() and net related ops | | *8b1d088be5
r8169: prevent potential deadlock in rtl8169_close | | *9c4ac2d98a
octeontx2-pf: Restore TC ingress police rules when interface is up | | *aef2d5b3e5
octeontx2-af: Install TC filter rules in hardware based on priority | | *662b887084
octeontx2-pf: Fix adding mbox work queue entry when num_vfs > 64 | | *5d5bcfb1ca
net: stmmac: xgmac: Disable FPE MMC interrupts | | *334e6378c2
octeontx2-af: Fix possible buffer overflow | | *c3e974e9c4
selftests/net: mptcp: fix uninitialized variable warnings | | *12dd4c1bf3
selftests/net: unix: fix unused variable compiler warning | | *4e999af7cf
selftests/net: fix a char signedness issue | | *249ceee95c
selftests/net: ipsec: fix constant out of range | | *e01249a839
uapi: propagate __struct_group() attributes to the container union | | *fd91b48f10
dpaa2-eth: increase the needed headroom to account for alignment | | *94445d9583
ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet | | *f89fef7710
usb: config: fix iteration issue in 'usb_get_bos_descriptor()' | | *9aff7c51b4
USB: core: Change configuration warnings to notices | | *c89b34eef3
USB: xhci-plat: fix legacy PHY double init | | *307a6525c8
wifi: cfg80211: fix CQM for non-range use | | *e8c1105c0c
serial: sc16is7xx: add missing support for rs485 devicetree properties | | *55061c3230
serial: sc16is7xx: Put IOControl register into regmap_volatile | | *a491c7be35
auxdisplay: hd44780: move cursor home after clear display command | | *7f21167775
Input: xpad - add HyperX Clutch Gladiate Support | | *7a105de275
btrfs: fix 64bit compat send ioctl arguments not initializing version member | | *32912ee869
btrfs: make error messages more clear when getting a chunk map | | *4fc9c61c02
btrfs: send: ensure send_fd is writable | | *86742a963f
btrfs: fix off-by-one when checking chunk map includes logical address | | *9fe447c485
btrfs: ref-verify: fix memory leaks in btrfs_ref_tree_mod() | | *3f26d9b257
btrfs: add dmesg output for first mount and last unmount of a filesystem | | *0ad7d59e79
parisc: Mark altinstructions read-only and 32-bit aligned | | *cf2ae6494d
parisc: Ensure 32-bit alignment on parisc unwind section | | *2acfff5730
parisc: Mark jump_table naturally aligned | | *3793cd2ded
parisc: Drop the HP-UX ENOSYM and EREMOTERELEASE error codes | | *79a1fdf4c2
parisc: Mark lock_aligned variables 16-byte aligned on SMP | | *41d7852a0a
parisc: Use natural CPU alignment for bug_table | | *c7c78a4aa6
parisc: Mark ex_table entries 32-bit aligned in uaccess.h | | *645e4b693b
parisc: Mark ex_table entries 32-bit aligned in assembly.h | | *c23b9eaca8
powerpc: Don't clobber f0/vs0 during fp|altivec register save | | *e6bc42fae6
KVM: PPC: Book3S HV: Fix KVM_RUN clobbering FP/VEC user registers | | *59419ebcc0
iommu/vt-d: Add MTL to quirk list to skip TE disabling | | *0b48970ce1
bcache: revert replacing IS_ERR_OR_NULL with IS_ERR | | *fc98ea2699
dma-buf: fix check in dma_resv_add_fence | | *4da1556996
cpufreq/amd-pstate: Fix the return value of amd_pstate_fast_switch() | | *9d4c721c18
powercap: DTPM: Fix unneeded conversions to micro-Watts | | *a62ca58bb3
nvme: check for valid nvme_identify_ns() before using it | | *82b5e603ed
dm verity: don't perform FEC for failed readahead IO | | *6f5a9fc94b
dm verity: initialize fec io before freeing it | | *7cfc3884a8
drm/amd/display: fix ABM disablement | | *859a3a9f1e
drm/amd/display: Update min Z8 residency time to 2100 for DCN314 | | *6ef7f13c72
drm/amd/display: Use DRAM speed from validation for dummy p-state | | *a67c187047
drm/amd/display: Remove min_dst_y_next_start check for Z8 | | *33ed892f0c
drm/amd/display: Include udelay when waiting for INBOX0 ACK | | *c5cf436c89
drm/amdgpu: Force order between a read and write to the same address | | *c608842963
drm/amd: Enable PCIe PME from D3 | | *cebccbe801
scsi: sd: Fix system start for ATA devices | | *181fd67dc5
scsi: Change SCSI device boolean fields to single bit flags | | *7d2faae81b
dm-verity: align struct dm_verity_fec_io properly | | *da9f55393f
ALSA: hda/realtek: Add supported ALC257 for ChromeOS | | *f4b1302134
ALSA: hda/realtek: Headset Mic VREF to 100% | | *65654af4c8
ALSA: hda: Disable power-save on KONTRON SinglePC | | *ba911edc6c
mmc: block: Be sure to wait while busy in CQE error recovery | | *eab9ec6446
mmc: block: Do not lose cache flush during CQE error recovery | | *e121f6d73d
mmc: block: Retry commands in CQE error recovery | | *3a9a9c256f
mmc: cqhci: Fix task clearing in CQE error recovery | | *def67fd8ef
mmc: cqhci: Warn of halt or task clear failure | | *2ebc8b758c
mmc: cqhci: Increase recovery halt timeout | | *d2fc10e262
mmc: sdhci-pci-gli: Disable LPM during initialization | | *87ceaa8521
firewire: core: fix possible memory leak in create_units() | | *db0b69e46d
pinctrl: avoid reload of p state in list iteration | | *74820f7406
smb: client: report correct st_size for SMB and NFS symlinks | | *60fed17ca5
cifs: Fix FALLOC_FL_INSERT_RANGE by setting i_size after EOF moved | | *6406cce4b2
cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved | * |157836a2ab
Merge 6.1.65 into android14-6.1-lts | |\| * | |1775bee186
Revert "HID: fix HID device resource race between HID core and debugging support" * | |ee16988743
Merge 6.1.65 into android14-6.1-lts |\ \ \ | | |/ | |/| | * |c6114c8459
Linux 6.1.65 | * |66ecd1cd8b
io_uring: fix off-by one bvec index | * |812171018e
USB: dwc3: qcom: fix wakeup after probe deferral | * |72ef87bb8e
USB: dwc3: qcom: fix software node leak on probe errors | * |fc7b2fe267
usb: dwc3: set the dma max_seg_size | * |92b9eca53d
usb: dwc3: Fix default mode initialization | * |451c5a6172
USB: dwc2: write HCINT with INTMASK applied | * |d9be7a1297
usb: typec: tcpm: Skip hard reset when in error recovery | * |c15cb712da
USB: serial: option: don't claim interface 4 for ZTE MF290 | * |5a657b34fe
USB: serial: option: fix FM101R-GL defines | * |4fccb016ff
USB: serial: option: add Fibocom L7xx modules | * |f70b0b6fd8
usb: cdnsp: Fix deadlock issue during using NCM gadget | * |f9ba5dd0d9
bcache: fixup lock c->root error | * |c736af32a8
bcache: fixup init dirty data errors | * |c37aca3dd5
bcache: prevent potential division by zero error | * |366f3648f1
bcache: check return value from btree_node_alloc_replacement() | * |4241b51f3e
dm-delay: fix a race between delay_presuspend and delay_bio | * |c4d3957510
hv_netvsc: Mark VF as slave before exposing it to user-mode | * |5dd83db613
hv_netvsc: Fix race of register_netdevice_notifier and VF register | * |e8ef65c174
hv_netvsc: fix race of netvsc and VF register_netdevice | * |043c8e0306
USB: serial: option: add Luat Air72*U series products | * |dc96fde8fc
s390/dasd: protect device queue against concurrent access | * |b964a0a391
io_uring/fs: consider link->flags when getting path for LINKAT | * |12f4971589
bcache: fixup multi-threaded bch_sectors_dirty_init() wake-up race | * |fa9bacc1d5
md: fix bi_status reporting in md_end_clone_io | * |415f644b1f
bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce() | * |354d162ba5
swiotlb-xen: provide the "max_mapping_size" method | * |05591c0d17
ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CVA | * |1ed904f424
arm64: dts: imx8mn-var-som: add 20ms delay to ethernet regulator enable | * |5d9ddbf4b5
NFSD: Fix checksum mismatches in the duplicate reply cache | * |b597f3c85d
NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update() | * |d7eb37615b
ext4: make sure allocate pending entry not fail | * |8384d8c5cc
ext4: fix slab-use-after-free in ext4_es_insert_extent() | * |9164978bce
ext4: using nofail preallocation in ext4_es_insert_extent() | * |614b383d01
ext4: using nofail preallocation in ext4_es_insert_delayed_block() | * |51cef2a5c6
ext4: using nofail preallocation in ext4_es_remove_extent() | * |f1c2369366
ext4: use pre-allocated es in __es_remove_extent() | * |ce581f8631
ext4: use pre-allocated es in __es_insert_extent() | * |594a5f00e5
ext4: factor out __es_alloc_extent() and __es_free_extent() | * |9381ff6512
ext4: add a new helper to check if es must be kept | * |3a14f4fd7b
media: qcom: camss: Fix genpd cleanup | * |df5bb7b408
media: qcom: camss: Fix V4L2 async notifier error path | * |fdfcdf9697
media: qcom: Initialise V4L2 async notifier later | * |153a4396c3
media: camss: Convert to platform remove callback returning void | * |4ae3c85e73
media: camss: Split power domain management | * |8bdcaa7c03
MIPS: KVM: Fix a build warning about variable set but not used | * |e9c3d6b09c
cifs: fix leak of iface for primary channel | * |b24d42b52b
cifs: account for primary channel in the interface list | * |548893404c
cifs: distribute channels across interfaces based on speed | * |5607a415d4
cifs: print last update time for interface list | * |f4dff37111
smb3: allow dumping session and tcon id to improve stats analysis and debugging | * |fbc666a9ac
cifs: minor cleanup of some headers | * |c2d336140a
lockdep: Fix block chain corruption | * |e9611e8404
USB: dwc3: qcom: fix ACPI platform device leak | * |eaa315288b
USB: dwc3: qcom: fix resource leaks on probe deferral | * |0e485f12eb
nvmet: nul-terminate the NQNs passed in the connect command | * |573fa2b708
i40e: Fix adding unsupported cloud filters | * |f7f3e69ced
i40e: use ERR_PTR error print in i40e messages | * |27f5dd22af
arm64: mm: Fix "rodata=on" when CONFIG_RODATA_FULL_DEFAULT_ENABLED=y | * |558b8ee45f
mm,kfence: decouple kfence from page granularity mapping judgement | * |48b3ee0134
afs: Fix file locking on R/O volumes to operate in local mode | * |f9cf17836e
afs: Return ENOENT if no cell DNS record can be found | * |8025fd0706
net: axienet: Fix check for partial TX checksum | * |3481ff3811
amd-xgbe: propagate the correct speed and duplex status | * |73d114dd57
amd-xgbe: handle the corner-case during tx completion | * |4bcc07bb36
amd-xgbe: handle corner-case during sfp hotplug | * |76b088b639
octeontx2-pf: Fix ntuple rule creation to direct packet to VF with higher Rx queue than its PF | * |97703eb199
arm/xen: fix xen_vcpu_info allocation alignment | * |94a0ae698b
net/smc: avoid data corruption caused by decline | * |a573b334be
net: usb: ax88179_178a: fix failed operations during ax88179_reset | * |e784313dd0
ipv4: Correct/silence an endian warning in __ip_do_redirect | * |377c4c7e97
HID: fix HID device resource race between HID core and debugging support | * |8e9a649965
drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full | * |84a6e47545
drm/i915: do not clean GT table on error path | * |84c9d30dbc
ata: pata_isapnp: Add missing error check for devm_ioport_map() | * |cfbdb36727
octeontx2-pf: Fix memory leak during interface down | * |4206f46d3f
wireguard: use DEV_STATS_INC() | * |7dfa514744
drm/panel: simple: Fix Innolux G101ICE-L01 timings | * |7f5eae8585
drm/panel: simple: Fix Innolux G101ICE-L01 bus flags | * |39f11604e5
drm/panel: auo,b101uan08.3: Fine tune the panel power sequence | * |84b232a9c8
drm/panel: boe-tv101wum-nl6: Fine tune the panel power sequence | * |d2b3bc8c7f
afs: Make error on cell lookup failure consistent with OpenAFS | * |790ea5bc40
afs: Fix afs_server_list to be cleaned up with RCU * | |a01e106f08
Merge branch 'android14-6.1' into branch 'android14-6.1-lts' | |/ |/| * |fc9e81c1a1
ANDROID: Fix up merge issues in 6.1.64 in net/netfilter/nf_tables_api.c * |31e1ff253d
ANDROID: Fix up unneeded crc break in af_vsock.c * |8a7ce2ee18
Revert "mmc: Add quirk MMC_QUIRK_BROKEN_CACHE_FLUSH for Micron eMMC Q2J54A" * |dcea2ba909
Revert "ASoC: soc-card: Add storage for PCI SSID" * |88487f809a
Revert "tracing: Have trace_event_file have ref counters" * |fd71493204
Revert "workqueue: Provide one lock class key per work_on_cpu() callsite" * |f1bc13cb9d
Merge 6.1.64 into android14-6.1-lts |\| | *6ac30d748b
Linux 6.1.64 | *04ff8a5107
RISC-V: drop error print from riscv_hartid_to_cpuid() | *9e1e0887ea
cxl/port: Fix NULL pointer access in devm_cxl_add_port() | *c88cfbb18a
mmc: sdhci-pci-gli: GL9755: Mask the replay timer timeout of AER | *2132941b45
Input: xpad - add VID for Turtle Beach controllers | *2fa74d29fc
tracing: Have trace_event_file have ref counters | *6460508dce
powerpc/powernv: Fix fortify source warnings in opal-prd.c | *4c55be0855
drm/amd/display: Change the DMCUB mailbox memory location from FB to inbox | *68d774eb10
drm/amd/display: Enable fast plane updates on DCN3.2 and above | *fb5c134ca5
drm/amd/display: fix a NULL pointer dereference in amdgpu_dm_i2c_xfer() | *51ffa1a379
drm/amdgpu: lower CS errors to debug severity | *c52aac5884
drm/amdgpu: fix error handling in amdgpu_bo_list_get() | *2ab6c1237b
drm/amdgpu: don't use ATRM for external devices | *965dce07a4
drm/amdgpu: don't use pci_is_thunderbolt_attached() | *8e54a91d3e
drm/amdgpu/smu13: drop compute workload workaround | *454d0cdd7c
drm/amd/pm: Fix error of MACO flag setting code | *07e94f204f
drm/i915: Fix potential spectre vulnerability | *9457636a49
drm/i915: Bump GLK CDCLK frequency when driving multiple pipes | *e973f40de1
drm/amd/pm: Handle non-terminated overdrive commands. | *dc4542861e
ext4: properly sync file size update after O_SYNC direct IO | *e1d0f68bc0
ext4: add missed brelse in update_backups | *1793dc461e
ext4: remove gdb backup copy for meta bg in setup_new_flex_group_blocks | *80ddcf21e7
ext4: correct the start block of counting reserved clusters | *ec4ba3d62f
ext4: correct return value of ext4_convert_meta_bg | *32b9fb9a67
ext4: mark buffer new if it is unwritten to avoid stale data exposure | *f0cc1368fa
ext4: correct offset of gdb backup in non meta_bg group to update_backups | *af075d06b3
ext4: apply umask if ACL support is disabled | *e795a56654
Revert "net: r8169: Disable multicast filter for RTL8168H and RTL8107E" | *eb2f435be2
media: qcom: camss: Fix csid-gen2 for test pattern generator | *eeab07ddd0
media: qcom: camss: Fix invalid clock enable bit disjunction | *18a06f2eeb
media: qcom: camss: Fix missing vfe_lite clocks check | *ddc424aedb
media: qcom: camss: Fix VFE-480 vfe_disable_output() | *0f3e5f93fe
media: qcom: camss: Fix VFE-17x vfe_disable_output() | *04ef31a3e3
media: qcom: camss: Fix vfe_get() error jump | *3166c3af55
media: qcom: camss: Fix pm_domain_on sequence in probe | *6dcb2605c2
mmc: sdhci-pci-gli: GL9750: Mask the replay timer timeout of AER | *f7164cb037
r8169: add handling DASH when DASH is disabled | *862565f324
r8169: fix network lost after resume on DASH systems | *9e9e2107ae
mptcp: fix setsockopt(IP_TOS) subflow locking | *dba6f08cef
mptcp: add validity check for sending RM_ADDR | *70ff9b65a7
mptcp: deal with large GSO size | *16fcda24b1
mm: kmem: drop __GFP_NOFAIL when allocating objcg vectors | *a7fd033550
mm: fix for negative counter: nr_file_hugepages | *2594bdaa16
mmc: sdhci-pci-gli: A workaround to allow GL9750 to enter ASPM L1.2 | *97fb6013f3
riscv: kprobes: allow writing to x0 | *645257ad8d
riscv: correct pt_level name via pgtable_l5/4_enabled | *fb1b16f041
riscv: mm: Update the comment of CONFIG_PAGE_OFFSET | *9f74b261e4
LoongArch: Mark __percpu functions as always inline | *1bb61fb790
nfsd: fix file memleak on client_opens_release | *a5d4be493a
dm-verity: don't use blocking calls from tasklets | *002d2473dd
drm/mediatek/dp: fix memory leak on ->get_edid callback error path | *5e9fcba176
drm/mediatek/dp: fix memory leak on ->get_edid callback audio detection | *e082326473
media: ccs: Correctly initialise try compose rectangle | *424fc46381
media: venus: hfi: add checks to handle capabilities from firmware | *9ebb3c14ec
media: venus: hfi: fix the check to handle session buffer requirement | *a3e0b55dea
media: venus: hfi_parser: Add check to keep the number of codecs within range | *997639c100
media: sharp: fix sharp encoding | *41c269083c
media: lirc: drop trailing space from scancode transmit | *526dd7540a
f2fs: avoid format-overflow warning | *6122b72ce5
f2fs: do not return EFSCORRUPTED, but try to run online repair | *e6fa9ac60f
i2c: i801: fix potential race in i801_block_transaction_byte_by_byte | *f5617a21c7
net: phylink: initialize carrier state at creation | *105d29fa8d
net: dsa: lan9303: consequently nested-lock physical MDIO | *eef592e71a
net: ethtool: Fix documentation of ethtool_sprintf() | *57e35d9229
s390/ap: fix AP bus crash on early config change callback invocation | *75d5c85cf4
i2c: designware: Disable TX_EMPTY irq while waiting for block length byte | *ba1a9eef3e
sbsa_gwdt: Calculate timeout with 64-bit math | *cfcb1e7c17
lsm: fix default return value for inode_getsecctx | *7a048a90ac
lsm: fix default return value for vm_enough_memory | *b3fd9db79e
Revert "i2c: pxa: move to generic GPIO recovery" | *677fc3780f
Revert ncsi: Propagate carrier gain/loss events to the NCSI controller | *31f6ff62df
cxl/region: Fix x1 root-decoder granularity calculations | *683b6a7324
tools/testing/cxl: Define a fixed volatile configuration to parse | *8cdc6b8b81
cxl/mem: Move devm_cxl_add_endpoint() from cxl_core to cxl_mem | *8fce427169
cxl: Unify debug messages when calling devm_cxl_add_port() | *e841a59ac1
i3c: master: svc: fix random hot join failure since timeout error | *a807a44189
i3c: master: svc: add NACK check after start byte sent | *90db4c1d5e
cxl/region: Do not try to cleanup after cxl_region_setup_targets() fails | *c415f113d9
cxl/region: Move region-position validation to a helper | *008b08ab07
cxl/region: Cleanup target list on attach error | *93d242f63e
cxl/region: Validate region mode vs decoder mode | *3b70d45c7e
drm/amd/display: enable dsc_clk even if dsc_pg disabled | *1d1cc275d1
Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE | *6c6a39080b
Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device tables | *ba9302fd93
bluetooth: Add device 13d3:3571 to device tables | *fc3423d55c
bluetooth: Add device 0bda:887b to device tables | *f1c7f81e97
Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559 | *1f026218f8
clk: visconti: Fix undefined behavior bug in struct visconti_pll_provider | *b2a2828720
clk: visconti: remove unused visconti_pll_provider::regmap | *e785584e0a
cpufreq: stats: Fix buffer overflow detection in trans_stats() | *c2d14682b3
pmdomain: imx: Make imx pgc power domain also set the fwnode | *8bd370cc3c
pmdomain: bcm: bcm2835-power: check if the ASB register is equal to enable | *68620ef460
ALSA: hda/realtek: Add quirks for HP Laptops | *4d50004416
ALSA: hda/realtek: Enable Mute LED on HP 255 G10 | *4645d3bcd5
ALSA: hda/realtek - Enable internal speaker of ASUS K6500ZC | *eaa4e4ba7a
ALSA: hda/realtek - Add Dell ALC295 to pin fall back table | *0fcc2cf28f
ALSA: hda/realtek: Enable Mute LED on HP 255 G8 | *fa7c9cc3cb
ALSA: info: Fix potential deadlock at disconnection | *a0d43e0f7c
btrfs: zoned: wait for data BG to be finished on direct IO allocation | *9ad4c7f065
xfs: recovery should not clear di_flushiter unconditionally | *209379924a
cifs: do not reset chan_max if multichannel is not supported at mount | *c9569bfd28
cifs: force interface update before a fresh session setup | *5bdf34ca32
cifs: reconnect helper should set reconnect for the right channel | *9eb44db68c
smb: client: fix potential deadlock when releasing mids | *558817597d
smb: client: fix use-after-free bug in cifs_debug_data_proc_show() | *49d0ff613f
smb3: fix caching of ctime on setxattr | *34828baf81
smb3: fix touch -h of symlink | *9d96ac07ae
smb3: fix creating FIFOs when mounting with "sfu" mount option | *5691e15695
fs: add ctime accessors infrastructure | *b50ca24c3e
xhci: Enable RPM on controllers that support low-power states | *72a90e7eb4
parisc/power: Fix power soft-off when running on qemu | *40b6914f42
parisc/pgtable: Do not drop upper 5 address bits of physical address | *1651b334f1
parisc: Prevent booting 64-bit kernels on PA1.x machines | *3ddb2fa5ec
i3c: master: svc: fix SDA keep low when polling IBIWON timeout happen | *1ea1fb2216
i3c: master: svc: fix check wrong status register in irq handler | *65d9f61324
i3c: master: svc: fix ibi may not return mandatory data byte | *e32e9cba56
i3c: master: svc: fix wrong data return when IBI happen during start frame | *3a8e03f133
i3c: master: svc: fix race condition in ibi work thread | *de6ca501ad
i3c: master: cdns: Fix reading status register | *3b93096d29
mtd: cfi_cmdset_0001: Byte swap OTP info | *aee642ae99
mm/memory_hotplug: use pfn math in place of direct struct page manipulation | *5a2768b9de
mm/cma: use nth_page() in place of direct struct page manipulation | *20412ca356
s390/cmma: fix detection of DAT pages | *7fc465d265
dmaengine: stm32-mdma: correct desc prep when channel running | *55d699e2d2
mcb: fix error handling for different scenarios when parsing | *afcde812dd
driver core: Release all resources during unbind before updating device links | *f7ab9dee22
tracing: Have the user copy of synthetic event address use correct context | *185f3617ad
i2c: core: Run atomic i2c xfer when !preemptible | *59cb785919
kernel/reboot: emergency_restart: Set correct system_state | *4f3135e2dd
quota: explicitly forbid quota files from being encrypted | *ed3cc4f3ca
jbd2: fix potential data lost in recovering journal raced with synchronizing fs bdev | *e166cc2bf5
ASoC: codecs: wsa-macro: fix uninitialized stack variables with name prefix | *479a120a04
hid: lenovo: Resend all settings on reset_resume for compact keyboards | *9ea5df7290
selftests/resctrl: Reduce failures due to outliers in MBA/MBM tests | *72f5a918b4
selftests/resctrl: Move _GNU_SOURCE define into Makefile | *e6526e403a
selftests/resctrl: Remove duplicate feature check from CMT test | *3f100cc63a
netfilter: nf_tables: split async and sync catchall in two functions | *13e2d49647
netfilter: nf_tables: remove catchall element in GC sync path | *143f450c6c
ima: detect changes to the backing overlay file | *2c63b9d7f7
ima: annotate iint mutex to avoid lockdep false positive warnings | *db98de0809
mfd: qcom-spmi-pmic: Fix revid implementation | *5231eb1190
mfd: qcom-spmi-pmic: Fix reference leaks in revid helper | *4d259683bc
arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size | *c754a6f5c3
ACPI: FPDT: properly handle invalid FPDT subtables | *95e747c3c6
firmware: qcom_scm: use 64-bit calling convention only when client is 64-bit | *cd222fc61e
arm64: dts: qcom: ipq8074: Fix hwlock index for SMEM | *e866ef947a
btrfs: don't arbitrarily slow down delalloc if we're committing | *ddf42b7c8d
rcu: kmemleak: Ignore kmemleak false positives when RCU-freeing objects | *d150294818
PM: hibernate: Clean up sync_read handling in snapshot_write_next() | *567c6f6495
PM: hibernate: Use __get_safe_page() rather than touching the list | *2c9222b7dc
arm64: dts: qcom: ipq6018: Fix hwlock index for SMEM | *8d837850d3
rcu/tree: Defer setting of jiffies during stall reset | *6aa3cab6be
svcrdma: Drop connection after an RDMA Read error | *4b0d6ddb64
wifi: wilc1000: use vmm_table as array in wilc struct | *efd8e6d19c
PCI: exynos: Don't discard .remove() callback | *75bf9a8b0e
PCI: kirin: Don't discard .remove() callback | *e02b9c6a83
PCI/ASPM: Fix L1 substate handling in aspm_attr_store_common() | *51dcd20a4a
mmc: Add quirk MMC_QUIRK_BROKEN_CACHE_FLUSH for Micron eMMC Q2J54A | *07d425242e
mmc: sdhci_am654: fix start loop index for TAP value parsing | *4542aa7569
mmc: vub300: fix an error code | *8387c94d73
ksmbd: fix slab out of bounds write in smb_inherit_dacl() | *482aaa72f9
ksmbd: handle malformed smb1 message | *8e76941a16
clk: qcom: ipq6018: drop the CLK_SET_RATE_PARENT flag from PLL clocks | *877080a349
clk: qcom: ipq8074: drop the CLK_SET_RATE_PARENT flag from PLL clocks | *3291d3ecf3
clk: socfpga: Fix undefined behavior bug in struct stratix10_clock_data | *ea2c6e85b6
parisc/power: Add power soft-off when running on qemu | *783645be98
parisc/pdc: Add width field to struct pdc_model | *ef0224ee53
arm64: Restrict CPU_BIG_ENDIAN to GNU as or LLVM IAS 15.x or newer | *938c4c7318
PCI: keystone: Don't discard .probe() callback | *b7d27cbfef
PCI: keystone: Don't discard .remove() callback | *fe0b2a20f7
KEYS: trusted: Rollback init_trusted() consistently | *454ad98f31
KEYS: trusted: tee: Refactor register SHM usage | *3ef9944681
genirq/generic_chip: Make irq_remove_generic_chip() irqdomain aware | *17381882fc
mmc: meson-gx: Remove setting of CMD_CFG_ERROR | *0cf7577b6b
wifi: ath11k: fix gtk offload status event locking | *e3199b3fac
wifi: ath11k: fix htt pktlog locking | *ca420ac4f9
wifi: ath11k: fix dfs radar event locking | *f0ea9e4726
wifi: ath11k: fix temperature event locking | *164fa9a0b1
regmap: Ensure range selector registers are updated after cache sync | *e10facbd25
ACPI: resource: Do IRQ override on TongFang GMxXGxx | *08a98c345f
mm/damon/sysfs: check error from damon_sysfs_update_target() | *b0fc14428c
mm/damon: implement a function for max nr_accesses safe calculation | *834a800c58
mm/damon/ops-common: avoid divide-by-zero during region hotness calculation | *2b38f0dbe8
mm/damon/lru_sort: avoid divide-by-zero in hot threshold calculation | *cf2641099c
watchdog: move softlockup_panic back to early_param | *f0f3328af9
mm/damon/sysfs: update monitoring target regions for online input commit | *9275f65d77
mm/damon/sysfs: remove requested targets when online-commit inputs | *4e0fbf3188
PCI/sysfs: Protect driver's D3cold preference from user space | *1a2c7a2f35
hvc/xen: fix event channel handling for secondary consoles | *b772e415e1
hvc/xen: fix error path in xen_hvc_init() to always register frontend driver | *74db59e63b
hvc/xen: fix console unplug | *e5b0e23080
tty: serial: meson: fix hard LOCKUP on crtscts mode | *5e3b2141c7
tty/sysrq: replace smp_processor_id() with get_cpu() | *5b2352c64c
proc: sysctl: prevent aliased sysctls from getting passed to init | *d91fd028c9
audit: don't WARN_ON_ONCE(!current->mm) in audit_exe_compare() | *38968c63e9
audit: don't take task_lock() in audit_exe_compare() code path | *43cea54109
KVM: x86: Clear bit12 of ICR after APIC-write VM-exit | *27976fa917
KVM: x86: Ignore MSR_AMD64_TW_CFG access | *7e218114a2
KVM: x86: hyper-v: Don't auto-enable stimer on write from user-space | *41689ef19b
x86/cpu/hygon: Fix the CPU topology evaluation for real | *f0732c646a
crypto: x86/sha - load modules based on CPU features | *1fc94de1c1
scsi: qla2xxx: Fix system crash due to bad pointer access | *b16ea57d6c
scsi: megaraid_sas: Increase register read retry rount from 3 to 30 for selected registers | *bb5e307366
scsi: mpt3sas: Fix loop logic | *dd56d43244
bpf: Fix precision tracking for BPF_ALU | BPF_TO_BE | BPF_END | *947635fa17
bpf: Fix check_stack_write_fixed_off() to correctly spill imm | *3bdbe399b8
randstruct: Fix gcc-plugin performance mode to stay in group | *bee4f891fe
powerpc/perf: Fix disabling BHRB and instruction sampling | *4cb064f617
perf intel-pt: Fix async branch flags | *a1d8f675ea
media: venus: hfi: add checks to perform sanity on queue pointers | *55db76caa7
i915/perf: Fix NULL deref bugs with drm_dbg() calls | *d1a04a5219
cifs: fix check of rc in function generate_smb3signingkey | *17cfba4aeb
cifs: spnego: add ';' in HOST_KEY_LEN | *4b91ba060f
tools/power/turbostat: Enable the C-state Pre-wake printing | *c5fcba7ff9
tools/power/turbostat: Fix a knl bug | *ca56cdfab3
macvlan: Don't propagate promisc change to lower dev in passthru | *f9b592a9e6
net/mlx5e: Check return value of snprintf writing to fw_version buffer for representors | *0ab53cd69f
net/mlx5e: Check return value of snprintf writing to fw_version buffer | *7f2feab701
net/mlx5e: Reduce the size of icosq_str | *e2d93cfd1b
net/mlx5e: Fix pedit endianness | *991ba64898
net/mlx5e: fix double free of encap_header in update funcs | *e8ae37f863
net/mlx5e: fix double free of encap_header | *7414a28de1
net: stmmac: avoid rx queue overrun | *49fb680403
net: stmmac: fix rx budget limit check | *18a169810c
netfilter: nf_tables: fix pointer math issue in nft_byteorder_eval() | *6a15d97104
netfilter: nf_conntrack_bridge: initialize err to 0 | *d179189eec
af_unix: fix use-after-free in unix_stream_read_actor() | *14b11892a6
net: ethernet: cortina: Fix MTU max setting | *1a1efaed5f
net: ethernet: cortina: Handle large frames | *4794b6b16a
net: ethernet: cortina: Fix max RX frame define | *19554aa901
bonding: stop the device in bond_setup_by_slave() | *f84846731b
ptp: annotate data-race around q->head and q->tail | *ceae93d76a
xen/events: fix delayed eoi list handling | *ab3e13b35c
ppp: limit MRU to 64K | *00768b3e90
net: mvneta: fix calls to page_pool_get_stats | *1e83edbc42
tipc: Fix kernel-infoleak due to uninitialized TLV value | *a28ec8322d
net: hns3: fix VF wrong speed and duplex issue | *55d82e092c
net: hns3: fix VF reset fail issue | *f47c6fba72
net: hns3: fix variable may not initialized problem in hns3_init_mac_addr() | *07f5b8c471
net: hns3: fix out-of-bounds access may occur when coalesce info is read via debugfs | *83a177b942
net: hns3: fix incorrect capability bit display for copper port | *5dc440293d
net: hns3: add barrier in vf mailbox reply process | *61c5ba5042
net: hns3: fix add VLAN fail issue | *76bd42849c
tty: Fix uninit-value access in ppp_sync_receive() | *732a67ca43
ipvlan: add ipvlan_route_v6_outbound() helper | *12af02d24a
net: set SOCK_RCU_FREE before inserting socket into hashtable | *c0f8b8fb7d
vhost-vdpa: fix use after free in vhost_vdpa_probe() | *58278cc71d
gfs2: Silence "suspicious RCU usage in gfs2_permission" warning | *7749fd2dbe
SUNRPC: Fix RPC client cleaned up the freed pipefs dentries | *af0095a559
NFSv4.1: fix SP4_MACH_CRED protection for pnfs IO | *19d7dbf71e
SUNRPC: Add an IS_ERR() check back to where it was | *c65b915641
NFSv4.1: fix handling NFS4ERR_DELAY when testing for session trunking | *5ee813da0c
mtd: rawnand: meson: check return value of devm_kasprintf() | *b2a9ba69df
mtd: rawnand: intel: check return value of devm_kasprintf() | *8d02b6fb3c
SUNRPC: ECONNRESET might require a rebind | *11f6aadd1f
sched/core: Optimize in_task() and in_interrupt() a bit | *3a6ad749e9
wifi: iwlwifi: Use FW rate for non-data frames | *2fa178e2cd
mtd: rawnand: tegra: add missing check for platform_get_irq() | *1fb3a9c59e
pwm: Fix double shift bug | *6586b5f8e4
drm/amdgpu: fix software pci_unplug on some chips | *8a1552e908
ALSA: hda/realtek: Add quirk for ASUS UX7602ZM | *07ab6615a9
drm/qxl: prevent memory leak | *09297e3ffc
ASoC: ti: omap-mcbsp: Fix runtime PM underflow warnings | *aff8be2cad
i2c: dev: copy userspace array safely | *72d02adae3
kgdb: Flush console before entering kgdb on panic | *8a06894666
drm/amd/display: Avoid NULL dereference of timing generator | *b083aaf5db
media: imon: fix access to invalid resource for the second interface | *65335aef1a
media: ccs: Fix driver quirk struct documentation | *b8dcbbd0c4
media: cobalt: Use FIELD_GET() to extract Link Width | *e2ccedd4d1
gfs2: fix an oops in gfs2_permission | *53fc16c1ad
gfs2: ignore negated quota changes | *329a8d1d60
media: vivid: avoid integer overflow | *a647f27a74
media: gspca: cpia1: shift-out-of-bounds in set_flicker | *e64d23dc65
i3c: master: mipi-i3c-hci: Fix a kernel panic for accessing DAT_data. | *472bd47874
virtio-blk: fix implicit overflow on virtio_max_dma_size | *32b17bc21f
i2c: sun6i-p2wi: Prevent potential division by zero | *0b5e729d4e
i2c: fix memleak in i2c_new_client_device() | *8be39f6691
i3c: mipi-i3c-hci: Fix out of bounds access in hci_dma_irq_handler | *07c11a5249
9p: v9fs_listxattr: fix %s null argument warning | *3851d844d7
9p/trans_fd: Annotate data-racy writes to file::f_flags | *c7b0ce54b1
usb: gadget: f_ncm: Always set current gadget in ncm_bind() | *ff95007583
f2fs: fix error handling of __get_node_page | *a82bd79cbf
soundwire: dmi-quirks: update HP Omen match | *7932afa9bb
usb: dwc3: core: configure TX/RX threshold for DWC3_IP | *7cebc86481
tty: vcc: Add check for kstrdup() in vcc_probe() | *d6957635de
thunderbolt: Apply USB 3.x bandwidth quirk only in software connection manager | *b80aaff5f7
iio: adc: stm32-adc: harden against NULL pointer deref in stm32_adc_probe() | *c92de3bf6c
mfd: intel-lpss: Add Intel Lunar Lake-M PCI IDs | *b469227b1d
exfat: support handle zero-size directory | *24e222a54e
HID: Add quirk for Dell Pro Wireless Keyboard and Mouse KM5221W | *4ee3b3a0ff
crypto: hisilicon/qm - prevent soft lockup in receive loop | *a70cb0d59d
ASoC: Intel: soc-acpi-cht: Add Lenovo Yoga Tab 3 Pro YT3-X90 quirk | *cbf304de78
PCI: Use FIELD_GET() in Sapphire RX 5600 XT Pulse quirk | *52cd51ba57
misc: pci_endpoint_test: Add Device ID for R-Car S4-8 PCIe controller | *6f9557a5c9
PCI: Disable ATS for specific Intel IPU E2000 devices | *161767bb7c
PCI: Extract ATS disabling to a helper function | *6b46084582
PCI: Use FIELD_GET() to extract Link Width | *442fd24d7b
scsi: libfc: Fix potential NULL pointer dereference in fc_lport_ptp_setup() | *dabc0ee84d
PCI: Do error check on own line to split long "if" conditions | *146badf18e
atm: iphase: Do PCI error checks on own line | *1a7c3d2e1d
PCI: mvebu: Use FIELD_PREP() with Link Width | *aac90c7197
PCI: tegra194: Use FIELD_GET()/FIELD_PREP() with Link Width fields | *43b91df291
ALSA: hda: Fix possible null-ptr-deref when assigning a stream | *fa7abd3c5c
ARM: 9320/1: fix stack depot IRQ stack filter | *6e2076cad8
HID: lenovo: Detect quirk-free fw on cptkbd and stop applying workaround | *8c68af2af6
jfs: fix array-index-out-of-bounds in diAlloc | *a50b796d36
jfs: fix array-index-out-of-bounds in dbFindLeaf | *5013f82698
fs/jfs: Add validity check for db_maxag and db_agpref | *0cb567e727
fs/jfs: Add check for negative db_l2nbperpage | *88984ec479
scsi: ibmvfc: Remove BUG_ON in the case of an empty event pool | *33331b265a
scsi: hisi_sas: Set debugfs_dir pointer to NULL after removing debugfs | *f1521fe0b4
RDMA/hfi1: Use FIELD_GET() to extract Link Width | *af493dde68
ASoC: SOF: ipc4: handle EXCEPTION_CAUGHT notification from firmware | *c55fc098fd
crypto: pcrypt - Fix hungtask for PADATA_RESET | *62c65e799f
ASoC: SOF: Pass PCI SSID to machine driver | *14107cbeb5
ASoC: soc-card: Add storage for PCI SSID | *0aaf807756
selftests/efivarfs: create-read: fix a resource leak | *c68535657f
arm64: dts: ls208xa: use a pseudo-bus to constrain usb dma size | *6c1b3d89a2
drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is NULL | *2806f88037
drm/amdkfd: Fix shift out-of-bounds issue | *7017e83500
drm/panel: st7703: Pick different reset sequence | *33fb1a5553
drm/amdgpu/vkms: fix a possible null pointer dereference | *16fa59e273
drm/radeon: fix a possible null pointer dereference | *d0bc9ab0a1
drm/panel/panel-tpo-tpg110: fix a possible null pointer dereference | *79813cd593
drm/panel: fix a possible null pointer dereference | *9b70fc7d70
drm/amdgpu: Fix potential null pointer derefernce | *d0725232da
drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and Tonga | *fc9ac0e8e0
drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7 | *09b900fc2c
drm/msm/dp: skip validity check for DP CTS EDID checksum | *412ce89669
drm: vmwgfx_surface.c: copy user-array safely | *0f5f567451
drm_lease.c: copy user-array safely | *6995df256e
kernel: watch_queue: copy user-array safely | *8332523b13
kernel: kexec: copy user-array safely | *2fabc3289b
string.h: add array-wrappers for (v)memdup_user() | *24faa2740b
drm/amd/display: use full update for clip size increase of large plane source | *09d4f579d3
drm/amd: Update `update_pcie_parameters` functions to use uint8_t arguments | *50f35a907c
drm/amdkfd: Fix a race condition of vram buffer unref in svm code | *5b978a8ce4
drm/amdgpu: not to save bo in the case of RAS err_event_athub | *0c8eda600e
drm/komeda: drop all currently held locks if deadlock happens | *4048cf4615
drm/gma500: Fix call trace when psb_gem_mm_init() fails | *a57a54a8bc
platform/x86: thinkpad_acpi: Add battery quirk for Thinkpad X120e | *6edd5ea504
platform/chrome: kunit: initialize lock for fake ec_dev | *c90c7bf7b1
tsnep: Fix tsnep_request_irq() format-overflow warning | *70997012d8
ACPI: EC: Add quirk for HP 250 G7 Notebook PC | *87624b1f9b
Bluetooth: Fix double free in hci_conn_cleanup | *a556f2ef55
Bluetooth: btusb: Add date->evt_skb is NULL check | *0a40c609e2
bpf: Ensure proper register state printing for cond jumps | *8093dd759e
vsock: read from socket's error queue | *459970363e
wifi: ath10k: Don't touch the CE interrupt registers after power up | *1c6a6c926a
net: annotate data-races around sk->sk_dst_pending_confirm | *e7960d2a09
net: annotate data-races around sk->sk_tx_queue_mapping | *46537b4597
wifi: ath10k: fix clang-specific fortify warning | *de979982eb
wifi: ath9k: fix clang-specific fortify warnings | *aa42a7cb92
bpf: Detect IP == ksym.end as part of BPF program | *57e44ff9c2
atl1c: Work around the DMA RX overflow issue | *2be24c47ac
wifi: mac80211: don't return unset power in ieee80211_get_tx_power() | *9c2e4a81d3
wifi: mac80211_hwsim: fix clang-specific fortify warning | *d0fc4cb9d2
wifi: plfxlc: fix clang-specific fortify warning | *b5046b2532
x86/mm: Drop the 4 MB restriction on minimal NUMA node memory size | *2652d199dd
workqueue: Provide one lock class key per work_on_cpu() callsite | *3410b70235
cpu/hotplug: Don't offline the last non-isolated CPU | *b7441453ff
smp,csd: Throw an error if a CSD lock is stuck for too long | *6680d55aba
clocksource/drivers/timer-atmel-tcb: Fix initialization on SAM9 hardware | *ff8370a0d8
clocksource/drivers/timer-imx-gpt: Fix potential memory leak | *9f4c391dc2
selftests/lkdtm: Disable CONFIG_UBSAN_TRAP in test config | *e9a27fdce5
srcu: Fix srcu_struct node grpmask overflow on 64-bit systems | *9ce4e87a8e
perf/core: Bail out early if the request AUX area is out of bound | *784d01f9bb
lib/generic-radix-tree.c: Don't overflow in peek() | *c56df79d68
locking/ww_mutex/test: Fix potential workqueue corruption * |0c2e40b9a3
Merge branch 'android14-6.1' into branch 'android14-6.1-lts' * |3e0f75c1a4
Merge branch 'android14-6.1' into branch 'android14-6.1-lts' * |0dfb0f3c97
Revert "inet: shrink struct flowi_common" * |937b554499
Revert "mfd: core: Un-constify mfd_cell.of_reg" * |c42877e34f
Revert "arm64/arm: xen: enlighten: Fix KPTI checks" * |55d4929d66
Revert "virtio/vsock: replace virtio_vsock_pkt with sk_buff" * |5418948a0a
Revert "vsock/virtio: remove socket from connected/bound list on shutdown" * |98f663d79a
Revert "virtio/vsock: don't use skbuff state to account credit" * |497503c6ec
Revert "virtio/vsock: remove redundant 'skb_pull()' call" * |5b9223a56f
Revert "virtio/vsock: don't drop skbuff on copy failure" * |ec573670da
Revert "virtio/vsock: fix leaks due to missing skb owner" * |e8ad0104af
Revert "virtio/vsock: Fix uninit-value in virtio_transport_recv_pkt()" * |db612631b7
Revert "virtio/vsock: fix header length on skb merging" * |7ccdce2dc4
Revert "vsock/loopback: use only sk_buff_head.lock to protect the packet queue" * |2b3ea8bdef
Merge 6.1.63 into android14-6.1-lts |\| | *69e434a1cb
Linux 6.1.63 | *830c11c9c0
virtio/vsock: fix header length on skb merging | *cd12535b97
virtio/vsock: Fix uninit-value in virtio_transport_recv_pkt() | *a6650e78c4
virtio/vsock: fix leaks due to missing skb owner | *bb1c9a5907
vsock/loopback: use only sk_buff_head.lock to protect the packet queue | *1e5f00e9db
virtio/vsock: don't drop skbuff on copy failure | *883a3db221
virtio/vsock: remove redundant 'skb_pull()' call | *5852a2b573
virtio/vsock: don't use skbuff state to account credit | *25bc87768c
wifi: cfg80211: fix kernel-doc for wiphy_delayed_work_flush() | *fc3a19543e
btrfs: use u64 for buffer sizes in the tree search ioctls | *c606c43ab6
Revert "mmc: core: Capture correct oemid-bits for eMMC cards" | *acca43d813
x86/amd_nb: Use Family 19h Models 60h-7Fh Function 4 IDs | *129debbb41
io_uring/net: ensure socket is marked connected on connect retry | *b80b85f494
tracing/kprobes: Fix the order of argument descriptions | *28e7153418
fbdev: fsl-diu-fb: mark wr_reg_wa() static | *7bc7b82fb2
fbdev: imsttfb: fix a resource leak in probe | *9858458282
fbdev: imsttfb: Fix error path of imsttfb_probe() | *6d53668c43
spi: spi-zynq-qspi: add spi-mem to driver kconfig dependencies | *b4843bf39d
ASoC: dapm: fix clock get name | *f5350c6f78
ASoC: hdmi-codec: register hpd callback on component probe | *acc36089bc
ASoC: mediatek: mt8186_mt6366_rt1019_rt5682s: trivial: fix error messages | *3bbf06efb8
drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE | *3df98bd319
RISC-V: Don't fail in riscv_of_parent_hartid() for disabled HARTs | *587e6308d6
netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses | *8fa280d1a9
netfilter: nft_redir: use `struct nf_nat_range2` throughout and deduplicate eval call-backs | *d85670128f
netfilter: xt_recent: fix (increase) ipv6 literal buffer length | *7ee2070589
i2c: iproc: handle invalid slave state | *b5974b0c89
r8169: respect userspace disabling IFF_MULTICAST | *1fecefb092
vsock/virtio: remove socket from connected/bound list on shutdown | *baddcc2c71
virtio/vsock: replace virtio_vsock_pkt with sk_buff | *46c541fa66
blk-core: use pr_warn_ratelimited() in bio_check_ro() | *4e9b3ec84d
nbd: fix uaf in nbd_open | *b0310063d4
tg3: power down device only on SYSTEM_POWER_OFF | *2dbafb0081
nvme: fix error-handling for io_uring nvme-passthrough | *f4277cb562
net/smc: put sk reference if close work was canceled | *2d563aa752
net/smc: allow cdc msg send rather than drop it with NULL sndbuf_desc | *9d976cd3e3
net/smc: fix dangling sock under state SMC_APPFINCLOSEWAIT | *4a12fb7d1a
octeontx2-pf: Free pending and dropped SQEs | *a1e8e68204
octeontx2-pf: qos send queues management | *479d344a92
octeontx2-pf: Rename tot_tx_queues to non_qos_queues | *f9c2807e2a
selftests: pmtu.sh: fix result checking | *490dfbf651
net: stmmac: xgmac: Enable support for multiple Flexible PPS outputs | *0b8ffe3cb0
Fix termination state for idr_for_each_entry_ul() | *7f4a2c2967
net: r8169: Disable multicast filter for RTL8168H and RTL8107E | *db68ac51fe
dccp/tcp: Call security_inet_conn_request() after setting IPv6 addresses. | *414d36c117
dccp: Call security_inet_conn_request() after setting IPv4 addresses. | *e129327d80
net: page_pool: add missing free_percpu when page_pool_init fail | *a95acc2099
octeontx2-pf: Fix holes in error code | *00376cc743
octeontx2-pf: Fix error codes | *612c22e928
inet: shrink struct flowi_common | *89d92e4fc5
bpf: Check map->usercnt after timer->timer is assigned | *4c731e98fe
tipc: Change nla_policy for bearer-related names to NLA_NUL_STRING | *6086258bd5
hsr: Prevent use after free in prp_create_tagged_frame() | *f980e9a57d
llc: verify mac len before reading mac header | *8803da01fe
watchdog: ixp4xx: Make sure restart always works | *7082b1fb53
Input: synaptics-rmi4 - fix use after free in rmi_unregister_function() | *f8225c3c65
pwm: brcmstb: Utilize appropriate clock APIs in suspend/resume | *679d2ab67e
pwm: sti: Reduce number of allocations and drop usage of chip_data | *713629765f
regmap: prevent noinc writes from clobbering cache | *7ec7b7d3f2
media: cec: meson: always include meson sub-directory in Makefile | *103c66dcf5
media: dvb-usb-v2: af9035: fix missing unlock | *39c2ec94a8
media: cadence: csi2rx: Unregister v4l2 async notifier | *76d12296ee
media: cedrus: Fix clock/reset sequence | *a254ee1ddc
media: vidtv: mux: Add check and kfree for kstrdup | *5c26aae372
media: vidtv: psi: Add check for kstrdup | *e7c96f4605
media: s3c-camif: Avoid inappropriate kfree() | *1620531a3d
media: mtk-jpegenc: Fix bug in JPEG encode quality selection | *b75fb8a2ee
media: amphion: handle firmware debug message | *20568d06f6
media: bttv: fix use after free error due to btv->timeout timer | *825a7a6a3a
media: ov5640: Fix a memory leak when ov5640_probe fails | *ba305517a1
media: i2c: max9286: Fix some redundant of_node_put() calls | *a7a8c49dc6
media: ov5640: fix vblank unchange issue when work at dvp mode | *9b1c0aca7f
media: ov5640: Drop dead code using frame_interval | *6380621de3
media: verisilicon: Do not enable G2 postproc downscale if source is narrower than destination | *64f55cebb4
media: hantro: Check whether reset op is defined before use | *f258fd94ab
pcmcia: ds: fix possible name leak in error path in pcmcia_device_add() | *7c9947693b
pcmcia: ds: fix refcount leak in pcmcia_device_add() | *fbdf451e76
pcmcia: cs: fix possible hung task and memory leak pccardd() | *f9e17bce0a
rtc: pcf85363: fix wrong mask/val parameters in regmap_update_bits call | *b4dda701d0
virt: sevguest: Fix passing a stack buffer as a scatterlist target | *d889b7bc12
x86/sev: Change snp_guest_issue_request()'s fw_err argument | *a5b03f56d3
crypto: ccp - Name -1 return value as SEV_RET_NO_FW_CALL | *7c7371b41a
cxl/mem: Fix shutdown order | *174ae0a3b8
i3c: Fix potential refcount leak in i3c_master_register_new_i3c_devs | *b9793c9c03
9p/net: fix possible memory leak in p9_check_errors() | *8b184ebff6
perf hist: Add missing puts to hist__account_cycles | *8e1f41a853
perf machine: Avoid out of bounds LBR memory read | *209f4a67d8
usb: host: xhci-plat: fix possible kernel oops while resuming | *071666451e
xhci: Loosen RPM as default policy to cover for AMD xHC 1.1 | *abdd1f47ef
powerpc/pseries: fix potential memory leak in init_cpu_associativity() | *257517c00b
powerpc/imc-pmu: Use the correct spinlock initializer. | *8409ee076d
powerpc/vas: Limit open window failure messages in log bufffer | *0f8dabe79a
powerpc/xive: Fix endian conversion size | *b4bc030af7
powerpc/40x: Remove stale PTE_ATOMIC_UPDATES macro | *a204f9f3cb
modpost: fix ishtp MODULE_DEVICE_TABLE built on big-endian host | *339148f786
modpost: fix tee MODULE_DEVICE_TABLE built on big-endian host | *9d4f7441cd
powerpc: Only define __parse_fpscr() when required | *4a43be67d6
interconnect: qcom: sm8350: Set ACV enable_mask | *bfc019c713
interconnect: qcom: sm8350: Retire DEFINE_QBCM | *ccbd1281a2
interconnect: qcom: sm8150: Set ACV enable_mask | *d7e501045e
interconnect: qcom: sm8150: Retire DEFINE_QBCM | *386a4d6f83
interconnect: qcom: sm8150: Drop IP0 interconnects | *8979ed70da
interconnect: move ignore_list out of of_count_icc_providers() | *bf7039825f
interconnect: qcom: sm6350: Set ACV enable_mask | *d39e3249c0
interconnect: qcom: sm6350: Retire DEFINE_QBCM | *639ee7fbc0
interconnect: qcom: sdm845: Set ACV enable_mask | *8085888045
interconnect: qcom: sdm845: Retire DEFINE_QBCM | *e82d634fdb
interconnect: qcom: sc8280xp: Set ACV enable_mask | *50e4e1ad35
interconnect: qcom: sc8180x: Set ACV enable_mask | *673ced6e01
interconnect: qcom: sc7280: Set ACV enable_mask | *8fe916ff8a
interconnect: qcom: sc7180: Set ACV enable_mask | *3f884277f9
interconnect: qcom: sc7180: Retire DEFINE_QBCM | *695b3cfe1c
f2fs: fix to initialize map.m_pblk in f2fs_precache_extents() | *7b863b8bcd
dmaengine: pxa_dma: Remove an erroneous BUG_ON() in pxad_free_desc() | *2ed67a40dd
USB: usbip: fix stub_dev hub disconnect | *dae6fd9747
tools: iio: iio_generic_buffer ensure alignment | *06a1286345
misc: st_core: Do not call kfree_skb() under spin_lock_irqsave() | *fc968818d5
dmaengine: ti: edma: handle irq_of_parse_and_map() errors | *03984e24db
usb: chipidea: Simplify Tegra DMA alignment code | *c9095c743b
usb: chipidea: Fix DMA overwrite for Tegra | *6b21a22728
usb: dwc2: fix possible NULL pointer dereference caused by driver concurrency | *0806a6afe1
dmaengine: idxd: Register dsa_bus_type before registering idxd sub-drivers | *1e03a26959
perf record: Fix BTF type checks in the off-cpu profiling | *1c4eb1bc39
pinctrl: renesas: rzg2l: Make reverse order of enable() for disable() | *cd7d804f52
livepatch: Fix missing newline character in klp_resolve_symbols() | *f1cda3c5dd
tty: tty_jobctrl: fix pid memleak in disassociate_ctty() | *fb4251dab3
f2fs: compress: fix to avoid redundant compress extension | *9375ea7f26
f2fs: compress: fix to avoid use-after-free on dic | *071bbc5a66
f2fs: compress: fix deadloop in f2fs_write_cache_pages() | *ec67c83dd5
f2fs: convert f2fs_write_cache_pages() to use filemap_get_folios_tag() | *599befdd79
filemap: add filemap_get_folios_tag() | *855516cb6e
perf kwork: Set ordered_events to true in 'struct perf_tool' | *231665cc6f
perf kwork: Add the supported subcommands to the document | *16e02976cf
perf kwork: Fix incorrect and missing free atom in work_push_atom() | *e27c2668ac
iio: frequency: adf4350: Use device managed functions and fix power down issue. | *550711e007
perf stat: Fix aggr mode initialization | *6cb0495d36
apparmor: fix invalid reference on profile->disconnected | *cef064fdde
apparmor: test: make static symbols visible during kunit testing | *cfce1e26b4
kunit: add macro to allow conditionally exposing static symbols to tests | *1d47d1abb4
leds: trigger: ledtrig-cpu:: Fix 'output may be truncated' issue for 'cpu' | *4198a7a6ef
leds: pwm: Don't disable the PWM when the LED should be off | *63cdeb20ee
leds: turris-omnia: Do not use SMBUS calls | *7d0e60e4ff
leds: turris-omnia: Drop unnecessary mutex locking | *ce58f479b5
mfd: arizona-spi: Set pdata.hpdet_channel for ACPI enumerated devs | *26b534a3f0
dt-bindings: mfd: mt6397: Split out compatible for MediaTek MT6366 PMIC | *90155dfd99
dt-bindings: mfd: mt6397: Add binding for MT6357 | *9ac0c05365
mfd: dln2: Fix double put in dln2_probe | *ee6b91411d
mfd: core: Ensure disabled devices are skipped without aborting | *f1ed6c4e59
mfd: core: Un-constify mfd_cell.of_reg | *437f033e30
IB/mlx5: Fix init stage error handling to avoid double free of same QP and UAF | *ad52f21e3d
ASoC: ams-delta.c: use component after check | *3dd998f78c
crypto: qat - fix deadlock in backlog processing | *c7c26d0ef5
padata: Fix refcnt handling in padata_free_shell() | *980a7fd5e5
ASoC: Intel: Skylake: Fix mem leak when parsing UUIDs fails | *9ee89579e6
HID: logitech-hidpp: Move get_wireless_feature_index() check to hidpp_connect_event() | *cf47abd7d8
HID: logitech-hidpp: Revert "Don't restart communication if not necessary" | *8eb1f933cc
HID: logitech-hidpp: Don't restart IO, instead defer hid_connect() only | *7f2ed86dde
HID: logitech-hidpp: Remove HIDPP_QUIRK_NO_HIDINPUT quirk | *b1736354a7
Revert "HID: logitech-hidpp: add a module parameter to keep firmware gestures" | *693baca82d
sh: bios: Revive earlyprintk support | *35ac8075ae
hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip | *8a716eb7f8
HID: cp2112: Make irq_chip immutable | *cce6785b84
RDMA/hfi1: Workaround truncation compilation error | *7a22e6fa51
scsi: ufs: core: Leave space for '\0' in utf8 desc string | *f9f4a6bdf9
ASoC: fsl: Fix PM disable depth imbalance in fsl_easrc_probe | *002bd3c874
ASoC: SOF: core: Ensure sof_ops_free() is still called when probe never ran. | *fe6efb2d18
RDMA/hns: The UD mode can only be configured with DCQCN | *1a6806f27e
RDMA/hns: Add check for SL | *d3a8efb9de
RDMA/hns: Fix signed-unsigned mixed comparisons | *1000adbac3
RDMA/hns: Fix uninitialized ucmd in hns_roce_create_qp_common() | *7c09504c37
RDMA/hns: Fix printing level of asynchronous events | *3d559a5d5d
IB/mlx5: Fix rdma counter binding for RAW QP | *c0f4144d0d
ASoC: fsl: mpc5200_dma.c: Fix warning of Function parameter or member not described | *4f13eab0e8
ext4: move 'ix' sanity check to corrent position | *242ba2e20b
ARM: 9321/1: memset: cast the constant byte to unsigned char | *0a7f9238f3
crypto: hisilicon/qm - fix PF queue parameter issue | *07eb93dbe1
crypto: hisilicon/qm - split a debugfs.c from qm | *2cec6774fd
crypto: hisilicon/qm - modify the process of regs dfx | *56785a3a08
crypto: hisilicon/qm - delete redundant null assignment operations | *bafb12b629
hid: cp2112: Fix duplicate workqueue initialization | *aa804deca1
PCI: vmd: Correct PCI Header Type Register's multi-function check | *ed7f07ef84
crypto: qat - increase size of buffers | *17c890a887
crypto: caam/jr - fix Chacha20 + Poly1305 self test failure | *9857f811e5
crypto: caam/qi2 - fix Chacha20 + Poly1305 self test failure | *f23859748e
nd_btt: Make BTT lanes preemptible | *93aa88170c
libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value | *4795de8c04
scsi: ibmvfc: Fix erroneous use of rtas_busy_delay with hcall return code | *dc44e3fdb0
crypto: qat - fix unregistration of crypto algorithms | *5e989aeb40
crypto: qat - extend buffer list interface | *443bde2a4c
crypto: qat - generalize crypto request buffers | *380f0a1de2
crypto: qat - change bufferlist logic interface | *2ad909a408
crypto: qat - rename bufferlist functions | *61c57bb986
crypto: qat - relocate bufferlist logic | *e3294cccd8
crypto: qat - ignore subsequent state up commands | *bb55130d02
RDMA/core: Use size_{add,sub,mul}() in calls to struct_size() | *e39b84448f
hwrng: geode - fix accessing registers | *3c5c7f926a
hwrng: bcm2835 - Fix hwrng throughput regression | *0c824b77ad
crypto: hisilicon/hpre - Fix a erroneous check after snprintf() | *12d2087a7d
KEYS: Include linux/errno.h in linux/verification.h | *44dcf6d33e
ALSA: hda: cs35l41: Undo runtime PM changes at driver exit time | *2d81896fe1
ALSA: hda: cs35l41: Fix unbalanced pm_runtime_get() | *0642126913
ASoC: cs35l41: Undo runtime PM changes at driver exit time | *ab3aa429c8
ASoC: cs35l41: Verify PM runtime resume errors in IRQ handler | *f20c4b0c01
module/decompress: use vmalloc() for gzip decompression workspace | *c8a2355833
selftests/resctrl: Ensure the benchmark commands fits to its array | *02c167c93f
selftests/pidfd: Fix ksft print formats | *6b7feafde7
arm64: tegra: Use correct interrupts for Tegra234 TKE | *87367bc3d9
arm64: dts: imx8mn: Add sound-dai-cells to micfil node | *fef0af2250
arm64: dts: imx8mm: Add sound-dai-cells to micfil node | *fafaf5a2f3
arm64: dts: imx8qm-ss-img: Fix jpegenc compatible entry | *37658e5189
clk: scmi: Free scmi_clk allocated when the clocks with invalid info are skipped | *db6db0af76
ARM: dts: am3517-evm: Fix LED3/4 pinmux | *d43c3e4974
firmware: arm_ffa: Allow the FF-A drivers to use 32bit mode of messaging | *5429ecbb1b
firmware: arm_ffa: Assign the missing IDR allocation ID to the FFA device | *e0cf8e811f
arm64: dts: ti: k3-am62a7-sk: Drop i2c-1 to 100Khz | *eccde2dbd9
firmware: ti_sci: Mark driver as non removable | *7efb91501b
kunit: Fix missed memory release in kunit_free_suite_set() | *f0ef883cae
soc: qcom: llcc: Handle a second device without data corruption | *4653225f41
ARM: dts: qcom: mdm9615: populate vsdcc fixed regulator | *d97268ce08
arm64: dts: qcom: apq8016-sbc: Add missing ADV7533 regulators | *7867e1d926
ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins | *945f2e4f13
arm64: dts: qcom: sdm845-mtp: fix WiFi configuration | *89465723e0
arm64: dts: qcom: sm8350: fix pinctrl for UART18 | *1a404795c4
arm64: dts: qcom: sm8150: add ref clock to PCIe PHYs | *cd952d43c0
arm64: dts: qcom: sc7280: Add missing LMH interrupts | *03a0a34f04
arm64: dts: qcom: msm8992-libra: drop duplicated reserved memory | *4109f7d1a8
arm64: dts: qcom: msm8916: Fix iommu local address range | *389a4aa5e3
arm64: dts: qcom: sc7280: link usb3_phy_wrapper_gcc_usb30_pipe_clk | *426d3c7c72
arm64: dts: qcom: sdm845: cheza doesn't support LMh node | *e65c1aa21b
ARM: dts: renesas: blanche: Fix typo in GP_11_2 pin name | *b660420f44
perf: hisi: Fix use-after-free when register pmu fails | *104fa6426a
drivers/perf: hisi_pcie: Check the type first in pmu::event_init() | *c6e00bc30e
perf/arm-cmn: Fix DTC domain detection | *28fa550a49
perf/arm-cmn: Revamp model detection | *4589403a34
drivers/perf: hisi: use cpuhp_state_remove_instance_nocalls() for hisi_hns3_pmu uninit process | *1e88414e64
drm: mediatek: mtk_dsi: Fix NO_EOT_PACKET settings/handling | *025d2ac470
clocksource/drivers/arm_arch_timer: limit XGene-1 workaround | *96c3a18304
drm/msm/dsi: free TX buffer in unbind | *8b072ab6c4
drm/msm/dsi: use msm_gem_kernel_put to free TX buffer | *5671bed3c0
xen-pciback: Consider INTx disabled when MSI/MSI-X is enabled | *934747e2f8
xenbus: fix error exit in xenbus_init() | *ace6403e78
drm/rockchip: Fix type promotion bug in rockchip_gem_iommu_map() | *2836c72e8d
arm64/arm: xen: enlighten: Fix KPTI checks | *008b2a93c5
drm/bridge: lt9611uxc: fix the race in the error path | *af19ebfc6a
gpu: host1x: Correct allocated size for contexts | *9da0193454
drm/rockchip: cdn-dp: Fix some error handling paths in cdn_dp_probe() | *8045808be1
drm/mediatek: Fix iommu fault during crtc enabling | *5d30fedc20
drm/mediatek: Fix iommu fault by swapping FBs after updating plane state | *32b15fef33
io_uring/kbuf: Allow the full buffer id space for provided buffers | *60db638be5
io_uring/kbuf: Fix check of BID wrapping in provided buffers | *03e334565d
drm/amd/display: Bail from dm_check_crtc_cursor if no relevant change | *a99afba394
drm/amd/display: Refactor dm_get_plane_scale helper | *8960662027
drm/amd/display: Check all enabled planes in dm_check_crtc_cursor | *9eae81af92
drm/amdkfd: fix some race conditions in vram buffer alloc/free of svm code | *78e998884d
drm/bridge: tc358768: Fix tc358768_ns_to_cnt() | *9dbfdf5dcc
drm/bridge: tc358768: Clean up clock period code | *3ed322a852
drm/bridge: tc358768: Rename dsibclk to hsbyteclk | *14d546d067
drm/bridge: tc358768: Use dev for dbg prints, not priv->dev | *4a1c4eff65
drm/bridge: tc358768: Print logical values, not raw register values | *fb82b3b4ac
drm/bridge: tc358768: Use struct videomode | *e87a3c24ce
drm/bridge: tc358768: remove unused variable | *1942dc48f4
drm/bridge: tc358768: Fix bit updates | *2fab90bcde
drm/bridge: tc358768: Fix use of uninitialized variable | *3c0b681ba4
drm/bridge: lt8912b: Add missing drm_bridge_attach call | *5a521f6b68
drm/bridge: lt8912b: Manually disable HPD only if it was enabled | *7bf0cb8f40
drm/bridge: lt8912b: Fix crash on bridge detach | *2cfa9dc32c
drm/bridge: lt8912b: Fix bridge_detach | *45350e5471
drm/bridge: lt8912b: Add hot plug detection | *2c80c4f0d2
drm: bridge: it66121: Fix invalid connector dereference | *341e79f8ae
drm/radeon: possible buffer overflow | *2d68194e1a
drm/rockchip: vop2: Add missing call to crtc reset helper | *bc05621888
drm/rockchip: vop2: Don't crash for invalid duplicate_state | *b248ccaabf
drm/rockchip: vop: Fix call to crtc reset helper | *ffebe76e50
drm/rockchip: vop: Fix reset of state in duplicate state crtc funcs | *4d37df40b1
hte: tegra: Fix missing error code in tegra_hte_test_probe() | *a671a41d60
hwmon: (sch5627) Disallow write access if virtual registers are locked | *4a30312982
hwmon: (sch5627) Use bit macros when accessing the control register | *3385632de8
Revert "hwmon: (sch56xx-common) Add automatic module loading on supported devices" | *581255403a
Revert "hwmon: (sch56xx-common) Add DMI override table" | *dd06f92fd8
hwmon: (coretemp) Fix potentially truncated sysfs attribute name | *33de53a270
hwmon: (axi-fan-control) Fix possible NULL pointer dereference | *44a96796d2
platform/x86: wmi: Fix opening of char device | *ae28868bba
platform/x86: wmi: Fix probe failure when failing to register WMI devices | *7b8d88df17
clk: qcom: config IPQ_APSS_6018 should depend on QCOM_SMEM | *2a18dd6532
clk: mediatek: clk-mt2701: Add check for mtk_alloc_clk_data | *a836efc21e
clk: mediatek: clk-mt7629: Add check for mtk_alloc_clk_data | *a540ca0aea
clk: mediatek: clk-mt7629-eth: Add check for mtk_alloc_clk_data | *357df1c2f6
clk: mediatek: clk-mt6797: Add check for mtk_alloc_clk_data | *df1c4a9efa
clk: mediatek: clk-mt6779: Add check for mtk_alloc_clk_data | *dd1f30d68f
clk: mediatek: clk-mt6765: Add check for mtk_alloc_clk_data | *7d022726e3
clk: npcm7xx: Fix incorrect kfree | *cc1c2772c1
clk: ti: fix double free in of_ti_divider_clk_setup() | *e4df931fb4
clk: ti: change ti_clk_register[_omap_hw]() API | *cb6c38995f
clk: keystone: pll: fix a couple NULL vs IS_ERR() checks | *0a37614109
spi: nxp-fspi: use the correct ioremap function | *cdaa544dc4
clk: linux/clk-provider.h: fix kernel-doc warnings and typos | *a0b3b2cc2d
clk: renesas: rzg2l: Fix computation formula | *e1809bb19a
clk: renesas: rzg2l: Use FIELD_GET() for PLL register fields | *e6070f0cda
clk: renesas: rzg2l: Trust value returned by hardware | *c823ffba5d
clk: renesas: rzg2l: Lock around writes to mux register | *77e2338802
clk: renesas: rzg2l: Wait for status bit of SD mux before continuing | *f26a440d0e
clk: renesas: rcar-gen3: Extend SDnH divider table | *d72c586809
clk: imx: imx8qxp: Fix elcdif_pll clock | *2c2f1fb3f8
clk: imx: imx8mq: correct error handling path | *0e2b088240
clk: imx: Select MXC_CLK for CLK_IMX8QXP | *5b8d3ea093
regulator: mt6358: Fail probe on unknown chip ID | *8d20252d96
clk: qcom: gcc-sm8150: Fix gcc_sdcc2_apps_clk_src | *a588f440c4
clk: qcom: mmcc-msm8998: Fix the SMMU GDSC | *d2ffd85ee3
clk: qcom: mmcc-msm8998: Don't check halt bit on some branch clks | *06a7365e2b
clk: qcom: clk-rcg2: Fix clock rate overflow for high parent frequencies | *101c2d257c
clk: qcom: gcc-msm8996: Remove RPM bus clocks | *5c25f89c00
spi: tegra: Fix missing IRQ check in tegra_slink_probe() | *51d4d3cd18
regmap: debugfs: Fix a erroneous check after snprintf() | *30e77e3ee9
ipvlan: properly track tx_errors | *4836b94e5e
net: add DEV_STATS_READ() helper | *fae5cc598e
ipv6: avoid atomic fragment on GSO packets | *35aff53626
ACPI: sysfs: Fix create_pnp_modalias() and create_of_modalias() | *1ca7bc1b08
bpf: Fix unnecessary -EBUSY from htab_lock_bucket | *4bb26ec7ed
Bluetooth: hci_sync: Fix Opcode prints in bt_dev_dbg/err | *6f505a013c
wifi: iwlwifi: empty overflow queue during flush | *e2be4ab86a
wifi: iwlwifi: pcie: synchronize IRQs before NAPI | *c56aed37b6
wifi: iwlwifi: call napi_synchronize() before freeing rx/tx queues | *6d88d4b1bb
tcp: fix cookie_init_timestamp() overflows | *72c23b3071
chtls: fix tp->rcv_tstamp initialization | *2acedc5372
net: skb_find_text: Ignore patterns extending past 'to' | *d860416236
selftests: netfilter: test for sctp collision processing in nf_conntrack | *aa0a050c65
r8169: fix rare issue with broken rx after link-down on RTL8125 | *4789d93f94
r8169: use tp_to_dev instead of open code | *77ff34a56b
thermal: core: prevent potential string overflow | *9709c6d759
netfilter: nf_tables: Drop pointless memset when dumping rules | *100a75d56b
wifi: wfx: fix case where rates are out of order | *f64a559f2d
PM / devfreq: rockchip-dfi: Make pmu regmap mandatory | *0d30931f1f
can: dev: can_put_echo_skb(): don't crash kernel if can_priv::echo_skb is accessed out of bounds | *76378a8bae
can: dev: can_restart(): fix race condition between controller restart and netif_carrier_on() | *614d615d49
can: dev: can_restart(): don't crash kernel if carrier is OK | *d5342dafca
wifi: ath11k: fix Tx power value during active CAC | *8a777b28d7
ACPI: video: Add acpi_backlight=vendor quirk for Toshiba Portégé R100 | *396ec51b13
ACPI: property: Allow _DSD buffer data only for byte accessors | *75de6a6641
wifi: rtlwifi: fix EDCA limit set by BT coexistence | *14a7e73b28
tcp_metrics: do not create an entry from tcp_init_metrics() | *52ec0669f4
tcp_metrics: properly set tp->snd_ssthresh in tcp_init_metrics() | *e850efcf2b
tcp_metrics: add missing barriers on delete | *586ce1064f
wifi: ath: dfs_pattern_detector: Fix a memory initialization issue | *ebca9ae926
wifi: mt76: mt7915: fix beamforming availability check | *2b12aebbd3
wifi: mt76: mt7603: improve stuck beacon handling | *c2fd48179c
wifi: mt76: mt7603: improve watchdog reset reliablity | *e3c46ce78d
wifi: mt76: mt7603: rework/fix rx pse hang check | *e01b3400d6
wifi: ath11k: fix boot failure with one MSI vector | *26e301a70d
wifi: rtw88: debug: Fix the NULL vs IS_ERR() bug for debugfs_create_file() | *365fe12f45
net: ethernet: mtk_wed: fix EXT_INT_STATUS_RX_FBUF definitions for MT7986 SoC | *d97463c1f3
net: spider_net: Use size_add() in call to struct_size() | *254187a64a
tipc: Use size_add() in calls to struct_size() | *065cb7ae3f
tls: Use size_add() in call to struct_size() | *8ae1873864
tls: Only use data field in crypto completion function | *65e65a8b2d
mlxsw: Use size_mul() in call to struct_size() | *a764c22bbc
gve: Use size_add() in call to struct_size() | *5dd1344de3
tcp: call tcp_try_undo_recovery when an RTOd TFO SYNACK is ACKed | *a08ff0544b
udp: add missing WRITE_ONCE() around up->encap_rcv | *ec18d7507f
selftests/bpf: Correct map_fd to data_fd in tailcalls | *3e1d754b5d
iavf: Fix promiscuous mode configuration flow messages | *42b452960a
i40e: fix potential memory leaks in i40e_remove() | *36f0004fe5
wifi: iwlwifi: honor the enable_ini value | *9c6269f5d1
wifi: mac80211: fix # of MSDU in A-MSDU calculation | *cee323e56c
wifi: mac80211: move sched-scan stop work to wiphy work | *0568d1e889
wifi: mac80211: move offchannel works to wiphy work | *ef41361519
wifi: mac80211: move scan work to wiphy work | *09915293c3
wifi: mac80211: move radar detect work to wiphy work | *697fb94e3e
wifi: cfg80211: add flush functions for wiphy work | *36aa50d578
genirq/matrix: Exclude managed interrupts in irq_matrix_allocated() | *4f834ad034
string: Adjust strtomem() logic to allow for smaller sources | *63f637309b
pstore/platform: Add check for kstrdup | *0a1dab4a8e
drivers/clocksource/timer-ti-dm: Don't call clk_get_rate() in stop function | *dbb5581603
x86/boot: Fix incorrect startup_gdt_descr.size | *21c5c3f95f
x86/sev-es: Allow copy_from_kernel_nofault() in earlier boot | *7807c269cb
ACPI/NUMA: Apply SRAT proximity domain to entire CFMWS window | *bf178c8b9c
x86/numa: Introduce numa_fill_memblks() | *dce53a017c
futex: Don't include process MM in futex key on no-MMU | *3c1a20c122
x86/srso: Fix SBPB enablement for (possible) future fixed HW | *2351c03529
writeback, cgroup: switch inodes with dirty timestamps to release dying cgwbs | *bc8e02850a
vfs: fix readahead(2) on block devices | *8620933c3c
sched: Fix stop_one_cpu_nowait() vs hotplug | *21f99a5adb
objtool: Propagate early errors | *df870d47d2
sched/uclamp: Ignore (util == 0) optimization in feec() when p_util_max = 0 | *d77530a1d4
sched/uclamp: Set max_spare_cap_cpu even if max_spare_cap is 0 | *b783919771
iov_iter, x86: Be consistent about the __user tag on copy_mc_to_user() | *42bed989f0
sched/fair: Fix cfs_rq_is_decayed() on !SMP | *71e3e7830b
hwmon: (nct6775) Fix incorrect variable reuse in fan_div calculation * |0d9fb52165
Merge 6.1.62 into android14-6.1-lts |\| | *fb2635ac69
Linux 6.1.62 | *585da49ad6
ASoC: SOF: sof-pci-dev: Fix community key quirk detection | *c1c15b09f4
ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection | *5c59879031
misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP device support | *6bebd303ad
tty: 8250: Add Brainboxes Oxford Semiconductor-based quirks | *3017a17ad6
tty: 8250: Add support for Intashield IX cards | *c3444894e8
tty: 8250: Add support for additional Brainboxes PX cards | *31ebf431ed
tty: 8250: Fix up PX-803/PX-857 | *bfe9bde05f
tty: 8250: Fix port count of PX-257 | *b75ee2d9d7
tty: 8250: Add support for Intashield IS-100 | *cdd260b220
tty: 8250: Add support for Brainboxes UP cards | *8af676c698
tty: 8250: Add support for additional Brainboxes UC cards | *abcb12f319
tty: 8250: Remove UC-257 and UC-431 | *df6cfab66f
tty: n_gsm: fix race condition in status line change on dead connections | *23107989be
usb: raw-gadget: properly handle interrupted requests | *e7a802447c
usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm() | *6f17be2700
usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility | *b25a2f2470
PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device | *977ae4dbe2
ALSA: usb-audio: add quirk flag to enable native DSD for McIntosh devices | *9411dbe2c6
mmap: fix error paths with dup_anon_vma() | *21ca008c53
mm/mempolicy: fix set_mempolicy_home_node() previous VMA pointer | *7ab62e3415
x86: KVM: SVM: always update the x2avic msr interception | *e833591265
perf evlist: Avoid frequency mode for the dummy event | *b3eed11110
power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint | *803cc77a3a
ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock | *9eab5008db
io_uring: kiocb_done() should *not* trust ->ki_pos if ->{read,write}_iter() failed | *ed0ba37e7b
powerpc/mm: Fix boot crash with FLATMEM | *31ae7876da
r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en() | *f90656fbf6
r8152: Check for unplug in rtl_phy_patch_request() | *98567c9d84
net: chelsio: cxgb4: add an error code check in t4_load_phy_fw | *ff86d69b2e
drm/amdgpu: Reserve fences for VM update | *8e4a77ba25
platform/mellanox: mlxbf-tmfifo: Fix a warning message | *0f2840dabf
netfilter: nf_tables: audit log object reset once per table | *ec80ad4585
LoongArch: Replace kmap_atomic() with kmap_local_page() in copy_user_highpage() | *afe80b58ee
LoongArch: Export symbol invalid_pud_table for modules building | *9f9b2ec53a
gpu/drm: Eliminate DRM_SCHED_PRIORITY_UNSET | *cafa191b27
drm/amdgpu: Unset context priority is now invalid | *0eb733b53e
scsi: mpt3sas: Fix in error path | *4e000daf39
fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() | *50736464a7
fbdev: omapfb: fix some error codes | *6a87b333ba
drm/ttm: Reorder sys manager cleanup step | *9951b2309e
ASoC: codecs: tas2780: Fix log of failed reset via I2C. | *b7ed4aa0c2
ASoC: rt5650: fix the wrong result of key button | *8e1a6594d7
efi: fix memory leak in krealloc failure handling | *678edd2dfd
netfilter: nfnetlink_log: silence bogus compiler warning | *c6f6a50527
spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 | *6a7a2d5a08
fs/ntfs3: Avoid possible memory leak | *84aabd18c8
fs/ntfs3: Fix directory element type detection | *3bff4bb7f9
fs/ntfs3: Fix NULL pointer dereference on error in attr_allocate_frame() | *c8cbae3cbb
fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr() | *6fe32f79ab
fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN) | *92f9c7c7dd
fs/ntfs3: Write immediately updated ntfs state | *fc91bb3e1b
fs/ntfs3: Add ckeck in ni_update_parent() | *768e857ac3
fbdev: atyfb: only use ioremap_uc() on i386 and ia64 | *dd6d75eb00
Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport | *c64c237275
powerpc/85xx: Fix math emulation exception | *96c7aac8d8
dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe | *9ef4697548
irqchip/stm32-exti: add missing DT IRQ flag translation | *7378415da0
irqchip/riscv-intc: Mark all INTC nodes as initialized | *d3204c0fdd
net: sched: cls_u32: Fix allocation size in u32_init() | *f15dbcda2c
ASoC: tlv320adc3xxx: BUG: Correct micbias setting | *30ed998604
coresight: tmc-etr: Disable warnings for allocation failures | *6618e7a740
ASoC: simple-card: fixup asoc_simple_probe() error handling * |d3f3412122
Merge branch 'android14-6.1' into branch 'android14-6.1-lts' * |a2eefda9e3
Revert "kasan: print the original fault addr when access invalid shadow" * |2cd386b08b
Merge 6.1.61 into android14-6.1-lts |\| | *4a61839152
Linux 6.1.61 | *5926b0886d
objtool/x86: add missing embedded_insn check | *2afa9f7eb1
ext4: avoid overlapping preallocations due to overflow | *fcefddf3a1
ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow | *495c4c58d6
ext4: add two helper functions extent_logical_end() and pa_logical_end() | *d022e4ea9c
platform/x86: Add s2idle quirk for more Lenovo laptops | *48ebeab0ed
clk: Sanitize possible_parent_show to Handle Return Value of of_clk_get_parent_name | *65e5a9890e
sparc32: fix a braino in fault handling in csum_and_copy_..._user() | *8b8cde8ebb
perf/core: Fix potential NULL deref | *5e232f2205
x86/cpu: Add model number for Intel Arrow Lake mobile processor | *63cc3d5d34
x86/i8259: Skip probing when ACPI/MADT advertises PCAT compatibility | *37495846b1
nvmem: imx: correct nregs for i.MX6UL | *116671d259
nvmem: imx: correct nregs for i.MX6SLL | *b90b8633ef
nvmem: imx: correct nregs for i.MX6ULL | *cc87c73eac
misc: fastrpc: Unmap only if buffer is unmapped from DSP | *38c5faf2a9
misc: fastrpc: Clean buffers on remote invocation failures | *7737e9384e
misc: fastrpc: Free DMA handles for RPC calls with no arguments | *1e8851b513
misc: fastrpc: Reset metadata buffer to avoid incorrect free | *5a35fc1c00
tracing/kprobes: Fix the description of variable length arguments | *91b95e3b4a
i2c: aspeed: Fix i2c bus hang in slave read | *11602cadc9
i2c: stm32f7: Fix PEC handling in case of SMBUS transfers | *ff0312a156
i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node() | *f9a7b3b33c
i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node() | *48a365ae4f
i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() | *6ec84059b5
iio: adc: xilinx-xadc: Correct temperature offset/scale for UltraScale | *e26fd381bf
iio: adc: xilinx-xadc: Don't clobber preset voltage/temperature thresholds | *cb01837e0f
iio: exynos-adc: request second interupt only when touchscreen mode is used | *7a641bc52f
iio: afe: rescale: Accept only offset channels | *9236d2ea64
io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid | *1684909df3
kasan: print the original fault addr when access invalid shadow | *6a5b845b57
blk-throttle: check for overflow in calculate_bytes_allowed | *bb20a245df
scsi: sd: Introduce manage_shutdown device flag | *93fa5786f9
iavf: in iavf_down, disable queues when removing the driver | *f7f660df65
drm/logicvc: Kconfig: select REGMAP and REGMAP_MMIO | *cb115b6688
i40e: Fix wrong check for I40E_TXR_FLAGS_WB_ON_ITR | *144f93c622
gtp: fix fragmentation needed check with gso | *039a050740
gtp: uapi: fix GTPA_MAX | *664a358b79
tcp: fix wrong RTO timeout when received SACK reneging | *5b100bb044
r8152: Release firmware if we have an error in probe | *ecb51a434e
r8152: Cancel hw_phy_work if we have an error in probe | *87376143df
r8152: Run the unload routine if we have errors during probe | *ee73f937c5
r8152: Increase USB control msg timeout to 5000ms as per spec | *9eb275fec6
net: usb: smsc95xx: Fix uninit-value access in smsc95xx_read_reg | *7c799bc322
net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show() | *55b01c5a84
net: ethernet: adi: adin1110: Fix uninitialized variable | *9d2b588fae
igc: Fix ambiguity in the ethtool advertising | *fa28949c72
neighbour: fix various data-races | *c166dd51b6
igb: Fix potential memory leak in igb_add_ethtool_nfc_entry | *9a194064fa
treewide: Spelling fix in comment | *b1ad0a147d
i40e: Fix I40E_FLAG_VF_VLAN_PRUNING value | *d8ac13acfb
iavf: initialize waitqueues before starting watchdog_task | *66e879507b
r8169: fix the KCSAN reported data race in rtl_rx while reading desc->opts1 | *d10140916e
r8169: fix the KCSAN reported data-race in rtl_tx while reading TxDescArray[entry].opts1 | *4138a02c89
r8169: fix the KCSAN reported data-race in rtl_tx() while reading tp->cur_tx | *29f365f4c3
clk: ti: Fix missing omap5 mcbsp functional clock and aliases | *2ba943c6d9
clk: ti: Fix missing omap4 mcbsp functional clock and aliases | *8d8346ed39
firmware/imx-dsp: Fix use_after_free in imx_dsp_setup_channels() | *df4169fc9b
ARM: OMAP: timer32K: fix all kernel-doc warnings | *6c668e2f33
drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper() | *024251bab2
drm/amd: Disable ASPM for VI w/ all Intel systems | *eded5f5261
drm/i915/pmu: Check if pmu is closed before stopping event | *4f46c177c0
nfsd: lock_rename() needs both directories to live on the same fs | *3262ff5826
maple_tree: add GFP_KERNEL to allocations in mas_expected_entries() | *b1b2750de1
hugetlbfs: extend hugetlb_vma_lock to private VMAs | *c9b066f692
mm/migrate: fix do_pages_move for compat pointers | *a6fbf025e3
mm/page_alloc: correct start page when guard page debug is enabled | *0aa7b24c06
hugetlbfs: clear resv_map pointer if mmap fails | *38d0d1c442
mm: fix vm_brk_flags() to not bail out while holding lock | *38930ec767
arm64: dts: rockchip: Fix i2s0 pin conflict on ROCK Pi 4 boards | *9d72254c2b
arm64: dts: rockchip: Add i2s0-2ch-bus-bclk-off pins to RK3399 | *08e6b680f2
vhost: Allow null msg.size on VHOST_IOTLB_INVALIDATE | *1f14ded0f1
vsock/virtio: initialize the_virtio_vsock before using VQs | *534487cc3e
virtio_pci: fix the common cfg map size | *86f467d358
virtio-crypto: handle config changed by work queue | *a9d4a1ea67
virtio-mmio: fix memory leak of vm_dev | *19b30a8790
virtio_balloon: Fix endless deflation and inflation on arm64 | *bede8b4b51
mcb-lpc: Reallocate memory region to avoid memory overlapping | *c9efc3efe4
mcb: Return actual parsed size when reading chameleon table | *e58ab834e4
pinctrl: qcom: lpass-lpi: fix concurrent register updates | *018b11ecba
ASoC: codecs: wcd938x: fix runtime PM imbalance on remove | *508c3353fe
ASoC: codecs: wcd938x: fix regulator leaks on probe errors | *877fc75d2c
ASoC: codecs: wcd938x: Simplify with dev_err_probe | *629ba75200
ASoC: codecs: wcd938x: Convert to platform remove callback returning void | *1fae817d3e
mmc: core: Fix error propagation for some ioctl commands | *719c01f281
mmc: block: ioctl: do write error check for spi | *651e66d20b
mmc: core: Align to common busy polling behaviour for mmc ioctls | *d3466ce4f4
KVM: x86/pmu: Truncate counter value to allowed width on write * |a5623b3d30
ANDROID: GKI: add system_unbound_wq to some symbol lists. * |08d790dfee
Revert "audit,io_uring: io_uring openat triggers audit reference count underflow" * |ddf96fa712
Revert "tcp: allow again tcp_disconnect() when threads are waiting" * |a5f2364ea6
Revert "tcp_bpf: properly release resources on error paths" * |904cdc97d4
Revert "ipv4/fib: send notify when delete source address routes" * |17952d5aad
Revert "Bluetooth: hci_core: Fix build warnings" * |29756f9286
Revert "xfrm: fix a data-race in xfrm_gen_index()" * |63eafbb6b3
Revert "perf: Disallow mis-matched inherited group reads" * |4933ddb051
ANDROID: fix up 6.1.60 merge of hid.h into android14-6.1-lts * |0a1364ec1f
ANDROID: GKI: arm64: drop CONFIG_DEBUG_PREEMPT forced disable * |788e35fdea
Merge 6.1.60 into android14-6.1-lts |\| | *32c9cdbe38
Linux 6.1.60 | *7f5bb254be
selftests: mptcp: join: no RST when rm subflow/addr | *0e0123e0e5
selftests: mptcp: join: correctly check for no RST | *300447c572
mptcp: avoid sending RST when closing the initial subflow | *c04f416730
Bluetooth: hci_sock: Correctly bounds check and pad HCI_MON_NEW_INDEX name | *a429d65428
Bluetooth: hci_sock: fix slab oob read in create_monitor_event | *46de539282
net: move altnames together with the netdevice | *c1d531aa09
phy: mapphone-mdm6600: Fix pinctrl_pm handling for sleep pins | *13a45130bb
phy: mapphone-mdm6600: Fix runtime PM for remove | *7fcce3258b
phy: mapphone-mdm6600: Fix runtime disable on probe | *4eac2cf444
gpio: vf610: mask the gpio irq in system suspend and support wakeup | *9b0f8a9dfd
gpio: vf610: make irq_chip immutable | *1f38ead73f
tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols | *e9b4b72567
kallsyms: Add helper kallsyms_on_each_match_symbol() | *da359f699f
kallsyms: Reduce the memory occupied by kallsyms_seqs_of_names[] | *3918cada8f
serial: 8250: omap: convert to modern PM ops | *70a841eb4f
serial: 8250: omap: Move uart_write() inside PM section | *6df4c9dee0
drm/bridge: ti-sn65dsi86: Associate DSI device lifetime with auxiliary device | *3d57f6ac64
ASoC: pxa: fix a memory leak in probe() | *14a1a7beb3
gpio: vf610: set value before the direction to avoid a glitch | *7ec224d980
platform/x86: asus-wmi: Map 0x2a code, Ignore 0x2b and 0x2c events | *baf191abec
platform/x86: asus-wmi: Only map brightness codes when using asus-wmi backlight control | *4186c79c13
platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e | *52d54f1d4e
platform/x86: intel-uncore-freq: Conditionally create attribute for read frequency | *8a4b575d00
platform/surface: platform_profile: Propagate error if profile registration fails | *fec769b9fd
s390/cio: fix a memleak in css_alloc_subchannel | *7241c2627c
selftests/ftrace: Add new test case which checks non unique symbol | *324c31b0e0
s390/pci: fix iommu bitmap allocation | *f6952655a6
perf: Disallow mis-matched inherited group reads | *908c628005
USB: serial: option: add Fibocom to DELL custom modem FM101R-GL | *acced163ab
USB: serial: option: add entry for Sierra EM9191 with new firmware | *1dce40c9e6
USB: serial: option: add Telit LE910C4-WWX 0x1035 composition | *59aa39697f
HID: input: map battery system charging | *ea0e047309
KVM: x86/mmu: Stop zapping invalidated TDP MMU roots asynchronously | *3519cee444
nvme-rdma: do not try to stop unallocated queues | *bec9cb90fe
nvmet-auth: complete a request only after freeing the dhchap pointers | *0ec655ad65
nvme-pci: add BOGUS_NID for Intel 0a54 device | *2c0b40c310
nvme: sanitize metadata bounce buffer for reads | *a54974b007
nfs42: client needs to strip file mode's suid/sgid bit after ALLOCATE op | *8d69b47443
ACPI: irq: Fix incorrect return value in acpi_register_gsi() | *c462bf4ef8
NFSv4.1: fixup use EXCHGID4_FLAG_USE_PNFS_DS for DS server | *ab65424d61
pNFS/flexfiles: Check the layout validity in ff_layout_mirror_prepare_stats | *730bbbbe16
pNFS: Fix a hang in nfs4_evict_inode() | *fbd8b28fe4
Revert "pinctrl: avoid unsafe code pattern in find_pinctrl()" | *c4b7b119c5
mmc: core: Capture correct oemid-bits for eMMC cards | *85664ad23f
mmc: core: sdio: hold retuning if sdio in 1-bit mode | *aaa476a7ad
mmc: mtk-sd: Use readl_poll_timeout_atomic in msdc_reset_hw | *43f588b820
mmc: sdhci-pci-gli: fix LPM negotiation so x86/S0ix SoCs can suspend | *55c2428658
dt-bindings: mmc: sdhci-msm: correct minimum number of clocks | *73915d26b4
mtd: physmap-core: Restore map_rom fallback | *578687563e
mtd: spinand: micron: correct bitmask for ecc status | *8b2b755a1a
mtd: rawnand: arasan: Ensure program page operations are successful | *58277212f5
mtd: rawnand: marvell: Ensure program page operations are successful | *250feed792
mtd: rawnand: pl353: Ensure program page operations are successful | *5845448613
mtd: rawnand: qcom: Unmap the right resource upon probe failure | *a7f5558ec2
net/smc: fix smc clc failed issue when netdevice not in init_net | *2efcdbef13
tcp_bpf: properly release resources on error paths | *c3e70048ac
selftests: openvswitch: Add version check for pyroute2 | *a1a9e57037
Bluetooth: hci_event: Fix using memcmp when comparing keys | *758610516f
ice: Remove redundant pci_enable_pcie_error_reporting() | *ec9bc89a01
tcp: allow again tcp_disconnect() when threads are waiting | *9dc02f41d5
net/tls: split tls_rx_reader_lock | *76f96854aa
net/mlx5e: Don't offload internal port if filter device is out device | *107ff0034b
net/mlx5: Handle fw tracer change ownership event based on MTRC | *0aa1e83a20
net/mlx5: E-switch, register event handler before arming the event | *c21bff1c99
xfrm6: fix inet6_dev refcount underflow problem | *d91723f6ca
net: xfrm: skip policies marked as dead while reinserting policies | *df2cc87f2c
fprobe: Fix to ensure the number of active retprobes is not zero | *f177a579d2
fprobe: Add nr_maxactive to specify rethook_node pool size | *0806cb1e6c
fprobe: Pass entry_data to handlers | *bacf8c749a
cpufreq: schedutil: Update next_freq when cpufreq_limits change | *62733bbae1
platform/x86: touchscreen_dmi: Add info for the Positivo C4128B | *60dc7e39df
HID: nintendo: reinitialize USB Pro Controller after resuming from suspend | *ef8cdee81e
HID: multitouch: Add required quirk for Synaptics 0xcd7e device | *2a2df4f74f
drm/amd/pm: add unique_id for gc 11.0.3 | *1869638a14
btrfs: error out when reallocating block for defrag using a stale transaction | *f174c8d2c6
btrfs: error when COWing block from a root that is being deleted | *c833f1e28d
btrfs: error out when COWing block using a stale transaction | *9d99acb6a1
btrfs: fix some -Wmaybe-uninitialized warnings in ioctl.c | *c3657e5fa7
drm: panel-orientation-quirks: Add quirk for One Mix 2S | *ffbb01fe9a
ipv4/fib: send notify when delete source address routes | *52080d6edc
sky2: Make sure there is at least one frag_addr available | *d63d39e7f9
regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()" | *2353f64762
wifi: cfg80211: avoid leaking stack data into trace | *2fd88f5632
wifi: mac80211: allow transmitting EAPOL frames with tainted key | *9285fea3a2
wifi: mac80211: work around Cisco AP 9115 VHT MPDU length | *dbbb6090c9
wifi: cfg80211: Fix 6GHz scan configuration | *a55d53ad5c
Bluetooth: hci_core: Fix build warnings | *aad0760c26
Bluetooth: Avoid redundant authentication | *7045675fc9
Bluetooth: btusb: add shutdown function for QCA6174 | *7d823a1071
HID: holtek: fix slab-out-of-bounds Write in holtek_kbd_input_event | *f45752f1eb
HID: logitech-hidpp: Add Bluetooth ID for the Logitech M720 Triathlon mouse | *e045b6a921
wifi: iwlwifi: Ensure ack flag is properly cleared. | *eb7ae9ed63
wifi: mwifiex: Sanity check tlv_len and tlv_bitmap_len | *b812b31696
tracing: relax trace_event_eval_update() execution with cond_resched() | *1c859abdd7
ata: libata-eh: Fix compilation warning in ata_eh_link_report() | *e4ce5ce29a
ata: libata-core: Fix compilation warning in ata_dev_config_ncq() | *5075570a3e
gpio: timberdale: Fix potential deadlock on &tgpio->lock | *d0dab9dd32
overlayfs: set ctime when setting mtime and atime | *6133f63d4d
i2c: mux: Avoid potential false error message in i2c_mux_add_adapter | *febcad3d32
btrfs: initialize start_slot in btrfs_log_prealloc_extents | *563853bf3b
btrfs: return -EUCLEAN for delayed tree ref with a ref count not equals to 1 | *8a4e34fe1b
btrfs: prevent transaction block reserve underflow when starting transaction | *c194e184a8
fs-writeback: do not requeue a clean inode having skipped pages | *a7354d9064
ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone | *1c972cb674
pwr-mlxbf: extend Kconfig to include gpio-mlxbf3 dependency | *82a93c65a4
iio: adc: ad7192: Correct reference voltage | *ee1d783be5
iio: adc: ad7192: Simplify using devm_regulator_get_enable() | *3b02dbd1cd
iio: cros_ec: fix an use-after-free in cros_ec_sensors_push_data() | *7bca0af538
iio: core: introduce iio_device_{claim|release}_buffer_mode() APIs | *681c8a2c23
serial: 8250_omap: Fix errors with no_console_suspend | *9424a0a456
serial: 8250: omap: Fix imprecise external abort for omap_8250_pm() | *7067c3cf08
serial: Reduce spinlocked portion of uart_rs485_config() | *147156b19c
serial: Rename uart_change_speed() to uart_change_line_settings() | *e4df8000bd
serial: Move uart_change_speed() earlier | *4d382ba65d
usb: misc: onboard_hub: add support for Microchip USB2412 USB 2.0 hub | *8e939c21f6
usb: misc: onboard_usb_hub: add Genesys Logic GL3523 hub support | *a46907e1f6
usb: misc: onboard_usb_hub: add Genesys Logic GL852G hub support | *a2431e7e8b
usb: misc: onboard_usb_hub: add Genesys Logic GL850G hub support | *5e7275e432
selftests/mm: fix awk usage in charge_reserved_hugetlb.sh and hugetlb_reparenting_test.sh that may cause error | *673edcffa0
net: check for altname conflicts when changing netdev's netns | *9307f5f59a
net: fix ifname in netlink ntf during netns move | *b92433493b
net: avoid UAF on deleted altname | *1cf912054a
net: pktgen: Fix interface flags printing | *2fb84f5214
net: phy: bcm7xxx: Add missing 16nm EPHY statistics | *e1512ff1ec
netfilter: nf_tables: revert do not remove elements if set backend implements .abort | *c2eaa8319f
netfilter: nf_tables: do not remove elements if set backend implements .abort | *0e8cdddf01
netlink: Correct offload_xstats size | *0697918ec0
netfilter: nft_set_rbtree: .deactivate fails if element has expired | *d9d289b78c
selftests: netfilter: Run nft_audit.sh in its own netns | *0bb1573512
selftests: openvswitch: Catch cases where the tests are killed | *e0914e5a05
neighbor: tracing: Move pin6 inside CONFIG_IPV6=y section | *d80bc19142
net/sched: sch_hfsc: upgrade 'rt' to 'sc' when it becomes a inner curve | *ec7393fe63
bonding: Return pointer to data after pull on skb | *3065fabd17
net: dsa: bcm_sf2: Fix possible memory leak in bcm_sf2_mdio_register() | *9c3d276fa8
i40e: prevent crash on probe if hw registers have invalid values | *f0ab9b0922
octeon_ep: update BQL sent bytes before ringing doorbell | *1a68d44011
net: usb: smsc95xx: Fix an error code in smsc95xx_reset() | *2c6451d665
ipv4: fib: annotate races around nh->nh_saddr_genid and nh->nh_saddr | *9570bee678
tun: prevent negative ifindex | *8b9c79c0ec
tcp: Fix listen() warning with v4-mapped-v6 address. | *f534a513e8
tcp: tsq: relax tcp_small_queue_check() when rtx queue contains a single skb | *4e1f3457e9
tcp: fix excessive TLP and RACK timeouts from HZ rounding | *df5ee37bf2
net: rfkill: gpio: prevent value glitch during probe | *2a6fc637c6
net: ipv6: fix return value check in esp_remove_trailer | *55d794cef3
net: ipv4: fix return value check in esp_remove_trailer | *49b9165ead
wifi: cfg80211: use system_unbound_wq for wiphy work | *405dbaf049
xfrm: interface: use DEV_STATS_INC() | *b372db2b8d
xfrm: fix a data-race in xfrm_gen_index() | *3065fa2cdd
xfrm: fix a data-race in xfrm_lookup_with_ifid() | *2c7ec9e9ea
qed: fix LL2 RX buffer allocation | *cc87f4db14
ASoC: codecs: wcd938x: fix resource leaks on bind errors | *8092aed623
ASoC: codecs: wcd938x: fix unbind tear down order | *b2974b20e4
ASoC: codecs: wcd938x: drop bogus bind error handling | *569afdedde
ASoC: codecs: wcd938x-sdw: fix runtime PM imbalance on probe errors | *0d912daab4
ASoC: codecs: wcd938x-sdw: fix use after free on driver unbind | *d496b6638c
ALSA: hda/relatek: Enable Mute LED on HP Laptop 15s-fq5xxx | *086babbbf8
ALSA: hda/realtek: Add quirk for ASUS ROG GU603ZV | *bcf883e244
ALSA: hda/realtek - Fixed ASUS platform headset Mic issue | *a9519099e3
drm/mediatek: Correctly free sg_table in gem prime vmap | *add2eeda1d
drm/i915: Retry gtt fault when out of fence registers | *f691ec5a54
nvmet-tcp: Fix a possible UAF in queue intialization setup | *02322c5177
netfilter: nft_payload: fix wrong mac header matching | *36a315c923
fs/ntfs3: fix deadlock in mark_as_free_ex | *c1f2638e31
fs/ntfs3: fix panic about slab-out-of-bounds caused by ntfs_list_ea() | *fb80a28fef
fs/ntfs3: Fix possible null-pointer dereference in hdr_find_e() | *d4ae85b883
mptcp: more conservative check for zero probes | *80990979a9
tcp: check mptcp-level constraints for backlog coalescing | *f7e65c03d5
audit,io_uring: io_uring openat triggers audit reference count underflow | *a556a0df8d
x86: KVM: SVM: refresh AVIC inhibition in svm_leave_nested() | *54f030271d
x86: KVM: SVM: add support for Invalid IPI Vector interception | *482565df35
KVM: x86: Constrain guest-supported xfeatures only at KVM_GET_XSAVE{2} | *20695711e2
x86/fpu: Allow caller to constrain xfeatures when copying to uabi buffer | *57d0639f60
x86/sev: Check for user-space IOIO pointing to kernel space | *def94eb9a8
x86/sev: Check IOBM for IOIO exceptions from user-space | *95ff590b80
x86/sev: Disable MMIO emulation from user mode | *19ffa9b251
KVM: x86: Mask LVTPC when handling a PMI | *d11cfd1f30
regmap: fix NULL deref on lookup | *d7dbdbe380
nfc: nci: fix possible NULL pointer dereference in send_acknowledge() | *fb8e1608b0
btrfs: fix stripe length calculation for non-zoned data chunk allocation | *753ef5ef4c
net/smc: return the right falback reason when prefix checks fail | *d994502fdc
ice: reset first in crash dump kernels | *0f8d381ada
ice: fix over-shifted variable | *bbc5c96f82
Bluetooth: avoid memcmp() out of bounds warning | *feffabdd0a
Bluetooth: hci_event: Fix coding style | *99ccf8d79b
Bluetooth: vhci: Fix race when opening vhci device | *25e5d28830
Bluetooth: Fix a refcnt underflow problem for hci_conn | *faa6366605
Bluetooth: Reject connection with the device which has same BD_ADDR | *8d76a44d26
Bluetooth: hci_event: Ignore NULL link key | *84523aeeea
igc: Fix race condition in PTP tx code | *ff996d61dd
igc: Add condition for qbv_config_change_errors counter | *cd7b19dc5f
igc: Add qbv_config_change_errors counter | *88421f4741
igc: Remove reset adapter task for i226 during disable tsn config | *3c3418a586
igc: enable Qbv configuration for 2nd GCL | *8420fe4dd2
igc: remove I226 Qbv BaseTime restriction | *db4677b350
lib/Kconfig.debug: do not enable DEBUG_PREEMPT by default * |316250b759
Revert "net: macsec: indicate next pn update when offloading" * |394fcccbe1
Revert "net: phy: mscc: macsec: reject PN update requests" * |a36206a6bb
Revert "net/mlx5e: macsec: use update_pn flag instead of PN comparation" * |b0e44b2726
Revert "tcp: enforce receive buffer memory limits by allowing the tcp window to shrink" * |3858124ea0
Merge 6.1.59 into android14-6.1-lts |\| | *7d24402875
Linux 6.1.59 | *eb26fa974c
ALSA: hda/realtek - Fixed two speaker platform | *54357fcafa
powerpc/64e: Fix wrong test in __ptep_test_and_clear_young() | *0afcc9d4a1
powerpc/8xx: Fix pte_access_permitted() for PAGE_NONE | *9a995e11b2
dmaengine: mediatek: Fix deadlock caused by synchronize_irq() | *01b19fc662
dmaengine: idxd: use spin_lock_irqsave before wait_event_lock_irq | *5b784489c8
x86/alternatives: Disable KASAN in apply_alternatives() | *033c0d5101
usb: cdnsp: Fixes issue with dequeuing not queued requests | *49fbc18378
usb: gadget: ncm: Handle decoding of multiple NTB's in unwrap call | *e5588fb391
usb: gadget: udc-xilinx: replace memcpy with memcpy_toio | *71d323072a
usb: typec: ucsi: Clear EVENT_PENDING bit if ucsi_send_command fails | *4d85f1ce6c
usb: typec: altmodes/displayport: Signal hpd low when exiting mode | *bc67250859
counter: microchip-tcb-capture: Fix the use of internal GCLK logic | *0e3953b577
counter: chrdev: fix getting array extensions | *9f6b391b04
scsi: ufs: core: Correct clear TM error log | *97306abdea
pinctrl: avoid unsafe code pattern in find_pinctrl() | *d67b5a2b97
dma-buf: add dma_fence_timestamp helper | *cb8f1dd1b7
cgroup: Remove duplicates in cgroup v1 tasks file | *57e7696b78
usb: typec: ucsi: Use GET_CAPABILITY attributes data to set power supply scope | *062f16c4dd
nfp: flower: avoid rmmod nfp crash issues | *1db0724a01
mctp: perform route lookups under a RCU read-side lock | *60c3e7a00d
tee: amdtee: fix use-after-free vulnerability in amdtee_close_session | *862aa98181
Input: goodix - ensure int GPIO is in input for gpio_count == 1 && gpio_int_idx == 0 case | *fbfb99ac5d
Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table | *9c6a11a05b
Input: xpad - add PXN V900 support | *211f71c1c0
Input: psmouse - fix fast_reconnect function for PS/2 mode | *2efe67c581
Input: powermate - fix use-after-free in powermate_config_complete | *4d6c1845cb
ceph: fix type promotion bug on 32bit systems | *9f43481c0d
ceph: fix incorrect revoked caps assert in ceph_fill_file_size() | *086d885c20
libceph: use kernel_connect() | *8ac2689502
powerpc/47x: Fix 47x syscall return crash | *434e3522b9
thunderbolt: Restart XDomain discovery handshake after failure | *5d206a77d4
thunderbolt: Check that lane 1 is in CL0 before enabling lane bonding | *0cf7ee2cc6
thunderbolt: Workaround an IOMMU fault on certain systems with Intel Maple Ridge | *23122e0c0e
mcb: remove is_added flag from mcb_device struct | *125f495fa6
x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs | *3863989497
perf/x86/lbr: Filter vsyscall addresses | *55b51187d2
ksmbd: not allow to open file if delelete on close bit is set | *ac2d5e70fb
ACPI: EC: Add quirk for the HP Pavilion Gaming 15-dk1xxx | *7aac2f2c00
ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA | *f041091756
drm/amd/display: Don't set dpms_off for seamless boot | *a61d905a86
drm/amdgpu: add missing NULL check | *0fb82afee5
drm/atomic-helper: relax unregistered connector check | *5bab104963
arm64: dts: mediatek: mt8195-demo: update and reorder reserved memory regions | *f17e00fb0c
arm64: dts: mediatek: mt8195-demo: fix the memory size to 8GB | *ff42d244b3
iio: addac: Kconfig: update ad74413r selections | *7d4ff34b6c
iio: pressure: ms5611: ms5611_prom_is_valid false negative bug | *b166ce5275
iio: pressure: dps310: Adjust Timeout Settings | *e93a7677f0
iio: admv1013: add mixer_vgate corner cases | *8ab33ae244
iio: dac: ad3552r: Correct device IDs | *a6bd5e1653
iio: adc: imx8qxp: Fix address for command buffer registers | *92426b1f5f
iio: imu: bno055: Fix missing Kconfig dependencies | *187939163b
iio: pressure: bmp280: Fix NULL pointer exception | *88a204cc0c
usb: musb: Modify the "HWVers" register address | *fecb419c62
usb: musb: Get the musb_qh poniter after musb_giveback | *fb9895ab95
usb: hub: Guard against accesses to uninitialized BOS descriptors | *1edbf4b285
usb: cdns3: Modify the return value of cdns_set_active () to void when CONFIG_PM_SLEEP is disabled | *3571910368
usb: dwc3: Soft reset phy on probe for host | *ea9ae69b0e
net: usb: dm9601: fix uninitialized variable use in dm9601_mdio_read | *c5bfe67d9f
usb: xhci: xhci-ring: Use sysdev for mapping bounce buffer | *f049b10aff
dmaengine: stm32-mdma: set in_flight_bytes in case CRQA flag is set | *721dbbabf1
dmaengine: stm32-mdma: use Link Address Register to compute residue | *fe15819408
dmaengine: stm32-dma: fix residue in case of MDMA chaining | *1e3b981a25
dmaengine: stm32-dma: fix stm32_dma_prep_slave_sg in case of MDMA chaining | *8e7dfe9c2a
dmaengine: stm32-mdma: abort resume if no ongoing transfer | *0796c53424
tcp: enforce receive buffer memory limits by allowing the tcp window to shrink | *55027c1d99
workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask() | *853dda54ba
nfc: nci: assert requested protocol is valid | *684accd26d
pinctrl: renesas: rzn1: Enable missing PINMUX | *f05befe5c4
net/smc: Fix pos miscalculation in statistics | *e4f2611f07
net: nfc: fix races in nfc_llcp_sock_get() and nfc_llcp_sock_get_sn() | *ab8075d3a4
net/mlx5e: Again mutually exclude RX-FCS and RX-port-timestamp | *04753d5ae2
ixgbe: fix crash with empty VF macvlan list | *89be6ad344
net/mlx5e: macsec: use update_pn flag instead of PN comparation | *a698195f3a
net: phy: mscc: macsec: reject PN update requests | *0d86ad068c
net: macsec: indicate next pn update when offloading | *50bce6a051
net: refine debug info in skb_checksum_help() | *30ca523f28
bpf: Fix verifier log for async callback return values | *e1f1e3cc5b
drm/vmwgfx: fix typo of sizeof argument | *5bfc5a28b5
riscv, bpf: Sign-extend return values | *72ae139546
riscv, bpf: Factor out emit_call for kernel and bpf context | *30a8354602
xen-netback: use default TX queue size for vifs | *469bef8129
mlxsw: fix mlxsw_sp2_nve_vxlan_learning_set() return type | *217efe32a4
ieee802154: ca8210: Fix a potential UAF in ca8210_probe | *6f6fa8061f
ravb: Fix use-after-free issue in ravb_tx_timeout_work() | *3f9295ad7f
ravb: Fix up dma_free_coherent() call in ravb_remove() | *cfe535ee69
arm64: dts: mediatek: mt8195: Set DSU PMU status to fail | *53c6dc71bf
can: sun4i_can: Only show Kconfig if ARCH_SUNXI is set | *789d125c0e
can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior | *881050b25b
net: dsa: qca8k: fix potential MDIO bus conflict when accessing internal PHYs via management frames | *6f901f8448
phy: lynx-28g: serialize concurrent phy_set_mode_ext() calls to shared registers | *e173d9a2e5
phy: lynx-28g: lock PHY while performing CDR lock workaround | *e52c81a9e3
phy: lynx-28g: cancel the CDR check work item on the remove path | *5f9d0edff2
drm/msm/dp: Add newlines to debug printks | *61b595ede9
drm/msm/dpu: change _dpu_plane_calc_bw() to use u64 to avoid overflow | *3979a9e572
drm/msm/dsi: fix irq_of_parse_and_map() error checking | *3de09684de
drm/msm/dsi: skip the wait for video mode done if not applicable | *82cb81ea96
drm/msm/dp: do not reinitialize phy unless retry during link training | *6c18c386fd
pinctrl: nuvoton: wpcm450: fix out of bounds write | *37157830a9
ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP | *171b791cc2
ALSA: hda/realtek - ALC287 I2S speaker platform support | *a8b85e47e3
ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx | *e225f67d49
ALSA: hda/realtek: Add quirk for HP Victus 16-d1xxx to enable mute LED | *8f7bb2b77b
ASoC: fsl_sai: Don't disable bitclock for i.MX8MP | *aacc508dd3
ASoC: fsl_sai: MCLK bind with TX/RX enable bit | *8276d65cf7
ASoC: Use of_property_read_bool() for boolean properties | *8611606c76
ASoC: Intel: soc-acpi: Add entry for sof_es8336 in MTL match table. | *4a250b3492
ASoC: Intel: sof_sdw: add support for SKU 0B14 | *307bbbbb94
ASoC: Intel: soc-acpi: Add entry for HDMI_In capture support in MTL match table | *988fba279d
ASoC: simple-card-utils: fixup simple_util_startup() error handling | *e3353ad7db
ASoC: SOF: amd: fix for firmware reload failure after playback | *2aa53213b6
ALSA: hda/realtek: Change model for Intel RVP board | *4cb0984557
ALSA: usb-audio: Fix microphone sound on Nexigo webcam. | *0f44423e35
ALSA: usb-audio: Fix microphone sound on Opencomm2 Headset | *3746b878ef
KEYS: trusted: Remove redundant static calls usage | *b86ac71abb
irqchip: renesas-rzg2l: Fix logic to clear TINT interrupt source | *d684418750
dt-bindings: interrupt-controller: renesas,rzg2l-irqc: Update description for '#interrupt-cells' property | *f4eaaa30d0
arm64: dts: qcom: sm8150: extend the size of the PDC resource | *020958c946
net: prevent address rewrite in kernel_bind() | *8fcdf7da9d
ata: libata-scsi: Disable scsi device manage_system_start_stop | *abc918831a
ASoC: amd: yc: Fix non-functional mic on Lenovo 82YM | *12a820a992
quota: Fix slow quotaoff | *fd72ac9556
HID: logitech-hidpp: Fix kernel crash on receiver USB disconnect | *87aa3ca497
scsi: Do not rescan devices with a suspended queue | *342f321af8
platform/x86: hp-wmi:: Mark driver struct with __refdata to prevent section mismatch warning | *af21c9119a
platform/x86: think-lmi: Fix reference leak | *1c8f6c7b83
perf/arm-cmn: Fix the unhandled overflow status of counter 4 to 7 | *3aade96e0c
RDMA/cxgb4: Check skb value for failure to allocate | *f175665385
drm/i915: Don't set PIPE_CONTROL_FLUSH_L3 for aux inval | *f2060a3a59
mptcp: fix delegated action races | *b67d7b1bfc
net: mana: Fix TX CQE error handling * |d58a224aca
Merge 6.1.58 into android14-6.1-lts |/ *adc4d740ad
Linux 6.1.58 *38fd36728f
lib/test_meminit: fix off-by-one error in test_pages() *ff74bdc838
Revert "NFS: Fix error handling for O_DIRECT write scheduling" *b0cee281c4
Revert "NFS: Fix O_DIRECT locking issues" *ebf5841ac1
Revert "NFS: More O_DIRECT accounting fixes for error paths" *506cf335d9
Revert "NFS: Use the correct commit info in nfs_join_page_group()" *e8db8b5581
Revert "NFS: More fixes for nfs_direct_write_reschedule_io()" Change-Id: Id55c4007c922e5c8a6c5220f2f615a0d9b422cde Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
commit
0177cfb2a2
@ -6,3 +6,12 @@ Description:
|
||||
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
|
||||
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
|
||||
are free to create needed API under optee-ta-<uuid> directory.
|
||||
|
||||
What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
|
||||
Date: November 2023
|
||||
KernelVersion: 6.7
|
||||
Contact: op-tee@lists.trustedfirmware.org
|
||||
Description:
|
||||
Allows to distinguish whether an OP-TEE based TA/device requires user-space
|
||||
tee-supplicant to function properly or not. This attribute will be present for
|
||||
devices which depend on tee-supplicant to be running.
|
||||
|
@ -5708,6 +5708,13 @@
|
||||
This feature may be more efficiently disabled
|
||||
using the csdlock_debug- kernel parameter.
|
||||
|
||||
smp.panic_on_ipistall= [KNL]
|
||||
If a csd_lock_timeout extends for more than
|
||||
the specified number of milliseconds, panic the
|
||||
system. By default, let CSD-lock acquisition
|
||||
take as long as they take. Specifying 300,000
|
||||
for this value provides a 5-minute timeout.
|
||||
|
||||
smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices
|
||||
smsc-ircc2.ircc_cfg= [HW] Device configuration I/O port
|
||||
smsc-ircc2.ircc_sir= [HW] SIR base I/O port
|
||||
|
@ -62,6 +62,9 @@ properties:
|
||||
- description: MPM pin number
|
||||
- description: GIC SPI number for the MPM pin
|
||||
|
||||
'#power-domain-cells':
|
||||
const: 0
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
@ -93,4 +96,5 @@ examples:
|
||||
<86 183>,
|
||||
<90 260>,
|
||||
<91 260>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
|
@ -31,8 +31,9 @@ properties:
|
||||
- const: renesas,rzg2l-irqc
|
||||
|
||||
'#interrupt-cells':
|
||||
description: The first cell should contain external interrupt number (IRQ0-7) and the
|
||||
second cell is used to specify the flag.
|
||||
description: The first cell should contain a macro RZG2L_{NMI,IRQX} included in the
|
||||
include/dt-bindings/interrupt-controller/irqc-rzg2l.h and the second
|
||||
cell is used to specify the flag.
|
||||
const: 2
|
||||
|
||||
'#address-cells':
|
||||
|
@ -21,8 +21,10 @@ Required properties:
|
||||
compatible:
|
||||
"mediatek,mt6323" for PMIC MT6323
|
||||
"mediatek,mt6331" for PMIC MT6331 and MT6332
|
||||
"mediatek,mt6358" for PMIC MT6358 and MT6366
|
||||
"mediatek,mt6357" for PMIC MT6357
|
||||
"mediatek,mt6358" for PMIC MT6358
|
||||
"mediatek,mt6359" for PMIC MT6359
|
||||
"mediatek,mt6366", "mediatek,mt6358" for PMIC MT6366
|
||||
"mediatek,mt6397" for PMIC MT6397
|
||||
|
||||
Optional subnodes:
|
||||
@ -39,6 +41,7 @@ Optional subnodes:
|
||||
- compatible: "mediatek,mt6323-regulator"
|
||||
see ../regulator/mt6323-regulator.txt
|
||||
- compatible: "mediatek,mt6358-regulator"
|
||||
- compatible: "mediatek,mt6366-regulator", "mediatek-mt6358-regulator"
|
||||
see ../regulator/mt6358-regulator.txt
|
||||
- compatible: "mediatek,mt6397-regulator"
|
||||
see ../regulator/mt6397-regulator.txt
|
||||
|
@ -59,7 +59,7 @@ properties:
|
||||
maxItems: 4
|
||||
|
||||
clocks:
|
||||
minItems: 3
|
||||
minItems: 2
|
||||
items:
|
||||
- description: Main peripheral bus clock, PCLK/HCLK - AHB Bus clock
|
||||
- description: SDC MMC clock, MCLK
|
||||
|
@ -37,11 +37,11 @@ along with a description:
|
||||
the return value. General error numbers (-ENOMEM, -EINVAL)
|
||||
are not detailed, but errors with specific meanings are.
|
||||
|
||||
The guest ioctl should be issued on a file descriptor of the /dev/sev-guest device.
|
||||
The ioctl accepts struct snp_user_guest_request. The input and output structure is
|
||||
specified through the req_data and resp_data field respectively. If the ioctl fails
|
||||
to execute due to a firmware error, then fw_err code will be set otherwise the
|
||||
fw_err will be set to 0x00000000000000ff.
|
||||
The guest ioctl should be issued on a file descriptor of the /dev/sev-guest
|
||||
device. The ioctl accepts struct snp_user_guest_request. The input and
|
||||
output structure is specified through the req_data and resp_data field
|
||||
respectively. If the ioctl fails to execute due to a firmware error, then
|
||||
the fw_error code will be set, otherwise fw_error will be set to -1.
|
||||
|
||||
The firmware checks that the message sequence counter is one greater than
|
||||
the guests message sequence counter. If guest driver fails to increment message
|
||||
@ -57,8 +57,14 @@ counter (e.g. counter overflow), then -EIO will be returned.
|
||||
__u64 req_data;
|
||||
__u64 resp_data;
|
||||
|
||||
/* firmware error code on failure (see psp-sev.h) */
|
||||
__u64 fw_err;
|
||||
/* bits[63:32]: VMM error code, bits[31:0] firmware error code (see psp-sev.h) */
|
||||
union {
|
||||
__u64 exitinfo2;
|
||||
struct {
|
||||
__u32 fw_error;
|
||||
__u32 vmm_error;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
2.1 SNP_GET_REPORT
|
||||
|
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 6
|
||||
PATCHLEVEL = 1
|
||||
SUBLEVEL = 57
|
||||
SUBLEVEL = 68
|
||||
EXTRAVERSION =
|
||||
NAME = Curry Ramen
|
||||
|
||||
|
@ -773,6 +773,7 @@
|
||||
sysfs_emit
|
||||
sysfs_remove_link
|
||||
system_power_efficient_wq
|
||||
system_unbound_wq
|
||||
system_wq
|
||||
tasklet_init
|
||||
tasklet_kill
|
||||
|
@ -440,6 +440,7 @@
|
||||
sysfs_remove_group
|
||||
sysfs_remove_link
|
||||
system_freezable_wq
|
||||
system_unbound_wq
|
||||
system_wq
|
||||
__tasklet_schedule
|
||||
tasklet_setup
|
||||
|
@ -271,13 +271,6 @@ OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c3_sda */
|
||||
>;
|
||||
};
|
||||
|
||||
leds_pins: pinmux_leds_pins {
|
||||
pinctrl-single,pins = <
|
||||
OMAP3_WKUP_IOPAD(0x2a24, PIN_OUTPUT_PULLUP | MUX_MODE4) /* jtag_emu0.gpio_11 */
|
||||
OMAP3_WKUP_IOPAD(0x2a26, PIN_OUTPUT_PULLUP | MUX_MODE4) /* jtag_emu1.gpio_31 */
|
||||
>;
|
||||
};
|
||||
|
||||
mmc1_pins: pinmux_mmc1_pins {
|
||||
pinctrl-single,pins = <
|
||||
OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_clk.sdmmc1_clk */
|
||||
@ -355,3 +348,12 @@ OMAP3430_CORE2_IOPAD(0x25e2, PIN_INPUT | MUX_MODE3) /* etk_d3.hsusb1_data7 */
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
||||
&omap3_pmx_wkup {
|
||||
leds_pins: pinmux_leds_pins {
|
||||
pinctrl-single,pins = <
|
||||
OMAP3_WKUP_IOPAD(0x2a24, PIN_OUTPUT_PULLUP | MUX_MODE4) /* jtag_emu0.gpio_11 */
|
||||
OMAP3_WKUP_IOPAD(0x2a26, PIN_OUTPUT_PULLUP | MUX_MODE4) /* jtag_emu1.gpio_31 */
|
||||
>;
|
||||
};
|
||||
};
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include "imx28-lwe.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Liebherr XEA board";
|
||||
compatible = "lwn,imx28-xea", "fsl,imx28";
|
||||
};
|
||||
|
||||
|
@ -121,6 +121,8 @@ ethphy1: ethernet-phy@1 {
|
||||
max-speed = <100>;
|
||||
interrupt-parent = <&gpio5>;
|
||||
interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
|
||||
clocks = <&clks IMX6UL_CLK_ENET_REF>;
|
||||
clock-names = "rmii-ref";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -454,7 +454,7 @@ iomuxc_lpsr: pinctrl@302c0000 {
|
||||
};
|
||||
|
||||
gpt1: timer@302d0000 {
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||
reg = <0x302d0000 0x10000>;
|
||||
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
|
||||
@ -463,7 +463,7 @@ gpt1: timer@302d0000 {
|
||||
};
|
||||
|
||||
gpt2: timer@302e0000 {
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||
reg = <0x302e0000 0x10000>;
|
||||
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
|
||||
@ -473,7 +473,7 @@ gpt2: timer@302e0000 {
|
||||
};
|
||||
|
||||
gpt3: timer@302f0000 {
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||
reg = <0x302f0000 0x10000>;
|
||||
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
|
||||
@ -483,7 +483,7 @@ gpt3: timer@302f0000 {
|
||||
};
|
||||
|
||||
gpt4: timer@30300000 {
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
||||
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||
reg = <0x30300000 0x10000>;
|
||||
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clks IMX7D_GPT4_ROOT_CLK>,
|
||||
|
@ -640,6 +640,7 @@ &uart1 {
|
||||
&uart3 {
|
||||
interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
|
||||
&omap4_pmx_core 0x17c>;
|
||||
overrun-throttle-ms = <500>;
|
||||
};
|
||||
|
||||
&uart4 {
|
||||
|
@ -109,6 +109,8 @@ mcbsp1: mcbsp@0 {
|
||||
reg = <0x0 0xff>, /* MPU private access */
|
||||
<0x49022000 0xff>; /* L3 Interconnect */
|
||||
reg-names = "mpu", "dma";
|
||||
clocks = <&abe_clkctrl OMAP4_MCBSP1_CLKCTRL 24>;
|
||||
clock-names = "fck";
|
||||
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "common";
|
||||
ti,buffer-size = <128>;
|
||||
@ -142,6 +144,8 @@ mcbsp2: mcbsp@0 {
|
||||
reg = <0x0 0xff>, /* MPU private access */
|
||||
<0x49024000 0xff>; /* L3 Interconnect */
|
||||
reg-names = "mpu", "dma";
|
||||
clocks = <&abe_clkctrl OMAP4_MCBSP2_CLKCTRL 24>;
|
||||
clock-names = "fck";
|
||||
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "common";
|
||||
ti,buffer-size = <128>;
|
||||
@ -175,6 +179,8 @@ mcbsp3: mcbsp@0 {
|
||||
reg = <0x0 0xff>, /* MPU private access */
|
||||
<0x49026000 0xff>; /* L3 Interconnect */
|
||||
reg-names = "mpu", "dma";
|
||||
clocks = <&abe_clkctrl OMAP4_MCBSP3_CLKCTRL 24>;
|
||||
clock-names = "fck";
|
||||
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "common";
|
||||
ti,buffer-size = <128>;
|
||||
|
@ -2043,6 +2043,8 @@ mcbsp4: mcbsp@0 {
|
||||
compatible = "ti,omap4-mcbsp";
|
||||
reg = <0x0 0xff>; /* L4 Interconnect */
|
||||
reg-names = "mpu";
|
||||
clocks = <&l4_per_clkctrl OMAP4_MCBSP4_CLKCTRL 24>;
|
||||
clock-names = "fck";
|
||||
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "common";
|
||||
ti,buffer-size = <128>;
|
||||
|
@ -109,6 +109,8 @@ mcbsp1: mcbsp@0 {
|
||||
reg = <0x0 0xff>, /* MPU private access */
|
||||
<0x49022000 0xff>; /* L3 Interconnect */
|
||||
reg-names = "mpu", "dma";
|
||||
clocks = <&abe_clkctrl OMAP5_MCBSP1_CLKCTRL 24>;
|
||||
clock-names = "fck";
|
||||
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "common";
|
||||
ti,buffer-size = <128>;
|
||||
@ -142,6 +144,8 @@ mcbsp2: mcbsp@0 {
|
||||
reg = <0x0 0xff>, /* MPU private access */
|
||||
<0x49024000 0xff>; /* L3 Interconnect */
|
||||
reg-names = "mpu", "dma";
|
||||
clocks = <&abe_clkctrl OMAP5_MCBSP2_CLKCTRL 24>;
|
||||
clock-names = "fck";
|
||||
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "common";
|
||||
ti,buffer-size = <128>;
|
||||
@ -175,6 +179,8 @@ mcbsp3: mcbsp@0 {
|
||||
reg = <0x0 0xff>, /* MPU private access */
|
||||
<0x49026000 0xff>; /* L3 Interconnect */
|
||||
reg-names = "mpu", "dma";
|
||||
clocks = <&abe_clkctrl OMAP5_MCBSP3_CLKCTRL 24>;
|
||||
clock-names = "fck";
|
||||
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "common";
|
||||
ti,buffer-size = <128>;
|
||||
|
@ -82,14 +82,12 @@ cxo_board {
|
||||
};
|
||||
};
|
||||
|
||||
regulators {
|
||||
vsdcc_fixed: vsdcc-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "SDCC Power";
|
||||
regulator-min-microvolt = <2700000>;
|
||||
regulator-max-microvolt = <2700000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
vsdcc_fixed: vsdcc-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "SDCC Power";
|
||||
regulator-min-microvolt = <2700000>;
|
||||
regulator-max-microvolt = <2700000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
soc: soc {
|
||||
|
@ -239,7 +239,7 @@ du1_pins: du1 {
|
||||
};
|
||||
|
||||
keyboard_pins: keyboard {
|
||||
pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_02";
|
||||
pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_2";
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
|
@ -10,10 +10,6 @@
|
||||
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
||||
#define __exception_irq_entry __irq_entry
|
||||
#else
|
||||
#define __exception_irq_entry
|
||||
#endif
|
||||
|
||||
#endif /* __ASM_ARM_EXCEPTION_H */
|
||||
|
@ -17,6 +17,7 @@ ENTRY(__memset)
|
||||
ENTRY(mmioset)
|
||||
WEAK(memset)
|
||||
UNWIND( .fnstart )
|
||||
and r1, r1, #255 @ cast to unsigned char
|
||||
ands r3, r0, #3 @ 1 unaligned?
|
||||
mov ip, r0 @ preserve r0 as return value
|
||||
bne 6f @ 1
|
||||
|
@ -502,6 +502,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
|
||||
|
||||
name = devm_kasprintf(&pdev->dev,
|
||||
GFP_KERNEL, "mmdc%d", ret);
|
||||
if (!name) {
|
||||
ret = -ENOMEM;
|
||||
goto pmu_release_id;
|
||||
}
|
||||
|
||||
pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
|
||||
pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
|
||||
@ -524,9 +528,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
|
||||
|
||||
pmu_register_err:
|
||||
pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret);
|
||||
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
|
||||
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
|
||||
hrtimer_cancel(&pmu_mmdc->hrtimer);
|
||||
pmu_release_id:
|
||||
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
|
||||
pmu_free:
|
||||
kfree(pmu_mmdc);
|
||||
return ret;
|
||||
|
@ -176,17 +176,18 @@ static u64 notrace omap_32k_read_sched_clock(void)
|
||||
return sync32k_cnt_reg ? readl_relaxed(sync32k_cnt_reg) : 0;
|
||||
}
|
||||
|
||||
static struct timespec64 persistent_ts;
|
||||
static cycles_t cycles;
|
||||
static unsigned int persistent_mult, persistent_shift;
|
||||
|
||||
/**
|
||||
* omap_read_persistent_clock64 - Return time from a persistent clock.
|
||||
* @ts: &struct timespec64 for the returned time
|
||||
*
|
||||
* Reads the time from a source which isn't disabled during PM, the
|
||||
* 32k sync timer. Convert the cycles elapsed since last read into
|
||||
* nsecs and adds to a monotonically increasing timespec64.
|
||||
*/
|
||||
static struct timespec64 persistent_ts;
|
||||
static cycles_t cycles;
|
||||
static unsigned int persistent_mult, persistent_shift;
|
||||
|
||||
static void omap_read_persistent_clock64(struct timespec64 *ts)
|
||||
{
|
||||
unsigned long long nsecs;
|
||||
@ -206,10 +207,9 @@ static void omap_read_persistent_clock64(struct timespec64 *ts)
|
||||
/**
|
||||
* omap_init_clocksource_32k - setup and register counter 32k as a
|
||||
* kernel clocksource
|
||||
* @pbase: base addr of counter_32k module
|
||||
* @size: size of counter_32k to map
|
||||
* @vbase: base addr of counter_32k module
|
||||
*
|
||||
* Returns 0 upon success or negative error code upon failure.
|
||||
* Returns: %0 upon success or negative error code upon failure.
|
||||
*
|
||||
*/
|
||||
static int __init omap_init_clocksource_32k(void __iomem *vbase)
|
||||
|
@ -207,7 +207,7 @@ static void xen_power_off(void)
|
||||
|
||||
static irqreturn_t xen_arm_callback(int irq, void *arg)
|
||||
{
|
||||
xen_hvm_evtchn_do_upcall();
|
||||
xen_evtchn_do_upcall();
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
@ -487,7 +487,8 @@ static int __init xen_guest_init(void)
|
||||
* for secondary CPUs as they are brought up.
|
||||
* For uniformity we use VCPUOP_register_vcpu_info even on cpu0.
|
||||
*/
|
||||
xen_vcpu_info = alloc_percpu(struct vcpu_info);
|
||||
xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),
|
||||
1 << fls(sizeof(struct vcpu_info) - 1));
|
||||
if (xen_vcpu_info == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -1295,6 +1295,8 @@ choice
|
||||
config CPU_BIG_ENDIAN
|
||||
bool "Build big-endian kernel"
|
||||
depends on !LD_IS_LLD || LLD_VERSION >= 130000
|
||||
# https://github.com/llvm/llvm-project/commit/1379b150991f70a5782e9a143c2ba5308da1161c
|
||||
depends on AS_IS_GNU || AS_VERSION >= 150000
|
||||
help
|
||||
Say Y if you plan on running a kernel with a big-endian userspace.
|
||||
|
||||
|
@ -1186,26 +1186,34 @@ sata1: sata@3210000 {
|
||||
dma-coherent;
|
||||
};
|
||||
|
||||
usb0: usb@3100000 {
|
||||
status = "disabled";
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x0 0x3100000 0x0 0x10000>;
|
||||
interrupts = <0 80 0x4>; /* Level high type */
|
||||
dr_mode = "host";
|
||||
snps,quirk-frame-length-adjustment = <0x20>;
|
||||
snps,dis_rxdet_inp3_quirk;
|
||||
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
||||
};
|
||||
bus: bus {
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
compatible = "simple-bus";
|
||||
ranges;
|
||||
dma-ranges = <0x0 0x0 0x0 0x0 0x100 0x00000000>;
|
||||
|
||||
usb1: usb@3110000 {
|
||||
status = "disabled";
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x0 0x3110000 0x0 0x10000>;
|
||||
interrupts = <0 81 0x4>; /* Level high type */
|
||||
dr_mode = "host";
|
||||
snps,quirk-frame-length-adjustment = <0x20>;
|
||||
snps,dis_rxdet_inp3_quirk;
|
||||
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
||||
usb0: usb@3100000 {
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x0 0x3100000 0x0 0x10000>;
|
||||
interrupts = <0 80 0x4>; /* Level high type */
|
||||
dr_mode = "host";
|
||||
snps,quirk-frame-length-adjustment = <0x20>;
|
||||
snps,dis_rxdet_inp3_quirk;
|
||||
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
usb1: usb@3110000 {
|
||||
compatible = "snps,dwc3";
|
||||
reg = <0x0 0x3110000 0x0 0x10000>;
|
||||
interrupts = <0 81 0x4>; /* Level high type */
|
||||
dr_mode = "host";
|
||||
snps,quirk-frame-length-adjustment = <0x20>;
|
||||
snps,dis_rxdet_inp3_quirk;
|
||||
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
||||
ccn@4000000 {
|
||||
|
@ -398,6 +398,7 @@ micfil: audio-controller@30080000 {
|
||||
"pll8k", "pll11k", "clkext3";
|
||||
dmas = <&sdma2 24 25 0x80000000>;
|
||||
dma-names = "rx";
|
||||
#sound-dai-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
@ -27,6 +27,7 @@ reg_eth_phy: regulator-eth-phy {
|
||||
regulator-name = "eth_phy_pwr";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-enable-ramp-delay = <20000>;
|
||||
gpio = <&gpio2 9 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
};
|
||||
|
@ -370,6 +370,7 @@ micfil: audio-controller@30080000 {
|
||||
"pll8k", "pll11k", "clkext3";
|
||||
dmas = <&sdma2 24 25 0x80000000>;
|
||||
dma-names = "rx";
|
||||
#sound-dai-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
@ -1301,6 +1301,7 @@ usb_dwc3_0: usb@38100000 {
|
||||
phys = <&usb3_phy0>, <&usb3_phy0>;
|
||||
phy-names = "usb2-phy", "usb3-phy";
|
||||
snps,gfladj-refclk-lpm-sel-quirk;
|
||||
snps,parkmode-disable-ss-quirk;
|
||||
};
|
||||
|
||||
};
|
||||
@ -1343,6 +1344,7 @@ usb_dwc3_1: usb@38200000 {
|
||||
phys = <&usb3_phy1>, <&usb3_phy1>;
|
||||
phy-names = "usb2-phy", "usb3-phy";
|
||||
snps,gfladj-refclk-lpm-sel-quirk;
|
||||
snps,parkmode-disable-ss-quirk;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1431,7 +1431,7 @@ usb_dwc3_0: usb@38100000 {
|
||||
phys = <&usb3_phy0>, <&usb3_phy0>;
|
||||
phy-names = "usb2-phy", "usb3-phy";
|
||||
power-domains = <&pgc_otg1>;
|
||||
usb3-resume-missing-cas;
|
||||
snps,parkmode-disable-ss-quirk;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@ -1463,7 +1463,7 @@ usb_dwc3_1: usb@38200000 {
|
||||
phys = <&usb3_phy1>, <&usb3_phy1>;
|
||||
phy-names = "usb2-phy", "usb3-phy";
|
||||
power-domains = <&pgc_otg2>;
|
||||
usb3-resume-missing-cas;
|
||||
snps,parkmode-disable-ss-quirk;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
@ -8,5 +8,5 @@ &jpegdec {
|
||||
};
|
||||
|
||||
&jpegenc {
|
||||
compatible = "nxp,imx8qm-jpgdec", "nxp,imx8qxp-jpgenc";
|
||||
compatible = "nxp,imx8qm-jpgenc", "nxp,imx8qxp-jpgenc";
|
||||
};
|
||||
|
@ -120,7 +120,7 @@ cp0_sdhci_pins: cp0-sdhi-pins-0 {
|
||||
"mpp59", "mpp60", "mpp61";
|
||||
marvell,function = "sdio";
|
||||
};
|
||||
cp0_spi0_pins: cp0-spi-pins-0 {
|
||||
cp0_spi1_pins: cp0-spi-pins-1 {
|
||||
marvell,pins = "mpp13", "mpp14", "mpp15", "mpp16";
|
||||
marvell,function = "spi1";
|
||||
};
|
||||
@ -170,7 +170,7 @@ &cp0_sdhci0 {
|
||||
|
||||
&cp0_spi1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cp0_spi0_pins>;
|
||||
pinctrl-0 = <&cp0_spi1_pins>;
|
||||
reg = <0x700680 0x50>, /* control */
|
||||
<0x2000000 0x1000000>; /* CS0 */
|
||||
status = "okay";
|
||||
|
@ -307,7 +307,7 @@ &cp0_sdhci0 {
|
||||
&cp0_spi1 {
|
||||
status = "disabled";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cp0_spi0_pins>;
|
||||
pinctrl-0 = <&cp0_spi1_pins>;
|
||||
reg = <0x700680 0x50>;
|
||||
|
||||
flash@0 {
|
||||
@ -371,7 +371,7 @@ cp0_sdhci_pins: cp0-sdhi-pins-0 {
|
||||
"mpp59", "mpp60", "mpp61";
|
||||
marvell,function = "sdio";
|
||||
};
|
||||
cp0_spi0_pins: cp0-spi-pins-0 {
|
||||
cp0_spi1_pins: cp0-spi-pins-1 {
|
||||
marvell,pins = "mpp13", "mpp14", "mpp15", "mpp16";
|
||||
marvell,function = "spi1";
|
||||
};
|
||||
|
@ -72,7 +72,7 @@ led-1 {
|
||||
};
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@40000000 {
|
||||
reg = <0 0x40000000 0 0x40000000>;
|
||||
};
|
||||
|
||||
|
@ -54,7 +54,7 @@ key-wps {
|
||||
};
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@40000000 {
|
||||
reg = <0 0x40000000 0 0x20000000>;
|
||||
};
|
||||
|
||||
|
@ -43,7 +43,7 @@ extcon_usb: extcon_iddig {
|
||||
id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
usb_p1_vbus: regulator@0 {
|
||||
usb_p1_vbus: regulator-usb-p1 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "usb_vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
@ -52,7 +52,7 @@ usb_p1_vbus: regulator@0 {
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
usb_p0_vbus: regulator@1 {
|
||||
usb_p0_vbus: regulator-usb-p0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
|
@ -30,14 +30,14 @@ reserved-memory {
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
ranges;
|
||||
scp_mem_reserved: scp_mem_region {
|
||||
scp_mem_reserved: memory@50000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0 0x50000000 0 0x2900000>;
|
||||
no-map;
|
||||
};
|
||||
};
|
||||
|
||||
ntc@0 {
|
||||
thermal-sensor {
|
||||
compatible = "murata,ncp03wf104";
|
||||
pullup-uv = <1800000>;
|
||||
pullup-ohm = <390000>;
|
||||
@ -139,8 +139,8 @@ &mmc1 {
|
||||
};
|
||||
|
||||
&pio {
|
||||
i2c_pins_0: i2c0{
|
||||
pins_i2c{
|
||||
i2c_pins_0: i2c0 {
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO82__FUNC_SDA0>,
|
||||
<PINMUX_GPIO83__FUNC_SCL0>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -148,8 +148,8 @@ pins_i2c{
|
||||
};
|
||||
};
|
||||
|
||||
i2c_pins_1: i2c1{
|
||||
pins_i2c{
|
||||
i2c_pins_1: i2c1 {
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO81__FUNC_SDA1>,
|
||||
<PINMUX_GPIO84__FUNC_SCL1>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -157,8 +157,8 @@ pins_i2c{
|
||||
};
|
||||
};
|
||||
|
||||
i2c_pins_2: i2c2{
|
||||
pins_i2c{
|
||||
i2c_pins_2: i2c2 {
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO103__FUNC_SCL2>,
|
||||
<PINMUX_GPIO104__FUNC_SDA2>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -166,8 +166,8 @@ pins_i2c{
|
||||
};
|
||||
};
|
||||
|
||||
i2c_pins_3: i2c3{
|
||||
pins_i2c{
|
||||
i2c_pins_3: i2c3 {
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO50__FUNC_SCL3>,
|
||||
<PINMUX_GPIO51__FUNC_SDA3>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -175,8 +175,8 @@ pins_i2c{
|
||||
};
|
||||
};
|
||||
|
||||
i2c_pins_4: i2c4{
|
||||
pins_i2c{
|
||||
i2c_pins_4: i2c4 {
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO105__FUNC_SCL4>,
|
||||
<PINMUX_GPIO106__FUNC_SDA4>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -184,8 +184,8 @@ pins_i2c{
|
||||
};
|
||||
};
|
||||
|
||||
i2c_pins_5: i2c5{
|
||||
pins_i2c{
|
||||
i2c_pins_5: i2c5 {
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO48__FUNC_SCL5>,
|
||||
<PINMUX_GPIO49__FUNC_SDA5>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -193,8 +193,8 @@ pins_i2c{
|
||||
};
|
||||
};
|
||||
|
||||
spi_pins_0: spi0{
|
||||
pins_spi{
|
||||
spi_pins_0: spi0 {
|
||||
pins_spi {
|
||||
pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
|
||||
<PINMUX_GPIO86__FUNC_SPI0_CSB>,
|
||||
<PINMUX_GPIO87__FUNC_SPI0_MO>,
|
||||
@ -308,8 +308,8 @@ pins_clk {
|
||||
};
|
||||
};
|
||||
|
||||
spi_pins_1: spi1{
|
||||
pins_spi{
|
||||
spi_pins_1: spi1 {
|
||||
pins_spi {
|
||||
pinmux = <PINMUX_GPIO161__FUNC_SPI1_A_MI>,
|
||||
<PINMUX_GPIO162__FUNC_SPI1_A_CSB>,
|
||||
<PINMUX_GPIO163__FUNC_SPI1_A_MO>,
|
||||
@ -318,8 +318,8 @@ pins_spi{
|
||||
};
|
||||
};
|
||||
|
||||
spi_pins_2: spi2{
|
||||
pins_spi{
|
||||
spi_pins_2: spi2 {
|
||||
pins_spi {
|
||||
pinmux = <PINMUX_GPIO0__FUNC_SPI2_CSB>,
|
||||
<PINMUX_GPIO1__FUNC_SPI2_MO>,
|
||||
<PINMUX_GPIO2__FUNC_SPI2_CLK>,
|
||||
@ -328,8 +328,8 @@ pins_spi{
|
||||
};
|
||||
};
|
||||
|
||||
spi_pins_3: spi3{
|
||||
pins_spi{
|
||||
spi_pins_3: spi3 {
|
||||
pins_spi {
|
||||
pinmux = <PINMUX_GPIO21__FUNC_SPI3_MI>,
|
||||
<PINMUX_GPIO22__FUNC_SPI3_CSB>,
|
||||
<PINMUX_GPIO23__FUNC_SPI3_MO>,
|
||||
@ -338,8 +338,8 @@ pins_spi{
|
||||
};
|
||||
};
|
||||
|
||||
spi_pins_4: spi4{
|
||||
pins_spi{
|
||||
spi_pins_4: spi4 {
|
||||
pins_spi {
|
||||
pinmux = <PINMUX_GPIO17__FUNC_SPI4_MI>,
|
||||
<PINMUX_GPIO18__FUNC_SPI4_CSB>,
|
||||
<PINMUX_GPIO19__FUNC_SPI4_MO>,
|
||||
@ -348,8 +348,8 @@ pins_spi{
|
||||
};
|
||||
};
|
||||
|
||||
spi_pins_5: spi5{
|
||||
pins_spi{
|
||||
spi_pins_5: spi5 {
|
||||
pins_spi {
|
||||
pinmux = <PINMUX_GPIO13__FUNC_SPI5_MI>,
|
||||
<PINMUX_GPIO14__FUNC_SPI5_CSB>,
|
||||
<PINMUX_GPIO15__FUNC_SPI5_MO>,
|
||||
|
@ -101,6 +101,8 @@ cros_ec_pwm: pwm {
|
||||
|
||||
&dsi0 {
|
||||
status = "okay";
|
||||
/delete-property/#size-cells;
|
||||
/delete-property/#address-cells;
|
||||
/delete-node/panel@0;
|
||||
ports {
|
||||
port {
|
||||
@ -437,20 +439,20 @@ pins2 {
|
||||
};
|
||||
|
||||
touchscreen_pins: touchscreen-pins {
|
||||
touch_int_odl {
|
||||
touch-int-odl {
|
||||
pinmux = <PINMUX_GPIO155__FUNC_GPIO155>;
|
||||
input-enable;
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
touch_rst_l {
|
||||
touch-rst-l {
|
||||
pinmux = <PINMUX_GPIO156__FUNC_GPIO156>;
|
||||
output-high;
|
||||
};
|
||||
};
|
||||
|
||||
trackpad_pins: trackpad-pins {
|
||||
trackpad_int {
|
||||
trackpad-int {
|
||||
pinmux = <PINMUX_GPIO7__FUNC_GPIO7>;
|
||||
input-enable;
|
||||
bias-disable; /* pulled externally */
|
||||
|
@ -108,7 +108,7 @@ reserved_memory: reserved-memory {
|
||||
#size-cells = <2>;
|
||||
ranges;
|
||||
|
||||
scp_mem_reserved: scp_mem_region {
|
||||
scp_mem_reserved: memory@50000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0 0x50000000 0 0x2900000>;
|
||||
no-map;
|
||||
@ -423,7 +423,7 @@ &mt6358_vsim2_reg {
|
||||
|
||||
&pio {
|
||||
aud_pins_default: audiopins {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO97__FUNC_I2S2_MCK>,
|
||||
<PINMUX_GPIO98__FUNC_I2S2_BCK>,
|
||||
<PINMUX_GPIO101__FUNC_I2S2_LRCK>,
|
||||
@ -445,7 +445,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
aud_pins_tdm_out_on: audiotdmouton {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO169__FUNC_TDM_BCK_2ND>,
|
||||
<PINMUX_GPIO170__FUNC_TDM_LRCK_2ND>,
|
||||
<PINMUX_GPIO171__FUNC_TDM_DATA0_2ND>,
|
||||
@ -457,7 +457,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
aud_pins_tdm_out_off: audiotdmoutoff {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO169__FUNC_GPIO169>,
|
||||
<PINMUX_GPIO170__FUNC_GPIO170>,
|
||||
<PINMUX_GPIO171__FUNC_GPIO171>,
|
||||
@ -471,13 +471,13 @@ pins_bus {
|
||||
};
|
||||
|
||||
bt_pins: bt-pins {
|
||||
pins_bt_en {
|
||||
pins-bt-en {
|
||||
pinmux = <PINMUX_GPIO120__FUNC_GPIO120>;
|
||||
output-low;
|
||||
};
|
||||
};
|
||||
|
||||
ec_ap_int_odl: ec_ap_int_odl {
|
||||
ec_ap_int_odl: ec-ap-int-odl {
|
||||
pins1 {
|
||||
pinmux = <PINMUX_GPIO151__FUNC_GPIO151>;
|
||||
input-enable;
|
||||
@ -485,7 +485,7 @@ pins1 {
|
||||
};
|
||||
};
|
||||
|
||||
h1_int_od_l: h1_int_od_l {
|
||||
h1_int_od_l: h1-int-od-l {
|
||||
pins1 {
|
||||
pinmux = <PINMUX_GPIO153__FUNC_GPIO153>;
|
||||
input-enable;
|
||||
@ -493,7 +493,7 @@ pins1 {
|
||||
};
|
||||
|
||||
i2c0_pins: i2c0 {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO82__FUNC_SDA0>,
|
||||
<PINMUX_GPIO83__FUNC_SCL0>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -502,7 +502,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
i2c1_pins: i2c1 {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO81__FUNC_SDA1>,
|
||||
<PINMUX_GPIO84__FUNC_SCL1>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -511,7 +511,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
i2c2_pins: i2c2 {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO103__FUNC_SCL2>,
|
||||
<PINMUX_GPIO104__FUNC_SDA2>;
|
||||
bias-disable;
|
||||
@ -520,7 +520,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
i2c3_pins: i2c3 {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO50__FUNC_SCL3>,
|
||||
<PINMUX_GPIO51__FUNC_SDA3>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -529,7 +529,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
i2c4_pins: i2c4 {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO105__FUNC_SCL4>,
|
||||
<PINMUX_GPIO106__FUNC_SDA4>;
|
||||
bias-disable;
|
||||
@ -538,7 +538,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
i2c5_pins: i2c5 {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO48__FUNC_SCL5>,
|
||||
<PINMUX_GPIO49__FUNC_SDA5>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -547,7 +547,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
i2c6_pins: i2c6 {
|
||||
pins_bus {
|
||||
pins-bus {
|
||||
pinmux = <PINMUX_GPIO11__FUNC_SCL6>,
|
||||
<PINMUX_GPIO12__FUNC_SDA6>;
|
||||
bias-disable;
|
||||
@ -555,7 +555,7 @@ pins_bus {
|
||||
};
|
||||
|
||||
mmc0_pins_default: mmc0-pins-default {
|
||||
pins_cmd_dat {
|
||||
pins-cmd-dat {
|
||||
pinmux = <PINMUX_GPIO123__FUNC_MSDC0_DAT0>,
|
||||
<PINMUX_GPIO128__FUNC_MSDC0_DAT1>,
|
||||
<PINMUX_GPIO125__FUNC_MSDC0_DAT2>,
|
||||
@ -570,13 +570,13 @@ pins_cmd_dat {
|
||||
mediatek,pull-up-adv = <01>;
|
||||
};
|
||||
|
||||
pins_clk {
|
||||
pins-clk {
|
||||
pinmux = <PINMUX_GPIO124__FUNC_MSDC0_CLK>;
|
||||
drive-strength = <MTK_DRIVE_14mA>;
|
||||
mediatek,pull-down-adv = <10>;
|
||||
};
|
||||
|
||||
pins_rst {
|
||||
pins-rst {
|
||||
pinmux = <PINMUX_GPIO133__FUNC_MSDC0_RSTB>;
|
||||
drive-strength = <MTK_DRIVE_14mA>;
|
||||
mediatek,pull-down-adv = <01>;
|
||||
@ -584,7 +584,7 @@ pins_rst {
|
||||
};
|
||||
|
||||
mmc0_pins_uhs: mmc0-pins-uhs {
|
||||
pins_cmd_dat {
|
||||
pins-cmd-dat {
|
||||
pinmux = <PINMUX_GPIO123__FUNC_MSDC0_DAT0>,
|
||||
<PINMUX_GPIO128__FUNC_MSDC0_DAT1>,
|
||||
<PINMUX_GPIO125__FUNC_MSDC0_DAT2>,
|
||||
@ -599,19 +599,19 @@ pins_cmd_dat {
|
||||
mediatek,pull-up-adv = <01>;
|
||||
};
|
||||
|
||||
pins_clk {
|
||||
pins-clk {
|
||||
pinmux = <PINMUX_GPIO124__FUNC_MSDC0_CLK>;
|
||||
drive-strength = <MTK_DRIVE_14mA>;
|
||||
mediatek,pull-down-adv = <10>;
|
||||
};
|
||||
|
||||
pins_ds {
|
||||
pins-ds {
|
||||
pinmux = <PINMUX_GPIO131__FUNC_MSDC0_DSL>;
|
||||
drive-strength = <MTK_DRIVE_14mA>;
|
||||
mediatek,pull-down-adv = <10>;
|
||||
};
|
||||
|
||||
pins_rst {
|
||||
pins-rst {
|
||||
pinmux = <PINMUX_GPIO133__FUNC_MSDC0_RSTB>;
|
||||
drive-strength = <MTK_DRIVE_14mA>;
|
||||
mediatek,pull-up-adv = <01>;
|
||||
@ -619,7 +619,7 @@ pins_rst {
|
||||
};
|
||||
|
||||
mmc1_pins_default: mmc1-pins-default {
|
||||
pins_cmd_dat {
|
||||
pins-cmd-dat {
|
||||
pinmux = <PINMUX_GPIO31__FUNC_MSDC1_CMD>,
|
||||
<PINMUX_GPIO32__FUNC_MSDC1_DAT0>,
|
||||
<PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
|
||||
@ -629,7 +629,7 @@ pins_cmd_dat {
|
||||
mediatek,pull-up-adv = <10>;
|
||||
};
|
||||
|
||||
pins_clk {
|
||||
pins-clk {
|
||||
pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
|
||||
input-enable;
|
||||
mediatek,pull-down-adv = <10>;
|
||||
@ -637,7 +637,7 @@ pins_clk {
|
||||
};
|
||||
|
||||
mmc1_pins_uhs: mmc1-pins-uhs {
|
||||
pins_cmd_dat {
|
||||
pins-cmd-dat {
|
||||
pinmux = <PINMUX_GPIO31__FUNC_MSDC1_CMD>,
|
||||
<PINMUX_GPIO32__FUNC_MSDC1_DAT0>,
|
||||
<PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
|
||||
@ -648,7 +648,7 @@ pins_cmd_dat {
|
||||
mediatek,pull-up-adv = <10>;
|
||||
};
|
||||
|
||||
pins_clk {
|
||||
pins-clk {
|
||||
pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
|
||||
drive-strength = <MTK_DRIVE_8mA>;
|
||||
mediatek,pull-down-adv = <10>;
|
||||
@ -656,15 +656,15 @@ pins_clk {
|
||||
};
|
||||
};
|
||||
|
||||
panel_pins_default: panel_pins_default {
|
||||
panel_reset {
|
||||
panel_pins_default: panel-pins-default {
|
||||
panel-reset {
|
||||
pinmux = <PINMUX_GPIO45__FUNC_GPIO45>;
|
||||
output-low;
|
||||
bias-pull-up;
|
||||
};
|
||||
};
|
||||
|
||||
pwm0_pin_default: pwm0_pin_default {
|
||||
pwm0_pin_default: pwm0-pin-default {
|
||||
pins1 {
|
||||
pinmux = <PINMUX_GPIO176__FUNC_GPIO176>;
|
||||
output-high;
|
||||
@ -676,14 +676,14 @@ pins2 {
|
||||
};
|
||||
|
||||
scp_pins: scp {
|
||||
pins_scp_uart {
|
||||
pins-scp-uart {
|
||||
pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,
|
||||
<PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;
|
||||
};
|
||||
};
|
||||
|
||||
spi0_pins: spi0 {
|
||||
pins_spi{
|
||||
pins-spi {
|
||||
pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
|
||||
<PINMUX_GPIO86__FUNC_GPIO86>,
|
||||
<PINMUX_GPIO87__FUNC_SPI0_MO>,
|
||||
@ -693,7 +693,7 @@ pins_spi{
|
||||
};
|
||||
|
||||
spi1_pins: spi1 {
|
||||
pins_spi{
|
||||
pins-spi {
|
||||
pinmux = <PINMUX_GPIO161__FUNC_SPI1_A_MI>,
|
||||
<PINMUX_GPIO162__FUNC_SPI1_A_CSB>,
|
||||
<PINMUX_GPIO163__FUNC_SPI1_A_MO>,
|
||||
@ -703,20 +703,20 @@ pins_spi{
|
||||
};
|
||||
|
||||
spi2_pins: spi2 {
|
||||
pins_spi{
|
||||
pins-spi {
|
||||
pinmux = <PINMUX_GPIO0__FUNC_SPI2_CSB>,
|
||||
<PINMUX_GPIO1__FUNC_SPI2_MO>,
|
||||
<PINMUX_GPIO2__FUNC_SPI2_CLK>;
|
||||
bias-disable;
|
||||
};
|
||||
pins_spi_mi {
|
||||
pins-spi-mi {
|
||||
pinmux = <PINMUX_GPIO94__FUNC_SPI2_MI>;
|
||||
mediatek,pull-down-adv = <00>;
|
||||
};
|
||||
};
|
||||
|
||||
spi3_pins: spi3 {
|
||||
pins_spi{
|
||||
pins-spi {
|
||||
pinmux = <PINMUX_GPIO21__FUNC_SPI3_MI>,
|
||||
<PINMUX_GPIO22__FUNC_SPI3_CSB>,
|
||||
<PINMUX_GPIO23__FUNC_SPI3_MO>,
|
||||
@ -726,7 +726,7 @@ pins_spi{
|
||||
};
|
||||
|
||||
spi4_pins: spi4 {
|
||||
pins_spi{
|
||||
pins-spi {
|
||||
pinmux = <PINMUX_GPIO17__FUNC_SPI4_MI>,
|
||||
<PINMUX_GPIO18__FUNC_SPI4_CSB>,
|
||||
<PINMUX_GPIO19__FUNC_SPI4_MO>,
|
||||
@ -736,7 +736,7 @@ pins_spi{
|
||||
};
|
||||
|
||||
spi5_pins: spi5 {
|
||||
pins_spi{
|
||||
pins-spi {
|
||||
pinmux = <PINMUX_GPIO13__FUNC_SPI5_MI>,
|
||||
<PINMUX_GPIO14__FUNC_SPI5_CSB>,
|
||||
<PINMUX_GPIO15__FUNC_SPI5_MO>,
|
||||
@ -746,63 +746,63 @@ pins_spi{
|
||||
};
|
||||
|
||||
uart0_pins_default: uart0-pins-default {
|
||||
pins_rx {
|
||||
pins-rx {
|
||||
pinmux = <PINMUX_GPIO95__FUNC_URXD0>;
|
||||
input-enable;
|
||||
bias-pull-up;
|
||||
};
|
||||
pins_tx {
|
||||
pins-tx {
|
||||
pinmux = <PINMUX_GPIO96__FUNC_UTXD0>;
|
||||
};
|
||||
};
|
||||
|
||||
uart1_pins_default: uart1-pins-default {
|
||||
pins_rx {
|
||||
pins-rx {
|
||||
pinmux = <PINMUX_GPIO121__FUNC_URXD1>;
|
||||
input-enable;
|
||||
bias-pull-up;
|
||||
};
|
||||
pins_tx {
|
||||
pins-tx {
|
||||
pinmux = <PINMUX_GPIO115__FUNC_UTXD1>;
|
||||
};
|
||||
pins_rts {
|
||||
pins-rts {
|
||||
pinmux = <PINMUX_GPIO47__FUNC_URTS1>;
|
||||
output-enable;
|
||||
};
|
||||
pins_cts {
|
||||
pins-cts {
|
||||
pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
|
||||
input-enable;
|
||||
};
|
||||
};
|
||||
|
||||
uart1_pins_sleep: uart1-pins-sleep {
|
||||
pins_rx {
|
||||
pins-rx {
|
||||
pinmux = <PINMUX_GPIO121__FUNC_GPIO121>;
|
||||
input-enable;
|
||||
bias-pull-up;
|
||||
};
|
||||
pins_tx {
|
||||
pins-tx {
|
||||
pinmux = <PINMUX_GPIO115__FUNC_UTXD1>;
|
||||
};
|
||||
pins_rts {
|
||||
pins-rts {
|
||||
pinmux = <PINMUX_GPIO47__FUNC_URTS1>;
|
||||
output-enable;
|
||||
};
|
||||
pins_cts {
|
||||
pins-cts {
|
||||
pinmux = <PINMUX_GPIO46__FUNC_UCTS1>;
|
||||
input-enable;
|
||||
};
|
||||
};
|
||||
|
||||
wifi_pins_pwrseq: wifi-pins-pwrseq {
|
||||
pins_wifi_enable {
|
||||
pins-wifi-enable {
|
||||
pinmux = <PINMUX_GPIO119__FUNC_GPIO119>;
|
||||
output-low;
|
||||
};
|
||||
};
|
||||
|
||||
wifi_pins_wakeup: wifi-pins-wakeup {
|
||||
pins_wifi_wakeup {
|
||||
pins-wifi-wakeup {
|
||||
pinmux = <PINMUX_GPIO113__FUNC_GPIO113>;
|
||||
input-enable;
|
||||
};
|
||||
|
@ -178,7 +178,7 @@ &mmc1 {
|
||||
|
||||
&pio {
|
||||
i2c_pins_0: i2c0 {
|
||||
pins_i2c{
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO82__FUNC_SDA0>,
|
||||
<PINMUX_GPIO83__FUNC_SCL0>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -187,7 +187,7 @@ pins_i2c{
|
||||
};
|
||||
|
||||
i2c_pins_1: i2c1 {
|
||||
pins_i2c{
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO81__FUNC_SDA1>,
|
||||
<PINMUX_GPIO84__FUNC_SCL1>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -196,7 +196,7 @@ pins_i2c{
|
||||
};
|
||||
|
||||
i2c_pins_2: i2c2 {
|
||||
pins_i2c{
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO103__FUNC_SCL2>,
|
||||
<PINMUX_GPIO104__FUNC_SDA2>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -205,7 +205,7 @@ pins_i2c{
|
||||
};
|
||||
|
||||
i2c_pins_3: i2c3 {
|
||||
pins_i2c{
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO50__FUNC_SCL3>,
|
||||
<PINMUX_GPIO51__FUNC_SDA3>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -214,7 +214,7 @@ pins_i2c{
|
||||
};
|
||||
|
||||
i2c_pins_4: i2c4 {
|
||||
pins_i2c{
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO105__FUNC_SCL4>,
|
||||
<PINMUX_GPIO106__FUNC_SDA4>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
@ -223,7 +223,7 @@ pins_i2c{
|
||||
};
|
||||
|
||||
i2c_pins_5: i2c5 {
|
||||
pins_i2c{
|
||||
pins_i2c {
|
||||
pinmux = <PINMUX_GPIO48__FUNC_SCL5>,
|
||||
<PINMUX_GPIO49__FUNC_SDA5>;
|
||||
mediatek,pull-up-adv = <3>;
|
||||
|
@ -1136,127 +1136,6 @@ thermal: thermal@1100b000 {
|
||||
nvmem-cell-names = "calibration-data";
|
||||
};
|
||||
|
||||
thermal_zones: thermal-zones {
|
||||
cpu_thermal: cpu-thermal {
|
||||
polling-delay-passive = <100>;
|
||||
polling-delay = <500>;
|
||||
thermal-sensors = <&thermal 0>;
|
||||
sustainable-power = <5000>;
|
||||
|
||||
trips {
|
||||
threshold: trip-point0 {
|
||||
temperature = <68000>;
|
||||
hysteresis = <2000>;
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
target: trip-point1 {
|
||||
temperature = <80000>;
|
||||
hysteresis = <2000>;
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
cpu_crit: cpu-crit {
|
||||
temperature = <115000>;
|
||||
hysteresis = <2000>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
|
||||
cooling-maps {
|
||||
map0 {
|
||||
trip = <&target>;
|
||||
cooling-device = <&cpu0
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu1
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu2
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu3
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>;
|
||||
contribution = <3072>;
|
||||
};
|
||||
map1 {
|
||||
trip = <&target>;
|
||||
cooling-device = <&cpu4
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu5
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu6
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu7
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>;
|
||||
contribution = <1024>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/* The tzts1 ~ tzts6 don't need to polling */
|
||||
/* The tzts1 ~ tzts6 don't need to thermal throttle */
|
||||
|
||||
tzts1: tzts1 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 1>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts2: tzts2 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 2>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts3: tzts3 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 3>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts4: tzts4 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 4>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts5: tzts5 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 5>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tztsABB: tztsABB {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 6>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
};
|
||||
|
||||
pwm0: pwm@1100e000 {
|
||||
compatible = "mediatek,mt8183-disp-pwm";
|
||||
reg = <0 0x1100e000 0 0x1000>;
|
||||
@ -2031,4 +1910,125 @@ larb3: larb@1a002000 {
|
||||
power-domains = <&spm MT8183_POWER_DOMAIN_CAM>;
|
||||
};
|
||||
};
|
||||
|
||||
thermal_zones: thermal-zones {
|
||||
cpu_thermal: cpu-thermal {
|
||||
polling-delay-passive = <100>;
|
||||
polling-delay = <500>;
|
||||
thermal-sensors = <&thermal 0>;
|
||||
sustainable-power = <5000>;
|
||||
|
||||
trips {
|
||||
threshold: trip-point0 {
|
||||
temperature = <68000>;
|
||||
hysteresis = <2000>;
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
target: trip-point1 {
|
||||
temperature = <80000>;
|
||||
hysteresis = <2000>;
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
cpu_crit: cpu-crit {
|
||||
temperature = <115000>;
|
||||
hysteresis = <2000>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
|
||||
cooling-maps {
|
||||
map0 {
|
||||
trip = <&target>;
|
||||
cooling-device = <&cpu0
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu1
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu2
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu3
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>;
|
||||
contribution = <3072>;
|
||||
};
|
||||
map1 {
|
||||
trip = <&target>;
|
||||
cooling-device = <&cpu4
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu5
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu6
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu7
|
||||
THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>;
|
||||
contribution = <1024>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/* The tzts1 ~ tzts6 don't need to polling */
|
||||
/* The tzts1 ~ tzts6 don't need to thermal throttle */
|
||||
|
||||
tzts1: tzts1 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 1>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts2: tzts2 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 2>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts3: tzts3 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 3>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts4: tzts4 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 4>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tzts5: tzts5 {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 5>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
|
||||
tztsABB: tztsABB {
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
thermal-sensors = <&thermal 6>;
|
||||
sustainable-power = <5000>;
|
||||
trips {};
|
||||
cooling-maps {};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -207,7 +207,7 @@ &i2c7 {
|
||||
pinctrl-0 = <&i2c7_pins>;
|
||||
|
||||
pmic@34 {
|
||||
#interrupt-cells = <1>;
|
||||
#interrupt-cells = <2>;
|
||||
compatible = "mediatek,mt6360";
|
||||
reg = <0x34>;
|
||||
interrupt-controller;
|
||||
|
@ -48,7 +48,7 @@ key-0 {
|
||||
|
||||
memory@40000000 {
|
||||
device_type = "memory";
|
||||
reg = <0 0x40000000 0 0x80000000>;
|
||||
reg = <0 0x40000000 0x2 0x00000000>;
|
||||
};
|
||||
|
||||
reserved-memory {
|
||||
@ -56,13 +56,8 @@ reserved-memory {
|
||||
#size-cells = <2>;
|
||||
ranges;
|
||||
|
||||
/* 2 MiB reserved for ARM Trusted Firmware (BL31) */
|
||||
bl31_secmon_reserved: secmon@54600000 {
|
||||
no-map;
|
||||
reg = <0 0x54600000 0x0 0x200000>;
|
||||
};
|
||||
|
||||
/* 12 MiB reserved for OP-TEE (BL32)
|
||||
/*
|
||||
* 12 MiB reserved for OP-TEE (BL32)
|
||||
* +-----------------------+ 0x43e0_0000
|
||||
* | SHMEM 2MiB |
|
||||
* +-----------------------+ 0x43c0_0000
|
||||
@ -75,6 +70,34 @@ optee_reserved: optee@43200000 {
|
||||
no-map;
|
||||
reg = <0 0x43200000 0 0x00c00000>;
|
||||
};
|
||||
|
||||
scp_mem: memory@50000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0 0x50000000 0 0x2900000>;
|
||||
no-map;
|
||||
};
|
||||
|
||||
vpu_mem: memory@53000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0 0x53000000 0 0x1400000>; /* 20 MB */
|
||||
};
|
||||
|
||||
/* 2 MiB reserved for ARM Trusted Firmware (BL31) */
|
||||
bl31_secmon_mem: memory@54600000 {
|
||||
no-map;
|
||||
reg = <0 0x54600000 0x0 0x200000>;
|
||||
};
|
||||
|
||||
snd_dma_mem: memory@60000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0 0x60000000 0 0x1100000>;
|
||||
no-map;
|
||||
};
|
||||
|
||||
apu_mem: memory@62000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0 0x62000000 0 0x1400000>; /* 20 MB */
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -229,6 +229,7 @@ dsu-pmu {
|
||||
interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||
cpus = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>,
|
||||
<&cpu4>, <&cpu5>, <&cpu6>, <&cpu7>;
|
||||
status = "fail";
|
||||
};
|
||||
|
||||
dmic_codec: dmic-codec {
|
||||
@ -470,6 +471,8 @@ power-domain@MT8195_POWER_DOMAIN_VDEC1 {
|
||||
|
||||
power-domain@MT8195_POWER_DOMAIN_VENC_CORE1 {
|
||||
reg = <MT8195_POWER_DOMAIN_VENC_CORE1>;
|
||||
clocks = <&vencsys_core1 CLK_VENC_CORE1_LARB>;
|
||||
clock-names = "venc1-larb";
|
||||
mediatek,infracfg = <&infracfg_ao>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
@ -532,6 +535,8 @@ power-domain@MT8195_POWER_DOMAIN_VDEC2 {
|
||||
|
||||
power-domain@MT8195_POWER_DOMAIN_VENC {
|
||||
reg = <MT8195_POWER_DOMAIN_VENC>;
|
||||
clocks = <&vencsys CLK_VENC_LARB>;
|
||||
clock-names = "venc0-larb";
|
||||
mediatek,infracfg = <&infracfg_ao>;
|
||||
#power-domain-cells = <0>;
|
||||
};
|
||||
@ -1984,7 +1989,7 @@ larb20: larb@1b010000 {
|
||||
reg = <0 0x1b010000 0 0x1000>;
|
||||
mediatek,larb-id = <20>;
|
||||
mediatek,smi = <&smi_common_vpp>;
|
||||
clocks = <&vencsys_core1 CLK_VENC_CORE1_LARB>,
|
||||
clocks = <&vencsys_core1 CLK_VENC_CORE1_VENC>,
|
||||
<&vencsys_core1 CLK_VENC_CORE1_GALS>,
|
||||
<&vppsys0 CLK_VPP0_GALS_VDO0_VDO1_VENCSYS_CORE1>;
|
||||
clock-names = "apb", "smi", "gals";
|
||||
|
@ -532,12 +532,12 @@ timer@2080000 {
|
||||
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
|
||||
<GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
@ -200,6 +200,9 @@ adv_bridge: bridge@39 {
|
||||
pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
|
||||
|
||||
avdd-supply = <&pm8916_l6>;
|
||||
a2vdd-supply = <&pm8916_l6>;
|
||||
dvdd-supply = <&pm8916_l6>;
|
||||
pvdd-supply = <&pm8916_l6>;
|
||||
v1p2-supply = <&pm8916_l6>;
|
||||
v3p3-supply = <&pm8916_l17>;
|
||||
|
||||
|
@ -169,7 +169,7 @@ q6_region: memory@4ab00000 {
|
||||
smem {
|
||||
compatible = "qcom,smem";
|
||||
memory-region = <&smem_region>;
|
||||
hwlocks = <&tcsr_mutex 0>;
|
||||
hwlocks = <&tcsr_mutex 3>;
|
||||
};
|
||||
|
||||
soc: soc {
|
||||
@ -248,7 +248,7 @@ gcc: gcc@1800000 {
|
||||
|
||||
tcsr_mutex: hwlock@1905000 {
|
||||
compatible = "qcom,ipq6018-tcsr-mutex", "qcom,tcsr-mutex";
|
||||
reg = <0x0 0x01905000 0x0 0x1000>;
|
||||
reg = <0x0 0x01905000 0x0 0x20000>;
|
||||
#hwlock-cells = <1>;
|
||||
};
|
||||
|
||||
|
@ -90,7 +90,7 @@ smem@4ab00000 {
|
||||
reg = <0x0 0x4ab00000 0x0 0x00100000>;
|
||||
no-map;
|
||||
|
||||
hwlocks = <&tcsr_mutex 0>;
|
||||
hwlocks = <&tcsr_mutex 3>;
|
||||
};
|
||||
|
||||
memory@4ac00000 {
|
||||
|
@ -1257,7 +1257,7 @@ apps_iommu: iommu@1ef0000 {
|
||||
#size-cells = <1>;
|
||||
#iommu-cells = <1>;
|
||||
compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
|
||||
ranges = <0 0x01e20000 0x40000>;
|
||||
ranges = <0 0x01e20000 0x20000>;
|
||||
reg = <0x01ef0000 0x3000>;
|
||||
clocks = <&gcc GCC_SMMU_CFG_CLK>,
|
||||
<&gcc GCC_APSS_TCU_CLK>;
|
||||
|
@ -109,11 +109,6 @@ rmtfs_mem: rmtfs@ca100000 {
|
||||
qcom,client-id = <1>;
|
||||
};
|
||||
|
||||
audio_mem: audio@cb400000 {
|
||||
reg = <0 0xcb000000 0 0x400000>;
|
||||
no-mem;
|
||||
};
|
||||
|
||||
qseecom_mem: qseecom@cb400000 {
|
||||
reg = <0 0xcb400000 0 0x1c00000>;
|
||||
no-mem;
|
||||
|
@ -820,7 +820,8 @@ gcc: clock-controller@100000 {
|
||||
clocks = <&rpmhcc RPMH_CXO_CLK>,
|
||||
<&rpmhcc RPMH_CXO_CLK_A>, <&sleep_clk>,
|
||||
<0>, <&pcie1_lane>,
|
||||
<0>, <0>, <0>, <0>;
|
||||
<0>, <0>, <0>,
|
||||
<&usb_1_ssphy>;
|
||||
clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk",
|
||||
"pcie_0_pipe_clk", "pcie_1_pipe_clk",
|
||||
"ufs_phy_rx_symbol_0_clk", "ufs_phy_rx_symbol_1_clk",
|
||||
@ -5337,6 +5338,14 @@ cpufreq_hw: cpufreq@18591000 {
|
||||
reg = <0 0x18591000 0 0x1000>,
|
||||
<0 0x18592000 0 0x1000>,
|
||||
<0 0x18593000 0 0x1000>;
|
||||
|
||||
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "dcvsh-irq-0",
|
||||
"dcvsh-irq-1",
|
||||
"dcvsh-irq-2";
|
||||
|
||||
clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_GPLL0>;
|
||||
clock-names = "xo", "alternate";
|
||||
#freq-domain-cells = <1>;
|
||||
|
@ -145,6 +145,10 @@ panel_in_edp: endpoint {
|
||||
};
|
||||
};
|
||||
|
||||
&cpufreq_hw {
|
||||
/delete-property/ interrupts-extended; /* reference to lmh_cluster[01] */
|
||||
};
|
||||
|
||||
&psci {
|
||||
/delete-node/ cpu0;
|
||||
/delete-node/ cpu1;
|
||||
@ -277,6 +281,14 @@ &BIG_CPU_SLEEP_1
|
||||
&CLUSTER_SLEEP_0>;
|
||||
};
|
||||
|
||||
&lmh_cluster0 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
&lmh_cluster1 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
/*
|
||||
* Reserved memory changes
|
||||
*
|
||||
|
@ -714,6 +714,8 @@ &wifi {
|
||||
vdd-1.8-xo-supply = <&vreg_l7a_1p8>;
|
||||
vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
|
||||
vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
|
||||
|
||||
qcom,snoc-host-cap-8bit-quirk;
|
||||
};
|
||||
|
||||
/* PINCTRL - additions to nodes defined in sdm845.dtsi */
|
||||
|
@ -1839,8 +1839,12 @@ pcie0_phy: phy@1c06000 {
|
||||
ranges;
|
||||
clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>,
|
||||
<&gcc GCC_PCIE_0_CFG_AHB_CLK>,
|
||||
<&gcc GCC_PCIE_0_CLKREF_CLK>,
|
||||
<&gcc GCC_PCIE0_PHY_REFGEN_CLK>;
|
||||
clock-names = "aux", "cfg_ahb", "refgen";
|
||||
clock-names = "aux",
|
||||
"cfg_ahb",
|
||||
"ref",
|
||||
"refgen";
|
||||
|
||||
resets = <&gcc GCC_PCIE_0_PHY_BCR>;
|
||||
reset-names = "phy";
|
||||
@ -1938,8 +1942,12 @@ pcie1_phy: phy@1c0e000 {
|
||||
ranges;
|
||||
clocks = <&gcc GCC_PCIE_PHY_AUX_CLK>,
|
||||
<&gcc GCC_PCIE_1_CFG_AHB_CLK>,
|
||||
<&gcc GCC_PCIE_1_CLKREF_CLK>,
|
||||
<&gcc GCC_PCIE1_PHY_REFGEN_CLK>;
|
||||
clock-names = "aux", "cfg_ahb", "refgen";
|
||||
clock-names = "aux",
|
||||
"cfg_ahb",
|
||||
"ref",
|
||||
"refgen";
|
||||
|
||||
resets = <&gcc GCC_PCIE_1_PHY_BCR>;
|
||||
reset-names = "phy";
|
||||
@ -3701,7 +3709,7 @@ camnoc_virt: interconnect@ac00000 {
|
||||
|
||||
pdc: interrupt-controller@b220000 {
|
||||
compatible = "qcom,sm8150-pdc", "qcom,pdc";
|
||||
reg = <0 0x0b220000 0 0x400>;
|
||||
reg = <0 0x0b220000 0 0x30000>;
|
||||
qcom,pdc-ranges = <0 480 94>, <94 609 31>,
|
||||
<125 63 1>;
|
||||
#interrupt-cells = <2>;
|
||||
|
@ -1778,7 +1778,7 @@ qup_uart6_default: qup-uart6-default-state {
|
||||
};
|
||||
|
||||
qup_uart18_default: qup-uart18-default-state {
|
||||
pins = "gpio58", "gpio59";
|
||||
pins = "gpio68", "gpio69";
|
||||
function = "qup18";
|
||||
drive-strength = <2>;
|
||||
bias-disable;
|
||||
|
@ -666,7 +666,7 @@ vpu_mmu: iommu@ff350800 {
|
||||
|
||||
vdec: video-codec@ff360000 {
|
||||
compatible = "rockchip,rk3328-vdec", "rockchip,rk3399-vdec";
|
||||
reg = <0x0 0xff360000 0x0 0x400>;
|
||||
reg = <0x0 0xff360000 0x0 0x480>;
|
||||
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>,
|
||||
<&cru SCLK_VDEC_CABAC>, <&cru SCLK_VDEC_CORE>;
|
||||
|
@ -493,6 +493,7 @@ &i2c4 {
|
||||
|
||||
&i2s0 {
|
||||
pinctrl-0 = <&i2s0_2ch_bus>;
|
||||
pinctrl-1 = <&i2s0_2ch_bus_bclk_off>;
|
||||
rockchip,capture-channels = <2>;
|
||||
rockchip,playback-channels = <2>;
|
||||
status = "okay";
|
||||
|
@ -1062,7 +1062,9 @@ power-domain@RK3399_PD_VCODEC {
|
||||
power-domain@RK3399_PD_VDU {
|
||||
reg = <RK3399_PD_VDU>;
|
||||
clocks = <&cru ACLK_VDU>,
|
||||
<&cru HCLK_VDU>;
|
||||
<&cru HCLK_VDU>,
|
||||
<&cru SCLK_VDU_CA>,
|
||||
<&cru SCLK_VDU_CORE>;
|
||||
pm_qos = <&qos_video_m1_r>,
|
||||
<&qos_video_m1_w>;
|
||||
#power-domain-cells = <0>;
|
||||
@ -1338,7 +1340,7 @@ vpu_mmu: iommu@ff650800 {
|
||||
|
||||
vdec: video-codec@ff660000 {
|
||||
compatible = "rockchip,rk3399-vdec";
|
||||
reg = <0x0 0xff660000 0x0 0x400>;
|
||||
reg = <0x0 0xff660000 0x0 0x480>;
|
||||
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||
clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,
|
||||
<&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>;
|
||||
@ -2396,6 +2398,16 @@ i2s0_2ch_bus: i2s0-2ch-bus {
|
||||
<4 RK_PA0 1 &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
i2s0_2ch_bus_bclk_off: i2s0-2ch-bus-bclk-off {
|
||||
rockchip,pins =
|
||||
<3 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
<3 RK_PD1 1 &pcfg_pull_none>,
|
||||
<3 RK_PD2 1 &pcfg_pull_none>,
|
||||
<3 RK_PD3 1 &pcfg_pull_none>,
|
||||
<3 RK_PD7 1 &pcfg_pull_none>,
|
||||
<4 RK_PA0 1 &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
i2s0_8ch_bus: i2s0-8ch-bus {
|
||||
rockchip,pins =
|
||||
<3 RK_PD0 1 &pcfg_pull_none>,
|
||||
|
@ -172,7 +172,7 @@ &main_i2c1 {
|
||||
status = "okay";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&main_i2c1_pins_default>;
|
||||
clock-frequency = <400000>;
|
||||
clock-frequency = <100000>;
|
||||
|
||||
exp1: gpio@22 {
|
||||
compatible = "ti,tca6424";
|
||||
|
@ -731,7 +731,6 @@ CONFIG_PANIC_TIMEOUT=-1
|
||||
CONFIG_SOFTLOCKUP_DETECTOR=y
|
||||
CONFIG_WQ_WATCHDOG=y
|
||||
CONFIG_SCHEDSTATS=y
|
||||
# CONFIG_DEBUG_PREEMPT is not set
|
||||
CONFIG_BUG_ON_DATA_CORRUPTION=y
|
||||
CONFIG_HIST_TRIGGERS=y
|
||||
CONFIG_PID_IN_CONTEXTIDR=y
|
||||
|
@ -85,7 +85,8 @@
|
||||
#define ARM_CPU_PART_NEOVERSE_N2 0xD49
|
||||
#define ARM_CPU_PART_CORTEX_A78C 0xD4B
|
||||
|
||||
#define APM_CPU_PART_POTENZA 0x000
|
||||
#define APM_CPU_PART_XGENE 0x000
|
||||
#define APM_CPU_VAR_POTENZA 0x00
|
||||
|
||||
#define CAVIUM_CPU_PART_THUNDERX 0x0A1
|
||||
#define CAVIUM_CPU_PART_THUNDERX_81XX 0x0A2
|
||||
|
@ -21,9 +21,22 @@ static inline bool arch_parse_debug_rodata(char *arg)
|
||||
extern bool rodata_enabled;
|
||||
extern bool rodata_full;
|
||||
|
||||
if (arg && !strcmp(arg, "full")) {
|
||||
if (!arg)
|
||||
return false;
|
||||
|
||||
if (!strcmp(arg, "full")) {
|
||||
rodata_enabled = rodata_full = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!strcmp(arg, "off")) {
|
||||
rodata_enabled = rodata_full = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!strcmp(arg, "on")) {
|
||||
rodata_enabled = true;
|
||||
rodata_full = true;
|
||||
rodata_full = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -865,7 +865,7 @@ u32 __attribute_const__ kvm_target_cpu(void)
|
||||
break;
|
||||
case ARM_CPU_IMP_APM:
|
||||
switch (part_number) {
|
||||
case APM_CPU_PART_POTENZA:
|
||||
case APM_CPU_PART_XGENE:
|
||||
return KVM_ARM_TARGET_XGENE_POTENZA;
|
||||
}
|
||||
break;
|
||||
|
@ -29,8 +29,8 @@ bool can_set_direct_map(void)
|
||||
*
|
||||
* KFENCE pool requires page-granular mapping if initialized late.
|
||||
*/
|
||||
return (rodata_enabled && rodata_full) || debug_pagealloc_enabled() ||
|
||||
arm64_kfence_can_set_direct_map();
|
||||
return rodata_full || debug_pagealloc_enabled() ||
|
||||
arm64_kfence_can_set_direct_map();
|
||||
}
|
||||
|
||||
static int change_page_range(pte_t *ptep, unsigned long addr, void *data)
|
||||
@ -105,8 +105,7 @@ static int change_memory_common(unsigned long addr, int numpages,
|
||||
* If we are manipulating read-only permissions, apply the same
|
||||
* change to the linear mapping of the pages that back this VM area.
|
||||
*/
|
||||
if (rodata_enabled &&
|
||||
rodata_full && (pgprot_val(set_mask) == PTE_RDONLY ||
|
||||
if (rodata_full && (pgprot_val(set_mask) == PTE_RDONLY ||
|
||||
pgprot_val(clear_mask) == PTE_RDONLY)) {
|
||||
for (i = 0; i < area->nr_pages; i++) {
|
||||
__change_memory_common((u64)page_address(area->pages[i]),
|
||||
|
@ -28,7 +28,7 @@ static inline void set_my_cpu_offset(unsigned long off)
|
||||
#define __my_cpu_offset __my_cpu_offset
|
||||
|
||||
#define PERCPU_OP(op, asm_op, c_op) \
|
||||
static inline unsigned long __percpu_##op(void *ptr, \
|
||||
static __always_inline unsigned long __percpu_##op(void *ptr, \
|
||||
unsigned long val, int size) \
|
||||
{ \
|
||||
unsigned long ret; \
|
||||
@ -59,7 +59,7 @@ PERCPU_OP(and, and, &)
|
||||
PERCPU_OP(or, or, |)
|
||||
#undef PERCPU_OP
|
||||
|
||||
static inline unsigned long __percpu_read(void *ptr, int size)
|
||||
static __always_inline unsigned long __percpu_read(void *ptr, int size)
|
||||
{
|
||||
unsigned long ret;
|
||||
|
||||
@ -96,7 +96,7 @@ static inline unsigned long __percpu_read(void *ptr, int size)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static inline void __percpu_write(void *ptr, unsigned long val, int size)
|
||||
static __always_inline void __percpu_write(void *ptr, unsigned long val, int size)
|
||||
{
|
||||
switch (size) {
|
||||
case 1:
|
||||
@ -128,8 +128,8 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
|
||||
}
|
||||
}
|
||||
|
||||
static inline unsigned long __percpu_xchg(void *ptr, unsigned long val,
|
||||
int size)
|
||||
static __always_inline unsigned long __percpu_xchg(void *ptr, unsigned long val,
|
||||
int size)
|
||||
{
|
||||
switch (size) {
|
||||
case 1:
|
||||
|
@ -68,11 +68,11 @@ void copy_user_highpage(struct page *to, struct page *from,
|
||||
{
|
||||
void *vfrom, *vto;
|
||||
|
||||
vto = kmap_atomic(to);
|
||||
vfrom = kmap_atomic(from);
|
||||
vfrom = kmap_local_page(from);
|
||||
vto = kmap_local_page(to);
|
||||
copy_page(vto, vfrom);
|
||||
kunmap_atomic(vfrom);
|
||||
kunmap_atomic(vto);
|
||||
kunmap_local(vfrom);
|
||||
kunmap_local(vto);
|
||||
/* Make sure this page is cleared on other CPU's too before using it */
|
||||
smp_wmb();
|
||||
}
|
||||
@ -228,6 +228,7 @@ pgd_t swapper_pg_dir[_PTRS_PER_PGD] __section(".bss..swapper_pg_dir");
|
||||
pgd_t invalid_pg_dir[_PTRS_PER_PGD] __page_aligned_bss;
|
||||
#ifndef __PAGETABLE_PUD_FOLDED
|
||||
pud_t invalid_pud_table[PTRS_PER_PUD] __page_aligned_bss;
|
||||
EXPORT_SYMBOL(invalid_pud_table);
|
||||
#endif
|
||||
#ifndef __PAGETABLE_PMD_FOLDED
|
||||
pmd_t invalid_pmd_table[PTRS_PER_PMD] __page_aligned_bss;
|
||||
|
@ -796,8 +796,6 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
|
||||
|
||||
/* function return */
|
||||
case BPF_JMP | BPF_EXIT:
|
||||
emit_sext_32(ctx, regmap[BPF_REG_0], true);
|
||||
|
||||
if (i == ctx->prog->len - 1)
|
||||
break;
|
||||
|
||||
@ -844,14 +842,8 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
|
||||
}
|
||||
break;
|
||||
case BPF_DW:
|
||||
if (is_signed_imm12(off)) {
|
||||
emit_insn(ctx, ldd, dst, src, off);
|
||||
} else if (is_signed_imm14(off)) {
|
||||
emit_insn(ctx, ldptrd, dst, src, off);
|
||||
} else {
|
||||
move_imm(ctx, t1, off, is32);
|
||||
emit_insn(ctx, ldxd, dst, src, t1);
|
||||
}
|
||||
move_imm(ctx, t1, off, is32);
|
||||
emit_insn(ctx, ldxd, dst, src, t1);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
@ -483,6 +483,7 @@ config MACH_LOONGSON2EF
|
||||
|
||||
config MACH_LOONGSON64
|
||||
bool "Loongson 64-bit family of machines"
|
||||
select ARCH_DMA_DEFAULT_COHERENT
|
||||
select ARCH_SPARSEMEM_ENABLE
|
||||
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||
select ARCH_MIGHT_HAVE_PC_SERIO
|
||||
@ -1304,6 +1305,7 @@ config CPU_LOONGSON64
|
||||
select CPU_SUPPORTS_MSA
|
||||
select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT
|
||||
select CPU_MIPSR2_IRQ_VI
|
||||
select DMA_NONCOHERENT
|
||||
select WEAK_ORDERING
|
||||
select WEAK_REORDERING_BEYOND_LLSC
|
||||
select MIPS_ASID_BITS_VARIABLE
|
||||
|
@ -14,7 +14,11 @@
|
||||
#define ADAPTER_ROM 8
|
||||
#define ACPI_TABLE 9
|
||||
#define SMBIOS_TABLE 10
|
||||
#define MAX_MEMORY_TYPE 11
|
||||
#define UMA_VIDEO_RAM 11
|
||||
#define VUMA_VIDEO_RAM 12
|
||||
#define MAX_MEMORY_TYPE 13
|
||||
|
||||
#define MEM_SIZE_IS_IN_BYTES (1 << 31)
|
||||
|
||||
#define LOONGSON3_BOOT_MEM_MAP_MAX 128
|
||||
struct efi_memory_map_loongson {
|
||||
@ -117,7 +121,8 @@ struct irq_source_routing_table {
|
||||
u64 pci_io_start_addr;
|
||||
u64 pci_io_end_addr;
|
||||
u64 pci_config_addr;
|
||||
u32 dma_mask_bits;
|
||||
u16 dma_mask_bits;
|
||||
u16 dma_noncoherent;
|
||||
} __packed;
|
||||
|
||||
struct interface_info {
|
||||
|
@ -121,6 +121,19 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
|
||||
/* Put the stack after the struct pt_regs. */
|
||||
childksp = (unsigned long) childregs;
|
||||
p->thread.cp0_status = (read_c0_status() & ~(ST0_CU2|ST0_CU1)) | ST0_KERNEL_CUMASK;
|
||||
|
||||
/*
|
||||
* New tasks lose permission to use the fpu. This accelerates context
|
||||
* switching for most programs since they don't use the fpu.
|
||||
*/
|
||||
clear_tsk_thread_flag(p, TIF_USEDFPU);
|
||||
clear_tsk_thread_flag(p, TIF_USEDMSA);
|
||||
clear_tsk_thread_flag(p, TIF_MSA_CTX_LIVE);
|
||||
|
||||
#ifdef CONFIG_MIPS_MT_FPAFF
|
||||
clear_tsk_thread_flag(p, TIF_FPUBOUND);
|
||||
#endif /* CONFIG_MIPS_MT_FPAFF */
|
||||
|
||||
if (unlikely(args->fn)) {
|
||||
/* kernel thread */
|
||||
unsigned long status = p->thread.cp0_status;
|
||||
@ -149,20 +162,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
|
||||
p->thread.reg29 = (unsigned long) childregs;
|
||||
p->thread.reg31 = (unsigned long) ret_from_fork;
|
||||
|
||||
/*
|
||||
* New tasks lose permission to use the fpu. This accelerates context
|
||||
* switching for most programs since they don't use the fpu.
|
||||
*/
|
||||
childregs->cp0_status &= ~(ST0_CU2|ST0_CU1);
|
||||
|
||||
clear_tsk_thread_flag(p, TIF_USEDFPU);
|
||||
clear_tsk_thread_flag(p, TIF_USEDMSA);
|
||||
clear_tsk_thread_flag(p, TIF_MSA_CTX_LIVE);
|
||||
|
||||
#ifdef CONFIG_MIPS_MT_FPAFF
|
||||
clear_tsk_thread_flag(p, TIF_FPUBOUND);
|
||||
#endif /* CONFIG_MIPS_MT_FPAFF */
|
||||
|
||||
#ifdef CONFIG_MIPS_FP_SUPPORT
|
||||
atomic_set(&p->thread.bd_emu_frame, BD_EMUFRAME_NONE);
|
||||
#endif
|
||||
|
@ -593,7 +593,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa,
|
||||
gfn_t gfn = gpa >> PAGE_SHIFT;
|
||||
int srcu_idx, err;
|
||||
kvm_pfn_t pfn;
|
||||
pte_t *ptep, entry, old_pte;
|
||||
pte_t *ptep, entry;
|
||||
bool writeable;
|
||||
unsigned long prot_bits;
|
||||
unsigned long mmu_seq;
|
||||
@ -665,7 +665,6 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa,
|
||||
entry = pfn_pte(pfn, __pgprot(prot_bits));
|
||||
|
||||
/* Write the PTE */
|
||||
old_pte = *ptep;
|
||||
set_pte(ptep, entry);
|
||||
|
||||
err = 0;
|
||||
|
@ -13,6 +13,8 @@
|
||||
* Copyright (C) 2009 Lemote Inc.
|
||||
* Author: Wu Zhangjin, wuzhangjin@gmail.com
|
||||
*/
|
||||
|
||||
#include <linux/dma-map-ops.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/pci_ids.h>
|
||||
#include <asm/bootinfo.h>
|
||||
@ -147,8 +149,14 @@ void __init prom_lefi_init_env(void)
|
||||
|
||||
loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits;
|
||||
if (loongson_sysconf.dma_mask_bits < 32 ||
|
||||
loongson_sysconf.dma_mask_bits > 64)
|
||||
loongson_sysconf.dma_mask_bits > 64) {
|
||||
loongson_sysconf.dma_mask_bits = 32;
|
||||
dma_default_coherent = true;
|
||||
} else {
|
||||
dma_default_coherent = !eirq_source->dma_noncoherent;
|
||||
}
|
||||
|
||||
pr_info("Firmware: Coherent DMA: %s\n", dma_default_coherent ? "on" : "off");
|
||||
|
||||
loongson_sysconf.restart_addr = boot_p->reset_system.ResetWarm;
|
||||
loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;
|
||||
|
@ -49,8 +49,7 @@ void virtual_early_config(void)
|
||||
void __init szmem(unsigned int node)
|
||||
{
|
||||
u32 i, mem_type;
|
||||
static unsigned long num_physpages;
|
||||
u64 node_id, node_psize, start_pfn, end_pfn, mem_start, mem_size;
|
||||
phys_addr_t node_id, mem_start, mem_size;
|
||||
|
||||
/* Otherwise come from DTB */
|
||||
if (loongson_sysconf.fw_interface != LOONGSON_LEFI)
|
||||
@ -64,30 +63,46 @@ void __init szmem(unsigned int node)
|
||||
|
||||
mem_type = loongson_memmap->map[i].mem_type;
|
||||
mem_size = loongson_memmap->map[i].mem_size;
|
||||
mem_start = loongson_memmap->map[i].mem_start;
|
||||
|
||||
/* Memory size comes in MB if MEM_SIZE_IS_IN_BYTES not set */
|
||||
if (mem_size & MEM_SIZE_IS_IN_BYTES)
|
||||
mem_size &= ~MEM_SIZE_IS_IN_BYTES;
|
||||
else
|
||||
mem_size = mem_size << 20;
|
||||
|
||||
mem_start = (node_id << 44) | loongson_memmap->map[i].mem_start;
|
||||
|
||||
switch (mem_type) {
|
||||
case SYSTEM_RAM_LOW:
|
||||
case SYSTEM_RAM_HIGH:
|
||||
start_pfn = ((node_id << 44) + mem_start) >> PAGE_SHIFT;
|
||||
node_psize = (mem_size << 20) >> PAGE_SHIFT;
|
||||
end_pfn = start_pfn + node_psize;
|
||||
num_physpages += node_psize;
|
||||
pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",
|
||||
(u32)node_id, mem_type, mem_start, mem_size);
|
||||
pr_info(" start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n",
|
||||
start_pfn, end_pfn, num_physpages);
|
||||
memblock_add_node(PFN_PHYS(start_pfn),
|
||||
PFN_PHYS(node_psize), node,
|
||||
case UMA_VIDEO_RAM:
|
||||
pr_info("Node %d, mem_type:%d\t[%pa], %pa bytes usable\n",
|
||||
(u32)node_id, mem_type, &mem_start, &mem_size);
|
||||
memblock_add_node(mem_start, mem_size, node,
|
||||
MEMBLOCK_NONE);
|
||||
break;
|
||||
case SYSTEM_RAM_RESERVED:
|
||||
pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",
|
||||
(u32)node_id, mem_type, mem_start, mem_size);
|
||||
memblock_reserve(((node_id << 44) + mem_start), mem_size << 20);
|
||||
case VIDEO_ROM:
|
||||
case ADAPTER_ROM:
|
||||
case ACPI_TABLE:
|
||||
case SMBIOS_TABLE:
|
||||
pr_info("Node %d, mem_type:%d\t[%pa], %pa bytes reserved\n",
|
||||
(u32)node_id, mem_type, &mem_start, &mem_size);
|
||||
memblock_reserve(mem_start, mem_size);
|
||||
break;
|
||||
/* We should not reserve VUMA_VIDEO_RAM as it overlaps with MMIO */
|
||||
case VUMA_VIDEO_RAM:
|
||||
default:
|
||||
pr_info("Node %d, mem_type:%d\t[%pa], %pa bytes unhandled\n",
|
||||
(u32)node_id, mem_type, &mem_start, &mem_size);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Reserve vgabios if it comes from firmware */
|
||||
if (loongson_sysconf.vgabios_addr)
|
||||
memblock_reserve(virt_to_phys((void *)loongson_sysconf.vgabios_addr),
|
||||
SZ_256K);
|
||||
}
|
||||
|
||||
#ifndef CONFIG_NUMA
|
||||
|
@ -105,9 +105,12 @@ config ARCH_HAS_ILOG2_U64
|
||||
default n
|
||||
|
||||
config GENERIC_BUG
|
||||
bool
|
||||
default y
|
||||
def_bool y
|
||||
depends on BUG
|
||||
select GENERIC_BUG_RELATIVE_POINTERS if 64BIT
|
||||
|
||||
config GENERIC_BUG_RELATIVE_POINTERS
|
||||
bool
|
||||
|
||||
config GENERIC_HWEIGHT
|
||||
bool
|
||||
|
@ -34,7 +34,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
|
||||
|
||||
/* Alternative SMP implementation. */
|
||||
#define ALTERNATIVE(cond, replacement) "!0:" \
|
||||
".section .altinstructions, \"aw\" !" \
|
||||
".section .altinstructions, \"a\" !" \
|
||||
".align 4 !" \
|
||||
".word (0b-4-.) !" \
|
||||
".hword 1, " __stringify(cond) " !" \
|
||||
".word " __stringify(replacement) " !" \
|
||||
@ -44,7 +45,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
|
||||
|
||||
/* to replace one single instructions by a new instruction */
|
||||
#define ALTERNATIVE(from, to, cond, replacement)\
|
||||
.section .altinstructions, "aw" ! \
|
||||
.section .altinstructions, "a" ! \
|
||||
.align 4 ! \
|
||||
.word (from - .) ! \
|
||||
.hword (to - from)/4, cond ! \
|
||||
.word replacement ! \
|
||||
@ -52,7 +54,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
|
||||
|
||||
/* to replace multiple instructions by new code */
|
||||
#define ALTERNATIVE_CODE(from, num_instructions, cond, new_instr_ptr)\
|
||||
.section .altinstructions, "aw" ! \
|
||||
.section .altinstructions, "a" ! \
|
||||
.align 4 ! \
|
||||
.word (from - .) ! \
|
||||
.hword -num_instructions, cond ! \
|
||||
.word (new_instr_ptr - .) ! \
|
||||
|
@ -574,6 +574,7 @@
|
||||
*/
|
||||
#define ASM_EXCEPTIONTABLE_ENTRY(fault_addr, except_addr) \
|
||||
.section __ex_table,"aw" ! \
|
||||
.align 4 ! \
|
||||
.word (fault_addr - .), (except_addr - .) ! \
|
||||
.previous
|
||||
|
||||
|
@ -17,24 +17,27 @@
|
||||
#define PARISC_BUG_BREAK_ASM "break 0x1f, 0x1fff"
|
||||
#define PARISC_BUG_BREAK_INSN 0x03ffe01f /* PARISC_BUG_BREAK_ASM */
|
||||
|
||||
#if defined(CONFIG_64BIT)
|
||||
#define ASM_WORD_INSN ".dword\t"
|
||||
#ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
|
||||
# define __BUG_REL(val) ".word " __stringify(val) " - ."
|
||||
#else
|
||||
#define ASM_WORD_INSN ".word\t"
|
||||
# define __BUG_REL(val) ".word " __stringify(val)
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
||||
#define BUG() \
|
||||
do { \
|
||||
asm volatile("\n" \
|
||||
"1:\t" PARISC_BUG_BREAK_ASM "\n" \
|
||||
"\t.pushsection __bug_table,\"aw\"\n" \
|
||||
"2:\t" ASM_WORD_INSN "1b, %c0\n" \
|
||||
"\t.short %c1, %c2\n" \
|
||||
"\t.org 2b+%c3\n" \
|
||||
"\t.pushsection __bug_table,\"a\"\n" \
|
||||
"\t.align 4\n" \
|
||||
"2:\t" __BUG_REL(1b) "\n" \
|
||||
"\t" __BUG_REL(%c0) "\n" \
|
||||
"\t.short %1, %2\n" \
|
||||
"\t.blockz %3-2*4-2*2\n" \
|
||||
"\t.popsection" \
|
||||
: : "i" (__FILE__), "i" (__LINE__), \
|
||||
"i" (0), "i" (sizeof(struct bug_entry)) ); \
|
||||
"i" (0), "i" (sizeof(struct bug_entry)) ); \
|
||||
unreachable(); \
|
||||
} while(0)
|
||||
|
||||
@ -51,10 +54,12 @@
|
||||
do { \
|
||||
asm volatile("\n" \
|
||||
"1:\t" PARISC_BUG_BREAK_ASM "\n" \
|
||||
"\t.pushsection __bug_table,\"aw\"\n" \
|
||||
"2:\t" ASM_WORD_INSN "1b, %c0\n" \
|
||||
"\t.short %c1, %c2\n" \
|
||||
"\t.org 2b+%c3\n" \
|
||||
"\t.pushsection __bug_table,\"a\"\n" \
|
||||
"\t.align 4\n" \
|
||||
"2:\t" __BUG_REL(1b) "\n" \
|
||||
"\t" __BUG_REL(%c0) "\n" \
|
||||
"\t.short %1, %2\n" \
|
||||
"\t.blockz %3-2*4-2*2\n" \
|
||||
"\t.popsection" \
|
||||
: : "i" (__FILE__), "i" (__LINE__), \
|
||||
"i" (BUGFLAG_WARNING|(flags)), \
|
||||
@ -65,10 +70,11 @@
|
||||
do { \
|
||||
asm volatile("\n" \
|
||||
"1:\t" PARISC_BUG_BREAK_ASM "\n" \
|
||||
"\t.pushsection __bug_table,\"aw\"\n" \
|
||||
"2:\t" ASM_WORD_INSN "1b\n" \
|
||||
"\t.short %c0\n" \
|
||||
"\t.org 2b+%c1\n" \
|
||||
"\t.pushsection __bug_table,\"a\"\n" \
|
||||
"\t.align 4\n" \
|
||||
"2:\t" __BUG_REL(1b) "\n" \
|
||||
"\t.short %0\n" \
|
||||
"\t.blockz %1-4-2\n" \
|
||||
"\t.popsection" \
|
||||
: : "i" (BUGFLAG_WARNING|(flags)), \
|
||||
"i" (sizeof(struct bug_entry)) ); \
|
||||
|
@ -15,10 +15,12 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
|
||||
asm_volatile_goto("1:\n\t"
|
||||
"nop\n\t"
|
||||
".pushsection __jump_table, \"aw\"\n\t"
|
||||
".align %1\n\t"
|
||||
".word 1b - ., %l[l_yes] - .\n\t"
|
||||
__stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
|
||||
".popsection\n\t"
|
||||
: : "i" (&((char *)key)[branch]) : : l_yes);
|
||||
: : "i" (&((char *)key)[branch]), "i" (sizeof(long))
|
||||
: : l_yes);
|
||||
|
||||
return false;
|
||||
l_yes:
|
||||
@ -30,10 +32,12 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
|
||||
asm_volatile_goto("1:\n\t"
|
||||
"b,n %l[l_yes]\n\t"
|
||||
".pushsection __jump_table, \"aw\"\n\t"
|
||||
".align %1\n\t"
|
||||
".word 1b - ., %l[l_yes] - .\n\t"
|
||||
__stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
|
||||
".popsection\n\t"
|
||||
: : "i" (&((char *)key)[branch]) : : l_yes);
|
||||
: : "i" (&((char *)key)[branch]), "i" (sizeof(long))
|
||||
: : l_yes);
|
||||
|
||||
return false;
|
||||
l_yes:
|
||||
|
@ -56,7 +56,7 @@
|
||||
})
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
# define __lock_aligned __section(".data..lock_aligned")
|
||||
# define __lock_aligned __section(".data..lock_aligned") __aligned(16)
|
||||
#endif
|
||||
|
||||
#endif /* __PARISC_LDCW_H */
|
||||
|
@ -41,6 +41,7 @@ struct exception_table_entry {
|
||||
|
||||
#define ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr )\
|
||||
".section __ex_table,\"aw\"\n" \
|
||||
".align 4\n" \
|
||||
".word (" #fault_addr " - .), (" #except_addr " - .)\n\t" \
|
||||
".previous\n"
|
||||
|
||||
|
@ -75,7 +75,6 @@
|
||||
|
||||
/* We now return you to your regularly scheduled HPUX. */
|
||||
|
||||
#define ENOSYM 215 /* symbol does not exist in executable */
|
||||
#define ENOTSOCK 216 /* Socket operation on non-socket */
|
||||
#define EDESTADDRREQ 217 /* Destination address required */
|
||||
#define EMSGSIZE 218 /* Message too long */
|
||||
@ -101,7 +100,6 @@
|
||||
#define ETIMEDOUT 238 /* Connection timed out */
|
||||
#define ECONNREFUSED 239 /* Connection refused */
|
||||
#define EREFUSED ECONNREFUSED /* for HP's NFS apparently */
|
||||
#define EREMOTERELEASE 240 /* Remote peer released connection */
|
||||
#define EHOSTDOWN 241 /* Host is down */
|
||||
#define EHOSTUNREACH 242 /* No route to host */
|
||||
|
||||
|
@ -472,6 +472,7 @@ struct pdc_model { /* for PDC_MODEL */
|
||||
unsigned long arch_rev;
|
||||
unsigned long pot_key;
|
||||
unsigned long curr_key;
|
||||
unsigned long width; /* default of PSW_W bit (1=enabled) */
|
||||
};
|
||||
|
||||
struct pdc_cache_cf { /* for PDC_CACHE (I/D-caches) */
|
||||
|
@ -462,13 +462,13 @@
|
||||
* to a CPU TLB 4k PFN (4k => 12 bits to shift) */
|
||||
#define PAGE_ADD_SHIFT (PAGE_SHIFT-12)
|
||||
#define PAGE_ADD_HUGE_SHIFT (REAL_HPAGE_SHIFT-12)
|
||||
#define PFN_START_BIT (63-ASM_PFN_PTE_SHIFT+(63-58)-PAGE_ADD_SHIFT)
|
||||
|
||||
/* Drop prot bits and convert to page addr for iitlbt and idtlbt */
|
||||
.macro convert_for_tlb_insert20 pte,tmp
|
||||
#ifdef CONFIG_HUGETLB_PAGE
|
||||
copy \pte,\tmp
|
||||
extrd,u \tmp,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\
|
||||
64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte
|
||||
extrd,u \tmp,PFN_START_BIT,PFN_START_BIT+1,\pte
|
||||
|
||||
depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\
|
||||
(63-58)+PAGE_ADD_SHIFT,\pte
|
||||
@ -476,8 +476,7 @@
|
||||
depdi _HUGE_PAGE_SIZE_ENCODING_DEFAULT,63,\
|
||||
(63-58)+PAGE_ADD_HUGE_SHIFT,\pte
|
||||
#else /* Huge pages disabled */
|
||||
extrd,u \pte,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\
|
||||
64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte
|
||||
extrd,u \pte,PFN_START_BIT,PFN_START_BIT+1,\pte
|
||||
depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\
|
||||
(63-58)+PAGE_ADD_SHIFT,\pte
|
||||
#endif
|
||||
|
@ -70,9 +70,8 @@ $bss_loop:
|
||||
stw,ma %arg2,4(%r1)
|
||||
stw,ma %arg3,4(%r1)
|
||||
|
||||
#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20)
|
||||
/* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU
|
||||
* and halt kernel if we detect a PA1.x CPU. */
|
||||
#if defined(CONFIG_PA20)
|
||||
/* check for 64-bit capable CPU as required by current kernel */
|
||||
ldi 32,%r10
|
||||
mtctl %r10,%cr11
|
||||
.level 2.0
|
||||
|
@ -131,6 +131,7 @@ SECTIONS
|
||||
RO_DATA(8)
|
||||
|
||||
/* unwind info */
|
||||
. = ALIGN(4);
|
||||
.PARISC.unwind : {
|
||||
__start___unwind = .;
|
||||
*(.PARISC.unwind)
|
||||
|
@ -69,9 +69,6 @@
|
||||
|
||||
#define _PTE_NONE_MASK 0
|
||||
|
||||
/* Until my rework is finished, 40x still needs atomic PTE updates */
|
||||
#define PTE_ATOMIC_UPDATES 1
|
||||
|
||||
#define _PAGE_BASE_NC (_PAGE_PRESENT | _PAGE_ACCESSED)
|
||||
#define _PAGE_BASE (_PAGE_BASE_NC)
|
||||
|
||||
|
@ -94,6 +94,13 @@ static inline pte_t pte_wrprotect(pte_t pte)
|
||||
|
||||
#define pte_wrprotect pte_wrprotect
|
||||
|
||||
static inline int pte_read(pte_t pte)
|
||||
{
|
||||
return (pte_val(pte) & _PAGE_RO) != _PAGE_NA;
|
||||
}
|
||||
|
||||
#define pte_read pte_read
|
||||
|
||||
static inline int pte_write(pte_t pte)
|
||||
{
|
||||
return !(pte_val(pte) & _PAGE_RO);
|
||||
|
@ -197,7 +197,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm,
|
||||
{
|
||||
unsigned long old;
|
||||
|
||||
if (pte_young(*ptep))
|
||||
if (!pte_young(*ptep))
|
||||
return 0;
|
||||
old = pte_update(mm, addr, ptep, _PAGE_ACCESSED, 0, 0);
|
||||
return (old & _PAGE_ACCESSED) != 0;
|
||||
|
@ -25,7 +25,9 @@ static inline int pte_write(pte_t pte)
|
||||
return pte_val(pte) & _PAGE_RW;
|
||||
}
|
||||
#endif
|
||||
#ifndef pte_read
|
||||
static inline int pte_read(pte_t pte) { return 1; }
|
||||
#endif
|
||||
static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
|
||||
static inline int pte_special(pte_t pte) { return pte_val(pte) & _PAGE_SPECIAL; }
|
||||
static inline int pte_none(pte_t pte) { return (pte_val(pte) & ~_PTE_NONE_MASK) == 0; }
|
||||
|
@ -135,8 +135,9 @@ ret_from_syscall:
|
||||
lis r4,icache_44x_need_flush@ha
|
||||
lwz r5,icache_44x_need_flush@l(r4)
|
||||
cmplwi cr0,r5,0
|
||||
bne- 2f
|
||||
bne- .L44x_icache_flush
|
||||
#endif /* CONFIG_PPC_47x */
|
||||
.L44x_icache_flush_return:
|
||||
kuep_unlock
|
||||
lwz r4,_LINK(r1)
|
||||
lwz r5,_CCR(r1)
|
||||
@ -170,10 +171,11 @@ syscall_exit_finish:
|
||||
b 1b
|
||||
|
||||
#ifdef CONFIG_44x
|
||||
2: li r7,0
|
||||
.L44x_icache_flush:
|
||||
li r7,0
|
||||
iccci r0,r0
|
||||
stw r7,icache_44x_need_flush@l(r4)
|
||||
b 1b
|
||||
b .L44x_icache_flush_return
|
||||
#endif /* CONFIG_44x */
|
||||
|
||||
.globl ret_from_fork
|
||||
|
@ -23,6 +23,15 @@
|
||||
#include <asm/feature-fixups.h>
|
||||
|
||||
#ifdef CONFIG_VSX
|
||||
#define __REST_1FPVSR(n,c,base) \
|
||||
BEGIN_FTR_SECTION \
|
||||
b 2f; \
|
||||
END_FTR_SECTION_IFSET(CPU_FTR_VSX); \
|
||||
REST_FPR(n,base); \
|
||||
b 3f; \
|
||||
2: REST_VSR(n,c,base); \
|
||||
3:
|
||||
|
||||
#define __REST_32FPVSRS(n,c,base) \
|
||||
BEGIN_FTR_SECTION \
|
||||
b 2f; \
|
||||
@ -41,9 +50,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX); \
|
||||
2: SAVE_32VSRS(n,c,base); \
|
||||
3:
|
||||
#else
|
||||
#define __REST_1FPVSR(n,b,base) REST_FPR(n, base)
|
||||
#define __REST_32FPVSRS(n,b,base) REST_32FPRS(n, base)
|
||||
#define __SAVE_32FPVSRS(n,b,base) SAVE_32FPRS(n, base)
|
||||
#endif
|
||||
#define REST_1FPVSR(n,c,base) __REST_1FPVSR(n,__REG_##c,__REG_##base)
|
||||
#define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base)
|
||||
#define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
|
||||
|
||||
@ -67,6 +78,7 @@ _GLOBAL(store_fp_state)
|
||||
SAVE_32FPVSRS(0, R4, R3)
|
||||
mffs fr0
|
||||
stfd fr0,FPSTATE_FPSCR(r3)
|
||||
REST_1FPVSR(0, R4, R3)
|
||||
blr
|
||||
EXPORT_SYMBOL(store_fp_state)
|
||||
|
||||
@ -138,4 +150,5 @@ _GLOBAL(save_fpu)
|
||||
2: SAVE_32FPVSRS(0, R4, R6)
|
||||
mffs fr0
|
||||
stfd fr0,FPSTATE_FPSCR(r6)
|
||||
REST_1FPVSR(0, R4, R6)
|
||||
blr
|
||||
|
@ -394,7 +394,7 @@ interrupt_base:
|
||||
#ifdef CONFIG_PPC_FPU
|
||||
FP_UNAVAILABLE_EXCEPTION
|
||||
#else
|
||||
EXCEPTION(0x0800, FP_UNAVAIL, FloatingPointUnavailable, unknown_exception)
|
||||
EXCEPTION(0x0800, FP_UNAVAIL, FloatingPointUnavailable, emulation_assist_interrupt)
|
||||
#endif
|
||||
|
||||
/* System Call Interrupt */
|
||||
|
@ -1163,11 +1163,11 @@ void kvmppc_save_user_regs(void)
|
||||
|
||||
usermsr = current->thread.regs->msr;
|
||||
|
||||
/* Caller has enabled FP/VEC/VSX/TM in MSR */
|
||||
if (usermsr & MSR_FP)
|
||||
save_fpu(current);
|
||||
|
||||
__giveup_fpu(current);
|
||||
if (usermsr & MSR_VEC)
|
||||
save_altivec(current);
|
||||
__giveup_altivec(current);
|
||||
|
||||
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
||||
if (usermsr & MSR_TM) {
|
||||
|
@ -946,6 +946,8 @@ void __init setup_arch(char **cmdline_p)
|
||||
|
||||
/* Parse memory topology */
|
||||
mem_topology_setup();
|
||||
/* Set max_mapnr before paging_init() */
|
||||
set_max_mapnr(max_pfn);
|
||||
|
||||
/*
|
||||
* Release secondary cpus out of their spinloops at 0x60 now that
|
||||
|
@ -1164,6 +1164,7 @@ static void emulate_single_step(struct pt_regs *regs)
|
||||
__single_step_exception(regs);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_FPU_REGS
|
||||
static inline int __parse_fpscr(unsigned long fpscr)
|
||||
{
|
||||
int ret = FPE_FLTUNK;
|
||||
@ -1190,6 +1191,7 @@ static inline int __parse_fpscr(unsigned long fpscr)
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void parse_fpe(struct pt_regs *regs)
|
||||
{
|
||||
|
@ -32,6 +32,7 @@ _GLOBAL(store_vr_state)
|
||||
mfvscr v0
|
||||
li r4, VRSTATE_VSCR
|
||||
stvx v0, r4, r3
|
||||
lvx v0, 0, r3
|
||||
blr
|
||||
EXPORT_SYMBOL(store_vr_state)
|
||||
|
||||
@ -108,6 +109,7 @@ _GLOBAL(save_altivec)
|
||||
mfvscr v0
|
||||
li r4,VRSTATE_VSCR
|
||||
stvx v0,r4,r7
|
||||
lvx v0,0,r7
|
||||
blr
|
||||
|
||||
#ifdef CONFIG_VSX
|
||||
|
@ -288,7 +288,6 @@ void __init mem_init(void)
|
||||
#endif
|
||||
|
||||
high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
|
||||
set_max_mapnr(max_pfn);
|
||||
|
||||
kasan_late_init();
|
||||
|
||||
|
@ -1371,8 +1371,7 @@ static void power_pmu_disable(struct pmu *pmu)
|
||||
/*
|
||||
* Disable instruction sampling if it was enabled
|
||||
*/
|
||||
if (cpuhw->mmcr.mmcra & MMCRA_SAMPLE_ENABLE)
|
||||
val &= ~MMCRA_SAMPLE_ENABLE;
|
||||
val &= ~MMCRA_SAMPLE_ENABLE;
|
||||
|
||||
/* Disable BHRB via mmcra (BHRBRD) for p10 */
|
||||
if (ppmu->flags & PPMU_ARCH_31)
|
||||
@ -1383,7 +1382,7 @@ static void power_pmu_disable(struct pmu *pmu)
|
||||
* instruction sampling or BHRB.
|
||||
*/
|
||||
if (val != mmcra) {
|
||||
mtspr(SPRN_MMCRA, mmcra);
|
||||
mtspr(SPRN_MMCRA, val);
|
||||
mb();
|
||||
isync();
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user