Merge tag 'android11-5.4.161_r00' into android11-5.4
This is the merge of the upstream LTS release of 5.4.1161 into the android11-5.4 branch. It contains the following commits:b52fb22557ANDROID: GKI: disable CONFIG_FORTIFY_SOURCE26b09f181dMerge 5.4.161 into android11-5.4-lts5c088fba39Linux 5.4.161b786cb3236erofs: fix unsafe pagevec reuse of hooked pclusters83de35ae27erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()b37f6da8c3PCI: Add MSI masking quirk for Nvidia ION AHCIdb1390b60ePCI/MSI: Deal with devices lying about their MSI mask capability49b55a7792PCI/MSI: Destroy sysfs before freeing entries7186be970cparisc/entry: fix trace test in syscall exit path258c42a8fbfortify: Explicitly disable Clang support4f9a3cda16scsi: ufs: Fix tm request when non-fatal error happensc468f9249dext4: fix lazy initialization next schedule time computation in more granular unit307c6f7287MIPS: Fix assembly error from MIPSr2 code used within MIPS_ISA_ARCH_LEVEL7be773a028scsi: ufs: Fix interrupt error message for shared interruptse3c97ba4a6soc/tegra: pmc: Fix imbalanced clock disabling in error code pathebd1ef6eaeRevert "net: sched: update default qdisc visibility after Tx queue cnt changes"9084a8ecc9Revert "serial: core: Fix initializing and restoring termios speed"91a7552beaMerge 5.4.160 into android11-5.4-lts17efa1a44cLinux 5.4.16066bd28d6beselftests/bpf: Fix also no-alu32 strobemeta selfteste7ea088cd0ath10k: fix invalid dma_addr_t token assignment20a951afb7SUNRPC: Partial revert of commit 6f9f17287e785b7a0a4f7cPCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros256a1e009bpowerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during module unloadfe02d37870s390/cio: make ccw_device_dma_* more robust8a8d007baes390/tape: fix timer initialization in tape_std_assign()5ef14af166s390/cio: check the subchannel validity for dev_busidb0989ae51dvideo: backlight: Drop maximum brightness override for brightness zero66938ba128mm, oom: do not trigger out_of_memory from the #PFd6648b55edmm, oom: pagefault_out_of_memory: don't force global OOM for dying tasksc6f9a5c11apowerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC453b779d2bpowerpc/security: Add a helper to query stf_barrier type84b3fbfd8epowerpc/bpf: Fix BPF_SUB when imm == 0x800000007edda4bd9epowerpc/bpf: Validate branch ranges0347c001c9powerpc/lib: Add helper to check if offset is within conditional branch rangec4461ca7a8ovl: fix deadlock in splice write8d750efc8d9p/net: fix missing error check in p9_check_errorsaba12bb38bnet, neigh: Enable state migration between NUD_PERMANENT and NTF_USE223985fa1bf2fs: should use GFP_NOFS for directory inodesaf73b240e0irqchip/sifive-plic: Fixup EOI failed when masked53014c1c41parisc: Fix set_fixmap() on PA1.x CPUs645d6dfdcbparisc: Fix backtrace to always include init funtion names62c4e0a3d8ARM: 9156/1: drop cc-option fallbacks for architecture selection61a5e446bbARM: 9155/1: fix early early_iounmap()dc33574246selftests/net: udpgso_bench_rx: fix port argumentdd3a418ba5cxgb4: fix eeprom len when diagnostics not implemented1800c9eecdnet/smc: fix sk_refcnt underflow on linkdown and fallbackb2d1b6624bvsock: prevent unnecessary refcnt inc for nonblocking connect72aca95f95net: hns3: allow configure ETS bandwidth of all TCs07b218db54net/sched: sch_taprio: fix undefined behavior in ktime_mono_to_any18f2809441bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding180a9b539carm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions572599cbf1nfc: pn533: Fix double free when pn533_fill_fragment_skbs() failsc1d5f943bbllc: fix out-of-bound array index in llc_sk_dev_hash()bdf94057aaperf bpf: Add missing free to bpf_event__print_bpf_prog_info()23def86bbfzram: off by one in read_block_state()d26835de40mm/zsmalloc.c: close race window between zs_pool_dec_isolated() and zs_unregister_migration()46d695e870bonding: Fix a use-after-free problem when bond_sysfs_slave_add() faileddce69e0a06ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses700602b662net: vlan: fix a UAF in vlan_dev_real_dev()98e0ab88f4net: davinci_emac: Fix interrupt pacing disable70ecaadb49xen-pciback: Fix return in pm_ctrl_init()7f57b9bc8ei2c: xlr: Fix a resource leak in the error handling path of 'xlr_i2c_probe()'53ad06ff3bNFSv4: Fix a regression in nfs_set_open_stateid_locked()c9dcb51ae4scsi: qla2xxx: Turn off target reset during issue_lip211f08d1ffscsi: qla2xxx: Fix gnl list corruption9b180f3c2dar7: fix kernel builds for compiler test59e97c74d1watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT162a1cfcd5m68k: set a default value for MEMORY_RESERVE9770f8c29fsignal/sh: Use force_sig(SIGKILL) instead of do_group_exit(SIGKILL)9e6985190fdmaengine: dmaengine_desc_callback_valid(): Check for `callback_result`fd1de35901netfilter: nfnetlink_queue: fix OOB when mac header was cleared15351d5e8bsoc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_readbe832f781dauxdisplay: ht16k33: Fix frame buffer device blankingc441943075auxdisplay: ht16k33: Connect backlight to fbdev1fa9803de9auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty stringe63507ea43dmaengine: at_xdmac: fix AT_XDMAC_CC_PERID() macro04317e7474mtd: core: don't remove debugfs directory if device is in use59929f9a57mtd: spi-nor: hisi-sfc: Remove excessive clk_disable_unprepare()a83aaf1507fs: orangefs: fix error return code of orangefs_revalidate_lookup()c79c37c775NFS: Fix deadlocks in nfs_scan_commit_list()5a893e0eabopp: Fix return in _opp_add_static_v2()98ac698216PCI: aardvark: Fix preserving PCI_EXP_RTCTL_CRSSVE flag on emulated bridge819925eff0PCI: aardvark: Don't spam about PIO Response Statusbab1cfec7adrm/plane-helper: fix uninitialized variable reference4b48c6ede3pnfs/flexfiles: Fix misplaced barrier in nfs4_ff_layout_prepare_ds2b2fdb6f48rpmsg: Fix rpmsg_create_ept return when RPMSG config is not definedbd48bdbfd9apparmor: fix error checka7b2947649power: supply: bq27xxx: Fix kernel crash on IRQ handler register error3f698d97f7mips: cm: Convert to bitfield API to fix out-of-bounds accessfb7b73cd94powerpc/44x/fsp2: add missing of_node_putd3dd1a057cHID: u2fzero: properly handle timeouts in usb_submit_urbb216a39b32HID: u2fzero: clarify error check and length calculationsfae0552d83serial: xilinx_uartps: Fix race condition causing stuck TX818e100c2bphy: qcom-qusb2: Fix a memory leak on probede43e75917ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFERf00ff5357bASoC: cs42l42: Correct some register default valuesbaf5c1225eARM: dts: stm32: fix SAI sub nodes register rangebb74ce1febstaging: ks7010: select CRYPTO_HASH/CRYPTO_MICHAEL_MIC73aaa6222aRDMA/mlx4: Return missed an error if device doesn't support steering20dfad97dbscsi: csiostor: Uninitialized data in csio_ln_vnp_read_cbfn()5ead6f4feapower: supply: rt5033_battery: Change voltage values to µVfdbe8e8a08usb: gadget: hid: fix error code in do_config()15355466cdserial: 8250_dw: Drop wrong use of ACPI_PTR()d8241e7a21video: fbdev: chipsfb: use memset_io() instead of memset()e7df004eb1clk: at91: check pmc node status before registering syscore ops44a2dcd146memory: fsl_ifc: fix leak of irq and nand_irq in fsl_ifc_ctrl_probe03fe35ce9asoc/tegra: Fix an error handling path in tegra_powergate_power_up()543d85602farm: dts: omap3-gta04a4: accelerometer irq fix7cf7d9b83dALSA: hda: Reduce udelay() at SKL+ position reportingd1cf71d79eJFS: fix memleak in jfs_mount56911ee537MIPS: loongson64: make CPU_LOONGSON64 depends on MIPS_FP_SUPPORTee49b6598cscsi: dc395: Fix error case unwindingdd49dee254ARM: dts: at91: tse850: the emac<->phy interface is rmii1df7102f26arm64: dts: meson-g12a: Fix the pwm regulator supply properties681c58f344RDMA/bnxt_re: Fix query SRQ failure50eca29537ARM: dts: qcom: msm8974: Add xo_board reference clock to DSI0 PHY863e71a3afarm64: dts: rockchip: Fix GPU register width for RK33286694960195ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc()d27580c1b0clk: mvebu: ap-cpu-clk: Fix a memory leak in error handling paths9212ebb1c6RDMA/rxe: Fix wrong port_cap_flagscf234bc5fbibmvnic: Process crqs after enabling interruptsbc40616481ibmvnic: don't stop queue in xmita91c8ee2edudp6: allow SO_MARK ctrl msg to affect routing9ff14503f4selftests/bpf: Fix fclose/pclose mismatch in test_progsaf51aa2b85crypto: pcrypt - Delay write to padata->info9be9cb2a2bnet: phylink: avoid mvneta warning when setting pause parameters077410c790net: amd-xgbe: Toggle PLL settings during rate change63a3b1af04drm/amdgpu/gmc6: fix DMA mask from 44 to 40 bits9ca0d10742wcn36xx: add proper DMA memory barriers in rx patha3256ae45blibertas: Fix possible memory leak in probe and disconnect427583b93dlibertas_tf: Fix possible memory leak in probe and disconnect2339ff4162KVM: s390: Fix handle_sske page fault handling3f3b4054e2samples/kretprobes: Fix return value if register_kretprobe() failed9435b2f9c0tcp: don't free a FIN sk_buff in tcp_remove_empty_skb()a8226599cbirq: mips: avoid nested irq_enter()ae5a244648s390/gmap: don't unconditionally call pte_unmap_unlock() in __gmap_zap()8fb436d146libbpf: Fix BTF data layout checks and allow empty BTF03a818c096smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi12ccb57379drm/msm: Fix potential NULL dereference in DPU SSPPdc18f08062clocksource/drivers/timer-ti-dm: Select TIMER_OFc523474f2aPM: hibernate: fix sparse warnings0d22f55014nvme-rdma: fix error code in nvme_rdma_setup_ctrl67ba6c8e71phy: micrel: ksz8041nl: do not use power down modeae213c059amwifiex: Send DELBA requests according to spec3a781e2131rsi: stop thread firstly in rsi_91x_init() error handlingad4cd01307mt76: mt76x02: fix endianness warnings in mt76x02_mac.cbdbc9311f1platform/x86: thinkpad_acpi: Fix bitwise vs. logical warning3446e5ecdfblock: ataflop: fix breakage introduced at blk-mq refactoring2918a29fc8mmc: mxs-mmc: disable regulator on error and in the remove functionb631c603b5net: stream: don't purge sk_error_queue in sk_stream_kill_queues()f27fbff862drm/msm: uninitialized variable in msm_gem_import()32ac072c24ath10k: fix max antenna gain unit218fb43fffhwmon: (pmbus/lm25066) Let compiler determine outer dimension of lm25066_coeff8384c4a7bchwmon: Fix possible memleak in __hwmon_device_register()f7fd072039net, neigh: Fix NTF_EXT_LEARNED in combination with NTF_USE9498f5272amemstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host()5f462b38cememstick: avoid out-of-range warning3a7525d5d7mmc: sdhci-omap: Fix NULL pointer exception if regulator is not configureddc73f7cae1b43: fix a lower bounds test1b6365fdaeb43legacy: fix a lower bounds testc51ac7fd02hwrng: mtk - Force runtime pm ops for sleep ops52d2cdab52crypto: qat - disregard spurious PFVF interrupts4d7881430fcrypto: qat - detect PFVF collision after ACKa3d3f9c5dcmedia: dvb-frontends: mn88443x: Handle errors of clk_prepare_enable()73dd601becnetfilter: nft_dynset: relax superfluous check on set updates62f6260f70EDAC/amd64: Handle three rank interleaving modef399e650c0ath9k: Fix potential interrupt storm on queue reset843ff688ebmedia: em28xx: Don't use ops->suspend if it is NULLe577924b70cpuidle: Fix kobject memory leaks in error paths18fdbdbecfcrypto: ecc - fix CRYPTO_DEFAULT_RNG dependencya993159a2akprobes: Do not use local variable when creating debugfs file71411bd79emedia: cx23885: Fix snd_card_free call on null card pointer1c2c8030e7media: tm6000: Avoid card name truncation61266f852fmedia: si470x: Avoid card name truncation4e65b9ec21media: radio-wl1273: Avoid card name truncation8eeec127d5media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()'2b9ae7bac9media: TDA1997x: handle short reads of hdmi info frame.23b65152a0media: dvb-usb: fix ununit-value in az6027_rc_querye2b2d221a4media: cxd2880-spi: Fix a null pointer dereference on error handling pathf46da0c6afmedia: em28xx: add missing em28xx_close_extension14f3d77c77drm/amdgpu: fix warning for overflow check465dc8a1b1ath10k: Fix missing frame timestamp for beacon/probe-resp7c12c2fe45net: dsa: rtl8366rb: Fix off-by-one bug674637270erxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies()d4cd7a167ccrypto: caam - disable pkc for non-E SoCs555fe5734dBluetooth: btmtkuart: fix a memleak in mtk_hci_wmt_sync8c68d12f1awilc1000: fix possible memory leak in cfg_scan_result()1713b85634cgroup: Make rebind_subsystems() disable v2 controllers all at oncebd76ec43f1net: net_namespace: Fix undefined member in key_remove_domain()3a37742128virtio-gpu: fix possible memory allocation failure606c95078adrm/v3d: fix wait for TMU write combiner flush6a93d8ebb8rcu: Fix existing exp request check in sync_sched_exp_online_cleanup()6237a1685cBluetooth: fix init and cleanup of sco_conn.timeout_work28c1d96562selftests/bpf: Fix strobemeta selftest regressionf2c04d46c8netfilter: conntrack: set on IPS_ASSURED if flows enters internal stream state0c2acfede5parisc/kgdb: add kgdb_roundup() to make kgdb work with idle pollingcbe2872427parisc/unwind: fix unwinder when CONFIG_64BIT is enableda9a411adcatask_stack: Fix end_of_stack() for architectures with upwards-growing stackc06cf3b1d0parisc: fix warning in flush_tlb_all7324419233x86/hyperv: Protect set_hv_tscchange_cb() against getting preemptedad67a7e2abspi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe()a15fc58933btrfs: do not take the uuid_mutex in btrfs_rm_deviceaba1db41ddnet: annotate data-race in neigh_output()2f78cb7eccvrf: run conntrack only in context of lower/physdev for locally generated packets5919f02e18ARM: 9136/1: ARMv7-M uses BE-8, not BE-32d99f320a1bgre/sit: Don't generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE9929b3db46ARM: clang: Do not rely on lr register for stacktrace681a426e6bsmackfs: use __GFP_NOFAIL for smk_cipso_doi()4752a9c3a0iwlwifi: mvm: disable RX-diversity in powersave41e583edb1selftests: kvm: fix mismatched fclose() after popen()4411d0d8dfPM: hibernate: Get block device exclusively in swsusp_check()a528d3aac3nvme: drop scan_lock and always kick requeue list when removing namespaces209c39b3f5nvmet-tcp: fix use-after-free when a port is removed81d11e40fdnvmet: fix use-after-free when a port is removed1ec1ca2be9block: remove inaccurate requeue checkbfde056402mwl8k: Fix use-after-free in mwl8k_fw_state_machine()e4af3e42batracing/cfi: Fix cmp_entries_* functions signature mismatchcaeb6bae75workqueue: make sysfs of unbound kworker cpumask more clever58b4e0c075lib/xz: Validate the value before assigning it to an enum variable8cdab20660lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompressioneb8f087201memstick: r592: Fix a UAF bug when removing the driver2226ad0314leaking_addresses: Always print a trailing newline63c3c7b699ACPI: battery: Accept charges over the design capacity as full2efb81b22diov_iter: Fix iov_iter_get_pages{,_alloc} page fault return valued5fb057f23ath: dfs_pattern_detector: Fix possible null-pointer dereference in channel_detector_create()e2c27194fctracefs: Have tracefs directories not set OTH permission bits by defaultace6e7fe96net-sysfs: try not to restart the syscall if it will fail eventuallyd8d1d35405media: usb: dvd-usb: fix uninit-value bug in dibusb_read_eeprom_byte()382e7b6458media: ipu3-imgu: VIDIOC_QUERYCAP: Fix bus_infoe5f9be4869media: ipu3-imgu: imgu_fmt: Handle properly trycdf338e1dbACPICA: Avoid evaluating methods too early during system resume9ff00d0b1dipmi: Disable some operations during a panic4bba26f89emedia: rcar-csi2: Add checking to rcsi2_start_receiver()c08a655ed9brcmfmac: Add DMI nvram filename quirk for Cyberbook T116 tabletf64551db52ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK31b7848647media: mceusb: return without resubmitting URB in case of -EPROTO error.e419469adfmedia: imx: set a media_device bus_info stringb2b2f91782media: s5p-mfc: Add checking to s5p_mfc_probe().6b8ab552e2media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe()bc4af8c782media: uvcvideo: Set unique vdev name based in type7a646855d6media: uvcvideo: Return -EIO for control errorsab7fca0eaemedia: uvcvideo: Set capability in s_parambff0833e2bmedia: stm32: Potential NULL pointer dereference in dcmi_irq_thread()cede36511cmedia: netup_unidvb: handle interrupt properly according to the firmware3fe3d04354media: mt9p031: Fix corrupted frame after restarting stream08743f9c48ath10k: high latency fixes for beacon bufferfadb4cd750mwifiex: Properly initialize private structure on interface type changes7d3e6635c2mwifiex: Run SET_BSS_MODE when changing from P2P to STATION vif-type480c240ab6x86: Increase exception stack sizes91b9c23b6dsmackfs: Fix use-after-free in netlbl_catmap_walk()31df731c87net: sched: update default qdisc visibility after Tx queue cnt changesa82f379378locking/lockdep: Avoid RCU-induced noinstr failf14eca60bfMIPS: lantiq: dma: reset correct number of channelca07aff257MIPS: lantiq: dma: add small delay after resete5ea3dca94platform/x86: wmi: do not fail if disabling failsb57df4d6fcdrm/panel-orientation-quirks: add Valve Steam Deck67bd269a84Bluetooth: fix use-after-free error in lock_sock_nested()d416020f1aBluetooth: sco: Fix lock_sock() blockage by memcpy_from_msg()a52bd11b24drm: panel-orientation-quirks: Add quirk for the Samsung Galaxy Book 10.6e5ca76568adrm: panel-orientation-quirks: Add quirk for KD Kurio Smart C15200 2-in-1c19cabfa55drm: panel-orientation-quirks: Update the Lenovo Ideapad D330 quirk (v2)46a25b7a25dma-buf: WARN on dmabuf release with pending attachments1bee9e59c6USB: chipidea: fix interrupt deadlock8a643c0f95USB: iowarrior: fix control-message timeouts3285811674USB: serial: keyspan: fix memleak on probe errors8ce0bc6962iio: dac: ad5446: Fix ad5622_write() return valuef01e16d324pinctrl: core: fix possible memory leak in pinctrl_enable()270541cbc0quota: correct error number in free_dqentry()10b808307dquota: check block number when reading the block in quota filea509a515f3PCI: aardvark: Read all 16-bits from PCIE_MSI_PAYLOAD_REG0ea58b9bb9PCI: aardvark: Fix return value of MSI domain .alloc() methodee9cdca4d6PCI: aardvark: Fix reporting Data Link Layer Link Active6f99c7a51ePCI: aardvark: Do not unmask unused interruptsd964886327PCI: aardvark: Fix checking for link up via LTSSM statee0269c0c81PCI: aardvark: Do not clear status bits of masked interrupts50b0ce94fbPCI: pci-bridge-emul: Fix emulation of W1C bits3d995568c9xen/balloon: add late_initcall_sync() for initial ballooning done3f6255a91bALSA: mixer: fix deadlock in snd_mixer_oss_set_volume6225a31b2eALSA: mixer: oss: Fix racy access to slotse9adf72bdbserial: core: Fix initializing and restoring termios speedb535b63464powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be foundbfefc5d6f9can: j1939: j1939_can_recv(): ignore messages with invalid source address94a3f521e3can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport8e61c799c8KVM: nVMX: Query current VMCS when determining if MSR bitmaps are in use654a824816power: supply: max17042_battery: use VFSOC for capacity when no rsns11129762e3power: supply: max17042_battery: Prevent int underflow in set_soc_threshold625c3ed247signal/mips: Update (_save|_restore)_fp_context to fail with -EFAULTec5ef8d4d7signal: Remove the bogus sigkill_pending in ptrace_stop28c70d5036RDMA/qedr: Fix NULL deref for query_qp on the GSI QP91a29609bdrsi: Fix module dev_oper_mode parameter description9defe9b1abrsi: fix rate mask set leading to P2P failure2f1f06be3ersi: fix key enabled check causing unwanted encryption for vap_id > 01fa1da8a60rsi: fix occasional initialisation failure with BT coex398e7e5addwcn36xx: handle connection loss indication4a67355383libata: fix checking of DMA state6f2f91b9dfmwifiex: Read a PCI register after writing the TX ring write pointer3991cdc40fwcn36xx: Fix HT40 capability for 2Ghz band301d33c954evm: mark evm_fixmode as __ro_after_inite1f71a3289rtl8187: fix control-message timeouts76d2ce7ca9PCI: Mark Atheros QCA6174 to avoid bus reset3110371c7aath10k: fix division by zero in send path2b94d10056ath10k: fix control-message timeoutcfbe74d8b1ath6kl: fix control-message timeout1a2fe1c3d8ath6kl: fix division by zero in send path78ebff828amwifiex: fix division by zero in fw download path08501eb9ffEDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswella147922924regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx propertyc9e5a00596regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled3baa5886d1hwmon: (pmbus/lm25066) Add offset coefficients98bea92379ia64: kprobes: Fix to pass correct trampoline address to the handlerddb54bf3b7btrfs: call btrfs_check_rw_degradable only if there is a missing device5223324ed1btrfs: fix lost error handling when replaying directory deletesc25984fa18btrfs: clear MISSING device status bit in btrfs_close_one_device87a87c82f7net/smc: Correct spelling mistake to TCPF_SYN_RECVcc14499b9dnfp: bpf: relax prog rejection for mtu check through max_pkt_offseta62d430841vmxnet3: do not stop tx queues after netif_device_detach()17dcecf20cr8169: Add device 10ec:8162 to driver r8169e84b38e578nvmet-tcp: fix header digest verification2804181e1bdrm: panel-orientation-quirks: Add quirk for GPD Win37273488fd3watchdog: Fix OMAP watchdog early handling5ffdddcf28net: multicast: calculate csum of looped-back and forwarded packets9420e2496dspi: spl022: fix Microwire full duplex mode1a667bc329nvmet-tcp: fix a memory leak when releasing a queue2f3860ba60xen/netfront: stop tx queues during live migrationde649ec7adbpf: Prevent increasing bpf_jit_limit above maxdf8665c398bpf: Define bpf_jit_alloc_exec_limit for arm64 JIT8dd688ba67drm: panel-orientation-quirks: Add quirk for Aya Neo 2021c4282bb805mmc: winbond: don't build on M68K05f0a97e2freset: socfpga: add empty driver allowing consumers to probedfa8fb782bARM: dts: sun7i: A20-olinuxino-lime2: Fix ethernet phy-modef09014e8behyperv/vmbus: include linux/bitops.h054fe50d26sfc: Don't use netif_info before net_device setup82005afbb3cavium: Fix return values of the probe function9f5fd5aab8scsi: qla2xxx: Fix unmap of already freed sgl96183337e9scsi: qla2xxx: Return -ENOMEM if kzalloc() fails8e3a0d28edcavium: Return negative value when pci_alloc_irq_vectors() fails58608e80d6x86/irq: Ensure PI wakeup handler is unregistered before module unload7252cb96e4x86/cpu: Fix migration safety with X86_BUG_NULL_SELe3d4ba338bx86/sme: Use #define USE_EARLY_PGTABLE_L5 in mem_encrypt_identity.cccc4e5e60bfuse: fix page stealing9505d48721ALSA: timer: Unconditionally unlink slave instances, too2c6446168fALSA: timer: Fix use-after-free problem246c6a1fe3ALSA: synth: missing check for possible NULL after the call to kstrdupce9f7535ecALSA: usb-audio: Add registration quirk for JBL Quantum 4007da6f4c5c2ALSA: line6: fix control and interrupt message timeouts4a12e624e5ALSA: 6fire: fix control and bulk message timeoutsab3f823af2ALSA: ua101: fix division by zero at probea3bb6e0db7ALSA: hda/realtek: Add quirk for HP EliteBook 840 G7 mute LED40243342d2ALSA: hda/realtek: Add quirk for ASUS UX550VE8af6ade7acALSA: hda/realtek: Add a quirk for Acer Spin SP513-54N809416fe0aALSA: hda/realtek: Add quirk for Clevo PC70HS638b53d67fmedia: v4l2-ioctl: Fix check_ext_ctrls8c11269bd6media: ir-kbd-i2c: improve responsiveness of hauppauge zilog receiversbbd62d2fcamedia: ite-cir: IR receiver stop working after receive overfloweef6cb3d3ccrypto: s5p-sss - Add error handling in s5p_aes_probe()d7a5d872b4firmware/psci: fix application of sizeof to pointer18f0fb57a9tpm: Check for integer overflow in tpm2_map_response_body()f38f3da360parisc: Fix ptrace check on syscall returnacbc2a08eammc: dw_mmc: Dont wait for DRTO on Write RSP error5ee76475f8scsi: qla2xxx: Fix use after free in eh_abort pathcc5b139488scsi: qla2xxx: Fix kernel crash when accessing port_speed sysfs file617d2fd48docfs2: fix data corruption on truncatec20eb9551clibata: fix read log timeout value69c2199f49Input: i8042 - Add quirk for Fujitsu Lifebook T72517ec1c6b45Input: elantench - fix misreporting trackpoint coordinatesce4bec0a54Input: iforce - fix control-message timeoutdb39f49ee7binder: use cred instead of task for getsecidfc9c470cd5binder: use cred instead of task for selinux checks28a1e470b0binder: use euid from cred instead of using task3e87c4996dusb: xhci: Enable runtime-pm by default on AMD Yellow Carp platform3fa7efd1faxhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delayf911d1ad48Merge 5.4.159 into android11-5.4-lts5915b0ea67Linux 5.4.159abc49cc45drsi: fix control-message timeout64e6632ab4media: staging/intel-ipu3: css: Fix wrong size comparison imgu_css_fw_init6c382b6365staging: rtl8192u: fix control-message timeoutsf66258cb60staging: r8712u: fix control-message timeout88a252ff78comedi: vmk80xx: fix bulk and interrupt message timeouts1ae4715121comedi: vmk80xx: fix bulk-buffer overflow199acd8c11comedi: vmk80xx: fix transfer-buffer overflowsb0156b7c96comedi: ni_usb6501: fix NULL-deref in command paths3efb7af8accomedi: dt9812: fix DMA buffers on stack6e80e9314fisofs: Fix out of bound access for corrupted isofs imageadc56dbfc4printk/console: Allow to disable console output by using console="" or console=null589ac131b3binder: don't detect sender/target during buffer cleanupb60e89b63eusb-storage: Add compatibility quirk flags for iODD 2531/25415c3eba2904usb: musb: Balance list entry in musb_gadget_queue161571745dusb: gadget: Mark USB_FSL_QE broken on 64-bitd6013265a7usb: ehci: handshake CMD_RUN instead of STS_HALT6d000e1c16Revert "x86/kvm: fix vcpu-id indexed array sizes"3197361248Merge branch 'android11-5.4' into 'android11-5.4-lts'7cd388bad4Merge 5.4.158 into android11-5.4-ltsc65356f0f7Linux 5.4.158e31d51f8a4ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"960b1fdfc3Revert "drm/ttm: fix memleak in ttm_transfered_destroy"a73ebe514asfc: Fix reading non-legacy supported link modes6789e4b759Revert "usb: core: hcd: Add support for deferring roothub registration"049849492bRevert "xhci: Set HCD flag to defer primary roothub registration"2461f38384media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt()21fc2bb836net: ethernet: microchip: lan743x: Fix skb allocation failuree02fdd7db4vrf: Revert "Reset skb conntrack connection..."1ce287eff9scsi: core: Put LLD module refcnt after SCSI device is released553d3c4173Merge 5.4.157 into android11-5.4-ltse6de9a8b5bLinux 5.4.15739fb393e21perf script: Check session->header.env.arch before using it472d9354a9KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu07e9a4e1abKVM: s390: clear kicked_mask before sleeping again5919a07d71cfg80211: correct bridge/4addr mode checkdba9e632ednet: use netif_is_bridge_port() to check for IFF_BRIDGE_PORT0f5b4c57dcsctp: add vtag check in sctp_sf_ootbdf52776407sctp: add vtag check in sctp_sf_do_8_5_1_E_sa0aa322b5fesctp: add vtag check in sctp_sf_violationd6470c2200sctp: fix the processing for COOKIE_ECHO chunk5fe74d5e4dsctp: fix the processing for INIT_ACK chunk5953ee99basctp: use init_tag from inithdr for ABORT chunk5395650d15phy: phy_start_aneg: Add an unlocked versionc85b696270phy: phy_ethtool_ksettings_get: Lock the phy for consistency0dea6379e2net/tls: Fix flipped sign in async_wait.err assignmente12b8f3c2bnet: nxp: lpc_eth.c: avoid hang when bringing interface downb232898c1dnet: ethernet: microchip: lan743x: Fix dma allocation failure by using dma_set_mask_and_coherent92507dc1efnet: ethernet: microchip: lan743x: Fix driver crash when lan743x_pm_resume fails3708aa267dnios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TESTb1c76f97adRDMA/sa_query: Use strscpy_pad instead of memcpy to copy a string18a012869fnet: Prevent infinite while loop in skb_tx_hash()6422e84718net: batman-adv: fix error handling1cead23c1cregmap: Fix possible double-free in regcache_rbtree_exit()207e6e93e7arm64: dts: allwinner: h5: NanoPI Neo 2: Fix ethernet nodec29c3295e0RDMA/mlx5: Set user priority for DCT13ad93a42cnvme-tcp: fix data digest pointer calculationb597b0e2e8nvmet-tcp: fix data digest pointer calculationd997d4e436IB/hfi1: Fix abba locking issue with sc_disable()0f8cdfff06IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields5f0bfe21c8tcp_bpf: Fix one concurrency problem in the tcp_bpf_send_verdict functionbd99782f3cdrm/ttm: fix memleak in ttm_transfered_destroyd2c64ebcc7net: lan78xx: fix division by zero in send patha37c5e70accfg80211: scan: fix RCU in cfg80211_add_nontrans_list()590abe5becmmc: sdhci-esdhc-imx: clear the buffer_read_ready to reset standard tuning circuit07da44b086mmc: sdhci: Map more voltage level to SDHCI_POWER_3300821c5608dmmc: dw_mmc: exynos: fix the finding clock sample value08328d65cbmmc: cqhci: clear HALT state after CQE enable55a3870f4ammc: vub300: fix control-message timeoutse0cfd5159fnet/tls: Fix flipped sign in tls_err_abort() calls6a18d155d5Revert "net: mdiobus: Fix memory leak in __mdiobus_register"9fdcf66ee4nfc: port100: fix using -ERRNO as command type mask853f22623data: sata_mv: Fix the error handling of mv_chip_id()6d0b30784fRevert "pinctrl: bcm: ns: support updated DT binding as syscon subnode"b7dfc536dbusbnet: fix error return code in usbnet_probe()492140e45dusbnet: sanity check for maxpacket4ba6c163feipv4: use siphash instead of Jenkins in fnhe_hashfun()3f439c231aipv6: use siphash in rt6_exception_hash()1cad781ecfpowerpc/bpf: Fix BPF_MOD when imm == 1ca10ddbbabARM: 9141/1: only warn about XIP address when not compile testing40cd329455ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype2f7647cc13ARM: 9134/1: remove duplicate memcpy() definition9f44f66396ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned5f1f361447Merge 5.4.156 into android11-5.4-lts3a7a77d783Merge branch 'android11-5.4' into 'android11-5.4-lts'89b6869b94Linux 5.4.1567cdcaa7c76pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume()a9c4e246f7ARM: 9122/1: select HAVE_FUTEX_CMPXCHGa98c81ab17tracing: Have all levels of checks prevent recursionb0feaa8376net: mdiobus: Fix memory leak in __mdiobus_register0ab35e7074scsi: core: Fix shost->cmd_per_lun calculation in scsi_add_host_with_dma()9068beaa04Input: snvs_pwrkey - add clk handling8de335e819ALSA: hda: avoid write to STATESTS if controller is in reset570bc60dcdplatform/x86: intel_scu_ipc: Update timeout value in comment4054b869dcisdn: mISDN: Fix sleeping function called from invalid context5001160d3eARM: dts: spear3xx: Fix gmac nodee9d9ffa193net: stmmac: add support for dwmac 3.40a044fa2afd6btrfs: deal with errors when checking if a dir entry exists during log replayd49a293b94gcc-plugins/structleak: add makefile var for disabling structleake8ef998441selftests: netfilter: remove stray bash debug lineb7fdebde2cnetfilter: Kconfig: use 'default y' instead of 'm' for bool config option285e9210b1isdn: cpai: check ctr->cnr to avoid array index out of bound1f75f8883bnfc: nci: fix the UAF of rf_conn_info object4f5d1c29cfmm, slub: fix potential memoryleak in kmem_cache_open()a1ec195a19mm, slub: fix mismatch between reconstructed freelist depth and cnt8e25a62e8dpowerpc/idle: Don't corrupt back chain when going idled0148cfaf8KVM: PPC: Book3S HV: Make idle_kvm_start_guest() return 0 if it went to guest80bbb0bc3aKVM: PPC: Book3S HV: Fix stack handling in idle_kvm_start_guest()722e6f6ac8powerpc64/idle: Fix SP offsets when saving GPRsd6f451f1f6audit: fix possible null-pointer dereference in audit_filter_rulesc974f2f92cASoC: DAPM: Fix missing kctl change notifications5307a77b71ALSA: hda/realtek: Add quirk for Clevo PC50HS50fc52e5caALSA: usb-audio: Provide quirk for Sennheiser GSP670 Headset0f218ba4c8vfs: check fd has read access in kernel_read_file_from_fd()f439d2bcb6elfcore: correct reference to CONFIG_UMLd3a8357637ocfs2: mount fails with buffer overflow in strlenb05caf023bocfs2: fix data corruption after conversion from inline formatbce53fbee9ceph: fix handling of "meta" errors151c72bba1can: j1939: j1939_xtp_rx_rts_session_new(): abort TP less than 9 bytes0ddf781882can: j1939: j1939_xtp_rx_dat_one(): cancel session if receive TP.DT with error lengtha0e47d2833can: j1939: j1939_netdev_start(): fix UAF for rx_kref of j1939_priv7e66cfed66can: j1939: j1939_tp_rxtimer(): fix errant alert in j1939_tp_rxtimer1248582e47can: peak_pci: peak_pci_remove(): fix UAFea82c2463ecan: peak_usb: pcan_usb_fd_decode_status(): fix back to ERROR_ACTIVE state notificationc26dcd1cb8can: rcar_can: fix suspend/resume8c5585eae3net: enetc: fix ethtool counter name for PM0_TERRc0b0baade9net: stmmac: Fix E2E delay mechanismc4b64011e4net: hns3: disable sriov before unload hclge layer472acf1582net: hns3: add limit ets dwrr bandwidth cannot be 0b1f9380ee2net: hns3: reset DWRR of unused tc to zero12bdcbc043NIOS2: irqflags: rename a redefined register name599766696fnet: dsa: lantiq_gswip: fix register definitionf49ce82f9blan78xx: select CRC3283094f8c44netfilter: ipvs: make global sysctl readonly in non-init netnsce70ee94ddASoC: wm8960: Fix clock configuration on slave mode0f5b08ca22dma-debug: fix sg checks in debug_dma_map_sg()50aefa9accNFSD: Keep existing listeners on portlist error4a5bf3e729xtensa: xtfpga: Try software restart before simulating CPU reset31137288b9xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OFd946a39badARM: dts: at91: sama5d2_som1_ek: disable ISC node by defaulte7c4819c0btee: optee: Fix missing devices unregister during optee_removeb1e9b4e0f6net: switchdev: do not propagate bridge updates across bridges2d22cd0482parisc: math-emu: Fix fall-through warningsff9005a69eMerge branch 'android11-5.4' into 'android11-5.4-lts'fa6db42758Merge 5.4.155 into android11-5.4-lts4f508aa9ddLinux 5.4.15532d2ce0b94ionic: don't remove netdev->dev_addr when syncing uc listabaf8e8b90r8152: select CRC32 and CRYPTO/CRYPTO_HASH/CRYPTO_SHA256a4f7d2246eqed: Fix missing error code in qed_slowpath_start()62d96bb68bmqprio: Correct stats in mqprio_dump_class_stats().fa272e8353acpi/arm64: fix next_platform_timer() section mismatch error32ac4ed32bdrm/msm/dsi: fix off by one in dsi_bus_clk_enable error handling4620098958drm/msm/dsi: Fix an error code in msm_dsi_modeset_init()f302be08e3drm/msm: Fix null pointer dereference on pointer edp0d5ef1e875drm/panel: olimex-lcd-olinuxino: select CRC329225d57f51platform/mellanox: mlxreg-io: Fix argument base in kstrtou32() callae0993739emlxsw: thermal: Fix out-of-bounds memory accesses97e6dcb416ata: ahci_platform: fix null-ptr-deref in ahci_platform_enable_regulators()b9352ed9b9pata_legacy: fix a couple uninitialized variable bugs2bde4aca56NFC: digital: fix possible memory leak in digital_in_send_sdd_req()7ab488d722NFC: digital: fix possible memory leak in digital_tg_listen_mdaa()69b3a13f0dnfc: fix error handling of nfc_proto_register()2731eaac19ethernet: s2io: fix setting mac address during resume4c2eb80fc9net: encx24j600: check error in devm_regmap_init_encx24j6000904e1be2anet: stmmac: fix get_hw_feature() on old hardware06251ea8d1net/mlx5e: Mutually exclude RX-FCS and RX-port-timestamp19a01522c5net: korina: select CRC3232b57d897enet: arc: select CRC322880dc1302gpio: pca953x: Improve bias settingd887745395sctp: account stream padding length for reconf chunk232c485c6biio: dac: ti-dac5571: fix an error code in probe()69696951deiio: ssp_sensors: fix error code in ssp_print_mcu_debug()10ecff1522iio: ssp_sensors: add more range checking in ssp_parse_dataframe()ac0688bcd1iio: light: opt3001: Fixed timeout error when 0 lux3c00d93297iio: mtk-auxadc: fix case IIO_CHAN_INFO_PROCESSEDcf4b39907aiio: adc128s052: Fix the error handling path of 'adc128_probe()'580c09a9efiio: adc: aspeed: set driver data when adc probe.1904050cacpowerpc/xive: Discard disabled interrupts in get_irqchip_state()5683ed468fx86/Kconfig: Do not enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT automatically0594f1d048nvmem: Fix shift-out-of-bound (UBSAN) with byte size cellsd07571672cEDAC/armada-xp: Fix output of uncorrectable error counterdba8834baevirtio: write back F_VERSION_1 before validate1b39a67856USB: serial: option: add prod. id for Quectel EG9141e178c138USB: serial: option: add Telit LE910Cx composition 0x1204848eac2cb7USB: serial: option: add Quectel EC200S-CN module support958e98ca52USB: serial: qcserial: add EM9191 QDL support733dcc08e9Input: xpad - add support for another USB ID of Nacon GC-1009ab5d539bcusb: musb: dsps: Fix the probe error path278e483dc7efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock()27a847dbc9efi/cper: use stack buffer for error record decoding6e35a5e926cb710: avoid NULL pointer subtractione71ce4a81exhci: Enable trust tx length quirk for Fresco FL11 USB controller01c2dcb67exhci: Fix command ring pointer corruption while aborting a command7ce7d4a46dxhci: guard accesses to ep_state in xhci_endpoint_reset()783579057cmei: me: add Ice Lake-N device id.9264bd22d7x86/resctrl: Free the ctrlval arrays when domain_setup_mon_state() fails10b77e16b3watchdog: orion: use 0 for unset heartbeat9acf1c10f1btrfs: check for error when looking up inode during dir entry replay625565fd80btrfs: deal with errors when adding inode reference during log replay6e2ac49b21btrfs: deal with errors when replaying dir entry during log replay005a07c9acbtrfs: unlock newly allocated extent buffer after errore9f457f056csky: Fixup regs.sr broken in ptracea6f4ea748acsky: don't let sigreturn play with priveleged bits of status register98544ca6cbs390: fix strrchr() implementation5959e22e07nds32/ftrace: Fix Error: invalid operands (*UND* and *UND* sections) for `^'2e41b9c846ALSA: hda/realtek: Fix the mic type detection issue for ASUS G551JW90cf96afa3ALSA: hda/realtek - ALC236 headset MIC recording issue33627fa4dbALSA: hda/realtek: Add quirk for Clevo X170KM-Ge96079ab1cALSA: hda/realtek: Complete partial device name to avoid ambiguitydd3f048315ALSA: seq: Fix a potential UAF by wrong private_free call order825786f723ALSA: usb-audio: Add quirk for VF077043d9332526ovl: simplify file splice615b28244cMerge 5.4.154 into android11-5.4-ltsce061ef43fLinux 5.4.154291a48871esched: Always inline is_percpu_thread()3e105ecc4ascsi: virtio_scsi: Fix spelling mistake "Unsupport" -> "Unsupported"1ff5ee9d39scsi: ses: Fix unsigned comparison with less than zero83d857d6b0drm/amdgpu: fix gart.bo pin_count leak1843ae8c4bnet: sun: SUNVNET_COMMON should depend on INET6d1d7acb10mac80211: check return value of rhashtable_init2aaf3fd5e1net: prevent user from passing illegal stab size1e66a472b5m68k: Handle arrivals of multiple signals correctlybe191c8e68mac80211: Drop frames from invalid MAC address in ad-hoc modefffad5988fnetfilter: nf_nat_masquerade: defer conntrack walk to work queueb3cb063034netfilter: nf_nat_masquerade: make async masq_inet6_event handling generica9d8aa2d3cHID: wacom: Add new Intuos BT (CTL-4100WL/CTL-6100WL) device IDs8c6680025bnetfilter: ip6_tables: zero-initialize fragment offset744b908a7fHID: apple: Fix logical maximum and usage maximum of Magic Keyboard JISb6bccc978eext4: correct the error path of ext4_write_inline_data_end()de4a28b718net: phy: bcm7xxx: Fixed indirect MMD operations57f5a5a9aeUPSTREAM: ovl: simplify file splice65d414cb38Merge branch 'android11-5.4' into 'android11-5.4-lts'ffab1c7d7cMerge 5.4.153 into android11-5.4-lts940a14a7d8Linux 5.4.1536a89b1e0c2x86/Kconfig: Correct reference to MWINCHIP3D5b3b400741x86/hpet: Use another crystalball to evaluate HPET usability367f643191x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI9e2a9da532RISC-V: Include clone3() on rv32a326f9c01cbpf, s390: Fix potential memory leak about jit_data60bacf259ei2c: acpi: fix resource leak in reconfiguration device additionb723b34a98net: prefer socket bound to interface when not in VRF17063cac40i40e: Fix freeing of uninitialized misc IRQ vector0a1fcc981di40e: fix endless loop under rtnld6c0668119gve: fix gve_get_stats()d83787c26drtnetlink: fix if_nlmsg_stats_size() under estimation0311d97753gve: Correct available tx qpl check11cd944bb8drm/nouveau/debugfs: fix file release memory leakcb7e651879video: fbdev: gbefb: Only instantiate device when built for IP3204f981251ebus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893809aa82ac6netlink: annotate data races around nlk->boundfd73c2e64bnet: sfp: Fix typo in state machine debug stringc951c08a59net/sched: sch_taprio: properly cancel timer from taprio_destroy()c2c45102aenet: bridge: use nla_total_size_64bit() in br_get_linkxstats_size()8af0c7d3fbARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequenceebe58e1c1aarm64: dts: ls1028a: add missing CAN nodes1b9f0d242aarm64: dts: freescale: Fix SP805 clock-names27e53e23a3ptp_pch: Load module automatically if ID matchesa7b441a2e2powerpc/fsl/dts: Fix phy-connection-type for fm1mac3c951a3be5enet_sched: fix NULL deref in fifo_set_limit()414bb4ead1phy: mdio: fix memory leakb14f28126cbpf: Fix integer overflow in prealloc_elems_and_freelist()a3d68a4245bpf, arm: Fix register clobbering in div/mod implementatione0c6e864d2xtensa: call irqchip_init only when CONFIG_USE_OF is selectedd10a2a8f88xtensa: use CONFIG_USE_OF instead of CONFIG_OF73711563f5xtensa: move XCHAL_KIO_* definitions to kmem_layout.hc82cffe171arm64: dts: qcom: pm8150: use qcom,pm8998-pon binding14c9c75d48ARM: dts: imx: Fix USB host power regulator polarity on M53Menlo720a4dceeeARM: dts: imx: Add missing pinctrl-names for panel on M53Menlo6b2855ac7esoc: qcom: mdt_loader: Drop PT_LOAD check on hash segment1179cd690aARM: dts: qcom: apq8064: Use 27MHz PXO clock as DSI PLL referencebdc189d6b6soc: qcom: socinfo: Fixed argument passed to platform_set_data()1a0fe45501bpf, mips: Validate conditional branch offsets7ed0402445MIPS: BPF: Restore MIPS32 cBPF JIT4239cd380aARM: dts: qcom: apq8064: use compatible which contains chipid30d68bf74dARM: dts: omap3430-sdp: Fix NAND device node2abb4077faxen/balloon: fix cancelled balloon action42fbcbaa8anfsd4: Handle the NFSv4 READDIR 'dircount' hint being zerof88420197anfsd: fix error handling of register_pernet_subsys() in init_nfsd()fab338f33covl: fix missing negative dentry check in ovl_rename()4920aae61bmmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk47f7bb3dc2xen/privcmd: fix error handling in mmap-resource processing9d93cfdaf8usb: typec: tcpm: handle SRC_STARTUP state if cc changesb53aa224adUSB: cdc-acm: fix break reporting3135935b7fUSB: cdc-acm: fix racy tty buffer accesses7c2392f03fPartially revert "usb: Kconfig: using select for USB_COMMON dependency"cc109ff104ANDROID: Different fix for KABI breakage in 5.4.151 in struct sock17eb597c8bMerge 5.4.152 into android11-5.4-ltsfaaca480fdLinux 5.4.152caff281e20libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.fecbe957efsilence nfscache allocation warnings with kvzalloc5546e3987dperf/x86: Reset destroy callback on event init failure2787cde6cbkvm: x86: Add AMD PMU MSRs to msrs_to_save_all[]ba58770c14KVM: do not shrink halt_poll_ns below grow_startd67e01e5e0tools/vm/page-types: remove dependency on opt_file for idle page tracking65c7e3c973scsi: ses: Retry failed Send/Receive Diagnostic commandse4e756054dselftests:kvm: fix get_warnings_count() ignoring fscanf() return warn1f830ab345selftests: be sure to make khdr before other targets8b9c1c33e5usb: dwc2: check return value after calling platform_get_resource()5d124ee0d2usb: testusb: Fix for showing the connection speed350d048cc5scsi: sd: Free scsi_disk device via put_device()4f194b5769ext2: fix sleeping in atomic bugs on error2d8eb45674sparc64: fix pci_iounmap() when CONFIG_PCI is not set61504f62bbxen-netback: correct success/error reporting for the SKB-with-fraglist case2ecca3b282net: mdio: introduce a shutdown method to mdio device drivers4659036941ANDROID: Fix up KABI breakage in 5.4.151 in struct sock0454b0c925Merge 5.4.151 into android11-5.4-lts31cdcb6d43Linux 5.4.151965147067fHID: usbhid: free raw_report buffers in usbhid_stop6f2f68640bnetfilter: ipset: Fix oversized kvmalloc() callsfe9bb925e7HID: betop: fix slab-out-of-bounds Write in betop_probe24f3d26091crypto: ccp - fix resource leaks in ccp_run_aes_gcm_cmd()62c5cacb09usb: hso: remove the bailout parameterfe57d53dd9usb: hso: fix error handling code of hso_create_net_deviced29c7a1a32hso: fix bailout in error case of probe1f2b324e82libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbinddd336267d8PCI: Fix pci_host_bridge struct device release/free handlinge81f3b7e71net: stmmac: don't attach interface until resume finishesf8ffde0bb9net: udp: annotate data race around udp_sk(sk)->corkflag9dbf7e343bHID: u2fzero: ignore incomplete packets without datad518ea0314ext4: fix potential infinite loop in ext4_dx_readdir()59c19fdcdeext4: fix reserved space counter leakagec4b8db2b47ext4: fix loff_t overflow in ext4_max_bitmap_size()3253c87e1eipack: ipoctal: fix module reference leak9c802a0574ipack: ipoctal: fix missing allocation-failure check3fd682d461ipack: ipoctal: fix tty-registration error handlinge6a71c173eipack: ipoctal: fix tty registration race8657158a3bipack: ipoctal: fix stack information leak91d5de0b71debugfs: debugfs_create_file_size(): use IS_ERR to check for error98574c91e3elf: don't use MAP_FIXED_NOREPLACE for elf interpreter mappings9356e4dcebperf/x86/intel: Update event constraints for ICX0fcfaa8ed9af_unix: fix races in sk_peer_pid and sk_peer_cred accesses694b0cee7fnet: sched: flower: protect fl_walk() with rcu5a31d4e73anet: hns3: do not allow call hns3_nic_net_open repeatedly87de237b0bscsi: csiostor: Add module softdep on cxgb41b6ccfcec6Revert "block, bfq: honor already-setup queue merges"753096c38aselftests, bpf: test_lwt_ip_encap: Really disable rp_filter897d1401d1e100: fix buffer overrun in e100_get_regs93372e02f9e100: fix length calculation in e100_get_regs_lena2624e0934net: ipv4: Fix rtnexthop len when RTA_FLOW is presentc37d3287e7hwmon: (tmp421) fix rounding for negative values8a07d5aba3hwmon: (tmp421) report /PVLD condition as faultec018021cfsctp: break out if skb_header_pointer returns NULL in sctp_rcv_ootb9bee85de2cmac80211-hwsim: fix late beacon hrtimer handling21c3a84493mac80211: mesh: fix potentially unaligned accessab85997465mac80211: limit injected vht mcs/nss in ieee80211_parse_tx_radiotap87e06c4428mac80211: Fix ieee80211_amsdu_aggregate frag_tail buga6c42ae153hwmon: (mlxreg-fan) Return non-zero value when fan current state is enforced from sysfs2c30592255ipvs: check that ip_vs_conn_tab_bits is between 8 and 209a571d83acdrm/amd/display: Pass PCI deviceid into DC3443eb443fx86/kvmclock: Move this_cpu_pvti into kvmclock.h50149e0866mac80211: fix use-after-free in CCMP/GCMP RX956bc3ee31scsi: ufs: Fix illegal offset in UPIU event trace44d3c480e4hwmon: (w83791d) Fix NULL pointer dereference by removing unnecessary structure field200ced5ba7hwmon: (w83792d) Fix NULL pointer dereference by removing unnecessary structure field6cb01fe630hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field504cf969d5fs-verity: fix signed integer overflow with i_size near S64_MAXb2fb6ce06cusb: cdns3: fix race condition before setting doorbelle2370e1935cpufreq: schedutil: Destroy mutex before kobject_put() frees the memory67c98e0231cpufreq: schedutil: Use kobject release() method to free sugov_tunables883f7897a2tty: Fix out-of-bound vmalloc access in imageblitec298edf02Merge 5.4.150 into android11-5.4-lts2abce4ec2aMerge 5.4.149 into android11-5.4-lts5785e5360aRevert "crypto: public_key: fix overflow during implicit conversion"3a7dc5b4cfLinux 5.4.15027f8c4402cqnx4: work around gcc false positive warning bug3a0f951e37xen/balloon: fix balloon kthread freezingf80b679381arm64: dts: marvell: armada-37xx: Extend PCIe MEM space04783de9c0thermal/drivers/int340x: Do not set a wrong tcc offset on resumede1c350680EDAC/synopsys: Fix wrong value type assignment for edac_mode8ede848bc9spi: Fix tegra20 build with CONFIG_PM=nd193f7dbf4net: 6pack: Fix tx timeout and slot timefa56f2c987alpha: Declare virt_to_phys and virt_to_bus parameter as pointer to volatileaf4a142ab7arm64: Mark __stack_chk_guard as __ro_after_initaeb19da46cparisc: Use absolute_pointer() to define PAGE08cd34eb616qnx4: avoid stringop-overread errors1214ace614sparc: avoid stringop-overread errors113a8edfb9net: i825xx: Use absolute_pointer for memcpy from fixed memory location2397ea2db2compiler.h: Introduce absolute_pointer macrod12ddd843fblk-cgroup: fix UAF by grabbing blkcg lock before destroying blkg pd9d77988232sparc32: page align size in arch_dma_allocec49f3f7f6nvme-multipath: fix ANA state updates when a namespace is not present29917bbb07xen/balloon: use a kernel thread instead a workqueue93937596e0bpf: Add oversize check before call kvcalloc()7273cb182fipv6: delay fib6_sernum increase in fib6_add7432ecc55fm68k: Double cast io functions to unsigned long29c70b0d33net: stmmac: allow CSR clock of 300MHz1da750d1e2net: macb: fix use after free on rmmodebb8d26d93blktrace: Fix uaf in blk_trace access after removing by sysfs2b5befcd40md: fix a lock order reversal in md_alloc42d3711c23irqchip/gic-v3-its: Fix potential VPE leak on error71f323f605irqchip/goldfish-pic: Select GENERIC_IRQ_CHIP to fix build1b59625da6scsi: lpfc: Use correct scnprintf() limit30d373dc35scsi: qla2xxx: Restore initiator in dual moded140ccb140cifs: fix a sign extension bug1c1062c5cfthermal/core: Potential buffer overflow in thermal_build_list_of_policies()b869901cabfpga: machxo2-spi: Fix missing error code in machxo2_write_complete()0ebc3e688ffpga: machxo2-spi: Return an error on failure5bcead7cdetty: synclink_gt: rename a conflicting function namec5f27aedf6tty: synclink_gt, drop unneeded forward declarations1deb94d37ascsi: iscsi: Adjust iface sysfs attr detectiond0f4a2eeebnet/mlx4_en: Don't allow aRFS for encapsulated packetsae7b957ef0qed: rdma - don't wait for resources under hw error recovery flow23716d7153gpio: uniphier: Fix void functions to remove return valuef7fb7dbdfbnet/smc: add missing error check in smc_clc_prfx_set()363438ed5dbnxt_en: Fix TX timeout when TX ring size is set to the smallest4c4c305291enetc: Fix illegal access when reading affinity_hintcf9138c966platform/x86/intel: punit_ipc: Drop wrong use of ACPI_PTR()a8e8b14819afs: Fix incorrect triggering of sillyrename on 3rd-party invalidationacce91ba0dnet: hso: fix muxed tty registration494260e20aserial: mvebu-uart: fix driver's tx_empty callback2d7c20db72xhci: Set HCD flag to defer primary roothub registration381c8ce0abbtrfs: prevent __btrfs_dump_space_info() to underflow its free spaced4ec140e71erofs: fix up erofs_lookup tracepoint7751f609eamcb: fix error handling in mcb_alloc_bus()406ff5bf72USB: serial: option: add device id for Foxconn T99W2654b2cf0faffUSB: serial: option: remove duplicate USB device ID59564b0183USB: serial: option: add Telit LN920 compositions5cc674a3f1USB: serial: mos7840: remove duplicated 0xac24 device ID20c9fdde30usb: core: hcd: Add support for deferring roothub registrationa6c7d3c2d1Re-enable UAS for LaCie Rugged USB3-FW with fk quirk4dc56951a8staging: greybus: uart: fix tty use after freeaa2c274c27binder: make sure fd closes complete93fa08e9a3USB: cdc-acm: fix minor-number release0dc1cfa7b9USB: serial: cp210x: add ID for GW Instek GDM-834x Digital Multimeter85d3493085usb-storage: Add quirk for ScanLogic SL11R-IDE older than 2.6cd4e7647695xen/x86: fix PV trap handling on secondary processors8b06b0f17fcifs: fix incorrect check for null pointer in header_assembleb1f6efa27busb: musb: tusb6010: uninitialized data in tusb_fifo_write_unaligned()b8c8060651usb: dwc2: gadget: Fix ISOC transfer complete handling for DDMAff275c870eusb: dwc2: gadget: Fix ISOC flow for BDMA and Slavef013a5001busb: gadget: r8a66597: fix a loop in set_feature()aa40438c71ocfs2: drop acl cache for directories tooe74e2950a0Linux 5.4.1493825263486drm/nouveau/nvkm: Replace -ENOSYS with -ENODEV409cb0b3d4rtc: rx8010: select REGMAP_I2C43832bf763blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()c37a34d797pwm: stm32-lp: Don't modify HW state in .remove() callback8a29e68ea8pwm: rockchip: Don't modify HW state in .remove() callbacked60d2db31pwm: img: Don't modify HW state in .remove() callbackb16f4acf6bnilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group594addd436nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group237ca37ca5nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group288c8b5ba5nilfs2: fix memory leak in nilfs_sysfs_create_##name##_groupdc70f0c8c3nilfs2: fix NULL pointer in nilfs_##name##_attr_release9c3ba40488nilfs2: fix memory leak in nilfs_sysfs_create_device_groupfb4c7d2923btrfs: fix lockdep warning while mounting sprout fs3f2d5c11beceph: lockdep annotations for try_nonblocking_invalidate3bbb11261aceph: request Fw caps before updating the mtime in ceph_write_iter2c89a856fadmaengine: xilinx_dma: Set DMA mask for coherent APIs2f3206199ddmaengine: ioat: depends on !UML644f1e87fedmaengine: sprd: Add missing MODULE_DEVICE_TABLE445a3379f6parisc: Move pci_dev_is_behind_card_dino to where it is used2f7bfc07e3drivers: base: cacheinfo: Get rid of DEFINE_SMP_CALL_CACHE_FUNCTION()a12743d072thermal/core: Fix thermal_cooling_device_register() prototypec7b9a866eeKconfig.debug: drop selecting non-existing HARDLOCKUP_DETECTOR_ARCH3c1d9b650cnet: stmmac: reset Tx desc base address before restarting Tx729f9d5ee3phy: avoid unnecessary link-up delay in polling mode81e6b51709pwm: lpc32xx: Don't modify HW state in .probe() after the PWM chip was registeredb94def8a47profiling: fix shift-out-of-bounds bugs7e98111cb2nilfs2: use refcount_dec_and_lock() to fix potential UAF5607b1bae1prctl: allow to setup brk for et_dyn executablesb40301607c9p/trans_virtio: Remove sysfs file on probe failurec3b45ea0a3thermal/drivers/exynos: Fix an error code in exynos_tmu_probe()e106080303dmaengine: acpi: Avoid comparison GSI with Linux vIRQ93f8a98ad8um: virtio_uml: fix memory leak on init failures4cd05e390astaging: rtl8192u: Fix bitwise vs logical operator in TranslateRxSignalStuff819xUsb()2f4b67bcebsctp: add param size validation for SCTP_PARAM_SET_PRIMARYcbd10b1189sctp: validate chunk size in __rcv_asconf_lookup6a12918e90ARM: 9098/1: ftrace: MODULE_PLT: Fix build problem without DYNAMIC_FTRACE2f7974cd7bARM: 9079/1: ftrace: Add MODULE_PLTS support1b27a03d12ARM: 9078/1: Add warn suppress parameter to arm_gen_branch_link()490be340c8ARM: 9077/1: PLT: Move struct plt_entries definition to header278df06460apparmor: remove duplicate macro list_entry_is_head()f23763ab46ARM: Qualify enabling of swiotlb_init()6bfdc3056cs390/pci_mmio: fully validate the VMA before calling follow_pte()bd292c6873console: consume APC, DM, DCSb0c813fbbfKVM: remember position in kvm->vcpus array5163578e9dPCI/ACPI: Add Ampere Altra SOC MCFG quirkec29e33e5cPCI: aardvark: Fix reporting CRS value3f0e275e43PCI: pci-bridge-emul: Add PCIe Root Capabilities Register296895c4f0PCI: aardvark: Indicate error in 'val' when config read fails2fcb7b7a1dPCI: pci-bridge-emul: Fix big-endian supportc4f92aff87Merge 5.4.148 into android11-5.4-lts07e5f23d3fLinux 5.4.14854ac8339aes390/bpf: Fix 64-bit subtraction of the -0x80000000 constanta5fc48000bs390/bpf: Fix optimizing out zero-extensionsf7f1bac898net: renesas: sh_eth: Fix freeing wrong tx descriptor3d32ce5472ip_gre: validate csum_start only on pullf9b308f730qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom93f54354ccfq_codel: reject silly quantum parametersd448b240b1netfilter: socket: icmp6: fix use-after-scopeb79204169dnet: dsa: b53: Fix calculating number of switch portsd5c0f016aeperf unwind: Do not overwrite FEATURE_CHECK_LDFLAGS-libunwind-{x86,aarch64}114bf5776fARC: export clear_user_page() for modules9b63c27d6bmtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()'14e0fdc43dPCI: Sync __pci_register_driver() stub for CONFIG_PCI=n810f9b6f0aKVM: arm64: Handle PSCI resets before userspace touches vCPU state5f289dcf0bmfd: tqmx86: Clear GPIO IRQ resource when no IRQ is sete1746c27c3PCI: Fix pci_dev_str_match_path() alloc while atomic bugbeaf65f0femfd: axp20x: Update AXP288 volatile ranges4a6c7c818bNTB: perf: Fix an error code in perf_setup_inbuf()5a16141949NTB: Fix an error code in ntb_msit_probe()0980697969ethtool: Fix an error code in cxgb2.cf336aa92b4PCI: ibmphp: Fix double unmap of io_mem0f9550c4f4block, bfq: honor already-setup queue mergesb61a99dda3net: usb: cdc_mbim: avoid altsetting toggling for Telit LN92079b584d859Set fc_nlinfo in nh_create_ipv4, nh_create_ipv6cf4168c4e0PCI: Add ACS quirks for Cavium multi-function devicesb3435cd968tracing/probes: Reject events which have the same name of existing one32280649f0mfd: Don't use irq_create_mapping() to resolve a mappinge904621ae0fuse: fix use after free in fuse_read_interrupt()a1eaaa6b7dPCI: Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms47c4490617mfd: db8500-prcmu: Adjust map to reality88834a6253dt-bindings: mtd: gpmc: Fix the ECC bytes vs. OOB bytes equation8656566821mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()d291cca2c4net: hns3: fix the timing issue of VF clearing interrupt sources65bcb8f73anet: hns3: disable mac in flr processd8fe64c351net: hns3: change affinity_mask to numa node rangedede0381danet: hns3: pad the short tunnel frame before sending to hardware4bf2c9605dKVM: PPC: Book3S HV: Tolerate treclaim. in fake-suspend mode changing registers235f782d5eibmvnic: check failover_pending in login responsed3939844ebdt-bindings: arm: Fix Toradex compatible typoc642afd17aqed: Handle management FW error9ebbb8b964tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()baf4504771net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup498e765b85net/af_unix: fix a data-race in unix_dgram_polle7332a1ac1vhost_net: fix OoB on sendmsg() failure.172749c879events: Reuse value read using READ_ONCE instead of re-reading itcd78d9c996net/mlx5: Fix potential sleeping in atomic context48e79555c2net/mlx5: FWTrace, cancel work on alloc pd error flow4655f8a5afperf machine: Initialize srcline string member in add_location struct6808e70a77tipc: increase timeout in tipc_sk_enqueue()678787dcfer6040: Restore MDIO clock frequency after MAC resetefe35db948net/l2tp: Fix reference count leak in l2tp_udp_recv_core5ab04a4ffedccp: don't duplicate ccid when cloning dccp sock6c4b7a87baptp: dp83640: don't define PAGE0faf9d46542net-caif: avoid user-triggerable WARN_ON(1)79ab38864dtipc: fix an use-after-free issue in tipc_recvmsg08f33350edx86/mm: Fix kern_addr_valid() to cope with existing but not present entriesfde4caf6fes390/sclp: fix Secure-IPL facility detection15b674b1e5drm/etnaviv: add missing MMU context put when reaping MMU mappingb2ec1e6f1ddrm/etnaviv: reference MMU context when setting up hardware state5827dbac41drm/etnaviv: fix MMU context leak on GPU reset5e67b38435drm/etnaviv: exec and MMU state is lost when resetting the GPU7068030d5edrm/etnaviv: keep MMU context across runtime suspend/resumea7970d4f00drm/etnaviv: stop abusing mmu_context as FE running markeree52ccecfedrm/etnaviv: put submit prev MMU context when it existsa9bacefda0drm/etnaviv: return context from etnaviv_iommu_context_getb56b6c51a9drm/amd/amdgpu: Increase HWIP_MAX_INSTANCE to 10c221eb008aPCI: Add AMD GPU multi-function power dependenciesd180a373a0PM: base: power: don't try to use non-existing RTC for storing data484fbe9cc0arm64/sve: Use correct size when reinitialising SVE state2f72542033bnx2x: Fix enabling network interfaces without VFs66c88a4793xen: reset legacy rtc flag for PV domUc7fab1f536btrfs: fix upper limit for max_inline for page size 64Kb9cc70e3dcdrm/panfrost: Clamp lock region to Bifrost minimum9a6c885489drm/panfrost: Use u64 for size in lock_region6c635129bfdrm/panfrost: Simplify lock_region calculation825ba38dfddrm/amdgpu: Fix BUG_ON assertd7a936da63drm/msi/mdp4: populate priv->kms in mdp4_kms_init90358cb02anet: dsa: lantiq_gswip: fix maximum frame lengthc1f12f440clib/test_stackinit: Fix static initializer test3c232895b8platform/chrome: cros_ec_proto: Send command again when timeout occurs0569920e43memcg: enable accounting for pids in nested pid namespacesd0ddb80bbfmm,vmscan: fix divide by zero in get_scan_count22b11dbbf9mm/hugetlb: initialize hugetlb_usage in mm_init1dc6df795cs390/pv: fix the forcing of the swiotlbf3b57cf090cpufreq: powernv: Fix init_chip_info initialization in numa=offb5eb54c4a9scsi: qla2xxx: Sync queue idx with queue_pair_map idxf499a9e9edscsi: qla2xxx: Changes to support kdump kernelcfa4591328scsi: BusLogic: Fix missing pr_cont() usea701ae9a0dovl: fix BUG_ON() in may_delete() when called from ovl_cleanup()1a2f728b03parisc: fix crash with signals and alloca76bebc93e1net: w5100: check return value after calling platform_get_resource()3179dd79dbfix array-index-out-of-bounds in taprio_changeef9a7867b2net: fix NULL pointer reference in cipso_v4_doi_free88a4ed85e8ath9k: fix sleeping in atomic context99b950d55eath9k: fix OOB read ar9300_eeprom_restore_internal5f70ea4a5cparport: remove non-zero check on countc30ea33b03net/mlx5: DR, Enable QP retransmissionc9095f788diwlwifi: mvm: fix access to BSS elementsf950996d64iwlwifi: mvm: avoid static queue number aliasing2db5ae5b28iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed3da13a1e2adrm/amdkfd: Account for SH/SE count when setting up cu masks.2af60889c8ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B98381f840fASoC: rockchip: i2s: Fix regmap_ops hanga1c7bc02e1usbip:vhci_hcd USB port can get stuck in the disabled state4f6095b0c9usbip: give back URBs for unsent unlink requests during cleanup9a4a680529usb: musb: musb_dsps: request_irq() after initializing musbd24381e5a7Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set"aa40cf19bfcifs: fix wrong release in sess_alloc_buffer() failed path39111cbb7bmmc: core: Return correct emmc response in case of ioctl error26f55b60f2selftests/bpf: Enlarge select() timeout for test_maps48f5a5f027mmc: rtsx_pci: Fix long reads when clock is prescaled4e773c5553mmc: sdhci-of-arasan: Check return value of non-void funtionsa73bbfabfeof: Don't allow __of_attached_node_sysfs() without CONFIG_SYSFS2fdf7d38eeASoC: Intel: Skylake: Fix passing loadable flag for modulef6ff4d5609ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER736f60bd48btrfs: tree-log: check btrfs_lookup_data_extent return value53a72858bcm68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch3710cff57ddrm/exynos: Always initialize mapping in exynos_drm_register_dma()727c973ffelockd: lockd server-side shouldn't set fl_opsa18cfd715eusb: chipidea: host: fix port index underflow and UBSAN complains8deedce385gfs2: Don't call dlm after protocol is unmounted50cf8f1b6cstaging: rts5208: Fix get_ms_information() heap buffer size8dfd785ae1rpc: fix gss_svc_init cleanup on failure0bc818e023tcp: enable data-less, empty-cookie SYN with TFO_SERVER_COOKIE_NOT_REQD2918eca497serial: sh-sci: fix break handling for sysrqd02a1c5fd7opp: Don't print an error if required-opps is missingd772d993b0Bluetooth: Fix handling of LE Enhanced Connection Completefb8593e8ednvme-tcp: don't check blk_mq_tag_to_rq when receiving pdu data072660f6c6arm64: dts: ls1046a: fix eeprom entries08825a784earm64: tegra: Fix compatible string for Tegra132 CPUsa6b69a76c3ARM: tegra: tamonten: Fix UART pad settinga66049c5ffmac80211: Fix monitor MTU limit so that A-MSDUs get through1e2842fb7edrm/display: fix possible null-pointer dereference in dcn10_set_clock()cf82fe45begpu: drm: amd: amdgpu: amdgpu_i2c: fix possible uninitialized-variable access in amdgpu_i2c_router_select_ddc_port()bbaa21da55net/mlx5: Fix variable type to match 64bit0d563020b8Bluetooth: avoid circular locks in sco_sock_connect37d7ae2b05Bluetooth: schedule SCO timeouts with delayed_workc408efcb8aselftests/bpf: Fix xdp_tx.c prog section name350e7501eedrm/msm: mdp4: drop vblank get/put from prepare/complete_commite545080477net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe()ed3400f22barm64: dts: qcom: sdm660: use reg value for memory node52f8a30730ARM: dts: imx53-ppd: Fix ACHC entrye15afa6747media: tegra-cec: Handle errors of clk_prepare_enable()53d02b0409media: TDA1997x: fix tda1997x_query_dv_timings() return value71de2779e5media: v4l2-dv-timings.c: fix wrong condition in two for-loopsd785cef384media: imx258: Limit the max analogue gain to 48033bd83fe3fmedia: imx258: Rectify mismatch of VTS value8d179746b3ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output37414bd6ecarm64: tegra: Fix Tegra194 PCIe EP compatible string5a24034ad8bonding: 3ad: fix the concurrency between __bond_release_one() and bond_3ad_state_machine_handler()b6cee35839workqueue: Fix possible memory leaks in wq_numa_init()9b4f0170e0Bluetooth: skip invalid hci_sync_conn_complete_evt7b1718666fata: sata_dwc_460ex: No need to call phy_exit() befre phy_init()76cbc142a5samples: bpf: Fix tracex7 error raised on the missing argument917eb0bbb8staging: ks7010: Fix the initialization of the 'sleep_status' structure44fd61a8bdserial: 8250_pci: make setup_port() parameters explicitly unsigned4beadefea8hvsi: don't panic on tty_register_driver failureaf0bd97b9dxtensa: ISS: don't panic in rs_init5418023f81serial: 8250: Define RX trigger levels for OxSemi 950 devicesb050848bbas390: make PCI mio support a machine flag0dd8da8ad0s390/jump_label: print real address in a case of a jump label bug91b4d44c7cflow_dissector: Fix out-of-bounds warnings8076709052ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs()faf0749c90video: fbdev: riva: Error out if 'pixclock' equals zeroae0d210aa7video: fbdev: kyro: Error out if 'pixclock' equals zero98551f0a7bvideo: fbdev: asiliantfb: Error out if 'pixclock' equals zero9dff06c505bpf/tests: Do not PASS tests without actually testing the result58831317c9bpf/tests: Fix copy-and-paste error in double word testa23430e79edrm/amd/amdgpu: Update debugfs link_settings output link_rate field in hex9baa552b2fdrm/amd/display: Fix timer_per_pixel unit error6c78ee1aectty: serial: jsm: hold port lock when reporting modem line changes7993ee1733staging: board: Fix uninitialized spinlock when attaching genpd995567ded0usb: gadget: composite: Allow bMaxPower=0 if self-powered44bbd4e636USB: EHCI: ehci-mv: improve error handling in mv_ehci_enable()7b96de5c30usb: gadget: u_ether: fix a potential null pointer dereferencee1480bcb40usb: host: fotg210: fix the actual_length of an iso packet33109bdf2cusb: host: fotg210: fix the endpoint's transactional opportunities calculationb190fdb93aigc: Check if num of q_vectors is smaller than max before array accessf4bf2fdfe3drm: avoid blocking in drm_clients_info's rcu sectiona1d12196c3Smack: Fix wrong semantics in smk_access_entry()c454b1a215netlink: Deal with ESRCH error in nlmsg_notify()5adbbb27bbvideo: fbdev: kyro: fix a DoS bug by restricting user input4ee6cc0f52ARM: dts: qcom: apq8064: correct clock namesb9707a9504iavf: fix locking of critical sections35429d3aa3iavf: do not override the adapter state in the watchdog taskab03f15c1diio: dac: ad5624r: Fix incorrect handling of an optional regulator.0de0c16739tipc: keep the skb in rcv queue until the whole data is readfe14f10c07PCI: Use pci_update_current_state() in pci_enable_device_flags()7d35690974crypto: mxs-dcp - Use sg_mapping_iter to copy data80bec14b4emedia: dib8000: rewrite the init prbs logic4cab14bcffASoC: atmel: ATMEL drivers don't need HAS_DMA4a7c6e9159drm/amdgpu: Fix amdgpu_ras_eeprom_init()d766826eeeuserfaultfd: prevent concurrent API initialization7bf2913a5bkbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y0ac2ecb915MIPS: Malta: fix alignment of the devicetree bufferdebdff9600f2fs: fix to unmap pages from userspace process in punch_hole()1c28c23dc8f2fs: fix unexpected ENOENT comes from f2fs_map_blocks()1ca5b00782f2fs: fix to account missing .skipped_gc_rwsemec5cab3798KVM: PPC: Fix clearing never mapped TCEs in realmodee46ce5a8abclk: at91: clk-generated: Limit the requested rate to our range557f6445e3clk: at91: clk-generated: pass the id of changeable parent at registrationd93a37889eclk: at91: sam9x60: Don't use audio PLL57188e2cacfscache: Fix cookie key hashinge2e3758a2cplatform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_callba5d4dc003KVM: PPC: Book3S HV Nested: Reflect guest PMU in-use to L0 when guest SPRs are livea02309beb2HID: i2c-hid: Fix Elan touchpad regressionf934961bf4scsi: target: avoid per-loop XCOPY buffer allocations389946024fpowerpc/config: Renable MTD_PHYSMAP_OFdb16408d52scsi: qedf: Fix error codes in qedf_alloc_global_queues()5e56c8d843scsi: qedi: Fix error codes in qedi_alloc_global_queues()a90ef02f01scsi: smartpqi: Fix an error code in pqi_get_raid_map()3365d41c04pinctrl: single: Fix error return code in pcs_parse_bits_in_pinctrl_entry()ef476b8d5ascsi: fdomain: Fix error return code in fdomain_probe()9ee7b45eddSUNRPC: Fix potential memory corruptionbe09cbd6a3dma-debug: fix debugfs initialization order9315497b17openrisc: don't printk() unconditionallyf56ee9af23f2fs: reduce the scope of setting fsck tag when de->name_len is zero2a2afb6d26f2fs: show f2fs instance in printk_ratelimited25ed049891RDMA/efa: Remove double QP type assignmentb8bb4b2839powerpc/stacktrace: Include linux/delay.h02889ac588vfio: Use config not menuconfig for VFIO_NOIOMMUb900cc4816pinctrl: samsung: Fix pinctrl bank pin counte69c283621docs: Fix infiniband uverbs minor numberfb42b9801eRDMA/iwcm: Release resources if iw_cm module initialization fails7930b1f98dIB/hfi1: Adjust pkey entry in index 02b1addd585scsi: bsg: Remove support for SCSI_IOCTL_SEND_COMMANDa02982545ef2fs: quota: fix potential deadlockbd74d6de0bHID: input: do not report stylus battery state as "full"0656eb5e7ePCI: aardvark: Fix masking and unmasking legacy INTx interrupts2b58db229ePCI: aardvark: Increase polling delay to 1.5s while waiting for PIO response0f39f8429cPCI: aardvark: Fix checking for PIO statusd810fa6f5fPCI: xilinx-nwl: Enable the clock through CCFd43ad02ad3PCI: Return ~0 data on pciconfig_read() CAP_SYS_ADMIN failure3aa6d023c6PCI: Restrict ASMedia ASM1062 SATA Max Payload Size Supported4d2bc69df9PCI/portdrv: Enable Bandwidth Notification only if port supports it0445da50b7ARM: 9105/1: atags_to_fdt: don't warn about stack size8ec08f1431libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs7cfbf391e8dmaengine: imx-sdma: remove duplicated sdma_load_context788122c99dRevert "dmaengine: imx-sdma: refine to load context only once"86e1abcd14media: rc-loopback: return number of emitters rather than error9d91046f6bmedia: uvc: don't do DMA on stack1ccb1fa41fVMCI: fix NULL pointer dereference when unmapping queue pair80d1675903dm crypt: Avoid percpu_counter spinlock contention in crypt_page_alloc()a6d4ac3f86power: supply: max17042: handle fails of reading status register668370dd4cblock: bfq: fix bfq_set_next_ioprio_data()cfdd25cd42crypto: public_key: fix overflow during implicit conversion3411b481edarm64: head: avoid over-mapping in map_memory991b64b89bsoc: aspeed: p2a-ctrl: Fix boundary check for mmap2712f29c44soc: aspeed: lpc-ctrl: Fix boundary check for mmap24c245de17soc: qcom: aoss: Fix the out of bound usage of cooling_devs603dbb1fa2pinctrl: ingenic: Fix incorrect pull up/down infoeda59ca42fpinctrl: stmfx: Fix hazardous u8[] to unsigned long castd4acec5e94tools/thermal/tmon: Add cross compiling support8a964aa6ed9p/xen: Fix end of loop tests for list_for_each_entry7d81fcc203include/linux/list.h: add a macro to test if entry is pointing to the head4bc0d1b535xen: fix setting of max_pfn in shared_info27f3b7f5c6powerpc/perf/hv-gpci: Fix counter value parsing7e9e6d0e07PCI/MSI: Skip masking MSI-X on Xen PV2edc06fa38blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN8da22cc41ablk-zoned: allow zone management send operations without CAP_SYS_ADMINcd7b39e7c4btrfs: reset replace target device to allocation state on close8554095328btrfs: wake up async_delalloc_pages waiters after submitd609c63a71rtc: tps65910: Correct driver module alias4076dc42c4Merge branch 'android11-5.4' into 'android11-5.4-lts' Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Idd628e993b6566952e119bfe31f4c8fe87d818a8
This commit is contained in:
Greg Kroah-Hartman
@@ -3002,10 +3002,10 @@
|
||||
65 = /dev/infiniband/issm1 Second InfiniBand IsSM device
|
||||
...
|
||||
127 = /dev/infiniband/issm63 63rd InfiniBand IsSM device
|
||||
128 = /dev/infiniband/uverbs0 First InfiniBand verbs device
|
||||
129 = /dev/infiniband/uverbs1 Second InfiniBand verbs device
|
||||
192 = /dev/infiniband/uverbs0 First InfiniBand verbs device
|
||||
193 = /dev/infiniband/uverbs1 Second InfiniBand verbs device
|
||||
...
|
||||
159 = /dev/infiniband/uverbs31 31st InfiniBand verbs device
|
||||
223 = /dev/infiniband/uverbs31 31st InfiniBand verbs device
|
||||
|
||||
232 char Biometric Devices
|
||||
0 = /dev/biometric/sensor0/fingerprint first fingerprint sensor on first device
|
||||
|
||||
@@ -5486,6 +5486,13 @@
|
||||
as generic guest with no PV drivers. Currently support
|
||||
XEN HVM, KVM, HYPER_V and VMWARE guest.
|
||||
|
||||
xen.balloon_boot_timeout= [XEN]
|
||||
The time (in seconds) to wait before giving up to boot
|
||||
in case initial ballooning fails to free enough memory.
|
||||
Applies only when running as HVM or PVH guest and
|
||||
started with less memory configured than allowed at
|
||||
max. Default is 180.
|
||||
|
||||
xen.event_eoi_delay= [XEN]
|
||||
How long to delay EOI handling in case of event
|
||||
storms (jiffies). Default is 10.
|
||||
|
||||
@@ -49,7 +49,7 @@ properties:
|
||||
- const: toradex,apalis_t30
|
||||
- const: nvidia,tegra30
|
||||
- items:
|
||||
- const: toradex,apalis_t30-eval-v1.1
|
||||
- const: toradex,apalis_t30-v1.1-eval
|
||||
- const: toradex,apalis_t30-eval
|
||||
- const: toradex,apalis_t30-v1.1
|
||||
- const: toradex,apalis_t30
|
||||
|
||||
@@ -122,7 +122,7 @@ on various other factors also like;
|
||||
so the device should have enough free bytes available its OOB/Spare
|
||||
area to accommodate ECC for entire page. In general following expression
|
||||
helps in determining if given device can accommodate ECC syndrome:
|
||||
"2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE"
|
||||
"2 + (PAGESIZE / 512) * ECC_BYTES" <= OOBSIZE"
|
||||
where
|
||||
OOBSIZE number of bytes in OOB/spare area
|
||||
PAGESIZE number of bytes in main-area of device page
|
||||
|
||||
@@ -13,6 +13,14 @@ common regulator binding documented in:
|
||||
|
||||
|
||||
Required properties of the main device node (the parent!):
|
||||
- s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used
|
||||
for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines.
|
||||
|
||||
[1] If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
|
||||
property is specified, then all the eight voltage values for the
|
||||
's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified.
|
||||
|
||||
Optional properties of the main device node (the parent!):
|
||||
- s5m8767,pmic-buck2-dvs-voltage: A set of 8 voltage values in micro-volt (uV)
|
||||
units for buck2 when changing voltage using gpio dvs. Refer to [1] below
|
||||
for additional information.
|
||||
@@ -25,26 +33,13 @@ Required properties of the main device node (the parent!):
|
||||
units for buck4 when changing voltage using gpio dvs. Refer to [1] below
|
||||
for additional information.
|
||||
|
||||
- s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used
|
||||
for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines.
|
||||
|
||||
[1] If none of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
|
||||
property is specified, the 's5m8767,pmic-buck[2/3/4]-dvs-voltage'
|
||||
property should specify atleast one voltage level (which would be a
|
||||
safe operating voltage).
|
||||
|
||||
If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
|
||||
property is specified, then all the eight voltage values for the
|
||||
's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified.
|
||||
|
||||
Optional properties of the main device node (the parent!):
|
||||
- s5m8767,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs.
|
||||
- s5m8767,pmic-buck3-uses-gpio-dvs: 'buck3' can be controlled by gpio dvs.
|
||||
- s5m8767,pmic-buck4-uses-gpio-dvs: 'buck4' can be controlled by gpio dvs.
|
||||
|
||||
Additional properties required if either of the optional properties are used:
|
||||
|
||||
- s5m8767,pmic-buck234-default-dvs-idx: Default voltage setting selected from
|
||||
- s5m8767,pmic-buck-default-dvs-idx: Default voltage setting selected from
|
||||
the possible 8 options selectable by the dvs gpios. The value of this
|
||||
property should be between 0 and 7. If not specified or if out of range, the
|
||||
default value of this property is set to 0.
|
||||
|
||||
2
Makefile
2
Makefile
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
SUBLEVEL = 147
|
||||
SUBLEVEL = 161
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ extern inline void set_hae(unsigned long new_hae)
|
||||
* Change virtual addresses to physical addresses and vv.
|
||||
*/
|
||||
#ifdef USE_48_BIT_KSEG
|
||||
static inline unsigned long virt_to_phys(void *address)
|
||||
static inline unsigned long virt_to_phys(volatile void *address)
|
||||
{
|
||||
return (unsigned long)address - IDENT_ADDR;
|
||||
}
|
||||
@@ -71,7 +71,7 @@ static inline void * phys_to_virt(unsigned long address)
|
||||
return (void *) (address + IDENT_ADDR);
|
||||
}
|
||||
#else
|
||||
static inline unsigned long virt_to_phys(void *address)
|
||||
static inline unsigned long virt_to_phys(volatile void *address)
|
||||
{
|
||||
unsigned long phys = (unsigned long)address;
|
||||
|
||||
@@ -107,7 +107,7 @@ static inline void * phys_to_virt(unsigned long address)
|
||||
extern unsigned long __direct_map_base;
|
||||
extern unsigned long __direct_map_size;
|
||||
|
||||
static inline unsigned long __deprecated virt_to_bus(void *address)
|
||||
static inline unsigned long __deprecated virt_to_bus(volatile void *address)
|
||||
{
|
||||
unsigned long phys = virt_to_phys(address);
|
||||
unsigned long bus = phys + __direct_map_base;
|
||||
|
||||
@@ -1123,7 +1123,7 @@ void clear_user_page(void *to, unsigned long u_vaddr, struct page *page)
|
||||
clear_page(to);
|
||||
clear_bit(PG_dc_clean, &page->flags);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(clear_user_page);
|
||||
|
||||
/**********************************************************************
|
||||
* Explicit Cache flush request from user space via syscall
|
||||
|
||||
@@ -85,6 +85,7 @@ config ARM
|
||||
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
|
||||
select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
|
||||
select HAVE_FUNCTION_TRACER if !XIP_KERNEL && (CC_IS_GCC || CLANG_VERSION >= 100000)
|
||||
select HAVE_FUTEX_CMPXCHG if FUTEX
|
||||
select HAVE_GCC_PLUGINS
|
||||
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
|
||||
select HAVE_IDE if PCI || ISA || PCMCIA
|
||||
|
||||
@@ -66,15 +66,15 @@ KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra)
|
||||
# Note that GCC does not numerically define an architecture version
|
||||
# macro, but instead defines a whole series of macros which makes
|
||||
# testing for a specific architecture or later rather impossible.
|
||||
arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m
|
||||
arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
|
||||
arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
|
||||
arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m
|
||||
arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a
|
||||
arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 -march=armv6
|
||||
# Only override the compiler option if ARMv6. The ARMv6K extensions are
|
||||
# always available in ARMv7
|
||||
ifeq ($(CONFIG_CPU_32v6),y)
|
||||
arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)
|
||||
arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 -march=armv6k
|
||||
endif
|
||||
arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)
|
||||
arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 -march=armv5te
|
||||
arch-$(CONFIG_CPU_32v4T) =-D__LINUX_ARM_ARCH__=4 -march=armv4t
|
||||
arch-$(CONFIG_CPU_32v4) =-D__LINUX_ARM_ARCH__=4 -march=armv4
|
||||
arch-$(CONFIG_CPU_32v3) =-D__LINUX_ARM_ARCH__=3 -march=armv3m
|
||||
@@ -88,7 +88,7 @@ tune-$(CONFIG_CPU_ARM720T) =-mtune=arm7tdmi
|
||||
tune-$(CONFIG_CPU_ARM740T) =-mtune=arm7tdmi
|
||||
tune-$(CONFIG_CPU_ARM9TDMI) =-mtune=arm9tdmi
|
||||
tune-$(CONFIG_CPU_ARM940T) =-mtune=arm9tdmi
|
||||
tune-$(CONFIG_CPU_ARM946E) =$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
|
||||
tune-$(CONFIG_CPU_ARM946E) =-mtune=arm9e
|
||||
tune-$(CONFIG_CPU_ARM920T) =-mtune=arm9tdmi
|
||||
tune-$(CONFIG_CPU_ARM922T) =-mtune=arm9tdmi
|
||||
tune-$(CONFIG_CPU_ARM925T) =-mtune=arm9tdmi
|
||||
@@ -96,11 +96,11 @@ tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9tdmi
|
||||
tune-$(CONFIG_CPU_FA526) =-mtune=arm9tdmi
|
||||
tune-$(CONFIG_CPU_SA110) =-mtune=strongarm110
|
||||
tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100
|
||||
tune-$(CONFIG_CPU_XSCALE) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
|
||||
tune-$(CONFIG_CPU_XSC3) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
|
||||
tune-$(CONFIG_CPU_FEROCEON) =$(call cc-option,-mtune=marvell-f,-mtune=xscale)
|
||||
tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
|
||||
tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
|
||||
tune-$(CONFIG_CPU_XSCALE) =-mtune=xscale
|
||||
tune-$(CONFIG_CPU_XSC3) =-mtune=xscale
|
||||
tune-$(CONFIG_CPU_FEROCEON) =-mtune=xscale
|
||||
tune-$(CONFIG_CPU_V6) =-mtune=arm1136j-s
|
||||
tune-$(CONFIG_CPU_V6K) =-mtune=arm1136j-s
|
||||
|
||||
# Evaluate tune cc-option calls now
|
||||
tune-y := $(tune-y)
|
||||
|
||||
@@ -90,6 +90,8 @@ $(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \
|
||||
$(addprefix $(obj)/,$(libfdt_hdrs))
|
||||
|
||||
ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)
|
||||
CFLAGS_REMOVE_atags_to_fdt.o += -Wframe-larger-than=${CONFIG_FRAME_WARN}
|
||||
CFLAGS_atags_to_fdt.o += -Wframe-larger-than=1280
|
||||
OBJS += $(libfdt_objs) atags_to_fdt.o
|
||||
endif
|
||||
|
||||
|
||||
@@ -47,7 +47,10 @@ extern char * strchrnul(const char *, int);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_KERNEL_XZ
|
||||
/* Prevent KASAN override of string helpers in decompressor */
|
||||
#undef memmove
|
||||
#define memmove memmove
|
||||
#undef memcpy
|
||||
#define memcpy memcpy
|
||||
#include "../../../../lib/decompress_unxz.c"
|
||||
#endif
|
||||
|
||||
@@ -69,7 +69,6 @@
|
||||
isc: isc@f0008000 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
qspi1: spi@f0024000 {
|
||||
|
||||
@@ -262,7 +262,7 @@
|
||||
&macb1 {
|
||||
status = "okay";
|
||||
|
||||
phy-mode = "rgmii";
|
||||
phy-mode = "rmii";
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
panel {
|
||||
compatible = "edt,etm0700g0dh6";
|
||||
pinctrl-0 = <&pinctrl_display_gpio>;
|
||||
pinctrl-names = "default";
|
||||
enable-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
|
||||
|
||||
port {
|
||||
@@ -76,8 +77,7 @@
|
||||
regulator-name = "vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
|
||||
enable-active-high;
|
||||
gpio = <&gpio1 2 0>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -70,6 +70,12 @@
|
||||
clock-frequency = <11289600>;
|
||||
};
|
||||
|
||||
achc_24M: achc-clock {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <24000000>;
|
||||
};
|
||||
|
||||
sgtlsound: sound {
|
||||
compatible = "fsl,imx53-cpuvo-sgtl5000",
|
||||
"fsl,imx-audio-sgtl5000";
|
||||
@@ -287,16 +293,13 @@
|
||||
&gpio4 12 GPIO_ACTIVE_LOW>;
|
||||
status = "okay";
|
||||
|
||||
spidev0: spi@0 {
|
||||
compatible = "ge,achc";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <1000000>;
|
||||
};
|
||||
|
||||
spidev1: spi@1 {
|
||||
compatible = "ge,achc";
|
||||
reg = <1>;
|
||||
spi-max-frequency = <1000000>;
|
||||
spidev0: spi@1 {
|
||||
compatible = "ge,achc", "nxp,kinetis-k20";
|
||||
reg = <1>, <0>;
|
||||
vdd-supply = <®_3v3>;
|
||||
vdda-supply = <®_3v3>;
|
||||
clocks = <&achc_24M>;
|
||||
reset-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
gpioxra0: gpio@2 {
|
||||
|
||||
@@ -515,7 +515,7 @@
|
||||
compatible = "bosch,bma180";
|
||||
reg = <0x41>;
|
||||
pinctrl-names = "default";
|
||||
pintcrl-0 = <&bma180_pins>;
|
||||
pinctrl-0 = <&bma180_pins>;
|
||||
interrupt-parent = <&gpio4>;
|
||||
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
|
||||
};
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
|
||||
nand@1,0 {
|
||||
compatible = "ti,omap2-nand";
|
||||
reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
|
||||
reg = <1 0 4>; /* CS1, offset 0, IO size 4 */
|
||||
interrupt-parent = <&gpmc>;
|
||||
interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
|
||||
<1 IRQ_TYPE_NONE>; /* termcount */
|
||||
|
||||
@@ -198,7 +198,7 @@
|
||||
clock-frequency = <19200000>;
|
||||
};
|
||||
|
||||
pxo_board {
|
||||
pxo_board: pxo_board {
|
||||
compatible = "fixed-clock";
|
||||
#clock-cells = <0>;
|
||||
clock-frequency = <27000000>;
|
||||
@@ -1147,7 +1147,7 @@
|
||||
};
|
||||
|
||||
gpu: adreno-3xx@4300000 {
|
||||
compatible = "qcom,adreno-3xx";
|
||||
compatible = "qcom,adreno-320.2", "qcom,adreno";
|
||||
reg = <0x04300000 0x20000>;
|
||||
reg-names = "kgsl_3d0_reg_memory";
|
||||
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
|
||||
@@ -1162,7 +1162,6 @@
|
||||
<&mmcc GFX3D_AHB_CLK>,
|
||||
<&mmcc GFX3D_AXI_CLK>,
|
||||
<&mmcc MMSS_IMEM_AHB_CLK>;
|
||||
qcom,chipid = <0x03020002>;
|
||||
|
||||
iommus = <&gfx3d 0
|
||||
&gfx3d 1
|
||||
@@ -1261,9 +1260,9 @@
|
||||
<&mmcc DSI1_BYTE_CLK>,
|
||||
<&mmcc DSI_PIXEL_CLK>,
|
||||
<&mmcc DSI1_ESC_CLK>;
|
||||
clock-names = "iface_clk", "bus_clk", "core_mmss_clk",
|
||||
"src_clk", "byte_clk", "pixel_clk",
|
||||
"core_clk";
|
||||
clock-names = "iface", "bus", "core_mmss",
|
||||
"src", "byte", "pixel",
|
||||
"core";
|
||||
|
||||
assigned-clocks = <&mmcc DSI1_BYTE_SRC>,
|
||||
<&mmcc DSI1_ESC_SRC>,
|
||||
@@ -1305,7 +1304,7 @@
|
||||
reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator";
|
||||
clock-names = "iface_clk", "ref";
|
||||
clocks = <&mmcc DSI_M_AHB_CLK>,
|
||||
<&cxo_board>;
|
||||
<&pxo_board>;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -1213,8 +1213,8 @@
|
||||
#phy-cells = <0>;
|
||||
qcom,dsi-phy-index = <0>;
|
||||
|
||||
clocks = <&mmcc MDSS_AHB_CLK>;
|
||||
clock-names = "iface";
|
||||
clocks = <&mmcc MDSS_AHB_CLK>, <&xo_board>;
|
||||
clock-names = "iface", "ref";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
};
|
||||
|
||||
gmac: eth@e0800000 {
|
||||
compatible = "st,spear600-gmac";
|
||||
compatible = "snps,dwmac-3.40a";
|
||||
reg = <0xe0800000 0x8000>;
|
||||
interrupts = <23 22>;
|
||||
interrupt-names = "macirq", "eth_wake_irq";
|
||||
|
||||
@@ -773,7 +773,7 @@
|
||||
#sound-dai-cells = <0>;
|
||||
|
||||
compatible = "st,stm32-sai-sub-a";
|
||||
reg = <0x4 0x1c>;
|
||||
reg = <0x4 0x20>;
|
||||
clocks = <&rcc SAI1_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 87 0x400 0x01>;
|
||||
@@ -783,7 +783,7 @@
|
||||
sai1b: audio-controller@4400a024 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "st,stm32-sai-sub-b";
|
||||
reg = <0x24 0x1c>;
|
||||
reg = <0x24 0x20>;
|
||||
clocks = <&rcc SAI1_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 88 0x400 0x01>;
|
||||
@@ -804,7 +804,7 @@
|
||||
sai2a: audio-controller@4400b004 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "st,stm32-sai-sub-a";
|
||||
reg = <0x4 0x1c>;
|
||||
reg = <0x4 0x20>;
|
||||
clocks = <&rcc SAI2_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 89 0x400 0x01>;
|
||||
@@ -814,7 +814,7 @@
|
||||
sai2b: audio-controller@4400b024 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "st,stm32-sai-sub-b";
|
||||
reg = <0x24 0x1c>;
|
||||
reg = <0x24 0x20>;
|
||||
clocks = <&rcc SAI2_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 90 0x400 0x01>;
|
||||
@@ -835,7 +835,7 @@
|
||||
sai3a: audio-controller@4400c004 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "st,stm32-sai-sub-a";
|
||||
reg = <0x04 0x1c>;
|
||||
reg = <0x04 0x20>;
|
||||
clocks = <&rcc SAI3_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 113 0x400 0x01>;
|
||||
@@ -845,7 +845,7 @@
|
||||
sai3b: audio-controller@4400c024 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "st,stm32-sai-sub-b";
|
||||
reg = <0x24 0x1c>;
|
||||
reg = <0x24 0x20>;
|
||||
clocks = <&rcc SAI3_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 114 0x400 0x01>;
|
||||
@@ -1191,7 +1191,7 @@
|
||||
sai4a: audio-controller@50027004 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "st,stm32-sai-sub-a";
|
||||
reg = <0x04 0x1c>;
|
||||
reg = <0x04 0x20>;
|
||||
clocks = <&rcc SAI4_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 99 0x400 0x01>;
|
||||
@@ -1201,7 +1201,7 @@
|
||||
sai4b: audio-controller@50027024 {
|
||||
#sound-dai-cells = <0>;
|
||||
compatible = "st,stm32-sai-sub-b";
|
||||
reg = <0x24 0x1c>;
|
||||
reg = <0x24 0x20>;
|
||||
clocks = <&rcc SAI4_K>;
|
||||
clock-names = "sai_ck";
|
||||
dmas = <&dmamux1 100 0x400 0x01>;
|
||||
|
||||
@@ -112,7 +112,7 @@
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&gmac_rgmii_pins>;
|
||||
phy-handle = <&phy1>;
|
||||
phy-mode = "rgmii";
|
||||
phy-mode = "rgmii-id";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@@ -185,8 +185,9 @@
|
||||
nvidia,pins = "ata", "atb", "atc", "atd", "ate",
|
||||
"cdev1", "cdev2", "dap1", "dtb", "gma",
|
||||
"gmb", "gmc", "gmd", "gme", "gpu7",
|
||||
"gpv", "i2cp", "pta", "rm", "slxa",
|
||||
"slxk", "spia", "spib", "uac";
|
||||
"gpv", "i2cp", "irrx", "irtx", "pta",
|
||||
"rm", "slxa", "slxk", "spia", "spib",
|
||||
"uac";
|
||||
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
|
||||
nvidia,tristate = <TEGRA_PIN_DISABLE>;
|
||||
};
|
||||
@@ -211,7 +212,7 @@
|
||||
conf_ddc {
|
||||
nvidia,pins = "ddc", "dta", "dtd", "kbca",
|
||||
"kbcb", "kbcc", "kbcd", "kbce", "kbcf",
|
||||
"sdc";
|
||||
"sdc", "uad", "uca";
|
||||
nvidia,pull = <TEGRA_PIN_PULL_UP>;
|
||||
nvidia,tristate = <TEGRA_PIN_DISABLE>;
|
||||
};
|
||||
@@ -221,10 +222,9 @@
|
||||
"lvp0", "owc", "sdb";
|
||||
nvidia,tristate = <TEGRA_PIN_ENABLE>;
|
||||
};
|
||||
conf_irrx {
|
||||
nvidia,pins = "irrx", "irtx", "sdd", "spic",
|
||||
"spie", "spih", "uaa", "uab", "uad",
|
||||
"uca", "ucb";
|
||||
conf_sdd {
|
||||
nvidia,pins = "sdd", "spic", "spie", "spih",
|
||||
"uaa", "uab", "ucb";
|
||||
nvidia,pull = <TEGRA_PIN_PULL_UP>;
|
||||
nvidia,tristate = <TEGRA_PIN_ENABLE>;
|
||||
};
|
||||
|
||||
@@ -16,6 +16,9 @@ extern void __gnu_mcount_nc(void);
|
||||
|
||||
#ifdef CONFIG_DYNAMIC_FTRACE
|
||||
struct dyn_arch_ftrace {
|
||||
#ifdef CONFIG_ARM_MODULE_PLTS
|
||||
struct module *mod;
|
||||
#endif
|
||||
};
|
||||
|
||||
static inline unsigned long ftrace_call_adjust(unsigned long addr)
|
||||
|
||||
@@ -13,18 +13,18 @@ arm_gen_nop(void)
|
||||
}
|
||||
|
||||
unsigned long
|
||||
__arm_gen_branch(unsigned long pc, unsigned long addr, bool link);
|
||||
__arm_gen_branch(unsigned long pc, unsigned long addr, bool link, bool warn);
|
||||
|
||||
static inline unsigned long
|
||||
arm_gen_branch(unsigned long pc, unsigned long addr)
|
||||
{
|
||||
return __arm_gen_branch(pc, addr, false);
|
||||
return __arm_gen_branch(pc, addr, false, true);
|
||||
}
|
||||
|
||||
static inline unsigned long
|
||||
arm_gen_branch_link(unsigned long pc, unsigned long addr)
|
||||
arm_gen_branch_link(unsigned long pc, unsigned long addr, bool warn)
|
||||
{
|
||||
return __arm_gen_branch(pc, addr, true);
|
||||
return __arm_gen_branch(pc, addr, true, warn);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -19,8 +19,18 @@ enum {
|
||||
};
|
||||
#endif
|
||||
|
||||
#define PLT_ENT_STRIDE L1_CACHE_BYTES
|
||||
#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32))
|
||||
#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT)
|
||||
|
||||
struct plt_entries {
|
||||
u32 ldr[PLT_ENT_COUNT];
|
||||
u32 lit[PLT_ENT_COUNT];
|
||||
};
|
||||
|
||||
struct mod_plt_sec {
|
||||
struct elf32_shdr *plt;
|
||||
struct plt_entries *plt_ent;
|
||||
int plt_count;
|
||||
};
|
||||
|
||||
|
||||
@@ -71,9 +71,10 @@ int ftrace_arch_code_modify_post_process(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr)
|
||||
static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr,
|
||||
bool warn)
|
||||
{
|
||||
return arm_gen_branch_link(pc, addr);
|
||||
return arm_gen_branch_link(pc, addr, warn);
|
||||
}
|
||||
|
||||
static int ftrace_modify_code(unsigned long pc, unsigned long old,
|
||||
@@ -112,14 +113,14 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
|
||||
int ret;
|
||||
|
||||
pc = (unsigned long)&ftrace_call;
|
||||
new = ftrace_call_replace(pc, (unsigned long)func);
|
||||
new = ftrace_call_replace(pc, (unsigned long)func, true);
|
||||
|
||||
ret = ftrace_modify_code(pc, 0, new, false);
|
||||
|
||||
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
|
||||
if (!ret) {
|
||||
pc = (unsigned long)&ftrace_regs_call;
|
||||
new = ftrace_call_replace(pc, (unsigned long)func);
|
||||
new = ftrace_call_replace(pc, (unsigned long)func, true);
|
||||
|
||||
ret = ftrace_modify_code(pc, 0, new, false);
|
||||
}
|
||||
@@ -132,10 +133,22 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
|
||||
{
|
||||
unsigned long new, old;
|
||||
unsigned long ip = rec->ip;
|
||||
unsigned long aaddr = adjust_address(rec, addr);
|
||||
struct module *mod = NULL;
|
||||
|
||||
#ifdef CONFIG_ARM_MODULE_PLTS
|
||||
mod = rec->arch.mod;
|
||||
#endif
|
||||
|
||||
old = ftrace_nop_replace(rec);
|
||||
|
||||
new = ftrace_call_replace(ip, adjust_address(rec, addr));
|
||||
new = ftrace_call_replace(ip, aaddr, !mod);
|
||||
#ifdef CONFIG_ARM_MODULE_PLTS
|
||||
if (!new && mod) {
|
||||
aaddr = get_module_plt(mod, ip, aaddr);
|
||||
new = ftrace_call_replace(ip, aaddr, true);
|
||||
}
|
||||
#endif
|
||||
|
||||
return ftrace_modify_code(rec->ip, old, new, true);
|
||||
}
|
||||
@@ -148,9 +161,9 @@ int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
|
||||
unsigned long new, old;
|
||||
unsigned long ip = rec->ip;
|
||||
|
||||
old = ftrace_call_replace(ip, adjust_address(rec, old_addr));
|
||||
old = ftrace_call_replace(ip, adjust_address(rec, old_addr), true);
|
||||
|
||||
new = ftrace_call_replace(ip, adjust_address(rec, addr));
|
||||
new = ftrace_call_replace(ip, adjust_address(rec, addr), true);
|
||||
|
||||
return ftrace_modify_code(rec->ip, old, new, true);
|
||||
}
|
||||
@@ -160,12 +173,29 @@ int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
|
||||
int ftrace_make_nop(struct module *mod,
|
||||
struct dyn_ftrace *rec, unsigned long addr)
|
||||
{
|
||||
unsigned long aaddr = adjust_address(rec, addr);
|
||||
unsigned long ip = rec->ip;
|
||||
unsigned long old;
|
||||
unsigned long new;
|
||||
int ret;
|
||||
|
||||
old = ftrace_call_replace(ip, adjust_address(rec, addr));
|
||||
#ifdef CONFIG_ARM_MODULE_PLTS
|
||||
/* mod is only supplied during module loading */
|
||||
if (!mod)
|
||||
mod = rec->arch.mod;
|
||||
else
|
||||
rec->arch.mod = mod;
|
||||
#endif
|
||||
|
||||
old = ftrace_call_replace(ip, aaddr,
|
||||
!IS_ENABLED(CONFIG_ARM_MODULE_PLTS) || !mod);
|
||||
#ifdef CONFIG_ARM_MODULE_PLTS
|
||||
if (!old && mod) {
|
||||
aaddr = get_module_plt(mod, ip, aaddr);
|
||||
old = ftrace_call_replace(ip, aaddr, true);
|
||||
}
|
||||
#endif
|
||||
|
||||
new = ftrace_nop_replace(rec);
|
||||
ret = ftrace_modify_code(ip, old, new, true);
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <asm/opcodes.h>
|
||||
|
||||
static unsigned long
|
||||
__arm_gen_branch_thumb2(unsigned long pc, unsigned long addr, bool link)
|
||||
static unsigned long __arm_gen_branch_thumb2(unsigned long pc,
|
||||
unsigned long addr, bool link,
|
||||
bool warn)
|
||||
{
|
||||
unsigned long s, j1, j2, i1, i2, imm10, imm11;
|
||||
unsigned long first, second;
|
||||
@@ -12,7 +13,7 @@ __arm_gen_branch_thumb2(unsigned long pc, unsigned long addr, bool link)
|
||||
|
||||
offset = (long)addr - (long)(pc + 4);
|
||||
if (offset < -16777216 || offset > 16777214) {
|
||||
WARN_ON_ONCE(1);
|
||||
WARN_ON_ONCE(warn);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -33,8 +34,8 @@ __arm_gen_branch_thumb2(unsigned long pc, unsigned long addr, bool link)
|
||||
return __opcode_thumb32_compose(first, second);
|
||||
}
|
||||
|
||||
static unsigned long
|
||||
__arm_gen_branch_arm(unsigned long pc, unsigned long addr, bool link)
|
||||
static unsigned long __arm_gen_branch_arm(unsigned long pc, unsigned long addr,
|
||||
bool link, bool warn)
|
||||
{
|
||||
unsigned long opcode = 0xea000000;
|
||||
long offset;
|
||||
@@ -44,7 +45,7 @@ __arm_gen_branch_arm(unsigned long pc, unsigned long addr, bool link)
|
||||
|
||||
offset = (long)addr - (long)(pc + 8);
|
||||
if (unlikely(offset < -33554432 || offset > 33554428)) {
|
||||
WARN_ON_ONCE(1);
|
||||
WARN_ON_ONCE(warn);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -54,10 +55,10 @@ __arm_gen_branch_arm(unsigned long pc, unsigned long addr, bool link)
|
||||
}
|
||||
|
||||
unsigned long
|
||||
__arm_gen_branch(unsigned long pc, unsigned long addr, bool link)
|
||||
__arm_gen_branch(unsigned long pc, unsigned long addr, bool link, bool warn)
|
||||
{
|
||||
if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
|
||||
return __arm_gen_branch_thumb2(pc, addr, link);
|
||||
return __arm_gen_branch_thumb2(pc, addr, link, warn);
|
||||
else
|
||||
return __arm_gen_branch_arm(pc, addr, link);
|
||||
return __arm_gen_branch_arm(pc, addr, link, warn);
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/elf.h>
|
||||
#include <linux/ftrace.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/sort.h>
|
||||
@@ -11,10 +12,6 @@
|
||||
#include <asm/cache.h>
|
||||
#include <asm/opcodes.h>
|
||||
|
||||
#define PLT_ENT_STRIDE L1_CACHE_BYTES
|
||||
#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32))
|
||||
#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT)
|
||||
|
||||
#ifdef CONFIG_THUMB2_KERNEL
|
||||
#define PLT_ENT_LDR __opcode_to_mem_thumb32(0xf8dff000 | \
|
||||
(PLT_ENT_STRIDE - 4))
|
||||
@@ -23,9 +20,11 @@
|
||||
(PLT_ENT_STRIDE - 8))
|
||||
#endif
|
||||
|
||||
struct plt_entries {
|
||||
u32 ldr[PLT_ENT_COUNT];
|
||||
u32 lit[PLT_ENT_COUNT];
|
||||
static const u32 fixed_plts[] = {
|
||||
#ifdef CONFIG_DYNAMIC_FTRACE
|
||||
FTRACE_ADDR,
|
||||
MCOUNT_ADDR,
|
||||
#endif
|
||||
};
|
||||
|
||||
static bool in_init(const struct module *mod, unsigned long loc)
|
||||
@@ -33,14 +32,40 @@ static bool in_init(const struct module *mod, unsigned long loc)
|
||||
return loc - (u32)mod->init_layout.base < mod->init_layout.size;
|
||||
}
|
||||
|
||||
static void prealloc_fixed(struct mod_plt_sec *pltsec, struct plt_entries *plt)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!ARRAY_SIZE(fixed_plts) || pltsec->plt_count)
|
||||
return;
|
||||
pltsec->plt_count = ARRAY_SIZE(fixed_plts);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(plt->ldr); ++i)
|
||||
plt->ldr[i] = PLT_ENT_LDR;
|
||||
|
||||
BUILD_BUG_ON(sizeof(fixed_plts) > sizeof(plt->lit));
|
||||
memcpy(plt->lit, fixed_plts, sizeof(fixed_plts));
|
||||
}
|
||||
|
||||
u32 get_module_plt(struct module *mod, unsigned long loc, Elf32_Addr val)
|
||||
{
|
||||
struct mod_plt_sec *pltsec = !in_init(mod, loc) ? &mod->arch.core :
|
||||
&mod->arch.init;
|
||||
struct plt_entries *plt;
|
||||
int idx;
|
||||
|
||||
struct plt_entries *plt = (struct plt_entries *)pltsec->plt->sh_addr;
|
||||
int idx = 0;
|
||||
/* cache the address, ELF header is available only during module load */
|
||||
if (!pltsec->plt_ent)
|
||||
pltsec->plt_ent = (struct plt_entries *)pltsec->plt->sh_addr;
|
||||
plt = pltsec->plt_ent;
|
||||
|
||||
prealloc_fixed(pltsec, plt);
|
||||
|
||||
for (idx = 0; idx < ARRAY_SIZE(fixed_plts); ++idx)
|
||||
if (plt->lit[idx] == val)
|
||||
return (u32)&plt->ldr[idx];
|
||||
|
||||
idx = 0;
|
||||
/*
|
||||
* Look for an existing entry pointing to 'val'. Given that the
|
||||
* relocations are sorted, this will be the last entry we allocated.
|
||||
@@ -188,8 +213,8 @@ static unsigned int count_plts(const Elf32_Sym *syms, Elf32_Addr base,
|
||||
int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
|
||||
char *secstrings, struct module *mod)
|
||||
{
|
||||
unsigned long core_plts = 0;
|
||||
unsigned long init_plts = 0;
|
||||
unsigned long core_plts = ARRAY_SIZE(fixed_plts);
|
||||
unsigned long init_plts = ARRAY_SIZE(fixed_plts);
|
||||
Elf32_Shdr *s, *sechdrs_end = sechdrs + ehdr->e_shnum;
|
||||
Elf32_Sym *syms = NULL;
|
||||
|
||||
@@ -244,6 +269,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
|
||||
mod->arch.core.plt->sh_size = round_up(core_plts * PLT_ENT_SIZE,
|
||||
sizeof(struct plt_entries));
|
||||
mod->arch.core.plt_count = 0;
|
||||
mod->arch.core.plt_ent = NULL;
|
||||
|
||||
mod->arch.init.plt->sh_type = SHT_NOBITS;
|
||||
mod->arch.init.plt->sh_flags = SHF_EXECINSTR | SHF_ALLOC;
|
||||
@@ -251,6 +277,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
|
||||
mod->arch.init.plt->sh_size = round_up(init_plts * PLT_ENT_SIZE,
|
||||
sizeof(struct plt_entries));
|
||||
mod->arch.init.plt_count = 0;
|
||||
mod->arch.init.plt_ent = NULL;
|
||||
|
||||
pr_debug("%s: plt=%x, init.plt=%x\n", __func__,
|
||||
mod->arch.core.plt->sh_size, mod->arch.init.plt->sh_size);
|
||||
|
||||
@@ -54,8 +54,7 @@ int notrace unwind_frame(struct stackframe *frame)
|
||||
|
||||
frame->sp = frame->fp;
|
||||
frame->fp = *(unsigned long *)(fp);
|
||||
frame->pc = frame->lr;
|
||||
frame->lr = *(unsigned long *)(fp + 4);
|
||||
frame->pc = *(unsigned long *)(fp + 4);
|
||||
#else
|
||||
/* check current frame pointer is within bounds */
|
||||
if (fp < low + 12 || fp > high - 4)
|
||||
|
||||
@@ -180,7 +180,7 @@ ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE,
|
||||
ASSERT((_end - __bss_start) >= 12288, ".bss too small for CONFIG_XIP_DEFLATED_DATA")
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARM_MPU
|
||||
#if defined(CONFIG_ARM_MPU) && !defined(CONFIG_COMPILE_TEST)
|
||||
/*
|
||||
* Due to PMSAv7 restriction on base address and size we have to
|
||||
* enforce minimal alignment restrictions. It was seen that weaker
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/genalloc.h>
|
||||
#include <linux/irqchip/arm-gic.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
|
||||
#include <linux/of.h>
|
||||
@@ -618,6 +619,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
|
||||
|
||||
static void imx6_pm_stby_poweroff(void)
|
||||
{
|
||||
gic_cpu_if_down(0);
|
||||
imx6_set_lpm(STOP_POWER_OFF);
|
||||
imx6q_suspend_finish(0);
|
||||
|
||||
|
||||
@@ -3656,6 +3656,8 @@ int omap_hwmod_init_module(struct device *dev,
|
||||
oh->flags |= HWMOD_SWSUP_SIDLE_ACT;
|
||||
if (data->cfg->quirks & SYSC_QUIRK_SWSUP_MSTANDBY)
|
||||
oh->flags |= HWMOD_SWSUP_MSTANDBY;
|
||||
if (data->cfg->quirks & SYSC_QUIRK_CLKDM_NOAUTO)
|
||||
oh->flags |= HWMOD_CLKDM_NOAUTO;
|
||||
|
||||
error = omap_hwmod_check_module(dev, oh, data, sysc_fields,
|
||||
rev_offs, sysc_offs, syss_offs,
|
||||
|
||||
@@ -752,7 +752,7 @@ config CPU_BIG_ENDIAN
|
||||
config CPU_ENDIAN_BE8
|
||||
bool
|
||||
depends on CPU_BIG_ENDIAN
|
||||
default CPU_V6 || CPU_V6K || CPU_V7
|
||||
default CPU_V6 || CPU_V6K || CPU_V7 || CPU_V7M
|
||||
help
|
||||
Support for the BE-8 (big-endian) mode on ARMv6 and ARMv7 processors.
|
||||
|
||||
|
||||
@@ -469,7 +469,11 @@ static void __init free_highpages(void)
|
||||
void __init mem_init(void)
|
||||
{
|
||||
#ifdef CONFIG_ARM_LPAE
|
||||
swiotlb_init(1);
|
||||
if (swiotlb_force == SWIOTLB_FORCE ||
|
||||
max_pfn > arm_dma_pfn_limit)
|
||||
swiotlb_init(1);
|
||||
else
|
||||
swiotlb_force = SWIOTLB_NO_FORCE;
|
||||
#endif
|
||||
|
||||
set_max_mapnr(pfn_to_page(max_pfn) - mem_map);
|
||||
|
||||
@@ -415,9 +415,9 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)
|
||||
FIXADDR_END);
|
||||
BUG_ON(idx >= __end_of_fixed_addresses);
|
||||
|
||||
/* we only support device mappings until pgprot_kernel has been set */
|
||||
/* We support only device mappings before pgprot_kernel is set. */
|
||||
if (WARN_ON(pgprot_val(prot) != pgprot_val(FIXMAP_PAGE_IO) &&
|
||||
pgprot_val(pgprot_kernel) == 0))
|
||||
pgprot_val(prot) && pgprot_val(pgprot_kernel) == 0))
|
||||
return;
|
||||
|
||||
if (pgprot_val(prot))
|
||||
|
||||
@@ -342,6 +342,7 @@ ENTRY(\name\()_cache_fns)
|
||||
|
||||
.macro define_tlb_functions name:req, flags_up:req, flags_smp
|
||||
.type \name\()_tlb_fns, #object
|
||||
.align 2
|
||||
ENTRY(\name\()_tlb_fns)
|
||||
.long \name\()_flush_user_tlb_range
|
||||
.long \name\()_flush_kern_tlb_range
|
||||
|
||||
@@ -36,6 +36,10 @@
|
||||
* +-----+
|
||||
* |RSVD | JIT scratchpad
|
||||
* current ARM_SP => +-----+ <= (BPF_FP - STACK_SIZE + SCRATCH_SIZE)
|
||||
* | ... | caller-saved registers
|
||||
* +-----+
|
||||
* | ... | arguments passed on stack
|
||||
* ARM_SP during call => +-----|
|
||||
* | |
|
||||
* | ... | Function call stack
|
||||
* | |
|
||||
@@ -63,6 +67,12 @@
|
||||
*
|
||||
* When popping registers off the stack at the end of a BPF function, we
|
||||
* reference them via the current ARM_FP register.
|
||||
*
|
||||
* Some eBPF operations are implemented via a call to a helper function.
|
||||
* Such calls are "invisible" in the eBPF code, so it is up to the calling
|
||||
* program to preserve any caller-saved ARM registers during the call. The
|
||||
* JIT emits code to push and pop those registers onto the stack, immediately
|
||||
* above the callee stack frame.
|
||||
*/
|
||||
#define CALLEE_MASK (1 << ARM_R4 | 1 << ARM_R5 | 1 << ARM_R6 | \
|
||||
1 << ARM_R7 | 1 << ARM_R8 | 1 << ARM_R9 | \
|
||||
@@ -70,6 +80,8 @@
|
||||
#define CALLEE_PUSH_MASK (CALLEE_MASK | 1 << ARM_LR)
|
||||
#define CALLEE_POP_MASK (CALLEE_MASK | 1 << ARM_PC)
|
||||
|
||||
#define CALLER_MASK (1 << ARM_R0 | 1 << ARM_R1 | 1 << ARM_R2 | 1 << ARM_R3)
|
||||
|
||||
enum {
|
||||
/* Stack layout - these are offsets from (top of stack - 4) */
|
||||
BPF_R2_HI,
|
||||
@@ -464,6 +476,7 @@ static inline int epilogue_offset(const struct jit_ctx *ctx)
|
||||
|
||||
static inline void emit_udivmod(u8 rd, u8 rm, u8 rn, struct jit_ctx *ctx, u8 op)
|
||||
{
|
||||
const int exclude_mask = BIT(ARM_R0) | BIT(ARM_R1);
|
||||
const s8 *tmp = bpf2a32[TMP_REG_1];
|
||||
|
||||
#if __LINUX_ARM_ARCH__ == 7
|
||||
@@ -495,11 +508,17 @@ static inline void emit_udivmod(u8 rd, u8 rm, u8 rn, struct jit_ctx *ctx, u8 op)
|
||||
emit(ARM_MOV_R(ARM_R0, rm), ctx);
|
||||
}
|
||||
|
||||
/* Push caller-saved registers on stack */
|
||||
emit(ARM_PUSH(CALLER_MASK & ~exclude_mask), ctx);
|
||||
|
||||
/* Call appropriate function */
|
||||
emit_mov_i(ARM_IP, op == BPF_DIV ?
|
||||
(u32)jit_udiv32 : (u32)jit_mod32, ctx);
|
||||
emit_blx_r(ARM_IP, ctx);
|
||||
|
||||
/* Restore caller-saved registers from stack */
|
||||
emit(ARM_POP(CALLER_MASK & ~exclude_mask), ctx);
|
||||
|
||||
/* Save return value */
|
||||
if (rd != ARM_R0)
|
||||
emit(ARM_MOV_R(rd, ARM_R0), ctx);
|
||||
|
||||
@@ -534,7 +534,7 @@ static struct undef_hook kprobes_arm_break_hook = {
|
||||
|
||||
#endif /* !CONFIG_THUMB2_KERNEL */
|
||||
|
||||
int __init arch_init_kprobes()
|
||||
int __init arch_init_kprobes(void)
|
||||
{
|
||||
arm_probes_decode_init();
|
||||
#ifdef CONFIG_THUMB2_KERNEL
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
pinctrl-0 = <&emac_rgmii_pins>;
|
||||
phy-supply = <®_gmac_3v3>;
|
||||
phy-handle = <&ext_rgmii_phy>;
|
||||
phy-mode = "rgmii";
|
||||
phy-mode = "rgmii-id";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
regulator-min-microvolt = <721000>;
|
||||
regulator-max-microvolt = <1022000>;
|
||||
|
||||
vin-supply = <&dc_in>;
|
||||
pwm-supply = <&dc_in>;
|
||||
|
||||
pwms = <&pwm_AO_cd 1 1250 0>;
|
||||
pwm-dutycycle-range = <100 0>;
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
regulator-min-microvolt = <721000>;
|
||||
regulator-max-microvolt = <1022000>;
|
||||
|
||||
vin-supply = <&main_12v>;
|
||||
pwm-supply = <&main_12v>;
|
||||
|
||||
pwms = <&pwm_AO_cd 1 1250 0>;
|
||||
pwm-dutycycle-range = <100 0>;
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
regulator-min-microvolt = <721000>;
|
||||
regulator-max-microvolt = <1022000>;
|
||||
|
||||
vin-supply = <&dc_in>;
|
||||
pwm-supply = <&dc_in>;
|
||||
|
||||
pwms = <&pwm_AO_cd 1 1250 0>;
|
||||
pwm-dutycycle-range = <100 0>;
|
||||
|
||||
@@ -287,6 +287,24 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
can0: can@2180000 {
|
||||
compatible = "fsl,ls1028ar1-flexcan", "fsl,lx2160ar1-flexcan";
|
||||
reg = <0x0 0x2180000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&sysclk>, <&clockgen 4 1>;
|
||||
clock-names = "ipg", "per";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
can1: can@2190000 {
|
||||
compatible = "fsl,ls1028ar1-flexcan", "fsl,lx2160ar1-flexcan";
|
||||
reg = <0x0 0x2190000 0x0 0x10000>;
|
||||
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&sysclk>, <&clockgen 4 1>;
|
||||
clock-names = "ipg", "per";
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
duart0: serial@21c0500 {
|
||||
compatible = "fsl,ns16550", "ns16550a";
|
||||
reg = <0x00 0x21c0500 0x0 0x100>;
|
||||
@@ -496,14 +514,14 @@
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc000000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 15>, <&clockgen 4 15>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core1_watchdog: watchdog@c010000 {
|
||||
compatible = "arm,sp805", "arm,primecell";
|
||||
reg = <0x0 0xc010000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 15>, <&clockgen 4 15>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
sai1: audio-controller@f100000 {
|
||||
|
||||
@@ -83,15 +83,9 @@
|
||||
};
|
||||
|
||||
eeprom@52 {
|
||||
compatible = "atmel,24c512";
|
||||
compatible = "onnn,cat24c04", "atmel,24c04";
|
||||
reg = <0x52>;
|
||||
};
|
||||
|
||||
eeprom@53 {
|
||||
compatible = "atmel,24c512";
|
||||
reg = <0x53>;
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -58,14 +58,9 @@
|
||||
};
|
||||
|
||||
eeprom@52 {
|
||||
compatible = "atmel,24c512";
|
||||
compatible = "onnn,cat24c05", "atmel,24c04";
|
||||
reg = <0x52>;
|
||||
};
|
||||
|
||||
eeprom@53 {
|
||||
compatible = "atmel,24c512";
|
||||
reg = <0x53>;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c3 {
|
||||
|
||||
@@ -640,56 +640,56 @@
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc000000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core1_watchdog: wdt@c010000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc010000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core2_watchdog: wdt@c020000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc020000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core3_watchdog: wdt@c030000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc030000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core0_watchdog: wdt@c100000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc100000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core1_watchdog: wdt@c110000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc110000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core2_watchdog: wdt@c120000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc120000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core3_watchdog: wdt@c130000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc130000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
fsl_mc: fsl-mc@80c000000 {
|
||||
|
||||
@@ -230,56 +230,56 @@
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc000000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster1_core1_watchdog: wdt@c010000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc010000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core0_watchdog: wdt@c100000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc100000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster2_core1_watchdog: wdt@c110000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc110000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster3_core0_watchdog: wdt@c200000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc200000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster3_core1_watchdog: wdt@c210000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc210000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster4_core0_watchdog: wdt@c300000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc300000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
cluster4_core1_watchdog: wdt@c310000 {
|
||||
compatible = "arm,sp805-wdt", "arm,primecell";
|
||||
reg = <0x0 0xc310000 0x0 0x1000>;
|
||||
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
|
||||
clock-names = "apb_pclk", "wdog_clk";
|
||||
clock-names = "wdog_clk", "apb_pclk";
|
||||
};
|
||||
|
||||
crypto: crypto@8000000 {
|
||||
|
||||
@@ -138,6 +138,23 @@
|
||||
max-link-speed = <2>;
|
||||
reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;
|
||||
phys = <&comphy1 0>;
|
||||
/*
|
||||
* U-Boot port for Turris Mox has a bug which always expects that "ranges" DT property
|
||||
* contains exactly 2 ranges with 3 (child) address cells, 2 (parent) address cells and
|
||||
* 2 size cells and also expects that the second range starts at 16 MB offset. If these
|
||||
* conditions are not met then U-Boot crashes during loading kernel DTB file. PCIe address
|
||||
* space is 128 MB long, so the best split between MEM and IO is to use fixed 16 MB window
|
||||
* for IO and the rest 112 MB (64+32+16) for MEM, despite that maximal IO size is just 64 kB.
|
||||
* This bug is not present in U-Boot ports for other Armada 3700 devices and is fixed in
|
||||
* U-Boot version 2021.07. See relevant U-Boot commits (the last one contains fix):
|
||||
* https://source.denx.de/u-boot/u-boot/-/commit/cb2ddb291ee6fcbddd6d8f4ff49089dfe580f5d7
|
||||
* https://source.denx.de/u-boot/u-boot/-/commit/c64ac3b3185aeb3846297ad7391fc6df8ecd73bf
|
||||
* https://source.denx.de/u-boot/u-boot/-/commit/4a82fca8e330157081fc132a591ebd99ba02ee33
|
||||
*/
|
||||
#address-cells = <3>;
|
||||
#size-cells = <2>;
|
||||
ranges = <0x81000000 0 0xe8000000 0 0xe8000000 0 0x01000000 /* Port 0 IO */
|
||||
0x82000000 0 0xe9000000 0 0xe9000000 0 0x07000000>; /* Port 0 MEM */
|
||||
|
||||
/* enabled by U-Boot if PCIe module is present */
|
||||
status = "disabled";
|
||||
|
||||
@@ -487,8 +487,15 @@
|
||||
#interrupt-cells = <1>;
|
||||
msi-parent = <&pcie0>;
|
||||
msi-controller;
|
||||
ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x1000000 /* Port 0 MEM */
|
||||
0x81000000 0 0xe9000000 0 0xe9000000 0 0x10000>; /* Port 0 IO*/
|
||||
/*
|
||||
* The 128 MiB address range [0xe8000000-0xf0000000] is
|
||||
* dedicated for PCIe and can be assigned to 8 windows
|
||||
* with size a power of two. Use one 64 KiB window for
|
||||
* IO at the end and the remaining seven windows
|
||||
* (totaling 127 MiB) for MEM.
|
||||
*/
|
||||
ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x07f00000 /* Port 0 MEM */
|
||||
0x81000000 0 0xefff0000 0 0xefff0000 0 0x00010000>; /* Port 0 IO */
|
||||
interrupt-map-mask = <0 0 0 7>;
|
||||
interrupt-map = <0 0 0 1 &pcie_intc 0>,
|
||||
<0 0 0 2 &pcie_intc 1>,
|
||||
|
||||
@@ -1082,13 +1082,13 @@
|
||||
|
||||
cpu@0 {
|
||||
device_type = "cpu";
|
||||
compatible = "nvidia,denver";
|
||||
compatible = "nvidia,tegra132-denver";
|
||||
reg = <0>;
|
||||
};
|
||||
|
||||
cpu@1 {
|
||||
device_type = "cpu";
|
||||
compatible = "nvidia,denver";
|
||||
compatible = "nvidia,tegra132-denver";
|
||||
reg = <1>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1434,7 +1434,7 @@
|
||||
};
|
||||
|
||||
pcie_ep@14160000 {
|
||||
compatible = "nvidia,tegra194-pcie-ep", "snps,dw-pcie-ep";
|
||||
compatible = "nvidia,tegra194-pcie-ep";
|
||||
power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX4A>;
|
||||
reg = <0x00 0x14160000 0x0 0x00020000 /* appl registers (128K) */
|
||||
0x00 0x36040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
|
||||
@@ -1466,7 +1466,7 @@
|
||||
};
|
||||
|
||||
pcie_ep@14180000 {
|
||||
compatible = "nvidia,tegra194-pcie-ep", "snps,dw-pcie-ep";
|
||||
compatible = "nvidia,tegra194-pcie-ep";
|
||||
power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX8B>;
|
||||
reg = <0x00 0x14180000 0x0 0x00020000 /* appl registers (128K) */
|
||||
0x00 0x38040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
|
||||
@@ -1498,7 +1498,7 @@
|
||||
};
|
||||
|
||||
pcie_ep@141a0000 {
|
||||
compatible = "nvidia,tegra194-pcie-ep", "snps,dw-pcie-ep";
|
||||
compatible = "nvidia,tegra194-pcie-ep";
|
||||
power-domains = <&bpmp TEGRA194_POWER_DOMAIN_PCIEX8A>;
|
||||
reg = <0x00 0x141a0000 0x0 0x00020000 /* appl registers (128K) */
|
||||
0x00 0x3a040000 0x0 0x00040000 /* iATU_DMA reg space (256K) */
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
stdout-path = "serial0";
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@40000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x0 0x40000000 0x0 0x20000000>;
|
||||
};
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#size-cells = <0>;
|
||||
|
||||
pon: power-on@800 {
|
||||
compatible = "qcom,pm8916-pon";
|
||||
compatible = "qcom,pm8998-pon";
|
||||
reg = <0x0800>;
|
||||
pwrkey {
|
||||
compatible = "qcom,pm8941-pwrkey";
|
||||
|
||||
@@ -555,7 +555,7 @@
|
||||
|
||||
gpu: gpu@ff300000 {
|
||||
compatible = "rockchip,rk3328-mali", "arm,mali-450";
|
||||
reg = <0x0 0xff300000 0x0 0x40000>;
|
||||
reg = <0x0 0xff300000 0x0 0x30000>;
|
||||
interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
||||
@@ -552,7 +552,6 @@ CONFIG_SECURITYFS=y
|
||||
CONFIG_SECURITY_NETWORK=y
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
|
||||
CONFIG_FORTIFY_SOURCE=y
|
||||
CONFIG_STATIC_USERMODEHELPER=y
|
||||
CONFIG_STATIC_USERMODEHELPER_PATH=""
|
||||
CONFIG_SECURITY_SELINUX=y
|
||||
|
||||
@@ -65,8 +65,8 @@
|
||||
#define EARLY_KASLR (0)
|
||||
#endif
|
||||
|
||||
#define EARLY_ENTRIES(vstart, vend, shift) (((vend) >> (shift)) \
|
||||
- ((vstart) >> (shift)) + 1 + EARLY_KASLR)
|
||||
#define EARLY_ENTRIES(vstart, vend, shift) \
|
||||
((((vend) - 1) >> (shift)) - ((vstart) >> (shift)) + 1 + EARLY_KASLR)
|
||||
|
||||
#define EARLY_PGDS(vstart, vend) (EARLY_ENTRIES(vstart, vend, PGDIR_SHIFT))
|
||||
|
||||
|
||||
@@ -54,9 +54,15 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
|
||||
* page table entry, taking care of 52-bit addresses.
|
||||
*/
|
||||
#ifdef CONFIG_ARM64_PA_BITS_52
|
||||
#define __pte_to_phys(pte) \
|
||||
((pte_val(pte) & PTE_ADDR_LOW) | ((pte_val(pte) & PTE_ADDR_HIGH) << 36))
|
||||
#define __phys_to_pte_val(phys) (((phys) | ((phys) >> 36)) & PTE_ADDR_MASK)
|
||||
static inline phys_addr_t __pte_to_phys(pte_t pte)
|
||||
{
|
||||
return (pte_val(pte) & PTE_ADDR_LOW) |
|
||||
((pte_val(pte) & PTE_ADDR_HIGH) << 36);
|
||||
}
|
||||
static inline pteval_t __phys_to_pte_val(phys_addr_t phys)
|
||||
{
|
||||
return (phys | (phys >> 36)) & PTE_ADDR_MASK;
|
||||
}
|
||||
#else
|
||||
#define __pte_to_phys(pte) (pte_val(pte) & PTE_ADDR_MASK)
|
||||
#define __phys_to_pte_val(phys) (phys)
|
||||
|
||||
@@ -43,7 +43,7 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,
|
||||
this_leaf->type = type;
|
||||
}
|
||||
|
||||
static int __init_cache_level(unsigned int cpu)
|
||||
int init_cache_level(unsigned int cpu)
|
||||
{
|
||||
unsigned int ctype, level, leaves, fw_level;
|
||||
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
|
||||
@@ -78,7 +78,7 @@ static int __init_cache_level(unsigned int cpu)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __populate_cache_leaves(unsigned int cpu)
|
||||
int populate_cache_leaves(unsigned int cpu)
|
||||
{
|
||||
unsigned int level, idx;
|
||||
enum cache_type type;
|
||||
@@ -97,6 +97,3 @@ static int __populate_cache_leaves(unsigned int cpu)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
DEFINE_SMP_CALL_CACHE_FUNCTION(init_cache_level)
|
||||
DEFINE_SMP_CALL_CACHE_FUNCTION(populate_cache_leaves)
|
||||
|
||||
@@ -498,7 +498,7 @@ size_t sve_state_size(struct task_struct const *task)
|
||||
void sve_alloc(struct task_struct *task)
|
||||
{
|
||||
if (task->thread.sve_state) {
|
||||
memset(task->thread.sve_state, 0, sve_state_size(current));
|
||||
memset(task->thread.sve_state, 0, sve_state_size(task));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -195,7 +195,7 @@ ENDPROC(preserve_boot_args)
|
||||
* to be composed of multiple pages. (This effectively scales the end index).
|
||||
*
|
||||
* vstart: virtual address of start of range
|
||||
* vend: virtual address of end of range
|
||||
* vend: virtual address of end of range - we map [vstart, vend]
|
||||
* shift: shift used to transform virtual address into index
|
||||
* ptrs: number of entries in page table
|
||||
* istart: index in table corresponding to vstart
|
||||
@@ -232,17 +232,18 @@ ENDPROC(preserve_boot_args)
|
||||
*
|
||||
* tbl: location of page table
|
||||
* rtbl: address to be used for first level page table entry (typically tbl + PAGE_SIZE)
|
||||
* vstart: start address to map
|
||||
* vend: end address to map - we map [vstart, vend]
|
||||
* vstart: virtual address of start of range
|
||||
* vend: virtual address of end of range - we map [vstart, vend - 1]
|
||||
* flags: flags to use to map last level entries
|
||||
* phys: physical address corresponding to vstart - physical memory is contiguous
|
||||
* pgds: the number of pgd entries
|
||||
*
|
||||
* Temporaries: istart, iend, tmp, count, sv - these need to be different registers
|
||||
* Preserves: vstart, vend, flags
|
||||
* Corrupts: tbl, rtbl, istart, iend, tmp, count, sv
|
||||
* Preserves: vstart, flags
|
||||
* Corrupts: tbl, rtbl, vend, istart, iend, tmp, count, sv
|
||||
*/
|
||||
.macro map_memory, tbl, rtbl, vstart, vend, flags, phys, pgds, istart, iend, tmp, count, sv
|
||||
sub \vend, \vend, #1
|
||||
add \rtbl, \tbl, #PAGE_SIZE
|
||||
mov \sv, \rtbl
|
||||
mov \count, #0
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
|
||||
#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)
|
||||
#include <linux/stackprotector.h>
|
||||
unsigned long __stack_chk_guard __read_mostly;
|
||||
unsigned long __stack_chk_guard __ro_after_init;
|
||||
EXPORT_SYMBOL(__stack_chk_guard);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -996,6 +996,11 @@ out:
|
||||
return prog;
|
||||
}
|
||||
|
||||
u64 bpf_jit_alloc_exec_limit(void)
|
||||
{
|
||||
return BPF_JIT_REGION_SIZE;
|
||||
}
|
||||
|
||||
void *bpf_jit_alloc_exec(unsigned long size)
|
||||
{
|
||||
return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
|
||||
|
||||
@@ -96,7 +96,8 @@ static int gpr_set(struct task_struct *target,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
regs.sr = task_pt_regs(target)->sr;
|
||||
/* BIT(0) of regs.sr is Condition Code/Carry bit */
|
||||
regs.sr = (regs.sr & BIT(0)) | (task_pt_regs(target)->sr & ~BIT(0));
|
||||
#ifdef CONFIG_CPU_HAS_HILO
|
||||
regs.dcsr = task_pt_regs(target)->dcsr;
|
||||
#endif
|
||||
|
||||
@@ -52,10 +52,14 @@ static long restore_sigcontext(struct pt_regs *regs,
|
||||
struct sigcontext __user *sc)
|
||||
{
|
||||
int err = 0;
|
||||
unsigned long sr = regs->sr;
|
||||
|
||||
/* sc_pt_regs is structured the same as the start of pt_regs */
|
||||
err |= __copy_from_user(regs, &sc->sc_pt_regs, sizeof(struct pt_regs));
|
||||
|
||||
/* BIT(0) of regs->sr is Condition Code/Carry bit */
|
||||
regs->sr = (sr & ~1) | (regs->sr & 1);
|
||||
|
||||
/* Restore the floating-point state. */
|
||||
err |= restore_fpu_state(sc);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ config DISABLE_VHPT
|
||||
|
||||
config IA64_DEBUG_CMPXCHG
|
||||
bool "Turn on compare-and-exchange bug checking (slow!)"
|
||||
depends on DEBUG_KERNEL
|
||||
depends on DEBUG_KERNEL && PRINTK
|
||||
help
|
||||
Selecting this option turns on bug checking for the IA-64
|
||||
compare-and-exchange instructions. This is slow! Itaniums
|
||||
|
||||
@@ -398,7 +398,8 @@ static void kretprobe_trampoline(void)
|
||||
|
||||
int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
|
||||
{
|
||||
regs->cr_iip = __kretprobe_trampoline_handler(regs, kretprobe_trampoline, NULL);
|
||||
regs->cr_iip = __kretprobe_trampoline_handler(regs,
|
||||
dereference_function_descriptor(kretprobe_trampoline), NULL);
|
||||
/*
|
||||
* By returning a non-zero value, we are telling
|
||||
* kprobe_handler() that we don't want the post_handler
|
||||
@@ -414,7 +415,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
|
||||
ri->fp = NULL;
|
||||
|
||||
/* Replace the return addr with trampoline addr */
|
||||
regs->b0 = ((struct fnptr *)kretprobe_trampoline)->ip;
|
||||
regs->b0 = (unsigned long)dereference_function_descriptor(kretprobe_trampoline);
|
||||
}
|
||||
|
||||
/* Check the instruction in the slot is break */
|
||||
@@ -918,14 +919,14 @@ static struct kprobe trampoline_p = {
|
||||
int __init arch_init_kprobes(void)
|
||||
{
|
||||
trampoline_p.addr =
|
||||
(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip;
|
||||
dereference_function_descriptor(kretprobe_trampoline);
|
||||
return register_kprobe(&trampoline_p);
|
||||
}
|
||||
|
||||
int __kprobes arch_trampoline_kprobe(struct kprobe *p)
|
||||
{
|
||||
if (p->addr ==
|
||||
(kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip)
|
||||
dereference_function_descriptor(kretprobe_trampoline))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -63,7 +63,7 @@ source "drivers/zorro/Kconfig"
|
||||
|
||||
endif
|
||||
|
||||
if !MMU
|
||||
if COLDFIRE
|
||||
|
||||
config ISA_DMA_API
|
||||
def_bool !M5272
|
||||
|
||||
@@ -190,6 +190,7 @@ config INIT_LCD
|
||||
config MEMORY_RESERVE
|
||||
int "Memory reservation (MiB)"
|
||||
depends on (UCSIMM || UCDIMM)
|
||||
default 0
|
||||
help
|
||||
Reserve certain memory regions on 68x328 based boards.
|
||||
|
||||
|
||||
@@ -17,21 +17,21 @@
|
||||
* two accesses to memory, which may be undesirable for some devices.
|
||||
*/
|
||||
#define in_8(addr) \
|
||||
({ u8 __v = (*(__force volatile u8 *) (addr)); __v; })
|
||||
({ u8 __v = (*(__force volatile u8 *) (unsigned long)(addr)); __v; })
|
||||
#define in_be16(addr) \
|
||||
({ u16 __v = (*(__force volatile u16 *) (addr)); __v; })
|
||||
({ u16 __v = (*(__force volatile u16 *) (unsigned long)(addr)); __v; })
|
||||
#define in_be32(addr) \
|
||||
({ u32 __v = (*(__force volatile u32 *) (addr)); __v; })
|
||||
({ u32 __v = (*(__force volatile u32 *) (unsigned long)(addr)); __v; })
|
||||
#define in_le16(addr) \
|
||||
({ u16 __v = le16_to_cpu(*(__force volatile __le16 *) (addr)); __v; })
|
||||
({ u16 __v = le16_to_cpu(*(__force volatile __le16 *) (unsigned long)(addr)); __v; })
|
||||
#define in_le32(addr) \
|
||||
({ u32 __v = le32_to_cpu(*(__force volatile __le32 *) (addr)); __v; })
|
||||
({ u32 __v = le32_to_cpu(*(__force volatile __le32 *) (unsigned long)(addr)); __v; })
|
||||
|
||||
#define out_8(addr,b) (void)((*(__force volatile u8 *) (addr)) = (b))
|
||||
#define out_be16(addr,w) (void)((*(__force volatile u16 *) (addr)) = (w))
|
||||
#define out_be32(addr,l) (void)((*(__force volatile u32 *) (addr)) = (l))
|
||||
#define out_le16(addr,w) (void)((*(__force volatile __le16 *) (addr)) = cpu_to_le16(w))
|
||||
#define out_le32(addr,l) (void)((*(__force volatile __le32 *) (addr)) = cpu_to_le32(l))
|
||||
#define out_8(addr,b) (void)((*(__force volatile u8 *) (unsigned long)(addr)) = (b))
|
||||
#define out_be16(addr,w) (void)((*(__force volatile u16 *) (unsigned long)(addr)) = (w))
|
||||
#define out_be32(addr,l) (void)((*(__force volatile u32 *) (unsigned long)(addr)) = (l))
|
||||
#define out_le16(addr,w) (void)((*(__force volatile __le16 *) (unsigned long)(addr)) = cpu_to_le16(w))
|
||||
#define out_le32(addr,l) (void)((*(__force volatile __le32 *) (unsigned long)(addr)) = cpu_to_le32(l))
|
||||
|
||||
#define raw_inb in_8
|
||||
#define raw_inw in_be16
|
||||
|
||||
@@ -448,7 +448,7 @@ static inline void save_fpu_state(struct sigcontext *sc, struct pt_regs *regs)
|
||||
|
||||
if (CPU_IS_060 ? sc->sc_fpstate[2] : sc->sc_fpstate[0]) {
|
||||
fpu_version = sc->sc_fpstate[0];
|
||||
if (CPU_IS_020_OR_030 &&
|
||||
if (CPU_IS_020_OR_030 && !regs->stkadj &&
|
||||
regs->vector >= (VEC_FPBRUC * 4) &&
|
||||
regs->vector <= (VEC_FPNAN * 4)) {
|
||||
/* Clear pending exception in 68882 idle frame */
|
||||
@@ -511,7 +511,7 @@ static inline int rt_save_fpu_state(struct ucontext __user *uc, struct pt_regs *
|
||||
if (!(CPU_IS_060 || CPU_IS_COLDFIRE))
|
||||
context_size = fpstate[1];
|
||||
fpu_version = fpstate[0];
|
||||
if (CPU_IS_020_OR_030 &&
|
||||
if (CPU_IS_020_OR_030 && !regs->stkadj &&
|
||||
regs->vector >= (VEC_FPBRUC * 4) &&
|
||||
regs->vector <= (VEC_FPNAN * 4)) {
|
||||
/* Clear pending exception in 68882 idle frame */
|
||||
@@ -829,18 +829,24 @@ badframe:
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline struct pt_regs *rte_regs(struct pt_regs *regs)
|
||||
{
|
||||
return (void *)regs + regs->stkadj;
|
||||
}
|
||||
|
||||
static void setup_sigcontext(struct sigcontext *sc, struct pt_regs *regs,
|
||||
unsigned long mask)
|
||||
{
|
||||
struct pt_regs *tregs = rte_regs(regs);
|
||||
sc->sc_mask = mask;
|
||||
sc->sc_usp = rdusp();
|
||||
sc->sc_d0 = regs->d0;
|
||||
sc->sc_d1 = regs->d1;
|
||||
sc->sc_a0 = regs->a0;
|
||||
sc->sc_a1 = regs->a1;
|
||||
sc->sc_sr = regs->sr;
|
||||
sc->sc_pc = regs->pc;
|
||||
sc->sc_formatvec = regs->format << 12 | regs->vector;
|
||||
sc->sc_sr = tregs->sr;
|
||||
sc->sc_pc = tregs->pc;
|
||||
sc->sc_formatvec = tregs->format << 12 | tregs->vector;
|
||||
save_a5_state(sc, regs);
|
||||
save_fpu_state(sc, regs);
|
||||
}
|
||||
@@ -848,6 +854,7 @@ static void setup_sigcontext(struct sigcontext *sc, struct pt_regs *regs,
|
||||
static inline int rt_setup_ucontext(struct ucontext __user *uc, struct pt_regs *regs)
|
||||
{
|
||||
struct switch_stack *sw = (struct switch_stack *)regs - 1;
|
||||
struct pt_regs *tregs = rte_regs(regs);
|
||||
greg_t __user *gregs = uc->uc_mcontext.gregs;
|
||||
int err = 0;
|
||||
|
||||
@@ -868,9 +875,9 @@ static inline int rt_setup_ucontext(struct ucontext __user *uc, struct pt_regs *
|
||||
err |= __put_user(sw->a5, &gregs[13]);
|
||||
err |= __put_user(sw->a6, &gregs[14]);
|
||||
err |= __put_user(rdusp(), &gregs[15]);
|
||||
err |= __put_user(regs->pc, &gregs[16]);
|
||||
err |= __put_user(regs->sr, &gregs[17]);
|
||||
err |= __put_user((regs->format << 12) | regs->vector, &uc->uc_formatvec);
|
||||
err |= __put_user(tregs->pc, &gregs[16]);
|
||||
err |= __put_user(tregs->sr, &gregs[17]);
|
||||
err |= __put_user((tregs->format << 12) | tregs->vector, &uc->uc_formatvec);
|
||||
err |= rt_save_fpu_state(uc, regs);
|
||||
return err;
|
||||
}
|
||||
@@ -887,13 +894,14 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct sigframe __user *frame;
|
||||
int fsize = frame_extra_sizes(regs->format);
|
||||
struct pt_regs *tregs = rte_regs(regs);
|
||||
int fsize = frame_extra_sizes(tregs->format);
|
||||
struct sigcontext context;
|
||||
int err = 0, sig = ksig->sig;
|
||||
|
||||
if (fsize < 0) {
|
||||
pr_debug("setup_frame: Unknown frame format %#x\n",
|
||||
regs->format);
|
||||
tregs->format);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
@@ -904,7 +912,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
|
||||
|
||||
err |= __put_user(sig, &frame->sig);
|
||||
|
||||
err |= __put_user(regs->vector, &frame->code);
|
||||
err |= __put_user(tregs->vector, &frame->code);
|
||||
err |= __put_user(&frame->sc, &frame->psc);
|
||||
|
||||
if (_NSIG_WORDS > 1)
|
||||
@@ -929,34 +937,28 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
|
||||
|
||||
push_cache ((unsigned long) &frame->retcode);
|
||||
|
||||
/*
|
||||
* Set up registers for signal handler. All the state we are about
|
||||
* to destroy is successfully copied to sigframe.
|
||||
*/
|
||||
wrusp ((unsigned long) frame);
|
||||
regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
|
||||
adjustformat(regs);
|
||||
|
||||
/*
|
||||
* This is subtle; if we build more than one sigframe, all but the
|
||||
* first one will see frame format 0 and have fsize == 0, so we won't
|
||||
* screw stkadj.
|
||||
*/
|
||||
if (fsize)
|
||||
if (fsize) {
|
||||
regs->stkadj = fsize;
|
||||
|
||||
/* Prepare to skip over the extra stuff in the exception frame. */
|
||||
if (regs->stkadj) {
|
||||
struct pt_regs *tregs =
|
||||
(struct pt_regs *)((ulong)regs + regs->stkadj);
|
||||
tregs = rte_regs(regs);
|
||||
pr_debug("Performing stackadjust=%04lx\n", regs->stkadj);
|
||||
/* This must be copied with decreasing addresses to
|
||||
handle overlaps. */
|
||||
tregs->vector = 0;
|
||||
tregs->format = 0;
|
||||
tregs->pc = regs->pc;
|
||||
tregs->sr = regs->sr;
|
||||
}
|
||||
|
||||
/*
|
||||
* Set up registers for signal handler. All the state we are about
|
||||
* to destroy is successfully copied to sigframe.
|
||||
*/
|
||||
wrusp ((unsigned long) frame);
|
||||
tregs->pc = (unsigned long) ksig->ka.sa.sa_handler;
|
||||
adjustformat(regs);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -964,7 +966,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
|
||||
struct pt_regs *regs)
|
||||
{
|
||||
struct rt_sigframe __user *frame;
|
||||
int fsize = frame_extra_sizes(regs->format);
|
||||
struct pt_regs *tregs = rte_regs(regs);
|
||||
int fsize = frame_extra_sizes(tregs->format);
|
||||
int err = 0, sig = ksig->sig;
|
||||
|
||||
if (fsize < 0) {
|
||||
@@ -1013,34 +1016,27 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
|
||||
|
||||
push_cache ((unsigned long) &frame->retcode);
|
||||
|
||||
/*
|
||||
* Set up registers for signal handler. All the state we are about
|
||||
* to destroy is successfully copied to sigframe.
|
||||
*/
|
||||
wrusp ((unsigned long) frame);
|
||||
regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
|
||||
adjustformat(regs);
|
||||
|
||||
/*
|
||||
* This is subtle; if we build more than one sigframe, all but the
|
||||
* first one will see frame format 0 and have fsize == 0, so we won't
|
||||
* screw stkadj.
|
||||
*/
|
||||
if (fsize)
|
||||
if (fsize) {
|
||||
regs->stkadj = fsize;
|
||||
|
||||
/* Prepare to skip over the extra stuff in the exception frame. */
|
||||
if (regs->stkadj) {
|
||||
struct pt_regs *tregs =
|
||||
(struct pt_regs *)((ulong)regs + regs->stkadj);
|
||||
tregs = rte_regs(regs);
|
||||
pr_debug("Performing stackadjust=%04lx\n", regs->stkadj);
|
||||
/* This must be copied with decreasing addresses to
|
||||
handle overlaps. */
|
||||
tregs->vector = 0;
|
||||
tregs->format = 0;
|
||||
tregs->pc = regs->pc;
|
||||
tregs->sr = regs->sr;
|
||||
}
|
||||
|
||||
/*
|
||||
* Set up registers for signal handler. All the state we are about
|
||||
* to destroy is successfully copied to sigframe.
|
||||
*/
|
||||
wrusp ((unsigned long) frame);
|
||||
tregs->pc = (unsigned long) ksig->ka.sa.sa_handler;
|
||||
adjustformat(regs);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@ config MIPS
|
||||
select HAVE_ARCH_TRACEHOOK
|
||||
select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
|
||||
select HAVE_ASM_MODVERSIONS
|
||||
select HAVE_CBPF_JIT if !64BIT && !CPU_MICROMIPS
|
||||
select HAVE_EBPF_JIT if 64BIT && !CPU_MICROMIPS && TARGET_ISA_REV >= 2
|
||||
select HAVE_CONTEXT_TRACKING
|
||||
select HAVE_COPY_THREAD_TLS
|
||||
@@ -1392,6 +1393,7 @@ config CPU_LOONGSON3
|
||||
select WEAK_REORDERING_BEYOND_LLSC
|
||||
select MIPS_PGD_C0_CONTEXT
|
||||
select MIPS_L1_CACHE_SHIFT_6
|
||||
select MIPS_FP_SUPPORT
|
||||
select GPIOLIB
|
||||
select SWIOTLB
|
||||
help
|
||||
|
||||
@@ -239,6 +239,7 @@ static inline unsigned long __cmpxchg64(volatile void *ptr,
|
||||
" .set " MIPS_ISA_ARCH_LEVEL " \n"
|
||||
/* Load 64 bits from ptr */
|
||||
"1: lld %L0, %3 # __cmpxchg64 \n"
|
||||
" .set pop \n"
|
||||
/*
|
||||
* Split the 64 bit value we loaded into the 2 registers that hold the
|
||||
* ret variable.
|
||||
@@ -266,6 +267,8 @@ static inline unsigned long __cmpxchg64(volatile void *ptr,
|
||||
" or %L1, %L1, $at \n"
|
||||
" .set at \n"
|
||||
# endif
|
||||
" .set push \n"
|
||||
" .set " MIPS_ISA_ARCH_LEVEL " \n"
|
||||
/* Attempt to store new at ptr */
|
||||
" scd %L1, %2 \n"
|
||||
/* If we failed, loop! */
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#ifndef __MIPS_ASM_MIPS_CM_H__
|
||||
#define __MIPS_ASM_MIPS_CM_H__
|
||||
|
||||
#include <linux/bitfield.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/errno.h>
|
||||
|
||||
@@ -153,8 +154,8 @@ GCR_ACCESSOR_RO(32, 0x030, rev)
|
||||
#define CM_GCR_REV_MINOR GENMASK(7, 0)
|
||||
|
||||
#define CM_ENCODE_REV(major, minor) \
|
||||
(((major) << __ffs(CM_GCR_REV_MAJOR)) | \
|
||||
((minor) << __ffs(CM_GCR_REV_MINOR)))
|
||||
(FIELD_PREP(CM_GCR_REV_MAJOR, major) | \
|
||||
FIELD_PREP(CM_GCR_REV_MINOR, minor))
|
||||
|
||||
#define CM_REV_CM2 CM_ENCODE_REV(6, 0)
|
||||
#define CM_REV_CM2_5 CM_ENCODE_REV(7, 0)
|
||||
@@ -362,10 +363,10 @@ static inline int mips_cm_revision(void)
|
||||
static inline unsigned int mips_cm_max_vp_width(void)
|
||||
{
|
||||
extern int smp_num_siblings;
|
||||
uint32_t cfg;
|
||||
|
||||
if (mips_cm_revision() >= CM_REV_CM3)
|
||||
return read_gcr_sys_config2() & CM_GCR_SYS_CONFIG2_MAXVPW;
|
||||
return FIELD_GET(CM_GCR_SYS_CONFIG2_MAXVPW,
|
||||
read_gcr_sys_config2());
|
||||
|
||||
if (mips_cm_present()) {
|
||||
/*
|
||||
@@ -373,8 +374,7 @@ static inline unsigned int mips_cm_max_vp_width(void)
|
||||
* number of VP(E)s, and if that ever changes then this will
|
||||
* need revisiting.
|
||||
*/
|
||||
cfg = read_gcr_cl_config() & CM_GCR_Cx_CONFIG_PVPE;
|
||||
return (cfg >> __ffs(CM_GCR_Cx_CONFIG_PVPE)) + 1;
|
||||
return FIELD_GET(CM_GCR_Cx_CONFIG_PVPE, read_gcr_cl_config()) + 1;
|
||||
}
|
||||
|
||||
if (IS_ENABLED(CONFIG_SMP))
|
||||
|
||||
@@ -17,7 +17,7 @@ do { \
|
||||
leaf++; \
|
||||
} while (0)
|
||||
|
||||
static int __init_cache_level(unsigned int cpu)
|
||||
int init_cache_level(unsigned int cpu)
|
||||
{
|
||||
struct cpuinfo_mips *c = ¤t_cpu_data;
|
||||
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
|
||||
@@ -69,7 +69,7 @@ static void fill_cpumask_cluster(int cpu, cpumask_t *cpu_map)
|
||||
cpumask_set_cpu(cpu1, cpu_map);
|
||||
}
|
||||
|
||||
static int __populate_cache_leaves(unsigned int cpu)
|
||||
int populate_cache_leaves(unsigned int cpu)
|
||||
{
|
||||
struct cpuinfo_mips *c = ¤t_cpu_data;
|
||||
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
|
||||
@@ -98,6 +98,3 @@ static int __populate_cache_leaves(unsigned int cpu)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
DEFINE_SMP_CALL_CACHE_FUNCTION(init_cache_level)
|
||||
DEFINE_SMP_CALL_CACHE_FUNCTION(populate_cache_leaves)
|
||||
|
||||
@@ -179,8 +179,7 @@ static void mips_cm_probe_l2sync(void)
|
||||
phys_addr_t addr;
|
||||
|
||||
/* L2-only sync was introduced with CM major revision 6 */
|
||||
major_rev = (read_gcr_rev() & CM_GCR_REV_MAJOR) >>
|
||||
__ffs(CM_GCR_REV_MAJOR);
|
||||
major_rev = FIELD_GET(CM_GCR_REV_MAJOR, read_gcr_rev());
|
||||
if (major_rev < 6)
|
||||
return;
|
||||
|
||||
@@ -263,13 +262,13 @@ void mips_cm_lock_other(unsigned int cluster, unsigned int core,
|
||||
preempt_disable();
|
||||
|
||||
if (cm_rev >= CM_REV_CM3) {
|
||||
val = core << __ffs(CM3_GCR_Cx_OTHER_CORE);
|
||||
val |= vp << __ffs(CM3_GCR_Cx_OTHER_VP);
|
||||
val = FIELD_PREP(CM3_GCR_Cx_OTHER_CORE, core) |
|
||||
FIELD_PREP(CM3_GCR_Cx_OTHER_VP, vp);
|
||||
|
||||
if (cm_rev >= CM_REV_CM3_5) {
|
||||
val |= CM_GCR_Cx_OTHER_CLUSTER_EN;
|
||||
val |= cluster << __ffs(CM_GCR_Cx_OTHER_CLUSTER);
|
||||
val |= block << __ffs(CM_GCR_Cx_OTHER_BLOCK);
|
||||
val |= FIELD_PREP(CM_GCR_Cx_OTHER_CLUSTER, cluster);
|
||||
val |= FIELD_PREP(CM_GCR_Cx_OTHER_BLOCK, block);
|
||||
} else {
|
||||
WARN_ON(cluster != 0);
|
||||
WARN_ON(block != CM_GCR_Cx_OTHER_BLOCK_LOCAL);
|
||||
@@ -299,7 +298,7 @@ void mips_cm_lock_other(unsigned int cluster, unsigned int core,
|
||||
spin_lock_irqsave(&per_cpu(cm_core_lock, curr_core),
|
||||
per_cpu(cm_core_lock_flags, curr_core));
|
||||
|
||||
val = core << __ffs(CM_GCR_Cx_OTHER_CORENUM);
|
||||
val = FIELD_PREP(CM_GCR_Cx_OTHER_CORENUM, core);
|
||||
}
|
||||
|
||||
write_gcr_cl_other(val);
|
||||
@@ -343,8 +342,8 @@ void mips_cm_error_report(void)
|
||||
cm_other = read_gcr_error_mult();
|
||||
|
||||
if (revision < CM_REV_CM3) { /* CM2 */
|
||||
cause = cm_error >> __ffs(CM_GCR_ERROR_CAUSE_ERRTYPE);
|
||||
ocause = cm_other >> __ffs(CM_GCR_ERROR_MULT_ERR2ND);
|
||||
cause = FIELD_GET(CM_GCR_ERROR_CAUSE_ERRTYPE, cm_error);
|
||||
ocause = FIELD_GET(CM_GCR_ERROR_MULT_ERR2ND, cm_other);
|
||||
|
||||
if (!cause)
|
||||
return;
|
||||
@@ -386,8 +385,8 @@ void mips_cm_error_report(void)
|
||||
ulong core_id_bits, vp_id_bits, cmd_bits, cmd_group_bits;
|
||||
ulong cm3_cca_bits, mcp_bits, cm3_tr_bits, sched_bit;
|
||||
|
||||
cause = cm_error >> __ffs64(CM3_GCR_ERROR_CAUSE_ERRTYPE);
|
||||
ocause = cm_other >> __ffs(CM_GCR_ERROR_MULT_ERR2ND);
|
||||
cause = FIELD_GET(CM3_GCR_ERROR_CAUSE_ERRTYPE, cm_error);
|
||||
ocause = FIELD_GET(CM_GCR_ERROR_MULT_ERR2ND, cm_other);
|
||||
|
||||
if (!cause)
|
||||
return;
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
#define EX2(a,b) \
|
||||
9: a,##b; \
|
||||
.section __ex_table,"a"; \
|
||||
PTR 9b,bad_stack; \
|
||||
PTR 9b+4,bad_stack; \
|
||||
PTR 9b,fault; \
|
||||
PTR 9b+4,fault; \
|
||||
.previous
|
||||
|
||||
.set mips1
|
||||
|
||||
@@ -239,12 +239,3 @@ SYSCALL_DEFINE3(cachectl, char *, addr, int, nbytes, int, op)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
|
||||
/*
|
||||
* If we ever come here the user sp is bad. Zap the process right away.
|
||||
* Due to the bad stack signaling wouldn't work.
|
||||
*/
|
||||
asmlinkage void bad_stack(void)
|
||||
{
|
||||
do_exit(SIGSEGV);
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <linux/export.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/err.h>
|
||||
|
||||
#include <lantiq_soc.h>
|
||||
@@ -29,6 +30,7 @@
|
||||
#define LTQ_DMA_PCTRL 0x44
|
||||
#define LTQ_DMA_IRNEN 0xf4
|
||||
|
||||
#define DMA_ID_CHNR GENMASK(26, 20) /* channel number */
|
||||
#define DMA_DESCPT BIT(3) /* descriptor complete irq */
|
||||
#define DMA_TX BIT(8) /* TX channel direction */
|
||||
#define DMA_CHAN_ON BIT(0) /* channel on / off bit */
|
||||
@@ -39,7 +41,6 @@
|
||||
#define DMA_POLL BIT(31) /* turn on channel polling */
|
||||
#define DMA_CLK_DIV4 BIT(6) /* polling clock divider */
|
||||
#define DMA_2W_BURST BIT(1) /* 2 word burst length */
|
||||
#define DMA_MAX_CHANNEL 20 /* the soc has 20 channels */
|
||||
#define DMA_ETOP_ENDIANNESS (0xf << 8) /* endianness swap etop channels */
|
||||
#define DMA_WEIGHT (BIT(17) | BIT(16)) /* default channel wheight */
|
||||
|
||||
@@ -205,7 +206,7 @@ ltq_dma_init(struct platform_device *pdev)
|
||||
{
|
||||
struct clk *clk;
|
||||
struct resource *res;
|
||||
unsigned id;
|
||||
unsigned int id, nchannels;
|
||||
int i;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
@@ -221,21 +222,24 @@ ltq_dma_init(struct platform_device *pdev)
|
||||
clk_enable(clk);
|
||||
ltq_dma_w32_mask(0, DMA_RESET, LTQ_DMA_CTRL);
|
||||
|
||||
usleep_range(1, 10);
|
||||
|
||||
/* disable all interrupts */
|
||||
ltq_dma_w32(0, LTQ_DMA_IRNEN);
|
||||
|
||||
/* reset/configure each channel */
|
||||
for (i = 0; i < DMA_MAX_CHANNEL; i++) {
|
||||
id = ltq_dma_r32(LTQ_DMA_ID);
|
||||
nchannels = ((id & DMA_ID_CHNR) >> 20);
|
||||
for (i = 0; i < nchannels; i++) {
|
||||
ltq_dma_w32(i, LTQ_DMA_CS);
|
||||
ltq_dma_w32(DMA_CHAN_RST, LTQ_DMA_CCTRL);
|
||||
ltq_dma_w32(DMA_POLL | DMA_CLK_DIV4, LTQ_DMA_CPOLL);
|
||||
ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);
|
||||
}
|
||||
|
||||
id = ltq_dma_r32(LTQ_DMA_ID);
|
||||
dev_info(&pdev->dev,
|
||||
"Init done - hw rev: %X, ports: %d, channels: %d\n",
|
||||
id & 0x1f, (id >> 16) & 0xf, id >> 20);
|
||||
id & 0x1f, (id >> 16) & 0xf, nchannels);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#define ROCIT_CONFIG_GEN1_MEMMAP_SHIFT 8
|
||||
#define ROCIT_CONFIG_GEN1_MEMMAP_MASK (0xf << 8)
|
||||
|
||||
static unsigned char fdt_buf[16 << 10] __initdata;
|
||||
static unsigned char fdt_buf[16 << 10] __initdata __aligned(8);
|
||||
|
||||
/* determined physical memory size, not overridden by command line args */
|
||||
extern unsigned long physical_memsize;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# MIPS networking code
|
||||
|
||||
obj-$(CONFIG_MIPS_CBPF_JIT) += bpf_jit.o bpf_jit_asm.o
|
||||
obj-$(CONFIG_MIPS_EBPF_JIT) += ebpf_jit.o
|
||||
|
||||
1299
arch/mips/net/bpf_jit.c
Normal file
1299
arch/mips/net/bpf_jit.c
Normal file
File diff suppressed because it is too large
Load Diff
285
arch/mips/net/bpf_jit_asm.S
Normal file
285
arch/mips/net/bpf_jit_asm.S
Normal file
@@ -0,0 +1,285 @@
|
||||
/*
|
||||
* bpf_jib_asm.S: Packet/header access helper functions for MIPS/MIPS64 BPF
|
||||
* compiler.
|
||||
*
|
||||
* Copyright (C) 2015 Imagination Technologies Ltd.
|
||||
* Author: Markos Chandras <markos.chandras@imgtec.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; version 2 of the License.
|
||||
*/
|
||||
|
||||
#include <asm/asm.h>
|
||||
#include <asm/isa-rev.h>
|
||||
#include <asm/regdef.h>
|
||||
#include "bpf_jit.h"
|
||||
|
||||
/* ABI
|
||||
*
|
||||
* r_skb_hl skb header length
|
||||
* r_skb_data skb data
|
||||
* r_off(a1) offset register
|
||||
* r_A BPF register A
|
||||
* r_X PF register X
|
||||
* r_skb(a0) *skb
|
||||
* r_M *scratch memory
|
||||
* r_skb_le skb length
|
||||
* r_s0 Scratch register 0
|
||||
* r_s1 Scratch register 1
|
||||
*
|
||||
* On entry:
|
||||
* a0: *skb
|
||||
* a1: offset (imm or imm + X)
|
||||
*
|
||||
* All non-BPF-ABI registers are free for use. On return, we only
|
||||
* care about r_ret. The BPF-ABI registers are assumed to remain
|
||||
* unmodified during the entire filter operation.
|
||||
*/
|
||||
|
||||
#define skb a0
|
||||
#define offset a1
|
||||
#define SKF_LL_OFF (-0x200000) /* Can't include linux/filter.h in assembly */
|
||||
|
||||
/* We know better :) so prevent assembler reordering etc */
|
||||
.set noreorder
|
||||
|
||||
#define is_offset_negative(TYPE) \
|
||||
/* If offset is negative we have more work to do */ \
|
||||
slti t0, offset, 0; \
|
||||
bgtz t0, bpf_slow_path_##TYPE##_neg; \
|
||||
/* Be careful what follows in DS. */
|
||||
|
||||
#define is_offset_in_header(SIZE, TYPE) \
|
||||
/* Reading from header? */ \
|
||||
addiu $r_s0, $r_skb_hl, -SIZE; \
|
||||
slt t0, $r_s0, offset; \
|
||||
bgtz t0, bpf_slow_path_##TYPE; \
|
||||
|
||||
LEAF(sk_load_word)
|
||||
is_offset_negative(word)
|
||||
FEXPORT(sk_load_word_positive)
|
||||
is_offset_in_header(4, word)
|
||||
/* Offset within header boundaries */
|
||||
PTR_ADDU t1, $r_skb_data, offset
|
||||
.set reorder
|
||||
lw $r_A, 0(t1)
|
||||
.set noreorder
|
||||
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
||||
# if MIPS_ISA_REV >= 2
|
||||
wsbh t0, $r_A
|
||||
rotr $r_A, t0, 16
|
||||
# else
|
||||
sll t0, $r_A, 24
|
||||
srl t1, $r_A, 24
|
||||
srl t2, $r_A, 8
|
||||
or t0, t0, t1
|
||||
andi t2, t2, 0xff00
|
||||
andi t1, $r_A, 0xff00
|
||||
or t0, t0, t2
|
||||
sll t1, t1, 8
|
||||
or $r_A, t0, t1
|
||||
# endif
|
||||
#endif
|
||||
jr $r_ra
|
||||
move $r_ret, zero
|
||||
END(sk_load_word)
|
||||
|
||||
LEAF(sk_load_half)
|
||||
is_offset_negative(half)
|
||||
FEXPORT(sk_load_half_positive)
|
||||
is_offset_in_header(2, half)
|
||||
/* Offset within header boundaries */
|
||||
PTR_ADDU t1, $r_skb_data, offset
|
||||
lhu $r_A, 0(t1)
|
||||
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
||||
# if MIPS_ISA_REV >= 2
|
||||
wsbh $r_A, $r_A
|
||||
# else
|
||||
sll t0, $r_A, 8
|
||||
srl t1, $r_A, 8
|
||||
andi t0, t0, 0xff00
|
||||
or $r_A, t0, t1
|
||||
# endif
|
||||
#endif
|
||||
jr $r_ra
|
||||
move $r_ret, zero
|
||||
END(sk_load_half)
|
||||
|
||||
LEAF(sk_load_byte)
|
||||
is_offset_negative(byte)
|
||||
FEXPORT(sk_load_byte_positive)
|
||||
is_offset_in_header(1, byte)
|
||||
/* Offset within header boundaries */
|
||||
PTR_ADDU t1, $r_skb_data, offset
|
||||
lbu $r_A, 0(t1)
|
||||
jr $r_ra
|
||||
move $r_ret, zero
|
||||
END(sk_load_byte)
|
||||
|
||||
/*
|
||||
* call skb_copy_bits:
|
||||
* (prototype in linux/skbuff.h)
|
||||
*
|
||||
* int skb_copy_bits(sk_buff *skb, int offset, void *to, int len)
|
||||
*
|
||||
* o32 mandates we leave 4 spaces for argument registers in case
|
||||
* the callee needs to use them. Even though we don't care about
|
||||
* the argument registers ourselves, we need to allocate that space
|
||||
* to remain ABI compliant since the callee may want to use that space.
|
||||
* We also allocate 2 more spaces for $r_ra and our return register (*to).
|
||||
*
|
||||
* n64 is a bit different. The *caller* will allocate the space to preserve
|
||||
* the arguments. So in 64-bit kernels, we allocate the 4-arg space for no
|
||||
* good reason but it does not matter that much really.
|
||||
*
|
||||
* (void *to) is returned in r_s0
|
||||
*
|
||||
*/
|
||||
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
||||
#define DS_OFFSET(SIZE) (4 * SZREG)
|
||||
#else
|
||||
#define DS_OFFSET(SIZE) ((4 * SZREG) + (4 - SIZE))
|
||||
#endif
|
||||
#define bpf_slow_path_common(SIZE) \
|
||||
/* Quick check. Are we within reasonable boundaries? */ \
|
||||
LONG_ADDIU $r_s1, $r_skb_len, -SIZE; \
|
||||
sltu $r_s0, offset, $r_s1; \
|
||||
beqz $r_s0, fault; \
|
||||
/* Load 4th argument in DS */ \
|
||||
LONG_ADDIU a3, zero, SIZE; \
|
||||
PTR_ADDIU $r_sp, $r_sp, -(6 * SZREG); \
|
||||
PTR_LA t0, skb_copy_bits; \
|
||||
PTR_S $r_ra, (5 * SZREG)($r_sp); \
|
||||
/* Assign low slot to a2 */ \
|
||||
PTR_ADDIU a2, $r_sp, DS_OFFSET(SIZE); \
|
||||
jalr t0; \
|
||||
/* Reset our destination slot (DS but it's ok) */ \
|
||||
INT_S zero, (4 * SZREG)($r_sp); \
|
||||
/* \
|
||||
* skb_copy_bits returns 0 on success and -EFAULT \
|
||||
* on error. Our data live in a2. Do not bother with \
|
||||
* our data if an error has been returned. \
|
||||
*/ \
|
||||
/* Restore our frame */ \
|
||||
PTR_L $r_ra, (5 * SZREG)($r_sp); \
|
||||
INT_L $r_s0, (4 * SZREG)($r_sp); \
|
||||
bltz v0, fault; \
|
||||
PTR_ADDIU $r_sp, $r_sp, 6 * SZREG; \
|
||||
move $r_ret, zero; \
|
||||
|
||||
NESTED(bpf_slow_path_word, (6 * SZREG), $r_sp)
|
||||
bpf_slow_path_common(4)
|
||||
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
||||
# if MIPS_ISA_REV >= 2
|
||||
wsbh t0, $r_s0
|
||||
jr $r_ra
|
||||
rotr $r_A, t0, 16
|
||||
# else
|
||||
sll t0, $r_s0, 24
|
||||
srl t1, $r_s0, 24
|
||||
srl t2, $r_s0, 8
|
||||
or t0, t0, t1
|
||||
andi t2, t2, 0xff00
|
||||
andi t1, $r_s0, 0xff00
|
||||
or t0, t0, t2
|
||||
sll t1, t1, 8
|
||||
jr $r_ra
|
||||
or $r_A, t0, t1
|
||||
# endif
|
||||
#else
|
||||
jr $r_ra
|
||||
move $r_A, $r_s0
|
||||
#endif
|
||||
|
||||
END(bpf_slow_path_word)
|
||||
|
||||
NESTED(bpf_slow_path_half, (6 * SZREG), $r_sp)
|
||||
bpf_slow_path_common(2)
|
||||
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
||||
# if MIPS_ISA_REV >= 2
|
||||
jr $r_ra
|
||||
wsbh $r_A, $r_s0
|
||||
# else
|
||||
sll t0, $r_s0, 8
|
||||
andi t1, $r_s0, 0xff00
|
||||
andi t0, t0, 0xff00
|
||||
srl t1, t1, 8
|
||||
jr $r_ra
|
||||
or $r_A, t0, t1
|
||||
# endif
|
||||
#else
|
||||
jr $r_ra
|
||||
move $r_A, $r_s0
|
||||
#endif
|
||||
|
||||
END(bpf_slow_path_half)
|
||||
|
||||
NESTED(bpf_slow_path_byte, (6 * SZREG), $r_sp)
|
||||
bpf_slow_path_common(1)
|
||||
jr $r_ra
|
||||
move $r_A, $r_s0
|
||||
|
||||
END(bpf_slow_path_byte)
|
||||
|
||||
/*
|
||||
* Negative entry points
|
||||
*/
|
||||
.macro bpf_is_end_of_data
|
||||
li t0, SKF_LL_OFF
|
||||
/* Reading link layer data? */
|
||||
slt t1, offset, t0
|
||||
bgtz t1, fault
|
||||
/* Be careful what follows in DS. */
|
||||
.endm
|
||||
/*
|
||||
* call skb_copy_bits:
|
||||
* (prototype in linux/filter.h)
|
||||
*
|
||||
* void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb,
|
||||
* int k, unsigned int size)
|
||||
*
|
||||
* see above (bpf_slow_path_common) for ABI restrictions
|
||||
*/
|
||||
#define bpf_negative_common(SIZE) \
|
||||
PTR_ADDIU $r_sp, $r_sp, -(6 * SZREG); \
|
||||
PTR_LA t0, bpf_internal_load_pointer_neg_helper; \
|
||||
PTR_S $r_ra, (5 * SZREG)($r_sp); \
|
||||
jalr t0; \
|
||||
li a2, SIZE; \
|
||||
PTR_L $r_ra, (5 * SZREG)($r_sp); \
|
||||
/* Check return pointer */ \
|
||||
beqz v0, fault; \
|
||||
PTR_ADDIU $r_sp, $r_sp, 6 * SZREG; \
|
||||
/* Preserve our pointer */ \
|
||||
move $r_s0, v0; \
|
||||
/* Set return value */ \
|
||||
move $r_ret, zero; \
|
||||
|
||||
bpf_slow_path_word_neg:
|
||||
bpf_is_end_of_data
|
||||
NESTED(sk_load_word_negative, (6 * SZREG), $r_sp)
|
||||
bpf_negative_common(4)
|
||||
jr $r_ra
|
||||
lw $r_A, 0($r_s0)
|
||||
END(sk_load_word_negative)
|
||||
|
||||
bpf_slow_path_half_neg:
|
||||
bpf_is_end_of_data
|
||||
NESTED(sk_load_half_negative, (6 * SZREG), $r_sp)
|
||||
bpf_negative_common(2)
|
||||
jr $r_ra
|
||||
lhu $r_A, 0($r_s0)
|
||||
END(sk_load_half_negative)
|
||||
|
||||
bpf_slow_path_byte_neg:
|
||||
bpf_is_end_of_data
|
||||
NESTED(sk_load_byte_negative, (6 * SZREG), $r_sp)
|
||||
bpf_negative_common(1)
|
||||
jr $r_ra
|
||||
lbu $r_A, 0($r_s0)
|
||||
END(sk_load_byte_negative)
|
||||
|
||||
fault:
|
||||
jr $r_ra
|
||||
addiu $r_ret, zero, 1
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
static inline unsigned long arch_local_save_flags(void)
|
||||
{
|
||||
return RDCTL(CTL_STATUS);
|
||||
return RDCTL(CTL_FSTATUS);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -18,7 +18,7 @@ static inline unsigned long arch_local_save_flags(void)
|
||||
*/
|
||||
static inline void arch_local_irq_restore(unsigned long flags)
|
||||
{
|
||||
WRCTL(CTL_STATUS, flags);
|
||||
WRCTL(CTL_FSTATUS, flags);
|
||||
}
|
||||
|
||||
static inline void arch_local_irq_disable(void)
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#endif
|
||||
|
||||
/* control register numbers */
|
||||
#define CTL_STATUS 0
|
||||
#define CTL_FSTATUS 0
|
||||
#define CTL_ESTATUS 1
|
||||
#define CTL_BSTATUS 2
|
||||
#define CTL_IENABLE 3
|
||||
|
||||
@@ -37,6 +37,7 @@ config NIOS2_DTB_PHYS_ADDR
|
||||
|
||||
config NIOS2_DTB_SOURCE_BOOL
|
||||
bool "Compile and link device tree into kernel image"
|
||||
depends on !COMPILE_TEST
|
||||
help
|
||||
This allows you to specify a dts (device tree source) file
|
||||
which will be compiled and linked into the kernel image.
|
||||
|
||||
@@ -547,6 +547,7 @@ EXCEPTION_ENTRY(_external_irq_handler)
|
||||
l.bnf 1f // ext irq enabled, all ok.
|
||||
l.nop
|
||||
|
||||
#ifdef CONFIG_PRINTK
|
||||
l.addi r1,r1,-0x8
|
||||
l.movhi r3,hi(42f)
|
||||
l.ori r3,r3,lo(42f)
|
||||
@@ -560,6 +561,7 @@ EXCEPTION_ENTRY(_external_irq_handler)
|
||||
.string "\n\rESR interrupt bug: in _external_irq_handler (ESR %x)\n\r"
|
||||
.align 4
|
||||
.previous
|
||||
#endif
|
||||
|
||||
l.ori r4,r4,SPR_SR_IEE // fix the bug
|
||||
// l.sw PT_SR(r1),r4
|
||||
|
||||
@@ -181,7 +181,7 @@ extern int npmem_ranges;
|
||||
#include <asm-generic/getorder.h>
|
||||
#include <asm/pdc.h>
|
||||
|
||||
#define PAGE0 ((struct zeropage *)__PAGE_OFFSET)
|
||||
#define PAGE0 ((struct zeropage *)absolute_pointer(__PAGE_OFFSET))
|
||||
|
||||
/* DEFINITION OF THE ZERO-PAGE (PAG0) */
|
||||
/* based on work by Jason Eckhardt (jason@equator.com) */
|
||||
|
||||
@@ -1841,8 +1841,8 @@ syscall_restore:
|
||||
LDREG TI_TASK-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1
|
||||
|
||||
/* Are we being ptraced? */
|
||||
ldw TASK_FLAGS(%r1),%r19
|
||||
ldi _TIF_SYSCALL_TRACE_MASK,%r2
|
||||
LDREG TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19
|
||||
ldi _TIF_SINGLESTEP|_TIF_BLOCKSTEP,%r2
|
||||
and,COND(=) %r19,%r2,%r0
|
||||
b,n syscall_restore_rfi
|
||||
|
||||
|
||||
@@ -238,6 +238,12 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,
|
||||
#endif
|
||||
|
||||
usp = (regs->gr[30] & ~(0x01UL));
|
||||
#ifdef CONFIG_64BIT
|
||||
if (is_compat_task()) {
|
||||
/* The gcc alloca implementation leaves garbage in the upper 32 bits of sp */
|
||||
usp = (compat_uint_t)usp;
|
||||
}
|
||||
#endif
|
||||
/*FIXME: frame_size parameter is unused, remove it. */
|
||||
frame = get_sigframe(&ksig->ka, usp, sizeof(*frame));
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/ftrace.h>
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/kgdb.h>
|
||||
|
||||
#include <linux/atomic.h>
|
||||
#include <asm/current.h>
|
||||
@@ -71,7 +72,10 @@ enum ipi_message_type {
|
||||
IPI_CALL_FUNC,
|
||||
IPI_CPU_START,
|
||||
IPI_CPU_STOP,
|
||||
IPI_CPU_TEST
|
||||
IPI_CPU_TEST,
|
||||
#ifdef CONFIG_KGDB
|
||||
IPI_ENTER_KGDB,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
@@ -169,7 +173,12 @@ ipi_interrupt(int irq, void *dev_id)
|
||||
case IPI_CPU_TEST:
|
||||
smp_debug(100, KERN_DEBUG "CPU%d is alive!\n", this_cpu);
|
||||
break;
|
||||
|
||||
#ifdef CONFIG_KGDB
|
||||
case IPI_ENTER_KGDB:
|
||||
smp_debug(100, KERN_DEBUG "CPU%d ENTER_KGDB\n", this_cpu);
|
||||
kgdb_nmicallback(raw_smp_processor_id(), get_irq_regs());
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
printk(KERN_CRIT "Unknown IPI num on CPU%d: %lu\n",
|
||||
this_cpu, which);
|
||||
@@ -225,6 +234,12 @@ send_IPI_allbutself(enum ipi_message_type op)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_KGDB
|
||||
void kgdb_roundup_cpus(void)
|
||||
{
|
||||
send_IPI_allbutself(IPI_ENTER_KGDB);
|
||||
}
|
||||
#endif
|
||||
|
||||
inline void
|
||||
smp_send_stop(void) { send_IPI_allbutself(IPI_CPU_STOP); }
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
#include <asm/ptrace.h>
|
||||
|
||||
#include <asm/unwind.h>
|
||||
#include <asm/switch_to.h>
|
||||
#include <asm/sections.h>
|
||||
|
||||
/* #define DEBUG 1 */
|
||||
#ifdef DEBUG
|
||||
@@ -203,6 +205,11 @@ int __init unwind_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool pc_is_kernel_fn(unsigned long pc, void *fn)
|
||||
{
|
||||
return (unsigned long)dereference_kernel_function_descriptor(fn) == pc;
|
||||
}
|
||||
|
||||
static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int frame_size)
|
||||
{
|
||||
/*
|
||||
@@ -221,7 +228,7 @@ static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int
|
||||
extern void * const _call_on_stack;
|
||||
#endif /* CONFIG_IRQSTACKS */
|
||||
|
||||
if (pc == (unsigned long) &handle_interruption) {
|
||||
if (pc_is_kernel_fn(pc, handle_interruption)) {
|
||||
struct pt_regs *regs = (struct pt_regs *)(info->sp - frame_size - PT_SZ_ALGN);
|
||||
dbg("Unwinding through handle_interruption()\n");
|
||||
info->prev_sp = regs->gr[30];
|
||||
@@ -229,13 +236,13 @@ static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pc == (unsigned long) &ret_from_kernel_thread ||
|
||||
pc == (unsigned long) &syscall_exit) {
|
||||
if (pc_is_kernel_fn(pc, ret_from_kernel_thread) ||
|
||||
pc_is_kernel_fn(pc, syscall_exit)) {
|
||||
info->prev_sp = info->prev_ip = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pc == (unsigned long) &intr_return) {
|
||||
if (pc_is_kernel_fn(pc, intr_return)) {
|
||||
struct pt_regs *regs;
|
||||
|
||||
dbg("Found intr_return()\n");
|
||||
@@ -246,20 +253,20 @@ static int unwind_special(struct unwind_frame_info *info, unsigned long pc, int
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pc == (unsigned long) &_switch_to_ret) {
|
||||
if (pc_is_kernel_fn(pc, _switch_to) ||
|
||||
pc_is_kernel_fn(pc, _switch_to_ret)) {
|
||||
info->prev_sp = info->sp - CALLEE_SAVE_FRAME_SIZE;
|
||||
info->prev_ip = *(unsigned long *)(info->prev_sp - RP_OFFSET);
|
||||
return 1;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IRQSTACKS
|
||||
if (pc == (unsigned long) &_call_on_stack) {
|
||||
if (pc_is_kernel_fn(pc, _call_on_stack)) {
|
||||
info->prev_sp = *(unsigned long *)(info->sp - FRAME_SIZE - REG_SZ);
|
||||
info->prev_ip = *(unsigned long *)(info->sp - FRAME_SIZE - RP_OFFSET);
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +56,8 @@ 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))
|
||||
@@ -79,7 +81,6 @@ 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
|
||||
|
||||
@@ -310,12 +310,15 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
r1 &= ~3;
|
||||
fpregs[t+3] = fpregs[r1+3];
|
||||
fpregs[t+2] = fpregs[r1+2];
|
||||
fallthrough;
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
fpregs[t] = fpregs[r1];
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 3: /* FABS */
|
||||
switch (fmt) {
|
||||
case 2: /* illegal */
|
||||
@@ -325,13 +328,16 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
r1 &= ~3;
|
||||
fpregs[t+3] = fpregs[r1+3];
|
||||
fpregs[t+2] = fpregs[r1+2];
|
||||
fallthrough;
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
/* copy and clear sign bit */
|
||||
fpregs[t] = fpregs[r1] & 0x7fffffff;
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 6: /* FNEG */
|
||||
switch (fmt) {
|
||||
case 2: /* illegal */
|
||||
@@ -341,13 +347,16 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
r1 &= ~3;
|
||||
fpregs[t+3] = fpregs[r1+3];
|
||||
fpregs[t+2] = fpregs[r1+2];
|
||||
fallthrough;
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
/* copy and invert sign bit */
|
||||
fpregs[t] = fpregs[r1] ^ 0x80000000;
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 7: /* FNEGABS */
|
||||
switch (fmt) {
|
||||
case 2: /* illegal */
|
||||
@@ -357,13 +366,16 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
r1 &= ~3;
|
||||
fpregs[t+3] = fpregs[r1+3];
|
||||
fpregs[t+2] = fpregs[r1+2];
|
||||
fallthrough;
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
/* copy and set sign bit */
|
||||
fpregs[t] = fpregs[r1] | 0x80000000;
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 4: /* FSQRT */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -376,6 +388,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* quad not implemented */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 5: /* FRND */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -389,7 +402,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
} /* end of switch (subop) */
|
||||
|
||||
BUG();
|
||||
case 1: /* class 1 */
|
||||
df = extru(ir,fpdfpos,2); /* get dest format */
|
||||
if ((df & 2) || (fmt & 2)) {
|
||||
@@ -419,6 +432,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* dbl/dbl */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 1: /* FCNVXF */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -434,6 +448,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
return(dbl_to_dbl_fcnvxf(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 2: /* FCNVFX */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -449,6 +464,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
return(dbl_to_dbl_fcnvfx(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 3: /* FCNVFXT */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -464,6 +480,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
return(dbl_to_dbl_fcnvfxt(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 5: /* FCNVUF (PA2.0 only) */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -479,6 +496,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
return(dbl_to_dbl_fcnvuf(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 6: /* FCNVFU (PA2.0 only) */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -494,6 +512,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
return(dbl_to_dbl_fcnvfu(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 7: /* FCNVFUT (PA2.0 only) */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -509,10 +528,11 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
return(dbl_to_dbl_fcnvfut(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 4: /* undefined */
|
||||
return(MAJOR_0C_EXCP);
|
||||
} /* end of switch subop */
|
||||
|
||||
BUG();
|
||||
case 2: /* class 2 */
|
||||
fpu_type_flags=fpregs[FPU_TYPE_FLAG_POS];
|
||||
r2 = extru(ir, fpr2pos, 5) * sizeof(double)/sizeof(u_int);
|
||||
@@ -590,6 +610,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* quad not implemented */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 1: /* FTEST */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -609,8 +630,10 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3:
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
} /* end of switch subop */
|
||||
} /* end of else for PA1.0 & PA1.1 */
|
||||
BUG();
|
||||
case 3: /* class 3 */
|
||||
r2 = extru(ir,fpr2pos,5) * sizeof(double)/sizeof(u_int);
|
||||
if (r2 == 0)
|
||||
@@ -633,6 +656,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* quad not implemented */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 1: /* FSUB */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -645,6 +669,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* quad not implemented */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 2: /* FMPY */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -657,6 +682,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* quad not implemented */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 3: /* FDIV */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -669,6 +695,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* quad not implemented */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 4: /* FREM */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -681,6 +708,7 @@ decode_0c(u_int ir, u_int class, u_int subop, u_int fpregs[])
|
||||
case 3: /* quad not implemented */
|
||||
return(MAJOR_0C_EXCP);
|
||||
}
|
||||
BUG();
|
||||
} /* end of class 3 switch */
|
||||
} /* end of switch(class) */
|
||||
|
||||
@@ -736,10 +764,12 @@ u_int fpregs[];
|
||||
return(MAJOR_0E_EXCP);
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
fpregs[t] = fpregs[r1];
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 3: /* FABS */
|
||||
switch (fmt) {
|
||||
case 2:
|
||||
@@ -747,10 +777,12 @@ u_int fpregs[];
|
||||
return(MAJOR_0E_EXCP);
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
fpregs[t] = fpregs[r1] & 0x7fffffff;
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 6: /* FNEG */
|
||||
switch (fmt) {
|
||||
case 2:
|
||||
@@ -758,10 +790,12 @@ u_int fpregs[];
|
||||
return(MAJOR_0E_EXCP);
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
fpregs[t] = fpregs[r1] ^ 0x80000000;
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 7: /* FNEGABS */
|
||||
switch (fmt) {
|
||||
case 2:
|
||||
@@ -769,10 +803,12 @@ u_int fpregs[];
|
||||
return(MAJOR_0E_EXCP);
|
||||
case 1: /* double */
|
||||
fpregs[t+1] = fpregs[r1+1];
|
||||
fallthrough;
|
||||
case 0: /* single */
|
||||
fpregs[t] = fpregs[r1] | 0x80000000;
|
||||
return(NOEXCEPTION);
|
||||
}
|
||||
BUG();
|
||||
case 4: /* FSQRT */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -785,6 +821,7 @@ u_int fpregs[];
|
||||
case 3:
|
||||
return(MAJOR_0E_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 5: /* FRMD */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -798,7 +835,7 @@ u_int fpregs[];
|
||||
return(MAJOR_0E_EXCP);
|
||||
}
|
||||
} /* end of switch (subop */
|
||||
|
||||
BUG();
|
||||
case 1: /* class 1 */
|
||||
df = extru(ir,fpdfpos,2); /* get dest format */
|
||||
/*
|
||||
@@ -826,6 +863,7 @@ u_int fpregs[];
|
||||
case 3: /* dbl/dbl */
|
||||
return(MAJOR_0E_EXCP);
|
||||
}
|
||||
BUG();
|
||||
case 1: /* FCNVXF */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -841,6 +879,7 @@ u_int fpregs[];
|
||||
return(dbl_to_dbl_fcnvxf(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 2: /* FCNVFX */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -856,6 +895,7 @@ u_int fpregs[];
|
||||
return(dbl_to_dbl_fcnvfx(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 3: /* FCNVFXT */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -871,6 +911,7 @@ u_int fpregs[];
|
||||
return(dbl_to_dbl_fcnvfxt(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 5: /* FCNVUF (PA2.0 only) */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -886,6 +927,7 @@ u_int fpregs[];
|
||||
return(dbl_to_dbl_fcnvuf(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 6: /* FCNVFU (PA2.0 only) */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -901,6 +943,7 @@ u_int fpregs[];
|
||||
return(dbl_to_dbl_fcnvfu(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 7: /* FCNVFUT (PA2.0 only) */
|
||||
switch(fmt) {
|
||||
case 0: /* sgl/sgl */
|
||||
@@ -916,9 +959,11 @@ u_int fpregs[];
|
||||
return(dbl_to_dbl_fcnvfut(&fpregs[r1],0,
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 4: /* undefined */
|
||||
return(MAJOR_0C_EXCP);
|
||||
} /* end of switch subop */
|
||||
BUG();
|
||||
case 2: /* class 2 */
|
||||
/*
|
||||
* Be careful out there.
|
||||
@@ -994,6 +1039,7 @@ u_int fpregs[];
|
||||
}
|
||||
} /* end of switch subop */
|
||||
} /* end of else for PA1.0 & PA1.1 */
|
||||
BUG();
|
||||
case 3: /* class 3 */
|
||||
/*
|
||||
* Be careful out there.
|
||||
@@ -1026,6 +1072,7 @@ u_int fpregs[];
|
||||
return(dbl_fadd(&fpregs[r1],&fpregs[r2],
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 1: /* FSUB */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -1035,6 +1082,7 @@ u_int fpregs[];
|
||||
return(dbl_fsub(&fpregs[r1],&fpregs[r2],
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 2: /* FMPY or XMPYU */
|
||||
/*
|
||||
* check for integer multiply (x bit set)
|
||||
@@ -1071,6 +1119,7 @@ u_int fpregs[];
|
||||
&fpregs[r2],&fpregs[t],status));
|
||||
}
|
||||
}
|
||||
BUG();
|
||||
case 3: /* FDIV */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
@@ -1080,6 +1129,7 @@ u_int fpregs[];
|
||||
return(dbl_fdiv(&fpregs[r1],&fpregs[r2],
|
||||
&fpregs[t],status));
|
||||
}
|
||||
BUG();
|
||||
case 4: /* FREM */
|
||||
switch (fmt) {
|
||||
case 0:
|
||||
|
||||
@@ -18,12 +18,9 @@ void notrace set_fixmap(enum fixed_addresses idx, phys_addr_t phys)
|
||||
pte_t *pte;
|
||||
|
||||
if (pmd_none(*pmd))
|
||||
pmd = pmd_alloc(NULL, pgd, vaddr);
|
||||
|
||||
pte = pte_offset_kernel(pmd, vaddr);
|
||||
if (pte_none(*pte))
|
||||
pte = pte_alloc_kernel(pmd, vaddr);
|
||||
|
||||
pte = pte_offset_kernel(pmd, vaddr);
|
||||
set_pte_at(&init_mm, vaddr, pte, __mk_pte(phys, PAGE_KERNEL_RWX));
|
||||
flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);
|
||||
}
|
||||
|
||||
@@ -892,9 +892,9 @@ void flush_tlb_all(void)
|
||||
{
|
||||
int do_recycle;
|
||||
|
||||
__inc_irq_stat(irq_tlb_count);
|
||||
do_recycle = 0;
|
||||
spin_lock(&sid_lock);
|
||||
__inc_irq_stat(irq_tlb_count);
|
||||
if (dirty_space_ids > RECYCLE_THRESHOLD) {
|
||||
BUG_ON(recycle_inuse); /* FIXME: Use a semaphore/wait queue here */
|
||||
get_dirty_sids(&recycle_ndirty,recycle_dirty_array);
|
||||
@@ -913,8 +913,8 @@ void flush_tlb_all(void)
|
||||
#else
|
||||
void flush_tlb_all(void)
|
||||
{
|
||||
__inc_irq_stat(irq_tlb_count);
|
||||
spin_lock(&sid_lock);
|
||||
__inc_irq_stat(irq_tlb_count);
|
||||
flush_tlb_all_local(NULL);
|
||||
recycle_sids();
|
||||
spin_unlock(&sid_lock);
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
|
||||
fm1mac3: ethernet@e4000 {
|
||||
phy-handle = <&sgmii_aqr_phy3>;
|
||||
phy-connection-type = "sgmii-2500";
|
||||
phy-connection-type = "2500base-x";
|
||||
sleep = <&rcpm 0x20000000>;
|
||||
};
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@ CONFIG_MTD_CFI_GEOMETRY=y
|
||||
# CONFIG_MTD_CFI_I2 is not set
|
||||
CONFIG_MTD_CFI_I4=y
|
||||
CONFIG_MTD_CFI_AMDSTD=y
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
CONFIG_MTD_PHYSMAP_OF=y
|
||||
# CONFIG_BLK_DEV is not set
|
||||
CONFIG_NETDEVICES=y
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#define BRANCH_ABSOLUTE 0x2
|
||||
|
||||
bool is_offset_in_branch_range(long offset);
|
||||
bool is_offset_in_cond_branch_range(long offset);
|
||||
unsigned int create_branch(const unsigned int *addr,
|
||||
unsigned long target, int flags);
|
||||
unsigned int create_cond_branch(const unsigned int *addr,
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user