a8a0447e0d
https://source.android.com/docs/security/bulletin/2023-06-01 * tag 'ASB-2023-06-05_11-5.4' of https://android.googlesource.com/kernel/common: UPSTREAM: io_uring: have io_kill_timeout() honor the request references UPSTREAM: io_uring: don't drop completion lock before timer is fully initialized UPSTREAM: io_uring: always grab lock in io_cancel_async_work() UPSTREAM: net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize UPSTREAM: cdc_ncm: Fix the build warning UPSTREAM: cdc_ncm: Implement the 32-bit version of NCM Transfer Block UPSTREAM: ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum UPSTREAM: ext4: fix invalid free tracking in ext4_xattr_move_to_block() Revert "Revert "mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse"" FROMLIST: binder: fix UAF caused by faulty buffer cleanup Linux 5.4.242 ASN.1: Fix check for strdup() success iio: adc: at91-sama5d2_adc: fix an error code in at91_adc_allocate_trigger() pwm: meson: Explicitly set .polarity in .get_state() xfs: fix forkoff miscalculation related to XFS_LITINO(mp) sctp: Call inet6_destroy_sock() via sk->sk_destruct(). dccp: Call inet6_destroy_sock() via sk->sk_destruct(). inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy(). tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct(). udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM). ext4: fix use-after-free in ext4_xattr_set_entry ext4: remove duplicate definition of ext4_xattr_ibody_inline_set() Revert "ext4: fix use-after-free in ext4_xattr_set_entry" x86/purgatory: Don't generate debug info for purgatory.ro MIPS: Define RUNTIME_DISCARD_EXIT in LD script mmc: sdhci_am654: Set HIGH_SPEED_ENA for SDR12 and SDR25 memstick: fix memory leak if card device is never registered nilfs2: initialize unused bytes in segment summary blocks iio: light: tsl2772: fix reading proximity-diodes from device tree xen/netback: use same error messages for same errors nvme-tcp: fix a possible UAF when failing to allocate an io queue s390/ptrace: fix PTRACE_GET_LAST_BREAK error handling net: dsa: b53: mmap: add phy ops scsi: core: Improve scsi_vpd_inquiry() checks scsi: megaraid_sas: Fix fw_crash_buffer_show() selftests: sigaltstack: fix -Wuninitialized Input: i8042 - add quirk for Fujitsu Lifebook A574/H f2fs: Fix f2fs_truncate_partial_nodes ftrace event e1000e: Disable TSO on i219-LM card to increase speed bpf: Fix incorrect verifier pruning due to missing register precision taints mlxfw: fix null-ptr-deref in mlxfw_mfa2_tlv_next() i40e: fix i40e_setup_misc_vector() error handling i40e: fix accessing vsi->active_filters without holding lock netfilter: nf_tables: fix ifdef to also consider nf_tables=m virtio_net: bugfix overflow inside xdp_linearize_page() net: sched: sch_qfq: prevent slab-out-of-bounds in qfq_activate_agg regulator: fan53555: Explicitly include bits header netfilter: br_netfilter: fix recent physdev match breakage arm64: dts: meson-g12-common: specify full DMC range ARM: dts: rockchip: fix a typo error for rk3288 spdif node Linux 5.4.241 xfs: force log and push AIL to clear pinned inodes when aborting mount xfs: don't reuse busy extents on extent trim xfs: consider shutdown in bmapbt cursor delete assert xfs: shut down the filesystem if we screw up quota reservation xfs: report corruption only as a regular error xfs: set inode size after creating symlink xfs: fix up non-directory creation in SGID directories xfs: remove the di_version field from struct icdinode xfs: simplify a check in xfs_ioctl_setattr_check_cowextsize xfs: simplify di_flags2 inheritance in xfs_ialloc xfs: only check the superblock version for dinode size calculation xfs: add a new xfs_sb_version_has_v3inode helper xfs: remove the kuid/kgid conversion wrappers xfs: remove the icdinode di_uid/di_gid members xfs: ensure that the inode uid/gid match values match the icdinode ones xfs: merge the projid fields in struct xfs_icdinode xfs: show the proper user quota options coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug watchdog: sbsa_wdog: Make sure the timeout programming is within the limits i2c: ocores: generate stop condition after timeout in polling mode ubi: Fix deadlock caused by recursively holding work_sem mtd: ubi: wl: Fix a couple of kernel-doc issues ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size asymmetric_keys: log on fatal failures in PE/pkcs7 verify_pefile: relax wrapper length check drm: panel-orientation-quirks: Add quirk for Lenovo Yoga Book X90F efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L i2c: imx-lpi2c: clean rx/tx buffers upon new message power: supply: cros_usbpd: reclassify "default case!" as debug net: macb: fix a memory corruption in extended buffer descriptor mode udp6: fix potential access to stale information RDMA/core: Fix GID entry ref leak when create_ah fails sctp: fix a potential overflow in sctp_ifwdtsn_skip qlcnic: check pci_reset_function result niu: Fix missing unwind goto in niu_alloc_channels() 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition mtd: rawnand: stm32_fmc2: remove unsupported EDO mode mtd: rawnand: meson: fix bitmask for length in command word mtdblock: tolerate corrected bit-flips btrfs: fix fast csum implementation detection btrfs: print checksum type and implementation at mount time Bluetooth: Fix race condition in hidp_session_thread Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp} ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex() ALSA: i2c/cs8427: fix iec958 mixer control deactivation ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard ALSA: emu10k1: fix capture interrupt handler unlinking Revert "pinctrl: amd: Disable and mask interrupts on resume" irqdomain: Fix mapping-creation race irqdomain: Refactor __irq_domain_alloc_irqs() irqdomain: Look for existing mapping only once mm/swap: fix swap_info_struct race between swapoff and get_swap_pages() ring-buffer: Fix race while reader and writer are on the same page drm/panfrost: Fix the panfrost_mmu_map_fault_addr() error path net_sched: prevent NULL dereference if default qdisc setup failed tracing: Free error logs of tracing instances can: j1939: j1939_tp_tx_dat_new(): fix out-of-bounds memory access ftrace: Mark get_lock_parent_ip() __always_inline perf/core: Fix the same task check in perf_event_set_output ALSA: hda/realtek: Add quirk for Clevo X370SNW nilfs2: fix sysfs interface lifetime nilfs2: fix potential UAF of struct nilfs_sc_info in nilfs_segctor_thread() tty: serial: fsl_lpuart: avoid checking for transfer complete when UARTCTRL_SBK is asserted in lpuart32_tx_empty tty: serial: sh-sci: Fix Rx on RZ/G2L SCI tty: serial: sh-sci: Fix transmit end interrupt handler iio: dac: cio-dac: Fix max DAC write value check for 12-bit iio: adc: ti-ads7950: Set `can_sleep` flag for GPIO chip USB: serial: option: add Quectel RM500U-CN modem USB: serial: option: add Telit FE990 compositions usb: typec: altmodes/displayport: Fix configure initial pin assignment USB: serial: cp210x: add Silicon Labs IFS-USB-DATACABLE IDs xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu NFSD: callback request does not use correct credential for AUTH_SYS sunrpc: only free unix grouplist after RCU settles gpio: davinci: Add irq chip flag to skip set wake ipv6: Fix an uninit variable access bug in __ip6_make_skb() sctp: check send stream number after wait_for_sndbuf net: don't let netpoll invoke NAPI if in xmit context icmp: guard against too small mtu wifi: mac80211: fix invalid drv_sta_pre_rcu_remove calls for non-uploaded sta pwm: sprd: Explicitly set .polarity in .get_state() pwm: cros-ec: Explicitly set .polarity in .get_state() pinctrl: amd: Disable and mask interrupts on resume pinctrl: amd: disable and mask interrupts on probe pinctrl: amd: Use irqchip template smb3: fix problem with null cifs super block with previous patch treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD() Revert "treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()" cgroup/cpuset: Wake up cpuset_attach_wq tasks in cpuset_cancel_attach() x86/PCI: Add quirk for AMD XHCI controller that loses MSI-X state in D3hot scsi: ses: Handle enclosure with just a primary component gracefully Linux 5.4.240 gfs2: Always check inode size of inline inodes firmware: arm_scmi: Fix device node validation for mailbox transport net: sched: fix race condition in qdisc_graft() net_sched: add __rcu annotation to netdev->qdisc ext4: fix kernel BUG in 'ext4_write_inline_data_end()' btrfs: scan device in non-exclusive mode s390/uaccess: add missing earlyclobber annotations to __clear_user() drm/etnaviv: fix reference leak when mmaping imported buffer ALSA: usb-audio: Fix regression on detection of Roland VS-100 ALSA: hda/conexant: Partial revert of a quirk for Lenovo NFSv4: Fix hangs when recovering open state after a server reboot pinctrl: at91-pio4: fix domain name assignment xen/netback: don't do grant copy across page boundary Input: goodix - add Lenovo Yoga Book X90F to nine_bytes_report DMI table cifs: fix DFS traversal oops without CONFIG_CIFS_DFS_UPCALL cifs: prevent infinite recursion in CIFSGetDFSRefer() Input: focaltech - use explicitly signed char type Input: alps - fix compatibility with -funsigned-char pinctrl: ocelot: Fix alt mode for ocelot net: mvneta: make tx buffer array agnostic net: dsa: mv88e6xxx: Enable IGMP snooping on user ports only bnxt_en: Fix typo in PCI id to device description string mapping i40e: fix registers dump after run ethtool adapter self test s390/vfio-ap: fix memory leak in vfio_ap device driver can: bcm: bcm_tx_setup(): fix KMSAN uninit-value in vfs_write net/net_failover: fix txq exceeding warning regulator: Handle deferred clk regulator: fix spelling mistake "Cant" -> "Can't" ptp_qoriq: fix memory leak in probe() scsi: megaraid_sas: Fix crash after a double completion mtd: rawnand: meson: invalidate cache on polling ECC bit mips: bmips: BCM6358: disable RAC flush for TP1 dma-mapping: drop the dev argument to arch_sync_dma_for_* ca8210: Fix unsigned mac_len comparison with zero in ca8210_skb_tx() fbdev: au1200fb: Fix potential divide by zero fbdev: lxfb: Fix potential divide by zero fbdev: intelfb: Fix potential divide by zero fbdev: nvidia: Fix potential divide by zero sched_getaffinity: don't assume 'cpumask_size()' is fully initialized fbdev: tgafb: Fix potential divide by zero ALSA: hda/ca0132: fixup buffer overrun at tuning_ctl_set() ALSA: asihpi: check pao in control_message() md: avoid signed overflow in slot_store() bus: imx-weim: fix branch condition evaluates to a garbage value fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY ocfs2: fix data corruption after failed write tun: avoid double free in tun_free_netdev sched/fair: Sanitize vruntime of entity being migrated sched/fair: sanitize vruntime of entity being placed dm crypt: add cond_resched() to dmcrypt_write() dm stats: check for and propagate alloc_percpu failure i2c: xgene-slimpro: Fix out-of-bounds bug in xgene_slimpro_i2c_xfer() nilfs2: fix kernel-infoleak in nilfs_ioctl_wrap_copy() wifi: mac80211: fix qos on mesh interfaces usb: chipidea: core: fix possible concurrent when switch role usb: chipdea: core: fix return -EINVAL if request role is the same with current role usb: cdns3: Fix issue with using incorrect PCI device function dm thin: fix deadlock when swapping to thin device igb: revert rtnl_lock() that causes deadlock fsverity: Remove WQ_UNBOUND from fsverity read workqueue usb: gadget: u_audio: don't let userspace block driver unbind scsi: core: Add BLIST_SKIP_VPD_PAGES for SKhynix H28U74301AMR cifs: empty interface list when server doesn't support query interfaces sh: sanitize the flags on sigreturn net: usb: qmi_wwan: add Telit 0x1080 composition net: usb: cdc_mbim: avoid altsetting toggling for Telit FE990 scsi: lpfc: Avoid usage of list iterator variable after loop scsi: ufs: core: Add soft dependency on governor_simpleondemand scsi: target: iscsi: Fix an error message in iscsi_check_key() selftests/bpf: check that modifier resolves after pointer m68k: Only force 030 bus error if PC not in exception table ca8210: fix mac_len negative array access riscv: Bump COMMAND_LINE_SIZE value to 1024 thunderbolt: Use const qualifier for `ring_interrupt_index` uas: Add US_FL_NO_REPORT_OPCODES for JMicron JMS583Gen 2 scsi: qla2xxx: Perform lockless command completion in abort path hwmon (it87): Fix voltage scaling for chips with 10.9mV ADCs platform/chrome: cros_ec_chardev: fix kernel data leak from ioctl Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work Bluetooth: btqcomsmd: Fix command timeout after setting BD address net: mdio: thunder: Add missing fwnode_handle_put() hvc/xen: prevent concurrent accesses to the shared ring nvme-tcp: fix nvme_tcp_term_pdu to match spec net/sonic: use dma_mapping_error() for error check erspan: do not use skb_mac_header() in ndo_start_xmit() atm: idt77252: fix kmemleak when rmmod idt77252 net/mlx5: Read the TC mapping of all priorities on ETS query bpf: Adjust insufficient default bpf_jit_limit keys: Do not cache key in task struct if key is requested from kernel thread net/ps3_gelic_net: Use dma_mapping_error net/ps3_gelic_net: Fix RX sk_buff length net: qcom/emac: Fix use after free bug in emac_remove due to race condition xirc2ps_cs: Fix use after free bug in xirc2ps_detach qed/qed_sriov: guard against NULL derefs from qed_iov_get_vf_info net: usb: smsc95xx: Limit packet length to skb->len scsi: scsi_dh_alua: Fix memleak for 'qdata' in alua_activate() i2c: imx-lpi2c: check only for enabled interrupt flags igbvf: Regard vf reset nack as success intel/igbvf: free irq on the error path in igbvf_request_msix() iavf: fix non-tunneled IPv6 UDP packet type and hashing iavf: fix inverted Rx hash condition leading to disabled hash power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition net: tls: fix possible race condition between do_tls_getsockopt_conf() and do_tls_setsockopt_conf() Linux 5.4.239 selftests: Fix the executable permissions for fib_tests.sh BACKPORT: mac80211_hwsim: notify wmediumd of used MAC addresses FROMGIT: mac80211_hwsim: add concurrent channels scanning support over virtio Revert "HID: core: Provide new max_buffer_size attribute to over-ride the default" Revert "HID: uhid: Over-ride the default maximum data buffer value with our own" Linux 5.4.238 HID: uhid: Over-ride the default maximum data buffer value with our own HID: core: Provide new max_buffer_size attribute to over-ride the default PCI: Unify delay handling for reset and resume s390/ipl: add missing intersection check to ipl_report handling serial: 8250_em: Fix UART port type drm/i915: Don't use stolen memory for ring buffers with LLC x86/mm: Fix use of uninitialized buffer in sme_enable() fbdev: stifb: Provide valid pixelclock and add fb_check_var() checks ftrace: Fix invalid address access in lookup_rec() when index is 0 KVM: nVMX: add missing consistency checks for CR0 and CR4 tracing: Make tracepoint lockdep check actually test something tracing: Check field value in hist_field_name() interconnect: fix mem leak when freeing nodes tty: serial: fsl_lpuart: skip waiting for transmission complete when UARTCTRL_SBK is asserted ext4: fix possible double unlock when moving a directory sh: intc: Avoid spurious sizeof-pointer-div warning drm/amdkfd: Fix an illegal memory access ext4: fix task hung in ext4_xattr_delete_inode ext4: fail ext4_iget if special inode unallocated jffs2: correct logic when creating a hole in jffs2_write_begin mmc: atmel-mci: fix race between stop command and start of next command media: m5mols: fix off-by-one loop termination error hwmon: (ina3221) return prober error code hwmon: (xgene) Fix use after free bug in xgene_hwmon_remove due to race condition hwmon: (adt7475) Fix masking of hysteresis registers hwmon: (adt7475) Display smoothing attributes in correct order ethernet: sun: add check for the mdesc_grab() net/iucv: Fix size of interrupt data net: usb: smsc75xx: Move packet length check to prevent kernel panic in skb_pull ipv4: Fix incorrect table ID in IOCTL path block: sunvdc: add check for mdesc_grab() returning NULL nvmet: avoid potential UAF in nvmet_req_complete() net: usb: smsc75xx: Limit packet length to skb->len nfc: st-nci: Fix use after free bug in ndlc_remove due to race condition net: phy: smsc: bail out in lan87xx_read_status if genphy_read_status fails net: tunnels: annotate lockless accesses to dev->needed_headroom qed/qed_dev: guard against a possible division by zero i40e: Fix kernel crash during reboot when adapter is in recovery mode ipvlan: Make skb->skb_iif track skb->dev for l3s mode nfc: pn533: initialize struct pn533_out_arg properly tcp: tcp_make_synack() can be called from process context scsi: core: Fix a procfs host directory removal regression scsi: core: Fix a comment in function scsi_host_dev_release() netfilter: nft_redir: correct value of inet type `.maxattrs` ALSA: hda: Match only Intel devices with CONTROLLER_IN_GPU() ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid ALSA: hda: Add Alderlake-S PCI ID and HDMI codec vid ALSA: hda - controller is in GPU on the DG1 ALSA: hda - add Intel DG1 PCI and HDMI ids scsi: mpt3sas: Fix NULL pointer access in mpt3sas_transport_port_add() docs: Correct missing "d_" prefix for dentry_operations member d_weak_revalidate clk: HI655X: select REGMAP instead of depending on it drm/meson: fix 1px pink line on GXM when scaling video overlay cifs: Move the in_send statistic to __smb_send_rqst() drm/panfrost: Don't sync rpm suspension after mmu flushing xfrm: Allow transport-mode states with AF_UNSPEC selector ext4: fix cgroup writeback accounting with fs-layer encryption ANDROID: preserve CRC for __irq_domain_add() Revert "drm/exynos: Don't reset bridge->next" Revert "drm/bridge: Rename bridge helpers targeting a bridge chain" Revert "drm/bridge: Introduce drm_bridge_get_next_bridge()" Revert "drm: Initialize struct drm_crtc_state.no_vblank from device settings" Revert "drm/msm/mdp5: Add check for kzalloc" Linux 5.4.237 s390/dasd: add missing discipline function UML: define RUNTIME_DISCARD_EXIT sh: define RUNTIME_DISCARD_EXIT s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36 powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT arch: fix broken BuildID for arm64 and riscv x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS drm/i915: Don't use BAR mappings for ring buffers with LLC ipmi:watchdog: Set panic count to proper value on a panic ipmi/watchdog: replace atomic_add() and atomic_sub() media: ov5640: Fix analogue gain control PCI: Add SolidRun vendor ID macintosh: windfarm: Use unsigned type for 1-bit bitfields alpha: fix R_ALPHA_LITERAL reloc for large modules MIPS: Fix a compilation issue ext4: Fix deadlock during directory rename riscv: Use READ_ONCE_NOCHECK in imprecise unwinding stack mode net/smc: fix fallback failed while sendmsg with fastopen scsi: megaraid_sas: Update max supported LD IDs to 240 btf: fix resolving BTF_KIND_VAR after ARRAY, STRUCT, UNION, PTR netfilter: tproxy: fix deadlock due to missing BH disable bnxt_en: Avoid order-5 memory allocation for TPA data net: caif: Fix use-after-free in cfusbl_device_notify() net: lan78xx: fix accessing the LAN7800's internal phy specific registers from the MAC driver net: usb: lan78xx: Remove lots of set but unused 'ret' variables selftests: nft_nat: ensuring the listening side is up before starting the client ila: do not generate empty messages in ila_xlat_nl_cmd_get_mapping() nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties drm/msm/a5xx: fix setting of the CP_PREEMPT_ENABLE_LOCAL register ext4: Fix possible corruption when moving a directory scsi: core: Remove the /proc/scsi/${proc_name} directory earlier cifs: Fix uninitialized memory read in smb3_qfs_tcon() SMB3: Backup intent flag missing from some more ops iommu/vt-d: Fix PASID directory pointer coherency irqdomain: Fix domain registration race irqdomain: Change the type of 'size' in __irq_domain_add() to be consistent ipmi:ssif: Add a timer between request retries ipmi:ssif: Increase the message retry time ipmi:ssif: Remove rtc_us_timer ipmi:ssif: resend_msg() cannot fail ipmi:ssif: make ssif_i2c_send() void iommu/amd: Add a length limitation for the ivrs_acpihid command-line parameter iommu/amd: Fix ill-formed ivrs_ioapic, ivrs_hpet and ivrs_acpihid options iommu/amd: Add PCI segment support for ivrs_[ioapic/hpet/acpihid] commands nfc: change order inside nfc_se_io error path ext4: zero i_disksize when initializing the bootloader inode ext4: fix WARNING in ext4_update_inline_data ext4: move where set the MAY_INLINE_DATA flag is set ext4: fix another off-by-one fsmap error on 1k block filesystems ext4: fix RENAME_WHITEOUT handling for inline directories drm/connector: print max_requested_bpc in state debugfs x86/CPU/AMD: Disable XSAVES on AMD family 0x17 fs: prevent out-of-bounds array speculation when closing a file descriptor Linux 5.4.236 staging: rtl8192e: Remove call_usermodehelper starting RadioPower.sh staging: rtl8192e: Remove function ..dm_check_ac_dc_power calling a script wifi: cfg80211: Partial revert "wifi: cfg80211: Fix use after free for wext" Linux 5.4.235 dt-bindings: rtc: sun6i-a31-rtc: Loosen the requirements on the clocks media: uvcvideo: Fix race condition with usb_kill_urb media: uvcvideo: Provide sync and async uvc_ctrl_status_event tcp: Fix listen() regression in 5.4.229. Bluetooth: hci_sock: purge socket queues in the destruct() callback x86/resctl: fix scheduler confusion with 'current' x86/resctrl: Apply READ_ONCE/WRITE_ONCE to task_struct.{rmid,closid} net: tls: avoid hanging tasks on the tx_lock phy: rockchip-typec: Fix unsigned comparison with less than zero PCI: Add ACS quirk for Wangxun NICs kernel/fail_function: fix memory leak with using debugfs_lookup() usb: uvc: Enumerate valid values for color matching USB: ene_usb6250: Allocate enough memory for full object usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_config_word() iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_status_word() tools/iio/iio_utils:fix memory leak mei: bus-fixup:upon error print return values of send and receive tty: serial: fsl_lpuart: disable the CTS when send break signal tty: fix out-of-bounds access in tty_driver_lookup_tty() staging: emxx_udc: Add checks for dma_alloc_coherent() media: uvcvideo: Silence memcpy() run-time false positive warnings media: uvcvideo: Quirk for autosuspend in Logitech B910 and C910 media: uvcvideo: Handle errors from calls to usb_string media: uvcvideo: Handle cameras with invalid descriptors mfd: arizona: Use pm_runtime_resume_and_get() to prevent refcnt leak firmware/efi sysfb_efi: Add quirk for Lenovo IdeaPad Duet 3 tracing: Add NULL checks for buffer in ring_buffer_free_read_page() thermal: intel: BXT_PMIC: select REGMAP instead of depending on it thermal: intel: quark_dts: fix error pointer dereference scsi: ipr: Work around fortify-string warning rtc: sun6i: Always export the internal oscillator rtc: sun6i: Make external 32k oscillator optional vc_screen: modify vcs_size() handling in vcs_read() tcp: tcp_check_req() can be called from process context ARM: dts: spear320-hmi: correct STMPE GPIO compatible net/sched: act_sample: fix action bind logic nfc: fix memory leak of se_io context in nfc_genl_se_io net/mlx5: Geneve, Fix handling of Geneve object id as error code 9p/rdma: unmap receive dma buffer in rdma_request()/post_recv() 9p/xen: fix connection sequence 9p/xen: fix version parsing net: fix __dev_kfree_skb_any() vs drop monitor sctp: add a refcnt in sctp_stream_priorities to avoid a nested loop ipv6: Add lwtunnel encap size of all siblings in nexthop calculation netfilter: ctnetlink: fix possible refcount leak in ctnetlink_create_conntrack() watchdog: pcwd_usb: Fix attempting to access uninitialized memory watchdog: Fix kmemleak in watchdog_cdev_register watchdog: at91sam9_wdt: use devm_request_irq to avoid missing free_irq() in error path x86: um: vdso: Add '%rcx' and '%r11' to the syscall clobber list ubi: ubi_wl_put_peb: Fix infinite loop when wear-leveling work failed ubi: Fix UAF wear-leveling entry in eraseblk_count_seq_show() ubifs: ubifs_writepage: Mark page dirty after writing inode failed ubifs: dirty_cow_znode: Fix memleak in error handling path ubifs: Re-statistic cleaned znode count if commit failed ubi: Fix possible null-ptr-deref in ubi_free_volume() ubifs: Fix memory leak in alloc_wbufs() ubi: Fix unreferenced object reported by kmemleak in ubi_resize_volume() ubi: Fix use-after-free when volume resizing failed ubifs: Reserve one leb for each journal head while doing budget ubifs: do_rename: Fix wrong space budget when target inode's nlink > 1 ubifs: Fix wrong dirty space budget for dirty inode ubifs: Rectify space budget for ubifs_xrename() ubifs: Rectify space budget for ubifs_symlink() if symlink is encrypted ubifs: Fix build errors as symbol undefined ubi: ensure that VID header offset + VID header size <= alloc, size um: vector: Fix memory leak in vector_config fs: f2fs: initialize fsdata in pagecache_write() f2fs: use memcpy_{to,from}_page() where possible pwm: stm32-lp: fix the check on arr and cmp registers update pwm: sifive: Always let the first pwm_apply_state succeed pwm: sifive: Reduce time the controller lock is held fs/jfs: fix shift exponent db_agl2size negative net/sched: Retire tcindex classifier kbuild: Port silent mode detection to future gnu make. wifi: ath9k: use proper statements in conditionals drm/radeon: Fix eDP for single-display iMac11,2 drm/i915/quirks: Add inverted backlight quirk for HP 14-r206nv PCI: Avoid FLR for AMD FCH AHCI adapters PCI: hotplug: Allow marking devices as disconnected during bind/unbind PCI/PM: Observe reset delay irrespective of bridge_d3 scsi: ses: Fix slab-out-of-bounds in ses_intf_remove() scsi: ses: Fix possible desc_ptr out-of-bounds accesses scsi: ses: Fix possible addl_desc_ptr out-of-bounds accesses scsi: ses: Fix slab-out-of-bounds in ses_enclosure_data_process() scsi: ses: Don't attach if enclosure has no components scsi: qla2xxx: Fix erroneous link down scsi: qla2xxx: Fix DMA-API call trace on NVMe LS requests scsi: qla2xxx: Fix link failure in NPIV environment ktest.pl: Add RUN_TIMEOUT option with default unlimited ktest.pl: Fix missing "end_monitor" when machine check fails ktest.pl: Give back console on Ctrt^C on monitor mm/thp: check and bail out if page in deferred queue already mm: memcontrol: deprecate charge moving media: ipu3-cio2: Fix PM runtime usage_count in driver unbind mips: fix syscall_get_nr alpha: fix FEN fault handling rbd: avoid use-after-free in do_rbd_add() when rbd_dev_create() fails ARM: dts: exynos: correct TMU phandle in Odroid XU ARM: dts: exynos: correct TMU phandle in Exynos4 dm flakey: don't corrupt the zero page dm flakey: fix logic when corrupting a bio thermal: intel: powerclamp: Fix cur_state for multi package system wifi: cfg80211: Fix use after free for wext wifi: rtl8xxxu: Use a longer retry limit of 48 ext4: refuse to create ea block when umounted ext4: optimize ea_inode block expansion ALSA: hda/realtek: Add quirk for HP EliteDesk 800 G6 Tower PC ALSA: ice1712: Do not left ice->gpio_mutex locked in aureon_add_controls() irqdomain: Drop bogus fwspec-mapping error handling irqdomain: Fix disassociation race irqdomain: Fix association race ima: Align ima_file_mmap() parameters with mmap_file LSM hook Documentation/hw-vuln: Document the interaction between IBRS and STIBP x86/speculation: Allow enabling STIBP with legacy IBRS x86/microcode/AMD: Fix mixed steppings support x86/microcode/AMD: Add a @cpu parameter to the reloading functions x86/microcode/amd: Remove load_microcode_amd()'s bsp parameter x86/kprobes: Fix arch_check_optimized_kprobe check within optimized_kprobe range x86/kprobes: Fix __recover_optprobed_insn check optimizing logic x86/reboot: Disable SVM, not just VMX, when stopping CPUs x86/reboot: Disable virtualization in an emergency if SVM is supported x86/crash: Disable virt in core NMI crash handler to avoid double shootdown x86/virt: Force GIF=1 prior to disabling SVM (for reboot flows) KVM: s390: disable migration mode when dirty tracking is disabled KVM: Destroy target device if coalesced MMIO unregistration fails udf: Fix file corruption when appending just after end of preallocated extent udf: Detect system inodes linked into directory hierarchy udf: Preserve link count of system files udf: Do not update file length for failed writes to inline files udf: Do not bother merging very long extents udf: Truncate added extents on failed expansion ocfs2: fix non-auto defrag path not working issue ocfs2: fix defrag path triggering jbd2 ASSERT f2fs: fix cgroup writeback accounting with fs-layer encryption f2fs: fix information leak in f2fs_move_inline_dirents() fs: hfsplus: fix UAF issue in hfsplus_put_super hfs: fix missing hfs_bnode_get() in __hfs_bnode_create ARM: dts: exynos: correct HDMI phy compatible in Exynos4 s390/kprobes: fix current_kprobe never cleared after kprobes reenter s390/kprobes: fix irq mask clobbering on kprobe reenter from post_handler s390: discard .interp section ipmi_ssif: Rename idle state and check rtc: pm8xxx: fix set-alarm race firmware: coreboot: framebuffer: Ignore reserved pixel color bits wifi: rtl8xxxu: fixing transmisison failure for rtl8192eu nfsd: zero out pointers after putting nfsd_files on COPY setup error dm cache: add cond_resched() to various workqueue loops dm thin: add cond_resched() to various workqueue loops drm: panel-orientation-quirks: Add quirk for Lenovo IdeaPad Duet 3 10IGL5 pinctrl: at91: use devm_kasprintf() to avoid potential leaks hwmon: (coretemp) Simplify platform device handling regulator: s5m8767: Bounds check id indexing into arrays regulator: max77802: Bounds check regulator id against opmode ASoC: kirkwood: Iterate over array indexes instead of using pointer math docs/scripts/gdb: add necessary make scripts_gdb step drm/msm/dsi: Add missing check for alloc_ordered_workqueue drm/radeon: free iio for atombios when driver shutdown HID: Add Mapping for System Microphone Mute drm/omap: dsi: Fix excessive stack usage drm/amd/display: Fix potential null-deref in dm_resume uaccess: Add minimum bounds check on kernel buffer size coda: Avoid partial allocation of sig_inputArgs net/mlx5: fw_tracer: Fix debug print ACPI: video: Fix Lenovo Ideapad Z570 DMI match wifi: mt76: dma: free rx_head in mt76_dma_rx_cleanup m68k: Check syscall_trace_enter() return code net: bcmgenet: Add a check for oversized packets ACPI: Don't build ACPICA with '-Os' ice: add missing checks for PF vsi type inet: fix fast path in __inet_hash_connect() wifi: mt7601u: fix an integer underflow wifi: brcmfmac: ensure CLM version is null-terminated to prevent stack-out-of-bounds x86/bugs: Reset speculation control settings on init timers: Prevent union confusion from unexpected restart_syscall() thermal: intel: Fix unsigned comparison with less than zero rcu: Suppress smp_processor_id() complaint in synchronize_rcu_expedited_wait() wifi: brcmfmac: Fix potential stack-out-of-bounds in brcmf_c_preinit_dcmds() blk-iocost: fix divide by 0 error in calc_lcoefs() ARM: dts: exynos: Use Exynos5420 compatible for the MIPI video phy udf: Define EFSCORRUPTED error code rpmsg: glink: Avoid infinite loop on intent for missing channel media: usb: siano: Fix use after free bugs caused by do_submit_urb media: i2c: ov7670: 0 instead of -EINVAL was returned media: rc: Fix use-after-free bugs caused by ene_tx_irqsim() media: i2c: ov772x: Fix memleak in ov772x_probe() media: ov5675: Fix memleak in ov5675_init_controls() powerpc: Remove linker flag from KBUILD_AFLAGS media: platform: ti: Add missing check for devm_regulator_get remoteproc: qcom_q6v5_mss: Use a carveout to authenticate modem headers MIPS: vpe-mt: drop physical_memsize MIPS: SMP-CPS: fix build error when HOTPLUG_CPU not set powerpc/eeh: Set channel state after notifying the drivers powerpc/eeh: Small refactor of eeh_handle_normal_event() powerpc/rtas: ensure 4KB alignment for rtas_data_buf powerpc/rtas: make all exports GPL powerpc/pseries/lparcfg: add missing RTAS retry status handling powerpc/pseries/lpar: add missing RTAS retry status handling clk: Honor CLK_OPS_PARENT_ENABLE in clk_core_is_enabled() powerpc/powernv/ioda: Skip unallocated resources when mapping to PE clk: qcom: gpucc-sdm845: fix clk_dis_wait being programmed for CX GDSC Input: ads7846 - don't check penirq immediately for 7845 Input: ads7846 - don't report pressure for ads7845 clk: renesas: cpg-mssr: Remove superfluous check in resume code clk: renesas: cpg-mssr: Use enum clk_reg_layout instead of a boolean flag clk: renesas: cpg-mssr: Fix use after free if cpg_mssr_common_init() failed mtd: rawnand: sunxi: Fix the size of the last OOB region clk: qcom: gcc-qcs404: fix names of the DSI clocks used as parents clk: qcom: gcc-qcs404: disable gpll[04]_out_aux parents mfd: pcf50633-adc: Fix potential memleak in pcf50633_adc_async_read() selftests/ftrace: Fix bash specific "==" operator sparc: allow PM configs for sparc32 COMPILE_TEST perf tools: Fix auto-complete on aarch64 perf llvm: Fix inadvertent file creation gfs2: jdata writepage fix cifs: Fix warning and UAF when destroy the MR list cifs: Fix lost destroy smbd connection when MR allocate failed nfsd: fix race to check ls_layouts hid: bigben_probe(): validate report count HID: asus: Fix mute and touchpad-toggle keys on Medion Akoya E1239T HID: asus: Add support for multi-touch touchpad on Medion Akoya E1239T HID: asus: Add report_size to struct asus_touchpad_info HID: asus: Only set EV_REP if we are adding a mapping HID: bigben: use spinlock to safely schedule workers HID: bigben_worker() remove unneeded check on report_field HID: bigben: use spinlock to protect concurrent accesses ASoC: soc-dapm.h: fixup warning struct snd_pcm_substream not declared ASoC: dapm: declare missing structure prototypes spi: synquacer: Fix timeout handling in synquacer_spi_transfer_one() dm: remove flush_scheduled_work() during local_exit() hwmon: (mlxreg-fan) Return zero speed for broken fan spi: bcm63xx-hsspi: Fix multi-bit mode setting spi: bcm63xx-hsspi: fix pm_runtime scsi: aic94xx: Add missing check for dma_map_single() hwmon: (ltc2945) Handle error case in ltc2945_value_store gpio: vf610: connect GPIO label to dev name ASoC: soc-compress.c: fixup private_data on snd_soc_new_compress() drm/mediatek: Clean dangling pointer on bind error path drm/mediatek: Drop unbalanced obj unref drm/mediatek: Use NULL instead of 0 for NULL pointer drm/mediatek: remove cast to pointers passed to kfree gpu: host1x: Don't skip assigning syncpoints to channels drm/msm/mdp5: Add check for kzalloc drm: Initialize struct drm_crtc_state.no_vblank from device settings drm/bridge: Introduce drm_bridge_get_next_bridge() drm/bridge: Rename bridge helpers targeting a bridge chain drm/exynos: Don't reset bridge->next drm/msm/dpu: Add check for pstates drm/msm/dpu: Add check for cstate drm/msm: use strscpy instead of strncpy drm/mipi-dsi: Fix byte order of 16-bit DCS set/get brightness ALSA: hda/ca0132: minor fix for allocation size ASoC: fsl_sai: initialize is_dsp_mode flag pinctrl: stm32: Fix refcount leak in stm32_pctrl_get_irq_domain drm/msm/hdmi: Add missing check for alloc_ordered_workqueue gpu: ipu-v3: common: Add of_node_put() for reference returned by of_graph_get_port_by_id() drm/vc4: dpi: Fix format mapping for RGB565 drm/vc4: dpi: Add option for inverting pixel clock and output enable drm/bridge: megachips: Fix error handling in i2c_register_driver() drm: mxsfb: DRM_MXSFB should depend on ARCH_MXS || ARCH_MXC drm/fourcc: Add missing big-endian XRGB1555 and RGB565 formats selftest: fib_tests: Always cleanup before exit selftests/net: Interpret UDP_GRO cmsg data as an int value irqchip/irq-bcm7120-l2: Set IRQ_LEVEL for level triggered interrupts irqchip/irq-brcmstb-l2: Set IRQ_LEVEL for level triggered interrupts can: esd_usb: Move mislocated storage of SJA1000_ECC_SEG bits in case of a bus error thermal/drivers/hisi: Drop second sensor hi3660 wifi: mac80211: make rate u32 in sta_set_rate_info_rx() crypto: crypto4xx - Call dma_unmap_page when done wifi: mwifiex: fix loop iterator in mwifiex_update_ampdu_txwinsize() wifi: iwl4965: Add missing check for create_singlethread_workqueue() wifi: iwl3945: Add missing check for create_singlethread_workqueue treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD() usb: gadget: udc: Avoid tasklet passing a global RISC-V: time: initialize hrtimer based broadcast clock event device m68k: /proc/hardware should depend on PROC_FS crypto: rsa-pkcs1pad - Use akcipher_request_complete rds: rds_rm_zerocopy_callback() correct order for list_add_tail() libbpf: Fix alen calculation in libbpf_nla_dump_errormsg() Bluetooth: L2CAP: Fix potential user-after-free OPP: fix error checking in opp_migrate_dentry() tap: tap_open(): correctly initialize socket uid tun: tun_chr_open(): correctly initialize socket uid net: add sock_init_data_uid() mptcp: add sk_stop_timer_sync helper irqchip/ti-sci: Fix refcount leak in ti_sci_intr_irq_domain_probe irqchip/irq-mvebu-gicp: Fix refcount leak in mvebu_gicp_probe irqchip/alpine-msi: Fix refcount leak in alpine_msix_init_domains net/mlx5: Enhance debug print in page allocation failure powercap: fix possible name leak in powercap_register_zone() crypto: seqiv - Handle EBUSY correctly crypto: essiv - Handle EBUSY correctly crypto: essiv - remove redundant null pointer check before kfree crypto: ccp - Failure on re-initialization due to duplicate sysfs filename ACPI: battery: Fix missing NUL-termination with large strings wifi: ath9k: Fix potential stack-out-of-bounds write in ath9k_wmi_rsp_callback() wifi: ath9k: hif_usb: clean up skbs if ath9k_hif_usb_rx_stream() fails ath9k: htc: clean up statistics macros ath9k: hif_usb: simplify if-if to if-else wifi: ath9k: htc_hst: free skb in ath9k_htc_rx_msg() if there is no callback function wifi: orinoco: check return value of hermes_write_wordrec() ACPICA: nsrepair: handle cases without a return value correctly lib/mpi: Fix buffer overrun when SG is too long genirq: Fix the return type of kstat_cpu_irqs_sum() ACPICA: Drop port I/O validation for some regions crypto: x86/ghash - fix unaligned access in ghash_setkey() wifi: wl3501_cs: don't call kfree_skb() under spin_lock_irqsave() wifi: libertas: cmdresp: don't call kfree_skb() under spin_lock_irqsave() wifi: libertas: main: don't call kfree_skb() under spin_lock_irqsave() wifi: libertas: if_usb: don't call kfree_skb() under spin_lock_irqsave() wifi: libertas_tf: don't call kfree_skb() under spin_lock_irqsave() wifi: brcmfmac: unmap dma buffer in brcmf_msgbuf_alloc_pktid() wifi: brcmfmac: fix potential memory leak in brcmf_netdev_start_xmit() wifi: wilc1000: fix potential memory leak in wilc_mac_xmit() wilc1000: let wilc_mac_xmit() return NETDEV_TX_OK wifi: ipw2200: fix memory leak in ipw_wdev_init() wifi: ipw2x00: don't call dev_kfree_skb() under spin_lock_irqsave() ipw2x00: switch from 'pci_' to 'dma_' API wifi: rtlwifi: Fix global-out-of-bounds bug in _rtl8812ae_phy_set_txpower_limit() rtlwifi: fix -Wpointer-sign warning wifi: rtl8xxxu: don't call dev_kfree_skb() under spin_lock_irqsave() wifi: libertas: fix memory leak in lbs_init_adapter() wifi: iwlegacy: common: don't call dev_kfree_skb() under spin_lock_irqsave() net/wireless: Delete unnecessary checks before the macro call “dev_kfree_skb” wifi: rsi: Fix memory leak in rsi_coex_attach() block: bio-integrity: Copy flags when bio_integrity_payload is cloned sched/rt: pick_next_rt_entity(): check list_entry sched/deadline,rt: Remove unused parameter from pick_next_[rt|dl]_entity() s390/dasd: Fix potential memleak in dasd_eckd_init() s390/dasd: Prepare for additional path event handling blk-mq: correct stale comment of .get_budget blk-mq: wait on correct sbitmap_queue in blk_mq_mark_tag_wait blk-mq: remove stale comment for blk_mq_sched_mark_restart_hctx block: Limit number of items taken from the I/O scheduler in one go Revert "scsi: core: run queue if SCSI device queue isn't ready and queue is idle" arm64: dts: mediatek: mt7622: Add missing pwm-cells to pwm node ARM: dts: imx7s: correct iomuxc gpr mux controller cells arm64: dts: amlogic: meson-gxl-s905d-phicomm-n1: fix led node name arm64: dts: amlogic: meson-gxl: add missing unit address to eth-phy-mux node name arm64: dts: amlogic: meson-gx: add missing unit address to rng node name arm64: dts: amlogic: meson-gx: add missing SCPI sensors compatible arm64: dts: amlogic: meson-axg: fix SCPI clock dvfs node name arm64: dts: amlogic: meson-gx: fix SCPI clock dvfs node name ARM: imx: Call ida_simple_remove() for ida_simple_get ARM: dts: exynos: correct wr-active property in Exynos3250 Rinato ARM: OMAP1: call platform_device_put() in error case in omap1_dm_timer_init() arm64: dts: meson: remove CPU opps below 1GHz for G12A boards arm64: dts: meson-gx: Fix the SCPI DVFS node name and unit address arm64: dts: meson-g12a: Fix internal Ethernet PHY unit name arm64: dts: meson-gx: Fix Ethernet MAC address unit name ARM: zynq: Fix refcount leak in zynq_early_slcr_init arm64: dts: qcom: qcs404: use symbol names for PCIe resets ARM: OMAP2+: Fix memory leak in realtime_counter_init() HID: asus: use spinlock to safely schedule workers HID: asus: use spinlock to protect concurrent accesses HID: asus: Remove check for same LED brightness on set Linux 5.4.234 USB: core: Don't hold device lock while reading the "descriptors" sysfs file USB: serial: option: add support for VW/Skoda "Carstick LTE" dmaengine: sh: rcar-dmac: Check for error num after dma_set_max_seg_size vc_screen: don't clobber return value in vcs_read net: Remove WARN_ON_ONCE(sk->sk_forward_alloc) from sk_stream_kill_queues(). bpf: bpf_fib_lookup should not return neigh in NUD_FAILED state HID: core: Fix deadloop in hid_apply_multiplier. neigh: make sure used and confirmed times are valid IB/hfi1: Assign npages earlier btrfs: send: limit number of clones and allocated memory size ACPI: NFIT: fix a potential deadlock during NFIT teardown ARM: dts: rockchip: add power-domains property to dp node on rk3288 arm64: dts: rockchip: drop unused LED mode property from rk3328-roc-cc Conflicts: Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml Documentation/devicetree/bindings~HEAD arch/arm/mm/dma-mapping.c drivers/clk/qcom/gcc-qcs404.c drivers/iommu/dma-iommu.c drivers/mtd/ubi/wl.c kernel/dma/direct.c Change-Id: I804ccb5552f305c49ec17b323c6c933cc99e6d39
1244 lines
33 KiB
C
1244 lines
33 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2014, 2018 The Linux Foundation. All rights reserved.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/init.h>
|
|
#include <linux/types.h>
|
|
#include <linux/device.h>
|
|
#include <linux/io.h>
|
|
#include <linux/err.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/sysfs.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/cpu.h>
|
|
#include <linux/coresight.h>
|
|
#include <linux/coresight-pmu.h>
|
|
#include <linux/of.h>
|
|
#include <linux/pm_wakeup.h>
|
|
#include <linux/amba/bus.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/perf_event.h>
|
|
#include <linux/pm_runtime.h>
|
|
#include <asm/sections.h>
|
|
#include <asm/local.h>
|
|
#include <asm/virt.h>
|
|
|
|
#include "coresight-etm4x.h"
|
|
#include "coresight-etm-perf.h"
|
|
|
|
static int boot_enable;
|
|
module_param(boot_enable, int, 0444);
|
|
MODULE_PARM_DESC(boot_enable, "Enable tracing on boot");
|
|
|
|
/* The number of ETMv4 currently registered */
|
|
static int etm4_count;
|
|
static struct etmv4_drvdata *etmdrvdata[NR_CPUS];
|
|
static void etm4_set_default_config(struct etmv4_config *config);
|
|
static int etm4_set_event_filters(struct etmv4_drvdata *drvdata,
|
|
struct perf_event *event);
|
|
|
|
static enum cpuhp_state hp_online;
|
|
|
|
static void etm4_os_unlock(struct etmv4_drvdata *drvdata)
|
|
{
|
|
/* Writing 0 to TRCOSLAR unlocks the trace registers */
|
|
writel_relaxed(0x0, drvdata->base + TRCOSLAR);
|
|
drvdata->os_unlock = true;
|
|
isb();
|
|
}
|
|
|
|
static bool etm4_arch_supported(u8 arch)
|
|
{
|
|
/* Mask out the minor version number */
|
|
switch (arch & 0xf0) {
|
|
case ETM_ARCH_V4:
|
|
break;
|
|
default:
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static int etm4_cpu_id(struct coresight_device *csdev)
|
|
{
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
|
|
return drvdata->cpu;
|
|
}
|
|
|
|
static int etm4_trace_id(struct coresight_device *csdev)
|
|
{
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
|
|
return drvdata->trcid;
|
|
}
|
|
|
|
struct etm4_enable_arg {
|
|
struct etmv4_drvdata *drvdata;
|
|
int rc;
|
|
};
|
|
|
|
static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
|
|
{
|
|
int i, rc;
|
|
struct etmv4_config *config = &drvdata->config;
|
|
struct device *etm_dev = &drvdata->csdev->dev;
|
|
|
|
CS_UNLOCK(drvdata->base);
|
|
|
|
etm4_os_unlock(drvdata);
|
|
|
|
rc = coresight_claim_device_unlocked(drvdata->base);
|
|
if (rc)
|
|
goto done;
|
|
|
|
/* Disable the trace unit before programming trace registers */
|
|
writel_relaxed(0, drvdata->base + TRCPRGCTLR);
|
|
|
|
/* wait for TRCSTATR.IDLE to go up */
|
|
if (coresight_timeout(drvdata->base, TRCSTATR, TRCSTATR_IDLE_BIT, 1))
|
|
dev_err(etm_dev,
|
|
"timeout while waiting for Idle Trace Status\n");
|
|
|
|
writel_relaxed(config->pe_sel, drvdata->base + TRCPROCSELR);
|
|
writel_relaxed(config->cfg, drvdata->base + TRCCONFIGR);
|
|
/* nothing specific implemented */
|
|
writel_relaxed(0x0, drvdata->base + TRCAUXCTLR);
|
|
writel_relaxed(config->eventctrl0, drvdata->base + TRCEVENTCTL0R);
|
|
writel_relaxed(config->eventctrl1, drvdata->base + TRCEVENTCTL1R);
|
|
writel_relaxed(config->stall_ctrl, drvdata->base + TRCSTALLCTLR);
|
|
writel_relaxed(config->ts_ctrl, drvdata->base + TRCTSCTLR);
|
|
writel_relaxed(config->syncfreq, drvdata->base + TRCSYNCPR);
|
|
writel_relaxed(config->ccctlr, drvdata->base + TRCCCCTLR);
|
|
writel_relaxed(config->bb_ctrl, drvdata->base + TRCBBCTLR);
|
|
writel_relaxed(drvdata->trcid, drvdata->base + TRCTRACEIDR);
|
|
writel_relaxed(config->vinst_ctrl, drvdata->base + TRCVICTLR);
|
|
writel_relaxed(config->viiectlr, drvdata->base + TRCVIIECTLR);
|
|
writel_relaxed(config->vissctlr,
|
|
drvdata->base + TRCVISSCTLR);
|
|
writel_relaxed(config->vipcssctlr,
|
|
drvdata->base + TRCVIPCSSCTLR);
|
|
for (i = 0; i < drvdata->nrseqstate - 1; i++)
|
|
writel_relaxed(config->seq_ctrl[i],
|
|
drvdata->base + TRCSEQEVRn(i));
|
|
writel_relaxed(config->seq_rst, drvdata->base + TRCSEQRSTEVR);
|
|
writel_relaxed(config->seq_state, drvdata->base + TRCSEQSTR);
|
|
writel_relaxed(config->ext_inp, drvdata->base + TRCEXTINSELR);
|
|
for (i = 0; i < drvdata->nr_cntr; i++) {
|
|
writel_relaxed(config->cntrldvr[i],
|
|
drvdata->base + TRCCNTRLDVRn(i));
|
|
writel_relaxed(config->cntr_ctrl[i],
|
|
drvdata->base + TRCCNTCTLRn(i));
|
|
writel_relaxed(config->cntr_val[i],
|
|
drvdata->base + TRCCNTVRn(i));
|
|
}
|
|
|
|
/*
|
|
* Resource selector pair 0 is always implemented and reserved. As
|
|
* such start at 2.
|
|
*/
|
|
for (i = 2; i < drvdata->nr_resource * 2; i++)
|
|
writel_relaxed(config->res_ctrl[i],
|
|
drvdata->base + TRCRSCTLRn(i));
|
|
|
|
for (i = 0; i < drvdata->nr_ss_cmp; i++) {
|
|
writel_relaxed(config->ss_ctrl[i],
|
|
drvdata->base + TRCSSCCRn(i));
|
|
writel_relaxed(config->ss_status[i],
|
|
drvdata->base + TRCSSCSRn(i));
|
|
writel_relaxed(config->ss_pe_cmp[i],
|
|
drvdata->base + TRCSSPCICRn(i));
|
|
}
|
|
for (i = 0; i < drvdata->nr_addr_cmp * 2; i++) {
|
|
writeq_relaxed(config->addr_val[i],
|
|
drvdata->base + TRCACVRn(i));
|
|
writeq_relaxed(config->addr_acc[i],
|
|
drvdata->base + TRCACATRn(i));
|
|
}
|
|
for (i = 0; i < drvdata->numcidc; i++)
|
|
writeq_relaxed(config->ctxid_pid[i],
|
|
drvdata->base + TRCCIDCVRn(i));
|
|
writel_relaxed(config->ctxid_mask0, drvdata->base + TRCCIDCCTLR0);
|
|
writel_relaxed(config->ctxid_mask1, drvdata->base + TRCCIDCCTLR1);
|
|
|
|
for (i = 0; i < drvdata->numvmidc; i++)
|
|
writeq_relaxed(config->vmid_val[i],
|
|
drvdata->base + TRCVMIDCVRn(i));
|
|
writel_relaxed(config->vmid_mask0, drvdata->base + TRCVMIDCCTLR0);
|
|
writel_relaxed(config->vmid_mask1, drvdata->base + TRCVMIDCCTLR1);
|
|
|
|
if (!drvdata->tupwr_disable) {
|
|
/*
|
|
* Request to keep the trace unit powered and also
|
|
* emulation of powerdown
|
|
*/
|
|
writel_relaxed(readl_relaxed(drvdata->base + TRCPDCR)
|
|
| TRCPDCR_PU, drvdata->base + TRCPDCR);
|
|
}
|
|
|
|
/* Enable the trace unit */
|
|
writel_relaxed(1, drvdata->base + TRCPRGCTLR);
|
|
|
|
/* wait for TRCSTATR.IDLE to go back down to '0' */
|
|
if (coresight_timeout(drvdata->base, TRCSTATR, TRCSTATR_IDLE_BIT, 0))
|
|
dev_err(etm_dev,
|
|
"timeout while waiting for Idle Trace Status\n");
|
|
|
|
/*
|
|
* As recommended by section 4.3.7 ("Synchronization when using the
|
|
* memory-mapped interface") of ARM IHI 0064D
|
|
*/
|
|
dsb(sy);
|
|
isb();
|
|
|
|
done:
|
|
CS_LOCK(drvdata->base);
|
|
|
|
dev_dbg(etm_dev, "cpu: %d enable smp call done: %d\n",
|
|
drvdata->cpu, rc);
|
|
return rc;
|
|
}
|
|
|
|
static void etm4_enable_hw_smp_call(void *info)
|
|
{
|
|
struct etm4_enable_arg *arg = info;
|
|
|
|
if (WARN_ON(!arg))
|
|
return;
|
|
arg->rc = etm4_enable_hw(arg->drvdata);
|
|
}
|
|
|
|
/*
|
|
* The goal of function etm4_config_timestamp_event() is to configure a
|
|
* counter that will tell the tracer to emit a timestamp packet when it
|
|
* reaches zero. This is done in order to get a more fine grained idea
|
|
* of when instructions are executed so that they can be correlated
|
|
* with execution on other CPUs.
|
|
*
|
|
* To do this the counter itself is configured to self reload and
|
|
* TRCRSCTLR1 (always true) used to get the counter to decrement. From
|
|
* there a resource selector is configured with the counter and the
|
|
* timestamp control register to use the resource selector to trigger the
|
|
* event that will insert a timestamp packet in the stream.
|
|
*/
|
|
static int etm4_config_timestamp_event(struct etmv4_drvdata *drvdata)
|
|
{
|
|
int ctridx, ret = -EINVAL;
|
|
int counter, rselector;
|
|
u32 val = 0;
|
|
struct etmv4_config *config = &drvdata->config;
|
|
|
|
/* No point in trying if we don't have at least one counter */
|
|
if (!drvdata->nr_cntr)
|
|
goto out;
|
|
|
|
/* Find a counter that hasn't been initialised */
|
|
for (ctridx = 0; ctridx < drvdata->nr_cntr; ctridx++)
|
|
if (config->cntr_val[ctridx] == 0)
|
|
break;
|
|
|
|
/* All the counters have been configured already, bail out */
|
|
if (ctridx == drvdata->nr_cntr) {
|
|
pr_debug("%s: no available counter found\n", __func__);
|
|
ret = -ENOSPC;
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* Searching for an available resource selector to use, starting at
|
|
* '2' since every implementation has at least 2 resource selector.
|
|
* ETMIDR4 gives the number of resource selector _pairs_,
|
|
* hence multiply by 2.
|
|
*/
|
|
for (rselector = 2; rselector < drvdata->nr_resource * 2; rselector++)
|
|
if (!config->res_ctrl[rselector])
|
|
break;
|
|
|
|
if (rselector == drvdata->nr_resource * 2) {
|
|
pr_debug("%s: no available resource selector found\n",
|
|
__func__);
|
|
ret = -ENOSPC;
|
|
goto out;
|
|
}
|
|
|
|
/* Remember what counter we used */
|
|
counter = 1 << ctridx;
|
|
|
|
/*
|
|
* Initialise original and reload counter value to the smallest
|
|
* possible value in order to get as much precision as we can.
|
|
*/
|
|
config->cntr_val[ctridx] = 1;
|
|
config->cntrldvr[ctridx] = 1;
|
|
|
|
/* Set the trace counter control register */
|
|
val = 0x1 << 16 | /* Bit 16, reload counter automatically */
|
|
0x0 << 7 | /* Select single resource selector */
|
|
0x1; /* Resource selector 1, i.e always true */
|
|
|
|
config->cntr_ctrl[ctridx] = val;
|
|
|
|
val = 0x2 << 16 | /* Group 0b0010 - Counter and sequencers */
|
|
counter << 0; /* Counter to use */
|
|
|
|
config->res_ctrl[rselector] = val;
|
|
|
|
val = 0x0 << 7 | /* Select single resource selector */
|
|
rselector; /* Resource selector */
|
|
|
|
config->ts_ctrl = val;
|
|
|
|
ret = 0;
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int etm4_parse_event_config(struct etmv4_drvdata *drvdata,
|
|
struct perf_event *event)
|
|
{
|
|
int ret = 0;
|
|
struct etmv4_config *config = &drvdata->config;
|
|
struct perf_event_attr *attr = &event->attr;
|
|
|
|
if (!attr) {
|
|
ret = -EINVAL;
|
|
goto out;
|
|
}
|
|
|
|
/* Clear configuration from previous run */
|
|
memset(config, 0, sizeof(struct etmv4_config));
|
|
|
|
if (attr->exclude_kernel)
|
|
config->mode = ETM_MODE_EXCL_KERN;
|
|
|
|
if (attr->exclude_user)
|
|
config->mode = ETM_MODE_EXCL_USER;
|
|
|
|
/* Always start from the default config */
|
|
etm4_set_default_config(config);
|
|
|
|
/* Configure filters specified on the perf cmd line, if any. */
|
|
ret = etm4_set_event_filters(drvdata, event);
|
|
if (ret)
|
|
goto out;
|
|
|
|
/* Go from generic option to ETMv4 specifics */
|
|
if (attr->config & BIT(ETM_OPT_CYCACC)) {
|
|
config->cfg |= BIT(4);
|
|
/* TRM: Must program this for cycacc to work */
|
|
config->ccctlr = ETM_CYC_THRESHOLD_DEFAULT;
|
|
}
|
|
if (attr->config & BIT(ETM_OPT_TS)) {
|
|
/*
|
|
* Configure timestamps to be emitted at regular intervals in
|
|
* order to correlate instructions executed on different CPUs
|
|
* (CPU-wide trace scenarios).
|
|
*/
|
|
ret = etm4_config_timestamp_event(drvdata);
|
|
|
|
/*
|
|
* No need to go further if timestamp intervals can't
|
|
* be configured.
|
|
*/
|
|
if (ret)
|
|
goto out;
|
|
|
|
/* bit[11], Global timestamp tracing bit */
|
|
config->cfg |= BIT(11);
|
|
}
|
|
|
|
if (attr->config & BIT(ETM_OPT_CTXTID))
|
|
/* bit[6], Context ID tracing bit */
|
|
config->cfg |= BIT(ETM4_CFG_BIT_CTXTID);
|
|
|
|
/* return stack - enable if selected and supported */
|
|
if ((attr->config & BIT(ETM_OPT_RETSTK)) && drvdata->retstack)
|
|
/* bit[12], Return stack enable bit */
|
|
config->cfg |= BIT(12);
|
|
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int etm4_enable_perf(struct coresight_device *csdev,
|
|
struct perf_event *event)
|
|
{
|
|
int ret = 0;
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
|
|
if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) {
|
|
ret = -EINVAL;
|
|
goto out;
|
|
}
|
|
|
|
/* Configure the tracer based on the session's specifics */
|
|
ret = etm4_parse_event_config(drvdata, event);
|
|
if (ret)
|
|
goto out;
|
|
/* And enable it */
|
|
ret = etm4_enable_hw(drvdata);
|
|
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int etm4_enable_sysfs(struct coresight_device *csdev)
|
|
{
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
struct etm4_enable_arg arg = { 0 };
|
|
int ret;
|
|
|
|
spin_lock(&drvdata->spinlock);
|
|
|
|
/*
|
|
* Executing etm4_enable_hw on the cpu whose ETM is being enabled
|
|
* ensures that register writes occur when cpu is powered.
|
|
*/
|
|
arg.drvdata = drvdata;
|
|
ret = smp_call_function_single(drvdata->cpu,
|
|
etm4_enable_hw_smp_call, &arg, 1);
|
|
if (!ret)
|
|
ret = arg.rc;
|
|
if (!ret)
|
|
drvdata->sticky_enable = true;
|
|
spin_unlock(&drvdata->spinlock);
|
|
|
|
if (!ret)
|
|
dev_dbg(&csdev->dev, "ETM tracing enabled\n");
|
|
return ret;
|
|
}
|
|
|
|
static int etm4_enable(struct coresight_device *csdev,
|
|
struct perf_event *event, u32 mode)
|
|
{
|
|
int ret;
|
|
u32 val;
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
|
|
val = local_cmpxchg(&drvdata->mode, CS_MODE_DISABLED, mode);
|
|
|
|
/* Someone is already using the tracer */
|
|
if (val)
|
|
return -EBUSY;
|
|
|
|
switch (mode) {
|
|
case CS_MODE_SYSFS:
|
|
ret = etm4_enable_sysfs(csdev);
|
|
break;
|
|
case CS_MODE_PERF:
|
|
ret = etm4_enable_perf(csdev, event);
|
|
break;
|
|
default:
|
|
ret = -EINVAL;
|
|
}
|
|
|
|
/* The tracer didn't start */
|
|
if (ret)
|
|
local_set(&drvdata->mode, CS_MODE_DISABLED);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void etm4_disable_hw(void *info)
|
|
{
|
|
u32 control;
|
|
struct etmv4_drvdata *drvdata = info;
|
|
|
|
CS_UNLOCK(drvdata->base);
|
|
|
|
if (!drvdata->tupwr_disable) {
|
|
/* power can be removed from the trace unit now */
|
|
control = readl_relaxed(drvdata->base + TRCPDCR);
|
|
control &= ~TRCPDCR_PU;
|
|
writel_relaxed(control, drvdata->base + TRCPDCR);
|
|
}
|
|
|
|
control = readl_relaxed(drvdata->base + TRCPRGCTLR);
|
|
|
|
/* EN, bit[0] Trace unit enable bit */
|
|
control &= ~0x1;
|
|
|
|
/*
|
|
* Make sure everything completes before disabling, as recommended
|
|
* by section 7.3.77 ("TRCVICTLR, ViewInst Main Control Register,
|
|
* SSTATUS") of ARM IHI 0064D
|
|
*/
|
|
dsb(sy);
|
|
isb();
|
|
writel_relaxed(control, drvdata->base + TRCPRGCTLR);
|
|
|
|
coresight_disclaim_device_unlocked(drvdata->base);
|
|
|
|
CS_LOCK(drvdata->base);
|
|
|
|
dev_dbg(&drvdata->csdev->dev,
|
|
"cpu: %d disable smp call done\n", drvdata->cpu);
|
|
}
|
|
|
|
static int etm4_disable_perf(struct coresight_device *csdev,
|
|
struct perf_event *event)
|
|
{
|
|
u32 control;
|
|
struct etm_filters *filters = event->hw.addr_filters;
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
|
|
if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id()))
|
|
return -EINVAL;
|
|
|
|
etm4_disable_hw(drvdata);
|
|
|
|
/*
|
|
* Check if the start/stop logic was active when the unit was stopped.
|
|
* That way we can re-enable the start/stop logic when the process is
|
|
* scheduled again. Configuration of the start/stop logic happens in
|
|
* function etm4_set_event_filters().
|
|
*/
|
|
control = readl_relaxed(drvdata->base + TRCVICTLR);
|
|
/* TRCVICTLR::SSSTATUS, bit[9] */
|
|
filters->ssstatus = (control & BIT(9));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void etm4_disable_sysfs(struct coresight_device *csdev)
|
|
{
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
|
|
/*
|
|
* Taking hotplug lock here protects from clocks getting disabled
|
|
* with tracing being left on (crash scenario) if user disable occurs
|
|
* after cpu online mask indicates the cpu is offline but before the
|
|
* DYING hotplug callback is serviced by the ETM driver.
|
|
*/
|
|
cpus_read_lock();
|
|
spin_lock(&drvdata->spinlock);
|
|
|
|
/*
|
|
* Executing etm4_disable_hw on the cpu whose ETM is being disabled
|
|
* ensures that register writes occur when cpu is powered.
|
|
*/
|
|
smp_call_function_single(drvdata->cpu, etm4_disable_hw, drvdata, 1);
|
|
|
|
spin_unlock(&drvdata->spinlock);
|
|
cpus_read_unlock();
|
|
|
|
dev_dbg(&csdev->dev, "ETM tracing disabled\n");
|
|
}
|
|
|
|
static void etm4_disable(struct coresight_device *csdev,
|
|
struct perf_event *event)
|
|
{
|
|
u32 mode;
|
|
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
|
|
|
|
/*
|
|
* For as long as the tracer isn't disabled another entity can't
|
|
* change its status. As such we can read the status here without
|
|
* fearing it will change under us.
|
|
*/
|
|
mode = local_read(&drvdata->mode);
|
|
|
|
switch (mode) {
|
|
case CS_MODE_DISABLED:
|
|
break;
|
|
case CS_MODE_SYSFS:
|
|
etm4_disable_sysfs(csdev);
|
|
break;
|
|
case CS_MODE_PERF:
|
|
etm4_disable_perf(csdev, event);
|
|
break;
|
|
}
|
|
|
|
if (mode)
|
|
local_set(&drvdata->mode, CS_MODE_DISABLED);
|
|
}
|
|
|
|
static const struct coresight_ops_source etm4_source_ops = {
|
|
.cpu_id = etm4_cpu_id,
|
|
.trace_id = etm4_trace_id,
|
|
.enable = etm4_enable,
|
|
.disable = etm4_disable,
|
|
};
|
|
|
|
static const struct coresight_ops etm4_cs_ops = {
|
|
.source_ops = &etm4_source_ops,
|
|
};
|
|
|
|
static void etm4_init_arch_data(void *info)
|
|
{
|
|
u32 etmidr0;
|
|
u32 etmidr1;
|
|
u32 etmidr2;
|
|
u32 etmidr3;
|
|
u32 etmidr4;
|
|
u32 etmidr5;
|
|
struct etmv4_drvdata *drvdata = info;
|
|
|
|
/* Make sure all registers are accessible */
|
|
etm4_os_unlock(drvdata);
|
|
|
|
CS_UNLOCK(drvdata->base);
|
|
|
|
/* find all capabilities of the tracing unit */
|
|
etmidr0 = readl_relaxed(drvdata->base + TRCIDR0);
|
|
|
|
/* INSTP0, bits[2:1] P0 tracing support field */
|
|
if (BMVAL(etmidr0, 1, 1) && BMVAL(etmidr0, 2, 2))
|
|
drvdata->instrp0 = true;
|
|
else
|
|
drvdata->instrp0 = false;
|
|
|
|
/* TRCBB, bit[5] Branch broadcast tracing support bit */
|
|
if (BMVAL(etmidr0, 5, 5))
|
|
drvdata->trcbb = true;
|
|
else
|
|
drvdata->trcbb = false;
|
|
|
|
/* TRCCOND, bit[6] Conditional instruction tracing support bit */
|
|
if (BMVAL(etmidr0, 6, 6))
|
|
drvdata->trccond = true;
|
|
else
|
|
drvdata->trccond = false;
|
|
|
|
/* TRCCCI, bit[7] Cycle counting instruction bit */
|
|
if (BMVAL(etmidr0, 7, 7))
|
|
drvdata->trccci = true;
|
|
else
|
|
drvdata->trccci = false;
|
|
|
|
/* RETSTACK, bit[9] Return stack bit */
|
|
if (BMVAL(etmidr0, 9, 9))
|
|
drvdata->retstack = true;
|
|
else
|
|
drvdata->retstack = false;
|
|
|
|
/* NUMEVENT, bits[11:10] Number of events field */
|
|
drvdata->nr_event = BMVAL(etmidr0, 10, 11);
|
|
/* QSUPP, bits[16:15] Q element support field */
|
|
drvdata->q_support = BMVAL(etmidr0, 15, 16);
|
|
/* TSSIZE, bits[28:24] Global timestamp size field */
|
|
drvdata->ts_size = BMVAL(etmidr0, 24, 28);
|
|
|
|
/* base architecture of trace unit */
|
|
etmidr1 = readl_relaxed(drvdata->base + TRCIDR1);
|
|
/*
|
|
* TRCARCHMIN, bits[7:4] architecture the minor version number
|
|
* TRCARCHMAJ, bits[11:8] architecture major versin number
|
|
*/
|
|
drvdata->arch = BMVAL(etmidr1, 4, 11);
|
|
|
|
/* maximum size of resources */
|
|
etmidr2 = readl_relaxed(drvdata->base + TRCIDR2);
|
|
/* CIDSIZE, bits[9:5] Indicates the Context ID size */
|
|
drvdata->ctxid_size = BMVAL(etmidr2, 5, 9);
|
|
/* VMIDSIZE, bits[14:10] Indicates the VMID size */
|
|
drvdata->vmid_size = BMVAL(etmidr2, 10, 14);
|
|
/* CCSIZE, bits[28:25] size of the cycle counter in bits minus 12 */
|
|
drvdata->ccsize = BMVAL(etmidr2, 25, 28);
|
|
|
|
etmidr3 = readl_relaxed(drvdata->base + TRCIDR3);
|
|
/* CCITMIN, bits[11:0] minimum threshold value that can be programmed */
|
|
drvdata->ccitmin = BMVAL(etmidr3, 0, 11);
|
|
/* EXLEVEL_S, bits[19:16] Secure state instruction tracing */
|
|
drvdata->s_ex_level = BMVAL(etmidr3, 16, 19);
|
|
/* EXLEVEL_NS, bits[23:20] Non-secure state instruction tracing */
|
|
drvdata->ns_ex_level = BMVAL(etmidr3, 20, 23);
|
|
|
|
/*
|
|
* TRCERR, bit[24] whether a trace unit can trace a
|
|
* system error exception.
|
|
*/
|
|
if (BMVAL(etmidr3, 24, 24))
|
|
drvdata->trc_error = true;
|
|
else
|
|
drvdata->trc_error = false;
|
|
|
|
/* SYNCPR, bit[25] implementation has a fixed synchronization period? */
|
|
if (BMVAL(etmidr3, 25, 25))
|
|
drvdata->syncpr = true;
|
|
else
|
|
drvdata->syncpr = false;
|
|
|
|
/* STALLCTL, bit[26] is stall control implemented? */
|
|
if (BMVAL(etmidr3, 26, 26))
|
|
drvdata->stallctl = true;
|
|
else
|
|
drvdata->stallctl = false;
|
|
|
|
/* SYSSTALL, bit[27] implementation can support stall control? */
|
|
if (BMVAL(etmidr3, 27, 27))
|
|
drvdata->sysstall = true;
|
|
else
|
|
drvdata->sysstall = false;
|
|
|
|
/* NUMPROC, bits[13:12, 30:28]
|
|
* the number of PEs available for tracing
|
|
*/
|
|
drvdata->nr_pe = (BMVAL(etmidr3, 12, 13) << 3) | BMVAL(etmidr3, 28, 30);
|
|
|
|
/* NOOVERFLOW, bit[31] is trace overflow prevention supported */
|
|
if (BMVAL(etmidr3, 31, 31))
|
|
drvdata->nooverflow = true;
|
|
else
|
|
drvdata->nooverflow = false;
|
|
|
|
/* number of resources trace unit supports */
|
|
etmidr4 = readl_relaxed(drvdata->base + TRCIDR4);
|
|
/* NUMACPAIRS, bits[0:3] number of addr comparator pairs for tracing */
|
|
drvdata->nr_addr_cmp = BMVAL(etmidr4, 0, 3);
|
|
/* NUMPC, bits[15:12] number of PE comparator inputs for tracing */
|
|
drvdata->nr_pe_cmp = BMVAL(etmidr4, 12, 15);
|
|
/*
|
|
* NUMRSPAIR, bits[19:16]
|
|
* The number of resource pairs conveyed by the HW starts at 0, i.e a
|
|
* value of 0x0 indicate 1 resource pair, 0x1 indicate two and so on.
|
|
* As such add 1 to the value of NUMRSPAIR for a better representation.
|
|
*/
|
|
drvdata->nr_resource = BMVAL(etmidr4, 16, 19) + 1;
|
|
/*
|
|
* NUMSSCC, bits[23:20] the number of single-shot
|
|
* comparator control for tracing
|
|
*/
|
|
drvdata->nr_ss_cmp = BMVAL(etmidr4, 20, 23);
|
|
/* NUMCIDC, bits[27:24] number of Context ID comparators for tracing */
|
|
drvdata->numcidc = BMVAL(etmidr4, 24, 27);
|
|
/* NUMVMIDC, bits[31:28] number of VMID comparators for tracing */
|
|
drvdata->numvmidc = BMVAL(etmidr4, 28, 31);
|
|
|
|
etmidr5 = readl_relaxed(drvdata->base + TRCIDR5);
|
|
/* NUMEXTIN, bits[8:0] number of external inputs implemented */
|
|
drvdata->nr_ext_inp = BMVAL(etmidr5, 0, 8);
|
|
/* TRACEIDSIZE, bits[21:16] indicates the trace ID width */
|
|
drvdata->trcid_size = BMVAL(etmidr5, 16, 21);
|
|
/* ATBTRIG, bit[22] implementation can support ATB triggers? */
|
|
if (BMVAL(etmidr5, 22, 22))
|
|
drvdata->atbtrig = true;
|
|
else
|
|
drvdata->atbtrig = false;
|
|
/*
|
|
* LPOVERRIDE, bit[23] implementation supports
|
|
* low-power state override
|
|
*/
|
|
if (BMVAL(etmidr5, 23, 23))
|
|
drvdata->lpoverride = true;
|
|
else
|
|
drvdata->lpoverride = false;
|
|
/* NUMSEQSTATE, bits[27:25] number of sequencer states implemented */
|
|
drvdata->nrseqstate = BMVAL(etmidr5, 25, 27);
|
|
/* NUMCNTR, bits[30:28] number of counters available for tracing */
|
|
drvdata->nr_cntr = BMVAL(etmidr5, 28, 30);
|
|
CS_LOCK(drvdata->base);
|
|
}
|
|
|
|
static void etm4_set_default_config(struct etmv4_config *config)
|
|
{
|
|
/* disable all events tracing */
|
|
config->eventctrl0 = 0x0;
|
|
config->eventctrl1 = 0x0;
|
|
|
|
/* disable stalling */
|
|
config->stall_ctrl = 0x0;
|
|
|
|
/* enable trace synchronization every 4096 bytes, if available */
|
|
config->syncfreq = 0xC;
|
|
|
|
/* disable timestamp event */
|
|
config->ts_ctrl = 0x0;
|
|
|
|
/* TRCVICTLR::EVENT = 0x01, select the always on logic */
|
|
config->vinst_ctrl |= BIT(0);
|
|
}
|
|
|
|
static u64 etm4_get_ns_access_type(struct etmv4_config *config)
|
|
{
|
|
u64 access_type = 0;
|
|
|
|
/*
|
|
* EXLEVEL_NS, bits[15:12]
|
|
* The Exception levels are:
|
|
* Bit[12] Exception level 0 - Application
|
|
* Bit[13] Exception level 1 - OS
|
|
* Bit[14] Exception level 2 - Hypervisor
|
|
* Bit[15] Never implemented
|
|
*/
|
|
if (!is_kernel_in_hyp_mode()) {
|
|
/* Stay away from hypervisor mode for non-VHE */
|
|
access_type = ETM_EXLEVEL_NS_HYP;
|
|
if (config->mode & ETM_MODE_EXCL_KERN)
|
|
access_type |= ETM_EXLEVEL_NS_OS;
|
|
} else if (config->mode & ETM_MODE_EXCL_KERN) {
|
|
access_type = ETM_EXLEVEL_NS_HYP;
|
|
}
|
|
|
|
if (config->mode & ETM_MODE_EXCL_USER)
|
|
access_type |= ETM_EXLEVEL_NS_APP;
|
|
|
|
return access_type;
|
|
}
|
|
|
|
static u64 etm4_get_access_type(struct etmv4_config *config)
|
|
{
|
|
u64 access_type = etm4_get_ns_access_type(config);
|
|
|
|
/*
|
|
* EXLEVEL_S, bits[11:8], don't trace anything happening
|
|
* in secure state.
|
|
*/
|
|
access_type |= (ETM_EXLEVEL_S_APP |
|
|
ETM_EXLEVEL_S_OS |
|
|
ETM_EXLEVEL_S_HYP);
|
|
|
|
return access_type;
|
|
}
|
|
|
|
static void etm4_set_comparator_filter(struct etmv4_config *config,
|
|
u64 start, u64 stop, int comparator)
|
|
{
|
|
u64 access_type = etm4_get_access_type(config);
|
|
|
|
/* First half of default address comparator */
|
|
config->addr_val[comparator] = start;
|
|
config->addr_acc[comparator] = access_type;
|
|
config->addr_type[comparator] = ETM_ADDR_TYPE_RANGE;
|
|
|
|
/* Second half of default address comparator */
|
|
config->addr_val[comparator + 1] = stop;
|
|
config->addr_acc[comparator + 1] = access_type;
|
|
config->addr_type[comparator + 1] = ETM_ADDR_TYPE_RANGE;
|
|
|
|
/*
|
|
* Configure the ViewInst function to include this address range
|
|
* comparator.
|
|
*
|
|
* @comparator is divided by two since it is the index in the
|
|
* etmv4_config::addr_val array but register TRCVIIECTLR deals with
|
|
* address range comparator _pairs_.
|
|
*
|
|
* Therefore:
|
|
* index 0 -> compatator pair 0
|
|
* index 2 -> comparator pair 1
|
|
* index 4 -> comparator pair 2
|
|
* ...
|
|
* index 14 -> comparator pair 7
|
|
*/
|
|
config->viiectlr |= BIT(comparator / 2);
|
|
}
|
|
|
|
static void etm4_set_start_stop_filter(struct etmv4_config *config,
|
|
u64 address, int comparator,
|
|
enum etm_addr_type type)
|
|
{
|
|
int shift;
|
|
u64 access_type = etm4_get_access_type(config);
|
|
|
|
/* Configure the comparator */
|
|
config->addr_val[comparator] = address;
|
|
config->addr_acc[comparator] = access_type;
|
|
config->addr_type[comparator] = type;
|
|
|
|
/*
|
|
* Configure ViewInst Start-Stop control register.
|
|
* Addresses configured to start tracing go from bit 0 to n-1,
|
|
* while those configured to stop tracing from 16 to 16 + n-1.
|
|
*/
|
|
shift = (type == ETM_ADDR_TYPE_START ? 0 : 16);
|
|
config->vissctlr |= BIT(shift + comparator);
|
|
}
|
|
|
|
static void etm4_set_default_filter(struct etmv4_config *config)
|
|
{
|
|
u64 start, stop;
|
|
|
|
/*
|
|
* Configure address range comparator '0' to encompass all
|
|
* possible addresses.
|
|
*/
|
|
start = 0x0;
|
|
stop = ~0x0;
|
|
|
|
etm4_set_comparator_filter(config, start, stop,
|
|
ETM_DEFAULT_ADDR_COMP);
|
|
|
|
/*
|
|
* TRCVICTLR::SSSTATUS == 1, the start-stop logic is
|
|
* in the started state
|
|
*/
|
|
config->vinst_ctrl |= BIT(9);
|
|
|
|
/* No start-stop filtering for ViewInst */
|
|
config->vissctlr = 0x0;
|
|
}
|
|
|
|
static void etm4_set_default(struct etmv4_config *config)
|
|
{
|
|
if (WARN_ON_ONCE(!config))
|
|
return;
|
|
|
|
/*
|
|
* Make default initialisation trace everything
|
|
*
|
|
* Select the "always true" resource selector on the
|
|
* "Enablign Event" line and configure address range comparator
|
|
* '0' to trace all the possible address range. From there
|
|
* configure the "include/exclude" engine to include address
|
|
* range comparator '0'.
|
|
*/
|
|
etm4_set_default_config(config);
|
|
etm4_set_default_filter(config);
|
|
}
|
|
|
|
static int etm4_get_next_comparator(struct etmv4_drvdata *drvdata, u32 type)
|
|
{
|
|
int nr_comparator, index = 0;
|
|
struct etmv4_config *config = &drvdata->config;
|
|
|
|
/*
|
|
* nr_addr_cmp holds the number of comparator _pair_, so time 2
|
|
* for the total number of comparators.
|
|
*/
|
|
nr_comparator = drvdata->nr_addr_cmp * 2;
|
|
|
|
/* Go through the tally of comparators looking for a free one. */
|
|
while (index < nr_comparator) {
|
|
switch (type) {
|
|
case ETM_ADDR_TYPE_RANGE:
|
|
if (config->addr_type[index] == ETM_ADDR_TYPE_NONE &&
|
|
config->addr_type[index + 1] == ETM_ADDR_TYPE_NONE)
|
|
return index;
|
|
|
|
/* Address range comparators go in pairs */
|
|
index += 2;
|
|
break;
|
|
case ETM_ADDR_TYPE_START:
|
|
case ETM_ADDR_TYPE_STOP:
|
|
if (config->addr_type[index] == ETM_ADDR_TYPE_NONE)
|
|
return index;
|
|
|
|
/* Start/stop address can have odd indexes */
|
|
index += 1;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
/* If we are here all the comparators have been used. */
|
|
return -ENOSPC;
|
|
}
|
|
|
|
static int etm4_set_event_filters(struct etmv4_drvdata *drvdata,
|
|
struct perf_event *event)
|
|
{
|
|
int i, comparator, ret = 0;
|
|
u64 address;
|
|
struct etmv4_config *config = &drvdata->config;
|
|
struct etm_filters *filters = event->hw.addr_filters;
|
|
|
|
if (!filters)
|
|
goto default_filter;
|
|
|
|
/* Sync events with what Perf got */
|
|
perf_event_addr_filters_sync(event);
|
|
|
|
/*
|
|
* If there are no filters to deal with simply go ahead with
|
|
* the default filter, i.e the entire address range.
|
|
*/
|
|
if (!filters->nr_filters)
|
|
goto default_filter;
|
|
|
|
for (i = 0; i < filters->nr_filters; i++) {
|
|
struct etm_filter *filter = &filters->etm_filter[i];
|
|
enum etm_addr_type type = filter->type;
|
|
|
|
/* See if a comparator is free. */
|
|
comparator = etm4_get_next_comparator(drvdata, type);
|
|
if (comparator < 0) {
|
|
ret = comparator;
|
|
goto out;
|
|
}
|
|
|
|
switch (type) {
|
|
case ETM_ADDR_TYPE_RANGE:
|
|
etm4_set_comparator_filter(config,
|
|
filter->start_addr,
|
|
filter->stop_addr,
|
|
comparator);
|
|
/*
|
|
* TRCVICTLR::SSSTATUS == 1, the start-stop logic is
|
|
* in the started state
|
|
*/
|
|
config->vinst_ctrl |= BIT(9);
|
|
|
|
/* No start-stop filtering for ViewInst */
|
|
config->vissctlr = 0x0;
|
|
break;
|
|
case ETM_ADDR_TYPE_START:
|
|
case ETM_ADDR_TYPE_STOP:
|
|
/* Get the right start or stop address */
|
|
address = (type == ETM_ADDR_TYPE_START ?
|
|
filter->start_addr :
|
|
filter->stop_addr);
|
|
|
|
/* Configure comparator */
|
|
etm4_set_start_stop_filter(config, address,
|
|
comparator, type);
|
|
|
|
/*
|
|
* If filters::ssstatus == 1, trace acquisition was
|
|
* started but the process was yanked away before the
|
|
* the stop address was hit. As such the start/stop
|
|
* logic needs to be re-started so that tracing can
|
|
* resume where it left.
|
|
*
|
|
* The start/stop logic status when a process is
|
|
* scheduled out is checked in function
|
|
* etm4_disable_perf().
|
|
*/
|
|
if (filters->ssstatus)
|
|
config->vinst_ctrl |= BIT(9);
|
|
|
|
/* No include/exclude filtering for ViewInst */
|
|
config->viiectlr = 0x0;
|
|
break;
|
|
default:
|
|
ret = -EINVAL;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
goto out;
|
|
|
|
|
|
default_filter:
|
|
etm4_set_default_filter(config);
|
|
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
void etm4_config_trace_mode(struct etmv4_config *config)
|
|
{
|
|
u32 addr_acc, mode;
|
|
|
|
mode = config->mode;
|
|
mode &= (ETM_MODE_EXCL_KERN | ETM_MODE_EXCL_USER);
|
|
|
|
/* excluding kernel AND user space doesn't make sense */
|
|
WARN_ON_ONCE(mode == (ETM_MODE_EXCL_KERN | ETM_MODE_EXCL_USER));
|
|
|
|
/* nothing to do if neither flags are set */
|
|
if (!(mode & ETM_MODE_EXCL_KERN) && !(mode & ETM_MODE_EXCL_USER))
|
|
return;
|
|
|
|
addr_acc = config->addr_acc[ETM_DEFAULT_ADDR_COMP];
|
|
/* clear default config */
|
|
addr_acc &= ~(ETM_EXLEVEL_NS_APP | ETM_EXLEVEL_NS_OS |
|
|
ETM_EXLEVEL_NS_HYP);
|
|
|
|
addr_acc |= etm4_get_ns_access_type(config);
|
|
|
|
config->addr_acc[ETM_DEFAULT_ADDR_COMP] = addr_acc;
|
|
config->addr_acc[ETM_DEFAULT_ADDR_COMP + 1] = addr_acc;
|
|
}
|
|
|
|
static int etm4_online_cpu(unsigned int cpu)
|
|
{
|
|
if (!etmdrvdata[cpu])
|
|
return 0;
|
|
|
|
if (etmdrvdata[cpu]->boot_enable && !etmdrvdata[cpu]->sticky_enable)
|
|
coresight_enable(etmdrvdata[cpu]->csdev);
|
|
return 0;
|
|
}
|
|
|
|
static int etm4_starting_cpu(unsigned int cpu)
|
|
{
|
|
if (!etmdrvdata[cpu])
|
|
return 0;
|
|
|
|
spin_lock(&etmdrvdata[cpu]->spinlock);
|
|
if (!etmdrvdata[cpu]->os_unlock)
|
|
etm4_os_unlock(etmdrvdata[cpu]);
|
|
|
|
if (local_read(&etmdrvdata[cpu]->mode))
|
|
etm4_enable_hw(etmdrvdata[cpu]);
|
|
spin_unlock(&etmdrvdata[cpu]->spinlock);
|
|
return 0;
|
|
}
|
|
|
|
static int etm4_dying_cpu(unsigned int cpu)
|
|
{
|
|
if (!etmdrvdata[cpu])
|
|
return 0;
|
|
|
|
spin_lock(&etmdrvdata[cpu]->spinlock);
|
|
if (local_read(&etmdrvdata[cpu]->mode))
|
|
etm4_disable_hw(etmdrvdata[cpu]);
|
|
spin_unlock(&etmdrvdata[cpu]->spinlock);
|
|
return 0;
|
|
}
|
|
|
|
static void etm4_init_trace_id(struct etmv4_drvdata *drvdata)
|
|
{
|
|
drvdata->trcid = coresight_get_trace_id(drvdata->cpu);
|
|
}
|
|
|
|
static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
|
|
{
|
|
int ret;
|
|
void __iomem *base;
|
|
struct device *dev = &adev->dev;
|
|
struct coresight_platform_data *pdata = NULL;
|
|
struct etmv4_drvdata *drvdata;
|
|
struct resource *res = &adev->res;
|
|
struct coresight_desc desc = { 0 };
|
|
|
|
drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL);
|
|
if (!drvdata)
|
|
return -ENOMEM;
|
|
|
|
dev_set_drvdata(dev, drvdata);
|
|
|
|
/* Validity for the resource is already checked by the AMBA core */
|
|
base = devm_ioremap_resource(dev, res);
|
|
if (IS_ERR(base))
|
|
return PTR_ERR(base);
|
|
|
|
drvdata->base = base;
|
|
|
|
spin_lock_init(&drvdata->spinlock);
|
|
|
|
drvdata->cpu = coresight_get_cpu(dev);
|
|
if (drvdata->cpu < 0)
|
|
return drvdata->cpu;
|
|
|
|
if (of_property_read_string(dev->of_node, "coresight-name", &desc.name))
|
|
desc.name = devm_kasprintf(dev, GFP_KERNEL, "etm%d",
|
|
drvdata->cpu);
|
|
if (!desc.name)
|
|
return -ENOMEM;
|
|
|
|
cpus_read_lock();
|
|
etmdrvdata[drvdata->cpu] = drvdata;
|
|
|
|
if (smp_call_function_single(drvdata->cpu,
|
|
etm4_init_arch_data, drvdata, 1))
|
|
dev_err(dev, "ETM arch init failed\n");
|
|
|
|
if (!etm4_count++) {
|
|
cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING,
|
|
"arm/coresight4:starting",
|
|
etm4_starting_cpu, etm4_dying_cpu);
|
|
ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN,
|
|
"arm/coresight4:online",
|
|
etm4_online_cpu, NULL);
|
|
if (ret < 0) {
|
|
cpus_read_unlock();
|
|
goto err_arch_supported;
|
|
}
|
|
hp_online = ret;
|
|
}
|
|
|
|
cpus_read_unlock();
|
|
|
|
if (etm4_arch_supported(drvdata->arch) == false) {
|
|
ret = -EINVAL;
|
|
goto err_arch_supported;
|
|
}
|
|
|
|
etm4_init_trace_id(drvdata);
|
|
etm4_set_default(&drvdata->config);
|
|
|
|
pdata = coresight_get_platform_data(dev);
|
|
if (IS_ERR(pdata)) {
|
|
ret = PTR_ERR(pdata);
|
|
goto err_arch_supported;
|
|
}
|
|
adev->dev.platform_data = pdata;
|
|
|
|
desc.type = CORESIGHT_DEV_TYPE_SOURCE;
|
|
desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC;
|
|
desc.ops = &etm4_cs_ops;
|
|
desc.pdata = pdata;
|
|
desc.dev = dev;
|
|
desc.groups = coresight_etmv4_groups;
|
|
drvdata->csdev = coresight_register(&desc);
|
|
if (IS_ERR(drvdata->csdev)) {
|
|
ret = PTR_ERR(drvdata->csdev);
|
|
goto err_arch_supported;
|
|
}
|
|
|
|
ret = etm_perf_symlink(drvdata->csdev, true);
|
|
if (ret) {
|
|
coresight_unregister(drvdata->csdev);
|
|
goto err_arch_supported;
|
|
}
|
|
|
|
pm_runtime_put(&adev->dev);
|
|
dev_info(&drvdata->csdev->dev, "CPU%d: ETM v%d.%d initialized\n",
|
|
drvdata->cpu, drvdata->arch >> 4, drvdata->arch & 0xf);
|
|
|
|
drvdata->tupwr_disable = of_property_read_bool(dev->of_node,
|
|
"qcom,tupwr-disable");
|
|
|
|
dev_info(dev, "CPU%d: %s initialized\n",
|
|
drvdata->cpu, (char *)id->data);
|
|
|
|
if (boot_enable) {
|
|
coresight_enable(drvdata->csdev);
|
|
drvdata->boot_enable = true;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_arch_supported:
|
|
etmdrvdata[drvdata->cpu] = NULL;
|
|
if (--etm4_count == 0) {
|
|
cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING);
|
|
if (hp_online)
|
|
cpuhp_remove_state_nocalls(hp_online);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static struct amba_cs_uci_id uci_id_etm4[] = {
|
|
{
|
|
/* ETMv4 UCI data */
|
|
.devarch = 0x47704a13,
|
|
.devarch_mask = 0xfff0ffff,
|
|
.devtype = 0x00000013,
|
|
}
|
|
};
|
|
|
|
static const struct amba_id etm4_ids[] = {
|
|
CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */
|
|
CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */
|
|
CS_AMBA_ID(0x000bb95a), /* Cortex-A72 */
|
|
CS_AMBA_ID(0x000bb959), /* Cortex-A73 */
|
|
CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4),/* Cortex-A35 */
|
|
CS_AMBA_UCI_ID(0x000f0205, uci_id_etm4),/* Qualcomm Kryo */
|
|
CS_AMBA_UCI_ID(0x000f0211, uci_id_etm4),/* Qualcomm Kryo */
|
|
CS_AMBA_ID(0x000bb802), /* Qualcomm Kryo 385 Cortex-A55 */
|
|
CS_AMBA_ID(0x000bb803), /* Qualcomm Kryo 385 Cortex-A75 */
|
|
{},
|
|
};
|
|
|
|
static struct amba_driver etm4x_driver = {
|
|
.drv = {
|
|
.name = "coresight-etm4x",
|
|
.suppress_bind_attrs = true,
|
|
},
|
|
.probe = etm4_probe,
|
|
.id_table = etm4_ids,
|
|
};
|
|
builtin_amba_driver(etm4x_driver);
|