Merge tag 'android11-5.4.180_r00' into android11-5.4
This is the merge of the upstream LTS release of 5.4.180 into the android11-5.4 branch. It contains the following commits:20d2140d23Merge 5.4.180 into android11-5.4-lts7b3eb66d0dLinux 5.4.1809d09cb1108ACPI: PM: s2idle: Cancel wakeup before dispatching EC GPEa2ed7b29d0perf: Fix list corruption in perf_cgroup_switch()f79cbf75acscsi: lpfc: Remove NVMe support if kernel has NVME_FC disableda1a018e2a0hwmon: (dell-smm) Speed up setting of fan speed1e30073c0eseccomp: Invalidate seccomp mode to catch death failuresa3769078c9USB: serial: cp210x: add CPI Bulk Coin Recycler idfade0cbf66USB: serial: cp210x: add NCR Retail IO box id697b9ed28bUSB: serial: ch341: add support for GW Instek USB2.0-Serial devicesed4fddac9dUSB: serial: option: add ZTE MF286D modemf729dfd364USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320f297b6109cusb: gadget: f_uac2: Define specific wTerminalTypec9e952871ausb: gadget: rndis: check size of RNDIS_MSG_SET command38fd68f55aUSB: gadget: validate interface OS descriptor requests3054dfef06usb: gadget: udc: renesas_usb3: Fix host to USB_ROLE_NONE transition8f032eaebcusb: dwc3: gadget: Prevent core from processing stale TRBs3a9953b280usb: ulpi: Call of_node_put correctly12ab57a213usb: ulpi: Move of_node_put to ulpi_dev_releasea0fd5492eenet: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup3937c35493eeprom: ee1004: limit i2c reads to I2C_SMBUS_BLOCK_MAXd4dc28db1bn_tty: wake up poll(POLLRDNORM) on receiving data0e31f914d7vt_ioctl: add array_index_nospec to VT_ACTIVATEae3d574115vt_ioctl: fix array_index_nospec in vt_setactivate311c82a680net: amd-xgbe: disable interrupts during pci removalb3e998a5dctipc: rate limit warning for received illegal binding updatee7daad5c28net: mdio: aspeed: Add missing MODULE_DEVICE_TABLEc99e66350cveth: fix races around rq->rx_notify_maskeda80817adc2net: fix a memleak when uncloning an skb dst and its metadata0b6087c635net: do not keep the dst cache when uncloning an skb dst and its metadata3f41ec8c83nfp: flower: fix ida_idx not being released16dcfde98aipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path4bcfbec337bonding: pair enable_port with slave_arr_updatese432f25c77ixgbevf: Require large buffers for build_skb on 82599VF4e6fd2b5fcmisc: fastrpc: avoid double fput() on failed usercopyc9fc422c9ausb: f_fs: Fix use-after-free for epfile336222182aARM: dts: imx6qdl-udoo: Properly describe the SD card detect94888cf755staging: fbtft: Fix error path in fbtft_driver_module_init()2650ed4707ARM: dts: meson: Fix the UART compatible strings4ccb639bdeperf probe: Fix ppc64 'perf probe add events failed' caseb4a59eafcbnet: bridge: fix stale eth hdr pointer in br_dev_xmitb55a0cdbecPM: s2idle: ACPI: Fix wakeup interrupts handlinge37a2a6b52ACPI/IORT: Check node revision for PMCG resources153d0f357bnvme-tcp: fix bogus request completion when failing to send AERa44ca40387ARM: socfpga: fix missing RESET_CONTROLLER8a0bad445aARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group9d5e5832ffriscv: fix build with binutils 2.38c230f6ba10bpf: Add kconfig knob for disabling unpriv bpf by defaulte2424c010aKVM: nVMX: eVMCS: Filter out VM_EXIT_SAVE_VMX_PREEMPTION_TIMERa437c52439net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout()032065cc5busb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend0863dedf58PM: hibernate: Remove register_nosave_region_late()5c5ceea00cscsi: myrs: Fix crash in error case7cc32ff0cdscsi: qedf: Fix refcount issue when LOGO is received during TMFc6a7077144scsi: target: iscsi: Make sure the np under each tpg is unique9babdef288net: sched: Clarify error message when qdisc kind is unknown978264fbc5drm: panel-orientation-quirks: Add quirk for the 1Netbook OneXPlayer162e8d7885NFSv4 expose nfs_parse_server_name function852c95db75NFSv4 remove zero number of fs_locations entries error check75e67eed75NFSv4.1: Fix uninitialised variable in devicenotify6efe396140nfs: nfs4clinet: check the return value of kstrdup()2acac498a5NFSv4 only print the label when its queried891c4ebf3bnvme: Fix parsing of ANA log paged7d345c807NFSD: Fix offset type in I/O trace points34217d7730NFSD: Clamp WRITE offsets5fde7ca7b1NFS: Fix initialisation of nfs_client cl_flags field09295a9893net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYsf84d17e6ddnet: phy: marvell: Fix RGMII Tx/Rx delays setting in 88e1121-compatible PHYs6002783411mmc: sdhci-of-esdhc: Check for error num after setting mask8a9511fd10ima: Do not print policy rule with inactive LSM labels89e51f2ab8ima: Allow template selection with ima_template[_fmt]= after ima_hash=0939988b16ima: Remove ima_policy file before directoryea58704f06integrity: check the return value of audit_log_start()82b6e1787fMerge branch 'android11-5.4' into 'android11-5.4-lts'58b361784bMerge 5.4.179 into android11-5.4-lts5287167109Linux 5.4.179d692e3406etipc: improve size validations for received domain records3a0a7ec557moxart: fix potential use-after-free on remove path88fc697aaeMerge 5.4.178 into android11-5.4-lts92070960c5Merge 5.4.177 into android11-5.4-lts76fd334f07Linux 5.4.178ed33906972cgroup/cpuset: Fix "suspicious RCU usage" lockdep warningc8d7d7c58eext4: fix error handling in ext4_restore_inline_data()f4a575eadaEDAC/xgene: Fix deferred probing0f1ca7cea5EDAC/altera: Fix deferred probing66c5aa5726rtc: cmos: Evaluate century appropriate2ffe36c9c4selftests: futex: Use variable MAKE instead of makec17a316f3dnfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client.53e4f71763scsi: bnx2fc: Make bnx2fc_recv_frame() mp safebfba4e8088pinctrl: bcm2835: Fix a few error paths71e60c1701ASoC: max9759: fix underflow in speaker_gain_control_put()e7e396324fASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name7709133f1fASoC: xilinx: xlnx_formatter_pcm: Make buffer bytes multiple of period bytese51b323f89ASoC: fsl: Add missing error handling in pcm030_fabric_probe04698be843drm/i915/overlay: Prevent divide by zero bugs in scaling4a674b8e8anet: stmmac: ensure PTP time register reads are consistent9afc028640net: stmmac: dump gmac4 DMA registers correctly77454c9adanet: macsec: Verify that send_sci is on when setting Tx sci explicitlydc8c2f0d01net: ieee802154: Return meaningful error codes from the netlink helpers6f38d3a6ecnet: ieee802154: ca8210: Stop leaking skb's859ded7ac2net: ieee802154: mcr20a: Fix lifs/sifs periods13be1165efnet: ieee802154: hwsim: Ensure proper channel selection at probe time8cfa026a21spi: meson-spicc: add IRQ check in meson_spicc_probefe58eb96bbspi: mediatek: Avoid NULL pointer crash in interruptc9fc48511cspi: bcm-qspi: check for valid cs before applying chip select6e0498e24biommu/amd: Fix loop timeout issue in iommu_ga_log_enable()5c43d46daaiommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping()cff7faba88RDMA/mlx4: Don't continue event handler after memory allocation failurebc5d3e8b70RDMA/siw: Fix broken RDMA Read Fence/Resume logic.60af6e6860IB/rdmavt: Validate remote_addr during loopback atomic tests4bbb6e6a1cmemcg: charge fs_context and legacy_fs_context2f837785c2Revert "ASoC: mediatek: Check for error clk pointer"9527177852block: bio-integrity: Advance seed correctly for larger interval sizesd3533ee20emm/kmemleak: avoid scanning potential huge holesacc887ba88drm/nouveau: fix off by one in BIOS boundary checking26b3901d20btrfs: fix deadlock between quota disable and qgroup rescan workere680e4d301ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows7e59f05544ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset)d8fbf567e7ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks66b5dd10c2ALSA: hda/realtek: Add quirk for ASUS GU603f2c5fde84cALSA: usb-audio: Simplify quirk entries with a macrofd9a23319fASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx()c33402b056ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()68fd718724ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()01baaf3bedaudit: improve audit queue handling when "audit=1" on cmdline454e00abb3Revert "net: fix information leakage in /proc/net/ptype"b8f53f9171Linux 5.4.1774fc41403f0af_packet: fix data-race in packet_setsockopt / packet_setsockoptdb6c57d266cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask()bd43771ee9rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()b1d17e920dnet: sched: fix use-after-free in tc_new_tfilter()9892742f03net: amd-xgbe: Fix skb data length underflow28bdf65a56net: amd-xgbe: ensure to reset the tx_timer_active flagf2a186a44eipheth: fix EOVERFLOW in ipheth_rcvbulk_callback0e8283cbe4cgroup-v1: Require capabilities to set release_agent2fd752ed77psi: Fix uaf issue when psi trigger is destroyed while being polled464da38ba8PCI: pciehp: Fix infinite loop in IRQ handler upon power fault46c68a5628Merge 5.4.176 into android11-5.4-lts2570bb2729Linux 5.4.1765e2a4d0225mtd: rawnand: mpc5121: Remove unused variable in ads5121_select_chip()6cbf4c731dblock: Fix wrong offset in bio_truncate()33a9ba52d5fsnotify: invalidate dcache before IN_DELETE eventb52103cbb6dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO confige913171594ipv4: remove sparse error in ip_neigh_gw4()c30ecdba9eipv4: tcp: send zero IPID in SYNACK messages51dde4ae5aipv4: raw: lock the socket in raw_bind()2d334469c2net: hns3: handle empty unknown interrupt for VF7afc09c891yam: fix a memory leak in yam_siocdevprivate()51edc483afdrm/msm/hdmi: Fix missing put_device() call in msm_hdmi_get_phya15ed3e988ibmvnic: don't spin in taskletc09702f43aibmvnic: init ->running_cap_crqs early86217a4ebdhwmon: (lm90) Mark alert as broken for MAX665418684bb996rxrpc: Adjust retransmission backofff39027cbadphylib: fix potential use-after-free218cccb521net: phy: broadcom: hook up soft_reset for BCM54616S0d26470b25netfilter: conntrack: don't increment invalid counter on NF_REPEATabcb9d80a4NFS: Ensure the server has an up to date ctime before renaming30965c7682NFS: Ensure the server has an up to date ctime before hardlinkingcdfaf8e985ipv6: annotate accesses to fn->fn_sernum581317b1f0drm/msm/dsi: invalid parameter check in msm_dsi_phy_enableb3e3d584f0drm/msm/dsi: Fix missing put_device() call in dsi_get_phy4abd2a7735drm/msm: Fix wrong size calculation9f0a6acac4net-procfs: show net devices bound packet types4fd45ff2b4NFSv4: nfs_atomic_open() can race when looking up a non-regular file0dfacee400NFSv4: Handle case where the lookup of a directory failsc27abaa040hwmon: (lm90) Reduce maximum conversion rate for G7811f748455a8ipv4: avoid using shared IP generator for connected socketsca5355771cping: fix the sk_bound_dev_if match in ping_lookup0b567a24adhwmon: (lm90) Mark alert as broken for MAX6680b63031651ahwmon: (lm90) Mark alert as broken for MAX6646/6647/6649e372ecd455net: fix information leakage in /proc/net/ptype20b7af4131ipv6_tunnel: Rate limit warning messagesbf2bd892a0scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put()d380beb5e5rpmsg: char: Fix race between the release of rpmsg_eptdev and cdevda27b834c1rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdevcb24af19e5i40e: fix unsigned stat widthsbe6998f232i40e: Fix queues reservation for XDPb16f1a078di40e: Fix issue when maximum queues is exceededf18aadbdf6i40e: Increase delay to 1 s after global EMP reset7e94539448powerpc/32: Fix boot failure with GCC latent entropy pluginff19d70b66net: sfp: ignore disabled SFP node5ede72d48cucsi_ccg: Check DEV_INT bit only when starting CCG43922b6e1c9usb: typec: tcpm: Do not disconnect while receiving VBUS off9c61fce322USB: core: Fix hang in usb_kill_urb by adding memory barriers4fc6519bdeusb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS64e671a221usb: common: ulpi: Fix crash in ulpi_match()d66dc656c5usb-storage: Add unusual-devs entry for VL817 USB-SATA bridgea06cba5ad1tty: Add support for Brainboxes UC cards.f5e6c94673tty: n_gsm: fix SW flow control encoding/handling05b3301188serial: stm32: fix software flow control transfer0b92eda2d8serial: 8250: of: Fix mapped region size when using reg-offset property2bf7dee6f4netfilter: nft_payload: do not update layer 4 checksum when mangling fragmentsa6d5885725arm64: errata: Fix exec handling in erratum1418040workaround5cbcd1f5a2drm/etnaviv: relax submit size limits5463cfd833fsnotify: fix fsnotify hooks in pseudo filesystems1614bd844etracing: Don't inc err_log entry count if entry allocation fails8a8878ebb5tracing/histogram: Fix a potential memory leak for kstrdup()73578a9b2bPM: wakeup: simplify the output logic of pm_show_wakelocks()31136e5467udf: Fix NULL ptr deref when converting from inline format86bcc670d3udf: Restore i_lenAlloc when inode expansion failsc54445af64scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices4d041e75c4s390/hypfs: include z/VM guests with access control group set835d370685Bluetooth: refactor malicious adv data check970ce66acdMerge 5.4.175 into android11-5.4-ltsa075d1beb1ANDROID: Fix CRC issue up with xfrm headers in 5.4.174b3174205cfMerge 5.4.174 into android11-5.4-lts7cdf2951f8Linux 5.4.17584b1259fe3drm/vmwgfx: Fix stale file descriptors on failed usercopy16895e4eacselect: Fix indefinitely sleeping task in poll_schedule_timeout()53d5b08d8emmc: sdhci-esdhc-imx: disable CMDQ supportc3fa7ce43cARM: dts: gpio-ranges property is now required75278f1affpinctrl: bcm2835: Change init order for gpio hogs0d006bb08dpinctrl: bcm2835: Add support for wake-up interrupts08fd627438pinctrl: bcm2835: Match BCM7211 compatible stringac3daf50c1pinctrl: bcm2835: Add support for all GPIOs on BCM2711e523717111pinctrl: bcm2835: Refactor platform data33e48b5305pinctrl: bcm2835: Drop unused define75ca9c1d96rcu: Tighten rcu_advance_cbs_nowake() checks1b5553c79ddrm/i915: Flush TLBs before releasing backing store411d8da1c8Linux 5.4.1742c9650faa1Revert "ia64: kprobes: Use generic kretprobe trampoline handler"d106693dfdmtd: nand: bbt: Fix corner case in bad block table handling0c1b203819lib/test_meminit: destroy cache in kmem_cache_alloc_bulk() testa836180fc5lib82596: Fix IRQ check in sni_82596_probe3903f65a5ascripts/dtc: dtx_diff: remove broken example from help textb0e5b352fedt-bindings: display: meson-vpu: Add missing amlogic,canvas propertye3e561707cdt-bindings: display: meson-dw-hdmi: add missing sound-name-prefix property810d3fac21net: ethernet: mtk_eth_soc: fix error checking in mtk_mac_config()e81d42e544bcmgenet: add WOL IRQ check3bd7629eb8net_sched: restore "mpu xxx" handling918b3dbf03arm64: dts: qcom: msm8996: drop not documented adreno properties1e0e01eb25dmaengine: at_xdmac: Fix at_xdmac_lld struct definitionca48aa7de7dmaengine: at_xdmac: Fix lld view setting0366901b7bdmaengine: at_xdmac: Fix concurrency over xfers_listd56e1fcb7bdmaengine: at_xdmac: Print debug message after realeasing the lock7163076f25dmaengine: at_xdmac: Don't start transactions at tx_submit level9fbe8ea8dfperf script: Fix hex dump character outpute7e3f9634alibcxgb: Don't accidentally set RTO_ONLINK in cxgb_find_route()91e58091a6gre: Don't accidentally set RTO_ONLINK in gre_fill_metadata_dst()1e06cb37fexfrm: Don't accidentally set RTO_ONLINK in decode_session4()d6bfcc8d95netns: add schedule point in ops_exit_list()577d3c5291inet: frags: annotate races around fqdir->dead and fqdir->high_thresh967ec4b059rtc: pxa: fix null pointer dereference1623e00e40net: axienet: increase default TX ring size to 12888d7727796net: axienet: fix number of TX ring slots for available checkd2765d89fenet: axienet: limit minimum TX ring size2612e35676clk: si5341: Fix clock HW provider cleanup7a831993a9af_unix: annote lockless accesses to unix_tot_inflight & gc_in_progressfdc1ce9790f2fs: fix to reserve space for IO align featuref852afb6c0parisc: pdc_stable: Fix memory leak in pdcs_register_pathentriesd25fe9c255net/fsl: xgmac_mdio: Fix incorrect iounmap when removing module682a1e0ecbipv4: avoid quadratic behavior in netns dismantlee6669fba04bpftool: Remove inclusion of utilities.mak from Makefiles9e5a74b632powerpc/fsl/dts: Enable WA for erratum A-009885 on fman3l MDIO buses461aedcf68powerpc/cell: Fix clang -Wimplicit-fallthrough warning261f991764Revert "net/mlx5: Add retry mechanism to the command entry index allocation"6926d42794dmaengine: stm32-mdma: fix STM32_MDMA_CTBR_TSEL_MASKd2d453940bRDMA/rxe: Fix a typo in opcode name1a3f263e05RDMA/hns: Modify the mapping attribute of doorbell to device0cb05af4bfscsi: core: Show SCMD_LAST in text form59c7ff9509Documentation: fix firewire.rst ABI file path errordafbd79e42Documentation: refer to config RANDOMIZE_BASE for kernel address-space randomization2ecbe50b2bDocumentation: ACPI: Fix data node reference documentation49daee5500Documentation: dmaengine: Correctly describe dmatest with channel unset05594394dcmedia: rcar-csi2: Optimize the selection PHTW register547ea2d23efirmware: Update Kconfig help text for Google firmware515ca9f568of: base: Improve argument length mismatch error227afbfe47drm/radeon: fix error handling in radeon_driver_open_kmsd820cb6365ext4: don't use the orphan list when migrating an inode85c121cf17ext4: Fix BUG_ON in ext4_bread when write quota datab985c8521dext4: set csum seed in tmp inode while migrating to extents6e23e0bb1aext4: make sure quota gets properly shutdown on error86be63aea2ext4: make sure to reset inode lockdep class when quota enabling failse5999c49cdbtrfs: respect the max size in the header when activating swap file85dc4aac7ebtrfs: check the root node for uptodate before returning iteeec77bb53btrfs: fix deadlock between quota enable and other quota operationse895140826xfrm: fix policy lookup for ipv6 gre packets09af149541PCI: pci-bridge-emul: Set PCI_STATUS_CAP_LIST for PCIe devicee904b46073PCI: pci-bridge-emul: Correctly set PCIe capabilitiesab57ac7299PCI: pci-bridge-emul: Properly mark reserved PCIe bits in PCI config spacedb531b57cbdrm/bridge: analogix_dp: Make PSR-exit block less17d492d39edrm/nouveau/kms/nv04: use vzalloc for nv04_display0d0e56a1a9drm/etnaviv: limit submit sizes72a953efcbs390/mm: fix 2KB pgtable release raceda4e1faccciwlwifi: mvm: Increase the scan timeout guard to 30 seconds11604a3a6btracing/kprobes: 'nmissed' not showed correctly for kretprobeae2e0b2f2bcputime, cpuacct: Include guest time in user time in cpuacct.statc526d53eddserial: Fix incorrect rs485 polarity on uart open19a61f92fafuse: Pass correct lend value to filemap_write_and_wait_range()8130a1c0bfubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers011024b0f6crypto: caam - replace this_cpu_ptr with raw_cpu_ptr973669290acrypto: stm32/crc32 - Fix kernel BUG triggered in probe()0c0fd11c9ccrypto: omap-aes - Fix broken pm_runtime_and_get() usageb728b5295drpmsg: core: Clean up resources on announce_create failure.9e2c8bd784power: bq25890: Enable continuous conversion for ADC at chargingf16a5bce3fASoC: mediatek: mt8173: fix device_node leak5d635c2598scsi: sr: Don't use GFP_DMA1785538d27MIPS: Octeon: Fix build errors using clangbb7d1de681i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters6abdf6722cMIPS: OCTEON: add put_device() after of_find_device_by_node()2a8870f5cbpowerpc: handle kdump appropriately with crash_kexec_post_notifiers option2dbb618e24ALSA: seq: Set upper limit of processed events1ad4f94630scsi: lpfc: Trigger SLI4 firmware dump before doing driver cleanup73ed9127b8w1: Misuse of get_user()/put_user() reported by sparseb8e5376c27KVM: PPC: Book3S: Suppress failed alloc warning in H_COPY_TOFROM_GUESTaecdb1d242powerpc/powermac: Add missing lockdep_register_key()2c146cf97bclk: meson: gxbb: Fix the SDM_EN bit for MPLL0 on GXBBe441d3cb76i2c: mpc: Correct I2C reset proceduref231d1d22bpowerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILINGaca56c298ei2c: i801: Don't silently correct invalid transfer sizeaea9d36848powerpc/watchdog: Fix missed watchdog reset due to memory ordering race5a3cda54ffpowerpc/btext: add missing of_node_putfd0135fc6fpowerpc/cell: add missing of_node_put67329fb6a8powerpc/powernv: add missing of_node_put5bea763aecpowerpc/6xx: add missing of_node_putecfe73aec6parisc: Avoid calling faulthandler_disabled() twice5e126f6880random: do not throw away excess input to crng_fast_load8f6cecfff3serial: core: Keep mctrl register state and cached copy in sync6f7bd9f7c8serial: pl010: Drop CR register reset on set_termiosc5e156a627regulator: qcom_smd: Align probe function with rpmh-regulator4a55b02b64net: gemini: allow any RGMII interface mode4bee2316c5net: phy: marvell: configure RGMII delays for 88E1118b3fbe7565fdm space map common: add bounds check to sm_ll_lookup_bitmap()052f640137dm btree: add a defensive bounds check to insert_at()aaefb18333mac80211: allow non-standard VHT MCS-10/115253794b19net: mdio: Demote probed message to debug print8508caebe6btrfs: remove BUG_ON(!eie) in find_parent_nodes7d4f4075e7btrfs: remove BUG_ON() in find_parent_nodes()ba72fa2cb2ACPI: battery: Add the ThinkPad "Not Charging" quirk7c366d75a4drm/amdgpu: fixup bad vram size on gmc v888b5abc0c6ACPICA: Hardware: Do not flush CPU cache when entering S4 and S5de85f58618ACPICA: Fix wrong interpretation of PCC address1fa8e71d00ACPICA: Executer: Fix the REFCLASS_REFOF case in acpi_ex_opcode_1A_0T_1R()aee78b668eACPICA: Utilities: Avoid deleting the same object twice in a rowa4c6cde223ACPICA: actypes.h: Expand the ACPI_ACCESS_ definitions56c308c730jffs2: GC deadlock reading a page that is used in jffs2_write_begin()c02454b3c8um: registers: Rename function names to avoid conflicts and build problems51b44e9b14iwlwifi: mvm: Fix calculation of frame length95017cf0a3iwlwifi: remove module loading failure message0446cafa84iwlwifi: fix leaks/bad data after failed firmware loadc8fe499c45ath9k: Fix out-of-bound memcpy in ath9k_hif_usb_rx_stream46fdba26cdusb: hub: Add delay for SuperSpeed hub resume to let links transit to U08ac2cf0253cpufreq: Fix initialization of min and max frequency QoS requestsbfcc1e9c2earm64: tegra: Adjust length of CCPLEX cluster MMIO region65816c1034arm64: dts: ls1028a-qds: move rtc node to the correct i2c busdcf1d9f76faudit: ensure userspace is penalized the same as the kernel when under pressure5cc8a36785mmc: core: Fixup storing of OCR for MMC_QUIRK_NONSTD_SDIO3a7f37eb20media: saa7146: hexium_gemini: Fix a NULL pointer dereference in hexium_attach()71b6d05db5media: igorplugusb: receiver overflow should be reported1af9e1d488HID: quirks: Allow inverting the absolute X/Y values75f7885dc2bpf: Do not WARN in bpf_warn_invalid_xdp_action()086181b0ffnet: bonding: debug: avoid printing debug logs when bond is not notifying peersfcd7e8ccc4x86/mce: Mark mce_read_aux() noinstra0d171398dx86/mce: Mark mce_end() noinstrbca5aa9202x86/mce: Mark mce_panic() noinstr2481ee0ce5gpio: aspeed: Convert aspeed_gpio.lock to raw_spinlock743911a2bfnet: phy: prefer 1000baseT over 1000baseKXa5d8e6189bnet-sysfs: update the queue counts in the unregistration pathd08cc0223aath10k: Fix tx hanging054281b354iwlwifi: mvm: synchronize with FW after multicast commandsfe791612afmedia: m920x: don't use stack on USB readsa821532ce5media: saa7146: hexium_orion: Fix a NULL pointer dereference in hexium_attach()b867a9c3demedia: uvcvideo: Increase UVC_CTRL_CONTROL_TIMEOUT to 5 seconds.ff867910e8x86/mm: Flush global TLB when switching to trampoline page-table16f2ef98ccfloppy: Add max size check for user space request3ad5c9e502usb: uhci: add aspeed ast2600 uhci supportc27a523211rsi: Fix out-of-bounds read in rsi_read_pkt()51ad4c4486rsi: Fix use-after-free in rsi_rx_done_handler()ae56c5524amwifiex: Fix skb_over_panic in mwifiex_usb_recv()4ff69cf3b1HSI: core: Fix return freed object in hsi_new_client009d6d9feagpiolib: acpi: Do not set the IRQ type if the IRQ is already in use50ad94f865drm/bridge: megachips: Ensure both bridges are probed before registrationc640dc459bmlxsw: pci: Add shutdown method in PCI driverf6b6509419EDAC/synopsys: Use the quirk for version instead of ddr version2134ebc2d0media: b2c2: Add missing check in flexcop_pci_isr:2933aa5109HID: apple: Do not reset quirks when the Fn key is not founda625239881drm: panel-orientation-quirks: Add quirk for the Lenovo Yoga Book X91F/L0cba42c09ausb: gadget: f_fs: Use stream_open() for endpoint filesc7e4004b38batman-adv: allow netlink usage in unprivileged containersc93a934f81ARM: shmobile: rcar-gen2: Add missing of_node_put()c9ec3d85c0drm/nouveau/pmu/gm200-: avoid touching PMU outside of DEVINIT/PREOS/ACR3642493839ar5523: Fix null-ptr-deref with unexpected WDCMSG_TARGET_START replyc7186605d8drm/lima: fix warning when CONFIG_DEBUG_SG=y & CONFIG_DMA_API_DEBUG=y58cddfe677fs: dlm: filter user dlm messages for kernel locksfa4ca508c2Bluetooth: Fix debugfs entry leak in hci_register_dev()2b09cb8d92of: base: Fix phandle argument length mismatch error messagef88ccfb3f2RDMA/cxgb4: Set queue pair state when being queried38d97204a2mips: bcm63xx: add support for clk_set_parent()d12b5cfab4mips: lantiq: add support for clk_set_parent()770e92dbc9misc: lattice-ecp3-config: Fix task hung when firmware load failed458c253b25ASoC: samsung: idma: Check of ioremap return value8b894d503eASoC: mediatek: Check for error clk pointer41d2dc9110phy: uniphier-usb3ss: fix unintended writing zeros to PHY registerdc03527ca1iommu/iova: Fix race between FQ timeout and teardown86233ee4b4dmaengine: pxa/mmp: stop referencing config->slave_id741a26cf31clk: stm32: Fix ltdc's clock turn off by clk_disable_unused() after system enter shell35d7be242cASoC: rt5663: Handle device_property_read_u32_array error codes200f00382fRDMA/cma: Let cma_resolve_ib_dev() continue search even after empty entry6314e22a99RDMA/core: Let ib_find_gid() continue search even after empty entry2e89a39fd7powerpc/powermac: Add additional missing lockdep_register_key()9367675e76PCI/MSI: Fix pci_irq_vector()/pci_irq_get_affinity()27a90275e8scsi: ufs: Fix race conditions related to driver datab9b691de3ciommu/io-pgtable-arm: Fix table descriptor paddr formatting48fc8eebd1binder: fix handling of error during copyf3c2c7f3f8char/mwave: Adjust io port register sizee607cd712dALSA: oss: fix compile error when OSS_DEBUG is enabled5daf392570ASoC: uniphier: drop selecting non-existing SND_SOC_UNIPHIER_AIO_DMA7e2ce332aapowerpc/prom_init: Fix improper check of prom_getprop()506184ded6clk: imx8mn: Fix imx8mn_clko1_sels852f447ce0RDMA/hns: Validate the pkey index9927848b1cALSA: hda: Add missing rwsem around snd_ctl_remove() calls79b89d3ab5ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls86fecb7f50ALSA: jack: Add missing rwsem around snd_ctl_remove() calls970d908204ext4: avoid trim error on fs with small groups2e5f08a5f8net: mcs7830: handle usb read errors properlyff09d5951bpcmcia: fix setting of kthread task statesf56b423bcecan: xilinx_can: xcan_probe(): check for error irq58533bbd5ccan: softing: softing_startstop(): fix set but not used variable warning13af3a9b1btpm: add request_locality before write TPM_INT_ENABLE5d5223beb6spi: spi-meson-spifc: Add missing pm_runtime_disable() in meson_spifc_probe74dd45122bnet/mlx5: Set command entry semaphore up once got index free2b7816b1e9Revert "net/mlx5e: Block offload of outer header csum for UDP tunnels"2f2336ca68net/mlx5e: Don't block routes with nexthop objects in SWfca92bb20cdebugfs: lockdown: Allow reading debugfs files that are not world readable46541f21deHID: hid-uclogic-params: Invalid parameter check in uclogic_params_frame_init_v1_buttonpadf6fbc6a050HID: hid-uclogic-params: Invalid parameter check in uclogic_params_huion_init1f660b3ff5HID: hid-uclogic-params: Invalid parameter check in uclogic_params_get_str_desc3f4823c651HID: hid-uclogic-params: Invalid parameter check in uclogic_params_init1b7443f4ebBluetooth: hci_bcm: Check for error irq4ceb319006fsl/fman: Check for null pointer after calling devm_ioremape2e1ceb8castaging: greybus: audio: Check null pointerb78473575frocker: fix a sleeping in atomic bug385b8fe398ppp: ensure minimum packet size in ppp_write()c7a99af48cbpf: Fix SO_RCVBUF/SO_SNDBUF handling in _bpf_setsockopt().4e8307203dnetfilter: ipt_CLUSTERIP: fix refcount leak in clusterip_tg_check()ad66745628pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in nonstatic_find_mem_region()17162e2601pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region()6cdbf5b6e4ACPI: scan: Create platform device for BCM4752 and LNV4752 ACPI nodesd49992de00x86/mce/inject: Avoid out-of-bounds write when setting flagsa259c73dddbpftool: Enable line buffering for stdouteb599bf3baselinux: fix potential memleak in selinux_add_opt()8fe5e6ed36mmc: meson-mx-sdio: add IRQ checkdb6eb2f94aARM: dts: armada-38x: Add generic compatible to UART nodes1b10eb460dusb: ftdi-elan: fix memory leak on device disconnect3f8edc28c0ARM: 9159/1: decompressor: Avoid UNPREDICTABLE NOP encoding25dfc85fcexfrm: state and policy should fail if XFRMA_IF_ID 0b34fadb521xfrm: interface with if_id 0 should return errorba7d5b3e33media: hantro: Fix probe func error path26cf595abddrm/bridge: ti-sn65dsi86: Set max register for regmapa6d408452cdrm/msm/dpu: fix safe status debugfs file036fcde6c7media: coda/imx-vdoa: Handle dma_set_coherent_mask error codes7089b97b46media: msi001: fix possible null-ptr-deref in msi001_probe()04691afdbcmedia: dw2102: Fix use after freeb153346f0fARM: dts: gemini: NAS4220-B: fis-index-block with 128 KiB sectors4c66717867crypto: stm32/cryp - fix lrw chaining mode46d85cdd47crypto: stm32/cryp - fix double pm exit17bb09710ccrypto: stm32/cryp - fix xts and race condition in crypto_engine requestsfe211ebe8exfrm: fix a small bug in xfrm_sa_len()b3e50e041bmwifiex: Fix possible ABBA deadlock236399a60ercu/exp: Mark current CPU as exp-QS in IPI loop second passb67881059fsched/rt: Try to restart rt period timer when rt runtime exceededa26a338f4dmedia: si2157: Fix "warm" tuner state detectiondc3b4b60a0media: saa7146: mxb: Fix a NULL pointer dereference in mxb_attach()f39bd2900fmedia: dib8000: Fix a memleak in dib8000_init()62bff2a806Bluetooth: btmtksdio: fix resume failure80f81e4bccstaging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib()9f49cf5196staging: rtl8192e: return error code from rtllib_softmac_init()84e568531bfloppy: Fix hang in watchdog when disk is ejected6a4160c9f2serial: amba-pl011: do not request memory region twice96591a7e66tty: serial: uartlite: allow 64 bit addressd3aee4338farm64: dts: ti: k3-j721e: Fix the L2 cache sets15115464ebdrm/radeon/radeon_kms: Fix a NULL pointer dereference in radeon_driver_open_kms()46ec86ea0ddrm/amdgpu: Fix a NULL pointer dereference in amdgpu_connector_lcd_native_mode()77af47f269ACPI: EC: Rework flushing of EC work while suspended to idlef996dab1a8arm64: dts: qcom: msm8916: fix MMC controller aliases54b5ab456enetfilter: bridge: add support for pppoe filtering04bb89f51cmedia: venus: core: Fix a resource leak in the error handling path of 'venus_probe()'8034d6c40emedia: mtk-vcodec: call v4l2_m2m_ctx_release first when file is releasedf77b903410media: si470x-i2c: fix possible memory leak in si470x_i2c_probe()a3c5386a51media: imx-pxp: Initialize the spinlock prior to using it0410f7ac04media: rcar-csi2: Correct the selection of hsfreqrange62866d6542tty: serial: atmel: Call dma_async_issue_pending()cd867ffa14tty: serial: atmel: Check return code of dmaengine_submit()06d6f69687arm64: dts: ti: k3-j721e: correct cache-sets infoac718d92b6crypto: qce - fix uaf on qce_ahash_register_onebe6ee09c9emedia: dmxdev: fix UAF when dvb_register_device() failsda0b42d1c3tee: fix put order in teedev_close_context()24161b9c43Bluetooth: stop proccessing malicious adv data50a9817423arm64: dts: meson-gxbb-wetek: fix missing GPIO bindinge48e1d3e0farm64: dts: meson-gxbb-wetek: fix HDMI in early boot1221b3adf5media: aspeed: Update signal status immediately to ensure sane hw state15df887c62media: em28xx: fix memory leak in em28xx_init_dev58f08f024cmedia: aspeed: fix mode-detect always time out at 2nd rundc644dd8a0media: videobuf2: Fix the size printk formate51b0099c8wcn36xx: Release DMA channel descriptor allocations2aa2da3fb5wcn36xx: Indicate beacon not connection loss on MISSED_BEACON_IND457b05f391clk: bcm-2835: Remove rounding up the dividersaac1ed3059clk: bcm-2835: Pick the closest clock rateba4cc49689Bluetooth: cmtp: fix possible panic when cmtp_init_sockets() fails141a9a9caedrm/rockchip: dsi: Fix unbalanced clock on probe errorbcd6bfe12bdrm/panel: innolux-p079zca: Delete panel on attach() failure4c255e98aadrm/panel: kingdisplay-kd097d04: Delete panel on attach() failure5cc7480e63drm/rockchip: dsi: Reconfigure hardware on resume()0620aabea8drm/rockchip: dsi: Hold pm-runtime across bind/unbind6264d0fef9shmem: fix a race between shmem_unused_huge_shrink and shmem_evict_inode9d8fb273d5mm/page_alloc.c: do not warn allocation failure on zone DMA if no managed pages7ad300800cmm_zone: add function to check if managed dma zone existsc4212d52f9PCI: Add function 1 DMA alias quirk for Marvell 88SE9125 SATA controller9e5bb22bebdma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled()e12f983c4aiommu/io-pgtable-arm-v7s: Add error handle for page table allocation failure81a026b9c3lkdtm: Fix content of section containing lkdtm_rodata_do_nothing()3cead5b7a8can: softing_cs: softingcs_probe(): fix memleak on registration failure38e28033a5media: stk1160: fix control-message timeouts0ac3d5f6f9media: pvrusb2: fix control-message timeoutsd1c57f558dmedia: redrat3: fix control-message timeouts7a9d34be18media: dib0700: fix undefined behavior in tuner shutdownf64b379bdemedia: s2255: fix control-message timeouts3a49cd738bmedia: cpia2: fix control-message timeoutsc9ef6e1d50media: em28xx: fix control-message timeoutsc89df039e8media: mceusb: fix control-message timeouts22325141e9media: flexcop-usb: fix control-message timeouts7458b0189emedia: v4l2-ioctl.c: readbuffers depends on V4L2_CAP_READWRITE023357dd2ertc: cmos: take rtc_lock while reading from CMOS9a82bfb442tools/nolibc: fix incorrect truncation of exit code2e83886c04tools/nolibc: i386: fix initial stack alignmentaca2988eddtools/nolibc: x86-64: Fix startup code buga4b5d9af4ax86/gpu: Reserve stolen memory for first integrated Intel GPUf55dbf7298mtd: rawnand: gpmi: Remove explicit default gpmi clock setting for i.MX62921885387mtd: rawnand: gpmi: Add ERR007117 protection for nfc_apply_timingsba2539b5f9nfc: llcp: fix NULL error pointer dereference on sendmsg() after failed bind()eb116c891bf2fs: fix to do sanity check in is_alive()bf9e52c0a9HID: wacom: Avoid using stale array indicies to read contact count5d1023f33cHID: wacom: Ignore the confidence flag when a touch is removed60257988d6HID: wacom: Reset expected and received contact counts at the same time898e69caadHID: uhid: Fix worker destroying device without any protection5d5005448eMerge 5.4.173 into android11-5.4-lts4aa2e7393eLinux 5.4.173e245aaefefARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLDd40f6eeaf5mtd: fixup CFI on ixp4xx1451deb164ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows7b98f61b83KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all5c69ba9e80firmware: qemu_fw_cfg: fix kobject leak in probe error path1cc36ed561firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entriesb543e41415firmware: qemu_fw_cfg: fix sysfs information leakb25e9ef29drtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts enabled8716657b1bmedia: uvcvideo: fix division by zero at stream start70ae85ca12KVM: s390: Clarify SIGP orders versus STOP/RESTART9b45f2007eperf: Protect perf_guest_cbs with RCUbd2aed0464vfs: fs_context: fix up param length parsing in legacy_parse_paramc2f067d4adorangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()5d6af67307devtmpfs regression fix: reconfigure on each mountc117b116e6kbuild: Add $(KBUILD_HOSTLDFLAGS) to 'has_libelf' tested177b5545Merge branch 'android11-5.4' into 'android11-5.4-lts'1b6f3f2708Merge 5.4.172 into android11-5.4-ltsb7f70762d1Linux 5.4.172f415409551staging: greybus: fix stack size warning with UBSAN65c2e7176fdrm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk()86ded7a6cfstaging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn()a459686f98media: Revert "media: uvcvideo: Set unique vdev name based in type"7e07bedae1random: fix crash on multiple early calls to add_bootloader_randomness()517ab153f5random: fix data race on crng init time90ceecdaa0random: fix data race on crng_node_poola4fa4377c9can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved}e90a7524b5can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data9e9241d334drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functionsada3805f14mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe()d08a0a88dbveth: Do not record rx queue hint in veth_xmita6722b4974mmc: sdhci-pci: Add PCI ID for Intel ADL1199f09284USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status43aac50196USB: core: Fix bug in resuming hub's handling of wakeup requestsed5c2683b6Bluetooth: bfusb: fix division by zero in send path784e873af3Bluetooth: btusb: fix memory leak in btusb_mtk_submit_wmt_recv_urb()ad07b60837workqueue: Fix unbind_workers() VS wq_worker_running() racee4310132cdUPSTREAM: x86/pci: Fix the function type for check_reserved_t22411ee1adMerge 5.4.171 into android11-5.4-lts0a4ce4977bLinux 5.4.1710101f11852mISDN: change function names to avoid conflicts34821931e1atlantic: Fix buff_ring OOB in aq_ring_rx_clean44065cc117net: udp: fix alignment problem in udp4_seq_show()0ad45baeadip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate8b36aa5af4scsi: libiscsi: Fix UAF in iscsi_conn_get_param()/iscsi_conn_teardown()6a3ffcc9ffusb: mtu3: fix interval value for intr and isocf0e5709824ipv6: Do cleanup if attribute validation fails in multipath routec94999cfbbipv6: Continue processing multipath route even if gateway attribute is invalid2a6a811a45phonet: refcount leak in pep_sock_accepdb0c834abbrndis_host: support Hytera digital radios72eb522ae6power: reset: ltc2952: Fix use of floating point literals159eaafee6power: supply: core: Break capacity loop102af6edfdxfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate10f2c33692net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081c0db2e1e60sch_qfq: prevent shift-out-of-bounds in qfq_init_qdiscbcbfc77800batman-adv: mcast: don't send link-local multicast to mcast routers76936ddb49lwtunnel: Validate RTA_ENCAP_TYPE attribute length2ebd777513ipv6: Check attribute length for RTA_GATEWAY when deleting multipath routea02d2be7ebipv6: Check attribute length for RTA_GATEWAY in multipath route34224e936aipv4: Check attribute length for RTA_FLOW in multipath route125d91f072ipv4: Check attribute length for RTA_GATEWAY in multipath route1f46721836i40e: Fix incorrect netdev's real number of RX/TX queuesf98acd3b4di40e: Fix for displaying message regarding NVM versionc340d45148i40e: fix use-after-free in i40e_sync_filters_subtask()38fbb1561dmac80211: initialize variable have_higher_than_11mbit7646a340b2RDMA/uverbs: Check for null return of kmalloc_array5eb5d9c659RDMA/core: Don't infoleak GRH fields415fc3f595iavf: Fix limit of total number of queues to active queues of VF23ebe9cfdaieee802154: atusb: fix uninit value in atusb_set_extended_addraa171d748atracing: Tag trace_percpu_buffer as a percpu pointerdb50ad6eectracing: Fix check for trace_percpu_buffer validity in get_trace_buf()cbbed1338dselftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv()6904679c84Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc406e80d2ee44f2fs: quota: fix potential deadlock7ada083540Merge 5.4.170 into android11-5.4-lts047dedaa38Linux 5.4.1702c3920c58eperf script: Fix CPU filtering of a script's switch eventsfe5838c22bnet: fix use-after-free in tw_timer_handler46556c4ecdInput: spaceball - fix parsing of movement data packets975774ea75Input: appletouch - initialize work before device registration436f6d0005scsi: vmw_pvscsi: Set residual data length conditionally103b16a8c5binder: fix async_free_space accounting for empty parcels98cde4dd5eusb: mtu3: set interval of FS intr and isoc endpoint585e2b244dusb: mtu3: fix list_head check warning50434eb609usb: mtu3: add memory barrier before set GPD's HWO240fc586e8usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear.20d80640faxhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.b364fcef96uapi: fix linux/nfc.h userspace compilation errors245c5e43cdnfc: uapi: use kernel size_t to fix user-space builds9e4a3f47efi2c: validate user data in compat ioctla7d3a1c6d9fsl/fman: Fix missing put_device() call in fman_port_probe2dc95e9364net/ncsi: check for error return from call to nla_put_u32ef01d63140selftests/net: udpgso_bench_tx: fix dst ip argument20f6896787net/mlx5e: Fix wrong features assignment in case of errorb85f87d30dionic: Initialize the 'lif->dbid_inuse' bitmap1cd4063dbcNFC: st21nfca: Fix memory leak in device probe and remove44cd64aa1cnet: lantiq_xrx200: fix statistics of received bytes3477f4b67enet: usb: pegasus: Do not drop long Ethernet frames831de27145sctp: use call_rcu to free endpoint3218d6bd61selftests: Calculate udpgso segment count without header adjustment0a2e9f6a8fudp: using datalen to cap ipv6 udp max gso segmentsdb484d35a9net/mlx5: DR, Fix NULL vs IS_ERR checking in dr_domain_init_resourcescc926b8f4dscsi: lpfc: Terminate string in lpfc_debugfs_nvmeio_trc_write()44937652afselinux: initialize proto variable in selinux_ip_postroute_compat()b536e357e7recordmcount.pl: fix typo in s390 mcount regex8d86b486e0memblock: fix memblock_phys_alloc() section mismatch error4606bfdaebplatform/x86: apple-gmux: use resource_size() with res930d4986a4tomoyo: Check exceeded quota early in tomoyo_domain_quota_is_ok().7978ddae24Input: i8042 - enable deferred probe quirk for ASUS UM325UAf93d5dca7dInput: i8042 - add deferred probe support940e68e57atee: handle lookup of shm with reference count 04b38b12092HID: asus: Add depends on USB_HID to HID_ASUS Kconfig option2bee9bd5c2Merge 5.4.169 into android11-5.4-lts4ca2eaf1d4Linux 5.4.16948c76fc535phonet/pep: refuse to enable an unbound pipea5c6a13e90hamradio: improve the incomplete fix to avoid NPDef5f7bfa19hamradio: defer ax25 kfree after unregister_netdevdf8f79bcc2ax25: NPD bug when detaching AX25 device0333eaf385hwmon: (lm90) Do not report 'busy' status bit as alarmbf260ff4a4hwmom: (lm90) Fix citical alarm status for MAX6680/MAX6681f373298e1bpinctrl: mediatek: fix global-out-of-bounds issuebf04afb613mm: mempolicy: fix THP allocations escaping mempolicy restrictionsf5db6bc934KVM: VMX: Fix stale docs for kvm-intel.emulate_invalid_guest_state06c13e039dusb: gadget: u_ether: fix race in setting MAC address in setup phaseb0406b5ef4f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr()806142c805tee: optee: Fix incorrect page free bug5478b90270ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling1c3d4122bemmc: core: Disable card detect during shutdowne9db8fc6c7mmc: sdhci-tegra: Fix switch to HS400ES moded9031ce0b0pinctrl: stm32: consider the GPIO offset to expose all the GPIO linesc7b2e5850bx86/pkey: Fix undefined behaviour with PKRU_WD_BITddc1d49e10parisc: Correct completer in lws start8467c8cb94ipmi: fix initialization when workqueue allocation fails8efd6a3391ipmi: ssif: initialize ssif_info->client earlycd24bafefcipmi: bail out if init_srcu_struct fails5525d80dc9Input: atmel_mxt_ts - fix double free in mxt_read_info_block737a98d91bALSA: hda/realtek: Amp init fixup for HP ZBook 15 G68df036befbALSA: drivers: opl3: Fix incorrect use of vp->statefdaf41977dALSA: jack: Check the return value of kstrdup()44c743f63dhwmon: (lm90) Drop critical attribute support for MAX66544615c97405hwmon: (lm90) Introduce flag indicating extended temperature supportc2242478f2hwmon: (lm90) Add basic support for TI TMP461d939660effhwmon: (lm90) Add max6654 support to lm90 driver055ca98d48hwmon: (lm90) Fix usage of CONFIG2 register in detect functiona7f95328c6Input: elantech - fix stack out of bound access in elantech_change_report_id()e12dcd4aa7sfc: falcon: Check null pointer of rx_queue->page_ringc11a41e269drivers: net: smc911x: Check for error irq5d556b1437fjes: Check for error irqd7024080dbbonding: fix ad_actor_system option setting to default992649b8b1ipmi: Fix UAF when uninstall ipmi_si and ipmi_msghandler module2460d96c19net: skip virtio_net_hdr_set_proto if protocol already set621d5536b4net: accept UFOv6 packages in virtio_net_hdr_to_skb0b01c51c4fqlcnic: potential dereference null pointer of rx_queue->page_ring685fc8d224netfilter: fix regression in looped (broad|multi)cast's MAC handling79dcbd8176IB/qib: Fix memory leak in qib_user_sdma_queue_pkts()78874bca4fspi: change clk_disable_unprepare to clk_unprepare0c0ac2547carm64: dts: allwinner: orangepi-zero-plus: fix PHY mode6fa4e29927HID: holtek: fix mouse probing2712816c10serial: 8250_fintek: Fix garbled text for console51c925a9bcnet: usb: lan78xx: add Allied Telesis AT29M2-AF3cd0728e7bMerge 5.4.168 into android11-5.4-lts8f843cf572Linux 5.4.1680d99b3c6bdxen/netback: don't queue unlimited number of packages8bfcd03852xen/netback: fix rx queue stall detection560e64413bxen/console: harden hvc_xen against event channel storms3e68d099f0xen/netfront: harden netfront against event channel storms4ed9f5c511xen/blkfront: harden blkfront against event channel storms192fe57395Revert "xsk: Do not sleep in poll() when need_wakeup set"e281b71992net: sched: Fix suspicious RCU usage while accessing tcf_tunnel_info96a1550a2bmac80211: fix regression in SSN handling of addba tx66aba15a14rcu: Mark accesses to rcu_state.n_force_qsb847ecff85scsi: scsi_debug: Sanity check block descriptor length in resp_mode_select()f9f300a922ovl: fix warning in ovl_create_real()ba2a9d8f8efuse: annotate lock in fuse_reverse_inval_entry()96f182c9f4media: mxl111sf: change mutex_init() location095ad3969bxsk: Do not sleep in poll() when need_wakeup set29e9fdf7b6ARM: dts: imx6ull-pinfunc: Fix CSI_DATA07__ESAI_TX0 pad namef6e9e7be9bInput: touchscreen - avoid bitwise vs logical OR warning3d45573dfbmwifiex: Remove unnecessary braces from HostCmd_SET_SEQ_NO_BSS_INFOa19cf6844bmac80211: validate extended element ID is presente070c0c990drm/amdgpu: correct register access for RLC_JUMP_TABLE_RESTOREc9ee8144e4libata: if T_LENGTH is zero, dma direction should be DMA_NONE6288909493timekeeping: Really make sure wall_to_monotonic isn't positive241d36219aUSB: serial: option: add Telit FN990 compositionsd2bb4378e2USB: serial: cp210x: fix CP2105 GPIO registrationbae7f08082usb: xhci: Extend support for runtime power management for AMD's Yellow carp.3dc6b5f2a4PCI/MSI: Mask MSI-X vectors only on successc520e7cf82PCI/MSI: Clear PCI_MSIX_FLAGS_MASKALL on errored31692a97USB: NO_LPM quirk Lenovo USB-C to Ethernet Adapher(RTL8153-04)aae3448b78USB: gadget: bRequestType is a bitfield, not a enumad0ed314d6sit: do not call ipip6_dev_free() from sit_init_net()c675256a7fnet: systemport: Add global locking for descriptor lifecycle2bf888fa4anet/smc: Prevent smc_release() from long blocking56a6ffea18net: Fix double 0x prefix print in SKB dump027a13973dnet/packet: rx_owner_map depends on pg_vec699e794c12netdevsim: Zero-initialize memory for new map's value in function nsim_bpf_map_alloca97e7dd4b7ixgbe: set X550 MDIO speed before talking to PHY8addba6cabigbvf: fix double free in `igbvf_probe`36844e250aigb: Fix removal of unicast MAC filters of VFsbca4a53ea7soc/tegra: fuse: Fix bitwise vs. logical OR warning166f0adf7erds: memory leak in __rds_conn_create()9cb405ee53flow_offload: return EOPNOTSUPP for the unsupported mpls action type066a637d1cnet: sched: lock action when translating it to flow_action infrae7660f9535mac80211: fix lookup when adding AddBA extension elementf363af7c70mac80211: accept aggregation sessions on 6 GHz1e65261481mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lockceb30f48d8mac80211: agg-tx: refactor sending addbaeeaf9c0609selftest/net/forwarding: declare NETIFS p9 p102252220d9edmaengine: st_fdma: fix MODULE_ALIAS18203fe176selftests: Fix IPv6 address bind testsb46f0afa74selftests: Fix raw socket bind tests with VRF7b5596e531inet_diag: fix kernel-infoleak for UDP sockets2c589cf07binet_diag: use jiffies_delta_to_msecs()0d80462fbdsch_cake: do not call cake_destroy() from cake_init()2fba53ccfbs390/kexec_file: fix error handling when applying relocationsb380bf012dselftests: net: Correct ping6 expected rc from 2 to 1ec5c00be78clk: Don't parent clks until the parent is fully registeredf83ed203c8ARM: socfpga: dts: fix qspi node compatible46b9e29db2mac80211: track only QoS data frames for admission controla6f18191c6arm64: dts: rockchip: fix audio-supply for Rock Pi 486f2789e3carm64: dts: rockchip: fix rk3399-leez-p710 vcc3v3-lan supply4bb0142433arm64: dts: rockchip: remove mmc-hs400-enhanced-strobe from rk3399-khadas-edgee0759696denfsd: fix use-after-free due to delegation race7243aa7150iio: adc: stm32: fix a current leak by resetting pcsel before disabling vdda0d3277eabdaudit: improve robustness of the audit queue handling501ecd90efdm btree remove: fix use after free in rebalance_children()b25e213522recordmcount.pl: look for jgnop instruction as well as bcrl on s390c0954f1010virtio_ring: Fix querying of maximum DMA mapping size for virtio device802a1a8501firmware: arm_scpi: Fix string overflow in SCPI genpd driver33f0dfab31mac80211: send ADDBA requests using the tid/queue of the aggregation session873e664a83mac80211: mark TX-during-stop for TX in in_reconfigff3e3fdc73KVM: selftests: Make sure kvm_create_max_vcpus test won't hit RLIMIT_NOFILE5ba000444aMerge 5.4.167 into android11-5.4-ltse8ef940326Linux 5.4.167c97579584farm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM6026d4032darm: extend pfn_valid to take into account freed memory map alignment492f4d3cdememblock: ensure there is no overflow in memblock_overlaps_region()bdca964781memblock: align freed memory map on pageblock boundaries with SPARSEMEM60111b30bememblock: free_unused_memmap: use pageblock units instead of MAX_ORDER3e8e272805hwmon: (dell-smm) Fix warning on /proc/i8k creation errorf6f1d19114bpf: Fix integer overflow in argument calculation for bpf_map_area_allocb06b1f4630selinux: fix race condition when computing ocontext SIDs2fb8e4267cKVM: x86: Ignore sparse banks size for an "all CPUs", non-sparse IPI req467359957atracing: Fix a kmemleak false positive in tracing_mapfb8cd2b336drm/amd/display: add connector type check for CRC source set8fc2f28e33drm/amd/display: Fix for the no Audio bug with Tiled Displaysc0315e9355net: netlink: af_netlink: Prevent empty skb by adding a check on len.7ff666e6fdi2c: rk3x: Handle a spurious start completion interrupt flag409ecd029aparisc/agp: Annotate parisc agp init functions with __init4233fbd459net/mlx4_en: Update reported link modes for 1/10Gb6158d968bdrm/msm/dsi: set default num_data_lanesd731ecc6f2nfc: fix segfault in nfc_genl_dump_devices_done4a68bf4833Merge 5.4.166 into android11-5.4-ltsc32c40ff80Linux 5.4.166eb1b5eaaddnetfilter: selftest: conntrack_vrf.sh: fix file permissiona91f4fe26cMerge 5.4.165 into android11-5.4-lts7f70428f01Linux 5.4.1653a99b4baffbpf: Add selftests to cover packet access corner casesb8a2c49aa9misc: fastrpc: fix improper packet size calculation8f9a25e452irqchip: nvic: Fix offset for Interrupt Priority Offsets61981e5feeirqchip/irq-gic-v3-its.c: Force synchronisation when issuing INVALLfc20091b3firqchip/armada-370-xp: Fix support for Multi-MSI interruptsa3689e694birqchip/armada-370-xp: Fix return value of armada_370_xp_msi_alloc()8c163a1427iio: accel: kxcjk-1013: Fix possible memory leak in probe and remove20f0fb418biio: ad7768-1: Call iio_trigger_notify_done() on errorb68f44829biio: adc: axp20x_adc: fix charging current reporting on AXP22xe79d86de1eiio: at91-sama5d2: Fix incorrect sign extension5f3d932f91iio: dln2: Check return value of devm_iio_trigger_register()7447f04508iio: dln2-adc: Fix lockdep complaint4c0fa7ed5aiio: itg3200: Call iio_trigger_notify_done() on errore67d60c5ebiio: kxsd9: Don't return error code in trigger handlerf143cfdccfiio: ltr501: Don't return error code in trigger handleracf0088ac0iio: mma8452: Fix trigger reference couting02553e9712iio: stk3310: Don't return error code in interrupt handler1374297ccfiio: trigger: stm32-timer: fix MODULE_ALIAS1dadba28a8iio: trigger: Fix reference countingec0cddcc24xhci: avoid race between disable slot command and host runtime suspend8d45969ca3usb: core: config: using bit mask instead of individual bitsd1eee0a393xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspendingd2f242d7a9usb: core: config: fix validation of wMaxPacketValue entries9978777c54USB: gadget: zero allocate endpoint 0 buffersfd6de5a0cdUSB: gadget: detect too-big endpoint 0 requests46d3477cdeselftests/fib_tests: Rework fib_rp_filter_test()caff29d112net/qla3xxx: fix an error code in ql_adapter_up()4aa28ac937net, neigh: clear whole pneigh_entry at alloc timef23f60e81anet: fec: only clear interrupt of handling queue in fec_enet_rx_queue()05bc4d266enet: altera: set a couple error code in probe()84a890d695net: cdc_ncm: Allow for dwNtbOutMaxSize to be unset or zeroe9ca63a07dtools build: Remove needless libpython-version feature check that breaks test-all fast path49e59d5144dt-bindings: net: Reintroduce PHY no lane swap bindingb78a27fa58mtd: rawnand: fsmc: Fix timing computation7596d0deecmtd: rawnand: fsmc: Take instruction delay into account9f88ca269ci40e: Fix pre-set max number of queues for VF171527da84i40e: Fix failed opcode appearing if handling messages from VFee8bfa62bfASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer43dcb79c1dqede: validate non LSO skb length727858a98ablock: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2)9ba5635cfatracefs: Set all files to the same group ownership as the mount option4105e6a128aio: fix use-after-free due to missing POLLFREE handling380185111faio: keep poll requests on waitqueue until completedaac8151624signalfd: use wake_up_pollfree()1a478a0522binder: use wake_up_pollfree()e0c03d15cdwait: add wake_up_pollfree()6db0db1657libata: add horkage for ASMedia 1092050ac9da67x86/sme: Explicitly map new EFI memmap table as encrypted9f5b334ee6can: m_can: Disable and ignore ELO interruptabb4eff3dccan: pch_can: pch_can_rx_normal: fix use after free291a164ac1drm/syncobj: Deal with signalled fences in drm_syncobj_find_fence.f53b73953fclk: qcom: regmap-mux: fix parent clock lookupe871f89ebftracefs: Have new files inherit the ownership of their parentf5734b1714nfsd: Fix nsfd startup race (again)412498e9e5btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handlingaa4740bc85btrfs: clear extent buffer uptodate when we fail to write it434927e938ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*()76f19e4cbbALSA: pcm: oss: Limit the period size to 16MBf12c8a7515ALSA: pcm: oss: Fix negative period/buffer sizes5b06fa0cd2ALSA: hda/realtek - Add headset Mic support for Lenovo ALC897 platformcaaea6bd3eALSA: ctl: Fix copy of updated id with element read/writea7ea5c099amm: bdi: initialize bdi_min_ratio when bdi is unregisteredb8a7980405IB/hfi1: Correct guard on eager buffer deallocationab1be91cf1iavf: Fix reporting when setting descriptor countc21bb711d0iavf: restore MSI state on resetc8ae8c812eudp: using datalen to cap max gso segmentsef8804e47cseg6: fix the iif in the IPv6 socket control block2e0e072e62nfp: Fix memory leak in nfp_cpp_area_cache_add()3db6482523bonding: make tx_rebalance_counter an atomic143ceb9b67ice: ignore dropped packets during init4174bd4221bpf: Fix the off-by-two error in range markings15f987473dvrf: don't run conntrack on vrf with !dflt qdisc8d3563ecbcselftests: netfilter: add a vrf+conntrack testcase48fcd08fdbnfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done1a295fea90can: sja1000: fix use after free in ems_pcmcia_add_card()fbcb12bc9dcan: kvaser_pciefd: kvaser_pciefd_rx_error_frame(): increase correct stats->{rx,tx}_errors counter68daa476f4can: kvaser_usb: get CAN clock frequency from devicea7944962eeHID: check for valid USB device for many HID driverse9114b9dc8HID: wacom: fix problems when device is not a valid USB device8e0ceff632HID: bigbenff: prevent null pointer dereference31520ec149HID: add USB_HID dependancy on some USB HID driversf8a6538587HID: add USB_HID dependancy to hid-chiconyee8477d1dbHID: add USB_HID dependancy to hid-prodikeys6e1e0a0142HID: add hid_is_usb() function to make it simpler for USB detection1e8db541c2HID: google: add eel USB idcb7b13c982HID: quirks: Add quirk for the Microsoft Surface 3 type-coverf99b201379ntfs: fix ntfs_test_inode and ntfs_init_locked_inode function typeeb246f58e1serial: tegra: Change lower tolerance baud rate limit for tegra20 and tegra30b2d37d0916Merge branch 'android11-5.4' into 'android11-5.4-lts'0bbf0a0642ANDROID: GKI: fix up abi breakage in fib_rules.h4872cb8f42Merge 5.4.164 into android11-5.4-ltse3c95128deLinux 5.4.1645df7d6a012ipmi: msghandler: Make symbol 'remove_work_wq' static5d1e83fffbnet/tls: Fix authentication failure in CCM modecffd7583c9parisc: Mark cr16 CPU clocksource unstable on all SMP machines23b40edec8iwlwifi: mvm: retry init flow if failed8d6e4b422dserial: 8250_pci: rewrite pericom_do_set_divisor()181cf7622cserial: 8250_pci: Fix ACCES entries in pci_serial_quirks arrayc5da8aa441serial: core: fix transmit-buffer reset and memleak7ed4a98a17serial: pl011: Add ACPI SBSA UART match id9e16682c94tty: serial: msm_serial: Deactivate RX DMA for polling supportb5dd5a467ex86/64/mm: Map all kernel memory into trampoline_pgd72736a3b90x86/tsc: Disable clocksource watchdog for TSC on qualified platormsfe3cd48420x86/tsc: Add a timer to make sure TSC_adjust is always checked957a203fe1usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnect7fbde74437USB: NO_LPM quirk Lenovo Powered USB-C Travel Hub095a39a2ccxhci: Fix commad ring abort, write all 64 bits to CRCR register.caedb12c77vgacon: Propagate console boot parameters before calling `vc_resize'a429446862parisc: Fix "make install" on newer debian releasesfbe7eacab7parisc: Fix KBUILD_IMAGE for self-extracting kernelc6a9060be5sched/uclamp: Fix rq->uclamp_max not set on first enqueue8ae8ccd240KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln registeree38eb8cf9ipv6: fix memory leak in fib6_rule_suppress9d15962826drm/msm: Do hw_init() before capturing GPU state10bad5a197net/smc: Keep smc_close_final rc during active close3f2a23fd13net/rds: correct socket tunable error in rds_tcp_tune()01c60b3f47ipv4: convert fib_num_tclassid_users to atomic_tefb0739817net: annotate data-races on txq->xmit_lock_ownerbfec04c689net: marvell: mvpp2: Fix the computation of shared CPUsd4034bb9b5net: usb: lan78xx: lan78xx_phy_init(): use PHY_POLL instead of "0" if no IRQ is available3e70e3a72drxrpc: Fix rxrpc_local leak in rxrpc_lookup_peer()ae8a253f3fselftests: net: Correct case namee461a9816anet/mlx4_en: Fix an use-after-free bug in mlx4_en_try_alloc_resources()af120fcffdsiphash: use _unaligned version by defaultf70c6281eanet: mpls: Fix notifications when deleting a devicebbeb0325a7net: qlogic: qlcnic: Fix a NULL pointer dereference in qlcnic_83xx_add_rings()49ab336231natsemi: xtensa: fix section mismatch warnings063d223362i2c: cbus-gpio: set atomic transfer callbackf5d7bd03f8i2c: stm32f7: stop dma transfer in case of NACK9fce2ead76i2c: stm32f7: recover the bus on access timeoutbc0215cbd1i2c: stm32f7: flush TX FIFO upon transfer errors742a5ae18csata_fsl: fix warning in remove_proc_entry when rmmod sata_fsl77393806c7sata_fsl: fix UAF in sata_fsl_port_stop when rmmod sata_fsl03d4462ba3fget: check that the fd still exists after getting a ref to ita78b607e1bs390/pci: move pseudo-MMIO to prevent MIO overlap006edd736dcpufreq: Fix get_cpu_device() failure in add_cpu_dev_symlink()648813c26dipmi: Move remove_work to dedicated workqueue3f8f7eef8crt2x00: do not mark device gone on EPROTO errors during startc2e2ccaac3kprobes: Limit max data_size of the kretprobe instances03ee5e8c63vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmitf82013d1d6net/smc: Avoid warning of possible recursive lockingdf5990db08perf report: Fix memory leaks around perf_tip()b380d09e44perf hist: Fix memory leak of a perf_hpp_fmt57247f7035net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock()77ff166909net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound99bb25cb67ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port()0f89c59e75ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile36c8f68695scsi: iscsi: Unblock session then wake up error handlerdbbc8aeaf7thermal: core: Reset previous low and high trip during thermal zone initebc8aed3b9btrfs: check-integrity: fix a warning on write caching disabled disk5db28ea9f1s390/setup: avoid using memblock_enforce_memory_limit5d93fc221cplatform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep9627494898net: return correct error code89d15a2e40atlantic: Fix OOB read and write in hw_atl_utils_fw_rpc_waitd6e981ec94net/smc: Transfer remaining wait queue entries during fallbacka1671b224bmac80211: do not access the IV when it was stripped3200cf7b9bdrm/sun4i: fix unmet dependency on RESET_CONTROLLER for PHY_SUN6I_MIPI_DPHY7ef9903650gfs2: Fix length of holes reported at end-of-filefe915dbd0fcan: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAMfb158a2654arm64: dts: mcbin: support 2W SFP modules39b3b131d1of: clk: Make <linux/of_clk.h> self-containedaad716bd14NFSv42: Fix pagecache invalidation after COPY/CLONEf0bd3f6558Revert "net: ipv6: add fib6_nh_release_dsts stub"e960255796Revert "net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group"ac1da9a21eRevert "mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB"c2531fc2c9Merge 5.4.163 into android11-5.4-lts57899c4e26Linux 5.4.1636c728efe16tty: hvc: replace BUG_ON() with negative return valuec3024e1945xen/netfront: don't trust the backend response data blindly828b1d3861xen/netfront: disentangle tx_skb_freelist5b757077daxen/netfront: don't read data from request on the ring page5c374d830exen/netfront: read response from backend only once3456a07614xen/blkfront: don't trust the backend response data blindly6392f51a9dxen/blkfront: don't take local copy of a request from the ring pagece011335cbxen/blkfront: read response from backend only once61826a7884xen: sync include/xen/interface/io/ring.h with Xen's newest version54f682cd48fuse: release pipe buf after last useeff32973ecNFC: add NCI_UNREG flag to eliminate the race4378845398shm: extend forced shm destroy to support objects from several IPC nsesb23c0c4c9es390/mm: validate VMA in PGSTE manipulation functions3c9a213e0etracing: Check pid filtering when creating eventsdda227cccfvhost/vsock: fix incorrect used length reported to the guest2eacc0acf6smb3: do not error on fsync when readonly51be334da3f2fs: set SBI_NEED_FSCK flag when inconsistent node block found3ceecea047net: mscc: ocelot: correctly report the timestamping RX filters in ethtoolee4e3f9d3dnet: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP0ea2e5497bnet: hns3: fix VF RSS failed problem after PF enable multi-TCs3b96164039net/smc: Don't call clcsock shutdown twice when smc shutdown5e44178864net: vlan: fix underflow for the real_dev refcnt296139e1deMIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_489f5838471aigb: fix netpoll exit with traffic25980820c4nvmet: use IOCB_NOWAIT only if the filesystem supports itd54662a91ftcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows562fe6a6d2PM: hibernate: use correct mode for swsusp_close()2654e6cfc4net/ncsi : Add payload to be 32-bit aligned to fix dropped packets080f6b694envmet-tcp: fix incomplete data digest send6c0ab2caa8net/smc: Ensure the active closing peer first closes clcsock7854de57bescsi: core: sysfs: Fix setting device state to SDEV_RUNNING67a6f64a0cnet: nexthop: release IPv6 per-cpu dsts when replacing a nexthop groupcca61bb170net: ipv6: add fib6_nh_release_dsts stubddd0518c1enfp: checking parameter process for rx-usecs/tx-usecs is invalidb638eb32c6ipv6: fix typos in __ip6_finish_output()8029ced6d7iavf: Prevent changing static ITR values if adaptive moderation is on4374e414fcdrm/vc4: fix error code in vc4_create_object()7e324f734ascsi: mpt3sas: Fix kernel panic during drive powercycle testdc9eb93d5aARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCEa078967dd3NFSv42: Don't fail clone() unless the OP_CLONE operation failedce50e97a06firmware: arm_scmi: pm: Propagate return value to caller7360abf31cnet: ieee802154: handle iftypes as u324421a196fdASoC: topology: Add missing rwsem around snd_ctl_remove() calls76867d0cb8ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixera848a22e94ARM: dts: BCM5301X: Add interrupt properties to GPIO node03f7379e2cARM: dts: BCM5301X: Fix I2C controller interrupt17a763eab7netfilter: ipvs: Fix reuse connection if RS weight is 0fd7974c547proc/vmcore: fix clearing user buffer by properly using clear_user()66d6eacba7arm64: dts: marvell: armada-37xx: Set pcie_reset_pin to gpio function3a4baf070cpinctrl: armada-37xx: Correct PWM pins definitions086226048bPCI: aardvark: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge7c517d7b88PCI: aardvark: Set PCI Bridge Class Code to PCI Bridge44b2776a93PCI: aardvark: Fix support for bus mastering and PCI_COMMAND on emulated bridgebbc6201152PCI: aardvark: Fix link training3d770a2095PCI: aardvark: Simplify initialization of rootcap on virtual bridgea06ace0d31PCI: aardvark: Implement re-issuing config requests on CRS response75faadcc3aPCI: aardvark: Fix PCIe Max Payload Size settingc697885a12PCI: aardvark: Configure PCIe resources from 'ranges' DT propertye3c51ac70aPCI: pci-bridge-emul: Fix array overruns, improve safetyea6eef03daPCI: aardvark: Update comment about disabling link trainingfe8a8c3a40PCI: aardvark: Move PCIe reset card code to advk_pcie_train_link()14311e77c9PCI: aardvark: Fix compilation on s39093491c5d26PCI: aardvark: Don't touch PCIe registers if no card connected8b0f7b8b78PCI: aardvark: Replace custom macros by standard linux/pci_regs.h macrose090b2e270PCI: aardvark: Issue PERST via GPIO0ad291db2dPCI: aardvark: Improve link training063a98c005PCI: aardvark: Train link immediately after enabling trainingbbe213fd12PCI: aardvark: Fix big endian support5551081d84PCI: aardvark: Wait for endpoint to be ready before training link65d962199bPCI: aardvark: Deduplicate code in advk_pcie_rd_conf()57c7d46e8bmdio: aspeed: Fix "Link is Down" issuee466278662mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiBe09e868c63tracing: Fix pid filtering when triggers are attachedf5bbebfd7ctracing/uprobe: Fix uprobe_perf_open probes iteration5c895828f4KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB4f1adc3f57xen: detect uninitialized xenbus in xenbus_init173fe1aedfxen: don't continue xenstore initialization in case of errors2e1ec01af2staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect()e72e981d16staging/fbtft: Fix backlight9b406e39e5HID: wacom: Use "Confidence" flag to prevent reporting invalid contactsc03ad97293Revert "parisc: Fix backtrace to always include init funtion names"4a6f918a92media: cec: copy sequence field for the reply8d0b9ea191ALSA: ctxfi: Fix out-of-range accessaaa83768babinder: fix test regression due to sender_euid changed797fde864usb: hub: Fix locking issues with address0_mutex4b354aeea4usb: hub: Fix usb enumeration issue due to address0 raced00bf013aeusb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts7b6f44856dnet: nexthop: fix null pointer dereference when IPv6 is not enabled9ad421aedcusb: dwc2: hcd_queue: Fix use of floating point literale44a934f9eusb: dwc2: gadget: Fix ISOC flow for elapsed framesc2e05c4ed8USB: serial: option: add Fibocom FM101-GL variantsee034eae9dUSB: serial: option: add Telit LE910S1 0x9200 compositionfe0ed45e42Merge 5.4.162 into android11-5.4-lts9334f48f56Linux 5.4.16246a8e16fcfALSA: hda: hdac_stream: fix potential locking issue in snd_hdac_stream_assign()293385739dALSA: hda: hdac_ext_stream: fix potential locking issues201340ca4ehugetlbfs: flush TLBs correctly after huge_pmd_unsharee7891b22b2tlb: mmu_gather: add tlb_flush_*_range APIs10e34766d8ice: Delete always true check of PF pointer101485e566usb: max-3421: Use driver data instead of maintaining a list of bound devices4e1b3e718fASoC: DAPM: Cover regression by kctl change notification fix56a32c8276batman-adv: Don't always reallocate the fragmentation skb head08bceb1e30batman-adv: Reserve needed_*room for fragments374c55d416batman-adv: Consider fragmentation for needed_headroom9eff9854f8perf/core: Avoid put_page() when GUP failse0122ea133Revert "net: mvpp2: disable force link UP during port init procedure"4efa2509d3drm/amdgpu: fix set scaling mode Full/Full aspect/Center not works on vga and dvi connectorsc0276de0bedrm/i915/dp: Ensure sink rate values are always valid1c4af56ffbdrm/nouveau: use drm_dev_unplug() during device removal9e98622aa5drm/udl: fix control-message timeout52affc201fcfg80211: call cfg80211_stop_ap when switch from P2P_GO typeca9834a114parisc/sticon: fix reverse colors670f6b3867btrfs: fix memory ordering between normal and ordered work functions1c38822159udf: Fix crash after seekdirf79957d274s390/kexec: fix memory leak of ipl report bufferb0e44dfb4ex86/hyperv: Fix NULL deref in set_hv_tscchange_cb() if Hyper-V setup failsf2e0cd42f1mm: kmemleak: slob: respect SLAB_NOLEAKTRACE flag95de3703a1ipc: WARN if trying to remove ipc object which is absent8997bb6d1ehexagon: export raw I/O routines for modules01a7ecd36dtun: fix bonding active backup with arp monitoring7c8f778f0aarm64: vdso32: suppress error message for 'make mrproper'e636f65b3ds390/kexec: fix return code handlingcc093e5a96perf/x86/intel/uncore: Fix IIO event constraints for Skylake Servercc63a789d8perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server47a8108178KVM: PPC: Book3S HV: Use GLOBAL_TOC for kvmppc_h_set_dabr/xdabr()307d2e6cebNFC: reorder the logic in nfc_{un,}register_deviceda3a87eeb9drm/nouveau: hdmigv100.c: fix corrupted HDMI Vendor InfoFramee418bb556fNFC: reorganize the functions in nci_requestbbb8376d58i40e: Fix display error code in dmesg69e5d27af5i40e: Fix creation of first queue by omitting it if is not power of two5564e9129fi40e: Fix ping is lost after configuring ADq on VF8509178dc0i40e: Fix changing previously set num_queue_pairs for PFsc30162da91i40e: Fix NULL ptr dereference on VSI filter sync0a0308af22i40e: Fix correct max_pkt_size on VF RX queuefb2dbc124anet: virtio_net_hdr_to_skb: count transport header in UFOd74ff10ed2net: dpaa2-eth: fix use-after-free in dpaa2_eth_remove8b2c66b0f2net: sched: act_mirred: drop dst for the direction from egress to ingressedd783162bscsi: core: sysfs: Fix hang when device state is set via sysfs446882f216platform/x86: hp_accel: Fix an error handling path in 'lis3lv02d_probe()'453b5b614bmips: lantiq: add support for clk_get_parent()477653f3e4mips: bcm63xx: add support for clk_get_parent()426fed211bMIPS: generic/yamon-dt: fix uninitialized variable error67334abd4fiavf: Fix for the false positive ASQ/ARQ errors while issuing VF reset98f3badc41iavf: validate pointers92cecf3491iavf: prevent accidental free of filter structure63f032a956iavf: Fix failure to exit out from last all-multicast mode926e8c83d4iavf: free q_vectors before queues in iavf_disable_vff0222e7eeeiavf: check for null in iavf_fix_featuresb5638bc64anet: bnx2x: fix variable dereferenced before checkfbba0692ecperf tests: Remove bash construct from record+zstd_comp_decomp.sh9e0df711f8perf bench futex: Fix memory leak of perf_cpu_map__new()642fc22210perf bpf: Avoid memory leak from perf_env__insert_btf()6bf5523090RDMA/netlink: Add __maybe_unused to static inline in C fileef82c3716atracing/histogram: Do not copy the fixed-size char array field over the field size80b7776069tracing: Save normal string variables8928e31a77sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()a93a58bae9mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set05311b9192clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clkee1317e1f4clk/ast2600: Fix soc revision for AHBd6c32b4c83clk: ingenic: Fix bugs with divided dividers982d31ba55sh: define __BIG_ENDIAN for math-emu214cd15d36sh: math-emu: drop unused functions3d774e776fsh: fix kconfig unmet dependency warning for FRAME_POINTER7727659e45f2fs: fix up f2fs_lookup tracepointsd7c612f6b1maple: fix wrong return value of maple_bus_init().9823ba8f17sh: check return code of request_irq94292e4577powerpc/dcr: Use cmplwi instead of 3-argument cmplic6d2cefdd0ALSA: gus: fix null pointer dereference on pointer block513543f1edpowerpc/5200: dts: fix memory node unit name3a9eae47a5iio: imu: st_lsm6dsx: Avoid potential array overflow in st_lsm6dsx_set_odr()a3ecee8a8fscsi: target: Fix alua_tg_pt_gps_count tracking14934afd4fscsi: target: Fix ordered tag handling1ab3b4f4f4MIPS: sni: Fix the buildd491c84df5tty: tty_buffer: Fix the softlockup issue in flush_to_ldisc80709beddbALSA: ISA: not for M68K2f8cda43c4ARM: dts: ls1021a-tsn: use generic "jedec,spi-nor" compatible for flash723c1af01cARM: dts: ls1021a: move thermal-zones node out of soc/f98986b7acusb: host: ohci-tmio: check return value after calling platform_get_resource()e187c2f3f2ARM: dts: omap: fix gpmc,mux-add-data type3b9d8d3e4afirmware_loader: fix pre-allocated buf built-in firmware usecc248790bfscsi: advansys: Fix kernel pointer leakbcc1eac0bdASoC: nau8824: Add DMI quirk mechanism for active-high jack-detectc9428e1341clk: imx: imx6ul: Move csi_sel mux to correct base registere5f8c43c85ASoC: SOF: Intel: hda-dai: fix potential locking issuecb074c00b7arm64: dts: freescale: fix arm,sp805 compatible stringa14d7038eaarm64: dts: qcom: msm8998: Fix CPU/L2 idle state latency and residency30dcfcda89usb: typec: tipd: Remove WARN_ON in tps6598x_block_read3ee15f1af1usb: musb: tusb6010: check return value after calling platform_get_resource()ba9579f832RDMA/bnxt_re: Check if the vlan is valid before reportingbf6a633b07arm64: dts: hisilicon: fix arm,sp805 compatible string16bcbfb56dscsi: lpfc: Fix list_add() corruption in lpfc_drain_txq()51c94d6aeeARM: dts: NSP: Fix mpcore, mmc node names1390f32ea9arm64: zynqmp: Fix serial compatible string31df0f0f18arm64: zynqmp: Do not duplicate flash partition label property Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I1a6bc17e217ed13d976d558d7eb3b0208d810db6
This commit is contained in:
Greg Kroah-Hartman
@@ -90,7 +90,8 @@ Triggers can be set on more than one psi metric and more than one trigger
|
||||
for the same psi metric can be specified. However for each trigger a separate
|
||||
file descriptor is required to be able to poll it separately from others,
|
||||
therefore for each trigger a separate open() syscall should be made even
|
||||
when opening the same psi interface file.
|
||||
when opening the same psi interface file. Write operations to a file descriptor
|
||||
with an already existing psi trigger will fail with EBUSY.
|
||||
|
||||
Monitors activate only when system enters stall state for the monitored
|
||||
psi metric and deactivates upon exit from the stall state. While system is
|
||||
|
||||
@@ -483,7 +483,7 @@ Spectre variant 2
|
||||
before invoking any firmware code to prevent Spectre variant 2 exploits
|
||||
using the firmware.
|
||||
|
||||
Using kernel address space randomization (CONFIG_RANDOMIZE_SLAB=y
|
||||
Using kernel address space randomization (CONFIG_RANDOMIZE_BASE=y
|
||||
and CONFIG_SLAB_FREELIST_RANDOM=y in the kernel configuration) makes
|
||||
attacks on the kernel generally more difficult.
|
||||
|
||||
|
||||
@@ -1487,6 +1487,8 @@
|
||||
architectures force reset to be always executed
|
||||
i8042.unlock [HW] Unlock (ignore) the keylock
|
||||
i8042.kbdreset [HW] Reset device connected to KBD port
|
||||
i8042.probe_defer
|
||||
[HW] Allow deferred probing upon i8042 probe errors
|
||||
|
||||
i810= [HW,DRM]
|
||||
|
||||
@@ -2112,8 +2114,12 @@
|
||||
Default is 1 (enabled)
|
||||
|
||||
kvm-intel.emulate_invalid_guest_state=
|
||||
[KVM,Intel] Enable emulation of invalid guest states
|
||||
Default is 0 (disabled)
|
||||
[KVM,Intel] Disable emulation of invalid guest state.
|
||||
Ignored if kvm-intel.enable_unrestricted_guest=1, as
|
||||
guest state is never invalid for unrestricted guests.
|
||||
This param doesn't apply to nested guests (L2), as KVM
|
||||
never emulates invalid L2 guest state.
|
||||
Default is 1 (enabled)
|
||||
|
||||
kvm-intel.flexpriority=
|
||||
[KVM,Intel] Disable FlexPriority feature (TPR shadow).
|
||||
|
||||
@@ -10,6 +10,9 @@ title: Amlogic specific extensions to the Synopsys Designware HDMI Controller
|
||||
maintainers:
|
||||
- Neil Armstrong <narmstrong@baylibre.com>
|
||||
|
||||
allOf:
|
||||
- $ref: /schemas/sound/name-prefix.yaml#
|
||||
|
||||
description: |
|
||||
The Amlogic Meson Synopsys Designware Integration is composed of
|
||||
- A Synopsys DesignWare HDMI Controller IP
|
||||
@@ -101,6 +104,8 @@ properties:
|
||||
"#sound-dai-cells":
|
||||
const: 0
|
||||
|
||||
sound-name-prefix: true
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
|
||||
@@ -78,6 +78,10 @@ properties:
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
amlogic,canvas:
|
||||
description: should point to a canvas provider node
|
||||
$ref: /schemas/types.yaml#/definitions/phandle
|
||||
|
||||
power-domains:
|
||||
maxItems: 1
|
||||
description: phandle to the associated power domain
|
||||
@@ -106,6 +110,7 @@ required:
|
||||
- port@1
|
||||
- "#address-cells"
|
||||
- "#size-cells"
|
||||
- amlogic,canvas
|
||||
|
||||
examples:
|
||||
- |
|
||||
@@ -116,6 +121,7 @@ examples:
|
||||
interrupts = <3>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
amlogic,canvas = <&canvas>;
|
||||
|
||||
/* CVBS VDAC output port */
|
||||
port@0 {
|
||||
|
||||
@@ -31,7 +31,7 @@ tcan4x5x: tcan4x5x@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
spi-max-frequency = <10000000>;
|
||||
bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
|
||||
bosch,mram-cfg = <0x0 0 0 16 0 0 1 1>;
|
||||
interrupt-parent = <&gpio1>;
|
||||
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
|
||||
device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
|
||||
|
||||
@@ -87,6 +87,14 @@ properties:
|
||||
compensate for the board being designed with the lanes
|
||||
swapped.
|
||||
|
||||
enet-phy-lane-no-swap:
|
||||
$ref: /schemas/types.yaml#/definitions/flag
|
||||
description:
|
||||
If set, indicates that PHY will disable swap of the
|
||||
TX/RX lanes. This property allows the PHY to work correcly after
|
||||
e.g. wrong bootstrap configuration caused by issues in PCB
|
||||
layout design.
|
||||
|
||||
eee-broken-100tx:
|
||||
$ref: /schemas/types.yaml#definitions/flag
|
||||
description:
|
||||
|
||||
@@ -43,19 +43,19 @@ group emmc_nb
|
||||
|
||||
group pwm0
|
||||
- pin 11 (GPIO1-11)
|
||||
- functions pwm, gpio
|
||||
- functions pwm, led, gpio
|
||||
|
||||
group pwm1
|
||||
- pin 12
|
||||
- functions pwm, gpio
|
||||
- functions pwm, led, gpio
|
||||
|
||||
group pwm2
|
||||
- pin 13
|
||||
- functions pwm, gpio
|
||||
- functions pwm, led, gpio
|
||||
|
||||
group pwm3
|
||||
- pin 14
|
||||
- functions pwm, gpio
|
||||
- functions pwm, led, gpio
|
||||
|
||||
group pmic1
|
||||
- pin 7
|
||||
|
||||
@@ -143,13 +143,14 @@ Part 5 - Handling channel allocation
|
||||
Allocating Channels
|
||||
-------------------
|
||||
|
||||
Channels are required to be configured prior to starting the test run.
|
||||
Attempting to run the test without configuring the channels will fail.
|
||||
Channels do not need to be configured prior to starting a test run. Attempting
|
||||
to run the test without configuring the channels will result in testing any
|
||||
channels that are available.
|
||||
|
||||
Example::
|
||||
|
||||
% echo 1 > /sys/module/dmatest/parameters/run
|
||||
dmatest: Could not start test, no channels configured
|
||||
dmatest: No channels configured, continue with any
|
||||
|
||||
Channels are registered using the "channel" parameter. Channels can be requested by their
|
||||
name, once requested, the channel is registered and a pending thread is added to the test list.
|
||||
|
||||
@@ -19,7 +19,7 @@ of kernel interfaces is available via exported symbols in `firewire-core` module
|
||||
Firewire char device data structures
|
||||
====================================
|
||||
|
||||
.. include:: /ABI/stable/firewire-cdev
|
||||
.. include:: ../ABI/stable/firewire-cdev
|
||||
:literal:
|
||||
|
||||
.. kernel-doc:: include/uapi/linux/firewire-cdev.h
|
||||
@@ -28,7 +28,7 @@ Firewire char device data structures
|
||||
Firewire device probing and sysfs interfaces
|
||||
============================================
|
||||
|
||||
.. include:: /ABI/stable/sysfs-bus-firewire
|
||||
.. include:: ../ABI/stable/sysfs-bus-firewire
|
||||
:literal:
|
||||
|
||||
.. kernel-doc:: drivers/firewire/core-device.c
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
Referencing hierarchical data nodes
|
||||
===================================
|
||||
|
||||
:Copyright: |copy| 2018 Intel Corporation
|
||||
:Copyright: |copy| 2018, 2021 Intel Corporation
|
||||
:Author: Sakari Ailus <sakari.ailus@linux.intel.com>
|
||||
|
||||
ACPI in general allows referring to device objects in the tree only.
|
||||
@@ -52,12 +52,14 @@ the ANOD object which is also the final target node of the reference.
|
||||
Name (NOD0, Package() {
|
||||
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
|
||||
Package () {
|
||||
Package () { "reg", 0 },
|
||||
Package () { "random-property", 3 },
|
||||
}
|
||||
})
|
||||
Name (NOD1, Package() {
|
||||
ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
|
||||
Package () {
|
||||
Package () { "reg", 1 },
|
||||
Package () { "anothernode", "ANOD" },
|
||||
}
|
||||
})
|
||||
@@ -74,7 +76,11 @@ the ANOD object which is also the final target node of the reference.
|
||||
Name (_DSD, Package () {
|
||||
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
|
||||
Package () {
|
||||
Package () { "reference", ^DEV0, "node@1", "anothernode" },
|
||||
Package () {
|
||||
"reference", Package () {
|
||||
^DEV0, "node@1", "anothernode"
|
||||
}
|
||||
},
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -123,6 +123,18 @@ Supported chips:
|
||||
|
||||
http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497
|
||||
|
||||
* Maxim MAX6654
|
||||
|
||||
Prefix: 'max6654'
|
||||
|
||||
Addresses scanned: I2C 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b,
|
||||
|
||||
0x4c, 0x4d and 0x4e
|
||||
|
||||
Datasheet: Publicly available at the Maxim website
|
||||
|
||||
https://www.maximintegrated.com/en/products/sensors/MAX6654.html
|
||||
|
||||
* Maxim MAX6657
|
||||
|
||||
Prefix: 'max6657'
|
||||
@@ -253,6 +265,16 @@ Supported chips:
|
||||
|
||||
http://www.ti.com/litv/pdf/sbos686
|
||||
|
||||
* Texas Instruments TMP461
|
||||
|
||||
Prefix: 'tmp461'
|
||||
|
||||
Addresses scanned: I2C 0x48 through 0x4F
|
||||
|
||||
Datasheet: Publicly available at TI website
|
||||
|
||||
https://www.ti.com/lit/gpn/tmp461
|
||||
|
||||
Author: Jean Delvare <jdelvare@suse.de>
|
||||
|
||||
|
||||
@@ -301,6 +323,13 @@ ADT7461, ADT7461A, NCT1008:
|
||||
* Extended temperature range (breaks compatibility)
|
||||
* Lower resolution for remote temperature
|
||||
|
||||
MAX6654:
|
||||
* Better local resolution
|
||||
* Selectable address
|
||||
* Remote sensor type selection
|
||||
* Extended temperature range
|
||||
* Extended resolution only available when conversion rate <= 1 Hz
|
||||
|
||||
MAX6657 and MAX6658:
|
||||
* Better local resolution
|
||||
* Remote sensor type selection
|
||||
@@ -336,8 +365,8 @@ SA56004X:
|
||||
|
||||
All temperature values are given in degrees Celsius. Resolution
|
||||
is 1.0 degree for the local temperature, 0.125 degree for the remote
|
||||
temperature, except for the MAX6657, MAX6658 and MAX6659 which have a
|
||||
resolution of 0.125 degree for both temperatures.
|
||||
temperature, except for the MAX6654, MAX6657, MAX6658 and MAX6659 which have
|
||||
a resolution of 0.125 degree for both temperatures.
|
||||
|
||||
Each sensor has its own high and low limits, plus a critical limit.
|
||||
Additionally, there is a relative hysteresis value common to both critical
|
||||
|
||||
@@ -191,11 +191,12 @@ ad_actor_sys_prio
|
||||
ad_actor_system
|
||||
|
||||
In an AD system, this specifies the mac-address for the actor in
|
||||
protocol packet exchanges (LACPDUs). The value cannot be NULL or
|
||||
multicast. It is preferred to have the local-admin bit set for this
|
||||
mac but driver does not enforce it. If the value is not given then
|
||||
system defaults to using the masters' mac address as actors' system
|
||||
address.
|
||||
protocol packet exchanges (LACPDUs). The value cannot be a multicast
|
||||
address. If the all-zeroes MAC is specified, bonding will internally
|
||||
use the MAC of the bond itself. It is preferred to have the
|
||||
local-admin bit set for this mac but driver does not enforce it. If
|
||||
the value is not given then system defaults to using the masters'
|
||||
mac address as actors' system address.
|
||||
|
||||
This parameter has effect only in 802.3ad mode and is available through
|
||||
SysFs interface.
|
||||
|
||||
@@ -30,8 +30,7 @@ conn_reuse_mode - INTEGER
|
||||
|
||||
0: disable any special handling on port reuse. The new
|
||||
connection will be delivered to the same real server that was
|
||||
servicing the previous connection. This will effectively
|
||||
disable expire_nodest_conn.
|
||||
servicing the previous connection.
|
||||
|
||||
bit 1: enable rescheduling of new connections when it is safe.
|
||||
That is, whenever expire_nodest_conn and for TCP sockets, when
|
||||
|
||||
4
Makefile
4
Makefile
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
SUBLEVEL = 161
|
||||
SUBLEVEL = 180
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
@@ -1095,7 +1095,7 @@ HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf)
|
||||
|
||||
ifdef CONFIG_STACK_VALIDATION
|
||||
has_libelf := $(call try-run,\
|
||||
echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)
|
||||
echo "int main() {}" | $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0)
|
||||
ifeq ($(has_libelf),1)
|
||||
objtool_target := tools/objtool FORCE
|
||||
else
|
||||
|
||||
165238
android/abi_gki_aarch64.xml
165238
android/abi_gki_aarch64.xml
File diff suppressed because it is too large
Load Diff
@@ -9,16 +9,22 @@
|
||||
#include <linux/sizes.h>
|
||||
|
||||
.macro __nop
|
||||
#ifdef CONFIG_EFI_STUB
|
||||
@ This is almost but not quite a NOP, since it does clobber the
|
||||
@ condition flags. But it is the best we can do for EFI, since
|
||||
@ PE/COFF expects the magic string "MZ" at offset 0, while the
|
||||
@ ARM/Linux boot protocol expects an executable instruction
|
||||
@ there.
|
||||
.inst MZ_MAGIC | (0x1310 << 16) @ tstne r0, #0x4d000
|
||||
#else
|
||||
AR_CLASS( mov r0, r0 )
|
||||
M_CLASS( nop.w )
|
||||
.endm
|
||||
|
||||
.macro __initial_nops
|
||||
#ifdef CONFIG_EFI_STUB
|
||||
@ This is a two-instruction NOP, which happens to bear the
|
||||
@ PE/COFF signature "MZ" in the first two bytes, so the kernel
|
||||
@ is accepted as an EFI binary. Booting via the UEFI stub
|
||||
@ will not execute those instructions, but the ARM/Linux
|
||||
@ boot protocol does, so we need some NOPs here.
|
||||
.inst MZ_MAGIC | (0xe225 << 16) @ eor r5, r5, 0x4d000
|
||||
eor r5, r5, 0x4d000 @ undo previous insn
|
||||
#else
|
||||
__nop
|
||||
__nop
|
||||
#endif
|
||||
.endm
|
||||
|
||||
|
||||
@@ -165,7 +165,8 @@ start:
|
||||
* were patching the initial instructions of the kernel, i.e
|
||||
* had started to exploit this "patch area".
|
||||
*/
|
||||
.rept 7
|
||||
__initial_nops
|
||||
.rept 5
|
||||
__nop
|
||||
.endr
|
||||
#ifndef CONFIG_THUMB2_KERNEL
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
};
|
||||
|
||||
uart0: serial@12000 {
|
||||
compatible = "marvell,armada-38x-uart";
|
||||
compatible = "marvell,armada-38x-uart", "ns16550a";
|
||||
reg = <0x12000 0x100>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@@ -175,7 +175,7 @@
|
||||
};
|
||||
|
||||
uart1: serial@12100 {
|
||||
compatible = "marvell,armada-38x-uart";
|
||||
compatible = "marvell,armada-38x-uart", "ns16550a";
|
||||
reg = <0x12100 0x100>;
|
||||
reg-shift = <2>;
|
||||
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
interrupt-affinity = <&cpu0>, <&cpu1>;
|
||||
};
|
||||
|
||||
mpcore@19000000 {
|
||||
mpcore-bus@19000000 {
|
||||
compatible = "simple-bus";
|
||||
ranges = <0x00000000 0x19000000 0x00023000>;
|
||||
#address-cells = <1>;
|
||||
@@ -217,7 +217,7 @@
|
||||
#dma-cells = <1>;
|
||||
};
|
||||
|
||||
sdio: sdhci@21000 {
|
||||
sdio: mmc@21000 {
|
||||
compatible = "brcm,sdhci-iproc-cygnus";
|
||||
reg = <0x21000 0x100>;
|
||||
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
@@ -183,6 +183,7 @@
|
||||
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
gpio-ranges = <&gpio 0 0 54>;
|
||||
|
||||
/* Defines pin muxing groups according to
|
||||
* BCM2835-ARM-Peripherals.pdf page 102.
|
||||
|
||||
@@ -242,6 +242,8 @@
|
||||
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
};
|
||||
|
||||
pcie0: pcie@12000 {
|
||||
@@ -387,7 +389,7 @@
|
||||
i2c0: i2c@18009000 {
|
||||
compatible = "brcm,iproc-i2c";
|
||||
reg = <0x18009000 0x50>;
|
||||
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
clock-frequency = <100000>;
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
partitions {
|
||||
compatible = "redboot-fis";
|
||||
/* Eraseblock at 0xfe0000 */
|
||||
fis-index-block = <0x1fc>;
|
||||
fis-index-block = <0x7f>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -79,7 +79,6 @@
|
||||
MX23_PAD_LCD_RESET__GPIO_1_18
|
||||
MX23_PAD_PWM3__GPIO_1_29
|
||||
MX23_PAD_PWM4__GPIO_1_30
|
||||
MX23_PAD_SSP1_DETECT__SSP1_DETECT
|
||||
>;
|
||||
fsl,drive-strength = <MXS_DRIVE_4mA>;
|
||||
fsl,voltage = <MXS_VOLTAGE_HIGH>;
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
* Author: Fabio Estevam <fabio.estevam@freescale.com>
|
||||
*/
|
||||
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
backlight = &backlight;
|
||||
@@ -218,6 +220,7 @@
|
||||
MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
|
||||
MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
|
||||
MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
|
||||
MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0
|
||||
>;
|
||||
};
|
||||
|
||||
@@ -290,7 +293,7 @@
|
||||
&usdhc3 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_usdhc3>;
|
||||
non-removable;
|
||||
cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@@ -82,6 +82,6 @@
|
||||
#define MX6ULL_PAD_CSI_DATA04__ESAI_TX_FS 0x01F4 0x0480 0x0000 0x9 0x0
|
||||
#define MX6ULL_PAD_CSI_DATA05__ESAI_TX_CLK 0x01F8 0x0484 0x0000 0x9 0x0
|
||||
#define MX6ULL_PAD_CSI_DATA06__ESAI_TX5_RX0 0x01FC 0x0488 0x0000 0x9 0x0
|
||||
#define MX6ULL_PAD_CSI_DATA07__ESAI_T0 0x0200 0x048C 0x0000 0x9 0x0
|
||||
#define MX6ULL_PAD_CSI_DATA07__ESAI_TX0 0x0200 0x048C 0x0000 0x9 0x0
|
||||
|
||||
#endif /* __DTS_IMX6ULL_PINFUNC_H */
|
||||
|
||||
@@ -247,7 +247,7 @@
|
||||
|
||||
flash@0 {
|
||||
/* Rev. A uses 64MB flash, Rev. B & C use 32MB flash */
|
||||
compatible = "jedec,spi-nor", "s25fl256s1", "s25fl512s";
|
||||
compatible = "jedec,spi-nor";
|
||||
spi-max-frequency = <20000000>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
@@ -311,39 +311,6 @@
|
||||
#thermal-sensor-cells = <1>;
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
cpu_thermal: cpu-thermal {
|
||||
polling-delay-passive = <1000>;
|
||||
polling-delay = <5000>;
|
||||
|
||||
thermal-sensors = <&tmu 0>;
|
||||
|
||||
trips {
|
||||
cpu_alert: cpu-alert {
|
||||
temperature = <85000>;
|
||||
hysteresis = <2000>;
|
||||
type = "passive";
|
||||
};
|
||||
cpu_crit: cpu-crit {
|
||||
temperature = <95000>;
|
||||
hysteresis = <2000>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
|
||||
cooling-maps {
|
||||
map0 {
|
||||
trip = <&cpu_alert>;
|
||||
cooling-device =
|
||||
<&cpu0 THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu1 THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
dspi0: spi@2100000 {
|
||||
compatible = "fsl,ls1021a-v1.0-dspi";
|
||||
#address-cells = <1>;
|
||||
@@ -984,4 +951,37 @@
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
cpu_thermal: cpu-thermal {
|
||||
polling-delay-passive = <1000>;
|
||||
polling-delay = <5000>;
|
||||
|
||||
thermal-sensors = <&tmu 0>;
|
||||
|
||||
trips {
|
||||
cpu_alert: cpu-alert {
|
||||
temperature = <85000>;
|
||||
hysteresis = <2000>;
|
||||
type = "passive";
|
||||
};
|
||||
cpu_crit: cpu-crit {
|
||||
temperature = <95000>;
|
||||
hysteresis = <2000>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
|
||||
cooling-maps {
|
||||
map0 {
|
||||
trip = <&cpu_alert>;
|
||||
cooling-device =
|
||||
<&cpu0 THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>,
|
||||
<&cpu1 THERMAL_NO_LIMIT
|
||||
THERMAL_NO_LIMIT>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -49,14 +49,14 @@
|
||||
};
|
||||
|
||||
uart_A: serial@84c0 {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart";
|
||||
reg = <0x84c0 0x18>;
|
||||
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
uart_B: serial@84dc {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart";
|
||||
reg = <0x84dc 0x18>;
|
||||
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
||||
status = "disabled";
|
||||
@@ -94,7 +94,7 @@
|
||||
};
|
||||
|
||||
uart_C: serial@8700 {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart";
|
||||
reg = <0x8700 0x18>;
|
||||
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
|
||||
status = "disabled";
|
||||
@@ -196,7 +196,7 @@
|
||||
};
|
||||
|
||||
uart_AO: serial@4c0 {
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
|
||||
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart";
|
||||
reg = <0x4c0 0x18>;
|
||||
interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
|
||||
status = "disabled";
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
compatible = "smsc,lan9221","smsc,lan9115";
|
||||
bank-width = <2>;
|
||||
|
||||
gpmc,mux-add-data;
|
||||
gpmc,mux-add-data = <0>;
|
||||
gpmc,cs-on-ns = <0>;
|
||||
gpmc,cs-rd-off-ns = <42>;
|
||||
gpmc,cs-wr-off-ns = <36>;
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
compatible = "smsc,lan9221","smsc,lan9115";
|
||||
bank-width = <2>;
|
||||
|
||||
gpmc,mux-add-data;
|
||||
gpmc,mux-add-data = <0>;
|
||||
gpmc,cs-on-ns = <0>;
|
||||
gpmc,cs-rd-off-ns = <42>;
|
||||
gpmc,cs-wr-off-ns = <36>;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
flash0: n25q00@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q00aa";
|
||||
compatible = "micron,mt25qu02g", "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <100000000>;
|
||||
|
||||
|
||||
@@ -119,7 +119,7 @@
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q256a";
|
||||
compatible = "micron,n25q256a", "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <100000000>;
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
flash0: n25q00@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q00";
|
||||
compatible = "micron,mt25qu02g", "jedec,spi-nor";
|
||||
reg = <0>; /* chip select */
|
||||
spi-max-frequency = <100000000>;
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q00";
|
||||
compatible = "micron,mt25qu02g", "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <100000000>;
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
flash: flash@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q256a";
|
||||
compatible = "micron,n25q256a", "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <100000000>;
|
||||
m25p,fast-read;
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
flash0: n25q512a@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q512a";
|
||||
compatible = "micron,n25q512a", "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <100000000>;
|
||||
|
||||
|
||||
@@ -224,7 +224,7 @@
|
||||
n25q128@0 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q128";
|
||||
compatible = "micron,n25q128", "jedec,spi-nor";
|
||||
reg = <0>; /* chip select */
|
||||
spi-max-frequency = <100000000>;
|
||||
m25p,fast-read;
|
||||
@@ -241,7 +241,7 @@
|
||||
n25q00@1 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
compatible = "n25q00";
|
||||
compatible = "micron,mt25qu02g", "jedec,spi-nor";
|
||||
reg = <1>; /* chip select */
|
||||
spi-max-frequency = <100000000>;
|
||||
m25p,fast-read;
|
||||
|
||||
@@ -596,11 +596,9 @@ call_fpe:
|
||||
tstne r0, #0x04000000 @ bit 26 set on both ARM and Thumb-2
|
||||
reteq lr
|
||||
and r8, r0, #0x00000f00 @ mask out CP number
|
||||
THUMB( lsr r8, r8, #8 )
|
||||
mov r7, #1
|
||||
add r6, r10, #TI_USED_CP
|
||||
ARM( strb r7, [r6, r8, lsr #8] ) @ set appropriate used_cp[]
|
||||
THUMB( strb r7, [r6, r8] ) @ set appropriate used_cp[]
|
||||
add r6, r10, r8, lsr #8 @ add used_cp[] array offset first
|
||||
strb r7, [r6, #TI_USED_CP] @ set appropriate used_cp[]
|
||||
#ifdef CONFIG_IWMMXT
|
||||
@ Test if we need to give access to iWMMXt coprocessors
|
||||
ldr r5, [r10, #TI_FLAGS]
|
||||
@@ -609,7 +607,7 @@ call_fpe:
|
||||
bcs iwmmxt_task_enable
|
||||
#endif
|
||||
ARM( add pc, pc, r8, lsr #6 )
|
||||
THUMB( lsl r8, r8, #2 )
|
||||
THUMB( lsr r8, r8, #6 )
|
||||
THUMB( add pc, r8 )
|
||||
nop
|
||||
|
||||
|
||||
@@ -62,9 +62,10 @@ user_backtrace(struct frame_tail __user *tail,
|
||||
void
|
||||
perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
struct frame_tail __user *tail;
|
||||
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
/* We don't support guest os callchain now */
|
||||
return;
|
||||
}
|
||||
@@ -98,9 +99,10 @@ callchain_trace(struct stackframe *fr,
|
||||
void
|
||||
perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
struct stackframe fr;
|
||||
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
/* We don't support guest os callchain now */
|
||||
return;
|
||||
}
|
||||
@@ -111,18 +113,21 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re
|
||||
|
||||
unsigned long perf_instruction_pointer(struct pt_regs *regs)
|
||||
{
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest())
|
||||
return perf_guest_cbs->get_guest_ip();
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
|
||||
if (guest_cbs && guest_cbs->is_in_guest())
|
||||
return guest_cbs->get_guest_ip();
|
||||
|
||||
return instruction_pointer(regs);
|
||||
}
|
||||
|
||||
unsigned long perf_misc_flags(struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
int misc = 0;
|
||||
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (perf_guest_cbs->is_user_mode())
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs->is_user_mode())
|
||||
misc |= PERF_RECORD_MISC_GUEST_USER;
|
||||
else
|
||||
misc |= PERF_RECORD_MISC_GUEST_KERNEL;
|
||||
|
||||
@@ -154,8 +154,10 @@ static int __init rcar_gen2_regulator_quirk(void)
|
||||
return -ENODEV;
|
||||
|
||||
for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) {
|
||||
if (!of_device_is_available(np))
|
||||
if (!of_device_is_available(np)) {
|
||||
of_node_put(np);
|
||||
break;
|
||||
}
|
||||
|
||||
ret = of_property_read_u32(np, "reg", &addr);
|
||||
if (ret) /* Skip invalid entry and continue */
|
||||
@@ -164,6 +166,7 @@ static int __init rcar_gen2_regulator_quirk(void)
|
||||
quirk = kzalloc(sizeof(*quirk), GFP_KERNEL);
|
||||
if (!quirk) {
|
||||
ret = -ENOMEM;
|
||||
of_node_put(np);
|
||||
goto err_mem;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
menuconfig ARCH_SOCFPGA
|
||||
bool "Altera SOCFPGA family"
|
||||
depends on ARCH_MULTI_V7
|
||||
select ARCH_HAS_RESET_CONTROLLER
|
||||
select ARCH_SUPPORTS_BIG_ENDIAN
|
||||
select ARM_AMBA
|
||||
select ARM_GIC
|
||||
@@ -19,6 +20,7 @@ menuconfig ARCH_SOCFPGA
|
||||
select PL310_ERRATA_727915
|
||||
select PL310_ERRATA_753970 if PL310
|
||||
select PL310_ERRATA_769419
|
||||
select RESET_CONTROLLER
|
||||
|
||||
if ARCH_SOCFPGA
|
||||
config SOCFPGA_SUSPEND
|
||||
|
||||
@@ -33,7 +33,7 @@ extern void __iomem *sdr_ctl_base_addr;
|
||||
u32 socfpga_sdram_self_refresh(u32 sdr_base);
|
||||
extern unsigned int socfpga_sdram_self_refresh_sz;
|
||||
|
||||
extern char secondary_trampoline, secondary_trampoline_end;
|
||||
extern char secondary_trampoline[], secondary_trampoline_end[];
|
||||
|
||||
extern unsigned long socfpga_cpu1start_addr;
|
||||
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
||||
{
|
||||
int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;
|
||||
int trampoline_size = secondary_trampoline_end - secondary_trampoline;
|
||||
|
||||
if (socfpga_cpu1start_addr) {
|
||||
/* This will put CPU #1 into reset. */
|
||||
writel(RSTMGR_MPUMODRST_CPU1,
|
||||
rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST);
|
||||
|
||||
memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
|
||||
memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);
|
||||
|
||||
writel(__pa_symbol(secondary_startup),
|
||||
sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff));
|
||||
@@ -45,12 +45,12 @@ static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
||||
|
||||
static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
||||
{
|
||||
int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;
|
||||
int trampoline_size = secondary_trampoline_end - secondary_trampoline;
|
||||
|
||||
if (socfpga_cpu1start_addr) {
|
||||
writel(RSTMGR_MPUMODRST_CPU1, rst_manager_base_addr +
|
||||
SOCFPGA_A10_RSTMGR_MODMPURST);
|
||||
memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
|
||||
memcpy(phys_to_virt(0), secondary_trampoline, trampoline_size);
|
||||
|
||||
writel(__pa_symbol(secondary_startup),
|
||||
sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));
|
||||
|
||||
@@ -743,6 +743,7 @@ config SWP_EMULATE
|
||||
config CPU_BIG_ENDIAN
|
||||
bool "Build big-endian kernel"
|
||||
depends on ARCH_SUPPORTS_BIG_ENDIAN
|
||||
depends on !LD_IS_LLD
|
||||
help
|
||||
Say Y if you plan on running a kernel in big-endian mode.
|
||||
Note that your board must be properly built and your board
|
||||
|
||||
@@ -176,11 +176,22 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,
|
||||
int pfn_valid(unsigned long pfn)
|
||||
{
|
||||
phys_addr_t addr = __pfn_to_phys(pfn);
|
||||
unsigned long pageblock_size = PAGE_SIZE * pageblock_nr_pages;
|
||||
|
||||
if (__phys_to_pfn(addr) != pfn)
|
||||
return 0;
|
||||
|
||||
return memblock_is_map_memory(__pfn_to_phys(pfn));
|
||||
/*
|
||||
* If address less than pageblock_size bytes away from a present
|
||||
* memory chunk there still will be a memory map entry for it
|
||||
* because we round freed memory map to the pageblock boundaries.
|
||||
*/
|
||||
if (memblock_overlaps_region(&memblock.memory,
|
||||
ALIGN_DOWN(addr, pageblock_size),
|
||||
pageblock_size))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(pfn_valid);
|
||||
#endif
|
||||
@@ -371,14 +382,14 @@ static void __init free_unused_memmap(void)
|
||||
*/
|
||||
start = min(start,
|
||||
ALIGN(prev_end, PAGES_PER_SECTION));
|
||||
#else
|
||||
/*
|
||||
* Align down here since the VM subsystem insists that the
|
||||
* memmap entries are valid from the bank start aligned to
|
||||
* MAX_ORDER_NR_PAGES.
|
||||
*/
|
||||
start = round_down(start, MAX_ORDER_NR_PAGES);
|
||||
#endif
|
||||
/*
|
||||
* Align down here since many operations in VM subsystem
|
||||
* presume that there are no holes in the memory map inside
|
||||
* a pageblock
|
||||
*/
|
||||
start = round_down(start, pageblock_nr_pages);
|
||||
|
||||
/*
|
||||
* If we had a previous bank, and there is a space
|
||||
* between the current bank and the previous, free it.
|
||||
@@ -387,18 +398,20 @@ static void __init free_unused_memmap(void)
|
||||
free_memmap(prev_end, start);
|
||||
|
||||
/*
|
||||
* Align up here since the VM subsystem insists that the
|
||||
* memmap entries are valid from the bank end aligned to
|
||||
* MAX_ORDER_NR_PAGES.
|
||||
* Align up here since many operations in VM subsystem
|
||||
* presume that there are no holes in the memory map inside
|
||||
* a pageblock
|
||||
*/
|
||||
prev_end = ALIGN(memblock_region_memory_end_pfn(reg),
|
||||
MAX_ORDER_NR_PAGES);
|
||||
pageblock_nr_pages);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPARSEMEM
|
||||
if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION))
|
||||
if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION)) {
|
||||
prev_end = ALIGN(prev_end, pageblock_nr_pages);
|
||||
free_memmap(prev_end,
|
||||
ALIGN(prev_end, PAGES_PER_SECTION));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <linux/memblock.h>
|
||||
|
||||
#include <asm/cp15.h>
|
||||
#include <asm/cputype.h>
|
||||
@@ -301,7 +302,8 @@ static void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
|
||||
* Don't allow RAM to be mapped with mismatched attributes - this
|
||||
* causes problems with ARMv6+
|
||||
*/
|
||||
if (WARN_ON(pfn_valid(pfn) && mtype != MT_MEMORY_RW))
|
||||
if (WARN_ON(memblock_is_map_memory(PFN_PHYS(pfn)) &&
|
||||
mtype != MT_MEMORY_RW))
|
||||
return NULL;
|
||||
|
||||
area = get_vm_area_caller(size, VM_IOREMAP, caller);
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
pinctrl-0 = <&emac_rgmii_pins>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
phy-mode = "rgmii";
|
||||
phy-mode = "rgmii-id";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
#include "meson-gxbb.dtsi"
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
@@ -64,6 +65,7 @@
|
||||
regulator-name = "VDDIO_AO18";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
vcc_3v3: regulator-vcc_3v3 {
|
||||
@@ -157,6 +159,7 @@
|
||||
status = "okay";
|
||||
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
|
||||
pinctrl-names = "default";
|
||||
hdmi-supply = <&vddio_ao18>;
|
||||
};
|
||||
|
||||
&hdmi_tx_tmds_port {
|
||||
|
||||
@@ -161,11 +161,6 @@
|
||||
vcc-supply = <&sb_3v3>;
|
||||
};
|
||||
|
||||
rtc@51 {
|
||||
compatible = "nxp,pcf2129";
|
||||
reg = <0x51>;
|
||||
};
|
||||
|
||||
eeprom@56 {
|
||||
compatible = "atmel,24c512";
|
||||
reg = <0x56>;
|
||||
@@ -209,6 +204,15 @@
|
||||
|
||||
};
|
||||
|
||||
&i2c1 {
|
||||
status = "okay";
|
||||
|
||||
rtc@51 {
|
||||
compatible = "nxp,pcf2129";
|
||||
reg = <0x51>;
|
||||
};
|
||||
};
|
||||
|
||||
&enetc_port1 {
|
||||
phy-handle = <&qds_phy1>;
|
||||
phy-connection-type = "rgmii-id";
|
||||
|
||||
@@ -637,56 +637,56 @@
|
||||
};
|
||||
|
||||
cluster1_core0_watchdog: wdt@c000000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc000000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core1_watchdog: wdt@c010000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc010000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core2_watchdog: wdt@c020000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc020000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core3_watchdog: wdt@c030000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc030000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core0_watchdog: wdt@c100000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc100000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core1_watchdog: wdt@c110000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc110000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core2_watchdog: wdt@c120000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc120000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core3_watchdog: wdt@c130000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc130000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
|
||||
@@ -227,56 +227,56 @@
|
||||
};
|
||||
|
||||
cluster1_core0_watchdog: wdt@c000000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc000000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core1_watchdog: wdt@c010000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc010000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core0_watchdog: wdt@c100000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc100000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core1_watchdog: wdt@c110000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc110000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster3_core0_watchdog: wdt@c200000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc200000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster3_core1_watchdog: wdt@c210000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc210000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster4_core0_watchdog: wdt@c300000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc300000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster4_core1_watchdog: wdt@c310000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc310000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
|
||||
@@ -1100,7 +1100,7 @@
|
||||
};
|
||||
|
||||
watchdog0: watchdog@e8a06000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xe8a06000 0x0 0x1000>;
|
||||
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&crg_ctrl HI3660_OSC32K>;
|
||||
@@ -1108,7 +1108,7 @@
|
||||
};
|
||||
|
||||
watchdog1: watchdog@e8a07000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xe8a07000 0x0 0x1000>;
|
||||
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&crg_ctrl HI3660_OSC32K>;
|
||||
|
||||
@@ -839,7 +839,7 @@
|
||||
};
|
||||
|
||||
watchdog0: watchdog@f8005000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xf8005000 0x0 0x1000>;
|
||||
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&ao_ctrl HI6220_WDT0_PCLK>;
|
||||
|
||||
@@ -128,6 +128,9 @@
|
||||
|
||||
/* CON15(V2.0)/CON17(V1.4) : PCIe / CON15(V2.0)/CON12(V1.4) :mini-PCIe */
|
||||
&pcie0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>;
|
||||
reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@@ -59,6 +59,7 @@
|
||||
phys = <&comphy1 0>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>;
|
||||
reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
/* J6 */
|
||||
|
||||
@@ -127,10 +127,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&pcie_reset_pins {
|
||||
function = "gpio";
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>;
|
||||
|
||||
@@ -318,7 +318,7 @@
|
||||
|
||||
pcie_reset_pins: pcie-reset-pins {
|
||||
groups = "pcie1";
|
||||
function = "pcie";
|
||||
function = "gpio";
|
||||
};
|
||||
|
||||
pcie_clkreq_pins: pcie-clkreq-pins {
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
tx-fault-gpio = <&cp1_gpio1 26 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cp1_sfpp0_pins>;
|
||||
maximum-power-milliwatt = <2000>;
|
||||
};
|
||||
|
||||
sfp_eth1: sfp-eth1 {
|
||||
@@ -83,6 +84,7 @@
|
||||
tx-fault-gpio = <&cp0_gpio2 30 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cp1_sfpp1_pins &cp0_sfpp1_pins>;
|
||||
maximum-power-milliwatt = <2000>;
|
||||
};
|
||||
|
||||
sfp_eth3: sfp-eth3 {
|
||||
@@ -95,6 +97,7 @@
|
||||
tx-fault-gpio = <&cp0_gpio2 19 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&cp0_sfp_1g_pins &cp1_sfp_1g_pins>;
|
||||
maximum-power-milliwatt = <2000>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -709,7 +709,7 @@
|
||||
|
||||
ccplex@e000000 {
|
||||
compatible = "nvidia,tegra186-ccplex-cluster";
|
||||
reg = <0x0 0x0e000000 0x0 0x3fffff>;
|
||||
reg = <0x0 0x0e000000 0x0 0x400000>;
|
||||
|
||||
nvidia,bpmp = <&bpmp>;
|
||||
};
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
#size-cells = <2>;
|
||||
|
||||
aliases {
|
||||
sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
|
||||
sdhc2 = &sdhc_2; /* SDC2 SD card slot */
|
||||
mmc0 = &sdhc_1; /* SDC1 eMMC slot */
|
||||
mmc1 = &sdhc_2; /* SDC2 SD card slot */
|
||||
};
|
||||
|
||||
chosen { };
|
||||
|
||||
@@ -2098,9 +2098,6 @@
|
||||
nvmem-cells = <&gpu_speed_bin>;
|
||||
nvmem-cell-names = "speed_bin";
|
||||
|
||||
qcom,gpu-quirk-two-pass-use-wfi;
|
||||
qcom,gpu-quirk-fault-detect-mask;
|
||||
|
||||
operating-points-v2 = <&gpu_opp_table>;
|
||||
|
||||
gpu_opp_table: opp-table {
|
||||
|
||||
@@ -246,38 +246,42 @@
|
||||
LITTLE_CPU_SLEEP_0: cpu-sleep-0-0 {
|
||||
compatible = "arm,idle-state";
|
||||
idle-state-name = "little-retention";
|
||||
/* CPU Retention (C2D), L2 Active */
|
||||
arm,psci-suspend-param = <0x00000002>;
|
||||
entry-latency-us = <81>;
|
||||
exit-latency-us = <86>;
|
||||
min-residency-us = <200>;
|
||||
min-residency-us = <504>;
|
||||
};
|
||||
|
||||
LITTLE_CPU_SLEEP_1: cpu-sleep-0-1 {
|
||||
compatible = "arm,idle-state";
|
||||
idle-state-name = "little-power-collapse";
|
||||
/* CPU + L2 Power Collapse (C3, D4) */
|
||||
arm,psci-suspend-param = <0x40000003>;
|
||||
entry-latency-us = <273>;
|
||||
exit-latency-us = <612>;
|
||||
min-residency-us = <1000>;
|
||||
entry-latency-us = <814>;
|
||||
exit-latency-us = <4562>;
|
||||
min-residency-us = <9183>;
|
||||
local-timer-stop;
|
||||
};
|
||||
|
||||
BIG_CPU_SLEEP_0: cpu-sleep-1-0 {
|
||||
compatible = "arm,idle-state";
|
||||
idle-state-name = "big-retention";
|
||||
/* CPU Retention (C2D), L2 Active */
|
||||
arm,psci-suspend-param = <0x00000002>;
|
||||
entry-latency-us = <79>;
|
||||
exit-latency-us = <82>;
|
||||
min-residency-us = <200>;
|
||||
min-residency-us = <1302>;
|
||||
};
|
||||
|
||||
BIG_CPU_SLEEP_1: cpu-sleep-1-1 {
|
||||
compatible = "arm,idle-state";
|
||||
idle-state-name = "big-power-collapse";
|
||||
/* CPU + L2 Power Collapse (C3, D4) */
|
||||
arm,psci-suspend-param = <0x40000003>;
|
||||
entry-latency-us = <336>;
|
||||
exit-latency-us = <525>;
|
||||
min-residency-us = <1000>;
|
||||
entry-latency-us = <724>;
|
||||
exit-latency-us = <2027>;
|
||||
min-residency-us = <9419>;
|
||||
local-timer-stop;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -685,7 +685,6 @@
|
||||
&sdhci {
|
||||
bus-width = <8>;
|
||||
mmc-hs400-1_8v;
|
||||
mmc-hs400-enhanced-strobe;
|
||||
non-removable;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
vim-supply = <&vcc3v3_sys>;
|
||||
vin-supply = <&vcc3v3_sys>;
|
||||
};
|
||||
|
||||
vcc3v3_sys: vcc3v3-sys {
|
||||
|
||||
@@ -452,7 +452,7 @@
|
||||
status = "okay";
|
||||
|
||||
bt656-supply = <&vcc_3v0>;
|
||||
audio-supply = <&vcc_3v0>;
|
||||
audio-supply = <&vcc1v8_codec>;
|
||||
sdmmc-supply = <&vcc_sdio>;
|
||||
gpio1830-supply = <&vcc_3v0>;
|
||||
};
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
i-cache-sets = <256>;
|
||||
d-cache-size = <0x8000>;
|
||||
d-cache-line-size = <64>;
|
||||
d-cache-sets = <128>;
|
||||
d-cache-sets = <256>;
|
||||
next-level-cache = <&L2_0>;
|
||||
};
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
i-cache-sets = <256>;
|
||||
d-cache-size = <0x8000>;
|
||||
d-cache-line-size = <64>;
|
||||
d-cache-sets = <128>;
|
||||
d-cache-sets = <256>;
|
||||
next-level-cache = <&L2_0>;
|
||||
};
|
||||
};
|
||||
@@ -84,7 +84,7 @@
|
||||
cache-level = <2>;
|
||||
cache-size = <0x100000>;
|
||||
cache-line-size = <64>;
|
||||
cache-sets = <2048>;
|
||||
cache-sets = <1024>;
|
||||
next-level-cache = <&msmc_l3>;
|
||||
};
|
||||
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
reg = <0>;
|
||||
|
||||
partition@0 {
|
||||
label = "data";
|
||||
label = "spi0-data";
|
||||
reg = <0x0 0x100000>;
|
||||
};
|
||||
};
|
||||
@@ -149,7 +149,7 @@
|
||||
reg = <0>;
|
||||
|
||||
partition@0 {
|
||||
label = "data";
|
||||
label = "spi1-data";
|
||||
reg = <0x0 0x84000>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -582,7 +582,7 @@
|
||||
};
|
||||
|
||||
uart0: serial@ff000000 {
|
||||
compatible = "cdns,uart-r1p12", "xlnx,xuartps";
|
||||
compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12";
|
||||
status = "disabled";
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 21 4>;
|
||||
@@ -591,7 +591,7 @@
|
||||
};
|
||||
|
||||
uart1: serial@ff010000 {
|
||||
compatible = "cdns,uart-r1p12", "xlnx,xuartps";
|
||||
compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12";
|
||||
status = "disabled";
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 22 4>;
|
||||
|
||||
@@ -102,7 +102,9 @@ compat_user_backtrace(struct compat_frame_tail __user *tail,
|
||||
void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
/* We don't support guest os callchain now */
|
||||
return;
|
||||
}
|
||||
@@ -147,9 +149,10 @@ static int callchain_trace(struct stackframe *frame, void *data)
|
||||
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
struct stackframe frame;
|
||||
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
/* We don't support guest os callchain now */
|
||||
return;
|
||||
}
|
||||
@@ -160,18 +163,21 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
|
||||
|
||||
unsigned long perf_instruction_pointer(struct pt_regs *regs)
|
||||
{
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest())
|
||||
return perf_guest_cbs->get_guest_ip();
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
|
||||
if (guest_cbs && guest_cbs->is_in_guest())
|
||||
return guest_cbs->get_guest_ip();
|
||||
|
||||
return instruction_pointer(regs);
|
||||
}
|
||||
|
||||
unsigned long perf_misc_flags(struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
int misc = 0;
|
||||
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (perf_guest_cbs->is_user_mode())
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs->is_user_mode())
|
||||
misc |= PERF_RECORD_MISC_GUEST_USER;
|
||||
else
|
||||
misc |= PERF_RECORD_MISC_GUEST_KERNEL;
|
||||
|
||||
@@ -499,34 +499,26 @@ static void entry_task_switch(struct task_struct *next)
|
||||
|
||||
/*
|
||||
* ARM erratum 1418040 handling, affecting the 32bit view of CNTVCT.
|
||||
* Assuming the virtual counter is enabled at the beginning of times:
|
||||
*
|
||||
* - disable access when switching from a 64bit task to a 32bit task
|
||||
* - enable access when switching from a 32bit task to a 64bit task
|
||||
* Ensure access is disabled when switching to a 32bit task, ensure
|
||||
* access is enabled when switching to a 64bit task.
|
||||
*/
|
||||
static void erratum_1418040_thread_switch(struct task_struct *prev,
|
||||
struct task_struct *next)
|
||||
static void erratum_1418040_thread_switch(struct task_struct *next)
|
||||
{
|
||||
bool prev32, next32;
|
||||
u64 val;
|
||||
|
||||
if (!IS_ENABLED(CONFIG_ARM64_ERRATUM_1418040))
|
||||
if (!IS_ENABLED(CONFIG_ARM64_ERRATUM_1418040) ||
|
||||
!this_cpu_has_cap(ARM64_WORKAROUND_1418040))
|
||||
return;
|
||||
|
||||
prev32 = is_compat_thread(task_thread_info(prev));
|
||||
next32 = is_compat_thread(task_thread_info(next));
|
||||
|
||||
if (prev32 == next32 || !this_cpu_has_cap(ARM64_WORKAROUND_1418040))
|
||||
return;
|
||||
|
||||
val = read_sysreg(cntkctl_el1);
|
||||
|
||||
if (!next32)
|
||||
val |= ARCH_TIMER_USR_VCT_ACCESS_EN;
|
||||
if (is_compat_thread(task_thread_info(next)))
|
||||
sysreg_clear_set(cntkctl_el1, ARCH_TIMER_USR_VCT_ACCESS_EN, 0);
|
||||
else
|
||||
val &= ~ARCH_TIMER_USR_VCT_ACCESS_EN;
|
||||
sysreg_clear_set(cntkctl_el1, 0, ARCH_TIMER_USR_VCT_ACCESS_EN);
|
||||
}
|
||||
|
||||
write_sysreg(val, cntkctl_el1);
|
||||
static void erratum_1418040_new_exec(void)
|
||||
{
|
||||
preempt_disable();
|
||||
erratum_1418040_thread_switch(current);
|
||||
preempt_enable();
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -545,7 +537,7 @@ __notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,
|
||||
uao_thread_switch(next);
|
||||
ptrauth_thread_switch(next);
|
||||
ssbs_thread_switch(next);
|
||||
erratum_1418040_thread_switch(prev, next);
|
||||
erratum_1418040_thread_switch(next);
|
||||
scs_overflow_check(next);
|
||||
|
||||
/*
|
||||
@@ -607,6 +599,7 @@ void arch_setup_new_exec(void)
|
||||
current->mm->context.flags = is_compat_task() ? MMCF_AARCH32 : 0;
|
||||
|
||||
ptrauth_thread_init_user(current);
|
||||
erratum_1418040_new_exec();
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ARM64_TAGGED_ADDR_ABI
|
||||
|
||||
@@ -43,7 +43,8 @@ cc32-as-instr = $(call try-run,\
|
||||
# As a result we set our own flags here.
|
||||
|
||||
# KBUILD_CPPFLAGS and NOSTDINC_FLAGS from top-level Makefile
|
||||
VDSO_CPPFLAGS := -D__KERNEL__ -nostdinc -isystem $(shell $(CC_COMPAT) -print-file-name=include)
|
||||
VDSO_CPPFLAGS := -D__KERNEL__ -nostdinc
|
||||
VDSO_CPPFLAGS += -isystem $(shell $(CC_COMPAT) -print-file-name=include 2>/dev/null)
|
||||
VDSO_CPPFLAGS += $(LINUXINCLUDE)
|
||||
|
||||
# Common C and assembly flags
|
||||
|
||||
@@ -86,10 +86,11 @@ static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry,
|
||||
void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
unsigned long fp = 0;
|
||||
|
||||
/* C-SKY does not support virtualization. */
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest())
|
||||
if (guest_cbs && guest_cbs->is_in_guest())
|
||||
return;
|
||||
|
||||
fp = regs->regs[4];
|
||||
@@ -110,10 +111,11 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
|
||||
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
struct stackframe fr;
|
||||
|
||||
/* C-SKY does not support virtualization. */
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
pr_warn("C-SKY does not support perf in guest mode!");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ void __raw_readsw(const void __iomem *addr, void *data, int len)
|
||||
*dst++ = *src;
|
||||
|
||||
}
|
||||
EXPORT_SYMBOL(__raw_readsw);
|
||||
|
||||
/*
|
||||
* __raw_writesw - read words a short at a time
|
||||
@@ -47,6 +48,7 @@ void __raw_writesw(void __iomem *addr, const void *data, int len)
|
||||
|
||||
|
||||
}
|
||||
EXPORT_SYMBOL(__raw_writesw);
|
||||
|
||||
/* Pretty sure len is pre-adjusted for the length of the access already */
|
||||
void __raw_readsl(const void __iomem *addr, void *data, int len)
|
||||
@@ -62,6 +64,7 @@ void __raw_readsl(const void __iomem *addr, void *data, int len)
|
||||
|
||||
|
||||
}
|
||||
EXPORT_SYMBOL(__raw_readsl);
|
||||
|
||||
void __raw_writesl(void __iomem *addr, const void *data, int len)
|
||||
{
|
||||
@@ -76,3 +79,4 @@ void __raw_writesl(void __iomem *addr, const void *data, int len)
|
||||
|
||||
|
||||
}
|
||||
EXPORT_SYMBOL(__raw_writesl);
|
||||
|
||||
@@ -396,10 +396,83 @@ static void kretprobe_trampoline(void)
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
* At this point the target function has been tricked into
|
||||
* returning into our trampoline. Lookup the associated instance
|
||||
* and then:
|
||||
* - call the handler function
|
||||
* - cleanup by marking the instance as unused
|
||||
* - long jump back to the original return address
|
||||
*/
|
||||
int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
|
||||
{
|
||||
regs->cr_iip = __kretprobe_trampoline_handler(regs,
|
||||
dereference_function_descriptor(kretprobe_trampoline), NULL);
|
||||
struct kretprobe_instance *ri = NULL;
|
||||
struct hlist_head *head, empty_rp;
|
||||
struct hlist_node *tmp;
|
||||
unsigned long flags, orig_ret_address = 0;
|
||||
unsigned long trampoline_address =
|
||||
(unsigned long)dereference_function_descriptor(kretprobe_trampoline);
|
||||
|
||||
INIT_HLIST_HEAD(&empty_rp);
|
||||
kretprobe_hash_lock(current, &head, &flags);
|
||||
|
||||
/*
|
||||
* It is possible to have multiple instances associated with a given
|
||||
* task either because an multiple functions in the call path
|
||||
* have a return probe installed on them, and/or more than one return
|
||||
* return probe was registered for a target function.
|
||||
*
|
||||
* We can handle this because:
|
||||
* - instances are always inserted at the head of the list
|
||||
* - when multiple return probes are registered for the same
|
||||
* function, the first instance's ret_addr will point to the
|
||||
* real return address, and all the rest will point to
|
||||
* kretprobe_trampoline
|
||||
*/
|
||||
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
|
||||
if (ri->task != current)
|
||||
/* another task is sharing our hash bucket */
|
||||
continue;
|
||||
|
||||
orig_ret_address = (unsigned long)ri->ret_addr;
|
||||
if (orig_ret_address != trampoline_address)
|
||||
/*
|
||||
* This is the real return address. Any other
|
||||
* instances associated with this task are for
|
||||
* other calls deeper on the call stack
|
||||
*/
|
||||
break;
|
||||
}
|
||||
|
||||
regs->cr_iip = orig_ret_address;
|
||||
|
||||
hlist_for_each_entry_safe(ri, tmp, head, hlist) {
|
||||
if (ri->task != current)
|
||||
/* another task is sharing our hash bucket */
|
||||
continue;
|
||||
|
||||
if (ri->rp && ri->rp->handler)
|
||||
ri->rp->handler(ri, regs);
|
||||
|
||||
orig_ret_address = (unsigned long)ri->ret_addr;
|
||||
recycle_rp_inst(ri, &empty_rp);
|
||||
|
||||
if (orig_ret_address != trampoline_address)
|
||||
/*
|
||||
* This is the real return address. Any other
|
||||
* instances associated with this task are for
|
||||
* other calls deeper on the call stack
|
||||
*/
|
||||
break;
|
||||
}
|
||||
kretprobe_assert(ri, orig_ret_address, trampoline_address);
|
||||
|
||||
kretprobe_hash_unlock(current, &flags);
|
||||
|
||||
hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
|
||||
hlist_del(&ri->hlist);
|
||||
kfree(ri);
|
||||
}
|
||||
/*
|
||||
* By returning a non-zero value, we are telling
|
||||
* kprobe_handler() that we don't want the post_handler
|
||||
@@ -412,7 +485,6 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
ri->ret_addr = (kprobe_opcode_t *)regs->b0;
|
||||
ri->fp = NULL;
|
||||
|
||||
/* Replace the return addr with trampoline addr */
|
||||
regs->b0 = (unsigned long)dereference_function_descriptor(kretprobe_trampoline);
|
||||
|
||||
@@ -294,6 +294,9 @@ config BCM63XX
|
||||
select SYS_SUPPORTS_32BIT_KERNEL
|
||||
select SYS_SUPPORTS_BIG_ENDIAN
|
||||
select SYS_HAS_EARLY_PRINTK
|
||||
select SYS_HAS_CPU_BMIPS32_3300
|
||||
select SYS_HAS_CPU_BMIPS4350
|
||||
select SYS_HAS_CPU_BMIPS4380
|
||||
select SWAP_IO_SPACE
|
||||
select GPIOLIB
|
||||
select HAVE_CLK
|
||||
@@ -3056,7 +3059,7 @@ config STACKTRACE_SUPPORT
|
||||
config PGTABLE_LEVELS
|
||||
int
|
||||
default 4 if PAGE_SIZE_4KB && MIPS_VA_BITS_48
|
||||
default 3 if 64BIT && !PAGE_SIZE_64KB
|
||||
default 3 if 64BIT && (!PAGE_SIZE_64KB || MIPS_VA_BITS_48)
|
||||
default 2
|
||||
|
||||
config MIPS_AUTO_PFN_OFFSET
|
||||
|
||||
@@ -381,6 +381,18 @@ void clk_disable(struct clk *clk)
|
||||
|
||||
EXPORT_SYMBOL(clk_disable);
|
||||
|
||||
struct clk *clk_get_parent(struct clk *clk)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get_parent);
|
||||
|
||||
int clk_set_parent(struct clk *clk, struct clk *parent)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_set_parent);
|
||||
|
||||
unsigned long clk_get_rate(struct clk *clk)
|
||||
{
|
||||
if (!clk)
|
||||
|
||||
@@ -328,6 +328,7 @@ static int __init octeon_ehci_device_init(void)
|
||||
|
||||
pd->dev.platform_data = &octeon_ehci_pdata;
|
||||
octeon_ehci_hw_start(&pd->dev);
|
||||
put_device(&pd->dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -391,6 +392,7 @@ static int __init octeon_ohci_device_init(void)
|
||||
|
||||
pd->dev.platform_data = &octeon_ohci_pdata;
|
||||
octeon_ohci_hw_start(&pd->dev);
|
||||
put_device(&pd->dev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -544,6 +544,7 @@ static int __init dwc3_octeon_device_init(void)
|
||||
devm_iounmap(&pdev->dev, base);
|
||||
devm_release_mem_region(&pdev->dev, res->start,
|
||||
resource_size(res));
|
||||
put_device(&pdev->dev);
|
||||
}
|
||||
} while (node != NULL);
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ static unsigned int __init gen_fdt_mem_array(
|
||||
__init int yamon_dt_append_memory(void *fdt,
|
||||
const struct yamon_mem_region *regions)
|
||||
{
|
||||
unsigned long phys_memsize, memsize;
|
||||
unsigned long phys_memsize = 0, memsize;
|
||||
__be32 mem_array[2 * MAX_MEM_ARRAY_ENTRIES];
|
||||
unsigned int mem_entries;
|
||||
int i, err, mem_off;
|
||||
|
||||
@@ -315,7 +315,7 @@ enum cvmx_chip_types_enum {
|
||||
|
||||
/* Functions to return string based on type */
|
||||
#define ENUM_BRD_TYPE_CASE(x) \
|
||||
case x: return(#x + 16); /* Skip CVMX_BOARD_TYPE_ */
|
||||
case x: return (&#x[16]); /* Skip CVMX_BOARD_TYPE_ */
|
||||
static inline const char *cvmx_board_type_to_string(enum
|
||||
cvmx_board_types_enum type)
|
||||
{
|
||||
@@ -404,7 +404,7 @@ static inline const char *cvmx_board_type_to_string(enum
|
||||
}
|
||||
|
||||
#define ENUM_CHIP_TYPE_CASE(x) \
|
||||
case x: return(#x + 15); /* Skip CVMX_CHIP_TYPE */
|
||||
case x: return (&#x[15]); /* Skip CVMX_CHIP_TYPE */
|
||||
static inline const char *cvmx_chip_type_to_string(enum
|
||||
cvmx_chip_types_enum type)
|
||||
{
|
||||
|
||||
@@ -158,6 +158,18 @@ void clk_deactivate(struct clk *clk)
|
||||
}
|
||||
EXPORT_SYMBOL(clk_deactivate);
|
||||
|
||||
struct clk *clk_get_parent(struct clk *clk)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_get_parent);
|
||||
|
||||
int clk_set_parent(struct clk *clk, struct clk *parent)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(clk_set_parent);
|
||||
|
||||
static inline u32 get_counter_resolution(void)
|
||||
{
|
||||
u32 res;
|
||||
|
||||
@@ -18,14 +18,14 @@ static int a20r_set_periodic(struct clock_event_device *evt)
|
||||
{
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0x34;
|
||||
wmb();
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV;
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV & 0xff;
|
||||
wmb();
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = SNI_COUNTER0_DIV >> 8;
|
||||
wmb();
|
||||
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0xb4;
|
||||
wmb();
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV;
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV & 0xff;
|
||||
wmb();
|
||||
*(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = SNI_COUNTER2_DIV >> 8;
|
||||
wmb();
|
||||
|
||||
@@ -1363,6 +1363,7 @@ void
|
||||
perf_callchain_user(struct perf_callchain_entry_ctx *entry,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
unsigned long fp = 0;
|
||||
unsigned long gp = 0;
|
||||
unsigned long lp = 0;
|
||||
@@ -1371,7 +1372,7 @@ perf_callchain_user(struct perf_callchain_entry_ctx *entry,
|
||||
|
||||
leaf_fp = 0;
|
||||
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
/* We don't support guest os callchain now */
|
||||
return;
|
||||
}
|
||||
@@ -1479,9 +1480,10 @@ void
|
||||
perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
struct stackframe fr;
|
||||
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
/* We don't support guest os callchain now */
|
||||
return;
|
||||
}
|
||||
@@ -1493,20 +1495,23 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
|
||||
|
||||
unsigned long perf_instruction_pointer(struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
|
||||
/* However, NDS32 does not support virtualization */
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest())
|
||||
return perf_guest_cbs->get_guest_ip();
|
||||
if (guest_cbs && guest_cbs->is_in_guest())
|
||||
return guest_cbs->get_guest_ip();
|
||||
|
||||
return instruction_pointer(regs);
|
||||
}
|
||||
|
||||
unsigned long perf_misc_flags(struct pt_regs *regs)
|
||||
{
|
||||
struct perf_guest_info_callbacks *guest_cbs = perf_get_guest_cbs();
|
||||
int misc = 0;
|
||||
|
||||
/* However, NDS32 does not support virtualization */
|
||||
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
|
||||
if (perf_guest_cbs->is_user_mode())
|
||||
if (guest_cbs && guest_cbs->is_in_guest()) {
|
||||
if (guest_cbs->is_user_mode())
|
||||
misc |= PERF_RECORD_MISC_GUEST_USER;
|
||||
else
|
||||
misc |= PERF_RECORD_MISC_GUEST_KERNEL;
|
||||
|
||||
@@ -17,7 +17,12 @@
|
||||
# Mike Shaver, Helge Deller and Martin K. Petersen
|
||||
#
|
||||
|
||||
ifdef CONFIG_PARISC_SELF_EXTRACT
|
||||
boot := arch/parisc/boot
|
||||
KBUILD_IMAGE := $(boot)/bzImage
|
||||
else
|
||||
KBUILD_IMAGE := vmlinuz
|
||||
endif
|
||||
|
||||
NM = sh $(srctree)/arch/parisc/nm
|
||||
CHECKFLAGS += -D__hppa__=1
|
||||
|
||||
@@ -39,6 +39,7 @@ verify "$3"
|
||||
if [ -n "${INSTALLKERNEL}" ]; then
|
||||
if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
|
||||
if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
|
||||
if [ -x /usr/sbin/${INSTALLKERNEL} ]; then exec /usr/sbin/${INSTALLKERNEL} "$@"; fi
|
||||
fi
|
||||
|
||||
# Default install
|
||||
|
||||
@@ -478,7 +478,7 @@ lws_start:
|
||||
extrd,u %r1,PSW_W_BIT,1,%r1
|
||||
/* sp must be aligned on 4, so deposit the W bit setting into
|
||||
* the bottom of sp temporarily */
|
||||
or,ev %r1,%r30,%r30
|
||||
or,od %r1,%r30,%r30
|
||||
|
||||
/* Clip LWS number to a 32-bit value for 32-bit processes */
|
||||
depdi 0, 31, 32, %r20
|
||||
|
||||
@@ -245,27 +245,13 @@ void __init time_init(void)
|
||||
static int __init init_cr16_clocksource(void)
|
||||
{
|
||||
/*
|
||||
* The cr16 interval timers are not syncronized across CPUs on
|
||||
* different sockets, so mark them unstable and lower rating on
|
||||
* multi-socket SMP systems.
|
||||
* The cr16 interval timers are not syncronized across CPUs, even if
|
||||
* they share the same socket.
|
||||
*/
|
||||
if (num_online_cpus() > 1 && !running_on_qemu) {
|
||||
int cpu;
|
||||
unsigned long cpu0_loc;
|
||||
cpu0_loc = per_cpu(cpu_data, 0).cpu_loc;
|
||||
|
||||
for_each_online_cpu(cpu) {
|
||||
if (cpu == 0)
|
||||
continue;
|
||||
if ((cpu0_loc != 0) &&
|
||||
(cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))
|
||||
continue;
|
||||
|
||||
clocksource_cr16.name = "cr16_unstable";
|
||||
clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
|
||||
clocksource_cr16.rating = 0;
|
||||
break;
|
||||
}
|
||||
clocksource_cr16.name = "cr16_unstable";
|
||||
clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
|
||||
clocksource_cr16.rating = 0;
|
||||
}
|
||||
|
||||
/* XXX: We may want to mark sched_clock stable here if cr16 clocks are
|
||||
|
||||
@@ -783,7 +783,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
|
||||
* unless pagefault_disable() was called before.
|
||||
*/
|
||||
|
||||
if (fault_space == 0 && !faulthandler_disabled())
|
||||
if (faulthandler_disabled() || fault_space == 0)
|
||||
{
|
||||
/* Clean up and return if in exception table. */
|
||||
if (fixup_exception(regs))
|
||||
|
||||
@@ -56,8 +56,6 @@ SECTIONS
|
||||
{
|
||||
. = KERNEL_BINARY_TEXT_START;
|
||||
|
||||
_stext = .; /* start of kernel text, includes init code & data */
|
||||
|
||||
__init_begin = .;
|
||||
HEAD_TEXT_SECTION
|
||||
MLONGCALL_DISCARD(INIT_TEXT_SECTION(8))
|
||||
@@ -81,6 +79,7 @@ SECTIONS
|
||||
/* freed after init ends here */
|
||||
|
||||
_text = .; /* Text and read-only data */
|
||||
_stext = .;
|
||||
MLONGCALL_KEEP(INIT_TEXT_SECTION(8))
|
||||
.text ALIGN(PAGE_SIZE) : {
|
||||
TEXT_TEXT
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x08000000>; // 128MB
|
||||
};
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
model = "intercontrol,digsy-mtc";
|
||||
compatible = "intercontrol,digsy-mtc";
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
reg = <0x00000000 0x02000000>; // 32MB
|
||||
};
|
||||
|
||||
|
||||
@@ -79,6 +79,7 @@ fman0: fman@400000 {
|
||||
#size-cells = <0>;
|
||||
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
|
||||
reg = <0xfc000 0x1000>;
|
||||
fsl,erratum-a009885;
|
||||
};
|
||||
|
||||
xmdio0: mdio@fd000 {
|
||||
@@ -86,6 +87,7 @@ fman0: fman@400000 {
|
||||
#size-cells = <0>;
|
||||
compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
|
||||
reg = <0xfd000 0x1000>;
|
||||
fsl,erratum-a009885;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x04000000>; // 64MB
|
||||
};
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
led4 { gpios = <&gpio_simple 2 1>; };
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
reg = <0x00000000 0x10000000>; // 256MB
|
||||
};
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
reg = <0x00000000 0x08000000>; // 128MB RAM
|
||||
};
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
memory: memory {
|
||||
memory: memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x04000000>; // 64MB
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
model = "ifm,o2d";
|
||||
compatible = "ifm,o2d";
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
reg = <0x00000000 0x08000000>; // 128MB
|
||||
};
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
model = "ifm,o2d";
|
||||
compatible = "ifm,o2d";
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
reg = <0x00000000 0x04000000>; // 64MB
|
||||
};
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
model = "ifm,o2dnt2";
|
||||
compatible = "ifm,o2d";
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
reg = <0x00000000 0x08000000>; // 128MB
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user