Merge tag 'android11-5.4.233_r00' into android11-5.4
This is the merge of the upstream LTS release of 5.4.233 into the android11-5.4 branch. It contains the following commits:6bb176e034Merge 5.4.233 into android11-5.4-lts7f7f254975Revert "iommu: Add gfp parameter to iommu_ops::map"7f7f83ce87Revert "iommu/amd: Pass gfp flags to iommu_map_page() in amd_iommu_map()"bbf1c13935Revert "RDMA/usnic: use iommu_map_atomic() under spin_lock()"69f65d442eLinux 5.4.233c6cc0121d4bpf: add missing header file include5d873a6c65Revert "net/sched: taprio: make qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"99e3fd21f8ext4: Fix function prototype mismatch for ext4_feat_ktype6f86bb6f85wifi: mwifiex: Add missing compatible string for SD87876c750ed036uaccess: Add speculation barrier to copy_from_user()4d2e5de071mac80211: mesh: embedd mesh_paths and mpp_paths into ieee80211_if_mesh787ef0db01drm/i915/gvt: fix double free bug in split_2MB_gtt_entry100cf2af1balarmtimer: Prevent starvation by small intervals and SIG_IGNdab2066c5fpowerpc: dts: t208x: Disable 10G on MAC1 and MAC2113e0cde39can: kvaser_usb: hydra: help gcc-13 to figure out cmd_lenf93a1a5bdcKVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRSdb209f39f1KVM: x86: Fail emulation during EMULTYPE_SKIP on any exceptiondc399695dfrandom: always mix cycle counter in add_latent_entropy()eff0e02f7dpowerpc: dts: t208x: Mark MAC1 and MAC2 as 10Gead0689bd6wifi: rtl8xxxu: gen2: Turn on the rate control0a77a966aadrm/etnaviv: don't truncate physical page addressfa2845b216drm: etnaviv: fix common struct sg_table related issues4626550b09scatterlist: add generic wrappers for iterating over sgtable objectsfe3e217272dma-mapping: add generic helpers for mapping sgtable objectsabc4ede193Merge 5.4.232 into android11-5.4-lts64121e2adfLinux 5.4.2328b47e324afiommu/amd: Pass gfp flags to iommu_map_page() in amd_iommu_map()7519069f1fnet: sched: sch: Fix off by one in htb_activate_prios()5660a6ffa7ASoC: SOF: Intel: hda-dai: fix possible stream_tag leak52844d8382nilfs2: fix underflow in second superblock position calculations9f95a161a7kvm: initialize all of the kvm_debugregs structure before sending it to userspace9f4abf2048i40e: Add checking for null for nlmsg_find_attr()e71554a09eipv6: Fix tcp socket connection with DSCP.388886f970ipv6: Fix datagram socket connection with DSCP.905199dac2ixgbe: add double of VLAN header when computing the max MTUdf099e6556net: mpls: fix stale pointer if allocation fails during device rename736f8f66d7net: stmmac: Restrict warning on disabling DMA store and fwd mode1a2c795142bnxt_en: Fix mqprio and XDP ring checking logicde44bdebcfnet: stmmac: fix order of dwmac5 FlexPPS parametrization sequencea753352622net/usb: kalmia: Don't pass act_len in usb_bulk_msg error path0c2651c763dccp/tcp: Avoid negative sk_forward_alloc by ipv6_pinfo.pktoptions.a4e9411769sctp: sctp_sock_filter(): avoid list_entry() on possibly empty liste1b54b5612net: bgmac: fix BCM5358 support by setting correct flags8a4d05b0ffi40e: add double of VLAN header when computing the max MTUfdeb4c258bixgbe: allow to increase MTU to 3K with XDP enabled32d81fd54erevert "squashfs: harden sanity check in squashfs_read_xattr_id_table"4c8011e77cnet: Fix unwanted sign extension in netdev_stats_to_stats64()6b08c9fc72Revert "mm: Always release pages to the buddy allocator in memblock_free_late()."8c07792e79hugetlb: check for undefined shift on 32 bit architectures7caeb5457bsched/psi: Fix use-after-free in ep_remove_wait_queue()6c38aa4020ALSA: hda/realtek - fixed wrong gpio assigned6e0ef3fc65ALSA: hda/conexant: add a new hda codec SN6180e9b488d60fmmc: mmc_spi: fix error handling in mmc_spi_probe()761db46b29mmc: sdio: fix possible resource leaks in some error paths98895c225eipv4: Fix incorrect route flushing when source address is deleted04a331c9ddRevert "ipv4: Fix incorrect route flushing when source address is deleted"85eda80883xfs: sync lazy sb accounting on quiesce of read-only mountsfb8ee907c1xfs: prevent UAF in xfs_log_item_in_current_chkpt7c07806ab0xfs: fix the forward progress assertion in xfs_iwalk_run_callbacks313699d505xfs: ensure inobt record walks always make forward progress7f9309a9f5xfs: fix missing CoW blocks writeback conversion retry6246b3a18fxfs: only relog deferred intent items if free space in the log gets low09d6181447xfs: expose the log push threshold5d711e4136xfs: periodically relog deferred intent items870e7d7108xfs: change the order in which child and parent defer ops are finishedf5af1d5c2dxfs: fix an incore inode UAF in xfs_bui_recoverefcdc2e70exfs: clean up xfs_bui_item_recover iget/trans_alloc/ilock orderingabad319deexfs: clean up bmap intent item recovery checking6601531db8xfs: xfs_defer_capture should absorb remaining transaction reservation411b14e68cxfs: xfs_defer_capture should absorb remaining block reservations3324249e6exfs: proper replay of deferred ops queued during log recovery1c89c04305xfs: fix finobt btree block recovery ordering6678b2787bxfs: log new intent items created as part of finishing recovered intent items562da8e704xfs: refactor xfs_defer_finish_noroll42a2406f90xfs: turn dfp_intent into a xfs_log_iteme11f1516fcxfs: merge the ->diff_items defer op into ->create_intente84096edf8xfs: merge the ->log_item defer op into ->create_intent64b21eaa33xfs: factor out a xfs_defer_create_intent helperd24633f3c2xfs: remove the xfs_inode_log_item_t typedefe0373eeaaaxfs: remove the xfs_efd_log_item_t typedef94e0639992xfs: remove the xfs_efi_log_item_t typedef83ef55c428netfilter: nft_tproxy: restrict to prerouting hookb6ac5e6be5btrfs: free device in btrfs_close_devices for a single device filesystem4326d0080faio: fix mremap after fork null-deref62b19b9f3anvme-fc: fix a missing queue put in nvmet_fc_ls_create_association16409f7d9cs390/decompressor: specify __decompress() buf len to avoid overflowfbe71c5dacnet: sched: sch: Bounds check priority09561d5e6anet: stmmac: do not stop RX_CLK in Rx LPI state for qcs404 SoCa74d3b0ea9net/rose: Fix to not accept on connected socketec54c946b4tools/virtio: fix the vringh test for virtio ring changes6644685f79ASoC: cs42l56: fix DT probed23b66b16eselftests/bpf: Verify copy_register_state() preserves parent/live fieldsa94695e0f9migrate: hugetlb: check for hugetlb shared PMD in node migrationbcd34f1eeabpf: Always return target ifindex in bpf_fib_lookup776f2ccfdcnvme-pci: Move enumeration by class to be last in the table5c86809882arm64: dts: meson-axg: Make mmc host controller interrupts level-sensitive4b97dab7cdarm64: dts: meson-g12-common: Make mmc host controller interrupts level-sensitivef0302e98edarm64: dts: meson-gx: Make mmc host controller interrupts level-sensitive1509e93916riscv: Fixup race condition on PG_dcache_clean in flush_icache_ptebb3187311eceph: flush cap releases when the session is flushed9b5d37d328usb: typec: altmodes/displayport: Fix probe pin assign checkd9758f7debusb: core: add quirk for Alcor Link AK9563 smartcard reader43379fcacenet: USB: Fix wrong-direction WARNING in plusb.c1bcb431237pinctrl: intel: Restore the pins that used to be in Direct IRQ mode2b763f7de1pinctrl: single: fix potential NULL dereferencecc1affa234pinctrl: aspeed: Fix confusing types in return valuef209431be1ALSA: pci: lx6464es: fix a debug loop1aab663ecbselftests: forwarding: lib: quote the sysctl valuesba38eacaderds: rds_rm_zerocopy_callback() use list_first_entry()87a5e3fc84ice: Do not use WQ_MEM_RECLAIM flag for workqueuef312958f58ionic: clean interrupt before enabling queue to avoid credit racea532f7ebf9net: phy: meson-gxl: use MMD access dummy stubs for GXL, internal PHY73b8e217febonding: fix error checking in bond_debug_reregister()c89ddf134cxfrm: fix bug with DSCP copy to v6 from v4 tunnel80282a3d10RDMA/usnic: use iommu_map_atomic() under spin_lock()fe4d708668iommu: Add gfp parameter to iommu_ops::map4a779187dbIB/IPoIB: Fix legacy IPoIB due to wrong number of queues7896accedfIB/hfi1: Restore allocated resources on failed copyoutae774f480dcan: j1939: do not wait 250 ms if the same addr was already claimed56ee31167ctracing: Fix poll() and select() do not work on per_cpu trace_pipe and trace_pipe_raw039f935ae0ALSA: emux: Avoid potential array out-of-bound in snd_emux_xg_control()7e43bb69bcbtrfs: zlib: zero-initialize zlib workspaceed29d8b309btrfs: limit device extents to the device size9f296c615eiio:adc:twl6030: Enable measurement of VAC9cf5e99c1awifi: brcmfmac: Check the count value of channel spec to prevent out-of-bounds readse5142a4935f2fs: fix to do sanity check on i_extra_isize in is_alive()3b3d3127f5fbdev: smscufx: fix error handling code in ufx_usb_probe8edda487f0powerpc/imc-pmu: Revert nest_init_lock to being a mutexfc8548c75cserial: 8250_dma: Fix DMA Rx rearm race71d6b277c4serial: 8250_dma: Fix DMA Rx completion raceec5b4ca3d3xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()5af2f74f90mm: swap: properly update readahead statistics in unuse_pte_range()ce62df33fcnvmem: core: fix cell removal on error1369322c1dSquashfs: fix handling and sanity checking of xattr_ids countd49c85a191mm/swapfile: add cond_resched() in get_swap_pages()c127bf9a95fpga: stratix10-soc: Fix return value check in s10_ops_write_init()6d86b4ceb0mm: hugetlb: proc: check for hugetlb shared PMD in /proc/PID/smaps845a3708f0riscv: disable generation of unwind tablesc89af52d91parisc: Wire up PTRACE_GETREGS/PTRACE_SETREGS for compat case8e6cc45ba8parisc: Fix return code of pdc_iodc_print()7f5df45fcbiio:adc:twl6030: Enable measurements of VUSB, VBAT and others4b82cc9f7fiio: adc: berlin2-adc: Add missing of_node_put() in error patha300e358c6iio: hid: fix the retval in accel_3d_capture_sample2035cfb958efi: Accept version 2 of memory attributes tablef6ea834e8dwatchdog: diag288_wdt: fix __diag288() inline assembly78e55b52b2watchdog: diag288_wdt: do not use stack buffers for hardware data4abcd352a0fbcon: Check font dimension limitse00d6a74c3Input: i8042 - add Clevo PCX0DX to i8042 quirk tablefaed5af8a9Input: i8042 - add TUXEDO devices to i8042 quirk tablesee77a19ee5Input: i8042 - merge quirk tablesa789c05516Input: i8042 - move __initconst to fix code styling warningd0332cbf53vc_screen: move load of struct vc_data pointer in vcs_read() to avoid UAF5bf0010b87usb: gadget: f_fs: Fix unbalanced spinlock in __ffs_ep0_queue_waitdb3798943ausb: dwc3: qcom: enable vbus override when in OTG dr-modefefffc7825usb: dwc3: dwc3-qcom: Fix typo in the dwc3 vbus override APIe4650c04deiio: adc: stm32-dfsdm: fill module aliases165511b99enet/x25: Fix to not accept on connected socketb05664e036i2c: rk3x: fix a bunch of kernel-doc warningsd4d765f476scsi: iscsi_tcp: Fix UAF during login when accessing the shost ipaddress6122ce1de1scsi: target: core: Fix warning on RT kernelsd92a25627befi: fix potential NULL deref in efi_mem_reserve_persistented6c5e8cafnet: openvswitch: fix flow memory leak in ovs_flow_cmd_new743f7b51fevirtio-net: Keep stop() to follow mirror sequence of open()aed972fbf6selftests: net: udpgso_bench_tx: Cater for pending datagrams zerocopy benchmarkingdf1213a267selftests: net: udpgso_bench: Fix racing bug between the rx/tx programs6c70ece3d3selftests: net: udpgso_bench_rx/tx: Stop when wrong CLI args are providedd47f886d0cselftests: net: udpgso_bench_rx: Fix 'used uninitialized' compiler warningdb3f016ad5ata: libata: Fix sata_down_spd_limit() when no link speed is reported6950df42a0can: j1939: fix errant WARN_ON_ONCE in j1939_session_deactivatecb079b0770net: phy: meson-gxl: Add generic dummy stubs for MMD register accessdb76fc535fsquashfs: harden sanity check in squashfs_read_xattr_id_tabledffe83a198netfilter: br_netfilter: disable sabotage_in hook after first suppression20355b9569netrom: Fix use-after-free caused by accept on already connected socket03eb2a1b03fix "direction" argument of iov_iter_kvec()34b0fab797fix iov_iter_bvec() "direction" argument50b70599c0WRITE is "data source", not destination...21081886descsi: Revert "scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT"14be8b0c4earm64: dts: imx8mm: Fix pad control for UART1_DTE_RXd6870f3800ALSA: hda/via: Avoid potential array out-of-bound in add_secret_dac_path()412fddc096ASoC: Intel: bytcr_rt5651: Drop reference count of ACPI device after use79dfde344ebus: sunxi-rsb: Fix error handling in sunxi_rsb_init()53785fd9b3firewire: fix memory leak for payload of request subaction to IEC 61883-1 FCP regione367c7b762Merge 5.4.231 into android11-5.4-lts59342376e8Linux 5.4.231268d595d4dRevert "xprtrdma: Fix regbuf data not freed in rpcrdma_req_create()"6c24a20223usb: host: xhci-plat: add wakeup entry at sysfs1c1291a84eBluetooth: fix null ptr deref on hci_sync_conn_complete_evtaf51fc23a0ipv6: ensure sane device mtu in tunnelsa7cc1b5d76exit: Use READ_ONCE() for all oops/warn limit readseb768617dadocs: Fix path paste-o for /sys/kernel/warn_count6f18d28c26panic: Expose "warn_count" to sysfs7c1273646fpanic: Introduce warn_limit51538bdde3panic: Consolidate open-coded panic_on_warn checks7020a9234eexit: Allow oops_limit to be disabled5a3482f2c1exit: Expose "oops_count" to sysfs28facdf7b0exit: Put an upper limit on how often we can oops3fa431bac2ia64: make IA64_MCA_RECOVERY bool instead of tristate86926761cacsky: Fix function name in csky_alignment() and die()3bf1fa2c7bh8300: Fix build errors from do_exit() to make_task_dead() transitionfcae924b94hexagon: Fix function name in die()49a128ae28objtool: Add a missing comma to avoid string concatenation9a18c9c833exit: Add and use make_task_dead.2f87e25512mm: kasan: do not panic if both panic_on_warn and kasan_multishot set119f6bcef7panic: unset panic_on_warn inside panic()f6c20ed17esysctl: add a new register_sysctl_init() interfacedbe634ce82dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init1986cd616bblk-cgroup: fix missing pd_online_fn() while activating policy4923160393bpf: Skip task with pid=1 in send_signal_common()bd393f0ad5ARM: dts: imx: Fix pca9547 i2c-mux node name8667280a67x86/asm: Fix an assembler warning with current binutils1a5119369aclk: Fix pointer casting to prevent oops in devm_clk_release()fbf7b0e4ceperf/x86/amd: fix potential integer overflow on shift of a intf571e34005netfilter: conntrack: unify established states for SCTP paths8770cd9d7cx86/i8259: Mark legacy PIC interrupts with IRQ_LEVEL4d1757f9feblock: fix and cleanup bio_check_ro3a10a4d5d0nfsd: Ensure knfsd shuts down when the "nfsd" pseudofs is unmounted5246266958Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode"f7a5644129net: mdio-mux-meson-g12a: force internal PHY off on mux switch2635c4fd91net: xgene: Move shared header file into include/linuxa70b966c6cnet/phy/mdio-i2c: Move header file to include/linux/mdioa9a022a0dbnet/tg3: resolve deadlock in tg3_reset_task() during EEH92a65b0f20thermal: intel: int340x: Add locking to int340x_thermal_get_trip_type()e249cea3abnet: ravb: Fix possible hang if RIS2_QFF1 happena7585028acsctp: fail if no bound addresses can be used for a given scopedae05cd371net/sched: sch_taprio: do not schedule in taprio_reset()fe9b9e621cnetrom: Fix use-after-free of a listening socket.67ac3b4cd5netfilter: conntrack: fix vtag checks for ABORT/SHUTDOWN_COMPLETE8f0eb24f1aipv4: prevent potential spectre v1 gadget in fib_metrics_match()746db9ec1eipv4: prevent potential spectre v1 gadget in ip_metrics_convert()4cde1d2f16netlink: annotate data races around sk_statec64bb85471netlink: annotate data races around dst_portid and dst_groupea11a52f55netlink: annotate data races around nlk->portidcfdd81ae47netfilter: nft_set_rbtree: skip elements in transaction from garbage collectionddd49cbbd4net: fix UaF in netns ops registration error path3e5082b1c6netlink: prevent potential spectre v1 gadgets66e10d5f39EDAC/qcom: Do not pass llcc_driv_data as edac_device_ctl_info's pvt_info594618c701EDAC/device: Respect any driver-supplied workqueue polling valuea536d87ec7ARM: 9280/1: mm: fix warning on phys_addr_t to void pointer assignment768e8cdf93thermal: intel: int340x: Protect trip temperature from concurrent updatesaa33d334bdKVM: x86/vmx: Do not skip segment attributes if unusable bit is set91be54849dcifs: Fix oops due to uncleared server->smbd_conn in reconnectbcb65adaa9ftrace/scripts: Update the instructions for ftrace-bisect.sh31b2414abetrace_events_hist: add check for return value of 'create_hist_field'76b2390fdctracing: Make sure trace_printk() can output as soon as it can be used4a4a22dda0module: Don't wait for GOING modules1cd70d8427scsi: hpsa: Fix allocation size for scsi_host_alloc()4d55f918e1Bluetooth: hci_sync: cancel cmd_timer if hci_open failede588a5872dRevert "Revert "xhci: Set HCD flag to defer primary roothub registration""8eb5a68064fs: reiserfs: remove useless new_opts in reiserfs_remounta61bc9197dnetfilter: conntrack: do not renew entry stuck in tcp SYN_SENT stated39117d779Revert "selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID"b4253b47bfmmc: sdhci-esdhc-imx: correct the tuning start tap and step setting14b70b4b4ammc: sdhci-esdhc-imx: disable the CMD CRC check for standard tuning7e66f28ce5mmc: sdhci-esdhc-imx: clear pending interrupt and halt cqhcia58c144b9elockref: stop doing cpu_relax in the cmpxchg loopd6ff82a4d7platform/x86: asus-nb-wmi: Add alternate mapping for KEY_SCREENLOCK295690bb05platform/x86: touchscreen_dmi: Add info for the CSL Panther Tab HD890d850cb2scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id45b3fc9cc6KVM: s390: interrupt: use READ_ONCE() before cmpxchg()dc0867c447spi: spidev: remove debug messages that access spidev->spi without locking0dfd34fb45ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets9e02118045ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC3163f4ed49cpufreq: armada-37xx: stop using 0 as NULL pointer1ec79234c2s390/debug: add _ASM_S390_ prefix to header guard1869922405drm: Add orientation quirk for Lenovo ideapad D330-10IGLaff2bc5784ASoC: fsl_micfil: Correct the number of steps on SX controls1c587aa6cdcpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist8cca0afccetcp: fix rate_app_limited to default to 111a4d51a4fnet: dsa: microchip: ksz9477: port map correction in ALU table entry register02a4a7dc90driver core: Fix test_async_probe_init saves device in wrong array276052159bw1: fix WARNING after calling w1_process()82867190cew1: fix deadloop in __w1_remove_master_device()c9ada35340tcp: avoid the lookup process failing to get sk in ehash tablee963b33723dmaengine: xilinx_dma: call of_node_put() when breaking out of for_each_child_of_node()9b4482267edmaengine: xilinx_dma: Fix devm_platform_ioremap_resource error handlingfe39e74a64dmaengine: xilinx_dma: use devm_platform_ioremap_resource()d3065cc562HID: betop: check shape of output reportsd16b83c804net: macb: fix PTP TX timestamp failure due to packet padding18dd3b30d4dmaengine: Fix double increment of client_count in dma_chan_get()cbed756bd1drm/panfrost: fix GENERIC_ATOMIC64 dependency914c58fec1net: mlx5: eliminate anonymous module_init & module_exit7335ba0c03usb: gadget: f_fs: Ensure ep0req is dequeued before free_requesta8d40942dfusb: gadget: f_fs: Prevent race during ffs_ep0_queue_waitedec50677bHID: revert CHERRY_MOUSE_000C quirkefa29f4ba0net: stmmac: fix invalid call to mdiobus_get_phy()8c3653c4e7HID: check empty report_list in bigben_probe()89e7fe3999HID: check empty report_list in hid_validate_values()8a7b9560a3net: mdio: validate parameter addr in mdiobus_get_phy()ce1e79bf31net: usb: sr9700: Handle negative len4fd6a6b101l2tp: Don't sleep and disable BH under writer-side sk_callback_lock7188c37f3cl2tp: Serialize access to sk_user_data with sk_callback_lock24c7614d31net: fix a concurrency bug in l2tp_tunnel_register()1200388a0bnet/sched: sch_taprio: fix possible use-after-free9042a9a3f2wifi: rndis_wlan: Prevent buffer overflow in rndis_query_oidde0e084f85gpio: mxc: Always set GPIOs used as interrupt source to INPUT mode8df414fce4net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regsa59cdbda37net: nfc: Fix use-after-free in local_cleanup()2a05d513d2phy: rockchip-inno-usb2: Fix missing clk_disable_unprepare() in rockchip_usb2phy_power_on()81b3374944bpf: Fix pointer-leak due to insufficient speculative store bypass mitigation8b35c7f692amd-xgbe: Delay AN timeout during KR trainingb85e0bb478amd-xgbe: TX Flow Ctrl Registers are h/w ver dependent3d41f4eeabaffs: initialize fsdata in affs_truncate()03965f8ad2IB/hfi1: Fix expected receive setup error exit issuesf5c918dc4eIB/hfi1: Reserve user expected TIDsd307c75f43IB/hfi1: Reject a zero-length user expected buffer902063a9feRDMA/core: Fix ib block iterator counter overflow048c17b619tomoyo: fix broken dependency on *.conf.default8d23f5d252EDAC/highbank: Fix memory leak in highbank_mc_probe()97445814efHID: intel_ish-hid: Add check for ishtp_dma_tx_map4be51ea91aARM: imx: add missing of_node_put()12a763015bARM: imx35: Retrieve the IIM base address from devicetree3b76bc1598ARM: imx31: Retrieve the IIM base address from devicetree61669e6decARM: imx27: Retrieve the SYSCTRL base address from devicetreed4e913bad2ARM: dts: imx6qdl-gw560x: Remove incorrect 'uart-has-rtscts'6d7f384268memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()8959188b2fmemory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe()310268050dclk: Provide new devm_clk helpers for prepared and enabled clocksc7ef7185a1clk: generalize devm_clk_get() a bit46d9b30a0cMerge changes into android11-5.4-ltscc162d31ceMerge branch 'android11-5.4' into android11-5.4-ltsbc37d9c8b3Merge 5.4.230 into android11-5.4-lts90245959a5Linux 5.4.23029487eed37mm/khugepaged: fix collapse_pte_mapped_thp() to allow anon_vma7242fc8c2fx86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN2b1375fac0drm/amd/display: Fix COLOR_SPACE_YCBCR2020_TYPE matrix763a74e1dedrm/amd/display: Fix set scaling doesn's work39e0844a1edrm/i915: re-disable RC6p on Sandy Bridgeffef77794fgsmi: fix null-deref in gsmi_get_variableb4461af0a5serial: atmel: fix incorrect baudrate setup55f9aca283dmaengine: tegra210-adma: fix global intr clear5d99369685serial: pch_uart: Pass correct sg to dma_unmap_sg()97697a252bdt-bindings: phy: g12a-usb3-pcie-phy: fix compatible string documentationaa1b22daa0usb-storage: apply IGNORE_UAS only for HIKSEMI MD202 on RTL9210a21da7f7aausb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate()83b0aac55dusb: gadget: g_webcam: Send color matching descriptor per frame004fbb049busb: typec: altmodes/displayport: Fix pin assignment calculationa1478ef59busb: typec: altmodes/displayport: Add pin assignment helper040e0d1281usb: host: ehci-fsl: Fix module alias8d5740ad8fUSB: serial: cp210x: add SCALANCE LPE-9000 device id9a39f4626bUSB: gadgetfs: Fix race between mounting and unmounting1bc1fdd73fcifs: do not include page data when checking signature89ac597e3ebtrfs: fix race between quota rescan and disable leading to NULL pointer deref61cad0c61cmmc: sunxi-mmc: Fix clock refcount imbalance during unbind4f96ae71d3comedi: adv_pci1760: Fix PWM instruction handlingf11a689164usb: core: hub: disable autosuspend for TI TUSB8041556dfdb226misc: fastrpc: Fix use-after-free race condition for maps4b5c44e924misc: fastrpc: Don't remove map on creater_process and device_release04eb41ec96USB: misc: iowarrior: fix up header size for USB_DEVICE_ID_CODEMERCS_IOW1007ebb3ecab1USB: serial: option: add Quectel EM05CN modem32165699a0USB: serial: option: add Quectel EM05CN (SG) modem81affe3b46USB: serial: option: add Quectel EC200U modema7c19d94b8USB: serial: option: add Quectel EM05-G (RS) modem5966eda550USB: serial: option: add Quectel EM05-G (CS) modemeece7a6c97USB: serial: option: add Quectel EM05-G (GR) modem96b02125ddprlimit: do_prlimit needs to have a speculation checkafcb4e0ab8xhci: Detect lpm incapable xHC USB3 roothub ports from ACPI tables84e2e57769usb: acpi: add helper to check port lpm capability using acpi _DSM8a6e963bf2xhci: Add a flag to disable USB3 lpm on a xhci root port level.cf6e5d3c2dxhci: Add update_hub_device override for PCI xHCI hosts133b902378xhci: Fix null pointer dereference when host dies9891e5c73cusb: xhci: Check endpoint is valid before dereferencing it643f7da782xhci-pci: set the dma max_seg_size890792b579ALSA: hda/realtek - Turn on power earlye60730280bdrm/i915/gt: Reset twice2e3e2649eaefi: fix userspace infinite retry read efivars after EFI runtime services page faultb0ba060d32nilfs2: fix general protection fault in nilfs_btree_insert()53dd833fd0Add exception protection processing for vd in axi_chan_handle_err function33a4d05138wifi: brcmfmac: fix regression for Broadcom PCIe wifi devices557e85ff9af2fs: let's avoid panic if extent_tree is not created7165dd4c3bRDMA/srp: Move large values to a new enum for gcc1319304ffb7bnet/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats4de1a5af1bselftests/bpf: check null propagation only neither reg is PTR_TO_BTF_IDa869f7b054pNFS/filelayout: Fix coalescing test for single DS931c2a07ffRevert "net: add atomic_long_t to net_device_stats fields"b1330360dbRevert "PM/devfreq: governor: Add a private governor_data for governor"68fdd20442Merge 5.4.229 into android11-5.4-lts1349fe3a33Linux 5.4.22968a37dc77etipc: call tipc_lxc_xmit without holding node_read_lock1140c3f7adocfs2: fix freeing uninitialized resource on ocfs2_dlm_shutdown2db88851fatipc: Add a missing case of TIPC_DIRECT_MSG type38b5d7054dtty: serial: tegra: Handle RX transfer in PIO mode if DMA wasn't started3188f80b80tipc: fix use-after-free in tipc_disc_rcv()3eeb06132dRevert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout"ecd47ffc99mm: Always release pages to the buddy allocator in memblock_free_late().5fcf75a8a4efi: fix NULL-deref in init error pathb30e5dd077arm64: cmpxchg_double*: hazard against entire exchange variableecdd65051barm64: atomics: remove LL/SC trampolinesf840000928arm64: atomics: format whitespace consistentlyd01d6d2b06drm/virtio: Fix GEM handle creation UAF3030f11f27x86/resctrl: Fix task CLOSID/RMID update race22c4eeafc3x86/resctrl: Use task_curr() instead of task_struct->on_cpu to prevent unnecessary IPIb3f9242467iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe()ecfe33e075iommu/mediatek-v1: Add error handle for mtk_iommu_probeec049ae2b4net/mlx5: Fix ptp max frequency adjustment range62d707dabbnet/mlx5: Rename ptp clock info2b157c3c5dnet/sched: act_mpls: Fix warning during failed attribute validation9424d2205fnfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame()576eadef2chvc/xen: lock console list traversal7d04fe153dtipc: fix unexpected link reset due to discovery messages95b2d4889ftipc: eliminate checking netns if node establishedd6418829cetipc: improve throughput between nodes in netnsd443308edbregulator: da9211: Use irq handler when ready43f48e6c30EDAC/device: Fix period calculation in edac_device_reset_delay_period()a5b737623ex86/boot: Avoid using Intel mnemonics in AT&T syntax asmd0c6d2a310powerpc/imc-pmu: Fix use of mutex in IRQs disabled sectionfeefb33eefnetfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function.e431b4fb1fext4: fix uninititialized value in 'ext4_evict_inode'026a4490b5ext4: fix use-after-free in ext4_orphan_cleanupfa41a133eaext4: lost matching-pair of trace in ext4_truncate1d5524832fext4: fix bug_on in __es_tree_search caused by bad quota inode3da22d06e0quota: Factor out setup of quota inodeecb9d0d2e1jbd2: use the correct print format06bb3f4e3busb: ulpi: defer ulpi_register on ulpi_read_id timeouta2689a4464wifi: wilc1000: sdio: fix module autoloading3998dba0f7ipv6: raw: Deduct extension header length in rawv6_push_pending_frames53cefa802fixgbe: fix pci device refcount leake0d6f3b62bplatform/x86: sony-laptop: Don't turn off 0x153 keyboard backlight during probe1ad759df6adrm/msm/adreno: Make adreno quirks not overwrite each other098416c4e3cifs: Fix uninitialized memory read for smb311 posix symlink created6546426cdALSA: hda/hdmi: Add a HP device 0x8715 to force connect listeaa5580a74ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAFc6d29a5ffdnet/ulp: prevent ULP without clone op from entering the LISTEN statusb318d41f1bs390/percpu: add READ_ONCE() to arch_this_cpu_to_op_simple()f6da927c92s390/kexec: fix ipl report address for kdump4bf6e11c34perf auxtrace: Fix address filter duplicate symbol selection2e4164d3d1docs: Fix the docs build with Sphinx 6.03ed183074cefi: tpm: Avoid READ_ONCE() for accessing the event log3ad31129ceKVM: arm64: Fix S1PTW handling on RO memslots9b83ec63d0net: sched: disallow noqueue for qdisc classesaa52acefc6driver core: Fix bus_type.match() error handling in __driver_attach()8d60a90560selftests: set the BUILD variable to absolute pathcad6d2bb47selftests: Fix kselftest O=objdir build from cluttering top level objdir320dbbd86fparisc: Align parisc MADV_XXX constants with all other architecturesd868597b71mbcache: Avoid nesting of cache->c_list_lock under bit locksda23752d96hfs/hfsplus: avoid WARN_ON() for sanity check, use proper error handling781fa14141hfs/hfsplus: use WARN_ON for sanity checkb47c690109ext4: don't allow journal inode to have encrypt flag1464feb5b6riscv: uaccess: fix type of 0 variable on error in get_user()da41069c61nfsd: fix handling of readdir in v4root vs. mount upcall timeout8cbd7f2643x86/bugs: Flush IBP in ib_prctl_set()ba780bff9fASoC: Intel: bytcr_rt5640: Add quirk for the Advantech MICA-071 tablete66ae100e7udf: Fix extension of the last extent in the file33df9c5d5ecaif: fix memory leak in cfctrl_linkup_request()3cb1ee82e4drm/i915: unpin on error in intel_vgpu_shadow_mm_pin()ebe6d2fcf7usb: rndis_host: Secure rndis_query check against int overflowa07b4895b9drivers/net/bonding/bond_3ad: return when there's no aggregator2f7a09c1eeperf tools: Fix resources leak in perf_data__open_dir()6b17b84634net: sched: cbq: dont intepret cls results when asked to drop63e469cb54net: sched: atm: dont intepret cls results when asked to dropd16e5fefd8RDMA/mlx5: Fix validation of max_rd_atomic caps for DC564fdc2f8bRDMA/uverbs: Silence shiftTooManyBitsSigned warning00616bd191net: phy: xgmiitorgmii: Fix refcount leak in xgmiitorgmii_probe904ad95b39net: amd-xgbe: add missed tasklet_killa15cbe9b84vhost: fix range used in translate_desc()d8e410315anfc: Fix potential resource leaks8f97eeb02aqlcnic: prevent ->dcb use-after-free on qlcnic_dcb_enable() failure55ac68b53fnet: sched: fix memory leak in tcindex_set_parmsb6a0623f75net: hns3: add interrupts re-initialization while doing VF FLRf9c551d874nfsd: shut down the NFSv4 state objects before the filecache7eaaee5268bpf: pull before calling skb_postpull_rcsum()1d449cd240SUNRPC: ensure the matching upcall is in-flight upon downcallaf53065276ext4: fix deadlock due to mbcache entry corruption711ef736ddmbcache: automatically delete entries from cache on freeingaf8ecc8d20ext4: fix race when reusing xattr blocksea4b9091aaext4: unindent codeblock in ext4_xattr_block_set()a5f9bd4beaext4: remove EA inode entry from mbcache on inode eviction951ea4d3dfmbcache: add functions to delete entry if unused81b0bb1eb2mbcache: don't reclaim used entriesc2f1e12b65ext4: use kmemdup() to replace kmalloc + memcpy6453836e37fs: ext4: initialize fsdata in pagecache_write()1af609646cext4: use memcpy_to_page() in pagecache_write()49dac5e017mm/highmem: Lift memcpy_[to|from]_page to coref44dcd9dceext4: correct inconsistent error msg in nojournal modeb02aa6a05aext4: goto right label 'failed_mount3a'e0fce1d665ravb: Fix "failed to switch device to config mode" message during unbind0ebcfdc8c9KVM: nVMX: Properly expose ENABLE_USR_WAIT_PAUSE control to L1e723bafd8fKVM: VMX: Fix the spelling of CPU_BASED_USE_TSC_OFFSETTING7290669045KVM: VMX: Rename NMI_PENDING to NMI_WINDOWda8ff59210KVM: VMX: Rename INTERRUPT_PENDING to INTERRUPT_WINDOWdb99c8d6b7KVM: retpolines: x86: eliminate retpoline from vmx.c exit handlers2c82f134b9KVM: x86: optimize more exit handlers in vmx.c6e3f6d9562perf probe: Fix to get the DW_AT_decl_file and DW_AT_call_file as unsinged datafc67c00defperf probe: Use dwarf_attr_integrate as generic DWARF attr accessord06a7e2049dm thin: resume even if in FAIL mode28cdd90c26media: s5p-mfc: Fix in register read and write for H264640075400cmedia: s5p-mfc: Clear workbit to handle error condition4a52a1a3eamedia: s5p-mfc: Fix to handle reference queue during finishingb9275d8a92PM/devfreq: governor: Add a private governor_data for governor839f3ca8bcbtrfs: replace strncpy() with strscpy()b5db135457ext4: allocate extended attribute value in vmalloc area6ef8b0a743ext4: avoid unaccounted block allocation when expanding inodeb14a553b0fext4: initialize quota before expanding inode in setproject ioctl9ef603086cext4: fix inode leak in ext4_xattr_inode_create() on an error path7138ef745eext4: avoid BUG_ON when creating xattrs4d84ec8e5cext4: fix error code return to user-space in ext4_get_branch()a4c3c1d57dext4: fix corruption when online resizing a 1K bigalloc fs6f4200ec76ext4: fix delayed allocation bug in ext4_clu_mapped for bigalloc + inlinef263e349baext4: init quota for 'old.inode' in 'ext4_rename'78e335fb57ext4: fix bug_on in __es_tree_search caused by bad boot loader inode362ce137d5ext4: fix reserved cluster accounting in __es_remove_extent()e1d946d9c8ext4: add helper to check quota inums2142dfa1deext4: add EXT4_IGET_BAD flag to prevent unexpected bad inode4690a4bdcfext4: fix undefined behavior in bit shift for ext4_check_flag_valuese347c269b5ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop94b283341fdrm/vmwgfx: Validate the box size for the snooped cursoreea62f0461drm/connector: send hotplug uevent on connector cleanupfbfd6dee52device_cgroup: Roll back to original exceptions after copy failure5e4500454dparisc: led: Fix potential null-ptr-deref in start_task()662dc7c6beiommu/amd: Fix ivrs_acpihid cmdline parsing code93e919d9accrypto: n2 - add missing hash statesizea5866d531bPCI/sysfs: Fix double free in error path65bd096299PCI: Fix pci_device_is_present() for VFs by checking PFd23006f2a5ipmi: fix use after free in _ipmi_destroy_user()cf19abbe4bima: Fix a potential NULL pointer access in ima_restore_measurement_listb163363535mtd: spi-nor: Check for zero erase size in spi_nor_find_best_erase_type()74531c23adipmi: fix long wait in unload when IPMI disconnectd4f48c648aefi: Add iMac Pro 2017 to uefi skip cert quirk2c4832a089md/bitmap: Fix bitmap chunk size overflow issuesb869cb7a3dcifs: fix missing display of three mount options149babe5e0cifs: fix confusing debug messagea29d621309media: dvb-core: Fix UAF due to refcount races at releasingb21f62b49emedia: dvb-core: Fix double free in dvb_register_device()50c2379f87ARM: 9256/1: NWFPE: avoid compiler-generated __aeabi_uldivmodc42cb66a89tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_linecb03fc217btracing/hist: Fix wrong return value in parse_action_params()f5489d5a24x86/microcode/intel: Do not retry microcode reloading on the APscf79d5410atracing/hist: Fix out-of-bound write on 'action_data.var_ref_idx'1a5165e80adm cache: set needs_check flag after aborting metadata2f097dfac7dm cache: Fix UAF in destroy()520b56cfd9dm clone: Fix UAF in clone_dtr()792e51aac3dm integrity: Fix UAF in dm_integrity_dtr()7ae6aa6493dm thin: Fix UAF in run_timer_softirq()f758987ff0dm thin: Use last transaction's pmd->root when commit failed200aa33b5ddm thin: Fix ABBA deadlock between shrink_slab and dm_pool_abort_metadataf472bfc95ddm cache: Fix ABBA deadlock between shrink_slab and dm_cache_metadata_abort52ba5b87a3binfmt: Fix error return code in load_elf_fdpic_binary()33933af45dbinfmt: Move install_exec_creds after setup_new_exec to match binfmt_elf3cdd91a916cpufreq: Init completion before kobject_init_and_add()6ccb116e6bselftests: Use optional USERCFLAGS and USERLDFLAGS2b8f2e127darm64: dts: qcom: sdm850-lenovo-yoga-c630: correct I2C12 pins drive strengthb22d683c90ARM: ux500: do not directly dereference __iomemc59ee1528bbtrfs: fix resolving backrefs for inline extent followed by prealloce63e1c6793mmc: sdhci-sprd: Disable CLK_AUTO when the clock is less than 400K3de2c36283ktest.pl minconfig: Unset configs instead of just removing themd10523afa8kest.pl: Fix grub2 menu handling for rebootingd089baa5b6soc: qcom: Select REMAP_MMIO for LLCC driverbcce46e115media: stv0288: use explicitly signed charde2ea2a0adnet/af_packet: make sure to pull mac headerad3f90a9c4net/af_packet: add VLAN support for AF_PACKET SOCK_RAW GSOaa91afe597SUNRPC: Don't leak netobj memory when gss_read_proxy_verf() failse027f3b9fatpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak927860dfa1tpm: tpm_crb: Add the missed acpi_put_table() to fix memory leakf1c08947abmmc: vub300: fix warning - do not call blocking ops when !TASK_RUNNINGf4b5a27f56f2fs: should put a page when checking the summary infof02d2e2b9bmm, compaction: fix fast_isolate_around() to stay within boundaries384ef33d37md: fix a crash in mempool_free2dae4211b5pnode: terminate at peers of source25e8c6ecb4ALSA: line6: fix stack overflow in line6_midi_transmit10a07d81f6ALSA: line6: correct midi status byte when receiving data from podxt0e727c328eovl: Use ovl mounter's fsuid and fsgid in ovl_link()cae6dddef2hfsplus: fix bug causing custom uid and gid being unable to be assigned with mountfe83242eabHID: plantronics: Additional PIDs for double volume key presses quirkb201fe49eeHID: multitouch: fix Asus ExpertBook P2 P2451FA trackpoint515959eb49powerpc/rtas: avoid scheduling in rtas_os_term()c2fa91abf2powerpc/rtas: avoid device tree lookups in rtas_os_term()418ef921ccobjtool: Fix SEGFAULT28046827c3nvme: fix the NVME_CMD_EFFECTS_CSE_MASK definition24561f5d09nvme: resync include/linux/nvme.h with nvmeclie69e8d7867ata: ahci: Fix PCS quirk application for suspende74d9f13a4nvme-pci: fix doorbell buffer value endiannesse8e2861cc3cifs: fix oops during encryption3c3baa40dcmedia: dvbdev: fix refcnt bug334a76861bmedia: dvbdev: fix build warning due to comments2a0e42877dgcov: add support for checksum field328f3c084fregulator: core: fix deadlock on regulator enablefb0407d8cdiio: adc128s052: add proper .data members in adc128_of_match tablebcb052a87diio: adc: ad_sigma_delta: do not use internal iio_dev lockad4eb32cedreiserfs: Add missing calls to reiserfs_security_free()5a5ef1882fHID: wacom: Ensure bootloader PID is usable in hidraw mode9e8f60094eusb: dwc3: core: defer probe on ulpi_read_id timeout7778fa1ca8ALSA: hda/hdmi: Add HP Device 0x8711 to force connect list12622fa053ALSA: hda/realtek: Add quirk for Lenovo TianYi510Pro-14IOBfad324bc07pstore: Make sure CONFIG_PSTORE_PMSG selects CONFIG_RT_MUTEXESe56423bb8epstore: Switch pmsg_lock to an rt_mutex to avoid priority inversione8a1ccd120ASoC: rt5670: Remove unbalanced pm_runtime_put()737058bd0bASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume()d456c253f3ASoC: wm8994: Fix potential deadlock2705bb1661ASoC: rockchip: pdm: Add missing clk_disable_unprepare() in rockchip_pdm_runtime_resume()ed1376f771ASoC: audio-graph-card: fix refcount leak of cpu_ep in __graph_for_each_link()df9cd38c3bASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe()56f630a0d5ASoC: Intel: Skylake: Fix driver hang during shutdownfd0d3bf37dALSA: hda: add snd_hdac_stop_streams() helperd5952155d6ALSA/ASoC: hda: move/rename snd_hdac_ext_stop_streams to hdac_stream.cbdc2d33fa2orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()2e7c091210orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string()511b48ee8edrm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid()6c00350c9fdrm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid()fa71639873hugetlbfs: fix null-ptr-deref in hugetlbfs_parse_param()713ad301c2clk: st: Fix memory leak in st_of_quadfs_setup()0ca298d548media: si470x: Fix use-after-free in si470x_int_in_callback()21d26381e1mmc: f-sdh30: Add quirks for broken timeout clock capability5bfc53df28regulator: core: fix use_count leakage when handling boot-on87fd18016ablk-mq: fix possible memleak when register 'hctx' failed17217737c1media: dvb-usb: fix memory leak in dvb_usb_adapter_init()6d18b44bb4media: dvbdev: adopts refcnt to avoid UAF438a4a8decmedia: dvb-frontends: fix leak of memory fw89357aa97bbpf: Prevent decl_tag from being referenced in func_proto arg7da524781cppp: associate skb with a device at txaadb1507a7mrp: introduce active flags to prevent UAF when applicant uninit4bdcc6a5aanet: add atomic_long_t to net_device_stats fields19d5a0e17amd/raid1: stop mdx_raid1 thread when raid1 array run failed5d8d046f3ddrivers/md/md-bitmap: check the return value of md_bitmap_get_counter()2b1b145ca1drm/sti: Use drm_mode_copy()272d12b5f3drm/rockchip: Use drm_mode_copy()20022d551fs390/lcs: Fix return type of lcs_start_xmit()4bee3c75d5s390/netiucv: Fix return type of netiucv_tx()e859e02fbfs390/ctcm: Fix return type of ctc{mp,}m_tx()f96bd8adc8igb: Do not free q_vector unless new one was allocated5b06a8a25ewifi: brcmfmac: Fix potential shift-out-of-bounds in brcmf_fw_alloc_request()e390838eefhamradio: baycom_epp: Fix return type of baycom_send_packet()dbe1a6b930net: ethernet: ti: Fix return type of netcp_ndo_start_xmit()772431f30cbpf: make sure skb->len != 0 when redirecting to a tunneling device9066300fe8ipmi: fix memleak when unload ipmi driver8234c522efASoC: codecs: rt298: Add quirk for KBL-R RVP platform7360b323e0wifi: ar5523: Fix use-after-free on ar5523_cmd() timed outca57748593wifi: ath9k: verify the expected usb_endpoints are present3cc9299036brcmfmac: return error when getting invalid max_flowrings from donglee44bfef5bfdrm/etnaviv: add missing quirks for GC30090103ccb6ehfs: fix OOB Read in __hfs_brec_finda815a3e019acct: fix potential integer overflow in encode_comp_t()d706485dffnilfs2: fix shift-out-of-bounds/overflow in nilfs_sb2_bad_offset()9ef353c92fACPICA: Fix error code path in acpi_ds_call_control_method()50163a1158fs: jfs: fix shift-out-of-bounds in dbDiscardAG156d440deaudf: Avoid double brelse() in udf_rename()359616ce58fs: jfs: fix shift-out-of-bounds in dbAllocAG419b808504binfmt_misc: fix shift-out-of-bounds in check_special_flags3d92527a91rcu: Fix __this_cpu_read() lockdep warning in rcu_force_quiescent_state()4f1d37ff42net: stream: purge sk_error_queue in sk_stream_kill_queues()fbae0dc7e2myri10ge: Fix an error handling path in myri10ge_probe()67af8655c8rxrpc: Fix missing unlock in rxrpc_do_sendmsg()93e794d4fenet_sched: reject TCF_EM_SIMPLE case for complex ematch moduleb3a5c76f61mailbox: zynq-ipi: fix error handling while device_register() fails668dc454bcskbuff: Account for tail adjustment during pull operations8b74211bf6openvswitch: Fix flow lookup to use unmasked key0e91836628rtc: mxc_v2: Add missing clk_disable_unprepare()b0a6135902r6040: Fix kmemleak in probe and remove8bddef54cbnfc: pn533: Clear nfc_target before being useddb77d4d005mISDN: hfcmulti: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave()82ff73638cmISDN: hfcpci: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave()5a35d18e79mISDN: hfcsusb: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave()fddac3b457nfsd: under NFSv4.1, fix double svc_xprt_put on rpc_create failuref06d3feee9NFSD: Add tracepoints to NFSD's duplicate reply cachefe142d5ceenfsd: Define the file access mode enum for tracingaa5fafd4a6rtc: pic32: Move devm_rtc_allocate_device earlier in pic32_rtc_probe()686f0793f7rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe()1240ed71a0remoteproc: qcom_q6v5_pas: Fix missing of_node_put() in adsp_alloc_memory_region()27441fab26remoteproc: sysmon: fix memory leak in qcom_add_sysmon_subdev()292c0f3b4apwm: sifive: Call pwm_sifive_update_clock() while mutex is held2b7ad43574selftests/powerpc: Fix resource leaks39633b4051powerpc/hv-gpci: Fix hv_gpci event listaed862896dpowerpc/83xx/mpc832x_rdb: call platform_device_put() in error case in of_fsl_spi_probe()d539b77baepowerpc/perf: callchain validate kernel stack pointer boundscfb5bbfcb6powerpc/xive: add missing iounmap() in error path in xive_spapr_populate_irq_data()f2d60f6ba1cxl: Fix refcount leak in cxl_calc_capp_routing9bf842ffddpowerpc/52xx: Fix a resource leak in an error handling pathb703da16dcmacintosh/macio-adb: check the return value of ioremap()b29a2f1dd3macintosh: fix possible memory leak in macio_add_one_device()17fd440594iommu/fsl_pamu: Fix resource leak in fsl_pamu_probe()8581ec1febiommu/amd: Fix pci device refcount leak in ppr_notifier()0d96a6f5dbrtc: pcf85063: Fix reading alarmbb1bdc72ddrtc: snvs: Allow a time difference on clock register read6a54d03337include/uapi/linux/swab: Fix potentially missing __always_inlinef170d4bd38RDMA/siw: Fix pointer cast warning8ea68b4e3fpower: supply: fix null pointer dereferencing in power_supply_get_battery_info61e80e7929HSI: omap_ssi_core: Fix error handling in ssi_init()7ae85631aeperf symbol: correction while adjusting symbol739b4294f8perf trace: Handle failure when trace point folder is missed1b4053ad54perf trace: Use macro RAW_SYSCALL_ARGS_NUM to replace number443aaf605fperf trace: Add a strtoul() method to 'struct syscall_arg_fmt'339e08e185perf trace: Allow associating scnprintf routines with well known arg names97cc27a28dperf trace: Add the syscall_arg_fmt pointer to syscall_arga2fcb44f5eperf trace: Factor out the initialization of syscal_arg_fmt->scnprintfba67de37adperf trace: Separate 'struct syscall_fmt' definition from syscall_fmts variable6086919d8cperf trace: Return error if a system call doesn't existf84fff700dpower: supply: fix residue sysfs file in error handle route of __power_supply_register()ef87ed9addHSI: omap_ssi_core: fix possible memory leak in ssi_probe()e9a32f7523HSI: omap_ssi_core: fix unbalanced pm_runtime_disable()0f049375adfbdev: uvesafb: Fixes an error handling path in uvesafb_probe()3c9aaa58f7fbdev: vermilion: decrease reference count in error path9413f188effbdev: via: Fix error in via_core_init()65dbd8eefafbdev: pm2fb: fix missing pci_disable_device()77738055e2fbdev: ssd1307fb: Drop optional dependency72c8770e35samples: vfio-mdev: Fix missing pci_disable_device() in mdpy_fb_probe()19b651db94tracing/hist: Fix issue of losting command info in error_logfab2536ba1usb: storage: Add check for kcalloccdcbae2c50i2c: ismt: Fix an out-of-bounds bug in ismt_access()f3f65c4177vme: Fix error not catched in fake_init()e5c97a433cstaging: rtl8192e: Fix potential use-after-free in rtllib_rx_Monitor()288ada16a9staging: rtl8192u: Fix use after free in ieee80211_rx()c226717aa8i2c: pxa-pci: fix missing pci_disable_device() on error in ce4100_i2c_probed85b5247a7chardev: fix error handling in cdev_device_add()110dc34c9fmcb: mcb-parse: fix error handing in chameleon_parse_gdd()68e54d9ee8drivers: mcb: fix resource leak in mcb_probe()80dc47e751usb: gadget: f_hid: fix refcount leak on error pathc78c87c4e3usb: gadget: f_hid: fix f_hidg lifetime vs cdevefa2ed93e5usb: gadget: f_hid: optional SETUP/SET_REPORT mode5e193764c2usb: roles: fix of node refcount leak in usb_role_switch_is_parent()76740fd8c6counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update361412dae1cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter()60b2ed21a6cxl: fix possible null-ptr-deref in cxl_guest_init_afu|adapter()0078dd8758misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_osee2715faf7misc: tifm: fix possible memory leak in tifm_7xx1_switch_media()0cd0506237misc: ocxl: fix possible name leak in ocxl_file_register_afu()628de998a3test_firmware: fix memory leak in test_firmware_init()98c01a728bserial: sunsab: Fix error handling in sunsab_init()61f4146a7eserial: altera_uart: fix locking in polling modece40c44e62tty: serial: altera_uart_{r,t}x_chars() need only uart_port071bb9e363tty: serial: clean up stop-tx part in altera_uart_tx_chars()d165388227serial: pch: Fix PCI device refcount leak in pch_request_dma()06c886548cserial: pl011: Do not clear RX FIFO & RX interrupt in unthrottle.965f07ea5fserial: amba-pl011: avoid SBSA UART accessing DMACR register4f257e2ebausb: typec: tcpci: fix of node refcount leak in tcpci_register_port()af4049a2ffusb: typec: Check for ops->exit instead of ops->enter in altmode_exita45ba33d39staging: vme_user: Fix possible UAF in tsi148_dma_list_add90e227d8b4usb: fotg210-udc: Fix ages old endianness issues12d20ba3ceuio: uio_dmem_genirq: Fix deadlock between irq config and handlingeca77a25a7uio: uio_dmem_genirq: Fix missing unlock in irq configurationc2163ecc48vfio: platform: Do not pass return buffer to ACPI _RST method3e0efc3f3fclass: fix possible memory leak in __class_register()0c44f584e3serial: tegra: Read DMA status before terminatingdcb26ea75dtty: serial: tegra: Activate RX DMA transfer by requestda64e01da4drivers: dio: fix possible memory leak in dio_init()d4bf3fcccdIB/IPoIB: Fix queue count inconsistency for PKEY child interfaces5cc818ad53hwrng: geode - Fix PCI device refcount leak1199f8e029hwrng: amd - Fix PCI device refcount leakc75ea343e4crypto: img-hash - Fix variable dereferenced before check 'hdev->req'76a9a58a71orangefs: Fix sysfs not cleanup when dev init failed5a2028369dRDMA/hfi1: Fix error return code in parse_platform_config()7917484c99crypto: omap-sham - Use pm_runtime_resume_and_get() in omap_sham_probe()c21a09ed1ef2fs: avoid victim selection from previous victim section91f63dd622RDMA/nldev: Add checks for nla_nest_start() in fill_stat_counter_qps()6866154c23scsi: snic: Fix possible UAF in snic_tgt_create()be5f1a82adscsi: fcoe: Fix transport not deattached when fcoe_if_init() failseccbec017cscsi: ipr: Fix WARNING in ipr_init()c9f83544fbscsi: fcoe: Fix possible name leak when device_register() fails3c4bb9446dscsi: hpsa: Fix possible memory leak in hpsa_add_sas_device()6fac40d806scsi: hpsa: Fix error handling in hpsa_add_sas_host()d60000cb11scsi: mpt3sas: Fix possible resource leaks in mpt3sas_transport_port_add()89e3f7324acrypto: tcrypt - Fix multibuffer skcipher speed test mem leakf8fc2f1865scsi: hpsa: Fix possible memory leak in hpsa_init_one()bd7106a600RDMA/rxe: Fix NULL-ptr-deref in rxe_qp_do_cleanup() when socket create faileda36c929fd7crypto: ccree - Make cc_debugfs_global_fini() available for module init function895bbed5aeRDMA/hfi: Decrease PCI device reference count in error path7e68c0d095PCI: Check for alloc failure in pci_request_irq()a234815ceecrypto: ccree - Remove debugfs when platform_driver_register failedca438aa466crypto: ccree - swap SHA384 and SHA512 larval hashes at build time263d21afbascsi: scsi_debug: Fix a warning in resp_write_scat()b5848661f1RDMA/siw: Set defined status for work completion with undefined statusad1676587cRDMA/nldev: Return "-EAGAIN" if the cm_id isn't from expected port6af043089dRDMA/siw: Fix immediate work request flush to completion queueef6079d98ff2fs: fix normal discard process7826e4c85eRDMA/core: Fix order of nldev_exit call3339d808b6apparmor: Use pointer to struct aa_label for lbs_credf7368ac846apparmor: Fix abi check to include v8 abie1a68ac015apparmor: fix lockdep warning when removing a namespaceeb0f78e28capparmor: fix a memleak in multi_transaction_new()df121012e4stmmac: fix potential division by 0203d604bd5Bluetooth: RFCOMM: don't call kfree_skb() under spin_lock_irqsave()5e832e0182Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave()8ae86c1ec2Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave()f360585691Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave()78e76830c7Bluetooth: hci_ll: don't call kfree_skb() under spin_lock_irqsave()b38b064cbaBluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave()f6d822ce4bBluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave()a6b9e09403ntb_netdev: Use dev_kfree_skb_any() in interrupt context3f2946a54bnet: lan9303: Fix read error execution path7d67e8ccfccan: tcan4x5x: Remove invalid write in clear_interrupts068672e75bnet: amd-xgbe: Check only the minimum speed for active/passive cables291b9669f6net: amd-xgbe: Fix logic around active and passive cablesbc06c239d5net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave()1e39d57a0ehamradio: don't call dev_kfree_skb() under spin_lock_irqsave()20dd873605net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave()3b748ba07bnet: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave()4b8256d9bfnet: apple: bmac: don't call dev_kfree_skb() under spin_lock_irqsave()bc51a3cadfnet: apple: mace: don't call dev_kfree_skb() under spin_lock_irqsave()303000c793net/tunnel: wait until all sk_user_data reader finish before releasing the sock0c5f2c7700net: farsync: Fix kmemleak when rmmods farsynccf7416aa01ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave()9ec5781879of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop()a44490abafdrivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init()429370c40dnet: stmmac: selftests: fix potential memleak in stmmac_test_arpoffload()bba527e4ecnet: defxx: Fix missing err handling in dfx_init()f54731a70cnet: vmw_vsock: vmci: Check memcpy_from_msg()6f2198914fclk: socfpga: Fix memory leak in socfpga_gate_init()dbd1a4fdf5clk: socfpga: use clk_hw_register for a5/c549513eabdaclk: socfpga: clk-pll: Remove unused variable 'rc'fe783eeac4blktrace: Fix output non-blktrace event when blk_classic option enabledd628d5c5b4wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware()1a49bba59dwifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h9e8440a657spi: spi-gpio: Don't set MOSI as an input if not 3WIRE modea00b4e0fa2clk: samsung: Fix memory leak in _samsung_clk_register_pll()7a2c66429bmedia: coda: Add check for kmalloc2b436f1410media: coda: Add check for dcoda_iram_alloc6250bc7331media: c8sectpfe: Add of_node_put() when breaking out of loop0fcee27507mmc: mmci: fix return value check of mmc_add_host()0a41ea4fd4mmc: wbsd: fix return value check of mmc_add_host()f59ef2a47ammc: via-sdmmc: fix return value check of mmc_add_host()9e11c6bb74mmc: meson-gx: fix return value check of mmc_add_host()f153c9e15fmmc: omap_hsmmc: fix return value check of mmc_add_host()6bb26abb92mmc: atmel-mci: fix return value check of mmc_add_host()c7a328cea7mmc: wmt-sdmmc: fix return value check of mmc_add_host()3b29f8769dmmc: vub300: fix return value check of mmc_add_host()3dbb69a024mmc: toshsd: fix return value check of mmc_add_host()937112e991mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host()0b7b634225mmc: pxamci: fix return value check of mmc_add_host()32eb502c97mmc: mxcmmc: fix return value check of mmc_add_host()b174f2b36cmmc: moxart: fix return value check of mmc_add_host()289c964fe1mmc: alcor: fix return value check of mmc_add_host()e8f20523cfNFSv4.x: Fail client initialisation if state manager thread can't runf7a8a1e36dSUNRPC: Fix missing release socket in rpc_sockname()bcebcb11fcxprtrdma: Fix regbuf data not freed in rpcrdma_req_create()c7e9624d90ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt6a8c0abcb5media: saa7164: fix missing pci_disable_device()4cabc3af4abpf, sockmap: fix race in sock_map_free()35593d60b1regulator: core: fix resource leak in regulator_register()90c38f57a8configfs: fix possible memory leak in configfs_create_dir()6dea95f640hsr: Avoid double remove of a node.de7dbee4bdclk: qcom: clk-krait: fix wrong div2 functions339ba693daregulator: core: fix module refcount leak in set_supply()46dfff9102wifi: cfg80211: Fix not unregister reg_pdev when load_builtin_regdb_keys() fails624a989db9spi: spidev: mask SPI_CS_HIGH in SPI_IOC_RD_MODE52fb0ffee0bonding: uninitialized variable in bond_miimon_inspect()31631c2ab4bpf, sockmap: Fix data loss caused by using apply_bytes on ingress redirect7508b9f4dabpf, sockmap: Fix repeated calls to sock_put() when msg has more_datad4145d028anetfilter: conntrack: set icmpv6 redirects as RELATED27c09443ddASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe981024abf5drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios()470a779890drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios()190685ff4eASoC: mediatek: mt8173: Enable IRQ when pdata is ready0e1e311fd9wifi: iwlwifi: mvm: fix double free on tx path.8b0c003e37ALSA: asihpi: fix missing pci_disable_device()5447f1ad0bNFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturne53a7c28a4NFSv4.2: Fix initialisation of struct nfs4_labelb2b472bcdaNFSv4.2: Fix a memory stomp in decode_attr_security_label96f3c70600NFSv4.2: Clear FATTR4_WORD2_SECURITY_LABEL when done decoding2672977dc0ASoC: mediatek: mtk-btcvsd: Add checks for write and read of mtk_btcvsd_sndd63e9eca94ASoC: dt-bindings: wcd9335: fix reset line polarity in example4ea79d0747drm/tegra: Add missing clk_disable_unprepare() in tegra_dc_probe()542a87f1cfmedia: s5p-mfc: Add variant data for MFC v7 hardware for Exynos 3250 SoC8b256d2336media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()9103bf2187media: dvb-core: Fix ignored return value in dvb_register_frontend()3359f8d533pinctrl: pinconf-generic: add missing of_node_put()ffd53b7892clk: imx: replace osc_hdmi with dummyaa79b53df7clk: imx8mn: correct the usb1_ctrl parent to be usb_bus1d8521e112media: imon: fix a race condition in send_packet()cf9c4c25camtd: maps: pxa2xx-flash: fix memory leak in probea7fc25159dbonding: fix link recovery in mode 2 when updelay is nonzero0879f594a7bonding: Rename slave_arr to usable_slaves9eaeb3e460bonding: Export skip slave logic to function26b94635f1clk: rockchip: Fix memory leak in rockchip_clk_register_pll()96be283d10regulator: core: use kfree_const() to free space conditionallyd884ed9a2fALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT497279199dALSA: pcm: fix undefined behavior in bit shift for SNDRV_PCM_RATE_KNOTe6364854f5HID: hid-sensor-custom: set fixed size for custom attributes75a5bf8eebbpf: Move skb->len == 0 checks into __bpf_redirect61688b8819media: videobuf-dma-contig: use dma_mmap_coherent9ca9d7fd7dmedia: platform: exynos4-is: Fix error handling in fimc_md_init()7b02c50d39media: solo6x10: fix possible memory leak in solo_sysfs_init()f81f63168fInput: elants_i2c - properly handle the reset GPIO when power is off8eb64dc5a7mtd: lpddr2_nvm: Fix possible null-ptr-deref8e51f5894dwifi: ath10k: Fix return value in ath10k_pci_init()8176538866ima: Fix misuse of dereference of pointer in template_desc_init_fields()9b7c44885aintegrity: Fix memory leakage in keyring allocation error path4d3dc0de9camdgpu/pm: prevent array underflow in vega20_odn_edit_dpm_table()d39937f8deregulator: core: fix unbalanced of node refcount in regulator_dev_lookup()a8baccb79dASoC: pxa: fix null-pointer dereference in filter()6f13a895cedrm/mediatek: Modify dpi power on/off sequence.a0f26560bedrm/radeon: Add the missed acpi_put_table() to fix memory leak832d0e19cerxrpc: Fix ack.bufferSize to be 0 when generating an ackc9c9350d30net, proc: Provide PROC_FS=n fallback for proc_create_net_single_write()fe443b3fe3media: camss: Clean up received buffers on failed start of streaming08114dc185wifi: rsi: Fix handling of 802.3 EAPOL frames sent via control portfa0d32ab84mtd: Fix device name leak when register device failed in add_mtd_device()d70fa0a6cebpf: propagate precision in ALU/ALU64 operations54f2599060media: vivid: fix compose size exceed boundary38d48fd224ima: Handle -ESTALE returned by ima_filter_rule_match()ecd0a6f81aima: Fix fall-through warnings for Clang55e2430e43ima: Rename internal filter rule functions0b7c47b7f3drm/panel/panel-sitronix-st7701: Remove panel on DSI attach failure3fcdc1534bspi: Update reference to struct spi_controllerd87dd4528dclk: renesas: r9a06g032: Repair grave increment errora2046e5a36can: kvaser_usb: Compare requested bittiming parameters with actual parameters in do_set_{,data}_bittiming7482f95315can: kvaser_usb: Add struct kvaser_usb_busparamsf3d20de76fcan: kvaser_usb_leaf: Fix bogus restart eventsad63992b64can: kvaser_usb_leaf: Fix wrong CAN state after stopping9208795770can: kvaser_usb_leaf: Fix improved state not being reported60ad08be78can: kvaser_usb_leaf: Set Warning state even without bus errors12d95e65f7can: kvaser_usb: kvaser_usb_leaf: Handle CMD_ERROR_EVENT5779a9d0e3can: kvaser_usb: kvaser_usb_leaf: Rename {leaf,usbcan}_cmd_error_event to {leaf,usbcan}_cmd_can_error_event0e56748852can: kvaser_usb: kvaser_usb_leaf: Get capabilities from device3a9d74f339can: kvaser_usb: do not increase tx statistics when sending error message frames3f2384f09bmedia: i2c: ad5820: Fix error pathe8e2da03c2pata_ipx4xx_cf: Fix unsigned comparison with less than zero5994e7a806wifi: rtl8xxxu: Fix reading the vendor of combo chips988bd27de2wifi: ath9k: hif_usb: Fix use-after-free in ath9k_hif_usb_reg_in_cb()9850791d38wifi: ath9k: hif_usb: fix memory leak of urbs in ath9k_hif_usb_dealloc_tx_urbs()bb7397f631rapidio: devices: fix missing put_device in mport_cdev_open6a95b17e4dhfs: Fix OOB Write in hfs_asc2mac657fea0a8drelay: fix type mismatch when allocating memory in relay_create_buf()e275249e5eeventfd: change int to __u64 in eventfd_signal() ifndef CONFIG_EVENTFD311b488405rapidio: fix possible UAF when kfifo_alloc() fails7aa5325e1bfs: sysv: Fix sysv_nblocks() returns wrong valuecb5859603cMIPS: OCTEON: warn only once if deprecated link status is being usedb7ca75207eMIPS: BCM63xx: Add check for NULL for clk in clk_enable14bb4bde3bplatform/x86: mxm-wmi: fix memleak in mxm_wmi_call_mx[ds|mx]()11ad95912bPM: runtime: Do not call __rpm_callback() from rpm_idle()c40ee4e04bPM: runtime: Improve path in rpm_idle() when no callback4f983ee5e5xen/privcmd: Fix a possible warning in privcmd_ioctl_mmap_resource()29198f667fx86/xen: Fix memory leak in xen_init_lock_cpu()ec88254208x86/xen: Fix memory leak in xen_smp_intr_init{_pv}()6e98158d97xen/events: only register debug interrupt for 2-level events314d510535uprobes/x86: Allow to probe a NOP instruction with 0x66 prefixdfdde4d513ACPICA: Fix use-after-free in acpi_ut_copy_ipackage_to_ipackage()805665aa52clocksource/drivers/sh_cmt: Make sure channel clock supply is enabled1bbad5793frapidio: rio: fix possible name leak in rio_register_mport()440afd7fd9rapidio: fix possible name leaks when rio_add_device() fails7ef516888cocfs2: fix memory leak in ocfs2_mount_volume()a4d3062f0aocfs2: rewrite error handling of ocfs2_fill_super227cc62e00ocfs2: ocfs2_mount_volume does cleanup job before return error5c27b46c20debugfs: fix error when writing negative value to atomic_t debugfs filec7bd49275ddocs: fault-injection: fix non-working usage of negative values6865a549f2lib/notifier-error-inject: fix error when writing -errno to debugfs file6fc6461672libfs: add DEFINE_SIMPLE_ATTRIBUTE_SIGNED for signed value75940697c0cpufreq: amd_freq_sensitivity: Add missing pci_dev_put()d25bf9af86genirq/irqdesc: Don't try to remove non-existing sysfs filesb4e28099cdnfsd: don't call nfsd_file_put from client states seqfile displaye6e295a434EDAC/i10nm: fix refcount leak in pci_get_dev_wrapper()d5c06dba46irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe()e293263248perf/x86/intel/uncore: Fix reference count leak in hswep_has_limit_sbox()81b024df47PNP: fix name memory leak in pnp_alloc_dev()821afb8c89selftests/efivarfs: Add checking of the test return valuec0b8cff014MIPS: vpe-cmp: fix possible memory leak while module exitingb3325a4435MIPS: vpe-mt: fix possible memory leak while module exiting7c8bf45ceaocfs2: fix memory leak in ocfs2_stack_glue_init()e039929e36lib/fonts: fix undefined behavior in bit shift for get_default_font160d6d6f14proc: fixup uptime selftestd7b9e43a5ctimerqueue: Use rb_entry_safe() in timerqueue_getnext()248fa44cdeperf: Fix possible memleak in pmu_dev_alloc()044ede4c38selftests/ftrace: event_triggers: wait longer for test_event_enable8511186f10fs: don't audit the capability check in simple_xattr_list()c907c55dc7PM: hibernate: Fix mistake in kerneldoc commentf0ff6c60bcalpha: fix syscall entry in !AUDUT_SYSCALL case1399ce344ecpuidle: dt: Return the correct numbers of parsed idle states082b55fe9ftpm/tpm_crb: Fix error message in __crb_relinquish_locality()4d3126f242pstore: Avoid kcore oops by vmap()ing with VM_IOREMAPe2516652daARM: mmp: fix timer_read delay2de791ff6fpstore/ram: Fix error return code in ramoops_probe()ded1b82716arm64: dts: armada-3720-turris-mox: Add missing interrupt for RTC03a666631aARM: dts: turris-omnia: Add switch port 6 nodefe1fc4d84dARM: dts: turris-omnia: Add ethernet aliasesb20454ea05ARM: dts: armada-39x: Fix assigned-addresses for every PCIe Root Port1b7017211eARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port87b951b7c2ARM: dts: armada-375: Fix assigned-addresses for every PCIe Root Porte3cf3f7a6dARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Porte302758cafARM: dts: armada-370: Fix assigned-addresses for every PCIe Root Port0a8544b723ARM: dts: dove: Fix assigned-addresses for every PCIe Root Portf707c3fee2arm64: dts: mediatek: mt6797: Fix 26M oscillator unit namefdf511fc07arm64: dts: mt2712-evb: Fix usb vbus regulators unit names06fbfc5f43arm64: dts: mt2712-evb: Fix vproc fixed regulators unit namesf0c1f46e49arm64: dts: mt2712e: Fix unit address for pinctrl nodeaaabd7e3e4arm64: dts: mt2712e: Fix unit_address_vs_reg warning for oscillatorsd69bdb61d5perf/smmuv3: Fix hotplug callback leak in arm_smmu_pmu_init()af2256d778perf: arm_dsu: Fix hotplug callback leak in dsu_pmu_init()1e9186d628soc: ti: smartreflex: Fix PM disable depth imbalance in omap_sr_probe83cfc38091soc: ti: knav_qmss_queue: Fix PM disable depth imbalance in knav_queue_probe5f07c85ca1soc: ti: knav_qmss_queue: Use pm_runtime_resume_and_get instead of pm_runtime_get_syncf5c521195earm: dts: spear600: Fix clcd interrupt3a90edbab8drivers: soc: ti: knav_qmss_queue: Mark knav_acc_firmwares as static3459e05ad3arm64: dts: qcom: sdm845-cheza: fix AP suspend pin bias6a24277840ARM: dts: qcom: apq8064: fix coresight compatible1a19212a71usb: musb: remove extra check in musb_gadget_vbus_draw40075e7975net: loopback: use NET_NAME_PREDICTABLE for name_assign_type9fdc79b571Bluetooth: L2CAP: Fix u8 overflow77d5e6f260HID: uclogic: Add HID_QUIRK_HIDINPUT_FORCE quirkc05a7fa010HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch V 10d535a33e83HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch 10E7346b2529fHID: ite: Add support for Acer S1002 keyboard-dock2d91b7a0b0xen-netback: move removal of "hotplug-status" to the right placec581439a97igb: Initialize mailbox message for VF reset50aa193a4bUSB: serial: f81534: fix division by zero on line-speed change0d6bf63eb3USB: serial: f81232: fix division by zero on line-speed changefe0f214385USB: serial: cp210x: add Kamstrup RF sniffer PIDsd487670654USB: serial: option: add Quectel EM05-G modemb8fb1cba93usb: gadget: uvc: Prevent buffer overflow in setup handler2610c2e59cudf: Fix extending file within last blockade1726d8cudf: Do not bother looking for prealloc extents if i_lenExtents matches i_size4d835efd56udf: Fix preallocation discarding at indirect extent boundary0905c78f62udf: Discard preallocation before extending file with a hole0758b50692tracing/ring-buffer: Only do full wait when cpu != RING_BUFFER_ALL_CPUSe1d491fcbfANDROID: Add more hvc devices for virtio-console.92a0ce5d0aMerge 5.4.228 into android11-5.4-lts6429852aefRevert "can: af_can: fix NULL pointer dereference in can_rcv_filter"4ae923b7c6Merge 5.4.227 into android11-5.4-lts57e53c3fa3ANDROID: Revert "tracing/ring-buffer: Have polling block on watermark"851c2b5fb7Linux 5.4.228ff484a9ba4ASoC: ops: Correct bounds check for second channel on SX controls7d4aa09299can: mcba_usb: Fix termination command argumentf843fdcac0can: sja1000: fix size of OCR_MODE_MASK defineb439b12d10pinctrl: meditatek: Startup with the IRQs disabled9796d07c75ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()3c837460f9nfp: fix use-after-free in area_cache_get()a40c3c9ae5block: unhash blkdev part inode when the part is deleted176ba4c19dmm/hugetlb: fix races when looking up a CONT-PTE/PMD size hugetlb page69d4f3baa6x86/smpboot: Move rcu_cpu_starting() earlierd1988bf2bbnet: bpf: Allow TC programs to call BPF_FUNC_skb_change_head66bb2e2b24Linux 5.4.227898270ec11can: esd_usb: Allow REC and TEC to return to zero08bf219d62net: mvneta: Fix an out of bounds check6b6d3be366ipv6: avoid use-after-free in ip6_fragment()f73eb3fc9bnet: plip: don't call kfree_skb/dev_kfree_skb() under spin_lock_irq()f0af234e2exen/netback: fix build warning99669d94ceethernet: aeroflex: fix potential skb leak in greth_init_rings()3295582cd7ipv4: Fix incorrect route flushing when table ID 0 is used2537b637eaipv4: Fix incorrect route flushing when source address is deleted36eedb9a05tipc: Fix potential OOB in tipc_link_proto_rcv()1b6360a093net: hisilicon: Fix potential use-after-free in hix5hd2_rx()e71a46cc8cnet: hisilicon: Fix potential use-after-free in hisi_femac_rx()7081cf86e1net: thunderx: Fix missing destroy_workqueue of nicvf_rx_mode_wqbc06207b4cnet: stmmac: fix "snps,axi-config" node property parsing7fab7add08nvme initialize core quirks before calling nvme_init_subsystem6778434706NFC: nci: Bounds check struct nfc_target arrayse5292711b0i40e: Disallow ip4 and ip6 l4_4_bytes9337d87da4i40e: Fix for VF MAC address 0a1e295517bi40e: Fix not setting default xps_cpus after reseteec1fc21ednet: mvneta: Prevent out of bounds read in mvneta_config_rss()ed773dd798xen-netfront: Fix NULL sring after live migration18e10a9e0enet: encx24j600: Fix invalid logic in reading of MISTAT register1356c17758net: encx24j600: Add parentheses to fix precedence1831d45404mac802154: fix missing INIT_LIST_HEAD in ieee802154_if_add()8fb4b50f54selftests: rtnetlink: correct xfrm policy rule in kci_test_ipsec_offload0834d4b121net: dsa: ksz: Check return value2c6cf0afc3Bluetooth: Fix not cleanup led when bt_init fails07ea5d74fcBluetooth: 6LoWPAN: add missing hci_dev_put() in get_l2cap_conn()c66d78aee5af_unix: Get user_ns from in_skb in unix_diag_get_exact().9d2ee8abf1igb: Allocate MSI-X vector when testingcff8ba243fe1000e: Fix TX dispatch condition48bd5d3801gpio: amd8111: Fix PCI device reference count leakd2be7ba2d4drm/bridge: ti-sn65dsi86: Fix output polarity setting buge2e2181772ca8210: Fix crash by zero initializing dataefbca8234aieee802154: cc2520: Fix error return code in cc2520_hw_init()3982652957can: af_can: fix NULL pointer dereference in can_rcv_filterdb1ed1b3fbHID: core: fix shift-out-of-bounds in hid_report_raw_event60bce926a8HID: hid-lg4ff: Add check for empty lbuf625814b85fHID: usbhid: Add ALWAYS_POLL quirk for some mice585a07b820drm/shmem-helper: Remove errant put in error pathb8419d16f4KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field04edfa3dc0mm/gup: fix gup_pud_range() for dax35963b3182memcg: fix possible use-after-free in memcg_write_event_control()4afc77068emedia: v4l2-dv-timings.c: fix too strict blanking sanity checks91516ba54aRevert "net: dsa: b53: Fix valid setting for MDB entries"50e1ab7e63xen/netback: don't call kfree_skb() with interrupts disabled6b1d47f9c3xen/netback: do some code cleanup8fe1bf6f32xen/netback: Ensure protocol headers don't fall in the non-linear area5ffc2a7553mm/khugepaged: invoke MMU notifiers in shmem/file collapse paths48b00ceb54mm/khugepaged: fix GUP-fast interaction by sending IPI324abbd8b9mm/khugepaged: take the right locks for page table retractionb2963819d0net: usb: qmi_wwan: add u-blox 0x1342 compositione35c3ad0c29p/xen: check logical size for buffer size9d5126b574fbcon: Use kzalloc() in fbcon_prepare_logo()102459222dregulator: twl6030: fix get status of twl6032 regulatorsf2ba66d873ASoC: soc-pcm: Add NULL check in BE reparenting3b2c064a8ebtrfs: send: avoid unaligned encoded writes when attempting to clone range63badfed20ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event8d16d3826fregulator: slg51000: Wait after asserting CS pin9327a9c6249p/fd: Use P9_HDRSZ for header size671f950d17ARM: dts: rockchip: disable arm_global_timer on rk3066 and rk31882c2c5d1d10ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation29917e381eARM: 9251/1: perf: Fix stacktraces for tracepoint events in THUMB2 kernels3f39d53bc7ARM: dts: rockchip: rk3188: fix lcdc1-rgb24 node name135fcc4581ARM: dts: rockchip: fix ir-receiver node names368f2c2640arm: dts: rockchip: fix node name for hym8563 rtc4b346f07f0arm64: dts: rockchip: keep I2S1 disabled for GPIO function on ROCK Pi 4 series Change-Id: I0cec2e1f212747f2f82af4006b2b2c19daa97369 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
commit
b86f2ce54f
6
Documentation/ABI/testing/sysfs-kernel-oops_count
Normal file
6
Documentation/ABI/testing/sysfs-kernel-oops_count
Normal file
@ -0,0 +1,6 @@
|
||||
What: /sys/kernel/oops_count
|
||||
Date: November 2022
|
||||
KernelVersion: 6.2.0
|
||||
Contact: Linux Kernel Hardening List <linux-hardening@vger.kernel.org>
|
||||
Description:
|
||||
Shows how many times the system has Oopsed since last boot.
|
||||
6
Documentation/ABI/testing/sysfs-kernel-warn_count
Normal file
6
Documentation/ABI/testing/sysfs-kernel-warn_count
Normal file
@ -0,0 +1,6 @@
|
||||
What: /sys/kernel/warn_count
|
||||
Date: November 2022
|
||||
KernelVersion: 6.2.0
|
||||
Contact: Linux Kernel Hardening List <linux-hardening@vger.kernel.org>
|
||||
Description:
|
||||
Shows how many times the system has Warned since last boot.
|
||||
@ -557,6 +557,15 @@ numa_balancing_scan_size_mb is how many megabytes worth of pages are
|
||||
scanned for a given scan.
|
||||
|
||||
|
||||
oops_limit
|
||||
==========
|
||||
|
||||
Number of kernel oopses after which the kernel should panic when
|
||||
``panic_on_oops`` is not set. Setting this to 0 disables checking
|
||||
the count. Setting this to 1 has the same effect as setting
|
||||
``panic_on_oops=1``. The default value is 10000.
|
||||
|
||||
|
||||
osrelease, ostype & version:
|
||||
============================
|
||||
|
||||
@ -1177,6 +1186,16 @@ entry will default to 2 instead of 0.
|
||||
2 Unprivileged calls to ``bpf()`` are disabled
|
||||
= =============================================================
|
||||
|
||||
|
||||
warn_limit
|
||||
==========
|
||||
|
||||
Number of kernel warnings after which the kernel should panic when
|
||||
``panic_on_warn`` is not set. Setting this to 0 disables checking
|
||||
the warning count. Setting this to 1 has the same effect as setting
|
||||
``panic_on_warn=1``. The default value is 0.
|
||||
|
||||
|
||||
watchdog:
|
||||
=========
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Copyright 2019 BayLibre, SAS
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#"
|
||||
$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#"
|
||||
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
|
||||
|
||||
title: Amlogic G12A USB3 + PCIE Combo PHY
|
||||
@ -13,7 +13,7 @@ maintainers:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- amlogic,meson-g12a-usb3-pcie-phy
|
||||
- amlogic,g12a-usb3-pcie-phy
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
@ -47,7 +47,7 @@ required:
|
||||
examples:
|
||||
- |
|
||||
phy@46000 {
|
||||
compatible = "amlogic,meson-g12a-usb3-pcie-phy";
|
||||
compatible = "amlogic,g12a-usb3-pcie-phy";
|
||||
reg = <0x46000 0x2000>;
|
||||
clocks = <&ref_clk>;
|
||||
clock-names = "ref_clk";
|
||||
@ -109,7 +109,7 @@ audio-codec@1{
|
||||
reg = <1 0>;
|
||||
interrupts = <&msmgpio 54 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "intr2"
|
||||
reset-gpios = <&msmgpio 64 0>;
|
||||
reset-gpios = <&msmgpio 64 GPIO_ACTIVE_LOW>;
|
||||
slim-ifc-dev = <&wc9335_ifd>;
|
||||
clock-names = "mclk", "native";
|
||||
clocks = <&rpmcc RPM_SMD_DIV_CLK1>,
|
||||
|
||||
@ -25,8 +25,8 @@ hardware, which may be as simple as a set of GPIO pins or as complex as
|
||||
a pair of FIFOs connected to dual DMA engines on the other side of the
|
||||
SPI shift register (maximizing throughput). Such drivers bridge between
|
||||
whatever bus they sit on (often the platform bus) and SPI, and expose
|
||||
the SPI side of their device as a :c:type:`struct spi_master
|
||||
<spi_master>`. SPI devices are children of that master,
|
||||
the SPI side of their device as a :c:type:`struct spi_controller
|
||||
<spi_controller>`. SPI devices are children of that master,
|
||||
represented as a :c:type:`struct spi_device <spi_device>` and
|
||||
manufactured from :c:type:`struct spi_board_info
|
||||
<spi_board_info>` descriptors which are usually provided by
|
||||
|
||||
@ -74,8 +74,8 @@ configuration of fault-injection capabilities.
|
||||
|
||||
- /sys/kernel/debug/fail*/times:
|
||||
|
||||
specifies how many times failures may happen at most.
|
||||
A value of -1 means "no limit".
|
||||
specifies how many times failures may happen at most. A value of -1
|
||||
means "no limit".
|
||||
|
||||
- /sys/kernel/debug/fail*/space:
|
||||
|
||||
@ -163,11 +163,13 @@ configuration of fault-injection capabilities.
|
||||
- ERRNO: retval must be -1 to -MAX_ERRNO (-4096).
|
||||
- ERR_NULL: retval must be 0 or -1 to -MAX_ERRNO (-4096).
|
||||
|
||||
- /sys/kernel/debug/fail_function/<functiuon-name>/retval:
|
||||
- /sys/kernel/debug/fail_function/<function-name>/retval:
|
||||
|
||||
specifies the "error" return value to inject to the given
|
||||
function for given function. This will be created when
|
||||
user specifies new injection entry.
|
||||
specifies the "error" return value to inject to the given function.
|
||||
This will be created when the user specifies a new injection entry.
|
||||
Note that this file only accepts unsigned values. So, if you want to
|
||||
use a negative errno, you better use 'printf' instead of 'echo', e.g.:
|
||||
$ printf %#x -12 > retval
|
||||
|
||||
Boot option
|
||||
^^^^^^^^^^^
|
||||
@ -331,7 +333,7 @@ Application Examples
|
||||
FAILTYPE=fail_function
|
||||
FAILFUNC=open_ctree
|
||||
echo $FAILFUNC > /sys/kernel/debug/$FAILTYPE/inject
|
||||
echo -12 > /sys/kernel/debug/$FAILTYPE/$FAILFUNC/retval
|
||||
printf %#x -12 > /sys/kernel/debug/$FAILTYPE/$FAILFUNC/retval
|
||||
echo N > /sys/kernel/debug/$FAILTYPE/task-filter
|
||||
echo 100 > /sys/kernel/debug/$FAILTYPE/probability
|
||||
echo 0 > /sys/kernel/debug/$FAILTYPE/interval
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
import os
|
||||
import sys
|
||||
from sphinx.util.pycompat import execfile_
|
||||
from sphinx.util.osutil import fs_encoding
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
def loadConfig(namespace):
|
||||
@ -48,7 +48,9 @@ def loadConfig(namespace):
|
||||
sys.stdout.write("load additional sphinx-config: %s\n" % config_file)
|
||||
config = namespace.copy()
|
||||
config['__file__'] = config_file
|
||||
execfile_(config_file, config)
|
||||
with open(config_file, 'rb') as f:
|
||||
code = compile(f.read(), fs_encoding, 'exec')
|
||||
exec(code, config)
|
||||
del config['__file__']
|
||||
namespace.update(config)
|
||||
else:
|
||||
|
||||
@ -14673,6 +14673,7 @@ L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/net/phy/phylink.c
|
||||
F: drivers/net/phy/sfp*
|
||||
F: include/linux/mdio/mdio-i2c.h
|
||||
F: include/linux/phylink.h
|
||||
F: include/linux/sfp.h
|
||||
K: phylink
|
||||
|
||||
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
SUBLEVEL = 226
|
||||
SUBLEVEL = 233
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
|
||||
@ -469,8 +469,10 @@ entSys:
|
||||
#ifdef CONFIG_AUDITSYSCALL
|
||||
lda $6, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
|
||||
and $3, $6, $3
|
||||
#endif
|
||||
bne $3, strace
|
||||
#else
|
||||
blbs $3, strace /* check for SYSCALL_TRACE in disguise */
|
||||
#endif
|
||||
beq $4, 1f
|
||||
ldq $27, 0($5)
|
||||
1: jsr $26, ($27), sys_ni_syscall
|
||||
|
||||
@ -192,7 +192,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
|
||||
local_irq_enable();
|
||||
while (1);
|
||||
}
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
#ifndef CONFIG_MATHEMU
|
||||
@ -577,7 +577,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg,
|
||||
|
||||
printk("Bad unaligned kernel access at %016lx: %p %lx %lu\n",
|
||||
pc, va, opcode, reg);
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
|
||||
got_exception:
|
||||
/* Ok, we caught the exception, but we don't want it. Is there
|
||||
@ -632,7 +632,7 @@ got_exception:
|
||||
local_irq_enable();
|
||||
while (1);
|
||||
}
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -206,7 +206,7 @@ retry:
|
||||
printk(KERN_ALERT "Unable to handle kernel paging request at "
|
||||
"virtual address %016lx\n", address);
|
||||
die_if_kernel("Oops", regs, cause, (unsigned long*)regs - 16);
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
|
||||
/* We ran out of memory, or some other thing happened to us that
|
||||
made us unable to handle the page fault gracefully. */
|
||||
|
||||
@ -74,7 +74,7 @@
|
||||
|
||||
pcie2: pcie@2,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@ -584,7 +584,7 @@
|
||||
|
||||
pcie1: pcie@2,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@ -79,7 +79,7 @@
|
||||
/* x1 port */
|
||||
pcie@2,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -98,7 +98,7 @@
|
||||
/* x1 port */
|
||||
pcie@3,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
|
||||
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
|
||||
reg = <0x1800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@ -22,6 +22,12 @@
|
||||
stdout-path = &uart0;
|
||||
};
|
||||
|
||||
aliases {
|
||||
ethernet0 = ð0;
|
||||
ethernet1 = ð1;
|
||||
ethernet2 = ð2;
|
||||
};
|
||||
|
||||
memory {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x40000000>; /* 1024 MB */
|
||||
@ -291,7 +297,17 @@
|
||||
};
|
||||
};
|
||||
|
||||
/* port 6 is connected to eth0 */
|
||||
ports@6 {
|
||||
reg = <6>;
|
||||
label = "cpu";
|
||||
ethernet = <ð0>;
|
||||
phy-mode = "rgmii-id";
|
||||
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
/* x1 port */
|
||||
pcie2: pcie@2,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -103,7 +103,7 @@
|
||||
/* x1 port */
|
||||
pcie3: pcie@3,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
|
||||
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
|
||||
reg = <0x1800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -125,7 +125,7 @@
|
||||
*/
|
||||
pcie4: pcie@4,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
|
||||
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
|
||||
reg = <0x2000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@ -457,7 +457,7 @@
|
||||
/* x1 port */
|
||||
pcie@2,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -476,7 +476,7 @@
|
||||
/* x1 port */
|
||||
pcie@3,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
|
||||
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
|
||||
reg = <0x1800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -498,7 +498,7 @@
|
||||
*/
|
||||
pcie@4,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
|
||||
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
|
||||
reg = <0x2000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
|
||||
pcie2: pcie@2,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -115,7 +115,7 @@
|
||||
|
||||
pcie3: pcie@3,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
|
||||
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
|
||||
reg = <0x1800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -133,7 +133,7 @@
|
||||
|
||||
pcie4: pcie@4,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
|
||||
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
|
||||
reg = <0x2000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -151,7 +151,7 @@
|
||||
|
||||
pcie5: pcie@5,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
|
||||
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
|
||||
reg = <0x2800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@ -112,7 +112,7 @@
|
||||
|
||||
pcie2: pcie@2,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -130,7 +130,7 @@
|
||||
|
||||
pcie3: pcie@3,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
|
||||
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
|
||||
reg = <0x1800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -148,7 +148,7 @@
|
||||
|
||||
pcie4: pcie@4,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
|
||||
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
|
||||
reg = <0x2000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -166,7 +166,7 @@
|
||||
|
||||
pcie5: pcie@5,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
|
||||
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
|
||||
reg = <0x2800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -184,7 +184,7 @@
|
||||
|
||||
pcie6: pcie@6,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x84000 0 0x2000>;
|
||||
assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
|
||||
reg = <0x3000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -202,7 +202,7 @@
|
||||
|
||||
pcie7: pcie@7,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x88000 0 0x2000>;
|
||||
assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
|
||||
reg = <0x3800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -220,7 +220,7 @@
|
||||
|
||||
pcie8: pcie@8,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x8c000 0 0x2000>;
|
||||
assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
|
||||
reg = <0x4000 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
@ -238,7 +238,7 @@
|
||||
|
||||
pcie9: pcie@9,0 {
|
||||
device_type = "pci";
|
||||
assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
|
||||
assigned-addresses = <0x82004800 0 0x42000 0 0x2000>;
|
||||
reg = <0x4800 0 0 0 0>;
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
|
||||
@ -129,7 +129,7 @@
|
||||
pcie1: pcie@2 {
|
||||
device_type = "pci";
|
||||
status = "disabled";
|
||||
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
|
||||
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
|
||||
reg = <0x1000 0 0 0 0>;
|
||||
clocks = <&gate_clk 5>;
|
||||
marvell,pcie-port = <1>;
|
||||
|
||||
@ -461,7 +461,7 @@
|
||||
scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
|
||||
status = "okay";
|
||||
|
||||
i2c-switch@70 {
|
||||
i2c-mux@70 {
|
||||
compatible = "nxp,pca9547";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
@ -464,7 +464,6 @@
|
||||
&uart1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_uart1>;
|
||||
uart-has-rtscts;
|
||||
rts-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@ -1570,7 +1570,7 @@
|
||||
};
|
||||
|
||||
etb@1a01000 {
|
||||
compatible = "coresight-etb10", "arm,primecell";
|
||||
compatible = "arm,coresight-etb10", "arm,primecell";
|
||||
reg = <0x1a01000 0x1000>;
|
||||
|
||||
clocks = <&rpmcc RPM_QDSS_CLK>;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
&i2c1 {
|
||||
status = "okay";
|
||||
|
||||
hym8563: hym8563@51 {
|
||||
hym8563: rtc@51 {
|
||||
compatible = "haoyu,hym8563";
|
||||
reg = <0x51>;
|
||||
#clock-cells = <0>;
|
||||
|
||||
@ -67,7 +67,7 @@
|
||||
#sound-dai-cells = <0>;
|
||||
};
|
||||
|
||||
ir_recv: gpio-ir-receiver {
|
||||
ir_recv: ir-receiver {
|
||||
compatible = "gpio-ir-receiver";
|
||||
gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||
pinctrl-names = "default";
|
||||
|
||||
@ -404,7 +404,7 @@
|
||||
rockchip,pins = <2 RK_PD3 1 &pcfg_pull_none>;
|
||||
};
|
||||
|
||||
lcdc1_rgb24: ldcd1-rgb24 {
|
||||
lcdc1_rgb24: lcdc1-rgb24 {
|
||||
rockchip,pins = <2 RK_PA0 1 &pcfg_pull_none>,
|
||||
<2 RK_PA1 1 &pcfg_pull_none>,
|
||||
<2 RK_PA2 1 &pcfg_pull_none>,
|
||||
@ -632,7 +632,6 @@
|
||||
|
||||
&global_timer {
|
||||
interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
&local_timer {
|
||||
|
||||
@ -53,7 +53,7 @@
|
||||
vin-supply = <&vcc_sys>;
|
||||
};
|
||||
|
||||
hym8563@51 {
|
||||
rtc@51 {
|
||||
compatible = "haoyu,hym8563";
|
||||
reg = <0x51>;
|
||||
|
||||
|
||||
@ -233,7 +233,7 @@
|
||||
vin-supply = <&vcc_sys>;
|
||||
};
|
||||
|
||||
hym8563: hym8563@51 {
|
||||
hym8563: rtc@51 {
|
||||
compatible = "haoyu,hym8563";
|
||||
reg = <0x51>;
|
||||
#clock-cells = <0>;
|
||||
|
||||
@ -145,7 +145,7 @@
|
||||
vin-supply = <&vcc_sys>;
|
||||
};
|
||||
|
||||
hym8563: hym8563@51 {
|
||||
hym8563: rtc@51 {
|
||||
compatible = "haoyu,hym8563";
|
||||
reg = <0x51>;
|
||||
#clock-cells = <0>;
|
||||
|
||||
@ -165,7 +165,7 @@
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
hym8563: hym8563@51 {
|
||||
hym8563: rtc@51 {
|
||||
compatible = "haoyu,hym8563";
|
||||
reg = <0x51>;
|
||||
#clock-cells = <0>;
|
||||
|
||||
@ -108,6 +108,13 @@
|
||||
reg = <0x1013c200 0x20>;
|
||||
interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>;
|
||||
clocks = <&cru CORE_PERI>;
|
||||
status = "disabled";
|
||||
/* The clock source and the sched_clock provided by the arm_global_timer
|
||||
* on Rockchip rk3066a/rk3188 are quite unstable because their rates
|
||||
* depend on the CPU frequency.
|
||||
* Keep the arm_global_timer disabled in order to have the
|
||||
* DW_APB_TIMER (rk3066a) or ROCKCHIP_TIMER (rk3188) selected by default.
|
||||
*/
|
||||
};
|
||||
|
||||
local_timer: local-timer@1013c600 {
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
compatible = "arm,pl110", "arm,primecell";
|
||||
reg = <0xfc200000 0x1000>;
|
||||
interrupt-parent = <&vic1>;
|
||||
interrupts = <12>;
|
||||
interrupts = <13>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ extern unsigned long perf_misc_flags(struct pt_regs *regs);
|
||||
|
||||
#define perf_arch_fetch_caller_regs(regs, __ip) { \
|
||||
(regs)->ARM_pc = (__ip); \
|
||||
(regs)->ARM_fp = (unsigned long) __builtin_frame_address(0); \
|
||||
frame_pointer((regs)) = (unsigned long) __builtin_frame_address(0); \
|
||||
(regs)->ARM_sp = current_stack_pointer; \
|
||||
(regs)->ARM_cpsr = SVC_MODE; \
|
||||
}
|
||||
|
||||
@ -51,12 +51,6 @@
|
||||
|
||||
typedef pte_t *pte_addr_t;
|
||||
|
||||
/*
|
||||
* ZERO_PAGE is a global shared page that is always zero: used
|
||||
* for zero-mapped memory areas etc..
|
||||
*/
|
||||
#define ZERO_PAGE(vaddr) (virt_to_page(0))
|
||||
|
||||
/*
|
||||
* Mark the prot value as uncacheable and unbufferable.
|
||||
*/
|
||||
|
||||
@ -10,6 +10,15 @@
|
||||
#include <linux/const.h>
|
||||
#include <asm/proc-fns.h>
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
/*
|
||||
* ZERO_PAGE is a global shared page that is always zero: used
|
||||
* for zero-mapped memory areas etc..
|
||||
*/
|
||||
extern struct page *empty_zero_page;
|
||||
#define ZERO_PAGE(vaddr) (empty_zero_page)
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_MMU
|
||||
|
||||
#include <asm-generic/4level-fixup.h>
|
||||
@ -166,13 +175,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
|
||||
#define __S111 __PAGE_SHARED_EXEC
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
/*
|
||||
* ZERO_PAGE is a global shared page that is always zero: used
|
||||
* for zero-mapped memory areas etc..
|
||||
*/
|
||||
extern struct page *empty_zero_page;
|
||||
#define ZERO_PAGE(vaddr) (empty_zero_page)
|
||||
|
||||
|
||||
extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
|
||||
|
||||
|
||||
@ -341,7 +341,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
|
||||
if (panic_on_oops)
|
||||
panic("Fatal exception");
|
||||
if (signr)
|
||||
do_exit(signr);
|
||||
make_task_dead(signr);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -23,6 +23,7 @@ static int mx25_read_cpu_rev(void)
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "fsl,imx25-iim");
|
||||
iim_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
BUG_ON(!iim_base);
|
||||
rev = readl(iim_base + MXC_IIMSREV);
|
||||
iounmap(iim_base);
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include "hardware.h"
|
||||
@ -17,16 +18,24 @@ static int mx27_cpu_rev = -1;
|
||||
static int mx27_cpu_partnumber;
|
||||
|
||||
#define SYS_CHIP_ID 0x00 /* The offset of CHIP ID register */
|
||||
#define SYSCTRL_OFFSET 0x800 /* Offset from CCM base address */
|
||||
|
||||
static int mx27_read_cpu_rev(void)
|
||||
{
|
||||
void __iomem *ccm_base;
|
||||
struct device_node *np;
|
||||
u32 val;
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "fsl,imx27-ccm");
|
||||
ccm_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
BUG_ON(!ccm_base);
|
||||
/*
|
||||
* now we have access to the IO registers. As we need
|
||||
* the silicon revision very early we read it here to
|
||||
* avoid any further hooks
|
||||
*/
|
||||
val = imx_readl(MX27_IO_ADDRESS(MX27_SYSCTRL_BASE_ADDR + SYS_CHIP_ID));
|
||||
val = imx_readl(ccm_base + SYSCTRL_OFFSET + SYS_CHIP_ID);
|
||||
|
||||
mx27_cpu_partnumber = (int)((val >> 12) & 0xFFFF);
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include "common.h"
|
||||
@ -32,10 +33,17 @@ static struct {
|
||||
|
||||
static int mx31_read_cpu_rev(void)
|
||||
{
|
||||
void __iomem *iim_base;
|
||||
struct device_node *np;
|
||||
u32 i, srev;
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "fsl,imx31-iim");
|
||||
iim_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
BUG_ON(!iim_base);
|
||||
|
||||
/* read SREV register from IIM module */
|
||||
srev = imx_readl(MX31_IO_ADDRESS(MX31_IIM_BASE_ADDR + MXC_IIMSREV));
|
||||
srev = imx_readl(iim_base + MXC_IIMSREV);
|
||||
srev &= 0xff;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++)
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
|
||||
*/
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include "hardware.h"
|
||||
@ -14,9 +15,16 @@ static int mx35_cpu_rev = -1;
|
||||
|
||||
static int mx35_read_cpu_rev(void)
|
||||
{
|
||||
void __iomem *iim_base;
|
||||
struct device_node *np;
|
||||
u32 rev;
|
||||
|
||||
rev = imx_readl(MX35_IO_ADDRESS(MX35_IIM_BASE_ADDR + MXC_IIMSREV));
|
||||
np = of_find_compatible_node(NULL, NULL, "fsl,imx35-iim");
|
||||
iim_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
BUG_ON(!iim_base);
|
||||
|
||||
rev = imx_readl(iim_base + MXC_IIMSREV);
|
||||
switch (rev) {
|
||||
case 0x00:
|
||||
return IMX_CHIP_REVISION_1_0;
|
||||
|
||||
@ -28,6 +28,7 @@ static u32 imx5_read_srev_reg(const char *compat)
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, compat);
|
||||
iim_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
WARN_ON(!iim_base);
|
||||
|
||||
srev = readl(iim_base + IIM_SREV) & 0xff;
|
||||
|
||||
@ -44,18 +44,21 @@
|
||||
static void __iomem *mmp_timer_base = TIMERS_VIRT_BASE;
|
||||
|
||||
/*
|
||||
* FIXME: the timer needs some delay to stablize the counter capture
|
||||
* Read the timer through the CVWR register. Delay is required after requesting
|
||||
* a read. The CR register cannot be directly read due to metastability issues
|
||||
* documented in the PXA168 software manual.
|
||||
*/
|
||||
static inline uint32_t timer_read(void)
|
||||
{
|
||||
int delay = 100;
|
||||
uint32_t val;
|
||||
int delay = 3;
|
||||
|
||||
__raw_writel(1, mmp_timer_base + TMR_CVWR(1));
|
||||
|
||||
while (delay--)
|
||||
cpu_relax();
|
||||
val = __raw_readl(mmp_timer_base + TMR_CVWR(1));
|
||||
|
||||
return __raw_readl(mmp_timer_base + TMR_CVWR(1));
|
||||
return val;
|
||||
}
|
||||
|
||||
static u64 notrace mmp_read_sched_clock(void)
|
||||
|
||||
@ -124,7 +124,7 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
|
||||
show_pte(KERN_ALERT, mm, addr);
|
||||
die("Oops", regs, fsr);
|
||||
bust_spinlocks(0);
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -26,6 +26,13 @@
|
||||
|
||||
unsigned long vectors_base;
|
||||
|
||||
/*
|
||||
* empty_zero_page is a special page that is used for
|
||||
* zero-initialized data and COW.
|
||||
*/
|
||||
struct page *empty_zero_page;
|
||||
EXPORT_SYMBOL(empty_zero_page);
|
||||
|
||||
#ifdef CONFIG_ARM_MPU
|
||||
struct mpu_rgn_info mpu_rgn_info;
|
||||
#endif
|
||||
@ -148,9 +155,21 @@ void __init adjust_lowmem_bounds(void)
|
||||
*/
|
||||
void __init paging_init(const struct machine_desc *mdesc)
|
||||
{
|
||||
void *zero_page;
|
||||
|
||||
early_trap_init((void *)vectors_base);
|
||||
mpu_setup();
|
||||
|
||||
/* allocate the zero page. */
|
||||
zero_page = (void *)memblock_alloc(PAGE_SIZE, PAGE_SIZE);
|
||||
if (!zero_page)
|
||||
panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
|
||||
__func__, PAGE_SIZE, PAGE_SIZE);
|
||||
|
||||
bootmem_init();
|
||||
|
||||
empty_zero_page = virt_to_page(zero_page);
|
||||
flush_dcache_page(empty_zero_page);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -11,3 +11,9 @@ nwfpe-y += fpa11.o fpa11_cpdo.o fpa11_cpdt.o \
|
||||
entry.o
|
||||
|
||||
nwfpe-$(CONFIG_FPE_NWFPE_XP) += extended_cpdo.o
|
||||
|
||||
# Try really hard to avoid generating calls to __aeabi_uldivmod() from
|
||||
# float64_rem() due to loop elision.
|
||||
ifdef CONFIG_CC_IS_CLANG
|
||||
CFLAGS_softfloat.o += -mllvm -replexitval=never
|
||||
endif
|
||||
|
||||
@ -1705,7 +1705,7 @@
|
||||
sd_emmc_b: sd@5000 {
|
||||
compatible = "amlogic,meson-axg-mmc";
|
||||
reg = <0x0 0x5000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
clocks = <&clkc CLKID_SD_EMMC_B>,
|
||||
<&clkc CLKID_SD_EMMC_B_CLK0>,
|
||||
@ -1717,7 +1717,7 @@
|
||||
sd_emmc_c: mmc@7000 {
|
||||
compatible = "amlogic,meson-axg-mmc";
|
||||
reg = <0x0 0x7000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
clocks = <&clkc CLKID_SD_EMMC_C>,
|
||||
<&clkc CLKID_SD_EMMC_C_CLK0>,
|
||||
|
||||
@ -2317,7 +2317,7 @@
|
||||
sd_emmc_a: sd@ffe03000 {
|
||||
compatible = "amlogic,meson-axg-mmc";
|
||||
reg = <0x0 0xffe03000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
clocks = <&clkc CLKID_SD_EMMC_A>,
|
||||
<&clkc CLKID_SD_EMMC_A_CLK0>,
|
||||
@ -2329,7 +2329,7 @@
|
||||
sd_emmc_b: sd@ffe05000 {
|
||||
compatible = "amlogic,meson-axg-mmc";
|
||||
reg = <0x0 0xffe05000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
clocks = <&clkc CLKID_SD_EMMC_B>,
|
||||
<&clkc CLKID_SD_EMMC_B_CLK0>,
|
||||
@ -2341,7 +2341,7 @@
|
||||
sd_emmc_c: mmc@ffe07000 {
|
||||
compatible = "amlogic,meson-axg-mmc";
|
||||
reg = <0x0 0xffe07000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 191 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
clocks = <&clkc CLKID_SD_EMMC_C>,
|
||||
<&clkc CLKID_SD_EMMC_C_CLK0>,
|
||||
|
||||
@ -528,21 +528,21 @@
|
||||
sd_emmc_a: mmc@70000 {
|
||||
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
||||
reg = <0x0 0x70000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sd_emmc_b: mmc@72000 {
|
||||
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
||||
reg = <0x0 0x72000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sd_emmc_c: mmc@74000 {
|
||||
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
|
||||
reg = <0x0 0x74000 0x0 0x800>;
|
||||
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
||||
@ -585,7 +585,7 @@
|
||||
#define MX8MM_IOMUXC_UART1_RXD_GPIO5_IO22 0x234 0x49C 0x000 0x5 0x0
|
||||
#define MX8MM_IOMUXC_UART1_RXD_TPSMP_HDATA24 0x234 0x49C 0x000 0x7 0x0
|
||||
#define MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX 0x238 0x4A0 0x000 0x0 0x0
|
||||
#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x0
|
||||
#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x1
|
||||
#define MX8MM_IOMUXC_UART1_TXD_ECSPI3_MOSI 0x238 0x4A0 0x000 0x1 0x0
|
||||
#define MX8MM_IOMUXC_UART1_TXD_GPIO5_IO23 0x238 0x4A0 0x000 0x5 0x0
|
||||
#define MX8MM_IOMUXC_UART1_TXD_TPSMP_HDATA25 0x238 0x4A0 0x000 0x7 0x0
|
||||
|
||||
@ -122,9 +122,12 @@
|
||||
/delete-property/ mrvl,i2c-fast-mode;
|
||||
status = "okay";
|
||||
|
||||
/* MCP7940MT-I/MNY RTC */
|
||||
rtc@6f {
|
||||
compatible = "microchip,mcp7940x";
|
||||
reg = <0x6f>;
|
||||
interrupt-parent = <&gpiosb>;
|
||||
interrupts = <5 0>; /* GPIO2_5 */
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -26,14 +26,14 @@
|
||||
stdout-path = "serial0:921600n8";
|
||||
};
|
||||
|
||||
cpus_fixed_vproc0: fixedregulator@0 {
|
||||
cpus_fixed_vproc0: regulator-vproc-buck0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vproc_buck0";
|
||||
regulator-min-microvolt = <1000000>;
|
||||
regulator-max-microvolt = <1000000>;
|
||||
};
|
||||
|
||||
cpus_fixed_vproc1: fixedregulator@1 {
|
||||
cpus_fixed_vproc1: regulator-vproc-buck1 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vproc_buck1";
|
||||
regulator-min-microvolt = <1000000>;
|
||||
@ -50,7 +50,7 @@
|
||||
id-gpio = <&pio 14 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
|
||||
usb_p0_vbus: regulator@2 {
|
||||
usb_p0_vbus: regulator-usb-p0-vbus {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "p0_vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
@ -59,7 +59,7 @@
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
usb_p1_vbus: regulator@3 {
|
||||
usb_p1_vbus: regulator-usb-p1-vbus {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "p1_vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
@ -68,7 +68,7 @@
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
usb_p2_vbus: regulator@4 {
|
||||
usb_p2_vbus: regulator-usb-p2-vbus {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "p2_vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
@ -77,7 +77,7 @@
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
usb_p3_vbus: regulator@5 {
|
||||
usb_p3_vbus: regulator-usb-p3-vbus {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "p3_vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
|
||||
@ -160,70 +160,70 @@
|
||||
#clock-cells = <0>;
|
||||
};
|
||||
|
||||
clk26m: oscillator@0 {
|
||||
clk26m: oscillator-26m {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <26000000>;
|
||||
clock-output-names = "clk26m";
|
||||
};
|
||||
|
||||
clk32k: oscillator@1 {
|
||||
clk32k: oscillator-32k {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <32768>;
|
||||
clock-output-names = "clk32k";
|
||||
};
|
||||
|
||||
clkfpc: oscillator@2 {
|
||||
clkfpc: oscillator-50m {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <50000000>;
|
||||
clock-output-names = "clkfpc";
|
||||
};
|
||||
|
||||
clkaud_ext_i_0: oscillator@3 {
|
||||
clkaud_ext_i_0: oscillator-aud0 {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <6500000>;
|
||||
clock-output-names = "clkaud_ext_i_0";
|
||||
};
|
||||
|
||||
clkaud_ext_i_1: oscillator@4 {
|
||||
clkaud_ext_i_1: oscillator-aud1 {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <196608000>;
|
||||
clock-output-names = "clkaud_ext_i_1";
|
||||
};
|
||||
|
||||
clkaud_ext_i_2: oscillator@5 {
|
||||
clkaud_ext_i_2: oscillator-aud2 {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <180633600>;
|
||||
clock-output-names = "clkaud_ext_i_2";
|
||||
};
|
||||
|
||||
clki2si0_mck_i: oscillator@6 {
|
||||
clki2si0_mck_i: oscillator-i2s0 {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <30000000>;
|
||||
clock-output-names = "clki2si0_mck_i";
|
||||
};
|
||||
|
||||
clki2si1_mck_i: oscillator@7 {
|
||||
clki2si1_mck_i: oscillator-i2s1 {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <30000000>;
|
||||
clock-output-names = "clki2si1_mck_i";
|
||||
};
|
||||
|
||||
clki2si2_mck_i: oscillator@8 {
|
||||
clki2si2_mck_i: oscillator-i2s2 {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <30000000>;
|
||||
clock-output-names = "clki2si2_mck_i";
|
||||
};
|
||||
|
||||
clktdmin_mclk_i: oscillator@9 {
|
||||
clktdmin_mclk_i: oscillator-mclk {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <30000000>;
|
||||
@ -266,7 +266,7 @@
|
||||
reg = <0 0x10005000 0 0x1000>;
|
||||
};
|
||||
|
||||
pio: pinctrl@10005000 {
|
||||
pio: pinctrl@1000b000 {
|
||||
compatible = "mediatek,mt2712-pinctrl";
|
||||
reg = <0 0x1000b000 0 0x1000>;
|
||||
mediatek,pctl-regmap = <&syscfg_pctl_a>;
|
||||
|
||||
@ -102,7 +102,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
clk26m: oscillator@0 {
|
||||
clk26m: oscillator-26m {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <26000000>;
|
||||
|
||||
@ -1310,7 +1310,7 @@ ap_ts_i2c: &i2c14 {
|
||||
config {
|
||||
pins = "gpio126";
|
||||
function = "gpio";
|
||||
bias-no-pull;
|
||||
bias-disable;
|
||||
drive-strength = <2>;
|
||||
output-low;
|
||||
};
|
||||
@ -1320,7 +1320,7 @@ ap_ts_i2c: &i2c14 {
|
||||
config {
|
||||
pins = "gpio126";
|
||||
function = "gpio";
|
||||
bias-no-pull;
|
||||
bias-disable;
|
||||
drive-strength = <2>;
|
||||
output-high;
|
||||
};
|
||||
|
||||
@ -298,8 +298,10 @@
|
||||
};
|
||||
|
||||
&qup_i2c12_default {
|
||||
drive-strength = <2>;
|
||||
bias-disable;
|
||||
pinmux {
|
||||
drive-strength = <2>;
|
||||
bias-disable;
|
||||
};
|
||||
};
|
||||
|
||||
&qup_uart6_default {
|
||||
|
||||
@ -441,7 +441,6 @@
|
||||
&i2s1 {
|
||||
rockchip,playback-channels = <2>;
|
||||
rockchip,capture-channels = <2>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&i2s2 {
|
||||
|
||||
@ -12,19 +12,6 @@
|
||||
|
||||
#include <linux/stringify.h>
|
||||
|
||||
#if IS_ENABLED(CONFIG_ARM64_LSE_ATOMICS) && IS_ENABLED(CONFIG_AS_LSE)
|
||||
#define __LL_SC_FALLBACK(asm_ops) \
|
||||
" b 3f\n" \
|
||||
" .subsection 1\n" \
|
||||
"3:\n" \
|
||||
asm_ops "\n" \
|
||||
" b 4f\n" \
|
||||
" .previous\n" \
|
||||
"4:\n"
|
||||
#else
|
||||
#define __LL_SC_FALLBACK(asm_ops) asm_ops
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_CC_HAS_K_CONSTRAINT
|
||||
#define K
|
||||
#endif
|
||||
@ -43,12 +30,11 @@ __ll_sc_atomic_##op(int i, atomic_t *v) \
|
||||
int result; \
|
||||
\
|
||||
asm volatile("// atomic_" #op "\n" \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ldxr %w0, %2\n" \
|
||||
" " #asm_op " %w0, %w0, %w3\n" \
|
||||
" stxr %w1, %w0, %2\n" \
|
||||
" cbnz %w1, 1b\n") \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ldxr %w0, %2\n" \
|
||||
" " #asm_op " %w0, %w0, %w3\n" \
|
||||
" stxr %w1, %w0, %2\n" \
|
||||
" cbnz %w1, 1b\n" \
|
||||
: "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \
|
||||
: __stringify(constraint) "r" (i)); \
|
||||
}
|
||||
@ -61,13 +47,12 @@ __ll_sc_atomic_##op##_return##name(int i, atomic_t *v) \
|
||||
int result; \
|
||||
\
|
||||
asm volatile("// atomic_" #op "_return" #name "\n" \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ld" #acq "xr %w0, %2\n" \
|
||||
" " #asm_op " %w0, %w0, %w3\n" \
|
||||
" st" #rel "xr %w1, %w0, %2\n" \
|
||||
" cbnz %w1, 1b\n" \
|
||||
" " #mb ) \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ld" #acq "xr %w0, %2\n" \
|
||||
" " #asm_op " %w0, %w0, %w3\n" \
|
||||
" st" #rel "xr %w1, %w0, %2\n" \
|
||||
" cbnz %w1, 1b\n" \
|
||||
" " #mb \
|
||||
: "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \
|
||||
: __stringify(constraint) "r" (i) \
|
||||
: cl); \
|
||||
@ -83,13 +68,12 @@ __ll_sc_atomic_fetch_##op##name(int i, atomic_t *v) \
|
||||
int val, result; \
|
||||
\
|
||||
asm volatile("// atomic_fetch_" #op #name "\n" \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %3\n" \
|
||||
"1: ld" #acq "xr %w0, %3\n" \
|
||||
" " #asm_op " %w1, %w0, %w4\n" \
|
||||
" st" #rel "xr %w2, %w1, %3\n" \
|
||||
" cbnz %w2, 1b\n" \
|
||||
" " #mb ) \
|
||||
" prfm pstl1strm, %3\n" \
|
||||
"1: ld" #acq "xr %w0, %3\n" \
|
||||
" " #asm_op " %w1, %w0, %w4\n" \
|
||||
" st" #rel "xr %w2, %w1, %3\n" \
|
||||
" cbnz %w2, 1b\n" \
|
||||
" " #mb \
|
||||
: "=&r" (result), "=&r" (val), "=&r" (tmp), "+Q" (v->counter) \
|
||||
: __stringify(constraint) "r" (i) \
|
||||
: cl); \
|
||||
@ -142,12 +126,11 @@ __ll_sc_atomic64_##op(s64 i, atomic64_t *v) \
|
||||
unsigned long tmp; \
|
||||
\
|
||||
asm volatile("// atomic64_" #op "\n" \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ldxr %0, %2\n" \
|
||||
" " #asm_op " %0, %0, %3\n" \
|
||||
" stxr %w1, %0, %2\n" \
|
||||
" cbnz %w1, 1b") \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ldxr %0, %2\n" \
|
||||
" " #asm_op " %0, %0, %3\n" \
|
||||
" stxr %w1, %0, %2\n" \
|
||||
" cbnz %w1, 1b" \
|
||||
: "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \
|
||||
: __stringify(constraint) "r" (i)); \
|
||||
}
|
||||
@ -160,13 +143,12 @@ __ll_sc_atomic64_##op##_return##name(s64 i, atomic64_t *v) \
|
||||
unsigned long tmp; \
|
||||
\
|
||||
asm volatile("// atomic64_" #op "_return" #name "\n" \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ld" #acq "xr %0, %2\n" \
|
||||
" " #asm_op " %0, %0, %3\n" \
|
||||
" st" #rel "xr %w1, %0, %2\n" \
|
||||
" cbnz %w1, 1b\n" \
|
||||
" " #mb ) \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ld" #acq "xr %0, %2\n" \
|
||||
" " #asm_op " %0, %0, %3\n" \
|
||||
" st" #rel "xr %w1, %0, %2\n" \
|
||||
" cbnz %w1, 1b\n" \
|
||||
" " #mb \
|
||||
: "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \
|
||||
: __stringify(constraint) "r" (i) \
|
||||
: cl); \
|
||||
@ -176,19 +158,18 @@ __ll_sc_atomic64_##op##_return##name(s64 i, atomic64_t *v) \
|
||||
|
||||
#define ATOMIC64_FETCH_OP(name, mb, acq, rel, cl, op, asm_op, constraint)\
|
||||
static inline long \
|
||||
__ll_sc_atomic64_fetch_##op##name(s64 i, atomic64_t *v) \
|
||||
__ll_sc_atomic64_fetch_##op##name(s64 i, atomic64_t *v) \
|
||||
{ \
|
||||
s64 result, val; \
|
||||
unsigned long tmp; \
|
||||
\
|
||||
asm volatile("// atomic64_fetch_" #op #name "\n" \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %3\n" \
|
||||
"1: ld" #acq "xr %0, %3\n" \
|
||||
" " #asm_op " %1, %0, %4\n" \
|
||||
" st" #rel "xr %w2, %1, %3\n" \
|
||||
" cbnz %w2, 1b\n" \
|
||||
" " #mb ) \
|
||||
" prfm pstl1strm, %3\n" \
|
||||
"1: ld" #acq "xr %0, %3\n" \
|
||||
" " #asm_op " %1, %0, %4\n" \
|
||||
" st" #rel "xr %w2, %1, %3\n" \
|
||||
" cbnz %w2, 1b\n" \
|
||||
" " #mb \
|
||||
: "=&r" (result), "=&r" (val), "=&r" (tmp), "+Q" (v->counter) \
|
||||
: __stringify(constraint) "r" (i) \
|
||||
: cl); \
|
||||
@ -240,15 +221,14 @@ __ll_sc_atomic64_dec_if_positive(atomic64_t *v)
|
||||
unsigned long tmp;
|
||||
|
||||
asm volatile("// atomic64_dec_if_positive\n"
|
||||
__LL_SC_FALLBACK(
|
||||
" prfm pstl1strm, %2\n"
|
||||
"1: ldxr %0, %2\n"
|
||||
" subs %0, %0, #1\n"
|
||||
" b.lt 2f\n"
|
||||
" stlxr %w1, %0, %2\n"
|
||||
" cbnz %w1, 1b\n"
|
||||
" dmb ish\n"
|
||||
"2:")
|
||||
" prfm pstl1strm, %2\n"
|
||||
"1: ldxr %0, %2\n"
|
||||
" subs %0, %0, #1\n"
|
||||
" b.lt 2f\n"
|
||||
" stlxr %w1, %0, %2\n"
|
||||
" cbnz %w1, 1b\n"
|
||||
" dmb ish\n"
|
||||
"2:"
|
||||
: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)
|
||||
:
|
||||
: "cc", "memory");
|
||||
@ -274,7 +254,6 @@ __ll_sc__cmpxchg_case_##name##sz(volatile void *ptr, \
|
||||
old = (u##sz)old; \
|
||||
\
|
||||
asm volatile( \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %[v]\n" \
|
||||
"1: ld" #acq "xr" #sfx "\t%" #w "[oldval], %[v]\n" \
|
||||
" eor %" #w "[tmp], %" #w "[oldval], %" #w "[old]\n" \
|
||||
@ -282,7 +261,7 @@ __ll_sc__cmpxchg_case_##name##sz(volatile void *ptr, \
|
||||
" st" #rel "xr" #sfx "\t%w[tmp], %" #w "[new], %[v]\n" \
|
||||
" cbnz %w[tmp], 1b\n" \
|
||||
" " #mb "\n" \
|
||||
"2:") \
|
||||
"2:" \
|
||||
: [tmp] "=&r" (tmp), [oldval] "=&r" (oldval), \
|
||||
[v] "+Q" (*(u##sz *)ptr) \
|
||||
: [old] __stringify(constraint) "r" (old), [new] "r" (new) \
|
||||
@ -326,7 +305,6 @@ __ll_sc__cmpxchg_double##name(unsigned long old1, \
|
||||
unsigned long tmp, ret; \
|
||||
\
|
||||
asm volatile("// __cmpxchg_double" #name "\n" \
|
||||
__LL_SC_FALLBACK( \
|
||||
" prfm pstl1strm, %2\n" \
|
||||
"1: ldxp %0, %1, %2\n" \
|
||||
" eor %0, %0, %3\n" \
|
||||
@ -336,8 +314,8 @@ __ll_sc__cmpxchg_double##name(unsigned long old1, \
|
||||
" st" #rel "xp %w0, %5, %6, %2\n" \
|
||||
" cbnz %w0, 1b\n" \
|
||||
" " #mb "\n" \
|
||||
"2:") \
|
||||
: "=&r" (tmp), "=&r" (ret), "+Q" (*(unsigned long *)ptr) \
|
||||
"2:" \
|
||||
: "=&r" (tmp), "=&r" (ret), "+Q" (*(__uint128_t *)ptr) \
|
||||
: "r" (old1), "r" (old2), "r" (new1), "r" (new2) \
|
||||
: cl); \
|
||||
\
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
#define __ASM_ATOMIC_LSE_H
|
||||
|
||||
#define ATOMIC_OP(op, asm_op) \
|
||||
static inline void __lse_atomic_##op(int i, atomic_t *v) \
|
||||
static inline void __lse_atomic_##op(int i, atomic_t *v) \
|
||||
{ \
|
||||
asm volatile( \
|
||||
__LSE_PREAMBLE \
|
||||
" " #asm_op " %w[i], %[v]\n" \
|
||||
" " #asm_op " %w[i], %[v]\n" \
|
||||
: [i] "+r" (i), [v] "+Q" (v->counter) \
|
||||
: "r" (v)); \
|
||||
}
|
||||
@ -32,7 +32,7 @@ static inline int __lse_atomic_fetch_##op##name(int i, atomic_t *v) \
|
||||
{ \
|
||||
asm volatile( \
|
||||
__LSE_PREAMBLE \
|
||||
" " #asm_op #mb " %w[i], %w[i], %[v]" \
|
||||
" " #asm_op #mb " %w[i], %w[i], %[v]" \
|
||||
: [i] "+r" (i), [v] "+Q" (v->counter) \
|
||||
: "r" (v) \
|
||||
: cl); \
|
||||
@ -130,7 +130,7 @@ static inline int __lse_atomic_sub_return##name(int i, atomic_t *v) \
|
||||
" add %w[i], %w[i], %w[tmp]" \
|
||||
: [i] "+&r" (i), [v] "+Q" (v->counter), [tmp] "=&r" (tmp) \
|
||||
: "r" (v) \
|
||||
: cl); \
|
||||
: cl); \
|
||||
\
|
||||
return i; \
|
||||
}
|
||||
@ -168,7 +168,7 @@ static inline void __lse_atomic64_##op(s64 i, atomic64_t *v) \
|
||||
{ \
|
||||
asm volatile( \
|
||||
__LSE_PREAMBLE \
|
||||
" " #asm_op " %[i], %[v]\n" \
|
||||
" " #asm_op " %[i], %[v]\n" \
|
||||
: [i] "+r" (i), [v] "+Q" (v->counter) \
|
||||
: "r" (v)); \
|
||||
}
|
||||
@ -185,7 +185,7 @@ static inline long __lse_atomic64_fetch_##op##name(s64 i, atomic64_t *v)\
|
||||
{ \
|
||||
asm volatile( \
|
||||
__LSE_PREAMBLE \
|
||||
" " #asm_op #mb " %[i], %[i], %[v]" \
|
||||
" " #asm_op #mb " %[i], %[i], %[v]" \
|
||||
: [i] "+r" (i), [v] "+Q" (v->counter) \
|
||||
: "r" (v) \
|
||||
: cl); \
|
||||
@ -272,7 +272,7 @@ static inline void __lse_atomic64_sub(s64 i, atomic64_t *v)
|
||||
}
|
||||
|
||||
#define ATOMIC64_OP_SUB_RETURN(name, mb, cl...) \
|
||||
static inline long __lse_atomic64_sub_return##name(s64 i, atomic64_t *v) \
|
||||
static inline long __lse_atomic64_sub_return##name(s64 i, atomic64_t *v)\
|
||||
{ \
|
||||
unsigned long tmp; \
|
||||
\
|
||||
@ -403,7 +403,7 @@ __lse__cmpxchg_double##name(unsigned long old1, \
|
||||
" eor %[old2], %[old2], %[oldval2]\n" \
|
||||
" orr %[old1], %[old1], %[old2]" \
|
||||
: [old1] "+&r" (x0), [old2] "+&r" (x1), \
|
||||
[v] "+Q" (*(unsigned long *)ptr) \
|
||||
[v] "+Q" (*(__uint128_t *)ptr) \
|
||||
: [new1] "r" (x2), [new2] "r" (x3), [ptr] "r" (x4), \
|
||||
[oldval1] "r" (oldval1), [oldval2] "r" (oldval2) \
|
||||
: cl); \
|
||||
|
||||
@ -378,8 +378,26 @@ static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu)
|
||||
|
||||
static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
if (kvm_vcpu_abt_iss1tw(vcpu))
|
||||
return true;
|
||||
if (kvm_vcpu_abt_iss1tw(vcpu)) {
|
||||
/*
|
||||
* Only a permission fault on a S1PTW should be
|
||||
* considered as a write. Otherwise, page tables baked
|
||||
* in a read-only memslot will result in an exception
|
||||
* being delivered in the guest.
|
||||
*
|
||||
* The drawback is that we end-up faulting twice if the
|
||||
* guest is using any of HW AF/DB: a translation fault
|
||||
* to map the page containing the PT (read only at
|
||||
* first), then a permission fault to allow the flags
|
||||
* to be set.
|
||||
*/
|
||||
switch (kvm_vcpu_trap_get_fault_type(vcpu)) {
|
||||
case ESR_ELx_FSC_PERM:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (kvm_vcpu_trap_is_iabt(vcpu))
|
||||
return false;
|
||||
|
||||
@ -202,7 +202,7 @@ void die(const char *str, struct pt_regs *regs, int err)
|
||||
raw_spin_unlock_irqrestore(&die_lock, flags);
|
||||
|
||||
if (ret != NOTIFY_STOP)
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
static void arm64_show_signal(int signo, const char *str)
|
||||
|
||||
@ -296,7 +296,7 @@ static void die_kernel_fault(const char *msg, unsigned long addr,
|
||||
show_pte(addr);
|
||||
die("Oops", regs, esr);
|
||||
bust_spinlocks(0);
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
}
|
||||
|
||||
static void __do_kernel_fault(unsigned long addr, unsigned int esr,
|
||||
|
||||
@ -294,7 +294,7 @@ bad_area:
|
||||
__func__, opcode, rz, rx, imm, addr);
|
||||
show_regs(regs);
|
||||
bust_spinlocks(0);
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
}
|
||||
|
||||
force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr);
|
||||
|
||||
@ -85,7 +85,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, int nr)
|
||||
pr_err("%s: %08x\n", str, nr);
|
||||
show_regs(regs);
|
||||
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
void buserr(struct pt_regs *regs)
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/sched/debug.h>
|
||||
#include <linux/sched/task.h>
|
||||
#include <linux/mm_types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/errno.h>
|
||||
@ -110,7 +111,7 @@ void die(const char *str, struct pt_regs *fp, unsigned long err)
|
||||
dump(fp);
|
||||
|
||||
spin_unlock_irq(&die_lock);
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
static int kstack_depth_to_print = 24;
|
||||
|
||||
@ -52,7 +52,7 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
|
||||
printk(" at virtual address %08lx\n", address);
|
||||
if (!user_mode(regs))
|
||||
die("Oops", regs, error_code);
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -221,7 +221,7 @@ int die(const char *str, struct pt_regs *regs, long err)
|
||||
panic("Fatal exception");
|
||||
|
||||
oops_exit();
|
||||
do_exit(err);
|
||||
make_task_dead(err);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -360,7 +360,7 @@ config ARCH_PROC_KCORE_TEXT
|
||||
depends on PROC_KCORE
|
||||
|
||||
config IA64_MCA_RECOVERY
|
||||
tristate "MCA recovery from errors other than TLB."
|
||||
bool "MCA recovery from errors other than TLB."
|
||||
|
||||
config PERFMON
|
||||
bool "Performance monitor support"
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/sched/task.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/kallsyms.h>
|
||||
@ -176,7 +177,7 @@ mca_handler_bh(unsigned long paddr, void *iip, unsigned long ipsr)
|
||||
spin_unlock(&mca_bh_lock);
|
||||
|
||||
/* This process is about to be killed itself */
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -85,7 +85,7 @@ die (const char *str, struct pt_regs *regs, long err)
|
||||
if (panic_on_oops)
|
||||
panic("Fatal exception");
|
||||
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -272,7 +272,7 @@ retry:
|
||||
regs = NULL;
|
||||
bust_spinlocks(0);
|
||||
if (regs)
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
return;
|
||||
|
||||
out_of_memory:
|
||||
|
||||
@ -1139,7 +1139,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr)
|
||||
pr_crit("%s: %08x\n", str, nr);
|
||||
show_registers(fp);
|
||||
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
asmlinkage void set_esp0(unsigned long ssp)
|
||||
|
||||
@ -48,7 +48,7 @@ int send_fault_sig(struct pt_regs *regs)
|
||||
pr_alert("Unable to handle kernel access");
|
||||
pr_cont(" at virtual address %p\n", addr);
|
||||
die_if_kernel("Oops", regs, 0 /*error_code*/);
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
||||
@ -44,10 +44,10 @@ void die(const char *str, struct pt_regs *fp, long err)
|
||||
pr_warn("Oops: %s, sig: %ld\n", str, err);
|
||||
show_regs(fp);
|
||||
spin_unlock_irq(&die_lock);
|
||||
/* do_exit() should take care of panic'ing from an interrupt
|
||||
/* make_task_dead() should take care of panic'ing from an interrupt
|
||||
* context so we don't handle it here
|
||||
*/
|
||||
do_exit(err);
|
||||
make_task_dead(err);
|
||||
}
|
||||
|
||||
/* for user application debugging */
|
||||
|
||||
@ -361,6 +361,8 @@ static struct clk clk_periph = {
|
||||
*/
|
||||
int clk_enable(struct clk *clk)
|
||||
{
|
||||
if (!clk)
|
||||
return 0;
|
||||
mutex_lock(&clocks_mutex);
|
||||
clk_enable_unlocked(clk);
|
||||
mutex_unlock(&clocks_mutex);
|
||||
|
||||
@ -211,7 +211,7 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)
|
||||
{
|
||||
cvmx_helper_link_info_t result;
|
||||
|
||||
WARN(!octeon_is_simulation(),
|
||||
WARN_ONCE(!octeon_is_simulation(),
|
||||
"Using deprecated link status - please update your DT");
|
||||
|
||||
/* Unless we fix it later, all links are defaulted to down */
|
||||
|
||||
@ -1100,7 +1100,7 @@ cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port)
|
||||
if (index == 0)
|
||||
result = __cvmx_helper_rgmii_link_get(ipd_port);
|
||||
else {
|
||||
WARN(1, "Using deprecated link status - please update your DT");
|
||||
WARN_ONCE(1, "Using deprecated link status - please update your DT");
|
||||
result.s.full_duplex = 1;
|
||||
result.s.link_up = 1;
|
||||
result.s.speed = 1000;
|
||||
|
||||
@ -415,7 +415,7 @@ void __noreturn die(const char *str, struct pt_regs *regs)
|
||||
if (regs && kexec_should_crash(current))
|
||||
crash_kexec(regs);
|
||||
|
||||
do_exit(sig);
|
||||
make_task_dead(sig);
|
||||
}
|
||||
|
||||
extern struct exception_table_entry __start___dbe_table[];
|
||||
|
||||
@ -75,7 +75,6 @@ ATTRIBUTE_GROUPS(vpe);
|
||||
|
||||
static void vpe_device_release(struct device *cd)
|
||||
{
|
||||
kfree(cd);
|
||||
}
|
||||
|
||||
static struct class vpe_class = {
|
||||
@ -157,6 +156,7 @@ out_dev:
|
||||
device_del(&vpe_device);
|
||||
|
||||
out_class:
|
||||
put_device(&vpe_device);
|
||||
class_unregister(&vpe_class);
|
||||
|
||||
out_chrdev:
|
||||
@ -169,7 +169,7 @@ void __exit vpe_module_exit(void)
|
||||
{
|
||||
struct vpe *v, *n;
|
||||
|
||||
device_del(&vpe_device);
|
||||
device_unregister(&vpe_device);
|
||||
class_unregister(&vpe_class);
|
||||
unregister_chrdev(major, VPE_MODULE_NAME);
|
||||
|
||||
|
||||
@ -313,7 +313,6 @@ ATTRIBUTE_GROUPS(vpe);
|
||||
|
||||
static void vpe_device_release(struct device *cd)
|
||||
{
|
||||
kfree(cd);
|
||||
}
|
||||
|
||||
static struct class vpe_class = {
|
||||
@ -497,6 +496,7 @@ out_dev:
|
||||
device_del(&vpe_device);
|
||||
|
||||
out_class:
|
||||
put_device(&vpe_device);
|
||||
class_unregister(&vpe_class);
|
||||
|
||||
out_chrdev:
|
||||
@ -509,7 +509,7 @@ void __exit vpe_module_exit(void)
|
||||
{
|
||||
struct vpe *v, *n;
|
||||
|
||||
device_del(&vpe_device);
|
||||
device_unregister(&vpe_device);
|
||||
class_unregister(&vpe_class);
|
||||
unregister_chrdev(major, VPE_MODULE_NAME);
|
||||
|
||||
|
||||
@ -223,7 +223,7 @@ inline void handle_fpu_exception(struct pt_regs *regs)
|
||||
}
|
||||
} else if (fpcsr & FPCSR_mskRIT) {
|
||||
if (!user_mode(regs))
|
||||
do_exit(SIGILL);
|
||||
make_task_dead(SIGILL);
|
||||
si_signo = SIGILL;
|
||||
}
|
||||
|
||||
|
||||
@ -184,7 +184,7 @@ void die(const char *str, struct pt_regs *regs, int err)
|
||||
|
||||
bust_spinlocks(0);
|
||||
spin_unlock_irq(&die_lock);
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(die);
|
||||
@ -288,7 +288,7 @@ void unhandled_interruption(struct pt_regs *regs)
|
||||
pr_emerg("unhandled_interruption\n");
|
||||
show_regs(regs);
|
||||
if (!user_mode(regs))
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
force_sig(SIGKILL);
|
||||
}
|
||||
|
||||
@ -299,7 +299,7 @@ void unhandled_exceptions(unsigned long entry, unsigned long addr,
|
||||
addr, type);
|
||||
show_regs(regs);
|
||||
if (!user_mode(regs))
|
||||
do_exit(SIGKILL);
|
||||
make_task_dead(SIGKILL);
|
||||
force_sig(SIGKILL);
|
||||
}
|
||||
|
||||
@ -326,7 +326,7 @@ void do_revinsn(struct pt_regs *regs)
|
||||
pr_emerg("Reserved Instruction\n");
|
||||
show_regs(regs);
|
||||
if (!user_mode(regs))
|
||||
do_exit(SIGILL);
|
||||
make_task_dead(SIGILL);
|
||||
force_sig(SIGILL);
|
||||
}
|
||||
|
||||
|
||||
@ -37,10 +37,10 @@ void die(const char *str, struct pt_regs *regs, long err)
|
||||
show_regs(regs);
|
||||
spin_unlock_irq(&die_lock);
|
||||
/*
|
||||
* do_exit() should take care of panic'ing from an interrupt
|
||||
* make_task_dead() should take care of panic'ing from an interrupt
|
||||
* context so we don't handle it here
|
||||
*/
|
||||
do_exit(err);
|
||||
make_task_dead(err);
|
||||
}
|
||||
|
||||
void _exception(int signo, struct pt_regs *regs, int code, unsigned long addr)
|
||||
|
||||
@ -218,7 +218,7 @@ void die(const char *str, struct pt_regs *regs, long err)
|
||||
__asm__ __volatile__("l.nop 1");
|
||||
do {} while (1);
|
||||
#endif
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
/* This is normally the 'Oops' routine */
|
||||
|
||||
@ -48,28 +48,27 @@
|
||||
#define MADV_DONTFORK 10 /* don't inherit across fork */
|
||||
#define MADV_DOFORK 11 /* do inherit across fork */
|
||||
|
||||
#define MADV_MERGEABLE 12 /* KSM may merge identical pages */
|
||||
#define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */
|
||||
|
||||
#define MADV_HUGEPAGE 14 /* Worth backing with hugepages */
|
||||
#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */
|
||||
|
||||
#define MADV_DONTDUMP 16 /* Explicity exclude from the core dump,
|
||||
overrides the coredump filter bits */
|
||||
#define MADV_DODUMP 17 /* Clear the MADV_NODUMP flag */
|
||||
|
||||
#define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */
|
||||
#define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */
|
||||
|
||||
#define MADV_COLD 20 /* deactivate these pages */
|
||||
#define MADV_PAGEOUT 21 /* reclaim these pages */
|
||||
|
||||
#define MADV_MERGEABLE 65 /* KSM may merge identical pages */
|
||||
#define MADV_UNMERGEABLE 66 /* KSM may not merge identical pages */
|
||||
|
||||
#define MADV_HUGEPAGE 67 /* Worth backing with hugepages */
|
||||
#define MADV_NOHUGEPAGE 68 /* Not worth backing with hugepages */
|
||||
|
||||
#define MADV_DONTDUMP 69 /* Explicity exclude from the core dump,
|
||||
overrides the coredump filter bits */
|
||||
#define MADV_DODUMP 70 /* Clear the MADV_NODUMP flag */
|
||||
|
||||
#define MADV_WIPEONFORK 71 /* Zero memory on fork, child only */
|
||||
#define MADV_KEEPONFORK 72 /* Undo MADV_WIPEONFORK */
|
||||
|
||||
#define MADV_HWPOISON 100 /* poison a page for testing */
|
||||
#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
|
||||
|
||||
/* compatibility flags */
|
||||
#define MAP_FILE 0
|
||||
#define MAP_VARIABLE 0
|
||||
|
||||
#define PKEY_DISABLE_ACCESS 0x1
|
||||
#define PKEY_DISABLE_WRITE 0x2
|
||||
|
||||
@ -1229,7 +1229,7 @@ static char __attribute__((aligned(64))) iodc_dbuf[4096];
|
||||
*/
|
||||
int pdc_iodc_print(const unsigned char *str, unsigned count)
|
||||
{
|
||||
unsigned int i;
|
||||
unsigned int i, found = 0;
|
||||
unsigned long flags;
|
||||
|
||||
for (i = 0; i < count;) {
|
||||
@ -1238,6 +1238,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count)
|
||||
iodc_dbuf[i+0] = '\r';
|
||||
iodc_dbuf[i+1] = '\n';
|
||||
i += 2;
|
||||
found = 1;
|
||||
goto print;
|
||||
default:
|
||||
iodc_dbuf[i] = str[i];
|
||||
@ -1254,7 +1255,7 @@ print:
|
||||
__pa(iodc_retbuf), 0, __pa(iodc_dbuf), i, 0);
|
||||
spin_unlock_irqrestore(&pdc_lock, flags);
|
||||
|
||||
return i;
|
||||
return i - found;
|
||||
}
|
||||
|
||||
#if !defined(BOOTLOADER)
|
||||
|
||||
@ -128,6 +128,12 @@ long arch_ptrace(struct task_struct *child, long request,
|
||||
unsigned long tmp;
|
||||
long ret = -EIO;
|
||||
|
||||
unsigned long user_regs_struct_size = sizeof(struct user_regs_struct);
|
||||
#ifdef CONFIG_64BIT
|
||||
if (is_compat_task())
|
||||
user_regs_struct_size /= 2;
|
||||
#endif
|
||||
|
||||
switch (request) {
|
||||
|
||||
/* Read the word at location addr in the USER area. For ptraced
|
||||
@ -183,14 +189,14 @@ long arch_ptrace(struct task_struct *child, long request,
|
||||
return copy_regset_to_user(child,
|
||||
task_user_regset_view(current),
|
||||
REGSET_GENERAL,
|
||||
0, sizeof(struct user_regs_struct),
|
||||
0, user_regs_struct_size,
|
||||
datap);
|
||||
|
||||
case PTRACE_SETREGS: /* Set all gp regs in the child. */
|
||||
return copy_regset_from_user(child,
|
||||
task_user_regset_view(current),
|
||||
REGSET_GENERAL,
|
||||
0, sizeof(struct user_regs_struct),
|
||||
0, user_regs_struct_size,
|
||||
datap);
|
||||
|
||||
case PTRACE_GETFPREGS: /* Get the child FPU state. */
|
||||
@ -304,6 +310,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
|
||||
}
|
||||
}
|
||||
break;
|
||||
case PTRACE_GETREGS:
|
||||
case PTRACE_SETREGS:
|
||||
case PTRACE_GETFPREGS:
|
||||
case PTRACE_SETFPREGS:
|
||||
return arch_ptrace(child, request, addr, data);
|
||||
|
||||
default:
|
||||
ret = compat_ptrace_request(child, request, addr, data);
|
||||
|
||||
@ -373,3 +373,30 @@ long parisc_personality(unsigned long personality)
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
/*
|
||||
* madvise() wrapper
|
||||
*
|
||||
* Up to kernel v6.1 parisc has different values than all other
|
||||
* platforms for the MADV_xxx flags listed below.
|
||||
* To keep binary compatibility with existing userspace programs
|
||||
* translate the former values to the new values.
|
||||
*
|
||||
* XXX: Remove this wrapper in year 2025 (or later)
|
||||
*/
|
||||
|
||||
asmlinkage notrace long parisc_madvise(unsigned long start, size_t len_in, int behavior)
|
||||
{
|
||||
switch (behavior) {
|
||||
case 65: behavior = MADV_MERGEABLE; break;
|
||||
case 66: behavior = MADV_UNMERGEABLE; break;
|
||||
case 67: behavior = MADV_HUGEPAGE; break;
|
||||
case 68: behavior = MADV_NOHUGEPAGE; break;
|
||||
case 69: behavior = MADV_DONTDUMP; break;
|
||||
case 70: behavior = MADV_DODUMP; break;
|
||||
case 71: behavior = MADV_WIPEONFORK; break;
|
||||
case 72: behavior = MADV_KEEPONFORK; break;
|
||||
}
|
||||
|
||||
return sys_madvise(start, len_in, behavior);
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@
|
||||
116 common sysinfo sys_sysinfo compat_sys_sysinfo
|
||||
117 common shutdown sys_shutdown
|
||||
118 common fsync sys_fsync
|
||||
119 common madvise sys_madvise
|
||||
119 common madvise parisc_madvise
|
||||
120 common clone sys_clone_wrapper
|
||||
121 common setdomainname sys_setdomainname
|
||||
122 common sendfile sys_sendfile compat_sys_sendfile
|
||||
|
||||
@ -268,7 +268,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
|
||||
panic("Fatal exception");
|
||||
|
||||
oops_exit();
|
||||
do_exit(SIGSEGV);
|
||||
make_task_dead(SIGSEGV);
|
||||
}
|
||||
|
||||
/* gdb uses break 4,8 */
|
||||
|
||||
44
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
Normal file
44
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
Normal file
@ -0,0 +1,44 @@
|
||||
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
|
||||
/*
|
||||
* QorIQ FMan v3 10g port #2 device tree stub [ controller @ offset 0x400000 ]
|
||||
*
|
||||
* Copyright 2022 Sean Anderson <sean.anderson@seco.com>
|
||||
* Copyright 2012 - 2015 Freescale Semiconductor Inc.
|
||||
*/
|
||||
|
||||
fman@400000 {
|
||||
fman0_rx_0x08: port@88000 {
|
||||
cell-index = <0x8>;
|
||||
compatible = "fsl,fman-v3-port-rx";
|
||||
reg = <0x88000 0x1000>;
|
||||
fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
fman0_tx_0x28: port@a8000 {
|
||||
cell-index = <0x28>;
|
||||
compatible = "fsl,fman-v3-port-tx";
|
||||
reg = <0xa8000 0x1000>;
|
||||
fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
ethernet@e0000 {
|
||||
cell-index = <0>;
|
||||
compatible = "fsl,fman-memac";
|
||||
reg = <0xe0000 0x1000>;
|
||||
fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
|
||||
ptp-timer = <&ptp_timer0>;
|
||||
pcsphy-handle = <&pcsphy0>;
|
||||
};
|
||||
|
||||
mdio@e1000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
|
||||
reg = <0xe1000 0x1000>;
|
||||
fsl,erratum-a011043; /* must ignore read errors */
|
||||
|
||||
pcsphy0: ethernet-phy@0 {
|
||||
reg = <0x0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
44
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
Normal file
44
arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
Normal file
@ -0,0 +1,44 @@
|
||||
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
|
||||
/*
|
||||
* QorIQ FMan v3 10g port #3 device tree stub [ controller @ offset 0x400000 ]
|
||||
*
|
||||
* Copyright 2022 Sean Anderson <sean.anderson@seco.com>
|
||||
* Copyright 2012 - 2015 Freescale Semiconductor Inc.
|
||||
*/
|
||||
|
||||
fman@400000 {
|
||||
fman0_rx_0x09: port@89000 {
|
||||
cell-index = <0x9>;
|
||||
compatible = "fsl,fman-v3-port-rx";
|
||||
reg = <0x89000 0x1000>;
|
||||
fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
fman0_tx_0x29: port@a9000 {
|
||||
cell-index = <0x29>;
|
||||
compatible = "fsl,fman-v3-port-tx";
|
||||
reg = <0xa9000 0x1000>;
|
||||
fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
ethernet@e2000 {
|
||||
cell-index = <1>;
|
||||
compatible = "fsl,fman-memac";
|
||||
reg = <0xe2000 0x1000>;
|
||||
fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
|
||||
ptp-timer = <&ptp_timer0>;
|
||||
pcsphy-handle = <&pcsphy1>;
|
||||
};
|
||||
|
||||
mdio@e3000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
|
||||
reg = <0xe3000 0x1000>;
|
||||
fsl,erratum-a011043; /* must ignore read errors */
|
||||
|
||||
pcsphy1: ethernet-phy@0 {
|
||||
reg = <0x0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -609,8 +609,8 @@
|
||||
/include/ "qoriq-bman1.dtsi"
|
||||
|
||||
/include/ "qoriq-fman3-0.dtsi"
|
||||
/include/ "qoriq-fman3-0-1g-0.dtsi"
|
||||
/include/ "qoriq-fman3-0-1g-1.dtsi"
|
||||
/include/ "qoriq-fman3-0-10g-2.dtsi"
|
||||
/include/ "qoriq-fman3-0-10g-3.dtsi"
|
||||
/include/ "qoriq-fman3-0-1g-2.dtsi"
|
||||
/include/ "qoriq-fman3-0-1g-3.dtsi"
|
||||
/include/ "qoriq-fman3-0-1g-4.dtsi"
|
||||
@ -659,3 +659,19 @@
|
||||
interrupts = <16 2 1 9>;
|
||||
};
|
||||
};
|
||||
|
||||
&fman0_rx_0x08 {
|
||||
/delete-property/ fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
&fman0_tx_0x28 {
|
||||
/delete-property/ fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
&fman0_rx_0x09 {
|
||||
/delete-property/ fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
&fman0_tx_0x29 {
|
||||
/delete-property/ fsl,fman-10g-port;
|
||||
};
|
||||
|
||||
@ -132,7 +132,7 @@ struct imc_pmu {
|
||||
* are inited.
|
||||
*/
|
||||
struct imc_pmu_ref {
|
||||
struct mutex lock;
|
||||
spinlock_t lock;
|
||||
unsigned int id;
|
||||
int refc;
|
||||
};
|
||||
|
||||
@ -714,6 +714,7 @@ void __noreturn rtas_halt(void)
|
||||
|
||||
/* Must be in the RMO region, so we place it here */
|
||||
static char rtas_os_term_buf[2048];
|
||||
static s32 ibm_os_term_token = RTAS_UNKNOWN_SERVICE;
|
||||
|
||||
void rtas_os_term(char *str)
|
||||
{
|
||||
@ -725,16 +726,20 @@ void rtas_os_term(char *str)
|
||||
* this property may terminate the partition which we want to avoid
|
||||
* since it interferes with panic_timeout.
|
||||
*/
|
||||
if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term") ||
|
||||
RTAS_UNKNOWN_SERVICE == rtas_token("ibm,extended-os-term"))
|
||||
if (ibm_os_term_token == RTAS_UNKNOWN_SERVICE)
|
||||
return;
|
||||
|
||||
snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str);
|
||||
|
||||
/*
|
||||
* Keep calling as long as RTAS returns a "try again" status,
|
||||
* but don't use rtas_busy_delay(), which potentially
|
||||
* schedules.
|
||||
*/
|
||||
do {
|
||||
status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL,
|
||||
status = rtas_call(ibm_os_term_token, 1, 1, NULL,
|
||||
__pa(rtas_os_term_buf));
|
||||
} while (rtas_busy_delay(status));
|
||||
} while (rtas_busy_delay_time(status));
|
||||
|
||||
if (status != 0)
|
||||
printk(KERN_EMERG "ibm,os-term call failed %d\n", status);
|
||||
@ -1215,6 +1220,13 @@ void __init rtas_initialize(void)
|
||||
no_entry = of_property_read_u32(rtas.dev, "linux,rtas-entry", &entry);
|
||||
rtas.entry = no_entry ? rtas.base : entry;
|
||||
|
||||
/*
|
||||
* Discover these now to avoid device tree lookups in the
|
||||
* panic path.
|
||||
*/
|
||||
if (of_property_read_bool(rtas.dev, "ibm,extended-os-term"))
|
||||
ibm_os_term_token = rtas_token("ibm,os-term");
|
||||
|
||||
/* If RTAS was found, allocate the RMO buffer for it and look for
|
||||
* the stop-self token if any
|
||||
*/
|
||||
|
||||
@ -246,7 +246,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs,
|
||||
|
||||
if (panic_on_oops)
|
||||
panic("Fatal exception");
|
||||
do_exit(signr);
|
||||
make_task_dead(signr);
|
||||
}
|
||||
NOKPROBE_SYMBOL(oops_end);
|
||||
|
||||
|
||||
@ -64,6 +64,7 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re
|
||||
next_sp = fp[0];
|
||||
|
||||
if (next_sp == sp + STACK_INT_FRAME_SIZE &&
|
||||
validate_sp(sp, current, STACK_INT_FRAME_SIZE) &&
|
||||
fp[STACK_FRAME_MARKER] == STACK_FRAME_REGS_MARKER) {
|
||||
/*
|
||||
* This looks like an interrupt frame for an
|
||||
|
||||
@ -79,6 +79,7 @@ REQUEST(__field(0, 8, partition_id)
|
||||
)
|
||||
#include I(REQUEST_END)
|
||||
|
||||
#ifdef ENABLE_EVENTS_COUNTERINFO_V6
|
||||
/*
|
||||
* Not available for counter_info_version >= 0x8, use
|
||||
* run_instruction_cycles_by_partition(0x100) instead.
|
||||
@ -92,6 +93,7 @@ REQUEST(__field(0, 8, partition_id)
|
||||
__count(0x10, 8, cycles)
|
||||
)
|
||||
#include I(REQUEST_END)
|
||||
#endif
|
||||
|
||||
#define REQUEST_NAME system_performance_capabilities
|
||||
#define REQUEST_NUM 0x40
|
||||
@ -103,6 +105,7 @@ REQUEST(__field(0, 1, perf_collect_privileged)
|
||||
)
|
||||
#include I(REQUEST_END)
|
||||
|
||||
#ifdef ENABLE_EVENTS_COUNTERINFO_V6
|
||||
#define REQUEST_NAME processor_bus_utilization_abc_links
|
||||
#define REQUEST_NUM 0x50
|
||||
#define REQUEST_IDX_KIND "hw_chip_id=?"
|
||||
@ -194,6 +197,7 @@ REQUEST(__field(0, 4, phys_processor_idx)
|
||||
__count(0x28, 8, instructions_completed)
|
||||
)
|
||||
#include I(REQUEST_END)
|
||||
#endif
|
||||
|
||||
/* Processor_core_power_mode (0x95) skipped, no counters */
|
||||
/* Affinity_domain_information_by_virtual_processor (0xA0) skipped,
|
||||
|
||||
@ -70,7 +70,7 @@ static struct attribute_group format_group = {
|
||||
|
||||
static struct attribute_group event_group = {
|
||||
.name = "events",
|
||||
.attrs = hv_gpci_event_attrs,
|
||||
/* .attrs is set in init */
|
||||
};
|
||||
|
||||
#define HV_CAPS_ATTR(_name, _format) \
|
||||
@ -280,6 +280,7 @@ static int hv_gpci_init(void)
|
||||
int r;
|
||||
unsigned long hret;
|
||||
struct hv_perf_caps caps;
|
||||
struct hv_gpci_request_buffer *arg;
|
||||
|
||||
hv_gpci_assert_offsets_correct();
|
||||
|
||||
@ -298,6 +299,36 @@ static int hv_gpci_init(void)
|
||||
/* sampling not supported */
|
||||
h_gpci_pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
|
||||
|
||||
arg = (void *)get_cpu_var(hv_gpci_reqb);
|
||||
memset(arg, 0, HGPCI_REQ_BUFFER_SIZE);
|
||||
|
||||
/*
|
||||
* hcall H_GET_PERF_COUNTER_INFO populates the output
|
||||
* counter_info_version value based on the system hypervisor.
|
||||
* Pass the counter request 0x10 corresponds to request type
|
||||
* 'Dispatch_timebase_by_processor', to get the supported
|
||||
* counter_info_version.
|
||||
*/
|
||||
arg->params.counter_request = cpu_to_be32(0x10);
|
||||
|
||||
r = plpar_hcall_norets(H_GET_PERF_COUNTER_INFO,
|
||||
virt_to_phys(arg), HGPCI_REQ_BUFFER_SIZE);
|
||||
if (r) {
|
||||
pr_devel("hcall failed, can't get supported counter_info_version: 0x%x\n", r);
|
||||
arg->params.counter_info_version_out = 0x8;
|
||||
}
|
||||
|
||||
/*
|
||||
* Use counter_info_version_out value to assign
|
||||
* required hv-gpci event list.
|
||||
*/
|
||||
if (arg->params.counter_info_version_out >= 0x8)
|
||||
event_group.attrs = hv_gpci_event_attrs;
|
||||
else
|
||||
event_group.attrs = hv_gpci_event_attrs_v6;
|
||||
|
||||
put_cpu_var(hv_gpci_reqb);
|
||||
|
||||
r = perf_pmu_register(&h_gpci_pmu, h_gpci_pmu.name, -1);
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user