-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmbCv24ACgkQONu9yGCS aT7lNRAAzP2lSCUHROaMTldoQdahqoWqwFSiMI9p32HYLTerpg1GHVsi1IUvD+pv zhmUG9w+ACbSbZ9337G61FeEDCIBzgqaIXLCtbK2Be9nWMa9I1ZtMSFUKoSmVJBw YbrI/UOscJmAf44G6DeMp+N+/S2o7INK463u51SYjufo/zhFF8KsYElm23p06kgn lTkkUAoo9mSVvEr64zbjwLrWyBWTlcvYH/xrkWeJWXl+hBv0K5Ig9IBm0sc0DSQR fErADzDLFkmD9pduZbMwbzUUzC8ST41KKjTgClaHQhSMeoLoWT8CJM5Swwds4XVE JkoClkqnj3+stYFpLFm9UUgZ12wu/9slzgRCN6fTraSNT8gE9F9BRJXFGL+3S5OO oHKZYEEPTZDsD3PihgufJ4Ft27+KpMUzAgQUmVH/y47wrVJ2pf4fCK8LKT0MbjBi pjZaDRCxwo1aORL3+jYJBVRecrNqQ0DhacYOKznhb2KKeaHojIwLaE6k/W/0Q8U5 1uMYv+NJ3LWDNzGcNUTCfNtuDELOpkp24Xc8RN0MK2iMMMyfjMpgKssjSBZtz0QW NH0UVpfiWKECKH+m03NeFnYdMuK8/VyM8vatkcemz0FfgJP2UazeiVwSujfS2r2S 0TtsCMPP3kgKa9mAnni7lQs4wkG+OTNDNZqbuDqFZ1rHUS2Usrg= =8i2e -----END PGP SIGNATURE----- Merge 5.10.224 into android12-5.10-lts Changes in 5.10.224 EDAC/skx_common: Add new ADXL components for 2-level memory EDAC, i10nm: make skx_common.o a separate module platform/chrome: cros_ec_debugfs: fix wrong EC message version hfsplus: fix to avoid false alarm of circular locking x86/of: Return consistent error type from x86_of_pci_irq_enable() x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling x86/pci/xen: Fix PCIBIOS_* return code handling x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos hwmon: (adt7475) Fix default duty on fan is disabled pwm: stm32: Always do lazy disabling hwmon: (max6697) Fix underflow when writing limit attributes hwmon: (max6697) Fix swapped temp{1,8} critical alarms arm64: dts: qcom: sdm845: add power-domain to UFS PHY soc: qcom: rpmh-rsc: Ensure irqs aren't disabled by rpmh_rsc_send_data() callers arm64: dts: qcom: msm8996: specify UFS core_clk frequencies soc: qcom: pdr: protect locator_addr with the main mutex soc: qcom: pdr: fix parsing of domains lists arm64: dts: rockchip: Increase VOP clk rate on RK3328 ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset ARM: dts: imx6qdl-kontron-samx6i: fix board reset ARM: dts: imx6qdl-kontron-samx6i: fix SPI0 chip selects ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity arm64: dts: mediatek: mt8183-kukui: Drop bogus output-enable property arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux arm64: dts: amlogic: gx: correct hdmi clocks m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages x86/xen: Convert comma to semicolon m68k: cmpxchg: Fix return value for default case in __arch_xchg() ARM: pxa: spitz: use gpio descriptors for audio ARM: spitz: fix GPIO assignment for backlight firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout() firmware: turris-mox-rwtm: Initialize completion before mailbox wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device selftests/bpf: Fix prog numbers in test_sockmap net: esp: cleanup esp_output_tail_tcp() in case of unsupported ESPINTCP net/smc: Allow SMC-D 1MB DMB allocations net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined selftests/bpf: Check length of recv in test_sockmap lib: objagg: Fix general protection fault mlxsw: spectrum_acl_erp: Fix object nesting warning mlxsw: spectrum_acl_bloom_filter: Make mlxsw_sp_acl_bf_key_encode() more flexible mlxsw: spectrum_acl: Fix ACL scale regression and firmware errors ath11k: dp: stop rx pktlog before suspend wifi: ath11k: fix wrong handling of CCMP256 and GCMP ciphers wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he() wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he() net: fec: Refactor: #define magic constants net: fec: Fix FEC_ECR_EN1588 being cleared on link-down ipvs: Avoid unnecessary calls to skb_is_gso_sctp netfilter: nf_tables: rise cap on SELinux secmark context perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation perf: Fix perf_aux_size() for greater-than 32-bit size perf: Prevent passing zero nr_pages to rb_alloc_aux() qed: Improve the stack space of filter_config() wifi: virt_wifi: avoid reporting connection success with wrong SSID gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey wifi: virt_wifi: don't use strlen() in const context selftests/bpf: Close fd in error path in drop_on_reuseport bpf: annotate BTF show functions with __printf bna: adjust 'name' buf size of bna_tcb and bna_ccb structures bpf: Eliminate remaining "make W=1" warnings in kernel/bpf/btf.o selftests: forwarding: devlink_lib: Wait for udev events after reloading xdp: fix invalid wait context of page_pool_destroy() drm/panel: boe-tv101wum-nl6: If prepare fails, disable GPIO before regulators drm/panel: boe-tv101wum-nl6: Check for errors on the NOP in prepare() media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control() media: imon: Fix race getting ictx->lock saa7134: Unchecked i2c_transfer function result fixed media: uvcvideo: Allow entity-defined get_info and get_cur media: uvcvideo: Override default flags media: renesas: vsp1: Fix _irqsave and _irq mix media: renesas: vsp1: Store RPF partition configuration per RPF instance leds: trigger: Unregister sysfs attributes before calling deactivate() perf report: Fix condition in sort__sym_cmp() drm/etnaviv: fix DMA direction handling for cached RW buffers drm/qxl: Add check for drm_cvt_mode Revert "leds: led-core: Fix refcount leak in of_led_get()" ext4: fix infinite loop when replaying fast_commit media: venus: flush all buffers in output plane streamoff mfd: omap-usb-tll: Use struct_size to allocate tll xprtrdma: Rename frwr_release_mr() xprtrdma: Fix rpcrdma_reqs_reset() SUNRPC: avoid soft lockup when transmitting UDP to reachable server. ext4: avoid writing unitialized memory to disk in EA inodes sparc64: Fix incorrect function signature and add prototype for prom_cif_init SUNRPC: Fixup gss_status tracepoint error output PCI: Fix resource double counting on remove & rescan coresight: Fix ref leak when of_coresight_parse_endpoint() fails Input: qt1050 - handle CHIP_ID reading error RDMA/mlx4: Fix truncated output warning in mad.c RDMA/mlx4: Fix truncated output warning in alias_GUID.c RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs ASoC: max98088: Check for clk_prepare_enable() error mtd: make mtd_test.c a separate module RDMA/device: Return error earlier if port in not valid Input: elan_i2c - do not leave interrupt disabled on suspend failure MIPS: Octeron: remove source file executable bit powerpc/xmon: Fix disassembly CPU feature checks macintosh/therm_windtunnel: fix module unload. RDMA/hns: Fix missing pagesize and alignment check in FRMR bnxt_re: Fix imm_data endianness netfilter: ctnetlink: use helper function to calculate expect ID net: dsa: mv88e6xxx: Limit chip-wide frame size config to CPU ports net: dsa: b53: Limit chip-wide jumbo frame config to CPU ports pinctrl: rockchip: update rk3308 iomux routes pinctrl: core: fix possible memory leak when pinctrl_enable() fails pinctrl: single: fix possible memory leak when pinctrl_enable() fails pinctrl: ti: ti-iodelay: Drop if block with always false condition pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails pinctrl: freescale: mxs: Fix refcount of child fs/proc/task_mmu: indicate PM_FILE for PMD-mapped file THP fs/nilfs2: remove some unused macros to tame gcc nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro rtc: interface: Add RTC offset to alarm after fix-up dt-bindings: thermal: correct thermal zone node name limit tick/broadcast: Make takeover of broadcast hrtimer reliable net: netconsole: Disable target before netpoll cleanup af_packet: Handle outgoing VLAN packets without hardware offloading ipv6: take care of scope when choosing the src addr sched/fair: set_load_weight() must also call reweight_task() for SCHED_IDLE tasks char: tpm: Fix possible memory leak in tpm_bios_measurements_open() media: venus: fix use after free in vdec_close hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode() ext2: Verify bitmap and itable block numbers before using them drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes scsi: qla2xxx: Fix optrom version displayed in FDMI drm/amd/display: Check for NULL pointer sched/fair: Use all little CPUs for CPU-bound workloads apparmor: use kvfree_sensitive to free data->data task_work: s/task_work_cancel()/task_work_cancel_func()/ task_work: Introduce task_work_cancel() again udf: Avoid using corrupted block bitmap buffer m68k: amiga: Turn off Warp1260 interrupts during boot ext4: check dot and dotdot of dx_root before making dir indexed ext4: make sure the first directory block is not a hole wifi: mwifiex: Fix interface type change leds: ss4200: Convert PCIBIOS_* return codes to errnos jbd2: make jbd2_journal_get_max_txn_bufs() internal KVM: VMX: Split out the non-virtualization part of vmx_interrupt_blocked() tools/memory-model: Fix bug in lock.cat hwrng: amd - Convert PCIBIOS_* return codes to errnos PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio binder: fix hang of unregistered readers dev/parport: fix the array out-of-bounds risk scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds f2fs: fix to don't dirty inode for readonly filesystem clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use ubi: eba: properly rollback inside self_check_eba decompress_bunzip2: fix rare decompression failure kbuild: Fix '-S -c' in x86 stack protector scripts kobject_uevent: Fix OOB access within zap_modalias_env() devres: Fix devm_krealloc() wasting memory rtc: cmos: Fix return value of nvmem callbacks scsi: qla2xxx: During vport delete send async logout explicitly scsi: qla2xxx: Fix for possible memory corruption scsi: qla2xxx: Fix flash read failure scsi: qla2xxx: Complete command early within lock scsi: qla2xxx: validate nvme_local_port correctly perf/x86/intel/pt: Fix topa_entry base length perf/x86/intel/pt: Fix a topa_entry base address calculation rtc: isl1208: Fix return value of nvmem callbacks watchdog/perf: properly initialize the turbo mode timestamp and rearm counter platform: mips: cpu_hwmon: Disable driver on unsupported hardware RDMA/iwcm: Fix a use-after-free related to destroying CM IDs selftests/sigaltstack: Fix ppc64 GCC build rbd: don't assume rbd_is_lock_owner() for exclusive mappings MIPS: ip30: ip30-console: Add missing include MIPS: Loongson64: env: Hook up Loongsson-2K drm/panfrost: Mark simple_ondemand governor as softdep rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591 nilfs2: handle inconsistent state in nilfs_btnode_create_block() io_uring/io-wq: limit retrying worker initialisation kernel: rerun task_work while freezing in get_signal() kdb: address -Wformat-security warnings kdb: Use the passed prompt in kdb_position_cursor() jfs: Fix array-index-out-of-bounds in diFree um: time-travel: fix time-travel-start option f2fs: fix start segno of large section libbpf: Fix no-args func prototype BTF dumping syntax dma: fix call order in dmam_free_coherent MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later ipv4: Fix incorrect source address in Record Route option net: bonding: correctly annotate RCU in bond_should_notify_peers() netfilter: nft_set_pipapo_avx2: disable softinterrupts tipc: Return non-zero value from tipc_udp_addr2str() on error net: stmmac: Correct byte order of perfect_match net: nexthop: Initialize all fields in dumped nexthops bpf: Fix a segment issue when downgrading gso_size mISDN: Fix a use after free in hfcmulti_tx() apparmor: Fix null pointer deref when receiving skb during sock creation powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap() lirc: rc_dev_get_from_fd(): fix file leak ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable ceph: fix incorrect kmalloc size of pagevec mempool nvme: split command copy into a helper nvme-pci: add missing condition check for existence of mapped data fs: don't allow non-init s_user_ns for filesystems without FS_USERNS_MOUNT powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC fuse: name fs_context consistently fuse: verify {g,u}id mount options correctly sysctl: always initialize i_uid/i_gid ext4: factor out a common helper to query extent map ext4: check the extent status again before inserting delalloc block soc: xilinx: move PM_INIT_FINALIZE to zynqmp_pm_domains driver drivers: soc: xilinx: check return status of get_api_version() driver core: Cast to (void *) with __force for __percpu pointer devres: Fix memory leakage caused by driver API devm_free_percpu() genirq: Allow the PM device to originate from irq domain irqchip/imx-irqsteer: Constify irq_chip struct irqchip/imx-irqsteer: Add runtime PM support irqchip/imx-irqsteer: Handle runtime power management correctly remoteproc: imx_rproc: ignore mapping vdev regions remoteproc: imx_rproc: Fix ignoring mapping vdev regions remoteproc: imx_rproc: Skip over memory region when node value is NULL drm/nouveau: prime: fix refcount underflow drm/vmwgfx: Fix overlay when using Screen Targets sched: act_ct: take care of padding in struct zones_ht_key net/iucv: fix use after free in iucv_sock_close() net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys ipv6: fix ndisc_is_useropt() handling for PIO riscv/mm: Add handling for VM_FAULT_SIGSEGV in mm_fault_error() platform/chrome: cros_ec_proto: Lock device when updating MKBP version HID: wacom: Modify pen IDs protect the fetch of ->fd[fd] in do_dup2() from mispredictions ALSA: usb-audio: Correct surround channels in UAC1 channel map ALSA: hda/realtek: Add quirk for Acer Aspire E5-574G net: usb: sr9700: fix uninitialized variable use in sr_mdio_read r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY mptcp: fix duplicate data handling netfilter: ipset: Add list flush to cancel_gc genirq: Allow irq_chip registration functions to take a const irq_chip irqchip/mbigen: Fix mbigen node address layout x86/mm: Fix pti_clone_pgtable() alignment assumption x86/mm: Fix pti_clone_entry_text() for i386 sctp: move hlist_node and hashent out of sctp_ep_common sctp: Fix null-ptr-deref in reuseport_add_sock(). net: usb: qmi_wwan: fix memory leak for not ip packets net: linkwatch: use system_unbound_wq Bluetooth: l2cap: always unlock channel in l2cap_conless_channel() net: dsa: bcm_sf2: Fix a possible memory leak in bcm_sf2_mdio_register() l2tp: fix lockdep splat net: fec: Stop PPS on driver remove rcutorture: Fix rcu_torture_fwd_cb_cr() data race md: do not delete safemode_timer in mddev_suspend md/raid5: avoid BUG_ON() while continue reshape after reassembling clocksource/drivers/sh_cmt: Address race condition for clock events ACPI: battery: create alarm sysfs attribute atomically ACPI: SBS: manage alarm sysfs attribute through psy core selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT PCI: Add Edimax Vendor ID to pci_ids.h udf: prevent integer overflow in udf_bitmap_free_blocks() wifi: nl80211: don't give key data to userspace btrfs: fix bitmap leak when loading free space cache on duplicate entry drm/amdgpu: Fix the null pointer dereference to ras_manager drm/amdgpu/pm: Fix the null pointer dereference in apply_state_adjust_rules media: uvcvideo: Ignore empty TS packets media: uvcvideo: Fix the bandwdith quirk on USB 3.x jbd2: avoid memleak in jbd2_journal_write_metadata_buffer s390/sclp: Prevent release of buffer in I/O SUNRPC: Fix a race to wake a sync task sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime ext4: fix wrong unit use in ext4_mb_find_by_goal arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space arm64: Add Neoverse-V2 part arm64: cputype: Add Cortex-X4 definitions arm64: cputype: Add Neoverse-V3 definitions arm64: errata: Add workaround for Arm errata 3194386 and 3312417 arm64: cputype: Add Cortex-X3 definitions arm64: cputype: Add Cortex-A720 definitions arm64: cputype: Add Cortex-X925 definitions arm64: errata: Unify speculative SSBS errata logic arm64: errata: Expand speculative SSBS workaround arm64: cputype: Add Cortex-X1C definitions arm64: cputype: Add Cortex-A725 definitions arm64: errata: Expand speculative SSBS workaround (again) i2c: smbus: Improve handling of stuck alerts ASoC: codecs: wsa881x: Correct Soundwire ports mask i2c: smbus: Send alert notifications to all devices if source not found bpf: kprobe: remove unused declaring of bpf_kprobe_override kprobes: Fix to check symbol prefixes correctly spi: spi-fsl-lpspi: Fix scldiv calculation ALSA: usb-audio: Re-add ScratchAmp quirk entries drm/client: fix null pointer dereference in drm_client_modeset_probe ALSA: line6: Fix racy access to midibuf ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4 usb: vhci-hcd: Do not drop references before new references are gained USB: serial: debug: do not echo input by default usb: gadget: core: Check for unset descriptor usb: gadget: u_serial: Set start_delayed during suspend scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic tick/broadcast: Move per CPU pointer access into the atomic section ntp: Clamp maxerror and esterror to operating range driver core: Fix uevent_show() vs driver detach race ntp: Safeguard against time_constant overflow scsi: mpt3sas: Remove scsi_dma_map() error messages scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES irqchip/meson-gpio: support more than 8 channels gpio irq irqchip/meson-gpio: Convert meson_gpio_irq_controller::lock to 'raw_spinlock_t' serial: core: check uartclk for zero to avoid divide by zero irqchip/xilinx: Fix shift out of bounds genirq/irqdesc: Honor caller provided affinity in alloc_desc() power: supply: axp288_charger: Fix constant_charge_voltage writes power: supply: axp288_charger: Round constant_charge_voltage writes down tracing: Fix overflow in get_free_elt() padata: Fix possible divide-by-0 panic in padata_mt_helper() x86/mtrr: Check if fixed MTRRs exist before saving them drm/bridge: analogix_dp: properly handle zero sized AUX transactions drm/mgag200: Set DDC timeout in milliseconds mptcp: sched: check both directions for backup mptcp: distinguish rcv vs sent backup flag in requests mptcp: fix NL PM announced address accounting mptcp: mib: count MPJ with backup flag mptcp: export local_address mptcp: pm: fix backup support in signal endpoints samples: Add fs error monitoring example samples: Make fs-monitor depend on libc and headers Add gitignore file for samples/fanotify/ subdirectory Fix gcc 4.9 build issue in 5.10.y PCI/DPC: Fix use-after-free on concurrent DPC and hot-removal netfilter: nf_tables: set element extended ACK reporting support netfilter: nf_tables: use timestamp to check for set element timeout netfilter: nf_tables: allow clone callbacks to sleep netfilter: nf_tables: prefer nft_chain_validate drm/i915/gem: Fix Virtual Memory mapping boundaries calculation powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt. arm64: cpufeature: Fix the visibility of compat hwcaps media: uvcvideo: Use entity get_cur in uvc_ctrl_set exec: Fix ToCToU between perm check and set-uid/gid usage nvme/pci: Add APST quirk for Lenovo N60z laptop vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro vhost-vdpa: switch to use vmf_insert_pfn() in the fault handler wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()" Linux 5.10.224 Change-Id: I7cd19d506c4c86df918a280598946060a494a161 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
428 lines
11 KiB
C
428 lines
11 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (c) 2017 Pengutronix, Oleksij Rempel <kernel@pengutronix.de>
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/mfd/syscon.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regmap.h>
|
|
#include <linux/remoteproc.h>
|
|
|
|
#define IMX7D_SRC_SCR 0x0C
|
|
#define IMX7D_ENABLE_M4 BIT(3)
|
|
#define IMX7D_SW_M4P_RST BIT(2)
|
|
#define IMX7D_SW_M4C_RST BIT(1)
|
|
#define IMX7D_SW_M4C_NON_SCLR_RST BIT(0)
|
|
|
|
#define IMX7D_M4_RST_MASK (IMX7D_ENABLE_M4 | IMX7D_SW_M4P_RST \
|
|
| IMX7D_SW_M4C_RST \
|
|
| IMX7D_SW_M4C_NON_SCLR_RST)
|
|
|
|
#define IMX7D_M4_START (IMX7D_ENABLE_M4 | IMX7D_SW_M4P_RST \
|
|
| IMX7D_SW_M4C_RST)
|
|
#define IMX7D_M4_STOP IMX7D_SW_M4C_NON_SCLR_RST
|
|
|
|
/* Address: 0x020D8000 */
|
|
#define IMX6SX_SRC_SCR 0x00
|
|
#define IMX6SX_ENABLE_M4 BIT(22)
|
|
#define IMX6SX_SW_M4P_RST BIT(12)
|
|
#define IMX6SX_SW_M4C_NON_SCLR_RST BIT(4)
|
|
#define IMX6SX_SW_M4C_RST BIT(3)
|
|
|
|
#define IMX6SX_M4_START (IMX6SX_ENABLE_M4 | IMX6SX_SW_M4P_RST \
|
|
| IMX6SX_SW_M4C_RST)
|
|
#define IMX6SX_M4_STOP IMX6SX_SW_M4C_NON_SCLR_RST
|
|
#define IMX6SX_M4_RST_MASK (IMX6SX_ENABLE_M4 | IMX6SX_SW_M4P_RST \
|
|
| IMX6SX_SW_M4C_NON_SCLR_RST \
|
|
| IMX6SX_SW_M4C_RST)
|
|
|
|
#define IMX7D_RPROC_MEM_MAX 8
|
|
|
|
/**
|
|
* struct imx_rproc_mem - slim internal memory structure
|
|
* @cpu_addr: MPU virtual address of the memory region
|
|
* @sys_addr: Bus address used to access the memory region
|
|
* @size: Size of the memory region
|
|
*/
|
|
struct imx_rproc_mem {
|
|
void __iomem *cpu_addr;
|
|
phys_addr_t sys_addr;
|
|
size_t size;
|
|
};
|
|
|
|
/* att flags */
|
|
/* M4 own area. Can be mapped at probe */
|
|
#define ATT_OWN BIT(1)
|
|
|
|
/* address translation table */
|
|
struct imx_rproc_att {
|
|
u32 da; /* device address (From Cortex M4 view)*/
|
|
u32 sa; /* system bus address */
|
|
u32 size; /* size of reg range */
|
|
int flags;
|
|
};
|
|
|
|
struct imx_rproc_dcfg {
|
|
u32 src_reg;
|
|
u32 src_mask;
|
|
u32 src_start;
|
|
u32 src_stop;
|
|
const struct imx_rproc_att *att;
|
|
size_t att_size;
|
|
};
|
|
|
|
struct imx_rproc {
|
|
struct device *dev;
|
|
struct regmap *regmap;
|
|
struct rproc *rproc;
|
|
const struct imx_rproc_dcfg *dcfg;
|
|
struct imx_rproc_mem mem[IMX7D_RPROC_MEM_MAX];
|
|
struct clk *clk;
|
|
};
|
|
|
|
static const struct imx_rproc_att imx_rproc_att_imx7d[] = {
|
|
/* dev addr , sys addr , size , flags */
|
|
/* OCRAM_S (M4 Boot code) - alias */
|
|
{ 0x00000000, 0x00180000, 0x00008000, 0 },
|
|
/* OCRAM_S (Code) */
|
|
{ 0x00180000, 0x00180000, 0x00008000, ATT_OWN },
|
|
/* OCRAM (Code) - alias */
|
|
{ 0x00900000, 0x00900000, 0x00020000, 0 },
|
|
/* OCRAM_EPDC (Code) - alias */
|
|
{ 0x00920000, 0x00920000, 0x00020000, 0 },
|
|
/* OCRAM_PXP (Code) - alias */
|
|
{ 0x00940000, 0x00940000, 0x00008000, 0 },
|
|
/* TCML (Code) */
|
|
{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
|
|
/* DDR (Code) - alias, first part of DDR (Data) */
|
|
{ 0x10000000, 0x80000000, 0x0FFF0000, 0 },
|
|
|
|
/* TCMU (Data) */
|
|
{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
|
|
/* OCRAM (Data) */
|
|
{ 0x20200000, 0x00900000, 0x00020000, 0 },
|
|
/* OCRAM_EPDC (Data) */
|
|
{ 0x20220000, 0x00920000, 0x00020000, 0 },
|
|
/* OCRAM_PXP (Data) */
|
|
{ 0x20240000, 0x00940000, 0x00008000, 0 },
|
|
/* DDR (Data) */
|
|
{ 0x80000000, 0x80000000, 0x60000000, 0 },
|
|
};
|
|
|
|
static const struct imx_rproc_att imx_rproc_att_imx6sx[] = {
|
|
/* dev addr , sys addr , size , flags */
|
|
/* TCML (M4 Boot Code) - alias */
|
|
{ 0x00000000, 0x007F8000, 0x00008000, 0 },
|
|
/* OCRAM_S (Code) */
|
|
{ 0x00180000, 0x008F8000, 0x00004000, 0 },
|
|
/* OCRAM_S (Code) - alias */
|
|
{ 0x00180000, 0x008FC000, 0x00004000, 0 },
|
|
/* TCML (Code) */
|
|
{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
|
|
/* DDR (Code) - alias, first part of DDR (Data) */
|
|
{ 0x10000000, 0x80000000, 0x0FFF8000, 0 },
|
|
|
|
/* TCMU (Data) */
|
|
{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
|
|
/* OCRAM_S (Data) - alias? */
|
|
{ 0x208F8000, 0x008F8000, 0x00004000, 0 },
|
|
/* DDR (Data) */
|
|
{ 0x80000000, 0x80000000, 0x60000000, 0 },
|
|
};
|
|
|
|
static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = {
|
|
.src_reg = IMX7D_SRC_SCR,
|
|
.src_mask = IMX7D_M4_RST_MASK,
|
|
.src_start = IMX7D_M4_START,
|
|
.src_stop = IMX7D_M4_STOP,
|
|
.att = imx_rproc_att_imx7d,
|
|
.att_size = ARRAY_SIZE(imx_rproc_att_imx7d),
|
|
};
|
|
|
|
static const struct imx_rproc_dcfg imx_rproc_cfg_imx6sx = {
|
|
.src_reg = IMX6SX_SRC_SCR,
|
|
.src_mask = IMX6SX_M4_RST_MASK,
|
|
.src_start = IMX6SX_M4_START,
|
|
.src_stop = IMX6SX_M4_STOP,
|
|
.att = imx_rproc_att_imx6sx,
|
|
.att_size = ARRAY_SIZE(imx_rproc_att_imx6sx),
|
|
};
|
|
|
|
static int imx_rproc_start(struct rproc *rproc)
|
|
{
|
|
struct imx_rproc *priv = rproc->priv;
|
|
const struct imx_rproc_dcfg *dcfg = priv->dcfg;
|
|
struct device *dev = priv->dev;
|
|
int ret;
|
|
|
|
ret = regmap_update_bits(priv->regmap, dcfg->src_reg,
|
|
dcfg->src_mask, dcfg->src_start);
|
|
if (ret)
|
|
dev_err(dev, "Failed to enable M4!\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int imx_rproc_stop(struct rproc *rproc)
|
|
{
|
|
struct imx_rproc *priv = rproc->priv;
|
|
const struct imx_rproc_dcfg *dcfg = priv->dcfg;
|
|
struct device *dev = priv->dev;
|
|
int ret;
|
|
|
|
ret = regmap_update_bits(priv->regmap, dcfg->src_reg,
|
|
dcfg->src_mask, dcfg->src_stop);
|
|
if (ret)
|
|
dev_err(dev, "Failed to stop M4!\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,
|
|
size_t len, u64 *sys)
|
|
{
|
|
const struct imx_rproc_dcfg *dcfg = priv->dcfg;
|
|
int i;
|
|
|
|
/* parse address translation table */
|
|
for (i = 0; i < dcfg->att_size; i++) {
|
|
const struct imx_rproc_att *att = &dcfg->att[i];
|
|
|
|
if (da >= att->da && da + len < att->da + att->size) {
|
|
unsigned int offset = da - att->da;
|
|
|
|
*sys = att->sa + offset;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
dev_warn(priv->dev, "Translation failed: da = 0x%llx len = 0x%zx\n",
|
|
da, len);
|
|
return -ENOENT;
|
|
}
|
|
|
|
static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_iomem)
|
|
{
|
|
struct imx_rproc *priv = rproc->priv;
|
|
void *va = NULL;
|
|
u64 sys;
|
|
int i;
|
|
|
|
if (len == 0)
|
|
return NULL;
|
|
|
|
/*
|
|
* On device side we have many aliases, so we need to convert device
|
|
* address (M4) to system bus address first.
|
|
*/
|
|
if (imx_rproc_da_to_sys(priv, da, len, &sys))
|
|
return NULL;
|
|
|
|
for (i = 0; i < IMX7D_RPROC_MEM_MAX; i++) {
|
|
if (sys >= priv->mem[i].sys_addr && sys + len <
|
|
priv->mem[i].sys_addr + priv->mem[i].size) {
|
|
unsigned int offset = sys - priv->mem[i].sys_addr;
|
|
/* __force to make sparse happy with type conversion */
|
|
va = (__force void *)(priv->mem[i].cpu_addr + offset);
|
|
break;
|
|
}
|
|
}
|
|
|
|
dev_dbg(&rproc->dev, "da = 0x%llx len = 0x%zx va = 0x%p\n",
|
|
da, len, va);
|
|
|
|
return va;
|
|
}
|
|
|
|
static const struct rproc_ops imx_rproc_ops = {
|
|
.start = imx_rproc_start,
|
|
.stop = imx_rproc_stop,
|
|
.da_to_va = imx_rproc_da_to_va,
|
|
};
|
|
|
|
static int imx_rproc_addr_init(struct imx_rproc *priv,
|
|
struct platform_device *pdev)
|
|
{
|
|
const struct imx_rproc_dcfg *dcfg = priv->dcfg;
|
|
struct device *dev = &pdev->dev;
|
|
struct device_node *np = dev->of_node;
|
|
int a, b = 0, err, nph;
|
|
|
|
/* remap required addresses */
|
|
for (a = 0; a < dcfg->att_size; a++) {
|
|
const struct imx_rproc_att *att = &dcfg->att[a];
|
|
|
|
if (!(att->flags & ATT_OWN))
|
|
continue;
|
|
|
|
if (b >= IMX7D_RPROC_MEM_MAX)
|
|
break;
|
|
|
|
priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev,
|
|
att->sa, att->size);
|
|
if (!priv->mem[b].cpu_addr) {
|
|
dev_err(dev, "devm_ioremap_resource failed\n");
|
|
return -ENOMEM;
|
|
}
|
|
priv->mem[b].sys_addr = att->sa;
|
|
priv->mem[b].size = att->size;
|
|
b++;
|
|
}
|
|
|
|
/* memory-region is optional property */
|
|
nph = of_count_phandle_with_args(np, "memory-region", NULL);
|
|
if (nph <= 0)
|
|
return 0;
|
|
|
|
/* remap optional addresses */
|
|
for (a = 0; a < nph; a++) {
|
|
struct device_node *node;
|
|
struct resource res;
|
|
|
|
node = of_parse_phandle(np, "memory-region", a);
|
|
if (!node)
|
|
continue;
|
|
/* Not map vdevbuffer, vdevring region */
|
|
if (!strncmp(node->name, "vdev", strlen("vdev")))
|
|
continue;
|
|
err = of_address_to_resource(node, 0, &res);
|
|
if (err) {
|
|
dev_err(dev, "unable to resolve memory region\n");
|
|
return err;
|
|
}
|
|
|
|
if (b >= IMX7D_RPROC_MEM_MAX)
|
|
break;
|
|
|
|
priv->mem[b].cpu_addr = devm_ioremap_resource(&pdev->dev, &res);
|
|
if (IS_ERR(priv->mem[b].cpu_addr)) {
|
|
dev_err(dev, "devm_ioremap_resource failed\n");
|
|
err = PTR_ERR(priv->mem[b].cpu_addr);
|
|
return err;
|
|
}
|
|
priv->mem[b].sys_addr = res.start;
|
|
priv->mem[b].size = resource_size(&res);
|
|
b++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int imx_rproc_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct device_node *np = dev->of_node;
|
|
struct imx_rproc *priv;
|
|
struct rproc *rproc;
|
|
struct regmap_config config = { .name = "imx-rproc" };
|
|
const struct imx_rproc_dcfg *dcfg;
|
|
struct regmap *regmap;
|
|
int ret;
|
|
|
|
regmap = syscon_regmap_lookup_by_phandle(np, "syscon");
|
|
if (IS_ERR(regmap)) {
|
|
dev_err(dev, "failed to find syscon\n");
|
|
return PTR_ERR(regmap);
|
|
}
|
|
regmap_attach_dev(dev, regmap, &config);
|
|
|
|
/* set some other name then imx */
|
|
rproc = rproc_alloc(dev, "imx-rproc", &imx_rproc_ops,
|
|
NULL, sizeof(*priv));
|
|
if (!rproc)
|
|
return -ENOMEM;
|
|
|
|
dcfg = of_device_get_match_data(dev);
|
|
if (!dcfg) {
|
|
ret = -EINVAL;
|
|
goto err_put_rproc;
|
|
}
|
|
|
|
priv = rproc->priv;
|
|
priv->rproc = rproc;
|
|
priv->regmap = regmap;
|
|
priv->dcfg = dcfg;
|
|
priv->dev = dev;
|
|
|
|
dev_set_drvdata(dev, rproc);
|
|
|
|
ret = imx_rproc_addr_init(priv, pdev);
|
|
if (ret) {
|
|
dev_err(dev, "failed on imx_rproc_addr_init\n");
|
|
goto err_put_rproc;
|
|
}
|
|
|
|
priv->clk = devm_clk_get(dev, NULL);
|
|
if (IS_ERR(priv->clk)) {
|
|
dev_err(dev, "Failed to get clock\n");
|
|
ret = PTR_ERR(priv->clk);
|
|
goto err_put_rproc;
|
|
}
|
|
|
|
/*
|
|
* clk for M4 block including memory. Should be
|
|
* enabled before .start for FW transfer.
|
|
*/
|
|
ret = clk_prepare_enable(priv->clk);
|
|
if (ret) {
|
|
dev_err(&rproc->dev, "Failed to enable clock\n");
|
|
goto err_put_rproc;
|
|
}
|
|
|
|
ret = rproc_add(rproc);
|
|
if (ret) {
|
|
dev_err(dev, "rproc_add failed\n");
|
|
goto err_put_clk;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_put_clk:
|
|
clk_disable_unprepare(priv->clk);
|
|
err_put_rproc:
|
|
rproc_free(rproc);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int imx_rproc_remove(struct platform_device *pdev)
|
|
{
|
|
struct rproc *rproc = platform_get_drvdata(pdev);
|
|
struct imx_rproc *priv = rproc->priv;
|
|
|
|
clk_disable_unprepare(priv->clk);
|
|
rproc_del(rproc);
|
|
rproc_free(rproc);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id imx_rproc_of_match[] = {
|
|
{ .compatible = "fsl,imx7d-cm4", .data = &imx_rproc_cfg_imx7d },
|
|
{ .compatible = "fsl,imx6sx-cm4", .data = &imx_rproc_cfg_imx6sx },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, imx_rproc_of_match);
|
|
|
|
static struct platform_driver imx_rproc_driver = {
|
|
.probe = imx_rproc_probe,
|
|
.remove = imx_rproc_remove,
|
|
.driver = {
|
|
.name = "imx-rproc",
|
|
.of_match_table = imx_rproc_of_match,
|
|
},
|
|
};
|
|
|
|
module_platform_driver(imx_rproc_driver);
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_DESCRIPTION("IMX6SX/7D remote processor control driver");
|
|
MODULE_AUTHOR("Oleksij Rempel <o.rempel@pengutronix.de>");
|