Merge branch 'android11-5.4-lts' of https://android.googlesource.com/kernel/common into android13-5.4-lahaina
* 'android11-5.4-lts' of https://android.googlesource.com/kernel/common: FROMGIT: clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd Linux 5.4.268 arm64: dts: armada-3720-turris-mox: set irq type for RTC perf top: Skip side-band event setup if HAVE_LIBBPF_SUPPORT is not set i2c: s3c24xx: fix transferring more than one message in polling mode i2c: s3c24xx: fix read transfers in polling mode mlxsw: spectrum_acl_erp: Fix error flow of pool allocation failure kdb: Fix a potential buffer overflow in kdb_local() kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ ipvs: avoid stat macros calls from preemptible context netfilter: nf_tables: skip dead set elements in netlink dump net: dsa: vsc73xx: Add null pointer check to vsc73xx_gpio_probe net: ravb: Fix dma_addr_t truncation in error case net: phy: micrel: populate .soft_reset for KSZ9131 net: qualcomm: rmnet: fix global oob in rmnet_policy s390/pci: fix max size calculation in zpci_memcpy_toio() PCI: keystone: Fix race condition when initializing PHYs nvmet-tcp: Fix the H2C expected PDU len calculation serial: imx: Correct clock error message in function probe() apparmor: avoid crash when parsed profile name is empty perf env: Avoid recursively taking env->bpf_progs.lock perf bpf: Decouple creating the evlist from adding the SB event perf top: Move sb_evlist to 'struct perf_top' perf record: Move sb_evlist to 'struct record' perf env: Add perf_env__numa_node() nvmet-tcp: fix a crash in nvmet_req_complete() nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length perf genelf: Set ELF program header addresses properly software node: Let args be NULL in software_node_get_reference_args acpi: property: Let args be NULL in __acpi_node_get_property_reference serial: 8250: omap: Don't skip resource freeing if pm_runtime_resume_and_get() failed MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup() MIPS: Alchemy: Fix an out-of-bound access in db1200_dev_setup() mips: Fix incorrect max_low_pfn adjustment HID: wacom: Correct behavior when processing some confidence == false touches x86/kvm: Do not try to disable kvmclock if it was not enabled wifi: mwifiex: configure BSSID consistently when starting AP wifi: rtlwifi: Convert LNKCTL change to PCIe cap RMW accessors wifi: rtlwifi: Remove bogus and dangerous ASPM disable/enable code rootfs: Fix support for rootfstype= when root= is given fbdev: flush deferred work in fb_deferred_io_fsync() ALSA: oxygen: Fix right channel of capture volume mixer usb: mon: Fix atomicity violation in mon_bin_vma_fault usb: typec: class: fix typec_altmode_put_partner to put plugs Revert "usb: typec: class: fix typec_altmode_put_partner to put plugs" usb: chipidea: wait controller resume finished for wakeup irq Revert "usb: dwc3: don't reset device side if dwc3 was configured as host-only" Revert "usb: dwc3: Soft reset phy on probe for host" usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart usb: phy: mxs: remove CONFIG_USB_OTG condition for mxs_phy_is_otg_host() tick-sched: Fix idle and iowait sleeptime accounting vs CPU hotplug binder: fix unused alloc->free_async_space binder: fix race between mmput() and do_exit() xen-netback: don't produce zero-size SKB frags Revert "ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek" Input: atkbd - use ab83 as id when skipping the getid command binder: fix use-after-free in shinker's callback binder: fix async space check for 0-sized buffers of: unittest: Fix of_count_phandle_with_args() expected value message of: Fix double free in of_parse_phandle_with_args_map mmc: sdhci_omap: Fix TI SoC dependencies clk: si5341: fix an error code problem in si5341_output_clk_set_rate watchdog: bcm2835_wdt: Fix WDIOC_SETTIMEOUT handling watchdog/hpwdt: Only claim UNKNOWN NMI if from iLO watchdog: set cdev owner before adding drivers: clk: zynqmp: calculate closest mux rate gpu/drm/radeon: fix two memleaks in radeon_vm_init drivers/amd/pm: fix a use-after-free in kv_parse_power_table drm/amd/pm: fix a double-free in si_dpm_init drm/amdgpu/debugfs: fix error code when smc register accessors are NULL media: dvbdev: drop refcount on error path in dvb_device_open() media: cx231xx: fix a memleak in cx231xx_init_isoc drm/bridge: tc358767: Fix return value on error case drm/radeon/trinity_dpm: fix a memleak in trinity_parse_power_table drm/radeon/dpm: fix a memleak in sumo_parse_power_table drm/radeon: check the alloc_workqueue return value in radeon_crtc_init() drm/drv: propagate errors from drm_modeset_register_all() drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks drm/msm/mdp4: flush vblank event on disable ASoC: cs35l34: Fix GPIO name and drop legacy include ASoC: cs35l33: Fix GPIO name and drop legacy include drm/radeon: check return value of radeon_ring_lock() drm/radeon/r100: Fix integer overflow issues in r100_cs_track_check() drm/radeon/r600_cs: Fix possible int overflows in r600_cs_check_reg() f2fs: fix to avoid dirent corruption drm/bridge: Fix typo in post_disable() description media: pvrusb2: fix use after free on context disconnection RDMA/usnic: Silence uninitialized symbol smatch warnings ARM: davinci: always select CONFIG_CPU_ARM926T ip6_tunnel: fix NEXTHDR_FRAGMENT handling in ip6_tnl_parse_tlv_enc_lim() Bluetooth: btmtkuart: fix recv_buf() return value Bluetooth: Fix bogus check for re-auth no supported with non-ssp netfilter: nf_tables: mark newset as dead on transaction abort wifi: rtlwifi: rtl8192se: using calculate_bit_shift() wifi: rtlwifi: rtl8192ee: using calculate_bit_shift() wifi: rtlwifi: rtl8192de: using calculate_bit_shift() rtlwifi: rtl8192de: make arrays static const, makes object smaller wifi: rtlwifi: rtl8192ce: using calculate_bit_shift() wifi: rtlwifi: rtl8192cu: using calculate_bit_shift() wifi: rtlwifi: rtl8192c: using calculate_bit_shift() wifi: rtlwifi: rtl8188ee: phy: using calculate_bit_shift() wifi: rtlwifi: add calculate_bit_shift() dma-mapping: clear dev->dma_mem to NULL after freeing it virtio/vsock: fix logic which reduces credit update messages selftests/net: fix grep checking for fib_nexthop_multiprefix scsi: hisi_sas: Replace with standard error code return value arm64: dts: qcom: sdm845-db845c: correct LED panic indicator scsi: fnic: Return error if vmalloc() failed wifi: rtlwifi: rtl8821ae: phy: fix an undefined bitwise shift behavior rtlwifi: Use ffs in <foo>_phy_calculate_bit_shift firmware: ti_sci: Fix an off-by-one in ti_sci_debugfs_create() net/ncsi: Fix netlink major/minor version numbers ncsi: internal.h: Fix a spello ARM: dts: qcom: apq8064: correct XOADC register address wifi: libertas: stop selecting wext bpf, lpm: Fix check prefixlen before walking trie wifi: rtw88: fix RX filter in FIF_ALLMULTI flag NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT blocklayoutdriver: Fix reference leak of pnfs_device_node crypto: scomp - fix req->dst buffer overflow crypto: sahara - do not resize req->src when doing hash operations crypto: sahara - fix processing hash requests with req->nbytes < sg->length crypto: sahara - improve error handling in sahara_sha_process() crypto: sahara - fix wait_for_completion_timeout() error handling crypto: sahara - fix ahash reqsize crypto: virtio - Wait for tasklet to complete on device remove gfs2: Fix kernel NULL pointer dereference in gfs2_rgrp_dump pstore: ram_core: fix possible overflow in persistent_ram_init_ecc() crypto: sahara - fix error handling in sahara_hw_descriptor_create() crypto: sahara - fix processing requests with cryptlen < sg->length crypto: sahara - fix ahash selftest failure crypto: sahara - remove FLAGS_NEW_KEY logic crypto: af_alg - Disallow multiple in-flight AIO requests crypto: ccp - fix memleak in ccp_init_dm_workarea virtio_crypto: Introduce VIRTIO_CRYPTO_NOSPC crypto: virtio - don't use 'default m' crypto: virtio - Handle dataq logic with tasklet selinux: Fix error priority for bind with AF_UNSPEC on PF_INET6 socket mtd: Fix gluebi NULL pointer dereference caused by ftl notifier spi: sh-msiof: Enforce fixed DTDL for R-Car H3 calipso: fix memory leak in netlbl_calipso_add_pass() netlabel: remove unused parameter in netlbl_netlink_auditinfo() net: netlabel: Fix kerneldoc warnings ACPI: LPIT: Avoid u32 multiplication overflow ACPI: video: check for error while searching for backlight device parent mtd: rawnand: Increment IFC_TIMEOUT_MSECS for nand controller response powerpc/imc-pmu: Add a null pointer check in update_events_in_group() powerpc/powernv: Add a null pointer check in opal_powercap_init() powerpc/powernv: Add a null pointer check in opal_event_init() powerpc/powernv: Add a null pointer check to scom_debug_init_one() selftests/powerpc: Fix error handling in FPU/VMX preemption tests powerpc/pseries/memhp: Fix access beyond end of drmem array powerpc/pseries/memhotplug: Quieten some DLPAR operations powerpc/44x: select I2C for CURRITUCK powerpc: add crtsavres.o to always-y instead of extra-y EDAC/thunderx: Fix possible out-of-bounds string access x86/lib: Fix overflow when counting digits coresight: etm4x: Fix width of CCITMIN field parport: parport_serial: Add Brainboxes device IDs and geometry parport: parport_serial: Add Brainboxes BAR details uio: Fix use-after-free in uio_open binder: fix comment on binder_alloc_new_buf() return value binder: fix trivial typo of binder_free_buf_locked() binder: use EPOLLERR from eventpoll.h ACPI: resource: Add another DMI match for the TongFang GMxXGxx drm/crtc: fix uninitialized variable use ARM: sun9i: smp: fix return code check of of_property_match_string ida: Fix crash in ida_free when the bitmap is empty Input: xpad - add Razer Wolverine V2 support ARC: fix spare error s390/scm: fix virtual vs physical address confusion Input: i8042 - add nomux quirk for Acer P459-G2-M Input: atkbd - skip ATKBD_CMD_GETID in translated mode reset: hisilicon: hi6220: fix Wvoid-pointer-to-enum-cast warning ring-buffer: Do not record in NMI if the arch does not support cmpxchg in NMI tracing: Add size check when printing trace_marker output tracing: Have large events show up as '[LINE TOO BIG]' instead of nothing neighbour: Don't let neigh_forced_gc() disable preemption for long drm/crtc: Fix uninit-value bug in drm_mode_setcrtc jbd2: correct the printing of write_flags in jbd2_write_superblock() clk: rockchip: rk3128: Fix HCLK_OTG gate register drm/exynos: fix a wrong error checking drm/exynos: fix a potential error pointer dereference nvme: introduce helper function to get ctrl state ASoC: da7219: Support low DC impedance headset net/tg3: fix race condition in tg3_reset_task() nouveau/tu102: flush all pdbs on vmm flush ASoC: rt5650: add mutex to avoid the jack detection failure ASoC: cs43130: Fix incorrect frame delay configuration ASoC: cs43130: Fix the position of const qualifier ASoC: Intel: Skylake: mem leak in skl register function ASoC: nau8822: Fix incorrect type in assignment and cast to restricted __be16 ASoC: Intel: Skylake: Fix mem leak in few functions ALSA: hda - Fix speaker and headset mic pin config for CHUWI CoreBook XPro pinctrl: lochnagar: Don't build on MIPS f2fs: explicitly null-terminate the xattr list Revert "ipv6: make ip6_rt_gc_expire an atomic_t" Revert "ipv6: remove max_size check inline with ipv4" Linux 5.4.267 ASoC: meson: codec-glue: fix pcm format cast warning ipv6: remove max_size check inline with ipv4 ipv6: make ip6_rt_gc_expire an atomic_t net/dst: use a smaller percpu_counter batch for dst entries accounting PCI: Disable ATS for specific Intel IPU E2000 devices PCI: Extract ATS disabling to a helper function netfilter: nf_tables: Reject tables of unsupported family net: tls, update curr on splice as well ath10k: Get rid of "per_ce_irq" hw param ath10k: Keep track of which interrupts fired, don't poll them ath10k: Add interrupt summary based CE processing ath10k: Wait until copy complete is actually done before completing mmc: sdhci-sprd: Fix eMMC init failure after hw reset mmc: core: Cancel delayed work before releasing host mmc: rpmb: fixes pause retune on all RPMB partitions. mm: fix unmap_mapping_range high bits shift bug i2c: core: Fix atomic xfer check for non-preempt config firewire: ohci: suppress unexpected system reboot in AMD Ryzen machines and ASM108x/VT630x PCIe cards mm/memory-failure: check the mapcount of the precise page net: Implement missing SO_TIMESTAMPING_NEW cmsg support bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters() asix: Add check for usbnet_get_endpoints net/qla3xxx: fix potential memleak in ql_alloc_buffer_queues net/qla3xxx: switch from 'pci_' to 'dma_' API i40e: Restore VF MSI-X state during PCI reset ASoC: meson: g12a-tohdmitx: Fix event generation for S/PDIF mux ASoC: meson: g12a-tohdmitx: Validate written enum values ASoC: meson: g12a: extract codec-to-codec utils i40e: fix use-after-free in i40e_aqc_add_filters() net: Save and restore msg_namelen in sock_sendmsg net: bcmgenet: Fix FCS generation for fragmented skbuffs ARM: sun9i: smp: Fix array-index-out-of-bounds read in sunxi_mc_smp_init net-timestamp: extend SOF_TIMESTAMPING_OPT_ID to HW timestamps can: raw: add support for SO_MARK can: raw: add support for SO_TXTIME/SCM_TXTIME net: sched: em_text: fix possible memory leak in em_text_destroy() i40e: Fix filter input checks to prevent config with invalid values nfc: llcp_core: Hold a ref to llcp_local->dev when holding a ref to llcp_local ANDROID: db845c: Enable device tree overlay support Linux 5.4.266 block: Don't invalidate pagecache for invalid falloc modes ring-buffer: Fix wake ups when buffer_percent is set to 100 smb: client: fix OOB in smbCalcSize() usb: fotg210-hcd: delete an incorrect bounds test x86/alternatives: Sync core before enabling interrupts net: rfkill: gpio: set GPIO direction net: 9p: avoid freeing uninit memory in p9pdu_vreadf Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent USB: serial: option: add Quectel RM500Q R13 firmware support USB: serial: option: add Foxconn T99W265 with new baseline USB: serial: option: add Quectel EG912Y module support USB: serial: ftdi_sio: update Actisense PIDs constant names wifi: cfg80211: fix certs build to not depend on file order wifi: cfg80211: Add my certificate iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table scsi: bnx2fc: Fix skb double free in bnx2fc_rcv() Input: ipaq-micro-keys - add error handling for devm_kmemdup iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw interconnect: Treat xlate() returning NULL node as an error btrfs: do not allow non subvolume root targets for snapshot smb: client: fix NULL deref in asn1_ber_decoder() ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10 pinctrl: at91-pio4: use dedicated lock class for IRQ i2c: aspeed: Handle the coalesced stop conditions with the start conditions. afs: Fix overwriting of result of DNS query net: check dev->gso_max_size in gso_features_check() net: warn if gso_type isn't set for a GSO SKB afs: Fix dynamic root lookup DNS check afs: Fix the dynamic root's d_delete to always delete unused dentries net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() net/rose: fix races in rose_kill_by_device() ethernet: atheros: fix a memleak in atl1e_setup_ring_resources net: sched: ife: fix potential use-after-free net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors net/mlx5: Fix fw tracer first block check net/mlx5: improve some comments Revert "net/mlx5e: fix double free of encap_header" wifi: mac80211: mesh_plink: fix matches_local logic s390/vx: fix save/restore of fpu kernel context reset: Fix crash when freeing non-existent optional resets ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5 ANDROID: GKI: fix crc issue in include/net/addrconf.h Revert "cred: switch to using atomic_long_t" Linux 5.4.265 powerpc/ftrace: Fix stack teardown in ftrace_no_trace powerpc/ftrace: Create a dummy stackframe to fix stack unwind mmc: block: Be sure to wait while busy in CQE error recovery ring-buffer: Fix memory leak of free page team: Fix use-after-free when an option instance allocation fails arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS soundwire: stream: fix NULL pointer dereference for multi_link perf: Fix perf_event_validate_size() lockdep splat HID: hid-asus: add const to read-only outgoing usb buffer net: usb: qmi_wwan: claim interface 4 for ZTE MF290 asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation HID: multitouch: Add quirk for HONOR GLO-GXXX touchpad HID: hid-asus: reset the backlight brightness level on resume HID: add ALWAYS_POLL quirk for Apple kb platform/x86: intel_telemetry: Fix kernel doc descriptions bcache: avoid NULL checking to c->root in run_cache_set() bcache: add code comments for bch_btree_node_get() and __bch_btree_node_alloc() bcache: avoid oversize memory allocation by small stripe_size blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!" usb: aqc111: check packet for fixup for true limit Revert "PCI: acpiphp: Reassign resources on bridge if necessary" ALSA: hda/hdmi: add force-connect quirks for ASUSTeK Z170 variants cred: switch to using atomic_long_t appletalk: Fix Use-After-Free in atalk_ioctl net: stmmac: Handle disabled MDIO busses from devicetree net: stmmac: use dev_err_probe() for reporting mdio bus registration failure vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space() sign-file: Fix incorrect return values check net: Remove acked SYN flag from packet in the transmit queue correctly qed: Fix a potential use-after-free in qed_cxt_tables_alloc net/rose: Fix Use-After-Free in rose_ioctl atm: Fix Use-After-Free in do_vcc_ioctl atm: solos-pci: Fix potential deadlock on &tx_queue_lock atm: solos-pci: Fix potential deadlock on &cli_queue_lock qca_spi: Fix reset behavior qca_debug: Fix ethtool -G iface tx behavior qca_debug: Prevent crash on TX ring changes net: ipv6: support reporting otherwise unknown prefix flags in RTM_NEWPREFIX afs: Fix refcount underflow from error handling race Revert "psample: Require 'CAP_NET_ADMIN' when joining "packets" group" Revert "mmc: core: add helpers mmc_regulator_enable/disable_vqmmc" Revert "mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled" Revert "genetlink: add CAP_NET_ADMIN test for multicast bind" Revert "drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group" Revert "perf/core: Add a new read format to get a number of lost samples" Revert "perf: Fix perf_event_validate_size()" Revert "hrtimers: Push pending hrtimers away from outgoing CPU earlier" Linux 5.4.264 devcoredump: Send uevent once devcd is ready devcoredump : Serialize devcd_del work smb: client: fix potential NULL deref in parse_dfs_referrals() cifs: Fix non-availability of dedup breaking generic/304 Revert "btrfs: add dmesg output for first mount and last unmount of a filesystem" tools headers UAPI: Sync linux/perf_event.h with the kernel sources drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group psample: Require 'CAP_NET_ADMIN' when joining "packets" group genetlink: add CAP_NET_ADMIN test for multicast bind netlink: don't call ->netlink_bind with table lock held io_uring/af_unix: disable sending io_uring over sockets nilfs2: fix missing error check for sb_set_blocksize call KVM: s390/mm: Properly reset no-dat x86/CPU/AMD: Check vendor in the AMD microcode callback serial: 8250_omap: Add earlycon support for the AM654 UART controller serial: sc16is7xx: address RX timeout interrupt errata ARM: PL011: Fix DMA support usb: typec: class: fix typec_altmode_put_partner to put plugs parport: Add support for Brainboxes IX/UC/PX parallel cards usb: gadget: f_hid: fix report descriptor allocation mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled mmc: core: add helpers mmc_regulator_enable/disable_vqmmc gpiolib: sysfs: Fix error handling on failed export perf: Fix perf_event_validate_size() perf/core: Add a new read format to get a number of lost samples arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names arm64: dts: mediatek: mt7622: fix memory node warning check packet: Move reference count in packet_sock to atomic_long_t tracing: Fix a possible race when disabling buffered events tracing: Fix incomplete locking when disabling buffered events tracing: Always update snapshot buffer size nilfs2: prevent WARNING in nilfs_sufile_set_segment_usage() ALSA: pcm: fix out-of-bounds in snd_pcm_state_names ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt ARM: dts: imx: make gpt node name generic ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init scsi: be2iscsi: Fix a memleak in beiscsi_init_wrb_handle() tracing: Fix a warning when allocating buffered events fails ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate hwmon: (acpi_power_meter) Fix 4.29 MW bug RDMA/bnxt_re: Correct module description string bpf: sockmap, updating the sg structure should also update curr tcp: do not accept ACK of bytes we never sent netfilter: xt_owner: Fix for unsafe access of sk->sk_socket net: hns: fix fake link up on xge port ipv4: ip_gre: Avoid skb_pull() failure in ipgre_xmit() arcnet: restoring support for multiple Sohard Arcnet cards net: arcnet: com20020 fix error handling net: arcnet: Fix RESET flag handling hv_netvsc: rndis_filter needs to select NLS ipv6: fix potential NULL deref in fib6_add() of: dynamic: Fix of_reconfig_get_state_change() return value documentation of: Add missing 'Return' section in kerneldoc comments of: Fix kerneldoc output formatting of: base: Fix some formatting issues and provide missing descriptions of/irq: Make of_msi_map_rid() PCI bus agnostic of/irq: make of_msi_map_get_device_domain() bus agnostic of/iommu: Make of_map_rid() PCI agnostic ACPI/IORT: Make iort_msi_map_rid() PCI agnostic ACPI/IORT: Make iort_get_device_domain IRQ domain agnostic of: base: Add of_get_cpu_state_node() to get idle states for a CPU node drm/amdgpu: correct chunk_ptr to a pointer to chunk. kconfig: fix memory leak from range properties tg3: Increment tx_dropped in tg3_tso_bug() tg3: Move the [rt]x_dropped counters to tg3_napi netfilter: ipset: fix race condition between swap/destroy and kernel side add/del/test hrtimers: Push pending hrtimers away from outgoing CPU earlier Revert "HID: core: store the unique system identifier in hid_device" Revert "HID: fix HID device resource race between HID core and debugging support" Linux 5.4.263 mmc: block: Retry commands in CQE error recovery mmc: core: convert comma to semicolon mmc: cqhci: Fix task clearing in CQE error recovery mmc: cqhci: Warn of halt or task clear failure mmc: cqhci: Increase recovery halt timeout cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily cpufreq: imx6q: don't warn for disabling a non-existing frequency scsi: qla2xxx: Fix system crash due to bad pointer access scsi: qla2xxx: Use scsi_cmd_to_rq() instead of scsi_cmnd.request scsi: core: Introduce the scsi_cmd_to_rq() function scsi: qla2xxx: Simplify the code for aborting SCSI commands ima: detect changes to the backing overlay file ovl: skip overlayfs superblocks at global sync ima: annotate iint mutex to avoid lockdep false positive warnings fbdev: stifb: Make the STI next font pointer a 32-bit signed offset mtd: cfi_cmdset_0001: Byte swap OTP info mtd: cfi_cmdset_0001: Support the absence of protection registers s390/cmma: fix detection of DAT pages s390/mm: fix phys vs virt confusion in mark_kernel_pXd() functions family smb3: fix touch -h of symlink net: ravb: Start TX queues after HW initialization succeeded net: ravb: Use pm_runtime_resume_and_get() ravb: Fix races between ravb_tx_timeout_work() and net related ops net: stmmac: xgmac: Disable FPE MMC interrupts ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet Input: xpad - add HyperX Clutch Gladiate Support btrfs: make error messages more clear when getting a chunk map btrfs: send: ensure send_fd is writable btrfs: fix off-by-one when checking chunk map includes logical address btrfs: add dmesg output for first mount and last unmount of a filesystem powerpc: Don't clobber f0/vs0 during fp|altivec register save bcache: revert replacing IS_ERR_OR_NULL with IS_ERR dm verity: don't perform FEC for failed readahead IO dm-verity: align struct dm_verity_fec_io properly ALSA: hda/realtek: Add supported ALC257 for ChromeOS ALSA: hda/realtek: Headset Mic VREF to 100% ALSA: hda: Disable power-save on KONTRON SinglePC mmc: block: Do not lose cache flush during CQE error recovery firewire: core: fix possible memory leak in create_units() pinctrl: avoid reload of p state in list iteration io_uring: fix off-by one bvec index USB: dwc3: qcom: fix wakeup after probe deferral USB: dwc3: qcom: fix resource leaks on probe deferral usb: dwc3: set the dma max_seg_size USB: dwc2: write HCINT with INTMASK applied USB: serial: option: don't claim interface 4 for ZTE MF290 USB: serial: option: fix FM101R-GL defines USB: serial: option: add Fibocom L7xx modules bcache: prevent potential division by zero error bcache: check return value from btree_node_alloc_replacement() dm-delay: fix a race between delay_presuspend and delay_bio hv_netvsc: Mark VF as slave before exposing it to user-mode hv_netvsc: Fix race of register_netdevice_notifier and VF register USB: serial: option: add Luat Air72*U series products s390/dasd: protect device queue against concurrent access bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce() ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CVA KVM: arm64: limit PMU version to PMUv3 for ARMv8.1 arm64: cpufeature: Extract capped perfmon fields ext4: make sure allocate pending entry not fail ext4: fix slab-use-after-free in ext4_es_insert_extent() ext4: using nofail preallocation in ext4_es_insert_extent() ext4: using nofail preallocation in ext4_es_insert_delayed_block() ext4: using nofail preallocation in ext4_es_remove_extent() ext4: use pre-allocated es in __es_remove_extent() ext4: use pre-allocated es in __es_insert_extent() ext4: factor out __es_alloc_extent() and __es_free_extent() ext4: add a new helper to check if es must be kept MIPS: KVM: Fix a build warning about variable set but not used nvmet: nul-terminate the NQNs passed in the connect command nvmet: remove unnecessary ctrl parameter afs: Fix file locking on R/O volumes to operate in local mode afs: Return ENOENT if no cell DNS record can be found net: axienet: Fix check for partial TX checksum amd-xgbe: propagate the correct speed and duplex status amd-xgbe: handle the corner-case during tx completion amd-xgbe: handle corner-case during sfp hotplug arm/xen: fix xen_vcpu_info allocation alignment net: usb: ax88179_178a: fix failed operations during ax88179_reset ipv4: Correct/silence an endian warning in __ip_do_redirect HID: fix HID device resource race between HID core and debugging support HID: core: store the unique system identifier in hid_device drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full ata: pata_isapnp: Add missing error check for devm_ioport_map() drm/panel: simple: Fix Innolux G101ICE-L01 timings drm/panel: simple: Fix Innolux G101ICE-L01 bus flags afs: Make error on cell lookup failure consistent with OpenAFS PCI: keystone: Drop __init from ks_pcie_add_pcie_{ep,port}() RDMA/irdma: Prevent zero-length STAG registration driver core: Release all resources during unbind before updating device links ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override Revert "tracing: Have trace_event_file have ref counters" Linux 5.4.262 netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush (for 5.4) netfilter: nf_tables: disable toggling dormant table state more than once netfilter: nf_tables: fix table flag updates netfilter: nftables: update table flags from the commit phase netfilter: nf_tables: double hook unregistration in netns path netfilter: nf_tables: unregister flowtable hooks on netns exit netfilter: nf_tables: fix memleak when more than 255 elements expired netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction netfilter: nf_tables: defer gc run if previous batch is still pending netfilter: nf_tables: use correct lock to protect gc_list netfilter: nf_tables: GC transaction race with abort path netfilter: nf_tables: GC transaction race with netns dismantle netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path netfilter: nf_tables: remove busy mark and gc batch API netfilter: nft_set_hash: mark set element as dead when deleting from packet path netfilter: nf_tables: adapt set backend to use GC transaction API netfilter: nf_tables: GC transaction API to avoid race with control plane netfilter: nf_tables: don't skip expired elements during walk netfilter: nft_set_rbtree: fix overlap expiration walk netfilter: nft_set_rbtree: fix null deref on element insertion netfilter: nft_set_rbtree: Switch to node list walk for overlap detection netfilter: nf_tables: drop map element references from preparation phase netfilter: nftables: rename set element data activation/deactivation functions netfilter: nf_tables: pass context to nft_set_destroy() tracing: Have trace_event_file have ref counters drm/amdgpu: fix error handling in amdgpu_bo_list_get() ext4: remove gdb backup copy for meta bg in setup_new_flex_group_blocks ext4: correct the start block of counting reserved clusters ext4: correct return value of ext4_convert_meta_bg ext4: correct offset of gdb backup in non meta_bg group to update_backups ext4: apply umask if ACL support is disabled Revert "net: r8169: Disable multicast filter for RTL8168H and RTL8107E" nfsd: fix file memleak on client_opens_release media: venus: hfi: add checks to handle capabilities from firmware media: venus: hfi: fix the check to handle session buffer requirement media: venus: hfi_parser: Add check to keep the number of codecs within range media: sharp: fix sharp encoding media: lirc: drop trailing space from scancode transmit i2c: i801: fix potential race in i801_block_transaction_byte_by_byte net: dsa: lan9303: consequently nested-lock physical MDIO Revert ncsi: Propagate carrier gain/loss events to the NCSI controller Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device tables bluetooth: Add device 13d3:3571 to device tables bluetooth: Add device 0bda:887b to device tables Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559 Bluetooth: btusb: add Realtek 8822CE to usb_device_id table Bluetooth: btusb: Add flag to define wideband speech capability tty: serial: meson: fix hard LOCKUP on crtscts mode serial: meson: Use platform_get_irq() to get the interrupt tty: serial: meson: retrieve port FIFO size from DT serial: meson: remove redundant initialization of variable id ALSA: hda/realtek - Enable internal speaker of ASUS K6500ZC ALSA: info: Fix potential deadlock at disconnection parisc/pgtable: Do not drop upper 5 address bits of physical address parisc: Prevent booting 64-bit kernels on PA1.x machines i3c: master: cdns: Fix reading status register mm/cma: use nth_page() in place of direct struct page manipulation dmaengine: stm32-mdma: correct desc prep when channel running mcb: fix error handling for different scenarios when parsing i2c: core: Run atomic i2c xfer when !preemptible kernel/reboot: emergency_restart: Set correct system_state quota: explicitly forbid quota files from being encrypted jbd2: fix potential data lost in recovering journal raced with synchronizing fs bdev btrfs: don't arbitrarily slow down delalloc if we're committing PM: hibernate: Clean up sync_read handling in snapshot_write_next() PM: hibernate: Use __get_safe_page() rather than touching the list mmc: vub300: fix an error code clk: qcom: ipq8074: drop the CLK_SET_RATE_PARENT flag from PLL clocks parisc/pdc: Add width field to struct pdc_model PCI: keystone: Don't discard .probe() callback PCI: keystone: Don't discard .remove() callback genirq/generic_chip: Make irq_remove_generic_chip() irqdomain aware mmc: meson-gx: Remove setting of CMD_CFG_ERROR ACPI: resource: Do IRQ override on TongFang GMxXGxx PCI/sysfs: Protect driver's D3cold preference from user space hvc/xen: fix error path in xen_hvc_init() to always register frontend driver audit: don't WARN_ON_ONCE(!current->mm) in audit_exe_compare() audit: don't take task_lock() in audit_exe_compare() code path KVM: x86: Ignore MSR_AMD64_TW_CFG access KVM: x86: hyper-v: Don't auto-enable stimer on write from user-space x86/cpu/hygon: Fix the CPU topology evaluation for real scsi: megaraid_sas: Increase register read retry rount from 3 to 30 for selected registers bpf: Fix precision tracking for BPF_ALU | BPF_TO_BE | BPF_END randstruct: Fix gcc-plugin performance mode to stay in group media: venus: hfi: add checks to perform sanity on queue pointers cifs: spnego: add ';' in HOST_KEY_LEN tools/power/turbostat: Fix a knl bug macvlan: Don't propagate promisc change to lower dev in passthru net/mlx5e: Check return value of snprintf writing to fw_version buffer for representors net/mlx5_core: Clean driver version and name net/mlx5e: fix double free of encap_header net: stmmac: fix rx budget limit check net: stmmac: Rework stmmac_rx() netfilter: nf_conntrack_bridge: initialize err to 0 net: ethernet: cortina: Fix MTU max setting net: ethernet: cortina: Handle large frames net: ethernet: cortina: Fix max RX frame define bonding: stop the device in bond_setup_by_slave() ptp: annotate data-race around q->head and q->tail xen/events: fix delayed eoi list handling ppp: limit MRU to 64K tipc: Fix kernel-infoleak due to uninitialized TLV value net: hns3: fix variable may not initialized problem in hns3_init_mac_addr() tty: Fix uninit-value access in ppp_sync_receive() ipvlan: add ipvlan_route_v6_outbound() helper NFSv4.1: fix SP4_MACH_CRED protection for pnfs IO wifi: iwlwifi: Use FW rate for non-data frames pwm: Fix double shift bug ASoC: ti: omap-mcbsp: Fix runtime PM underflow warnings kgdb: Flush console before entering kgdb on panic drm/amd/display: Avoid NULL dereference of timing generator media: cobalt: Use FIELD_GET() to extract Link Width gfs2: ignore negated quota changes media: vivid: avoid integer overflow media: gspca: cpia1: shift-out-of-bounds in set_flicker i2c: sun6i-p2wi: Prevent potential division by zero usb: gadget: f_ncm: Always set current gadget in ncm_bind() tty: vcc: Add check for kstrdup() in vcc_probe() HID: Add quirk for Dell Pro Wireless Keyboard and Mouse KM5221W scsi: libfc: Fix potential NULL pointer dereference in fc_lport_ptp_setup() atm: iphase: Do PCI error checks on own line PCI: tegra194: Use FIELD_GET()/FIELD_PREP() with Link Width fields ALSA: hda: Fix possible null-ptr-deref when assigning a stream ARM: 9320/1: fix stack depot IRQ stack filter jfs: fix array-index-out-of-bounds in diAlloc jfs: fix array-index-out-of-bounds in dbFindLeaf fs/jfs: Add validity check for db_maxag and db_agpref fs/jfs: Add check for negative db_l2nbperpage RDMA/hfi1: Use FIELD_GET() to extract Link Width crypto: pcrypt - Fix hungtask for PADATA_RESET selftests/efivarfs: create-read: fix a resource leak drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is NULL drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and Tonga drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7 drm/komeda: drop all currently held locks if deadlock happens platform/x86: thinkpad_acpi: Add battery quirk for Thinkpad X120e Bluetooth: Fix double free in hci_conn_cleanup wifi: ath10k: Don't touch the CE interrupt registers after power up net: annotate data-races around sk->sk_dst_pending_confirm net: annotate data-races around sk->sk_tx_queue_mapping wifi: ath10k: fix clang-specific fortify warning wifi: ath9k: fix clang-specific fortify warnings wifi: mac80211: don't return unset power in ieee80211_get_tx_power() wifi: mac80211_hwsim: fix clang-specific fortify warning x86/mm: Drop the 4 MB restriction on minimal NUMA node memory size clocksource/drivers/timer-atmel-tcb: Fix initialization on SAM9 hardware clocksource/drivers/timer-imx-gpt: Fix potential memory leak perf/core: Bail out early if the request AUX area is out of bound locking/ww_mutex/test: Fix potential workqueue corruption Revert "inet: shrink struct flowi_common" Revert "ipvlan: properly track tx_errors" ANDROID: fix up rpmsg_device ABI break ANDROID: fix up platform_device ABI break Linux 5.4.261 btrfs: use u64 for buffer sizes in the tree search ioctls Revert "mmc: core: Capture correct oemid-bits for eMMC cards" fbdev: fsl-diu-fb: mark wr_reg_wa() static fbdev: imsttfb: fix a resource leak in probe fbdev: imsttfb: Fix error path of imsttfb_probe() spi: spi-zynq-qspi: add spi-mem to driver kconfig dependencies drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses netfilter: nft_redir: use `struct nf_nat_range2` throughout and deduplicate eval call-backs netfilter: xt_recent: fix (increase) ipv6 literal buffer length r8169: respect userspace disabling IFF_MULTICAST tg3: power down device only on SYSTEM_POWER_OFF net/smc: fix dangling sock under state SMC_APPFINCLOSEWAIT net: stmmac: xgmac: Enable support for multiple Flexible PPS outputs Fix termination state for idr_for_each_entry_ul() net: r8169: Disable multicast filter for RTL8168H and RTL8107E dccp/tcp: Call security_inet_conn_request() after setting IPv6 addresses. dccp: Call security_inet_conn_request() after setting IPv4 addresses. inet: shrink struct flowi_common tipc: Change nla_policy for bearer-related names to NLA_NUL_STRING llc: verify mac len before reading mac header Input: synaptics-rmi4 - fix use after free in rmi_unregister_function() pwm: brcmstb: Utilize appropriate clock APIs in suspend/resume pwm: sti: Reduce number of allocations and drop usage of chip_data pwm: sti: Avoid conditional gotos regmap: prevent noinc writes from clobbering cache media: dvb-usb-v2: af9035: fix missing unlock media: s3c-camif: Avoid inappropriate kfree() media: bttv: fix use after free error due to btv->timeout timer pcmcia: ds: fix possible name leak in error path in pcmcia_device_add() pcmcia: ds: fix refcount leak in pcmcia_device_add() pcmcia: cs: fix possible hung task and memory leak pccardd() rtc: pcf85363: fix wrong mask/val parameters in regmap_update_bits call i3c: Fix potential refcount leak in i3c_master_register_new_i3c_devs powerpc/pseries: fix potential memory leak in init_cpu_associativity() powerpc/imc-pmu: Use the correct spinlock initializer. powerpc/xive: Fix endian conversion size modpost: fix tee MODULE_DEVICE_TABLE built on big-endian host f2fs: fix to initialize map.m_pblk in f2fs_precache_extents() dmaengine: pxa_dma: Remove an erroneous BUG_ON() in pxad_free_desc() USB: usbip: fix stub_dev hub disconnect tools: iio: iio_generic_buffer ensure alignment tools: iio: iio_generic_buffer: Fix some integer type and calculation tools: iio: privatize globals and functions in iio_generic_buffer.c file misc: st_core: Do not call kfree_skb() under spin_lock_irqsave() dmaengine: ti: edma: handle irq_of_parse_and_map() errors usb: dwc2: fix possible NULL pointer dereference caused by driver concurrency tty: tty_jobctrl: fix pid memleak in disassociate_ctty() leds: trigger: ledtrig-cpu:: Fix 'output may be truncated' issue for 'cpu' ledtrig-cpu: Limit to 8 CPUs leds: pwm: Don't disable the PWM when the LED should be off leds: pwm: convert to atomic PWM API leds: pwm: simplify if condition mfd: dln2: Fix double put in dln2_probe ASoC: ams-delta.c: use component after check ASoC: Intel: Skylake: Fix mem leak when parsing UUIDs fails sh: bios: Revive earlyprintk support RDMA/hfi1: Workaround truncation compilation error scsi: ufs: core: Leave space for '\0' in utf8 desc string ext4: move 'ix' sanity check to corrent position ARM: 9321/1: memset: cast the constant byte to unsigned char hid: cp2112: Fix duplicate workqueue initialization HID: cp2112: Use irqchip template crypto: caam/jr - fix Chacha20 + Poly1305 self test failure crypto: caam/qi2 - fix Chacha20 + Poly1305 self test failure nd_btt: Make BTT lanes preemptible sched/rt: Provide migrate_disable/enable() inlines libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value hwrng: geode - fix accessing registers clk: scmi: Free scmi_clk allocated when the clocks with invalid info are skipped firmware: ti_sci: Mark driver as non removable firmware: ti_sci: Replace HTTP links with HTTPS ones soc: qcom: llcc: Handle a second device without data corruption soc: qcom: Rename llcc-slice to llcc-qcom soc: qcom: llcc cleanup to get rid of sdm845 specific driver file ARM: dts: qcom: mdm9615: populate vsdcc fixed regulator arm64: dts: qcom: sdm845-mtp: fix WiFi configuration drm/rockchip: cdn-dp: Fix some error handling paths in cdn_dp_probe() drm/radeon: possible buffer overflow drm/rockchip: vop: Fix call to crtc reset helper drm/rockchip: vop: Fix reset of state in duplicate state crtc funcs hwmon: (coretemp) Fix potentially truncated sysfs attribute name platform/x86: wmi: Fix opening of char device platform/x86: wmi: remove unnecessary initializations platform/x86: wmi: Fix probe failure when failing to register WMI devices clk: mediatek: clk-mt2701: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt7629: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt7629-eth: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt6797: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt6779: Add check for mtk_alloc_clk_data clk: npcm7xx: Fix incorrect kfree clk: keystone: pll: fix a couple NULL vs IS_ERR() checks clk: imx: Select MXC_CLK for CLK_IMX8QXP clk: qcom: gcc-sm8150: Fix gcc_sdcc2_apps_clk_src clk: qcom: gcc-sm8150: use ARRAY_SIZE instead of specifying num_parents clk: qcom: clk-rcg2: Fix clock rate overflow for high parent frequencies regmap: debugfs: Fix a erroneous check after snprintf() ipvlan: properly track tx_errors net: add DEV_STATS_READ() helper ipv6: avoid atomic fragment on GSO packets ACPI: sysfs: Fix create_pnp_modalias() and create_of_modalias() tcp: fix cookie_init_timestamp() overflows tcp: Remove one extra ktime_get_ns() from cookie_init_timestamp chtls: fix tp->rcv_tstamp initialization r8169: fix rare issue with broken rx after link-down on RTL8125 r8169: use tp_to_dev instead of open code thermal: core: prevent potential string overflow can: dev: can_restart(): fix race condition between controller restart and netif_carrier_on() can: dev: can_restart(): don't crash kernel if carrier is OK wifi: rtlwifi: fix EDCA limit set by BT coexistence tcp_metrics: do not create an entry from tcp_init_metrics() tcp_metrics: properly set tp->snd_ssthresh in tcp_init_metrics() tcp_metrics: add missing barriers on delete wifi: mt76: mt7603: rework/fix rx pse hang check wifi: rtw88: debug: Fix the NULL vs IS_ERR() bug for debugfs_create_file() tcp: call tcp_try_undo_recovery when an RTOd TFO SYNACK is ACKed i40e: fix potential memory leaks in i40e_remove() genirq/matrix: Exclude managed interrupts in irq_matrix_allocated() vfs: fix readahead(2) on block devices Linux 5.4.260 tty: 8250: Add support for Intashield IS-100 tty: 8250: Add support for Brainboxes UP cards tty: 8250: Add support for additional Brainboxes UC cards tty: 8250: Remove UC-257 and UC-431 usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device Revert "ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver" nvmet-tcp: Fix a possible UAF in queue intialization setup nvmet-tcp: move send/recv error handling in the send/recv methods instead of call-sites remove the sx8 block driver ata: ahci: fix enum constants for gcc-13 net: chelsio: cxgb4: add an error code check in t4_load_phy_fw platform/mellanox: mlxbf-tmfifo: Fix a warning message platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e scsi: mpt3sas: Fix in error path fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() ASoC: rt5650: fix the wrong result of key button netfilter: nfnetlink_log: silence bogus compiler warning spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe irqchip/stm32-exti: add missing DT IRQ flag translation Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table x86: Fix .brk attribute in linker script rpmsg: Fix possible refcount leak in rpmsg_register_device_override() rpmsg: glink: Release driver_override rpmsg: Fix calling device_lock() on non-initialized device rpmsg: Fix kfree() of static memory on setting driver_override rpmsg: Constify local variable in field store macro driver: platform: Add helper for safer setting of driver_override ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow ext4: avoid overlapping preallocations due to overflow ext4: add two helper functions extent_logical_end() and pa_logical_end() x86/mm: Fix RESERVE_BRK() for older binutils x86/mm: Simplify RESERVE_BRK() nfsd: lock_rename() needs both directories to live on the same fs f2fs: fix to do sanity check on inode type during garbage collection smbdirect: missing rc checks while waiting for rdma events kobject: Fix slab-out-of-bounds in fill_kobj_path() arm64: fix a concurrency issue in emulation_proc_handler() drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper() x86/i8259: Skip probing when ACPI/MADT advertises PCAT compatibility i40e: Fix wrong check for I40E_TXR_FLAGS_WB_ON_ITR clk: Sanitize possible_parent_show to Handle Return Value of of_clk_get_parent_name perf/core: Fix potential NULL deref nvmem: imx: correct nregs for i.MX6UL nvmem: imx: correct nregs for i.MX6SLL nvmem: imx: correct nregs for i.MX6ULL i2c: aspeed: Fix i2c bus hang in slave read i2c: stm32f7: Fix PEC handling in case of SMBUS transfers i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node() i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node() i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() iio: exynos-adc: request second interupt only when touchscreen mode is used gtp: fix fragmentation needed check with gso gtp: uapi: fix GTPA_MAX tcp: fix wrong RTO timeout when received SACK reneging r8152: Cancel hw_phy_work if we have an error in probe r8152: Run the unload routine if we have errors during probe r8152: Increase USB control msg timeout to 5000ms as per spec net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show() igc: Fix ambiguity in the ethtool advertising neighbour: fix various data-races igb: Fix potential memory leak in igb_add_ethtool_nfc_entry treewide: Spelling fix in comment r8169: fix the KCSAN reported data race in rtl_rx while reading desc->opts1 r8169: fix the KCSAN reported data-race in rtl_tx while reading TxDescArray[entry].opts1 virtio-mmio: fix memory leak of vm_dev virtio_balloon: Fix endless deflation and inflation on arm64 mcb-lpc: Reallocate memory region to avoid memory overlapping mcb: Return actual parsed size when reading chameleon table selftests/ftrace: Add new test case which checks non unique symbol mtd: rawnand: marvell: Ensure program page operations are successful Conflicts: drivers/clk/qcom/gcc-sm8150.c drivers/net/ethernet/stmicro/stmmac/stmmac_main.c drivers/soc/qcom/Kconfig drivers/soc/qcom/Makefile drivers/soc/qcom/llcc-qcom.c drivers/usb/dwc3/core.c drivers/usb/gadget/function/f_ncm.c include/linux/soc/qcom/llcc-qcom.h include/net/netfilter/nf_tables.h mm/memory-failure.c net/netfilter/nf_tables_api.c net/netfilter/nft_set_hash.c net/netfilter/nft_set_rbtree.c Notes: * Dropped the following upstream commits:813fddd| AOSP soc: qcom: Rename llcc-slice to llcc-qcom0770107| AOSP soc: qcom: llcc cleanup to get rid of sdm845 specific driver file Change-Id: Id31af0559be59eccc0cd242940754292baed09f7
This commit is contained in:
Bruno Martins
commit
2f84185dd7
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
VERSION = 5
|
VERSION = 5
|
||||||
PATCHLEVEL = 4
|
PATCHLEVEL = 4
|
||||||
SUBLEVEL = 259
|
SUBLEVEL = 268
|
||||||
EXTRAVERSION =
|
EXTRAVERSION =
|
||||||
NAME = Kleptomaniac Octopus
|
NAME = Kleptomaniac Octopus
|
||||||
|
|
||||||
|
|||||||
@ -61,7 +61,7 @@ struct rt_sigframe {
|
|||||||
unsigned int sigret_magic;
|
unsigned int sigret_magic;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
|
static int save_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
#ifndef CONFIG_ISA_ARCOMPACT
|
#ifndef CONFIG_ISA_ARCOMPACT
|
||||||
@ -74,12 +74,12 @@ static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
|
|||||||
#else
|
#else
|
||||||
v2abi.r58 = v2abi.r59 = 0;
|
v2abi.r58 = v2abi.r59 = 0;
|
||||||
#endif
|
#endif
|
||||||
err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));
|
err = __copy_to_user(&mctx->v2abi, (void const *)&v2abi, sizeof(v2abi));
|
||||||
#endif
|
#endif
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int restore_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
|
static int restore_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
#ifndef CONFIG_ISA_ARCOMPACT
|
#ifndef CONFIG_ISA_ARCOMPACT
|
||||||
|
|||||||
@ -381,7 +381,7 @@
|
|||||||
&mmc2 {
|
&mmc2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
vmmc-supply = <&wl12xx_vmmc>;
|
vmmc-supply = <&wl12xx_vmmc>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
|
|||||||
@ -22,7 +22,6 @@
|
|||||||
pinctrl-0 = <&emmc_pins>;
|
pinctrl-0 = <&emmc_pins>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
non-removable;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
&am33xx_pinmux {
|
&am33xx_pinmux {
|
||||||
|
|||||||
@ -75,6 +75,7 @@
|
|||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
non-removable;
|
non-removable;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
|
ti,needs-special-hs-handling;
|
||||||
keep-power-in-suspend;
|
keep-power-in-suspend;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
|
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
|
||||||
|
|||||||
@ -389,6 +389,7 @@
|
|||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
non-removable;
|
non-removable;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
|
ti,needs-special-hs-handling;
|
||||||
keep-power-in-suspend;
|
keep-power-in-suspend;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
|
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
|
||||||
|
|||||||
@ -75,6 +75,7 @@
|
|||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
non-removable;
|
non-removable;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
|
ti,needs-special-hs-handling;
|
||||||
keep-power-in-suspend;
|
keep-power-in-suspend;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
|
pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
|
||||||
|
|||||||
@ -782,7 +782,8 @@
|
|||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&mmc3_pins &wlan_pins>;
|
pinctrl-0 = <&mmc3_pins &wlan_pins>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
|
ti,needs-special-hs-handling;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
keep-power-in-suspend;
|
keep-power-in-suspend;
|
||||||
|
|
||||||
|
|||||||
@ -700,7 +700,7 @@
|
|||||||
&mmc2 {
|
&mmc2 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
vmmc-supply = <&wl12xx_vmmc>;
|
vmmc-supply = <&wl12xx_vmmc>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
keep-power-in-suspend;
|
keep-power-in-suspend;
|
||||||
|
|||||||
@ -361,7 +361,7 @@
|
|||||||
pinctrl-0 = <&emmc_pins>;
|
pinctrl-0 = <&emmc_pins>;
|
||||||
vmmc-supply = <&vmmcsd_fixed>;
|
vmmc-supply = <&vmmcsd_fixed>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -176,7 +176,7 @@
|
|||||||
vmmc-supply = <&vmmcsd_fixed>;
|
vmmc-supply = <&vmmcsd_fixed>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
pinctrl-0 = <&mmc1_pins_default>;
|
pinctrl-0 = <&mmc1_pins_default>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -473,7 +473,7 @@
|
|||||||
vmmc-supply = <&vmmcsd_fixed>;
|
vmmc-supply = <&vmmcsd_fixed>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
pinctrl-0 = <&mmc2_pins_default>;
|
pinctrl-0 = <&mmc2_pins_default>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -341,7 +341,7 @@
|
|||||||
pinctrl-0 = <&emmc_pins>;
|
pinctrl-0 = <&emmc_pins>;
|
||||||
vmmc-supply = <&ldo3_reg>;
|
vmmc-supply = <&ldo3_reg>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
};
|
};
|
||||||
|
|
||||||
&mmc3 {
|
&mmc3 {
|
||||||
@ -351,7 +351,7 @@
|
|||||||
pinctrl-0 = <&wireless_pins>;
|
pinctrl-0 = <&wireless_pins>;
|
||||||
vmmmc-supply = <&v3v3c_reg>;
|
vmmmc-supply = <&v3v3c_reg>;
|
||||||
bus-width = <4>;
|
bus-width = <4>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
dmas = <&edma_xbar 12 0 1
|
dmas = <&edma_xbar 12 0 1
|
||||||
&edma_xbar 13 0 2>;
|
&edma_xbar 13 0 2>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
|
|||||||
@ -69,7 +69,7 @@
|
|||||||
pinctrl-0 = <&emmc_pins>;
|
pinctrl-0 = <&emmc_pins>;
|
||||||
vmmc-supply = <&vmmc_reg>;
|
vmmc-supply = <&vmmc_reg>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1333,8 +1333,10 @@
|
|||||||
ranges = <0x0 0x60000 0x1000>;
|
ranges = <0x0 0x60000 0x1000>;
|
||||||
|
|
||||||
mmc1: mmc@0 {
|
mmc1: mmc@0 {
|
||||||
compatible = "ti,am335-sdhci";
|
compatible = "ti,omap4-hsmmc";
|
||||||
|
ti,dual-volt;
|
||||||
ti,needs-special-reset;
|
ti,needs-special-reset;
|
||||||
|
ti,needs-special-hs-handling;
|
||||||
dmas = <&edma 24 0>, <&edma 25 0>;
|
dmas = <&edma 24 0>, <&edma 25 0>;
|
||||||
dma-names = "tx", "rx";
|
dma-names = "tx", "rx";
|
||||||
interrupts = <64>;
|
interrupts = <64>;
|
||||||
@ -1824,7 +1826,7 @@
|
|||||||
ranges = <0x0 0xd8000 0x1000>;
|
ranges = <0x0 0xd8000 0x1000>;
|
||||||
|
|
||||||
mmc2: mmc@0 {
|
mmc2: mmc@0 {
|
||||||
compatible = "ti,am335-sdhci";
|
compatible = "ti,omap4-hsmmc";
|
||||||
ti,needs-special-reset;
|
ti,needs-special-reset;
|
||||||
dmas = <&edma 2 0
|
dmas = <&edma 2 0
|
||||||
&edma 3 0>;
|
&edma 3 0>;
|
||||||
|
|||||||
@ -259,11 +259,10 @@
|
|||||||
ranges = <0x0 0x47810000 0x1000>;
|
ranges = <0x0 0x47810000 0x1000>;
|
||||||
|
|
||||||
mmc3: mmc@0 {
|
mmc3: mmc@0 {
|
||||||
compatible = "ti,am335-sdhci";
|
compatible = "ti,omap4-hsmmc";
|
||||||
ti,needs-special-reset;
|
ti,needs-special-reset;
|
||||||
interrupts = <29>;
|
interrupts = <29>;
|
||||||
reg = <0x0 0x1000>;
|
reg = <0x0 0x1000>;
|
||||||
status = "disabled";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -250,11 +250,10 @@
|
|||||||
ranges = <0x0 0x47810000 0x1000>;
|
ranges = <0x0 0x47810000 0x1000>;
|
||||||
|
|
||||||
mmc3: mmc@0 {
|
mmc3: mmc@0 {
|
||||||
compatible = "ti,am437-sdhci";
|
compatible = "ti,omap4-hsmmc";
|
||||||
ti,needs-special-reset;
|
ti,needs-special-reset;
|
||||||
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
reg = <0x0 0x1000>;
|
reg = <0x0 0x1000>;
|
||||||
status = "disabled";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -291,7 +291,7 @@
|
|||||||
pinctrl-0 = <&emmc_pins>;
|
pinctrl-0 = <&emmc_pins>;
|
||||||
vmmc-supply = <&vmmc_3v3>;
|
vmmc-supply = <&vmmc_3v3>;
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
};
|
};
|
||||||
|
|
||||||
&spi0 {
|
&spi0 {
|
||||||
|
|||||||
@ -872,7 +872,7 @@
|
|||||||
pinctrl-names = "default", "sleep";
|
pinctrl-names = "default", "sleep";
|
||||||
pinctrl-0 = <&emmc_pins_default>;
|
pinctrl-0 = <&emmc_pins_default>;
|
||||||
pinctrl-1 = <&emmc_pins_sleep>;
|
pinctrl-1 = <&emmc_pins_sleep>;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
};
|
};
|
||||||
|
|
||||||
&mmc3 {
|
&mmc3 {
|
||||||
@ -889,7 +889,7 @@
|
|||||||
pinctrl-1 = <&mmc3_pins_sleep>;
|
pinctrl-1 = <&mmc3_pins_sleep>;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
keep-power-in-suspend;
|
keep-power-in-suspend;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|||||||
@ -1104,8 +1104,9 @@
|
|||||||
ranges = <0x0 0x60000 0x1000>;
|
ranges = <0x0 0x60000 0x1000>;
|
||||||
|
|
||||||
mmc1: mmc@0 {
|
mmc1: mmc@0 {
|
||||||
compatible = "ti,am437-sdhci";
|
compatible = "ti,omap4-hsmmc";
|
||||||
reg = <0x0 0x1000>;
|
reg = <0x0 0x1000>;
|
||||||
|
ti,dual-volt;
|
||||||
ti,needs-special-reset;
|
ti,needs-special-reset;
|
||||||
dmas = <&edma 24 0>,
|
dmas = <&edma 24 0>,
|
||||||
<&edma 25 0>;
|
<&edma 25 0>;
|
||||||
@ -1640,7 +1641,7 @@
|
|||||||
ranges = <0x0 0xd8000 0x1000>;
|
ranges = <0x0 0xd8000 0x1000>;
|
||||||
|
|
||||||
mmc2: mmc@0 {
|
mmc2: mmc@0 {
|
||||||
compatible = "ti,am437-sdhci";
|
compatible = "ti,omap4-hsmmc";
|
||||||
reg = <0x0 0x1000>;
|
reg = <0x0 0x1000>;
|
||||||
ti,needs-special-reset;
|
ti,needs-special-reset;
|
||||||
dmas = <&edma 2 0>,
|
dmas = <&edma 2 0>,
|
||||||
|
|||||||
@ -694,7 +694,7 @@
|
|||||||
pinctrl-1 = <&mmc3_pins_sleep>;
|
pinctrl-1 = <&mmc3_pins_sleep>;
|
||||||
cap-power-off-card;
|
cap-power-off-card;
|
||||||
keep-power-in-suspend;
|
keep-power-in-suspend;
|
||||||
non-removable;
|
ti,non-removable;
|
||||||
|
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|||||||
@ -578,7 +578,7 @@
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt: gpt@2098000 {
|
gpt: timer@2098000 {
|
||||||
compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
|
compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
|
||||||
reg = <0x02098000 0x4000>;
|
reg = <0x02098000 0x4000>;
|
||||||
interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|||||||
@ -386,7 +386,7 @@
|
|||||||
clock-names = "ipg", "per";
|
clock-names = "ipg", "per";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt: gpt@2098000 {
|
gpt: timer@2098000 {
|
||||||
compatible = "fsl,imx6sl-gpt";
|
compatible = "fsl,imx6sl-gpt";
|
||||||
reg = <0x02098000 0x4000>;
|
reg = <0x02098000 0x4000>;
|
||||||
interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|||||||
@ -475,7 +475,7 @@
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt: gpt@2098000 {
|
gpt: timer@2098000 {
|
||||||
compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
|
compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
|
||||||
reg = <0x02098000 0x4000>;
|
reg = <0x02098000 0x4000>;
|
||||||
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|||||||
@ -433,7 +433,7 @@
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt1: gpt@2098000 {
|
gpt1: timer@2098000 {
|
||||||
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
|
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
|
||||||
reg = <0x02098000 0x4000>;
|
reg = <0x02098000 0x4000>;
|
||||||
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
@ -707,7 +707,7 @@
|
|||||||
reg = <0x020e4000 0x4000>;
|
reg = <0x020e4000 0x4000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt2: gpt@20e8000 {
|
gpt2: timer@20e8000 {
|
||||||
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
|
compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";
|
||||||
reg = <0x020e8000 0x4000>;
|
reg = <0x020e8000 0x4000>;
|
||||||
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
|||||||
@ -446,8 +446,8 @@
|
|||||||
fsl,input-sel = <&iomuxc>;
|
fsl,input-sel = <&iomuxc>;
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt1: gpt@302d0000 {
|
gpt1: timer@302d0000 {
|
||||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||||
reg = <0x302d0000 0x10000>;
|
reg = <0x302d0000 0x10000>;
|
||||||
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
|
clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
|
||||||
@ -455,8 +455,8 @@
|
|||||||
clock-names = "ipg", "per";
|
clock-names = "ipg", "per";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt2: gpt@302e0000 {
|
gpt2: timer@302e0000 {
|
||||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||||
reg = <0x302e0000 0x10000>;
|
reg = <0x302e0000 0x10000>;
|
||||||
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
|
clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
|
||||||
@ -465,8 +465,8 @@
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt3: gpt@302f0000 {
|
gpt3: timer@302f0000 {
|
||||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||||
reg = <0x302f0000 0x10000>;
|
reg = <0x302f0000 0x10000>;
|
||||||
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
|
clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
|
||||||
@ -475,8 +475,8 @@
|
|||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
gpt4: gpt@30300000 {
|
gpt4: timer@30300000 {
|
||||||
compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
|
compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
|
||||||
reg = <0x30300000 0x10000>;
|
reg = <0x30300000 0x10000>;
|
||||||
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&clks IMX7D_GPT4_ROOT_CLK>,
|
clocks = <&clks IMX7D_GPT4_ROOT_CLK>,
|
||||||
|
|||||||
@ -759,7 +759,7 @@
|
|||||||
|
|
||||||
xoadc: xoadc@197 {
|
xoadc: xoadc@197 {
|
||||||
compatible = "qcom,pm8921-adc";
|
compatible = "qcom,pm8921-adc";
|
||||||
reg = <197>;
|
reg = <0x197>;
|
||||||
interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
|
interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
|
||||||
#address-cells = <2>;
|
#address-cells = <2>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|||||||
@ -82,14 +82,12 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
regulators {
|
vsdcc_fixed: vsdcc-regulator {
|
||||||
vsdcc_fixed: vsdcc-regulator {
|
compatible = "regulator-fixed";
|
||||||
compatible = "regulator-fixed";
|
regulator-name = "SDCC Power";
|
||||||
regulator-name = "SDCC Power";
|
regulator-min-microvolt = <2700000>;
|
||||||
regulator-min-microvolt = <2700000>;
|
regulator-max-microvolt = <2700000>;
|
||||||
regulator-max-microvolt = <2700000>;
|
regulator-always-on;
|
||||||
regulator-always-on;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
soc: soc {
|
soc: soc {
|
||||||
|
|||||||
@ -10,10 +10,6 @@
|
|||||||
|
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
|
|
||||||
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
|
||||||
#define __exception_irq_entry __irq_entry
|
#define __exception_irq_entry __irq_entry
|
||||||
#else
|
|
||||||
#define __exception_irq_entry
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __ASM_ARM_EXCEPTION_H */
|
#endif /* __ASM_ARM_EXCEPTION_H */
|
||||||
|
|||||||
@ -16,6 +16,7 @@
|
|||||||
ENTRY(mmioset)
|
ENTRY(mmioset)
|
||||||
ENTRY(memset)
|
ENTRY(memset)
|
||||||
UNWIND( .fnstart )
|
UNWIND( .fnstart )
|
||||||
|
and r1, r1, #255 @ cast to unsigned char
|
||||||
ands r3, r0, #3 @ 1 unaligned?
|
ands r3, r0, #3 @ 1 unaligned?
|
||||||
mov ip, r0 @ preserve r0 as return value
|
mov ip, r0 @ preserve r0 as return value
|
||||||
bne 6f @ 1
|
bne 6f @ 1
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
menuconfig ARCH_DAVINCI
|
menuconfig ARCH_DAVINCI
|
||||||
bool "TI DaVinci"
|
bool "TI DaVinci"
|
||||||
depends on ARCH_MULTI_V5
|
depends on ARCH_MULTI_V5
|
||||||
|
select CPU_ARM926T
|
||||||
select DAVINCI_TIMER
|
select DAVINCI_TIMER
|
||||||
select ZONE_DMA
|
select ZONE_DMA
|
||||||
select PM_GENERIC_DOMAINS if PM
|
select PM_GENERIC_DOMAINS if PM
|
||||||
|
|||||||
@ -502,6 +502,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
|
|||||||
|
|
||||||
name = devm_kasprintf(&pdev->dev,
|
name = devm_kasprintf(&pdev->dev,
|
||||||
GFP_KERNEL, "mmdc%d", ret);
|
GFP_KERNEL, "mmdc%d", ret);
|
||||||
|
if (!name) {
|
||||||
|
ret = -ENOMEM;
|
||||||
|
goto pmu_release_id;
|
||||||
|
}
|
||||||
|
|
||||||
pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
|
pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
|
||||||
pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
|
pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
|
||||||
@ -524,9 +528,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
|
|||||||
|
|
||||||
pmu_register_err:
|
pmu_register_err:
|
||||||
pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret);
|
pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret);
|
||||||
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
|
|
||||||
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
|
cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
|
||||||
hrtimer_cancel(&pmu_mmdc->hrtimer);
|
hrtimer_cancel(&pmu_mmdc->hrtimer);
|
||||||
|
pmu_release_id:
|
||||||
|
ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
|
||||||
pmu_free:
|
pmu_free:
|
||||||
kfree(pmu_mmdc);
|
kfree(pmu_mmdc);
|
||||||
return ret;
|
return ret;
|
||||||
|
|||||||
@ -797,10 +797,15 @@ void __init omap_soc_device_init(void)
|
|||||||
|
|
||||||
soc_dev_attr->machine = soc_name;
|
soc_dev_attr->machine = soc_name;
|
||||||
soc_dev_attr->family = omap_get_family();
|
soc_dev_attr->family = omap_get_family();
|
||||||
|
if (!soc_dev_attr->family) {
|
||||||
|
kfree(soc_dev_attr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
soc_dev_attr->revision = soc_rev;
|
soc_dev_attr->revision = soc_rev;
|
||||||
|
|
||||||
soc_dev = soc_device_register(soc_dev_attr);
|
soc_dev = soc_device_register(soc_dev_attr);
|
||||||
if (IS_ERR(soc_dev)) {
|
if (IS_ERR(soc_dev)) {
|
||||||
|
kfree(soc_dev_attr->family);
|
||||||
kfree(soc_dev_attr);
|
kfree(soc_dev_attr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -804,16 +804,16 @@ static int __init sunxi_mc_smp_init(void)
|
|||||||
for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) {
|
for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) {
|
||||||
ret = of_property_match_string(node, "enable-method",
|
ret = of_property_match_string(node, "enable-method",
|
||||||
sunxi_mc_smp_data[i].enable_method);
|
sunxi_mc_smp_data[i].enable_method);
|
||||||
if (!ret)
|
if (ret >= 0)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
is_a83t = sunxi_mc_smp_data[i].is_a83t;
|
|
||||||
|
|
||||||
of_node_put(node);
|
of_node_put(node);
|
||||||
if (ret)
|
if (ret < 0)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
is_a83t = sunxi_mc_smp_data[i].is_a83t;
|
||||||
|
|
||||||
if (!sunxi_mc_smp_cpu_table_init())
|
if (!sunxi_mc_smp_cpu_table_init())
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
|||||||
@ -362,7 +362,8 @@ static int __init xen_guest_init(void)
|
|||||||
* for secondary CPUs as they are brought up.
|
* for secondary CPUs as they are brought up.
|
||||||
* For uniformity we use VCPUOP_register_vcpu_info even on cpu0.
|
* For uniformity we use VCPUOP_register_vcpu_info even on cpu0.
|
||||||
*/
|
*/
|
||||||
xen_vcpu_info = alloc_percpu(struct vcpu_info);
|
xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),
|
||||||
|
1 << fls(sizeof(struct vcpu_info) - 1));
|
||||||
if (xen_vcpu_info == NULL)
|
if (xen_vcpu_info == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|||||||
@ -127,7 +127,7 @@
|
|||||||
compatible = "microchip,mcp7940x";
|
compatible = "microchip,mcp7940x";
|
||||||
reg = <0x6f>;
|
reg = <0x6f>;
|
||||||
interrupt-parent = <&gpiosb>;
|
interrupt-parent = <&gpiosb>;
|
||||||
interrupts = <5 0>; /* GPIO2_5 */
|
interrupts = <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO2_5 */
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -69,7 +69,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
memory {
|
memory@40000000 {
|
||||||
reg = <0 0x40000000 0 0x40000000>;
|
reg = <0 0x40000000 0 0x40000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -55,7 +55,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
memory {
|
memory@40000000 {
|
||||||
reg = <0 0x40000000 0 0x20000000>;
|
reg = <0 0x40000000 0 0x20000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -43,7 +43,7 @@
|
|||||||
id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;
|
id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb_p1_vbus: regulator@0 {
|
usb_p1_vbus: regulator-usb-p1 {
|
||||||
compatible = "regulator-fixed";
|
compatible = "regulator-fixed";
|
||||||
regulator-name = "usb_vbus";
|
regulator-name = "usb_vbus";
|
||||||
regulator-min-microvolt = <5000000>;
|
regulator-min-microvolt = <5000000>;
|
||||||
@ -52,7 +52,7 @@
|
|||||||
enable-active-high;
|
enable-active-high;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb_p0_vbus: regulator@1 {
|
usb_p0_vbus: regulator-usb-p0 {
|
||||||
compatible = "regulator-fixed";
|
compatible = "regulator-fixed";
|
||||||
regulator-name = "vbus";
|
regulator-name = "vbus";
|
||||||
regulator-min-microvolt = <5000000>;
|
regulator-min-microvolt = <5000000>;
|
||||||
|
|||||||
@ -53,8 +53,8 @@
|
|||||||
user4 {
|
user4 {
|
||||||
label = "green:user4";
|
label = "green:user4";
|
||||||
gpios = <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>;
|
gpios = <&pm8998_gpio 13 GPIO_ACTIVE_HIGH>;
|
||||||
linux,default-trigger = "panic-indicator";
|
|
||||||
default-state = "off";
|
default-state = "off";
|
||||||
|
panic-indicator;
|
||||||
};
|
};
|
||||||
|
|
||||||
wlan {
|
wlan {
|
||||||
|
|||||||
@ -468,6 +468,8 @@
|
|||||||
vdd-1.8-xo-supply = <&vreg_l7a_1p8>;
|
vdd-1.8-xo-supply = <&vreg_l7a_1p8>;
|
||||||
vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
|
vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
|
||||||
vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
|
vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
|
||||||
|
|
||||||
|
qcom,snoc-host-cap-8bit-quirk;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* PINCTRL - additions to nodes defined in sdm845.dtsi */
|
/* PINCTRL - additions to nodes defined in sdm845.dtsi */
|
||||||
|
|||||||
@ -55,7 +55,7 @@ Required Properties:
|
|||||||
corresponds to a range of host irqs.
|
corresponds to a range of host irqs.
|
||||||
|
|
||||||
For more details on TISCI IRQ resource management refer:
|
For more details on TISCI IRQ resource management refer:
|
||||||
http://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
|
https://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
--------
|
--------
|
||||||
|
|||||||
@ -449,6 +449,29 @@ cpuid_feature_extract_unsigned_field(u64 features, int field)
|
|||||||
return cpuid_feature_extract_unsigned_field_width(features, field, 4);
|
return cpuid_feature_extract_unsigned_field_width(features, field, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fields that identify the version of the Performance Monitors Extension do
|
||||||
|
* not follow the standard ID scheme. See ARM DDI 0487E.a page D13-2825,
|
||||||
|
* "Alternative ID scheme used for the Performance Monitors Extension version".
|
||||||
|
*/
|
||||||
|
static inline u64 __attribute_const__
|
||||||
|
cpuid_feature_cap_perfmon_field(u64 features, int field, u64 cap)
|
||||||
|
{
|
||||||
|
u64 val = cpuid_feature_extract_unsigned_field(features, field);
|
||||||
|
u64 mask = GENMASK_ULL(field + 3, field);
|
||||||
|
|
||||||
|
/* Treat IMPLEMENTATION DEFINED functionality as unimplemented */
|
||||||
|
if (val == 0xf)
|
||||||
|
val = 0;
|
||||||
|
|
||||||
|
if (val > cap) {
|
||||||
|
features &= ~mask;
|
||||||
|
features |= (cap << field) & mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
return features;
|
||||||
|
}
|
||||||
|
|
||||||
static inline u64 arm64_ftr_mask(const struct arm64_ftr_bits *ftrp)
|
static inline u64 arm64_ftr_mask(const struct arm64_ftr_bits *ftrp)
|
||||||
{
|
{
|
||||||
return (u64)GENMASK(ftrp->shift + ftrp->width - 1, ftrp->shift);
|
return (u64)GENMASK(ftrp->shift + ftrp->width - 1, ftrp->shift);
|
||||||
|
|||||||
@ -694,6 +694,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
|
|||||||
if (pte_hw_dirty(pte))
|
if (pte_hw_dirty(pte))
|
||||||
pte = pte_mkdirty(pte);
|
pte = pte_mkdirty(pte);
|
||||||
pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
|
pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
|
||||||
|
/*
|
||||||
|
* If we end up clearing hw dirtiness for a sw-dirty PTE, set hardware
|
||||||
|
* dirtiness again.
|
||||||
|
*/
|
||||||
|
if (pte_sw_dirty(pte))
|
||||||
|
pte = pte_mkdirty(pte);
|
||||||
return pte;
|
return pte;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -735,6 +735,12 @@
|
|||||||
#define ID_AA64DFR0_TRACEVER_SHIFT 4
|
#define ID_AA64DFR0_TRACEVER_SHIFT 4
|
||||||
#define ID_AA64DFR0_DEBUGVER_SHIFT 0
|
#define ID_AA64DFR0_DEBUGVER_SHIFT 0
|
||||||
|
|
||||||
|
#define ID_AA64DFR0_PMUVER_8_1 0x4
|
||||||
|
|
||||||
|
#define ID_DFR0_PERFMON_SHIFT 24
|
||||||
|
|
||||||
|
#define ID_DFR0_PERFMON_8_1 0x4
|
||||||
|
|
||||||
#define ID_ISAR5_RDM_SHIFT 24
|
#define ID_ISAR5_RDM_SHIFT 24
|
||||||
#define ID_ISAR5_CRC32_SHIFT 16
|
#define ID_ISAR5_CRC32_SHIFT 16
|
||||||
#define ID_ISAR5_SHA2_SHIFT 12
|
#define ID_ISAR5_SHA2_SHIFT 12
|
||||||
|
|||||||
@ -208,10 +208,12 @@ static int emulation_proc_handler(struct ctl_table *table, int write,
|
|||||||
loff_t *ppos)
|
loff_t *ppos)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
struct insn_emulation *insn = container_of(table->data, struct insn_emulation, current_mode);
|
struct insn_emulation *insn;
|
||||||
enum insn_emulation_mode prev_mode = insn->current_mode;
|
enum insn_emulation_mode prev_mode;
|
||||||
|
|
||||||
mutex_lock(&insn_emulation_mutex);
|
mutex_lock(&insn_emulation_mutex);
|
||||||
|
insn = container_of(table->data, struct insn_emulation, current_mode);
|
||||||
|
prev_mode = insn->current_mode;
|
||||||
ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
|
ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
|
||||||
|
|
||||||
if (ret || !write || prev_mode == insn->current_mode)
|
if (ret || !write || prev_mode == insn->current_mode)
|
||||||
|
|||||||
@ -1105,6 +1105,16 @@ static u64 read_id_reg(const struct kvm_vcpu *vcpu,
|
|||||||
(0xfUL << ID_AA64ISAR1_API_SHIFT) |
|
(0xfUL << ID_AA64ISAR1_API_SHIFT) |
|
||||||
(0xfUL << ID_AA64ISAR1_GPA_SHIFT) |
|
(0xfUL << ID_AA64ISAR1_GPA_SHIFT) |
|
||||||
(0xfUL << ID_AA64ISAR1_GPI_SHIFT));
|
(0xfUL << ID_AA64ISAR1_GPI_SHIFT));
|
||||||
|
} else if (id == SYS_ID_AA64DFR0_EL1) {
|
||||||
|
/* Limit guests to PMUv3 for ARMv8.1 */
|
||||||
|
val = cpuid_feature_cap_perfmon_field(val,
|
||||||
|
ID_AA64DFR0_PMUVER_SHIFT,
|
||||||
|
ID_AA64DFR0_PMUVER_8_1);
|
||||||
|
} else if (id == SYS_ID_DFR0_EL1) {
|
||||||
|
/* Limit guests to PMUv3 for ARMv8.1 */
|
||||||
|
val = cpuid_feature_cap_perfmon_field(val,
|
||||||
|
ID_DFR0_PERFMON_SHIFT,
|
||||||
|
ID_DFR0_PERFMON_8_1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
|
|||||||
@ -847,7 +847,7 @@ int __init db1200_dev_setup(void)
|
|||||||
i2c_register_board_info(0, db1200_i2c_devs,
|
i2c_register_board_info(0, db1200_i2c_devs,
|
||||||
ARRAY_SIZE(db1200_i2c_devs));
|
ARRAY_SIZE(db1200_i2c_devs));
|
||||||
spi_register_board_info(db1200_spi_devs,
|
spi_register_board_info(db1200_spi_devs,
|
||||||
ARRAY_SIZE(db1200_i2c_devs));
|
ARRAY_SIZE(db1200_spi_devs));
|
||||||
|
|
||||||
/* SWITCHES: S6.8 I2C/SPI selector (OFF=I2C ON=SPI)
|
/* SWITCHES: S6.8 I2C/SPI selector (OFF=I2C ON=SPI)
|
||||||
* S6.7 AC97/I2S selector (OFF=AC97 ON=I2S)
|
* S6.7 AC97/I2S selector (OFF=AC97 ON=I2S)
|
||||||
|
|||||||
@ -588,7 +588,7 @@ int __init db1550_dev_setup(void)
|
|||||||
i2c_register_board_info(0, db1550_i2c_devs,
|
i2c_register_board_info(0, db1550_i2c_devs,
|
||||||
ARRAY_SIZE(db1550_i2c_devs));
|
ARRAY_SIZE(db1550_i2c_devs));
|
||||||
spi_register_board_info(db1550_spi_devs,
|
spi_register_board_info(db1550_spi_devs,
|
||||||
ARRAY_SIZE(db1550_i2c_devs));
|
ARRAY_SIZE(db1550_spi_devs));
|
||||||
|
|
||||||
c = clk_get(NULL, "psc0_intclk");
|
c = clk_get(NULL, "psc0_intclk");
|
||||||
if (!IS_ERR(c)) {
|
if (!IS_ERR(c)) {
|
||||||
|
|||||||
@ -362,11 +362,11 @@ static void __init bootmem_init(void)
|
|||||||
panic("Incorrect memory mapping !!!");
|
panic("Incorrect memory mapping !!!");
|
||||||
|
|
||||||
if (max_pfn > PFN_DOWN(HIGHMEM_START)) {
|
if (max_pfn > PFN_DOWN(HIGHMEM_START)) {
|
||||||
|
max_low_pfn = PFN_DOWN(HIGHMEM_START);
|
||||||
#ifdef CONFIG_HIGHMEM
|
#ifdef CONFIG_HIGHMEM
|
||||||
highstart_pfn = PFN_DOWN(HIGHMEM_START);
|
highstart_pfn = max_low_pfn;
|
||||||
highend_pfn = max_pfn;
|
highend_pfn = max_pfn;
|
||||||
#else
|
#else
|
||||||
max_low_pfn = PFN_DOWN(HIGHMEM_START);
|
|
||||||
max_pfn = max_low_pfn;
|
max_pfn = max_low_pfn;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
@ -693,7 +693,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa,
|
|||||||
gfn_t gfn = gpa >> PAGE_SHIFT;
|
gfn_t gfn = gpa >> PAGE_SHIFT;
|
||||||
int srcu_idx, err;
|
int srcu_idx, err;
|
||||||
kvm_pfn_t pfn;
|
kvm_pfn_t pfn;
|
||||||
pte_t *ptep, entry, old_pte;
|
pte_t *ptep, entry;
|
||||||
bool writeable;
|
bool writeable;
|
||||||
unsigned long prot_bits;
|
unsigned long prot_bits;
|
||||||
unsigned long mmu_seq;
|
unsigned long mmu_seq;
|
||||||
@ -766,7 +766,6 @@ retry:
|
|||||||
entry = pfn_pte(pfn, __pgprot(prot_bits));
|
entry = pfn_pte(pfn, __pgprot(prot_bits));
|
||||||
|
|
||||||
/* Write the PTE */
|
/* Write the PTE */
|
||||||
old_pte = *ptep;
|
|
||||||
set_pte(ptep, entry);
|
set_pte(ptep, entry);
|
||||||
|
|
||||||
err = 0;
|
err = 0;
|
||||||
|
|||||||
@ -465,6 +465,7 @@ struct pdc_model { /* for PDC_MODEL */
|
|||||||
unsigned long arch_rev;
|
unsigned long arch_rev;
|
||||||
unsigned long pot_key;
|
unsigned long pot_key;
|
||||||
unsigned long curr_key;
|
unsigned long curr_key;
|
||||||
|
unsigned long width; /* default of PSW_W bit (1=enabled) */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pdc_cache_cf { /* for PDC_CACHE (I/D-caches) */
|
struct pdc_cache_cf { /* for PDC_CACHE (I/D-caches) */
|
||||||
|
|||||||
@ -511,13 +511,13 @@
|
|||||||
* to a CPU TLB 4k PFN (4k => 12 bits to shift) */
|
* to a CPU TLB 4k PFN (4k => 12 bits to shift) */
|
||||||
#define PAGE_ADD_SHIFT (PAGE_SHIFT-12)
|
#define PAGE_ADD_SHIFT (PAGE_SHIFT-12)
|
||||||
#define PAGE_ADD_HUGE_SHIFT (REAL_HPAGE_SHIFT-12)
|
#define PAGE_ADD_HUGE_SHIFT (REAL_HPAGE_SHIFT-12)
|
||||||
|
#define PFN_START_BIT (63-ASM_PFN_PTE_SHIFT+(63-58)-PAGE_ADD_SHIFT)
|
||||||
|
|
||||||
/* Drop prot bits and convert to page addr for iitlbt and idtlbt */
|
/* Drop prot bits and convert to page addr for iitlbt and idtlbt */
|
||||||
.macro convert_for_tlb_insert20 pte,tmp
|
.macro convert_for_tlb_insert20 pte,tmp
|
||||||
#ifdef CONFIG_HUGETLB_PAGE
|
#ifdef CONFIG_HUGETLB_PAGE
|
||||||
copy \pte,\tmp
|
copy \pte,\tmp
|
||||||
extrd,u \tmp,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\
|
extrd,u \tmp,PFN_START_BIT,PFN_START_BIT+1,\pte
|
||||||
64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte
|
|
||||||
|
|
||||||
depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\
|
depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\
|
||||||
(63-58)+PAGE_ADD_SHIFT,\pte
|
(63-58)+PAGE_ADD_SHIFT,\pte
|
||||||
@ -525,8 +525,7 @@
|
|||||||
depdi _HUGE_PAGE_SIZE_ENCODING_DEFAULT,63,\
|
depdi _HUGE_PAGE_SIZE_ENCODING_DEFAULT,63,\
|
||||||
(63-58)+PAGE_ADD_HUGE_SHIFT,\pte
|
(63-58)+PAGE_ADD_HUGE_SHIFT,\pte
|
||||||
#else /* Huge pages disabled */
|
#else /* Huge pages disabled */
|
||||||
extrd,u \pte,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\
|
extrd,u \pte,PFN_START_BIT,PFN_START_BIT+1,\pte
|
||||||
64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte
|
|
||||||
depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\
|
depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\
|
||||||
(63-58)+PAGE_ADD_SHIFT,\pte
|
(63-58)+PAGE_ADD_SHIFT,\pte
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -69,9 +69,8 @@ $bss_loop:
|
|||||||
stw,ma %arg2,4(%r1)
|
stw,ma %arg2,4(%r1)
|
||||||
stw,ma %arg3,4(%r1)
|
stw,ma %arg3,4(%r1)
|
||||||
|
|
||||||
#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20)
|
#if defined(CONFIG_PA20)
|
||||||
/* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU
|
/* check for 64-bit capable CPU as required by current kernel */
|
||||||
* and halt kernel if we detect a PA1.x CPU. */
|
|
||||||
ldi 32,%r10
|
ldi 32,%r10
|
||||||
mtctl %r10,%cr11
|
mtctl %r10,%cr11
|
||||||
.level 2.0
|
.level 2.0
|
||||||
|
|||||||
@ -24,6 +24,15 @@
|
|||||||
#include <asm/feature-fixups.h>
|
#include <asm/feature-fixups.h>
|
||||||
|
|
||||||
#ifdef CONFIG_VSX
|
#ifdef CONFIG_VSX
|
||||||
|
#define __REST_1FPVSR(n,c,base) \
|
||||||
|
BEGIN_FTR_SECTION \
|
||||||
|
b 2f; \
|
||||||
|
END_FTR_SECTION_IFSET(CPU_FTR_VSX); \
|
||||||
|
REST_FPR(n,base); \
|
||||||
|
b 3f; \
|
||||||
|
2: REST_VSR(n,c,base); \
|
||||||
|
3:
|
||||||
|
|
||||||
#define __REST_32FPVSRS(n,c,base) \
|
#define __REST_32FPVSRS(n,c,base) \
|
||||||
BEGIN_FTR_SECTION \
|
BEGIN_FTR_SECTION \
|
||||||
b 2f; \
|
b 2f; \
|
||||||
@ -42,9 +51,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX); \
|
|||||||
2: SAVE_32VSRS(n,c,base); \
|
2: SAVE_32VSRS(n,c,base); \
|
||||||
3:
|
3:
|
||||||
#else
|
#else
|
||||||
|
#define __REST_1FPVSR(n,b,base) REST_FPR(n, base)
|
||||||
#define __REST_32FPVSRS(n,b,base) REST_32FPRS(n, base)
|
#define __REST_32FPVSRS(n,b,base) REST_32FPRS(n, base)
|
||||||
#define __SAVE_32FPVSRS(n,b,base) SAVE_32FPRS(n, base)
|
#define __SAVE_32FPVSRS(n,b,base) SAVE_32FPRS(n, base)
|
||||||
#endif
|
#endif
|
||||||
|
#define REST_1FPVSR(n,c,base) __REST_1FPVSR(n,__REG_##c,__REG_##base)
|
||||||
#define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base)
|
#define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base)
|
||||||
#define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
|
#define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
|
||||||
|
|
||||||
@ -68,6 +79,7 @@ _GLOBAL(store_fp_state)
|
|||||||
SAVE_32FPVSRS(0, R4, R3)
|
SAVE_32FPVSRS(0, R4, R3)
|
||||||
mffs fr0
|
mffs fr0
|
||||||
stfd fr0,FPSTATE_FPSCR(r3)
|
stfd fr0,FPSTATE_FPSCR(r3)
|
||||||
|
REST_1FPVSR(0, R4, R3)
|
||||||
blr
|
blr
|
||||||
EXPORT_SYMBOL(store_fp_state)
|
EXPORT_SYMBOL(store_fp_state)
|
||||||
|
|
||||||
@ -132,6 +144,7 @@ _GLOBAL(save_fpu)
|
|||||||
2: SAVE_32FPVSRS(0, R4, R6)
|
2: SAVE_32FPVSRS(0, R4, R6)
|
||||||
mffs fr0
|
mffs fr0
|
||||||
stfd fr0,FPSTATE_FPSCR(r6)
|
stfd fr0,FPSTATE_FPSCR(r6)
|
||||||
|
REST_1FPVSR(0, R4, R6)
|
||||||
blr
|
blr
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -36,6 +36,9 @@ _GLOBAL(ftrace_regs_caller)
|
|||||||
/* Save the original return address in A's stack frame */
|
/* Save the original return address in A's stack frame */
|
||||||
std r0,LRSAVE(r1)
|
std r0,LRSAVE(r1)
|
||||||
|
|
||||||
|
/* Create a minimal stack frame for representing B */
|
||||||
|
stdu r1, -STACK_FRAME_MIN_SIZE(r1)
|
||||||
|
|
||||||
/* Create our stack frame + pt_regs */
|
/* Create our stack frame + pt_regs */
|
||||||
stdu r1,-SWITCH_FRAME_SIZE(r1)
|
stdu r1,-SWITCH_FRAME_SIZE(r1)
|
||||||
|
|
||||||
@ -52,7 +55,7 @@ _GLOBAL(ftrace_regs_caller)
|
|||||||
SAVE_10GPRS(22, r1)
|
SAVE_10GPRS(22, r1)
|
||||||
|
|
||||||
/* Save previous stack pointer (r1) */
|
/* Save previous stack pointer (r1) */
|
||||||
addi r8, r1, SWITCH_FRAME_SIZE
|
addi r8, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
|
||||||
std r8, GPR1(r1)
|
std r8, GPR1(r1)
|
||||||
|
|
||||||
/* Load special regs for save below */
|
/* Load special regs for save below */
|
||||||
@ -65,6 +68,8 @@ _GLOBAL(ftrace_regs_caller)
|
|||||||
mflr r7
|
mflr r7
|
||||||
/* Save it as pt_regs->nip */
|
/* Save it as pt_regs->nip */
|
||||||
std r7, _NIP(r1)
|
std r7, _NIP(r1)
|
||||||
|
/* Also save it in B's stackframe header for proper unwind */
|
||||||
|
std r7, LRSAVE+SWITCH_FRAME_SIZE(r1)
|
||||||
/* Save the read LR in pt_regs->link */
|
/* Save the read LR in pt_regs->link */
|
||||||
std r0, _LINK(r1)
|
std r0, _LINK(r1)
|
||||||
|
|
||||||
@ -121,7 +126,7 @@ ftrace_regs_call:
|
|||||||
ld r2, 24(r1)
|
ld r2, 24(r1)
|
||||||
|
|
||||||
/* Pop our stack frame */
|
/* Pop our stack frame */
|
||||||
addi r1, r1, SWITCH_FRAME_SIZE
|
addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
|
||||||
|
|
||||||
#ifdef CONFIG_LIVEPATCH
|
#ifdef CONFIG_LIVEPATCH
|
||||||
/* Based on the cmpd above, if the NIP was altered handle livepatch */
|
/* Based on the cmpd above, if the NIP was altered handle livepatch */
|
||||||
@ -145,7 +150,7 @@ ftrace_no_trace:
|
|||||||
mflr r3
|
mflr r3
|
||||||
mtctr r3
|
mtctr r3
|
||||||
REST_GPR(3, r1)
|
REST_GPR(3, r1)
|
||||||
addi r1, r1, SWITCH_FRAME_SIZE
|
addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
|
||||||
mtlr r0
|
mtlr r0
|
||||||
bctr
|
bctr
|
||||||
|
|
||||||
@ -153,6 +158,9 @@ _GLOBAL(ftrace_caller)
|
|||||||
/* Save the original return address in A's stack frame */
|
/* Save the original return address in A's stack frame */
|
||||||
std r0, LRSAVE(r1)
|
std r0, LRSAVE(r1)
|
||||||
|
|
||||||
|
/* Create a minimal stack frame for representing B */
|
||||||
|
stdu r1, -STACK_FRAME_MIN_SIZE(r1)
|
||||||
|
|
||||||
/* Create our stack frame + pt_regs */
|
/* Create our stack frame + pt_regs */
|
||||||
stdu r1, -SWITCH_FRAME_SIZE(r1)
|
stdu r1, -SWITCH_FRAME_SIZE(r1)
|
||||||
|
|
||||||
@ -166,6 +174,7 @@ _GLOBAL(ftrace_caller)
|
|||||||
/* Get the _mcount() call site out of LR */
|
/* Get the _mcount() call site out of LR */
|
||||||
mflr r7
|
mflr r7
|
||||||
std r7, _NIP(r1)
|
std r7, _NIP(r1)
|
||||||
|
std r7, LRSAVE+SWITCH_FRAME_SIZE(r1)
|
||||||
|
|
||||||
/* Save callee's TOC in the ABI compliant location */
|
/* Save callee's TOC in the ABI compliant location */
|
||||||
std r2, 24(r1)
|
std r2, 24(r1)
|
||||||
@ -200,7 +209,7 @@ ftrace_call:
|
|||||||
ld r2, 24(r1)
|
ld r2, 24(r1)
|
||||||
|
|
||||||
/* Pop our stack frame */
|
/* Pop our stack frame */
|
||||||
addi r1, r1, SWITCH_FRAME_SIZE
|
addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
|
||||||
|
|
||||||
/* Reload original LR */
|
/* Reload original LR */
|
||||||
ld r0, LRSAVE(r1)
|
ld r0, LRSAVE(r1)
|
||||||
|
|||||||
@ -32,6 +32,7 @@ _GLOBAL(store_vr_state)
|
|||||||
mfvscr v0
|
mfvscr v0
|
||||||
li r4, VRSTATE_VSCR
|
li r4, VRSTATE_VSCR
|
||||||
stvx v0, r4, r3
|
stvx v0, r4, r3
|
||||||
|
lvx v0, 0, r3
|
||||||
blr
|
blr
|
||||||
EXPORT_SYMBOL(store_vr_state)
|
EXPORT_SYMBOL(store_vr_state)
|
||||||
|
|
||||||
@ -102,6 +103,7 @@ _GLOBAL(save_altivec)
|
|||||||
mfvscr v0
|
mfvscr v0
|
||||||
li r4,VRSTATE_VSCR
|
li r4,VRSTATE_VSCR
|
||||||
stvx v0,r4,r7
|
stvx v0,r4,r7
|
||||||
|
lvx v0,0,r7
|
||||||
blr
|
blr
|
||||||
|
|
||||||
#ifdef CONFIG_VSX
|
#ifdef CONFIG_VSX
|
||||||
|
|||||||
@ -35,7 +35,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
|
|||||||
# so it is only needed for modules, and only for older linkers which
|
# so it is only needed for modules, and only for older linkers which
|
||||||
# do not support --save-restore-funcs
|
# do not support --save-restore-funcs
|
||||||
ifeq ($(call ld-ifversion, -lt, 225000000, y),y)
|
ifeq ($(call ld-ifversion, -lt, 225000000, y),y)
|
||||||
extra-$(CONFIG_PPC64) += crtsavres.o
|
always-$(CONFIG_PPC64) += crtsavres.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
|
obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
|
||||||
|
|||||||
@ -50,7 +50,7 @@ static int trace_imc_mem_size;
|
|||||||
* core and trace-imc
|
* core and trace-imc
|
||||||
*/
|
*/
|
||||||
static struct imc_pmu_ref imc_global_refc = {
|
static struct imc_pmu_ref imc_global_refc = {
|
||||||
.lock = __SPIN_LOCK_INITIALIZER(imc_global_refc.lock),
|
.lock = __SPIN_LOCK_UNLOCKED(imc_global_refc.lock),
|
||||||
.id = 0,
|
.id = 0,
|
||||||
.refc = 0,
|
.refc = 0,
|
||||||
};
|
};
|
||||||
@ -292,6 +292,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu)
|
|||||||
attr_group->attrs = attrs;
|
attr_group->attrs = attrs;
|
||||||
do {
|
do {
|
||||||
ev_val_str = kasprintf(GFP_KERNEL, "event=0x%x", pmu->events[i].value);
|
ev_val_str = kasprintf(GFP_KERNEL, "event=0x%x", pmu->events[i].value);
|
||||||
|
if (!ev_val_str)
|
||||||
|
continue;
|
||||||
dev_str = device_str_attr_create(pmu->events[i].name, ev_val_str);
|
dev_str = device_str_attr_create(pmu->events[i].name, ev_val_str);
|
||||||
if (!dev_str)
|
if (!dev_str)
|
||||||
continue;
|
continue;
|
||||||
@ -299,6 +301,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu)
|
|||||||
attrs[j++] = dev_str;
|
attrs[j++] = dev_str;
|
||||||
if (pmu->events[i].scale) {
|
if (pmu->events[i].scale) {
|
||||||
ev_scale_str = kasprintf(GFP_KERNEL, "%s.scale", pmu->events[i].name);
|
ev_scale_str = kasprintf(GFP_KERNEL, "%s.scale", pmu->events[i].name);
|
||||||
|
if (!ev_scale_str)
|
||||||
|
continue;
|
||||||
dev_str = device_str_attr_create(ev_scale_str, pmu->events[i].scale);
|
dev_str = device_str_attr_create(ev_scale_str, pmu->events[i].scale);
|
||||||
if (!dev_str)
|
if (!dev_str)
|
||||||
continue;
|
continue;
|
||||||
@ -308,6 +312,8 @@ static int update_events_in_group(struct device_node *node, struct imc_pmu *pmu)
|
|||||||
|
|
||||||
if (pmu->events[i].unit) {
|
if (pmu->events[i].unit) {
|
||||||
ev_unit_str = kasprintf(GFP_KERNEL, "%s.unit", pmu->events[i].name);
|
ev_unit_str = kasprintf(GFP_KERNEL, "%s.unit", pmu->events[i].name);
|
||||||
|
if (!ev_unit_str)
|
||||||
|
continue;
|
||||||
dev_str = device_str_attr_create(ev_unit_str, pmu->events[i].unit);
|
dev_str = device_str_attr_create(ev_unit_str, pmu->events[i].unit);
|
||||||
if (!dev_str)
|
if (!dev_str)
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@ -178,6 +178,7 @@ config ISS4xx
|
|||||||
config CURRITUCK
|
config CURRITUCK
|
||||||
bool "IBM Currituck (476fpe) Support"
|
bool "IBM Currituck (476fpe) Support"
|
||||||
depends on PPC_47x
|
depends on PPC_47x
|
||||||
|
select I2C
|
||||||
select SWIOTLB
|
select SWIOTLB
|
||||||
select 476FPE
|
select 476FPE
|
||||||
select FORCE_PCI
|
select FORCE_PCI
|
||||||
|
|||||||
@ -278,6 +278,8 @@ int __init opal_event_init(void)
|
|||||||
else
|
else
|
||||||
name = kasprintf(GFP_KERNEL, "opal");
|
name = kasprintf(GFP_KERNEL, "opal");
|
||||||
|
|
||||||
|
if (!name)
|
||||||
|
continue;
|
||||||
/* Install interrupt handler */
|
/* Install interrupt handler */
|
||||||
rc = request_irq(r->start, opal_interrupt, r->flags & IRQD_TRIGGER_MASK,
|
rc = request_irq(r->start, opal_interrupt, r->flags & IRQD_TRIGGER_MASK,
|
||||||
name, NULL);
|
name, NULL);
|
||||||
|
|||||||
@ -196,6 +196,12 @@ void __init opal_powercap_init(void)
|
|||||||
|
|
||||||
j = 0;
|
j = 0;
|
||||||
pcaps[i].pg.name = kasprintf(GFP_KERNEL, "%pOFn", node);
|
pcaps[i].pg.name = kasprintf(GFP_KERNEL, "%pOFn", node);
|
||||||
|
if (!pcaps[i].pg.name) {
|
||||||
|
kfree(pcaps[i].pattrs);
|
||||||
|
kfree(pcaps[i].pg.attrs);
|
||||||
|
goto out_pcaps_pattrs;
|
||||||
|
}
|
||||||
|
|
||||||
if (has_min) {
|
if (has_min) {
|
||||||
powercap_add_attr(min, "powercap-min",
|
powercap_add_attr(min, "powercap-min",
|
||||||
&pcaps[i].pattrs[j]);
|
&pcaps[i].pattrs[j]);
|
||||||
|
|||||||
@ -165,6 +165,11 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
|
|||||||
ent->chip = chip;
|
ent->chip = chip;
|
||||||
snprintf(ent->name, 16, "%08x", chip);
|
snprintf(ent->name, 16, "%08x", chip);
|
||||||
ent->path.data = (void *)kasprintf(GFP_KERNEL, "%pOF", dn);
|
ent->path.data = (void *)kasprintf(GFP_KERNEL, "%pOF", dn);
|
||||||
|
if (!ent->path.data) {
|
||||||
|
kfree(ent);
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
ent->path.size = strlen((char *)ent->path.data);
|
ent->path.size = strlen((char *)ent->path.data);
|
||||||
|
|
||||||
dir = debugfs_create_dir(ent->name, root);
|
dir = debugfs_create_dir(ent->name, root);
|
||||||
|
|||||||
@ -496,7 +496,7 @@ static int dlpar_memory_remove_by_index(u32 drc_index)
|
|||||||
int lmb_found;
|
int lmb_found;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
pr_info("Attempting to hot-remove LMB, drc index %x\n", drc_index);
|
pr_debug("Attempting to hot-remove LMB, drc index %x\n", drc_index);
|
||||||
|
|
||||||
lmb_found = 0;
|
lmb_found = 0;
|
||||||
for_each_drmem_lmb(lmb) {
|
for_each_drmem_lmb(lmb) {
|
||||||
@ -510,14 +510,15 @@ static int dlpar_memory_remove_by_index(u32 drc_index)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!lmb_found)
|
if (!lmb_found) {
|
||||||
|
pr_debug("Failed to look up LMB for drc index %x\n", drc_index);
|
||||||
rc = -EINVAL;
|
rc = -EINVAL;
|
||||||
|
} else if (rc) {
|
||||||
if (rc)
|
pr_debug("Failed to hot-remove memory at %llx\n",
|
||||||
pr_info("Failed to hot-remove memory at %llx\n",
|
lmb->base_addr);
|
||||||
lmb->base_addr);
|
} else {
|
||||||
else
|
pr_debug("Memory at %llx was hot-removed\n", lmb->base_addr);
|
||||||
pr_info("Memory at %llx was hot-removed\n", lmb->base_addr);
|
}
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
@ -770,8 +771,8 @@ static int dlpar_memory_add_by_count(u32 lmbs_to_add)
|
|||||||
if (!drmem_lmb_reserved(lmb))
|
if (!drmem_lmb_reserved(lmb))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
pr_info("Memory at %llx (drc index %x) was hot-added\n",
|
pr_debug("Memory at %llx (drc index %x) was hot-added\n",
|
||||||
lmb->base_addr, lmb->drc_index);
|
lmb->base_addr, lmb->drc_index);
|
||||||
drmem_remove_lmb_reservation(lmb);
|
drmem_remove_lmb_reservation(lmb);
|
||||||
}
|
}
|
||||||
rc = 0;
|
rc = 0;
|
||||||
|
|||||||
@ -522,8 +522,10 @@ static ssize_t vcpudispatch_stats_write(struct file *file, const char __user *p,
|
|||||||
|
|
||||||
if (cmd) {
|
if (cmd) {
|
||||||
rc = init_cpu_associativity();
|
rc = init_cpu_associativity();
|
||||||
if (rc)
|
if (rc) {
|
||||||
|
destroy_cpu_associativity();
|
||||||
goto out;
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
for_each_possible_cpu(cpu) {
|
for_each_possible_cpu(cpu) {
|
||||||
disp = per_cpu_ptr(&vcpu_disp_data, cpu);
|
disp = per_cpu_ptr(&vcpu_disp_data, cpu);
|
||||||
|
|||||||
@ -778,7 +778,7 @@ int xive_native_get_queue_info(u32 vp_id, u32 prio,
|
|||||||
if (out_qpage)
|
if (out_qpage)
|
||||||
*out_qpage = be64_to_cpu(qpage);
|
*out_qpage = be64_to_cpu(qpage);
|
||||||
if (out_qsize)
|
if (out_qsize)
|
||||||
*out_qsize = be32_to_cpu(qsize);
|
*out_qsize = be64_to_cpu(qsize);
|
||||||
if (out_qeoi_page)
|
if (out_qeoi_page)
|
||||||
*out_qeoi_page = be64_to_cpu(qeoi_page);
|
*out_qeoi_page = be64_to_cpu(qeoi_page);
|
||||||
if (out_escalate_irq)
|
if (out_escalate_irq)
|
||||||
|
|||||||
@ -76,7 +76,7 @@ static inline int test_fp_ctl(u32 fpc)
|
|||||||
#define KERNEL_VXR_HIGH (KERNEL_VXR_V16V23|KERNEL_VXR_V24V31)
|
#define KERNEL_VXR_HIGH (KERNEL_VXR_V16V23|KERNEL_VXR_V24V31)
|
||||||
|
|
||||||
#define KERNEL_VXR (KERNEL_VXR_LOW|KERNEL_VXR_HIGH)
|
#define KERNEL_VXR (KERNEL_VXR_LOW|KERNEL_VXR_HIGH)
|
||||||
#define KERNEL_FPR (KERNEL_FPC|KERNEL_VXR_V0V7)
|
#define KERNEL_FPR (KERNEL_FPC|KERNEL_VXR_LOW)
|
||||||
|
|
||||||
struct kernel_fpu;
|
struct kernel_fpu;
|
||||||
|
|
||||||
|
|||||||
@ -11,6 +11,8 @@
|
|||||||
/* I/O size constraints */
|
/* I/O size constraints */
|
||||||
#define ZPCI_MAX_READ_SIZE 8
|
#define ZPCI_MAX_READ_SIZE 8
|
||||||
#define ZPCI_MAX_WRITE_SIZE 128
|
#define ZPCI_MAX_WRITE_SIZE 128
|
||||||
|
#define ZPCI_BOUNDARY_SIZE (1 << 12)
|
||||||
|
#define ZPCI_BOUNDARY_MASK (ZPCI_BOUNDARY_SIZE - 1)
|
||||||
|
|
||||||
/* I/O Map */
|
/* I/O Map */
|
||||||
#define ZPCI_IOMAP_SHIFT 48
|
#define ZPCI_IOMAP_SHIFT 48
|
||||||
@ -125,16 +127,18 @@ out:
|
|||||||
int zpci_write_block(volatile void __iomem *dst, const void *src,
|
int zpci_write_block(volatile void __iomem *dst, const void *src,
|
||||||
unsigned long len);
|
unsigned long len);
|
||||||
|
|
||||||
static inline u8 zpci_get_max_write_size(u64 src, u64 dst, int len, int max)
|
static inline int zpci_get_max_io_size(u64 src, u64 dst, int len, int max)
|
||||||
{
|
{
|
||||||
int count = len > max ? max : len, size = 1;
|
int offset = dst & ZPCI_BOUNDARY_MASK;
|
||||||
|
int size;
|
||||||
|
|
||||||
while (!(src & 0x1) && !(dst & 0x1) && ((size << 1) <= count)) {
|
size = min3(len, ZPCI_BOUNDARY_SIZE - offset, max);
|
||||||
dst = dst >> 1;
|
if (IS_ALIGNED(src, 8) && IS_ALIGNED(dst, 8) && IS_ALIGNED(size, 8))
|
||||||
src = src >> 1;
|
return size;
|
||||||
size = size << 1;
|
|
||||||
}
|
if (size >= 8)
|
||||||
return size;
|
return 8;
|
||||||
|
return rounddown_pow_of_two(size);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int zpci_memcpy_fromio(void *dst,
|
static inline int zpci_memcpy_fromio(void *dst,
|
||||||
@ -144,9 +148,9 @@ static inline int zpci_memcpy_fromio(void *dst,
|
|||||||
int size, rc = 0;
|
int size, rc = 0;
|
||||||
|
|
||||||
while (n > 0) {
|
while (n > 0) {
|
||||||
size = zpci_get_max_write_size((u64 __force) src,
|
size = zpci_get_max_io_size((u64 __force) src,
|
||||||
(u64) dst, n,
|
(u64) dst, n,
|
||||||
ZPCI_MAX_READ_SIZE);
|
ZPCI_MAX_READ_SIZE);
|
||||||
rc = zpci_read_single(dst, src, size);
|
rc = zpci_read_single(dst, src, size);
|
||||||
if (rc)
|
if (rc)
|
||||||
break;
|
break;
|
||||||
@ -166,9 +170,9 @@ static inline int zpci_memcpy_toio(volatile void __iomem *dst,
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
while (n > 0) {
|
while (n > 0) {
|
||||||
size = zpci_get_max_write_size((u64 __force) dst,
|
size = zpci_get_max_io_size((u64 __force) dst,
|
||||||
(u64) src, n,
|
(u64) src, n,
|
||||||
ZPCI_MAX_WRITE_SIZE);
|
ZPCI_MAX_WRITE_SIZE);
|
||||||
if (size > 8) /* main path */
|
if (size > 8) /* main path */
|
||||||
rc = zpci_write_block(dst, src, size);
|
rc = zpci_write_block(dst, src, size);
|
||||||
else
|
else
|
||||||
|
|||||||
@ -112,7 +112,7 @@ static void mark_kernel_pmd(pud_t *pud, unsigned long addr, unsigned long end)
|
|||||||
next = pmd_addr_end(addr, end);
|
next = pmd_addr_end(addr, end);
|
||||||
if (pmd_none(*pmd) || pmd_large(*pmd))
|
if (pmd_none(*pmd) || pmd_large(*pmd))
|
||||||
continue;
|
continue;
|
||||||
page = virt_to_page(pmd_val(*pmd));
|
page = phys_to_page(pmd_val(*pmd));
|
||||||
set_bit(PG_arch_1, &page->flags);
|
set_bit(PG_arch_1, &page->flags);
|
||||||
} while (pmd++, addr = next, addr != end);
|
} while (pmd++, addr = next, addr != end);
|
||||||
}
|
}
|
||||||
@ -130,8 +130,8 @@ static void mark_kernel_pud(p4d_t *p4d, unsigned long addr, unsigned long end)
|
|||||||
if (pud_none(*pud) || pud_large(*pud))
|
if (pud_none(*pud) || pud_large(*pud))
|
||||||
continue;
|
continue;
|
||||||
if (!pud_folded(*pud)) {
|
if (!pud_folded(*pud)) {
|
||||||
page = virt_to_page(pud_val(*pud));
|
page = phys_to_page(pud_val(*pud));
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 4; i++)
|
||||||
set_bit(PG_arch_1, &page[i].flags);
|
set_bit(PG_arch_1, &page[i].flags);
|
||||||
}
|
}
|
||||||
mark_kernel_pmd(pud, addr, next);
|
mark_kernel_pmd(pud, addr, next);
|
||||||
@ -151,8 +151,8 @@ static void mark_kernel_p4d(pgd_t *pgd, unsigned long addr, unsigned long end)
|
|||||||
if (p4d_none(*p4d))
|
if (p4d_none(*p4d))
|
||||||
continue;
|
continue;
|
||||||
if (!p4d_folded(*p4d)) {
|
if (!p4d_folded(*p4d)) {
|
||||||
page = virt_to_page(p4d_val(*p4d));
|
page = phys_to_page(p4d_val(*p4d));
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 4; i++)
|
||||||
set_bit(PG_arch_1, &page[i].flags);
|
set_bit(PG_arch_1, &page[i].flags);
|
||||||
}
|
}
|
||||||
mark_kernel_pud(p4d, addr, next);
|
mark_kernel_pud(p4d, addr, next);
|
||||||
@ -173,8 +173,8 @@ static void mark_kernel_pgd(void)
|
|||||||
if (pgd_none(*pgd))
|
if (pgd_none(*pgd))
|
||||||
continue;
|
continue;
|
||||||
if (!pgd_folded(*pgd)) {
|
if (!pgd_folded(*pgd)) {
|
||||||
page = virt_to_page(pgd_val(*pgd));
|
page = phys_to_page(pgd_val(*pgd));
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 4; i++)
|
||||||
set_bit(PG_arch_1, &page[i].flags);
|
set_bit(PG_arch_1, &page[i].flags);
|
||||||
}
|
}
|
||||||
mark_kernel_p4d(pgd, addr, next);
|
mark_kernel_p4d(pgd, addr, next);
|
||||||
|
|||||||
@ -699,7 +699,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr,
|
|||||||
pte_clear(mm, addr, ptep);
|
pte_clear(mm, addr, ptep);
|
||||||
}
|
}
|
||||||
if (reset)
|
if (reset)
|
||||||
pgste_val(pgste) &= ~_PGSTE_GPS_USAGE_MASK;
|
pgste_val(pgste) &= ~(_PGSTE_GPS_USAGE_MASK | _PGSTE_GPS_NODAT);
|
||||||
pgste_set_unlock(ptep, pgste);
|
pgste_set_unlock(ptep, pgste);
|
||||||
preempt_enable();
|
preempt_enable();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -100,9 +100,9 @@ static inline int __memcpy_toio_inuser(void __iomem *dst,
|
|||||||
|
|
||||||
old_fs = enable_sacf_uaccess();
|
old_fs = enable_sacf_uaccess();
|
||||||
while (n > 0) {
|
while (n > 0) {
|
||||||
size = zpci_get_max_write_size((u64 __force) dst,
|
size = zpci_get_max_io_size((u64 __force) dst,
|
||||||
(u64 __force) src, n,
|
(u64 __force) src, n,
|
||||||
ZPCI_MAX_WRITE_SIZE);
|
ZPCI_MAX_WRITE_SIZE);
|
||||||
if (size > 8) /* main path */
|
if (size > 8) /* main path */
|
||||||
rc = __pcistb_mio_inuser(dst, src, size, &status);
|
rc = __pcistb_mio_inuser(dst, src, size, &status);
|
||||||
else
|
else
|
||||||
@ -250,9 +250,9 @@ static inline int __memcpy_fromio_inuser(void __user *dst,
|
|||||||
|
|
||||||
old_fs = enable_sacf_uaccess();
|
old_fs = enable_sacf_uaccess();
|
||||||
while (n > 0) {
|
while (n > 0) {
|
||||||
size = zpci_get_max_write_size((u64 __force) src,
|
size = zpci_get_max_io_size((u64 __force) src,
|
||||||
(u64 __force) dst, n,
|
(u64 __force) dst, n,
|
||||||
ZPCI_MAX_READ_SIZE);
|
ZPCI_MAX_READ_SIZE);
|
||||||
rc = __pcilg_mio_inuser(dst, src, size, &status);
|
rc = __pcilg_mio_inuser(dst, src, size, &status);
|
||||||
if (rc)
|
if (rc)
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -26,6 +26,17 @@ config STACK_DEBUG
|
|||||||
every function call and will therefore incur a major
|
every function call and will therefore incur a major
|
||||||
performance hit. Most users should say N.
|
performance hit. Most users should say N.
|
||||||
|
|
||||||
|
config EARLY_PRINTK
|
||||||
|
bool "Early printk"
|
||||||
|
depends on SH_STANDARD_BIOS
|
||||||
|
help
|
||||||
|
Say Y here to redirect kernel printk messages to the serial port
|
||||||
|
used by the SH-IPL bootloader, starting very early in the boot
|
||||||
|
process and ending when the kernel's serial console is initialised.
|
||||||
|
This option is only useful while porting the kernel to a new machine,
|
||||||
|
when the kernel may crash or hang before the serial console is
|
||||||
|
initialised. If unsure, say N.
|
||||||
|
|
||||||
config 4KSTACKS
|
config 4KSTACKS
|
||||||
bool "Use 4Kb for kernel stacks instead of 8Kb"
|
bool "Use 4Kb for kernel stacks instead of 8Kb"
|
||||||
depends on DEBUG_KERNEL && (MMU || BROKEN) && !PAGE_SIZE_64KB
|
depends on DEBUG_KERNEL && (MMU || BROKEN) && !PAGE_SIZE_64KB
|
||||||
|
|||||||
@ -67,6 +67,8 @@ struct legacy_pic {
|
|||||||
void (*make_irq)(unsigned int irq);
|
void (*make_irq)(unsigned int irq);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
void legacy_pic_pcat_compat(void);
|
||||||
|
|
||||||
extern struct legacy_pic *legacy_pic;
|
extern struct legacy_pic *legacy_pic;
|
||||||
extern struct legacy_pic null_legacy_pic;
|
extern struct legacy_pic null_legacy_pic;
|
||||||
|
|
||||||
|
|||||||
@ -469,6 +469,7 @@
|
|||||||
#define MSR_AMD64_OSVW_STATUS 0xc0010141
|
#define MSR_AMD64_OSVW_STATUS 0xc0010141
|
||||||
#define MSR_AMD64_LS_CFG 0xc0011020
|
#define MSR_AMD64_LS_CFG 0xc0011020
|
||||||
#define MSR_AMD64_DC_CFG 0xc0011022
|
#define MSR_AMD64_DC_CFG 0xc0011022
|
||||||
|
#define MSR_AMD64_TW_CFG 0xc0011023
|
||||||
|
|
||||||
#define MSR_AMD64_DE_CFG 0xc0011029
|
#define MSR_AMD64_DE_CFG 0xc0011029
|
||||||
#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT 1
|
#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT 1
|
||||||
|
|||||||
@ -11,13 +11,6 @@
|
|||||||
|
|
||||||
#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
|
#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
|
||||||
|
|
||||||
/*
|
|
||||||
* Too small node sizes may confuse the VM badly. Usually they
|
|
||||||
* result from BIOS bugs. So dont recognize nodes as standalone
|
|
||||||
* NUMA entities that have less than this amount of RAM listed:
|
|
||||||
*/
|
|
||||||
#define NODE_MIN_SIZE (4*1024*1024)
|
|
||||||
|
|
||||||
extern int numa_off;
|
extern int numa_off;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -94,27 +94,16 @@ extern unsigned long _brk_end;
|
|||||||
void *extend_brk(size_t size, size_t align);
|
void *extend_brk(size_t size, size_t align);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reserve space in the brk section. The name must be unique within
|
* Reserve space in the .brk section, which is a block of memory from which the
|
||||||
* the file, and somewhat descriptive. The size is in bytes. Must be
|
* caller is allowed to allocate very early (before even memblock is available)
|
||||||
* used at file scope.
|
* by calling extend_brk(). All allocated memory will be eventually converted
|
||||||
|
* to memblock. Any leftover unallocated memory will be freed.
|
||||||
*
|
*
|
||||||
* (This uses a temp function to wrap the asm so we can pass it the
|
* The size is in bytes.
|
||||||
* size parameter; otherwise we wouldn't be able to. We can't use a
|
|
||||||
* "section" attribute on a normal variable because it always ends up
|
|
||||||
* being @progbits, which ends up allocating space in the vmlinux
|
|
||||||
* executable.)
|
|
||||||
*/
|
*/
|
||||||
#define RESERVE_BRK(name,sz) \
|
#define RESERVE_BRK(name, size) \
|
||||||
static void __section(.discard.text) __used notrace \
|
__section(.bss..brk) __aligned(1) __used \
|
||||||
__brk_reservation_fn_##name##__(void) { \
|
static char __brk_##name[size]
|
||||||
asm volatile ( \
|
|
||||||
".pushsection .brk_reservation,\"aw\",@nobits;" \
|
|
||||||
".brk." #name ":" \
|
|
||||||
" 1:.skip %c0;" \
|
|
||||||
" .size .brk." #name ", . - 1b;" \
|
|
||||||
" .popsection" \
|
|
||||||
: : "i" (sz)); \
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Helper for reserving space for arrays of things */
|
/* Helper for reserving space for arrays of things */
|
||||||
#define RESERVE_BRK_ARRAY(type, name, entries) \
|
#define RESERVE_BRK_ARRAY(type, name, entries) \
|
||||||
@ -132,12 +121,19 @@ asmlinkage void __init x86_64_start_reservations(char *real_mode_data);
|
|||||||
|
|
||||||
#endif /* __i386__ */
|
#endif /* __i386__ */
|
||||||
#endif /* _SETUP */
|
#endif /* _SETUP */
|
||||||
#else
|
|
||||||
#define RESERVE_BRK(name,sz) \
|
#else /* __ASSEMBLY */
|
||||||
.pushsection .brk_reservation,"aw",@nobits; \
|
|
||||||
.brk.name: \
|
.macro __RESERVE_BRK name, size
|
||||||
1: .skip sz; \
|
.pushsection .bss..brk, "aw"
|
||||||
.size .brk.name,.-1b; \
|
SYM_DATA_START(__brk_\name)
|
||||||
|
.skip \size
|
||||||
|
SYM_DATA_END(__brk_\name)
|
||||||
.popsection
|
.popsection
|
||||||
|
.endm
|
||||||
|
|
||||||
|
#define RESERVE_BRK(name, size) __RESERVE_BRK name, size
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* _ASM_X86_SETUP_H */
|
#endif /* _ASM_X86_SETUP_H */
|
||||||
|
|||||||
@ -140,6 +140,9 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)
|
|||||||
madt->address);
|
madt->address);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (madt->flags & ACPI_MADT_PCAT_COMPAT)
|
||||||
|
legacy_pic_pcat_compat();
|
||||||
|
|
||||||
default_acpi_madt_oem_check(madt->header.oem_id,
|
default_acpi_madt_oem_check(madt->header.oem_id,
|
||||||
madt->header.oem_table_id);
|
madt->header.oem_table_id);
|
||||||
|
|
||||||
|
|||||||
@ -759,8 +759,8 @@ void __init_or_module text_poke_early(void *addr, const void *opcode,
|
|||||||
} else {
|
} else {
|
||||||
local_irq_save(flags);
|
local_irq_save(flags);
|
||||||
memcpy(addr, opcode, len);
|
memcpy(addr, opcode, len);
|
||||||
local_irq_restore(flags);
|
|
||||||
sync_core();
|
sync_core();
|
||||||
|
local_irq_restore(flags);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Could also do a CLFLUSH here to speed up CPU recovery; but
|
* Could also do a CLFLUSH here to speed up CPU recovery; but
|
||||||
|
|||||||
@ -1248,5 +1248,8 @@ static void zenbleed_check_cpu(void *unused)
|
|||||||
|
|
||||||
void amd_check_microcode(void)
|
void amd_check_microcode(void)
|
||||||
{
|
{
|
||||||
|
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
|
||||||
|
return;
|
||||||
|
|
||||||
on_each_cpu(zenbleed_check_cpu, NULL, 1);
|
on_each_cpu(zenbleed_check_cpu, NULL, 1);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -88,8 +88,12 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)
|
|||||||
if (!err)
|
if (!err)
|
||||||
c->x86_coreid_bits = get_count_order(c->x86_max_cores);
|
c->x86_coreid_bits = get_count_order(c->x86_max_cores);
|
||||||
|
|
||||||
/* Socket ID is ApicId[6] for these processors. */
|
/*
|
||||||
c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
|
* Socket ID is ApicId[6] for the processors with model <= 0x3
|
||||||
|
* when running on host.
|
||||||
|
*/
|
||||||
|
if (!boot_cpu_has(X86_FEATURE_HYPERVISOR) && c->x86_model <= 0x3)
|
||||||
|
c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
|
||||||
|
|
||||||
cacheinfo_hygon_init_llc_id(c, cpu);
|
cacheinfo_hygon_init_llc_id(c, cpu);
|
||||||
} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
|
} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
|
||||||
|
|||||||
@ -32,6 +32,7 @@
|
|||||||
*/
|
*/
|
||||||
static void init_8259A(int auto_eoi);
|
static void init_8259A(int auto_eoi);
|
||||||
|
|
||||||
|
static bool pcat_compat __ro_after_init;
|
||||||
static int i8259A_auto_eoi;
|
static int i8259A_auto_eoi;
|
||||||
DEFINE_RAW_SPINLOCK(i8259A_lock);
|
DEFINE_RAW_SPINLOCK(i8259A_lock);
|
||||||
|
|
||||||
@ -301,15 +302,32 @@ static void unmask_8259A(void)
|
|||||||
|
|
||||||
static int probe_8259A(void)
|
static int probe_8259A(void)
|
||||||
{
|
{
|
||||||
|
unsigned char new_val, probe_val = ~(1 << PIC_CASCADE_IR);
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned char probe_val = ~(1 << PIC_CASCADE_IR);
|
|
||||||
unsigned char new_val;
|
|
||||||
/*
|
/*
|
||||||
* Check to see if we have a PIC.
|
* If MADT has the PCAT_COMPAT flag set, then do not bother probing
|
||||||
* Mask all except the cascade and read
|
* for the PIC. Some BIOSes leave the PIC uninitialized and probing
|
||||||
* back the value we just wrote. If we don't
|
* fails.
|
||||||
* have a PIC, we will read 0xff as opposed to the
|
*
|
||||||
* value we wrote.
|
* Right now this causes problems as quite some code depends on
|
||||||
|
* nr_legacy_irqs() > 0 or has_legacy_pic() == true. This is silly
|
||||||
|
* when the system has an IO/APIC because then PIC is not required
|
||||||
|
* at all, except for really old machines where the timer interrupt
|
||||||
|
* must be routed through the PIC. So just pretend that the PIC is
|
||||||
|
* there and let legacy_pic->init() initialize it for nothing.
|
||||||
|
*
|
||||||
|
* Alternatively this could just try to initialize the PIC and
|
||||||
|
* repeat the probe, but for cases where there is no PIC that's
|
||||||
|
* just pointless.
|
||||||
|
*/
|
||||||
|
if (pcat_compat)
|
||||||
|
return nr_legacy_irqs();
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check to see if we have a PIC. Mask all except the cascade and
|
||||||
|
* read back the value we just wrote. If we don't have a PIC, we
|
||||||
|
* will read 0xff as opposed to the value we wrote.
|
||||||
*/
|
*/
|
||||||
raw_spin_lock_irqsave(&i8259A_lock, flags);
|
raw_spin_lock_irqsave(&i8259A_lock, flags);
|
||||||
|
|
||||||
@ -431,5 +449,9 @@ static int __init i8259A_init_ops(void)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
device_initcall(i8259A_init_ops);
|
device_initcall(i8259A_init_ops);
|
||||||
|
|
||||||
|
void __init legacy_pic_pcat_compat(void)
|
||||||
|
{
|
||||||
|
pcat_compat = true;
|
||||||
|
}
|
||||||
|
|||||||
@ -24,8 +24,8 @@
|
|||||||
|
|
||||||
static int kvmclock __initdata = 1;
|
static int kvmclock __initdata = 1;
|
||||||
static int kvmclock_vsyscall __initdata = 1;
|
static int kvmclock_vsyscall __initdata = 1;
|
||||||
static int msr_kvm_system_time __ro_after_init = MSR_KVM_SYSTEM_TIME;
|
static int msr_kvm_system_time __ro_after_init;
|
||||||
static int msr_kvm_wall_clock __ro_after_init = MSR_KVM_WALL_CLOCK;
|
static int msr_kvm_wall_clock __ro_after_init;
|
||||||
static u64 kvm_sched_clock_offset __ro_after_init;
|
static u64 kvm_sched_clock_offset __ro_after_init;
|
||||||
|
|
||||||
static int __init parse_no_kvmclock(char *arg)
|
static int __init parse_no_kvmclock(char *arg)
|
||||||
@ -189,7 +189,8 @@ static void kvm_setup_secondary_clock(void)
|
|||||||
|
|
||||||
void kvmclock_disable(void)
|
void kvmclock_disable(void)
|
||||||
{
|
{
|
||||||
native_write_msr(msr_kvm_system_time, 0, 0);
|
if (msr_kvm_system_time)
|
||||||
|
native_write_msr(msr_kvm_system_time, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init kvmclock_init_mem(void)
|
static void __init kvmclock_init_mem(void)
|
||||||
@ -286,7 +287,10 @@ void __init kvmclock_init(void)
|
|||||||
if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE2)) {
|
if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE2)) {
|
||||||
msr_kvm_system_time = MSR_KVM_SYSTEM_TIME_NEW;
|
msr_kvm_system_time = MSR_KVM_SYSTEM_TIME_NEW;
|
||||||
msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK_NEW;
|
msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK_NEW;
|
||||||
} else if (!kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) {
|
} else if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE)) {
|
||||||
|
msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;
|
||||||
|
msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;
|
||||||
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -389,7 +389,7 @@ SECTIONS
|
|||||||
.brk : AT(ADDR(.brk) - LOAD_OFFSET) {
|
.brk : AT(ADDR(.brk) - LOAD_OFFSET) {
|
||||||
__brk_base = .;
|
__brk_base = .;
|
||||||
. += 64 * 1024; /* 64k alignment slop space */
|
. += 64 * 1024; /* 64k alignment slop space */
|
||||||
*(.brk_reservation) /* areas brk users have reserved */
|
*(.bss..brk) /* areas brk users have reserved */
|
||||||
__brk_limit = .;
|
__brk_limit = .;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -555,10 +555,12 @@ static int stimer_set_count(struct kvm_vcpu_hv_stimer *stimer, u64 count,
|
|||||||
|
|
||||||
stimer_cleanup(stimer);
|
stimer_cleanup(stimer);
|
||||||
stimer->count = count;
|
stimer->count = count;
|
||||||
if (stimer->count == 0)
|
if (!host) {
|
||||||
stimer->config.enable = 0;
|
if (stimer->count == 0)
|
||||||
else if (stimer->config.auto_enable)
|
stimer->config.enable = 0;
|
||||||
stimer->config.enable = 1;
|
else if (stimer->config.auto_enable)
|
||||||
|
stimer->config.enable = 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (stimer->config.enable)
|
if (stimer->config.enable)
|
||||||
stimer_mark_pending(stimer, false);
|
stimer_mark_pending(stimer, false);
|
||||||
|
|||||||
@ -2720,6 +2720,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
|
|||||||
case MSR_AMD64_PATCH_LOADER:
|
case MSR_AMD64_PATCH_LOADER:
|
||||||
case MSR_AMD64_BU_CFG2:
|
case MSR_AMD64_BU_CFG2:
|
||||||
case MSR_AMD64_DC_CFG:
|
case MSR_AMD64_DC_CFG:
|
||||||
|
case MSR_AMD64_TW_CFG:
|
||||||
case MSR_F15H_EX_CFG:
|
case MSR_F15H_EX_CFG:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -3029,6 +3030,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
|
|||||||
case MSR_AMD64_BU_CFG2:
|
case MSR_AMD64_BU_CFG2:
|
||||||
case MSR_IA32_PERF_CTL:
|
case MSR_IA32_PERF_CTL:
|
||||||
case MSR_AMD64_DC_CFG:
|
case MSR_AMD64_DC_CFG:
|
||||||
|
case MSR_AMD64_TW_CFG:
|
||||||
case MSR_F15H_EX_CFG:
|
case MSR_F15H_EX_CFG:
|
||||||
msr_info->data = 0;
|
msr_info->data = 0;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
int num_digits(int val)
|
int num_digits(int val)
|
||||||
{
|
{
|
||||||
int m = 10;
|
long long m = 10;
|
||||||
int d = 1;
|
int d = 1;
|
||||||
|
|
||||||
if (val < 0) {
|
if (val < 0) {
|
||||||
|
|||||||
@ -581,13 +581,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
|
|||||||
if (start >= end)
|
if (start >= end)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/*
|
|
||||||
* Don't confuse VM with a node that doesn't have the
|
|
||||||
* minimum amount of memory:
|
|
||||||
*/
|
|
||||||
if (end && (end - start) < NODE_MIN_SIZE)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
alloc_node_data(nid);
|
alloc_node_data(nid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1374,6 +1374,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global)
|
|||||||
tg_bps_limit(tg, READ), tg_bps_limit(tg, WRITE),
|
tg_bps_limit(tg, READ), tg_bps_limit(tg, WRITE),
|
||||||
tg_iops_limit(tg, READ), tg_iops_limit(tg, WRITE));
|
tg_iops_limit(tg, READ), tg_iops_limit(tg, WRITE));
|
||||||
|
|
||||||
|
rcu_read_lock();
|
||||||
/*
|
/*
|
||||||
* Update has_rules[] flags for the updated tg's subtree. A tg is
|
* Update has_rules[] flags for the updated tg's subtree. A tg is
|
||||||
* considered to have rules if either the tg itself or any of its
|
* considered to have rules if either the tg itself or any of its
|
||||||
@ -1401,6 +1402,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global)
|
|||||||
this_tg->latency_target = max(this_tg->latency_target,
|
this_tg->latency_target = max(this_tg->latency_target,
|
||||||
parent_tg->latency_target);
|
parent_tg->latency_target);
|
||||||
}
|
}
|
||||||
|
rcu_read_unlock();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We're already holding queue_lock and know @tg is valid. Let's
|
* We're already holding queue_lock and know @tg is valid. Let's
|
||||||
|
|||||||
@ -7,6 +7,8 @@ FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment
|
|||||||
PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
|
PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
|
||||||
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
|
POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
|
||||||
|
|
||||||
|
DTC_FLAGS="${DTC_FLAGS} -@"
|
||||||
|
|
||||||
FILES="
|
FILES="
|
||||||
arch/arm64/boot/Image.gz
|
arch/arm64/boot/Image.gz
|
||||||
arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
|
arch/arm64/boot/dts/qcom/sdm845-db845c.dtb
|
||||||
|
|||||||
@ -1029,9 +1029,13 @@ EXPORT_SYMBOL_GPL(af_alg_sendpage);
|
|||||||
void af_alg_free_resources(struct af_alg_async_req *areq)
|
void af_alg_free_resources(struct af_alg_async_req *areq)
|
||||||
{
|
{
|
||||||
struct sock *sk = areq->sk;
|
struct sock *sk = areq->sk;
|
||||||
|
struct af_alg_ctx *ctx;
|
||||||
|
|
||||||
af_alg_free_areq_sgls(areq);
|
af_alg_free_areq_sgls(areq);
|
||||||
sock_kfree_s(sk, areq, areq->areqlen);
|
sock_kfree_s(sk, areq, areq->areqlen);
|
||||||
|
|
||||||
|
ctx = alg_sk(sk)->private;
|
||||||
|
ctx->inflight = false;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(af_alg_free_resources);
|
EXPORT_SYMBOL_GPL(af_alg_free_resources);
|
||||||
|
|
||||||
@ -1095,11 +1099,19 @@ EXPORT_SYMBOL_GPL(af_alg_poll);
|
|||||||
struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk,
|
struct af_alg_async_req *af_alg_alloc_areq(struct sock *sk,
|
||||||
unsigned int areqlen)
|
unsigned int areqlen)
|
||||||
{
|
{
|
||||||
struct af_alg_async_req *areq = sock_kmalloc(sk, areqlen, GFP_KERNEL);
|
struct af_alg_ctx *ctx = alg_sk(sk)->private;
|
||||||
|
struct af_alg_async_req *areq;
|
||||||
|
|
||||||
|
/* Only one AIO request can be in flight. */
|
||||||
|
if (ctx->inflight)
|
||||||
|
return ERR_PTR(-EBUSY);
|
||||||
|
|
||||||
|
areq = sock_kmalloc(sk, areqlen, GFP_KERNEL);
|
||||||
if (unlikely(!areq))
|
if (unlikely(!areq))
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
||||||
|
ctx->inflight = true;
|
||||||
|
|
||||||
areq->areqlen = areqlen;
|
areq->areqlen = areqlen;
|
||||||
areq->sk = sk;
|
areq->sk = sk;
|
||||||
areq->last_rsgl = NULL;
|
areq->last_rsgl = NULL;
|
||||||
|
|||||||
@ -118,6 +118,8 @@ static int pcrypt_aead_encrypt(struct aead_request *req)
|
|||||||
err = padata_do_parallel(ictx->psenc, padata, &ctx->cb_cpu);
|
err = padata_do_parallel(ictx->psenc, padata, &ctx->cb_cpu);
|
||||||
if (!err)
|
if (!err)
|
||||||
return -EINPROGRESS;
|
return -EINPROGRESS;
|
||||||
|
if (err == -EBUSY)
|
||||||
|
return -EAGAIN;
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
@ -165,6 +167,8 @@ static int pcrypt_aead_decrypt(struct aead_request *req)
|
|||||||
err = padata_do_parallel(ictx->psdec, padata, &ctx->cb_cpu);
|
err = padata_do_parallel(ictx->psdec, padata, &ctx->cb_cpu);
|
||||||
if (!err)
|
if (!err)
|
||||||
return -EINPROGRESS;
|
return -EINPROGRESS;
|
||||||
|
if (err == -EBUSY)
|
||||||
|
return -EAGAIN;
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,6 +124,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
|
|||||||
struct crypto_scomp *scomp = *tfm_ctx;
|
struct crypto_scomp *scomp = *tfm_ctx;
|
||||||
void **ctx = acomp_request_ctx(req);
|
void **ctx = acomp_request_ctx(req);
|
||||||
struct scomp_scratch *scratch;
|
struct scomp_scratch *scratch;
|
||||||
|
unsigned int dlen;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!req->src || !req->slen || req->slen > SCOMP_SCRATCH_SIZE)
|
if (!req->src || !req->slen || req->slen > SCOMP_SCRATCH_SIZE)
|
||||||
@ -135,6 +136,8 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
|
|||||||
if (!req->dlen || req->dlen > SCOMP_SCRATCH_SIZE)
|
if (!req->dlen || req->dlen > SCOMP_SCRATCH_SIZE)
|
||||||
req->dlen = SCOMP_SCRATCH_SIZE;
|
req->dlen = SCOMP_SCRATCH_SIZE;
|
||||||
|
|
||||||
|
dlen = req->dlen;
|
||||||
|
|
||||||
scratch = raw_cpu_ptr(&scomp_scratch);
|
scratch = raw_cpu_ptr(&scomp_scratch);
|
||||||
spin_lock(&scratch->lock);
|
spin_lock(&scratch->lock);
|
||||||
|
|
||||||
@ -152,6 +155,9 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
|
|||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
} else if (req->dlen > dlen) {
|
||||||
|
ret = -ENOSPC;
|
||||||
|
goto out;
|
||||||
}
|
}
|
||||||
scatterwalk_map_and_copy(scratch->dst, req->dst, 0, req->dlen,
|
scatterwalk_map_and_copy(scratch->dst, req->dst, 0, req->dlen,
|
||||||
1);
|
1);
|
||||||
|
|||||||
@ -98,7 +98,7 @@ static void lpit_update_residency(struct lpit_residency_info *info,
|
|||||||
struct acpi_lpit_native *lpit_native)
|
struct acpi_lpit_native *lpit_native)
|
||||||
{
|
{
|
||||||
info->frequency = lpit_native->counter_frequency ?
|
info->frequency = lpit_native->counter_frequency ?
|
||||||
lpit_native->counter_frequency : tsc_khz * 1000;
|
lpit_native->counter_frequency : mul_u32_u32(tsc_khz, 1000U);
|
||||||
if (!info->frequency)
|
if (!info->frequency)
|
||||||
info->frequency = 1;
|
info->frequency = 1;
|
||||||
|
|
||||||
|
|||||||
@ -1784,12 +1784,12 @@ static void acpi_video_dev_register_backlight(struct acpi_video_device *device)
|
|||||||
return;
|
return;
|
||||||
count++;
|
count++;
|
||||||
|
|
||||||
acpi_get_parent(device->dev->handle, &acpi_parent);
|
if (ACPI_SUCCESS(acpi_get_parent(device->dev->handle, &acpi_parent))) {
|
||||||
|
pdev = acpi_get_pci_dev(acpi_parent);
|
||||||
pdev = acpi_get_pci_dev(acpi_parent);
|
if (pdev) {
|
||||||
if (pdev) {
|
parent = &pdev->dev;
|
||||||
parent = &pdev->dev;
|
pci_dev_put(pdev);
|
||||||
pci_dev_put(pdev);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(&props, 0, sizeof(struct backlight_properties));
|
memset(&props, 0, sizeof(struct backlight_properties));
|
||||||
|
|||||||
@ -503,7 +503,6 @@ static struct acpi_iort_node *iort_find_dev_node(struct device *dev)
|
|||||||
node = iort_get_iort_node(dev->fwnode);
|
node = iort_get_iort_node(dev->fwnode);
|
||||||
if (node)
|
if (node)
|
||||||
return node;
|
return node;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* if not, then it should be a platform device defined in
|
* if not, then it should be a platform device defined in
|
||||||
* DSDT/SSDT (with Named Component node in IORT)
|
* DSDT/SSDT (with Named Component node in IORT)
|
||||||
@ -522,22 +521,22 @@ static struct acpi_iort_node *iort_find_dev_node(struct device *dev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* iort_msi_map_rid() - Map a MSI requester ID for a device
|
* iort_msi_map_id() - Map a MSI input ID for a device
|
||||||
* @dev: The device for which the mapping is to be done.
|
* @dev: The device for which the mapping is to be done.
|
||||||
* @req_id: The device requester ID.
|
* @input_id: The device input ID.
|
||||||
*
|
*
|
||||||
* Returns: mapped MSI RID on success, input requester ID otherwise
|
* Returns: mapped MSI ID on success, input ID otherwise
|
||||||
*/
|
*/
|
||||||
u32 iort_msi_map_rid(struct device *dev, u32 req_id)
|
u32 iort_msi_map_id(struct device *dev, u32 input_id)
|
||||||
{
|
{
|
||||||
struct acpi_iort_node *node;
|
struct acpi_iort_node *node;
|
||||||
u32 dev_id;
|
u32 dev_id;
|
||||||
|
|
||||||
node = iort_find_dev_node(dev);
|
node = iort_find_dev_node(dev);
|
||||||
if (!node)
|
if (!node)
|
||||||
return req_id;
|
return input_id;
|
||||||
|
|
||||||
iort_node_map_id(node, req_id, &dev_id, IORT_MSI_TYPE);
|
iort_node_map_id(node, input_id, &dev_id, IORT_MSI_TYPE);
|
||||||
return dev_id;
|
return dev_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -594,13 +593,13 @@ static int __maybe_unused iort_find_its_base(u32 its_id, phys_addr_t *base)
|
|||||||
/**
|
/**
|
||||||
* iort_dev_find_its_id() - Find the ITS identifier for a device
|
* iort_dev_find_its_id() - Find the ITS identifier for a device
|
||||||
* @dev: The device.
|
* @dev: The device.
|
||||||
* @req_id: Device's requester ID
|
* @id: Device's ID
|
||||||
* @idx: Index of the ITS identifier list.
|
* @idx: Index of the ITS identifier list.
|
||||||
* @its_id: ITS identifier.
|
* @its_id: ITS identifier.
|
||||||
*
|
*
|
||||||
* Returns: 0 on success, appropriate error value otherwise
|
* Returns: 0 on success, appropriate error value otherwise
|
||||||
*/
|
*/
|
||||||
static int iort_dev_find_its_id(struct device *dev, u32 req_id,
|
static int iort_dev_find_its_id(struct device *dev, u32 id,
|
||||||
unsigned int idx, int *its_id)
|
unsigned int idx, int *its_id)
|
||||||
{
|
{
|
||||||
struct acpi_iort_its_group *its;
|
struct acpi_iort_its_group *its;
|
||||||
@ -610,7 +609,7 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id,
|
|||||||
if (!node)
|
if (!node)
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
|
||||||
node = iort_node_map_id(node, req_id, NULL, IORT_MSI_TYPE);
|
node = iort_node_map_id(node, id, NULL, IORT_MSI_TYPE);
|
||||||
if (!node)
|
if (!node)
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
|
||||||
@ -633,19 +632,20 @@ static int iort_dev_find_its_id(struct device *dev, u32 req_id,
|
|||||||
*
|
*
|
||||||
* Returns: the MSI domain for this device, NULL otherwise
|
* Returns: the MSI domain for this device, NULL otherwise
|
||||||
*/
|
*/
|
||||||
struct irq_domain *iort_get_device_domain(struct device *dev, u32 req_id)
|
struct irq_domain *iort_get_device_domain(struct device *dev, u32 id,
|
||||||
|
enum irq_domain_bus_token bus_token)
|
||||||
{
|
{
|
||||||
struct fwnode_handle *handle;
|
struct fwnode_handle *handle;
|
||||||
int its_id;
|
int its_id;
|
||||||
|
|
||||||
if (iort_dev_find_its_id(dev, req_id, 0, &its_id))
|
if (iort_dev_find_its_id(dev, id, 0, &its_id))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
handle = iort_find_domain_token(its_id);
|
handle = iort_find_domain_token(its_id);
|
||||||
if (!handle)
|
if (!handle)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
return irq_find_matching_fwnode(handle, DOMAIN_BUS_PCI_MSI);
|
return irq_find_matching_fwnode(handle, bus_token);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void iort_set_device_domain(struct device *dev,
|
static void iort_set_device_domain(struct device *dev,
|
||||||
|
|||||||
@ -156,8 +156,8 @@ static int create_pnp_modalias(struct acpi_device *acpi_dev, char *modalias,
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
len = snprintf(modalias, size, "acpi:");
|
len = snprintf(modalias, size, "acpi:");
|
||||||
if (len <= 0)
|
if (len >= size)
|
||||||
return len;
|
return -ENOMEM;
|
||||||
|
|
||||||
size -= len;
|
size -= len;
|
||||||
|
|
||||||
@ -210,8 +210,10 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,
|
|||||||
len = snprintf(modalias, size, "of:N%sT", (char *)buf.pointer);
|
len = snprintf(modalias, size, "of:N%sT", (char *)buf.pointer);
|
||||||
ACPI_FREE(buf.pointer);
|
ACPI_FREE(buf.pointer);
|
||||||
|
|
||||||
if (len <= 0)
|
if (len >= size)
|
||||||
return len;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
size -= len;
|
||||||
|
|
||||||
of_compatible = acpi_dev->data.of_compatible;
|
of_compatible = acpi_dev->data.of_compatible;
|
||||||
if (of_compatible->type == ACPI_TYPE_PACKAGE) {
|
if (of_compatible->type == ACPI_TYPE_PACKAGE) {
|
||||||
|
|||||||
@ -646,6 +646,7 @@ acpi_fwnode_get_named_child_node(const struct fwnode_handle *fwnode,
|
|||||||
* @index: Index of the reference to return
|
* @index: Index of the reference to return
|
||||||
* @num_args: Maximum number of arguments after each reference
|
* @num_args: Maximum number of arguments after each reference
|
||||||
* @args: Location to store the returned reference with optional arguments
|
* @args: Location to store the returned reference with optional arguments
|
||||||
|
* (may be NULL)
|
||||||
*
|
*
|
||||||
* Find property with @name, verifify that it is a package containing at least
|
* Find property with @name, verifify that it is a package containing at least
|
||||||
* one object reference and if so, store the ACPI device object pointer to the
|
* one object reference and if so, store the ACPI device object pointer to the
|
||||||
@ -704,6 +705,9 @@ int __acpi_node_get_property_reference(const struct fwnode_handle *fwnode,
|
|||||||
if (ret)
|
if (ret)
|
||||||
return ret == -ENODEV ? -EINVAL : ret;
|
return ret == -ENODEV ? -EINVAL : ret;
|
||||||
|
|
||||||
|
if (!args)
|
||||||
|
return 0;
|
||||||
|
|
||||||
args->fwnode = acpi_fwnode_handle(device);
|
args->fwnode = acpi_fwnode_handle(device);
|
||||||
args->nargs = 0;
|
args->nargs = 0;
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@ -442,6 +442,32 @@ static const struct dmi_system_id asus_laptop[] = {
|
|||||||
DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"),
|
DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
/* TongFang GMxXGxx/TUXEDO Polaris 15 Gen5 AMD */
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_BOARD_NAME, "GMxXGxx"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
/* Asus ExpertBook B1402CVA */
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
|
||||||
|
DMI_MATCH(DMI_BOARD_NAME, "B1402CVA"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
/* TongFang GMxXGxx sold as Eluktronics Inc. RP-15 */
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_SYS_VENDOR, "Eluktronics Inc."),
|
||||||
|
DMI_MATCH(DMI_BOARD_NAME, "RP-15"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
/* TongFang GM6XGxX/TUXEDO Stellaris 16 Gen5 AMD */
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_BOARD_NAME, "GM6XGxX"),
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.ident = "Asus ExpertBook B2502",
|
.ident = "Asus ExpertBook B2502",
|
||||||
.matches = {
|
.matches = {
|
||||||
|
|||||||
@ -5106,7 +5106,7 @@ static __poll_t binder_poll(struct file *filp,
|
|||||||
|
|
||||||
thread = binder_get_thread(proc);
|
thread = binder_get_thread(proc);
|
||||||
if (!thread)
|
if (!thread)
|
||||||
return POLLERR;
|
return EPOLLERR;
|
||||||
|
|
||||||
binder_inner_proc_lock(thread->proc);
|
binder_inner_proc_lock(thread->proc);
|
||||||
thread->looper |= BINDER_LOOPER_STATE_POLL;
|
thread->looper |= BINDER_LOOPER_STATE_POLL;
|
||||||
|
|||||||
@ -272,7 +272,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
|
|||||||
}
|
}
|
||||||
if (mm) {
|
if (mm) {
|
||||||
up_write(&mm->mmap_sem);
|
up_write(&mm->mmap_sem);
|
||||||
mmput(mm);
|
mmput_async(mm);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@ -305,7 +305,7 @@ err_page_ptr_cleared:
|
|||||||
err_no_vma:
|
err_no_vma:
|
||||||
if (mm) {
|
if (mm) {
|
||||||
up_write(&mm->mmap_sem);
|
up_write(&mm->mmap_sem);
|
||||||
mmput(mm);
|
mmput_async(mm);
|
||||||
}
|
}
|
||||||
return vma ? -ENOMEM : -ESRCH;
|
return vma ? -ENOMEM : -ESRCH;
|
||||||
}
|
}
|
||||||
@ -422,17 +422,17 @@ static struct binder_buffer *binder_alloc_new_buf_locked(
|
|||||||
alloc->pid, extra_buffers_size);
|
alloc->pid, extra_buffers_size);
|
||||||
return ERR_PTR(-EINVAL);
|
return ERR_PTR(-EINVAL);
|
||||||
}
|
}
|
||||||
if (is_async &&
|
|
||||||
alloc->free_async_space < size + sizeof(struct binder_buffer)) {
|
/* Pad 0-size buffers so they get assigned unique addresses */
|
||||||
|
size = max(size, sizeof(void *));
|
||||||
|
|
||||||
|
if (is_async && alloc->free_async_space < size) {
|
||||||
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
|
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
|
||||||
"%d: binder_alloc_buf size %zd failed, no async space left\n",
|
"%d: binder_alloc_buf size %zd failed, no async space left\n",
|
||||||
alloc->pid, size);
|
alloc->pid, size);
|
||||||
return ERR_PTR(-ENOSPC);
|
return ERR_PTR(-ENOSPC);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Pad 0-size buffers so they get assigned unique addresses */
|
|
||||||
size = max(size, sizeof(void *));
|
|
||||||
|
|
||||||
while (n) {
|
while (n) {
|
||||||
buffer = rb_entry(n, struct binder_buffer, rb_node);
|
buffer = rb_entry(n, struct binder_buffer, rb_node);
|
||||||
BUG_ON(!buffer->free);
|
BUG_ON(!buffer->free);
|
||||||
@ -534,7 +534,7 @@ static struct binder_buffer *binder_alloc_new_buf_locked(
|
|||||||
buffer->pid = pid;
|
buffer->pid = pid;
|
||||||
buffer->oneway_spam_suspect = false;
|
buffer->oneway_spam_suspect = false;
|
||||||
if (is_async) {
|
if (is_async) {
|
||||||
alloc->free_async_space -= size + sizeof(struct binder_buffer);
|
alloc->free_async_space -= size;
|
||||||
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
|
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
|
||||||
"%d: binder_alloc_buf size %zd async free %zd\n",
|
"%d: binder_alloc_buf size %zd async free %zd\n",
|
||||||
alloc->pid, size, alloc->free_async_space);
|
alloc->pid, size, alloc->free_async_space);
|
||||||
@ -572,7 +572,7 @@ err_alloc_buf_struct_failed:
|
|||||||
* is the sum of the three given sizes (each rounded up to
|
* is the sum of the three given sizes (each rounded up to
|
||||||
* pointer-sized boundary)
|
* pointer-sized boundary)
|
||||||
*
|
*
|
||||||
* Return: The allocated buffer or %NULL if error
|
* Return: The allocated buffer or %ERR_PTR(-errno) if error
|
||||||
*/
|
*/
|
||||||
struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc,
|
struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc,
|
||||||
size_t data_size,
|
size_t data_size,
|
||||||
@ -671,8 +671,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
|
|||||||
BUG_ON(buffer->user_data > alloc->buffer + alloc->buffer_size);
|
BUG_ON(buffer->user_data > alloc->buffer + alloc->buffer_size);
|
||||||
|
|
||||||
if (buffer->async_transaction) {
|
if (buffer->async_transaction) {
|
||||||
alloc->free_async_space += buffer_size + sizeof(struct binder_buffer);
|
alloc->free_async_space += buffer_size;
|
||||||
|
|
||||||
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
|
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
|
||||||
"%d: binder_free_buf size %zd async free %zd\n",
|
"%d: binder_free_buf size %zd async free %zd\n",
|
||||||
alloc->pid, size, alloc->free_async_space);
|
alloc->pid, size, alloc->free_async_space);
|
||||||
@ -720,7 +719,7 @@ void binder_alloc_free_buf(struct binder_alloc *alloc,
|
|||||||
/*
|
/*
|
||||||
* We could eliminate the call to binder_alloc_clear_buf()
|
* We could eliminate the call to binder_alloc_clear_buf()
|
||||||
* from binder_alloc_deferred_release() by moving this to
|
* from binder_alloc_deferred_release() by moving this to
|
||||||
* binder_alloc_free_buf_locked(). However, that could
|
* binder_free_buf_locked(). However, that could
|
||||||
* increase contention for the alloc mutex if clear_on_free
|
* increase contention for the alloc mutex if clear_on_free
|
||||||
* is used frequently for large buffers. The mutex is not
|
* is used frequently for large buffers. The mutex is not
|
||||||
* needed for correctness here.
|
* needed for correctness here.
|
||||||
@ -1011,7 +1010,9 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
|
|||||||
goto err_mmget;
|
goto err_mmget;
|
||||||
if (!down_read_trylock(&mm->mmap_sem))
|
if (!down_read_trylock(&mm->mmap_sem))
|
||||||
goto err_down_read_mmap_sem_failed;
|
goto err_down_read_mmap_sem_failed;
|
||||||
vma = binder_alloc_get_vma(alloc);
|
vma = find_vma(mm, page_addr);
|
||||||
|
if (vma && vma != binder_alloc_get_vma(alloc))
|
||||||
|
goto err_invalid_vma;
|
||||||
|
|
||||||
list_lru_isolate(lru, item);
|
list_lru_isolate(lru, item);
|
||||||
spin_unlock(lock);
|
spin_unlock(lock);
|
||||||
@ -1037,6 +1038,8 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
|
|||||||
mutex_unlock(&alloc->mutex);
|
mutex_unlock(&alloc->mutex);
|
||||||
return LRU_REMOVED_RETRY;
|
return LRU_REMOVED_RETRY;
|
||||||
|
|
||||||
|
err_invalid_vma:
|
||||||
|
up_read(&mm->mmap_sem);
|
||||||
err_down_read_mmap_sem_failed:
|
err_down_read_mmap_sem_failed:
|
||||||
mmput_async(mm);
|
mmput_async(mm);
|
||||||
err_mmget:
|
err_mmget:
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user