95f4203fc9
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmJQLWwACgkQONu9yGCS aT4R2BAAr/cGnf2/BQ6+zNPW+LlfGn75803yd+oWNL8WzjNiQGrTsQavE1jL0LXP 45iPxvY6eOlP9oEoJGYyNYhzQfUM92Unysa/KemB/xUBsb2If0ZdWk1WB9Lnw0xq m65kACXovbcg4LsZGpgCv7ln1ykogo+bNMES9P6CLxwKR/DMKUeJxbRNKE/AkD5l DxF7IJEP+YRbKAtoLM2Xj4KdjVSfRIfs+Pf0A1t43GqAw6tt3beqmzeCwDzuzz5a DHpXS6PeJjTZOjz4LkuBSbyK5cKGFv1C6o7JVjWSZhDyI5E4OLdNDpNKqcjsXAN+ wMqS1eh4gYUBXmPE44BGwkkugPyaR0/KHUebfkFZG2/H/8DfvrGqlbvsGSFNXxsV jH2/AV/rOxAFeM/U0c1I4Ve42MU18kdf1MRBo0Dq5xSoN9HFQhNp+HE5jpppgsvi FYpMqZoQzH31GIjOq7g0zLdj4NTBrkO9dh7kbpH0Xay1yBmigvD2PA4qpsL1+VMI v73Iq/RJVGUJFAeiYFjn9IGs9EsiKNG08v9uoKS+1m1VLrpVdgwtzo+RjJ/E51Mt Nk4WK94MyoivkRFKulDasv9yBWdcZCfljc91271UCKCERlyO/bmsTqhffeATGGRh N/7oxa71BHvxp0VYqvKD6xFUs+jFt9DQmIX7Pl1/yLpaz+sN0no= =31mv -----END PGP SIGNATURE----- Merge 5.10.110 into android12-5.10-lts Changes in 5.10.110 swiotlb: fix info leak with DMA_FROM_DEVICE USB: serial: pl2303: add IBM device IDs USB: serial: simple: add Nokia phone driver hv: utils: add PTP_1588_CLOCK to Kconfig to fix build netdevice: add the case if dev is NULL HID: logitech-dj: add new lightspeed receiver id xfrm: fix tunnel model fragmentation behavior ARM: mstar: Select HAVE_ARM_ARCH_TIMER virtio_console: break out of buf poll on remove vdpa/mlx5: should verify CTRL_VQ feature exists for MQ tools/virtio: fix virtio_test execution ethernet: sun: Free the coherent when failing in probing gpio: Revert regression in sysfs-gpio (gpiolib.c) spi: Fix invalid sgs value net:mcf8390: Use platform_get_irq() to get the interrupt Revert "gpio: Revert regression in sysfs-gpio (gpiolib.c)" spi: Fix erroneous sgs value with min_t() Input: zinitix - do not report shadow fingers af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register net: dsa: microchip: add spi_device_id tables locking/lockdep: Avoid potential access of invalid memory in lock_class iommu/iova: Improve 32-bit free space estimate tpm: fix reference counting for struct tpm_chip virtio-blk: Use blk_validate_block_size() to validate block size USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c xhci: fix garbage USBSTS being logged in some cases xhci: fix runtime PM imbalance in USB2 resume xhci: make xhci_handshake timeout for xhci_reset() adjustable xhci: fix uninitialized string returned by xhci_decode_ctrl_ctx() mei: me: add Alder Lake N device id. mei: avoid iterator usage outside of list_for_each_entry coresight: Fix TRCCONFIGR.QE sysfs interface iio: afe: rescale: use s64 for temporary scale calculations iio: inkern: apply consumer scale on IIO_VAL_INT cases iio: inkern: apply consumer scale when no channel scale is available iio: inkern: make a best effort on offset calculation greybus: svc: fix an error handling bug in gb_svc_hello() clk: uniphier: Fix fixed-rate initialization ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE KEYS: fix length validation in keyctl_pkey_params_get_2() Documentation: add link to stable release candidate tree Documentation: update stable tree link firmware: stratix10-svc: add missing callback parameter on RSU HID: intel-ish-hid: Use dma_alloc_coherent for firmware update SUNRPC: avoid race between mod_timer() and del_timer_sync() NFSD: prevent underflow in nfssvc_decode_writeargs() NFSD: prevent integer overflow on 32 bit systems f2fs: fix to unlock page correctly in error path of is_alive() f2fs: quota: fix loop condition at f2fs_quota_sync() f2fs: fix to do sanity check on .cp_pack_total_block_count remoteproc: Fix count check in rproc_coredump_write() pinctrl: samsung: drop pin banks references on error paths spi: mxic: Fix the transmit path mtd: rawnand: protect access to rawnand devices while in suspend can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path jffs2: fix use-after-free in jffs2_clear_xattr_subsystem jffs2: fix memory leak in jffs2_do_mount_fs jffs2: fix memory leak in jffs2_scan_medium mm/pages_alloc.c: don't create ZONE_MOVABLE beyond the end of a node mm: invalidate hwpoison page cache page in fault path mempolicy: mbind_range() set_policy() after vma_merge() scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands qed: display VF trust config qed: validate and restrict untrusted VFs vlan promisc mode riscv: Fix fill_callchain return value riscv: Increase stack size under KASAN Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads" cifs: prevent bad output lengths in smb2_ioctl_query_info() cifs: fix NULL ptr dereference in smb2_ioctl_query_info() ALSA: cs4236: fix an incorrect NULL check on list iterator ALSA: hda: Avoid unsol event during RPM suspending ALSA: pcm: Fix potential AB/BA lock with buffer_mutex and mmap_lock ALSA: hda/realtek: Fix audio regression on Mi Notebook Pro 2020 mm: madvise: skip unmapped vma holes passed to process_madvise mm: madvise: return correct bytes advised with process_madvise Revert "mm: madvise: skip unmapped vma holes passed to process_madvise" mm,hwpoison: unmap poisoned page before invalidation mm/kmemleak: reset tag when compare object pointer dm integrity: set journal entry unused when shrinking device drbd: fix potential silent data corruption can: isotp: sanitize CAN ID checks in isotp_bind() powerpc/kvm: Fix kvm_use_magic_page udp: call udp_encap_enable for v6 sockets when enabling encap arm64: signal: nofpsimd: Do not allocate fp/simd context when not available arm64: dts: ti: k3-am65: Fix gic-v3 compatible regs arm64: dts: ti: k3-j721e: Fix gic-v3 compatible regs arm64: dts: ti: k3-j7200: Fix gic-v3 compatible regs ACPI: properties: Consistently return -ENOENT if there are no more references coredump: Also dump first pages of non-executable ELF libraries ext4: fix ext4_fc_stats trace point ext4: fix fs corruption when tring to remove a non-empty directory with IO error drivers: hamradio: 6pack: fix UAF bug caused by mod_timer() mailbox: tegra-hsp: Flush whole channel block: limit request dispatch loop duration block: don't merge across cgroup boundaries if blkcg is enabled drm/edid: check basic audio support on CEA extension block video: fbdev: sm712fb: Fix crash in smtcfb_read() video: fbdev: atari: Atari 2 bpp (STe) palette bugfix ARM: dts: at91: sama5d2: Fix PMERRLOC resource size ARM: dts: exynos: fix UART3 pins configuration in Exynos5250 ARM: dts: exynos: add missing HDMI supplies on SMDK5250 ARM: dts: exynos: add missing HDMI supplies on SMDK5420 mgag200 fix memmapsl configuration in GCTL6 register carl9170: fix missing bit-wise or operator for tx_params pstore: Don't use semaphores in always-atomic-context code thermal: int340x: Increase bitmap size lib/raid6/test: fix multiple definition linking error exec: Force single empty string when argv is empty crypto: rsa-pkcs1pad - only allow with rsa crypto: rsa-pkcs1pad - correctly get hash from source scatterlist crypto: rsa-pkcs1pad - restore signature length check crypto: rsa-pkcs1pad - fix buffer overread in pkcs1pad_verify_complete() bcache: fixup multiple threads crash DEC: Limit PMAX memory probing to R3k systems media: gpio-ir-tx: fix transmit with long spaces on Orange Pi PC media: davinci: vpif: fix unbalanced runtime PM get media: davinci: vpif: fix unbalanced runtime PM enable xtensa: fix stop_machine_cpuslocked call in patch_text xtensa: fix xtensa_wsr always writing 0 brcmfmac: firmware: Allocate space for default boardrev in nvram brcmfmac: pcie: Release firmwares in the brcmf_pcie_setup error path brcmfmac: pcie: Replace brcmf_pcie_copy_mem_todev with memcpy_toio brcmfmac: pcie: Fix crashes due to early IRQs drm/i915/opregion: check port number bounds for SWSCI display power state drm/i915/gem: add missing boundary check in vm_access PCI: pciehp: Clear cmd_busy bit in polling mode PCI: xgene: Revert "PCI: xgene: Fix IB window setup" regulator: qcom_smd: fix for_each_child.cocci warnings selinux: check return value of sel_make_avc_files hwrng: cavium - Check health status while reading random data hwrng: cavium - HW_RANDOM_CAVIUM should depend on ARCH_THUNDER crypto: sun8i-ss - really disable hash on A80 crypto: authenc - Fix sleep in atomic context in decrypt_tail crypto: mxs-dcp - Fix scatterlist processing thermal: int340x: Check for NULL after calling kmemdup() spi: tegra114: Add missing IRQ check in tegra_spi_probe arm64/mm: avoid fixmap race condition when create pud mapping selftests/x86: Add validity check and allow field splitting crypto: rockchip - ECB does not need IV audit: log AUDIT_TIME_* records only from rules EVM: fix the evm= __setup handler return value crypto: ccree - don't attempt 0 len DMA mappings spi: pxa2xx-pci: Balance reference count for PCI DMA device hwmon: (pmbus) Add mutex to regulator ops hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING nvme: cleanup __nvme_check_ids block: don't delete queue kobject before its children PM: hibernate: fix __setup handler error handling PM: suspend: fix return value of __setup handler spi: spi-zynqmp-gqspi: Handle error for dma_set_mask hwrng: atmel - disable trng on failure path crypto: sun8i-ss - call finalize with bh disabled crypto: sun8i-ce - call finalize with bh disabled crypto: amlogic - call finalize with bh disabled crypto: vmx - add missing dependencies clocksource/drivers/timer-ti-dm: Fix regression from errata i940 fix clocksource/drivers/exynos_mct: Refactor resources allocation clocksource/drivers/exynos_mct: Handle DTS with higher number of interrupts clocksource/drivers/timer-microchip-pit64b: Use notrace clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init() ACPI: APEI: fix return value of __setup handlers crypto: ccp - ccp_dmaengine_unregister release dma channels crypto: ccree - Fix use after free in cc_cipher_exit() vfio: platform: simplify device removal amba: Make the remove callback return void hwrng: nomadik - Change clk_disable to clk_disable_unprepare hwmon: (pmbus) Add Vin unit off handling clocksource: acpi_pm: fix return value of __setup handler io_uring: terminate manual loop iterator loop correctly for non-vecs watch_queue: Fix NULL dereference in error cleanup watch_queue: Actually free the watch f2fs: fix to enable ATGC correctly via gc_idle sysfs interface sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa sched/core: Export pelt_thermal_tp rseq: Optimise rseq_get_rseq_cs() and clear_rseq_cs() rseq: Remove broken uapi field layout on 32-bit little endian perf/core: Fix address filter parser for multiple filters perf/x86/intel/pt: Fix address filter config for 32-bit kernel f2fs: fix missing free nid in f2fs_handle_failed_inode nfsd: more robust allocation failure handling in nfsd_file_cache_init f2fs: fix to avoid potential deadlock btrfs: fix unexpected error path when reflinking an inline extent f2fs: compress: remove unneeded read when rewrite whole cluster f2fs: fix compressed file start atomic write may cause data corruption selftests, x86: fix how check_cc.sh is being invoked kunit: make kunit_test_timeout compatible with comment media: staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size media: v4l2-mem2mem: Apply DST_QUEUE_OFF_BASE on MMAP buffers across ioctls media: mtk-vcodec: potential dereference of null pointer media: bttv: fix WARNING regression on tunerless devices ASoC: xilinx: xlnx_formatter_pcm: Handle sysclk setting ASoC: generic: simple-card-utils: remove useless assignment media: coda: Fix missing put_device() call in coda_get_vdoa_data media: meson: vdec: potential dereference of null pointer media: hantro: Fix overfill bottom register field name media: aspeed: Correct value for h-total-pixels video: fbdev: matroxfb: set maxvram of vbG200eW to the same as vbG200 to avoid black screen video: fbdev: controlfb: Fix set but not used warnings video: fbdev: controlfb: Fix COMPILE_TEST build video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe() video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe() video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name() firmware: qcom: scm: Remove reassignment to desc following initializer ARM: dts: qcom: ipq4019: fix sleep clock soc: qcom: rpmpd: Check for null return of devm_kcalloc soc: qcom: ocmem: Fix missing put_device() call in of_get_ocmem soc: qcom: aoss: remove spurious IRQF_ONESHOT flags arm64: dts: qcom: sdm845: fix microphone bias properties and values arm64: dts: qcom: sm8150: Correct TCS configuration for apps rsc firmware: ti_sci: Fix compilation failure when CONFIG_TI_SCI_PROTOCOL is not defined soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe ARM: dts: sun8i: v3s: Move the csi1 block to follow address order ARM: dts: imx: Add missing LVDS decoder on M53Menlo media: video/hdmi: handle short reads of hdmi info frame. media: em28xx: initialize refcount before kref_get media: usb: go7007: s2250-board: fix leak in probe() media: cedrus: H265: Fix neighbour info buffer size media: cedrus: h264: Fix neighbour info buffer size ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put uaccess: fix nios2 and microblaze get_user_8() ASoC: rt5663: check the return value of devm_kzalloc() in rt5663_parse_dp() ASoC: ti: davinci-i2s: Add check for clk_enable() ALSA: spi: Add check for clk_enable() arm64: dts: ns2: Fix spi-cpol and spi-cpha property arm64: dts: broadcom: Fix sata nodename printk: fix return value of printk.devkmsg __setup handler ASoC: mxs-saif: Handle errors for clk_enable ASoC: atmel_ssc_dai: Handle errors for clk_enable ASoC: dwc-i2s: Handle errors for clk_enable ASoC: soc-compress: prevent the potentially use of null pointer memory: emif: Add check for setup_interrupts memory: emif: check the pointer temp in get_device_details() ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined media: stk1160: If start stream fails, return buffers with VB2_BUF_STATE_QUEUED media: vidtv: Check for null return of vzalloc ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe ASoC: wm8350: Handle error for wm8350_register_irq ASoC: fsi: Add check for clk_enable video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of media: saa7134: convert list_for_each to entry variant media: saa7134: fix incorrect use to determine if list is empty ivtv: fix incorrect device_caps for ivtvfb ASoC: rockchip: i2s: Use devm_platform_get_and_ioremap_resource() ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe ASoC: SOF: Add missing of_node_put() in imx8m_probe ASoC: dmaengine: do not use a NULL prepare_slave_config() callback ASoC: mxs: Fix error handling in mxs_sgtl5000_probe ASoC: fsl_spdif: Disable TX clock when stop ASoC: imx-es8328: Fix error return code in imx_es8328_probe() ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe mmc: davinci_mmc: Handle error for clk_enable ASoC: atmel: sam9x5_wm8731: use devm_snd_soc_register_card() ASoC: atmel: Fix error handling in sam9x5_wm8731_driver_probe ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe ASoC: codecs: wcd934x: Add missing of_node_put() in wcd934x_codec_parse_data ARM: configs: multi_v5_defconfig: re-enable CONFIG_V4L_PLATFORM_DRIVERS drm/meson: osd_afbcd: Add an exit callback to struct meson_afbcd_ops drm/bridge: Fix free wrong object in sii8620_init_rcp_input_dev drm/bridge: Add missing pm_runtime_disable() in __dw_mipi_dsi_probe drm/bridge: nwl-dsi: Fix PM disable depth imbalance in nwl_dsi_probe drm: bridge: adv7511: Fix ADV7535 HPD enablement ath10k: fix memory overwrite of the WoWLAN wakeup packet pattern drm/panfrost: Check for error num after setting mask libbpf: Fix possible NULL pointer dereference when destroying skeleton udmabuf: validate ubuf->pagecount Bluetooth: hci_serdev: call init_rwsem() before p->open() mtd: onenand: Check for error irq mtd: rawnand: gpmi: fix controller timings setting drm/edid: Don't clear formats if using deep color ionic: fix type complaint in ionic_dev_cmd_clean() drm/nouveau/acr: Fix undefined behavior in nvkm_acr_hsfw_load_bl() drm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes() drm/amd/pm: return -ENOTSUPP if there is no get_dpm_ultimate_freq function ath9k_htc: fix uninit value bugs RDMA/core: Set MR type in ib_reg_user_mr KVM: PPC: Fix vmx/vsx mixup in mmio emulation i40e: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb i40e: respect metadata on XSK Rx to skb power: reset: gemini-poweroff: Fix IRQ check in gemini_poweroff_probe ray_cs: Check ioremap return value powerpc: dts: t1040rdb: fix ports names for Seville Ethernet switch KVM: PPC: Book3S HV: Check return value of kvmppc_radix_init powerpc/perf: Don't use perf_hw_context for trace IMC PMU mt76: mt7915: use proper aid value in mt7915_mcu_wtbl_generic_tlv in sta mode mt76: mt7915: use proper aid value in mt7915_mcu_sta_basic_tlv mt76: mt7603: check sta_rates pointer in mt7603_sta_rate_tbl_update mt76: mt7615: check sta_rates pointer in mt7615_sta_rate_tbl_update net: dsa: mv88e6xxx: Enable port policy support on 6097 scripts/dtc: Call pkg-config POSIXly correct livepatch: Fix build failure on 32 bits processors PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge drm/bridge: dw-hdmi: use safe format when first in bridge chain power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports iommu/ipmmu-vmsa: Check for error num after setting mask drm/amd/pm: enable pm sysfs write for one VF mode drm/amd/display: Add affected crtcs to atomic state for dsc mst unplug IB/cma: Allow XRC INI QPs to set their local ACK timeout dax: make sure inodes are flushed before destroy cache iwlwifi: Fix -EIO error code that is never returned iwlwifi: mvm: Fix an error code in iwl_mvm_up() drm/msm/dp: populate connector of struct dp_panel drm/msm/dpu: add DSPP blocks teardown drm/msm/dpu: fix dp audio condition dm crypt: fix get_key_size compiler warning if !CONFIG_KEYS scsi: pm8001: Fix command initialization in pm80XX_send_read_log() scsi: pm8001: Fix command initialization in pm8001_chip_ssp_tm_req() scsi: pm8001: Fix payload initialization in pm80xx_set_thermal_config() scsi: pm8001: Fix le32 values handling in pm80xx_set_sas_protocol_timer_config() scsi: pm8001: Fix payload initialization in pm80xx_encrypt_update() scsi: pm8001: Fix le32 values handling in pm80xx_chip_ssp_io_req() scsi: pm8001: Fix le32 values handling in pm80xx_chip_sata_req() scsi: pm8001: Fix NCQ NON DATA command task initialization scsi: pm8001: Fix NCQ NON DATA command completion handling scsi: pm8001: Fix abort all task initialization RDMA/mlx5: Fix the flow of a miss in the allocation of a cache ODP MR drm/amd/display: Remove vupdate_int_entry definition TOMOYO: fix __setup handlers return values ext2: correct max file size computing drm/tegra: Fix reference leak in tegra_dsi_ganged_probe power: supply: bq24190_charger: Fix bq24190_vbus_is_enabled() wrong false return scsi: hisi_sas: Change permission of parameter prot_mask drm/bridge: cdns-dsi: Make sure to to create proper aliases for dt bpf, arm64: Call build_prologue() first in first JIT pass bpf, arm64: Feed byte-offset into bpf line info gpu: host1x: Fix a memory leak in 'host1x_remove()' libbpf: Skip forward declaration when counting duplicated type names powerpc/mm/numa: skip NUMA_NO_NODE onlining in parse_numa_properties() powerpc/Makefile: Don't pass -mcpu=powerpc64 when building 32-bit KVM: x86: Fix emulation in writing cr8 KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor() hv_balloon: rate-limit "Unhandled message" warning i2c: xiic: Make bus names unique power: supply: wm8350-power: Handle error for wm8350_register_irq power: supply: wm8350-power: Add missing free in free_charger_irq IB/hfi1: Allow larger MTU without AIP PCI: Reduce warnings on possible RW1C corruption net: axienet: fix RX ring refill allocation failure handling mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n powerpc/sysdev: fix incorrect use to determine if list is empty mfd: mc13xxx: Add check for mc13xxx_irq_request libbpf: Unmap rings when umem deleted selftests/bpf: Make test_lwt_ip_encap more stable and faster platform/x86: huawei-wmi: check the return value of device_create_file() powerpc: 8xx: fix a return value error in mpc8xx_pic_init vxcan: enable local echo for sent CAN frames ath10k: Fix error handling in ath10k_setup_msa_resources mips: cdmm: Fix refcount leak in mips_cdmm_phys_base MIPS: RB532: fix return value of __setup handler MIPS: pgalloc: fix memory leak caused by pgd_free() mtd: rawnand: atmel: fix refcount issue in atmel_nand_controller_init RDMA/mlx5: Fix memory leak in error flow for subscribe event routine bpf, sockmap: Fix memleak in tcp_bpf_sendmsg while sk msg is full bpf, sockmap: Fix more uncharged while msg has more_data bpf, sockmap: Fix double uncharge the mem of sk_msg samples/bpf, xdpsock: Fix race when running for fix duration of time USB: storage: ums-realtek: fix error code in rts51x_read_mem() can: isotp: return -EADDRNOTAVAIL when reading from unbound socket can: isotp: support MSG_TRUNC flag when reading from socket bareudp: use ipv6_mod_enabled to check if IPv6 enabled selftests/bpf: Fix error reporting from sock_fields programs Bluetooth: call hci_le_conn_failed with hdev lock in hci_le_conn_failed Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt ipv4: Fix route lookups when handling ICMP redirects and PMTU updates af_netlink: Fix shift out of bounds in group mask calculation i2c: meson: Fix wrong speed use from probe i2c: mux: demux-pinctrl: do not deactivate a master that is not active selftests/bpf/test_lirc_mode2.sh: Exit with proper code PCI: Avoid broken MSI on SB600 USB devices net: bcmgenet: Use stronger register read/writes to assure ordering tcp: ensure PMTU updates are processed during fastopen openvswitch: always update flow key after nat tipc: fix the timer expires after interval 100ms mfd: asic3: Add missing iounmap() on error asic3_mfd_probe mxser: fix xmit_buf leak in activate when LSR == 0xff pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add() fsi: aspeed: convert to devm_platform_ioremap_resource fsi: Aspeed: Fix a potential double free misc: alcor_pci: Fix an error handling path cpufreq: qcom-cpufreq-nvmem: fix reading of PVS Valid fuse soundwire: intel: fix wrong register name in intel_shim_wake clk: qcom: ipq8074: fix PCI-E clock oops iio: mma8452: Fix probe failing when an i2c_device_id is used staging:iio:adc:ad7280a: Fix handing of device address bit reversing. pinctrl: renesas: r8a77470: Reduce size for narrow VIN1 channel pinctrl: renesas: checker: Fix miscalculation of number of states clk: qcom: ipq8074: Use floor ops for SDCC1 clock phy: dphy: Correct lpx parameter and its derivatives(ta_{get,go,sure}) serial: 8250_mid: Balance reference count for PCI DMA device serial: 8250_lpss: Balance reference count for PCI DMA device NFS: Use of mapping_set_error() results in spurious errors serial: 8250: Fix race condition in RTS-after-send handling iio: adc: Add check for devm_request_threaded_irq habanalabs: Add check for pci_enable_device NFS: Return valid errors from nfs2/3_decode_dirent() dma-debug: fix return value of __setup handlers clk: imx7d: Remove audio_mclk_root_clk clk: at91: sama7g5: fix parents of PDMCs' GCLK clk: qcom: clk-rcg2: Update logic to calculate D value for RCG clk: qcom: clk-rcg2: Update the frac table for pixel clock dmaengine: hisi_dma: fix MSI allocate fail when reload hisi_dma remoteproc: qcom: Fix missing of_node_put in adsp_alloc_memory_region remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region remoteproc: qcom_q6v5_mss: Fix some leaks in q6v5_alloc_memory_region nvdimm/region: Fix default alignment for small regions clk: actions: Terminate clk_div_table with sentinel element clk: loongson1: Terminate clk_div_table with sentinel element clk: clps711x: Terminate clk_div_table with sentinel element clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver NFS: remove unneeded check in decode_devicenotify_args() staging: mt7621-dts: fix LEDs and pinctrl on GB-PC1 devicetree staging: mt7621-dts: fix formatting staging: mt7621-dts: fix pinctrl properties for ethernet staging: mt7621-dts: fix GB-PC2 devicetree pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init pinctrl: mediatek: paris: Fix PIN_CONFIG_BIAS_* readback pinctrl: mediatek: paris: Fix "argument" argument type for mtk_pinconf_get() pinctrl: mediatek: paris: Fix pingroup pin config state readback pinctrl: mediatek: paris: Skip custom extra pin config dump for virtual GPIOs pinctrl: nomadik: Add missing of_node_put() in nmk_pinctrl_probe pinctrl/rockchip: Add missing of_node_put() in rockchip_pinctrl_probe tty: hvc: fix return value of __setup handler kgdboc: fix return value of __setup handler serial: 8250: fix XOFF/XON sending when DMA is used kgdbts: fix return value of __setup handler firmware: google: Properly state IOMEM dependency driver core: dd: fix return value of __setup handler jfs: fix divide error in dbNextAG netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error kdb: Fix the putarea helper function clk: qcom: gcc-msm8994: Fix gpll4 width clk: Initialize orphan req_rate xen: fix is_xen_pmu() net: enetc: report software timestamping via SO_TIMESTAMPING net: hns3: fix bug when PF set the duplicate MAC address for VFs net: phy: broadcom: Fix brcm_fet_config_init() selftests: test_vxlan_under_vrf: Fix broken test case qlcnic: dcb: default to returning -EOPNOTSUPP net/x25: Fix null-ptr-deref caused by x25_disconnect NFSv4/pNFS: Fix another issue with a list iterator pointing to the head net: dsa: bcm_sf2_cfp: fix an incorrect NULL check on list iterator fs: fd tables have to be multiples of BITS_PER_LONG lib/test: use after free in register_test_dev_kmod() fs: fix fd table size alignment properly LSM: general protection fault in legacy_parse_param regulator: rpi-panel: Handle I2C errors/timing to the Atmel gcc-plugins/stackleak: Exactly match strings instead of prefixes pinctrl: npcm: Fix broken references to chip->parent_device block, bfq: don't move oom_bfqq selinux: use correct type for context length selinux: allow FIOCLEX and FIONCLEX with policy capability loop: use sysfs_emit() in the sysfs xxx show() Fix incorrect type in assignment of ipv6 port for audit irqchip/qcom-pdc: Fix broken locking irqchip/nvic: Release nvic_base upon failure fs/binfmt_elf: Fix AT_PHDR for unusual ELF files bfq: fix use-after-free in bfq_dispatch_request ACPICA: Avoid walking the ACPI Namespace if it is not there lib/raid6/test/Makefile: Use $(pound) instead of \# for Make 4.3 Revert "Revert "block, bfq: honor already-setup queue merges"" ACPI/APEI: Limit printable size of BERT table data PM: core: keep irq flags in device_pm_check_callbacks() parisc: Fix handling off probe non-access faults nvme-tcp: lockdep: annotate in-kernel sockets spi: tegra20: Use of_device_get_match_data() locking/lockdep: Iterate lock_classes directly when reading lockdep files ext4: correct cluster len and clusters changed accounting in ext4_mb_mark_bb ext4: fix ext4_mb_mark_bb() with flex_bg with fast_commit ext4: don't BUG if someone dirty pages without asking ext4 first f2fs: fix to do sanity check on curseg->alloc_type NFSD: Fix nfsd_breaker_owns_lease() return values f2fs: compress: fix to print raw data size in error path of lz4 decompression ntfs: add sanity check on allocation size media: staging: media: zoran: move videodev alloc media: staging: media: zoran: calculate the right buffer number for zoran_reap_stat_com media: staging: media: zoran: fix various V4L2 compliance errors media: ir_toy: free before error exiting video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow video: fbdev: w100fb: Reset global state video: fbdev: cirrusfb: check pixclock to avoid divide by zero video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960 ARM: dts: bcm2837: Add the missing L1/L2 cache information ASoC: madera: Add dependencies on MFD media: atomisp_gmin_platform: Add DMI quirk to not turn AXP ELDO2 regulator off on some boards media: atomisp: fix dummy_ptr check to avoid duplicate active_bo ARM: ftrace: avoid redundant loads or clobbering IP ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk arm64: defconfig: build imx-sdma as a module video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf() video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf() video: fbdev: udlfb: replace snprintf in show functions with sysfs_emit ARM: dts: bcm2711: Add the missing L1/L2 cache information ASoC: soc-core: skip zero num_dai component in searching dai name media: cx88-mpeg: clear interrupt status register before streaming video uaccess: fix type mismatch warnings from access_ok() lib/test_lockup: fix kernel pointer check for separate address spaces ARM: tegra: tamonten: Fix I2C3 pad setting ARM: mmp: Fix failure to remove sram device video: fbdev: sm712fb: Fix crash in smtcfb_write() media: Revert "media: em28xx: add missing em28xx_close_extension" media: hdpvr: initialize dev->worker at hdpvr_register_videodev mmc: host: Return an error when ->enable_sdio_irq() ops is missing media: atomisp: fix bad usage at error handling logic ALSA: hda/realtek: Add alc256-samsung-headphone fixup KVM: x86/mmu: Check for present SPTE when clearing dirty bit in TDP MMU powerpc/kasan: Fix early region not updated correctly powerpc/lib/sstep: Fix 'sthcx' instruction powerpc/lib/sstep: Fix build errors with newer binutils powerpc: Fix build errors with newer binutils scsi: qla2xxx: Fix stuck session in gpdb scsi: qla2xxx: Fix scheduling while atomic scsi: qla2xxx: Fix wrong FDMI data for 64G adapter scsi: qla2xxx: Fix warning for missing error code scsi: qla2xxx: Fix device reconnect in loop topology scsi: qla2xxx: Add devids and conditionals for 28xx scsi: qla2xxx: Check for firmware dump already collected scsi: qla2xxx: Suppress a kernel complaint in qla_create_qpair() scsi: qla2xxx: Fix disk failure to rediscover scsi: qla2xxx: Fix incorrect reporting of task management failure scsi: qla2xxx: Fix hang due to session stuck scsi: qla2xxx: Fix missed DMA unmap for NVMe ls requests scsi: qla2xxx: Fix N2N inconsistent PLOGI scsi: qla2xxx: Reduce false trigger to login scsi: qla2xxx: Use correct feature type field during RFF_ID processing platform: chrome: Split trace include file KVM: x86: Forbid VMM to set SYNIC/STIMER MSRs when SynIC wasn't activated KVM: Prevent module exit until all VMs are freed KVM: x86: fix sending PV IPI KVM: SVM: fix panic on out-of-bounds guest IRQ ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM ubifs: rename_whiteout: Fix double free for whiteout_ui->data ubifs: Fix deadlock in concurrent rename whiteout and inode writeback ubifs: Add missing iput if do_tmpfile() failed in rename whiteout ubifs: setflags: Make dirtied_ino_d 8 bytes aligned ubifs: Fix read out-of-bounds in ubifs_wbuf_write_nolock() ubifs: Fix to add refcount once page is set private ubifs: rename_whiteout: correct old_dir size computing wireguard: queueing: use CFI-safe ptr_ring cleanup function wireguard: socket: free skb in send6 when ipv6 is disabled wireguard: socket: ignore v6 endpoints when ipv6 is disabled XArray: Fix xas_create_range() when multi-order entry present can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path can: mcba_usb: properly check endpoint type can: mcp251xfd: mcp251xfd_register_get_dev_id(): fix return of error value XArray: Update the LRU list in xas_split() rtc: check if __rtc_read_time was successful gfs2: Make sure FITRIM minlen is rounded up to fs block size net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware rxrpc: Fix call timer start racing with call destruction mailbox: imx: fix wakeup failure from freeze mode crypto: arm/aes-neonbs-cbc - Select generic cbc and aes watch_queue: Free the page array when watch_queue is dismantled pinctrl: pinconf-generic: Print arguments for bias-pull-* watchdog: rti-wdt: Add missing pm_runtime_disable() in probe function pinctrl: nuvoton: npcm7xx: Rename DS() macro to DSTR() pinctrl: nuvoton: npcm7xx: Use %zu printk format for ARRAY_SIZE() ASoC: mediatek: mt6358: add missing EXPORT_SYMBOLs ubi: Fix race condition between ctrl_cdev_ioctl and ubi_cdev_ioctl ARM: iop32x: offset IRQ numbers by 1 io_uring: fix memory leak of uid in files registration riscv module: remove (NOLOAD) ACPI: CPPC: Avoid out of bounds access when parsing _CPC data platform/chrome: cros_ec_typec: Check for EC device can: isotp: restore accidentally removed MSG_PEEK feature proc: bootconfig: Add null pointer check staging: mt7621-dts: fix pinctrl-0 items to be size-1 items on ethernet ASoC: soc-compress: Change the check for codec_dai batman-adv: Check ptr for NULL before reducing its refcnt mm/mmap: return 1 from stack_guard_gap __setup() handler ARM: 9187/1: JIVE: fix return value of __setup handler mm/memcontrol: return 1 from cgroup.memory __setup() handler mm/usercopy: return 1 from hardened_usercopy __setup() handler bpf: Adjust BPF stack helper functions to accommodate skip > 0 bpf: Fix comment for helper bpf_current_task_under_cgroup() dt-bindings: mtd: nand-controller: Fix the reg property description dt-bindings: mtd: nand-controller: Fix a comment in the examples dt-bindings: spi: mxic: The interrupt property is not mandatory ubi: fastmap: Return error code if memory allocation fails in add_aeb() ASoC: topology: Allow TLV control to be either read or write ARM: dts: spear1340: Update serial node properties ARM: dts: spear13xx: Update SPI dma properties um: Fix uml_mconsole stop/go docs: sysctl/kernel: add missing bit to panic_print openvswitch: Fixed nd target mask field in the flow dump. KVM: x86/mmu: do compare-and-exchange of gPTE via the user address can: m_can: m_can_tx_handler(): fix use after free of skb can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path coredump: Snapshot the vmas in do_coredump coredump: Remove the WARN_ON in dump_vma_snapshot coredump/elf: Pass coredump_params into fill_note_info coredump: Use the vma snapshot in fill_files_note arm64: Do not defer reserve_crashkernel() for platforms with no DMA memory zones PCI: xgene: Revert "PCI: xgene: Use inbound resources for setup" Linux 5.10.110 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I12fbe227793dd40c0582588e1700cf88cafd0ac6
1204 lines
30 KiB
C
1204 lines
30 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* IOMMU API for Renesas VMSA-compatible IPMMU
|
|
* Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
*
|
|
* Copyright (C) 2014-2020 Renesas Electronics Corporation
|
|
*/
|
|
|
|
#include <linux/bitmap.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/dma-iommu.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/err.h>
|
|
#include <linux/export.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <linux/io-pgtable.h>
|
|
#include <linux/iommu.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_iommu.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/sizes.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sys_soc.h>
|
|
|
|
#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)
|
|
#include <asm/dma-iommu.h>
|
|
#else
|
|
#define arm_iommu_create_mapping(...) NULL
|
|
#define arm_iommu_attach_device(...) -ENODEV
|
|
#define arm_iommu_release_mapping(...) do {} while (0)
|
|
#define arm_iommu_detach_device(...) do {} while (0)
|
|
#endif
|
|
|
|
#define IPMMU_CTX_MAX 8U
|
|
#define IPMMU_CTX_INVALID -1
|
|
|
|
#define IPMMU_UTLB_MAX 48U
|
|
|
|
struct ipmmu_features {
|
|
bool use_ns_alias_offset;
|
|
bool has_cache_leaf_nodes;
|
|
unsigned int number_of_contexts;
|
|
unsigned int num_utlbs;
|
|
bool setup_imbuscr;
|
|
bool twobit_imttbcr_sl0;
|
|
bool reserved_context;
|
|
bool cache_snoop;
|
|
unsigned int ctx_offset_base;
|
|
unsigned int ctx_offset_stride;
|
|
unsigned int utlb_offset_base;
|
|
};
|
|
|
|
struct ipmmu_vmsa_device {
|
|
struct device *dev;
|
|
void __iomem *base;
|
|
struct iommu_device iommu;
|
|
struct ipmmu_vmsa_device *root;
|
|
const struct ipmmu_features *features;
|
|
unsigned int num_ctx;
|
|
spinlock_t lock; /* Protects ctx and domains[] */
|
|
DECLARE_BITMAP(ctx, IPMMU_CTX_MAX);
|
|
struct ipmmu_vmsa_domain *domains[IPMMU_CTX_MAX];
|
|
s8 utlb_ctx[IPMMU_UTLB_MAX];
|
|
|
|
struct iommu_group *group;
|
|
struct dma_iommu_mapping *mapping;
|
|
};
|
|
|
|
struct ipmmu_vmsa_domain {
|
|
struct ipmmu_vmsa_device *mmu;
|
|
struct iommu_domain io_domain;
|
|
|
|
struct io_pgtable_cfg cfg;
|
|
struct io_pgtable_ops *iop;
|
|
|
|
unsigned int context_id;
|
|
struct mutex mutex; /* Protects mappings */
|
|
};
|
|
|
|
static struct ipmmu_vmsa_domain *to_vmsa_domain(struct iommu_domain *dom)
|
|
{
|
|
return container_of(dom, struct ipmmu_vmsa_domain, io_domain);
|
|
}
|
|
|
|
static struct ipmmu_vmsa_device *to_ipmmu(struct device *dev)
|
|
{
|
|
return dev_iommu_priv_get(dev);
|
|
}
|
|
|
|
#define TLB_LOOP_TIMEOUT 100 /* 100us */
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Registers Definition
|
|
*/
|
|
|
|
#define IM_NS_ALIAS_OFFSET 0x800
|
|
|
|
/* MMU "context" registers */
|
|
#define IMCTR 0x0000 /* R-Car Gen2/3 */
|
|
#define IMCTR_INTEN (1 << 2) /* R-Car Gen2/3 */
|
|
#define IMCTR_FLUSH (1 << 1) /* R-Car Gen2/3 */
|
|
#define IMCTR_MMUEN (1 << 0) /* R-Car Gen2/3 */
|
|
|
|
#define IMTTBCR 0x0008 /* R-Car Gen2/3 */
|
|
#define IMTTBCR_EAE (1 << 31) /* R-Car Gen2/3 */
|
|
#define IMTTBCR_SH0_INNER_SHAREABLE (3 << 12) /* R-Car Gen2 only */
|
|
#define IMTTBCR_ORGN0_WB_WA (1 << 10) /* R-Car Gen2 only */
|
|
#define IMTTBCR_IRGN0_WB_WA (1 << 8) /* R-Car Gen2 only */
|
|
#define IMTTBCR_SL0_TWOBIT_LVL_1 (2 << 6) /* R-Car Gen3 only */
|
|
#define IMTTBCR_SL0_LVL_1 (1 << 4) /* R-Car Gen2 only */
|
|
|
|
#define IMBUSCR 0x000c /* R-Car Gen2 only */
|
|
#define IMBUSCR_DVM (1 << 2) /* R-Car Gen2 only */
|
|
#define IMBUSCR_BUSSEL_MASK (3 << 0) /* R-Car Gen2 only */
|
|
|
|
#define IMTTLBR0 0x0010 /* R-Car Gen2/3 */
|
|
#define IMTTUBR0 0x0014 /* R-Car Gen2/3 */
|
|
|
|
#define IMSTR 0x0020 /* R-Car Gen2/3 */
|
|
#define IMSTR_MHIT (1 << 4) /* R-Car Gen2/3 */
|
|
#define IMSTR_ABORT (1 << 2) /* R-Car Gen2/3 */
|
|
#define IMSTR_PF (1 << 1) /* R-Car Gen2/3 */
|
|
#define IMSTR_TF (1 << 0) /* R-Car Gen2/3 */
|
|
|
|
#define IMMAIR0 0x0028 /* R-Car Gen2/3 */
|
|
|
|
#define IMELAR 0x0030 /* R-Car Gen2/3, IMEAR on R-Car Gen2 */
|
|
#define IMEUAR 0x0034 /* R-Car Gen3 only */
|
|
|
|
/* uTLB registers */
|
|
#define IMUCTR(n) ((n) < 32 ? IMUCTR0(n) : IMUCTR32(n))
|
|
#define IMUCTR0(n) (0x0300 + ((n) * 16)) /* R-Car Gen2/3 */
|
|
#define IMUCTR32(n) (0x0600 + (((n) - 32) * 16)) /* R-Car Gen3 only */
|
|
#define IMUCTR_TTSEL_MMU(n) ((n) << 4) /* R-Car Gen2/3 */
|
|
#define IMUCTR_FLUSH (1 << 1) /* R-Car Gen2/3 */
|
|
#define IMUCTR_MMUEN (1 << 0) /* R-Car Gen2/3 */
|
|
|
|
#define IMUASID(n) ((n) < 32 ? IMUASID0(n) : IMUASID32(n))
|
|
#define IMUASID0(n) (0x0308 + ((n) * 16)) /* R-Car Gen2/3 */
|
|
#define IMUASID32(n) (0x0608 + (((n) - 32) * 16)) /* R-Car Gen3 only */
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Root device handling
|
|
*/
|
|
|
|
static struct platform_driver ipmmu_driver;
|
|
|
|
static bool ipmmu_is_root(struct ipmmu_vmsa_device *mmu)
|
|
{
|
|
return mmu->root == mmu;
|
|
}
|
|
|
|
static int __ipmmu_check_device(struct device *dev, void *data)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = dev_get_drvdata(dev);
|
|
struct ipmmu_vmsa_device **rootp = data;
|
|
|
|
if (ipmmu_is_root(mmu))
|
|
*rootp = mmu;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct ipmmu_vmsa_device *ipmmu_find_root(void)
|
|
{
|
|
struct ipmmu_vmsa_device *root = NULL;
|
|
|
|
return driver_for_each_device(&ipmmu_driver.driver, NULL, &root,
|
|
__ipmmu_check_device) == 0 ? root : NULL;
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Read/Write Access
|
|
*/
|
|
|
|
static u32 ipmmu_read(struct ipmmu_vmsa_device *mmu, unsigned int offset)
|
|
{
|
|
return ioread32(mmu->base + offset);
|
|
}
|
|
|
|
static void ipmmu_write(struct ipmmu_vmsa_device *mmu, unsigned int offset,
|
|
u32 data)
|
|
{
|
|
iowrite32(data, mmu->base + offset);
|
|
}
|
|
|
|
static unsigned int ipmmu_ctx_reg(struct ipmmu_vmsa_device *mmu,
|
|
unsigned int context_id, unsigned int reg)
|
|
{
|
|
return mmu->features->ctx_offset_base +
|
|
context_id * mmu->features->ctx_offset_stride + reg;
|
|
}
|
|
|
|
static u32 ipmmu_ctx_read(struct ipmmu_vmsa_device *mmu,
|
|
unsigned int context_id, unsigned int reg)
|
|
{
|
|
return ipmmu_read(mmu, ipmmu_ctx_reg(mmu, context_id, reg));
|
|
}
|
|
|
|
static void ipmmu_ctx_write(struct ipmmu_vmsa_device *mmu,
|
|
unsigned int context_id, unsigned int reg, u32 data)
|
|
{
|
|
ipmmu_write(mmu, ipmmu_ctx_reg(mmu, context_id, reg), data);
|
|
}
|
|
|
|
static u32 ipmmu_ctx_read_root(struct ipmmu_vmsa_domain *domain,
|
|
unsigned int reg)
|
|
{
|
|
return ipmmu_ctx_read(domain->mmu->root, domain->context_id, reg);
|
|
}
|
|
|
|
static void ipmmu_ctx_write_root(struct ipmmu_vmsa_domain *domain,
|
|
unsigned int reg, u32 data)
|
|
{
|
|
ipmmu_ctx_write(domain->mmu->root, domain->context_id, reg, data);
|
|
}
|
|
|
|
static void ipmmu_ctx_write_all(struct ipmmu_vmsa_domain *domain,
|
|
unsigned int reg, u32 data)
|
|
{
|
|
if (domain->mmu != domain->mmu->root)
|
|
ipmmu_ctx_write(domain->mmu, domain->context_id, reg, data);
|
|
|
|
ipmmu_ctx_write(domain->mmu->root, domain->context_id, reg, data);
|
|
}
|
|
|
|
static u32 ipmmu_utlb_reg(struct ipmmu_vmsa_device *mmu, unsigned int reg)
|
|
{
|
|
return mmu->features->utlb_offset_base + reg;
|
|
}
|
|
|
|
static void ipmmu_imuasid_write(struct ipmmu_vmsa_device *mmu,
|
|
unsigned int utlb, u32 data)
|
|
{
|
|
ipmmu_write(mmu, ipmmu_utlb_reg(mmu, IMUASID(utlb)), data);
|
|
}
|
|
|
|
static void ipmmu_imuctr_write(struct ipmmu_vmsa_device *mmu,
|
|
unsigned int utlb, u32 data)
|
|
{
|
|
ipmmu_write(mmu, ipmmu_utlb_reg(mmu, IMUCTR(utlb)), data);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* TLB and microTLB Management
|
|
*/
|
|
|
|
/* Wait for any pending TLB invalidations to complete */
|
|
static void ipmmu_tlb_sync(struct ipmmu_vmsa_domain *domain)
|
|
{
|
|
unsigned int count = 0;
|
|
|
|
while (ipmmu_ctx_read_root(domain, IMCTR) & IMCTR_FLUSH) {
|
|
cpu_relax();
|
|
if (++count == TLB_LOOP_TIMEOUT) {
|
|
dev_err_ratelimited(domain->mmu->dev,
|
|
"TLB sync timed out -- MMU may be deadlocked\n");
|
|
return;
|
|
}
|
|
udelay(1);
|
|
}
|
|
}
|
|
|
|
static void ipmmu_tlb_invalidate(struct ipmmu_vmsa_domain *domain)
|
|
{
|
|
u32 reg;
|
|
|
|
reg = ipmmu_ctx_read_root(domain, IMCTR);
|
|
reg |= IMCTR_FLUSH;
|
|
ipmmu_ctx_write_all(domain, IMCTR, reg);
|
|
|
|
ipmmu_tlb_sync(domain);
|
|
}
|
|
|
|
/*
|
|
* Enable MMU translation for the microTLB.
|
|
*/
|
|
static void ipmmu_utlb_enable(struct ipmmu_vmsa_domain *domain,
|
|
unsigned int utlb)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = domain->mmu;
|
|
|
|
/*
|
|
* TODO: Reference-count the microTLB as several bus masters can be
|
|
* connected to the same microTLB.
|
|
*/
|
|
|
|
/* TODO: What should we set the ASID to ? */
|
|
ipmmu_imuasid_write(mmu, utlb, 0);
|
|
/* TODO: Do we need to flush the microTLB ? */
|
|
ipmmu_imuctr_write(mmu, utlb, IMUCTR_TTSEL_MMU(domain->context_id) |
|
|
IMUCTR_FLUSH | IMUCTR_MMUEN);
|
|
mmu->utlb_ctx[utlb] = domain->context_id;
|
|
}
|
|
|
|
/*
|
|
* Disable MMU translation for the microTLB.
|
|
*/
|
|
static void ipmmu_utlb_disable(struct ipmmu_vmsa_domain *domain,
|
|
unsigned int utlb)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = domain->mmu;
|
|
|
|
ipmmu_imuctr_write(mmu, utlb, 0);
|
|
mmu->utlb_ctx[utlb] = IPMMU_CTX_INVALID;
|
|
}
|
|
|
|
static void ipmmu_tlb_flush_all(void *cookie)
|
|
{
|
|
struct ipmmu_vmsa_domain *domain = cookie;
|
|
|
|
ipmmu_tlb_invalidate(domain);
|
|
}
|
|
|
|
static void ipmmu_tlb_flush(unsigned long iova, size_t size,
|
|
size_t granule, void *cookie)
|
|
{
|
|
ipmmu_tlb_flush_all(cookie);
|
|
}
|
|
|
|
static const struct iommu_flush_ops ipmmu_flush_ops = {
|
|
.tlb_flush_all = ipmmu_tlb_flush_all,
|
|
.tlb_flush_walk = ipmmu_tlb_flush,
|
|
};
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Domain/Context Management
|
|
*/
|
|
|
|
static int ipmmu_domain_allocate_context(struct ipmmu_vmsa_device *mmu,
|
|
struct ipmmu_vmsa_domain *domain)
|
|
{
|
|
unsigned long flags;
|
|
int ret;
|
|
|
|
spin_lock_irqsave(&mmu->lock, flags);
|
|
|
|
ret = find_first_zero_bit(mmu->ctx, mmu->num_ctx);
|
|
if (ret != mmu->num_ctx) {
|
|
mmu->domains[ret] = domain;
|
|
set_bit(ret, mmu->ctx);
|
|
} else
|
|
ret = -EBUSY;
|
|
|
|
spin_unlock_irqrestore(&mmu->lock, flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void ipmmu_domain_free_context(struct ipmmu_vmsa_device *mmu,
|
|
unsigned int context_id)
|
|
{
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&mmu->lock, flags);
|
|
|
|
clear_bit(context_id, mmu->ctx);
|
|
mmu->domains[context_id] = NULL;
|
|
|
|
spin_unlock_irqrestore(&mmu->lock, flags);
|
|
}
|
|
|
|
static void ipmmu_domain_setup_context(struct ipmmu_vmsa_domain *domain)
|
|
{
|
|
u64 ttbr;
|
|
u32 tmp;
|
|
|
|
/* TTBR0 */
|
|
ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr;
|
|
ipmmu_ctx_write_root(domain, IMTTLBR0, ttbr);
|
|
ipmmu_ctx_write_root(domain, IMTTUBR0, ttbr >> 32);
|
|
|
|
/*
|
|
* TTBCR
|
|
* We use long descriptors and allocate the whole 32-bit VA space to
|
|
* TTBR0.
|
|
*/
|
|
if (domain->mmu->features->twobit_imttbcr_sl0)
|
|
tmp = IMTTBCR_SL0_TWOBIT_LVL_1;
|
|
else
|
|
tmp = IMTTBCR_SL0_LVL_1;
|
|
|
|
if (domain->mmu->features->cache_snoop)
|
|
tmp |= IMTTBCR_SH0_INNER_SHAREABLE | IMTTBCR_ORGN0_WB_WA |
|
|
IMTTBCR_IRGN0_WB_WA;
|
|
|
|
ipmmu_ctx_write_root(domain, IMTTBCR, IMTTBCR_EAE | tmp);
|
|
|
|
/* MAIR0 */
|
|
ipmmu_ctx_write_root(domain, IMMAIR0,
|
|
domain->cfg.arm_lpae_s1_cfg.mair);
|
|
|
|
/* IMBUSCR */
|
|
if (domain->mmu->features->setup_imbuscr)
|
|
ipmmu_ctx_write_root(domain, IMBUSCR,
|
|
ipmmu_ctx_read_root(domain, IMBUSCR) &
|
|
~(IMBUSCR_DVM | IMBUSCR_BUSSEL_MASK));
|
|
|
|
/*
|
|
* IMSTR
|
|
* Clear all interrupt flags.
|
|
*/
|
|
ipmmu_ctx_write_root(domain, IMSTR, ipmmu_ctx_read_root(domain, IMSTR));
|
|
|
|
/*
|
|
* IMCTR
|
|
* Enable the MMU and interrupt generation. The long-descriptor
|
|
* translation table format doesn't use TEX remapping. Don't enable AF
|
|
* software management as we have no use for it. Flush the TLB as
|
|
* required when modifying the context registers.
|
|
*/
|
|
ipmmu_ctx_write_all(domain, IMCTR,
|
|
IMCTR_INTEN | IMCTR_FLUSH | IMCTR_MMUEN);
|
|
}
|
|
|
|
static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
|
|
{
|
|
int ret;
|
|
|
|
/*
|
|
* Allocate the page table operations.
|
|
*
|
|
* VMSA states in section B3.6.3 "Control of Secure or Non-secure memory
|
|
* access, Long-descriptor format" that the NStable bit being set in a
|
|
* table descriptor will result in the NStable and NS bits of all child
|
|
* entries being ignored and considered as being set. The IPMMU seems
|
|
* not to comply with this, as it generates a secure access page fault
|
|
* if any of the NStable and NS bits isn't set when running in
|
|
* non-secure mode.
|
|
*/
|
|
domain->cfg.quirks = IO_PGTABLE_QUIRK_ARM_NS;
|
|
domain->cfg.pgsize_bitmap = SZ_1G | SZ_2M | SZ_4K;
|
|
domain->cfg.ias = 32;
|
|
domain->cfg.oas = 40;
|
|
domain->cfg.tlb = &ipmmu_flush_ops;
|
|
domain->io_domain.geometry.aperture_end = DMA_BIT_MASK(32);
|
|
domain->io_domain.geometry.force_aperture = true;
|
|
/*
|
|
* TODO: Add support for coherent walk through CCI with DVM and remove
|
|
* cache handling. For now, delegate it to the io-pgtable code.
|
|
*/
|
|
domain->cfg.coherent_walk = false;
|
|
domain->cfg.iommu_dev = domain->mmu->root->dev;
|
|
|
|
/*
|
|
* Find an unused context.
|
|
*/
|
|
ret = ipmmu_domain_allocate_context(domain->mmu->root, domain);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
domain->context_id = ret;
|
|
|
|
domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
|
|
domain);
|
|
if (!domain->iop) {
|
|
ipmmu_domain_free_context(domain->mmu->root,
|
|
domain->context_id);
|
|
return -EINVAL;
|
|
}
|
|
|
|
ipmmu_domain_setup_context(domain);
|
|
return 0;
|
|
}
|
|
|
|
static void ipmmu_domain_destroy_context(struct ipmmu_vmsa_domain *domain)
|
|
{
|
|
if (!domain->mmu)
|
|
return;
|
|
|
|
/*
|
|
* Disable the context. Flush the TLB as required when modifying the
|
|
* context registers.
|
|
*
|
|
* TODO: Is TLB flush really needed ?
|
|
*/
|
|
ipmmu_ctx_write_all(domain, IMCTR, IMCTR_FLUSH);
|
|
ipmmu_tlb_sync(domain);
|
|
ipmmu_domain_free_context(domain->mmu->root, domain->context_id);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Fault Handling
|
|
*/
|
|
|
|
static irqreturn_t ipmmu_domain_irq(struct ipmmu_vmsa_domain *domain)
|
|
{
|
|
const u32 err_mask = IMSTR_MHIT | IMSTR_ABORT | IMSTR_PF | IMSTR_TF;
|
|
struct ipmmu_vmsa_device *mmu = domain->mmu;
|
|
unsigned long iova;
|
|
u32 status;
|
|
|
|
status = ipmmu_ctx_read_root(domain, IMSTR);
|
|
if (!(status & err_mask))
|
|
return IRQ_NONE;
|
|
|
|
iova = ipmmu_ctx_read_root(domain, IMELAR);
|
|
if (IS_ENABLED(CONFIG_64BIT))
|
|
iova |= (u64)ipmmu_ctx_read_root(domain, IMEUAR) << 32;
|
|
|
|
/*
|
|
* Clear the error status flags. Unlike traditional interrupt flag
|
|
* registers that must be cleared by writing 1, this status register
|
|
* seems to require 0. The error address register must be read before,
|
|
* otherwise its value will be 0.
|
|
*/
|
|
ipmmu_ctx_write_root(domain, IMSTR, 0);
|
|
|
|
/* Log fatal errors. */
|
|
if (status & IMSTR_MHIT)
|
|
dev_err_ratelimited(mmu->dev, "Multiple TLB hits @0x%lx\n",
|
|
iova);
|
|
if (status & IMSTR_ABORT)
|
|
dev_err_ratelimited(mmu->dev, "Page Table Walk Abort @0x%lx\n",
|
|
iova);
|
|
|
|
if (!(status & (IMSTR_PF | IMSTR_TF)))
|
|
return IRQ_NONE;
|
|
|
|
/*
|
|
* Try to handle page faults and translation faults.
|
|
*
|
|
* TODO: We need to look up the faulty device based on the I/O VA. Use
|
|
* the IOMMU device for now.
|
|
*/
|
|
if (!report_iommu_fault(&domain->io_domain, mmu->dev, iova, 0))
|
|
return IRQ_HANDLED;
|
|
|
|
dev_err_ratelimited(mmu->dev,
|
|
"Unhandled fault: status 0x%08x iova 0x%lx\n",
|
|
status, iova);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static irqreturn_t ipmmu_irq(int irq, void *dev)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = dev;
|
|
irqreturn_t status = IRQ_NONE;
|
|
unsigned int i;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&mmu->lock, flags);
|
|
|
|
/*
|
|
* Check interrupts for all active contexts.
|
|
*/
|
|
for (i = 0; i < mmu->num_ctx; i++) {
|
|
if (!mmu->domains[i])
|
|
continue;
|
|
if (ipmmu_domain_irq(mmu->domains[i]) == IRQ_HANDLED)
|
|
status = IRQ_HANDLED;
|
|
}
|
|
|
|
spin_unlock_irqrestore(&mmu->lock, flags);
|
|
|
|
return status;
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* IOMMU Operations
|
|
*/
|
|
|
|
static struct iommu_domain *__ipmmu_domain_alloc(unsigned type)
|
|
{
|
|
struct ipmmu_vmsa_domain *domain;
|
|
|
|
domain = kzalloc(sizeof(*domain), GFP_KERNEL);
|
|
if (!domain)
|
|
return NULL;
|
|
|
|
mutex_init(&domain->mutex);
|
|
|
|
return &domain->io_domain;
|
|
}
|
|
|
|
static struct iommu_domain *ipmmu_domain_alloc(unsigned type)
|
|
{
|
|
struct iommu_domain *io_domain = NULL;
|
|
|
|
switch (type) {
|
|
case IOMMU_DOMAIN_UNMANAGED:
|
|
io_domain = __ipmmu_domain_alloc(type);
|
|
break;
|
|
|
|
case IOMMU_DOMAIN_DMA:
|
|
io_domain = __ipmmu_domain_alloc(type);
|
|
if (io_domain && iommu_get_dma_cookie(io_domain)) {
|
|
kfree(io_domain);
|
|
io_domain = NULL;
|
|
}
|
|
break;
|
|
}
|
|
|
|
return io_domain;
|
|
}
|
|
|
|
static void ipmmu_domain_free(struct iommu_domain *io_domain)
|
|
{
|
|
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
|
|
|
|
/*
|
|
* Free the domain resources. We assume that all devices have already
|
|
* been detached.
|
|
*/
|
|
iommu_put_dma_cookie(io_domain);
|
|
ipmmu_domain_destroy_context(domain);
|
|
free_io_pgtable_ops(domain->iop);
|
|
kfree(domain);
|
|
}
|
|
|
|
static int ipmmu_attach_device(struct iommu_domain *io_domain,
|
|
struct device *dev)
|
|
{
|
|
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
|
|
struct ipmmu_vmsa_device *mmu = to_ipmmu(dev);
|
|
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
|
|
unsigned int i;
|
|
int ret = 0;
|
|
|
|
if (!mmu) {
|
|
dev_err(dev, "Cannot attach to IPMMU\n");
|
|
return -ENXIO;
|
|
}
|
|
|
|
mutex_lock(&domain->mutex);
|
|
|
|
if (!domain->mmu) {
|
|
/* The domain hasn't been used yet, initialize it. */
|
|
domain->mmu = mmu;
|
|
ret = ipmmu_domain_init_context(domain);
|
|
if (ret < 0) {
|
|
dev_err(dev, "Unable to initialize IPMMU context\n");
|
|
domain->mmu = NULL;
|
|
} else {
|
|
dev_info(dev, "Using IPMMU context %u\n",
|
|
domain->context_id);
|
|
}
|
|
} else if (domain->mmu != mmu) {
|
|
/*
|
|
* Something is wrong, we can't attach two devices using
|
|
* different IOMMUs to the same domain.
|
|
*/
|
|
dev_err(dev, "Can't attach IPMMU %s to domain on IPMMU %s\n",
|
|
dev_name(mmu->dev), dev_name(domain->mmu->dev));
|
|
ret = -EINVAL;
|
|
} else
|
|
dev_info(dev, "Reusing IPMMU context %u\n", domain->context_id);
|
|
|
|
mutex_unlock(&domain->mutex);
|
|
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
for (i = 0; i < fwspec->num_ids; ++i)
|
|
ipmmu_utlb_enable(domain, fwspec->ids[i]);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void ipmmu_detach_device(struct iommu_domain *io_domain,
|
|
struct device *dev)
|
|
{
|
|
struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
|
|
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < fwspec->num_ids; ++i)
|
|
ipmmu_utlb_disable(domain, fwspec->ids[i]);
|
|
|
|
/*
|
|
* TODO: Optimize by disabling the context when no device is attached.
|
|
*/
|
|
}
|
|
|
|
static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
|
|
phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
|
|
{
|
|
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
|
|
|
|
if (!domain)
|
|
return -ENODEV;
|
|
|
|
return domain->iop->map(domain->iop, iova, paddr, size, prot, gfp);
|
|
}
|
|
|
|
static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
|
|
size_t size, struct iommu_iotlb_gather *gather)
|
|
{
|
|
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
|
|
|
|
return domain->iop->unmap(domain->iop, iova, size, gather);
|
|
}
|
|
|
|
static void ipmmu_flush_iotlb_all(struct iommu_domain *io_domain)
|
|
{
|
|
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
|
|
|
|
if (domain->mmu)
|
|
ipmmu_tlb_flush_all(domain);
|
|
}
|
|
|
|
static void ipmmu_iotlb_sync(struct iommu_domain *io_domain,
|
|
struct iommu_iotlb_gather *gather)
|
|
{
|
|
ipmmu_flush_iotlb_all(io_domain);
|
|
}
|
|
|
|
static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
|
|
dma_addr_t iova)
|
|
{
|
|
struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
|
|
|
|
/* TODO: Is locking needed ? */
|
|
|
|
return domain->iop->iova_to_phys(domain->iop, iova);
|
|
}
|
|
|
|
static int ipmmu_init_platform_device(struct device *dev,
|
|
struct of_phandle_args *args)
|
|
{
|
|
struct platform_device *ipmmu_pdev;
|
|
|
|
ipmmu_pdev = of_find_device_by_node(args->np);
|
|
if (!ipmmu_pdev)
|
|
return -ENODEV;
|
|
|
|
dev_iommu_priv_set(dev, platform_get_drvdata(ipmmu_pdev));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct soc_device_attribute soc_rcar_gen3[] = {
|
|
{ .soc_id = "r8a774a1", },
|
|
{ .soc_id = "r8a774b1", },
|
|
{ .soc_id = "r8a774c0", },
|
|
{ .soc_id = "r8a774e1", },
|
|
{ .soc_id = "r8a7795", },
|
|
{ .soc_id = "r8a77961", },
|
|
{ .soc_id = "r8a7796", },
|
|
{ .soc_id = "r8a77965", },
|
|
{ .soc_id = "r8a77970", },
|
|
{ .soc_id = "r8a77990", },
|
|
{ .soc_id = "r8a77995", },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
static const struct soc_device_attribute soc_rcar_gen3_whitelist[] = {
|
|
{ .soc_id = "r8a774b1", },
|
|
{ .soc_id = "r8a774c0", },
|
|
{ .soc_id = "r8a774e1", },
|
|
{ .soc_id = "r8a7795", .revision = "ES3.*" },
|
|
{ .soc_id = "r8a77961", },
|
|
{ .soc_id = "r8a77965", },
|
|
{ .soc_id = "r8a77990", },
|
|
{ .soc_id = "r8a77995", },
|
|
{ /* sentinel */ }
|
|
};
|
|
|
|
static const char * const rcar_gen3_slave_whitelist[] = {
|
|
};
|
|
|
|
static bool ipmmu_slave_whitelist(struct device *dev)
|
|
{
|
|
unsigned int i;
|
|
|
|
/*
|
|
* For R-Car Gen3 use a white list to opt-in slave devices.
|
|
* For Other SoCs, this returns true anyway.
|
|
*/
|
|
if (!soc_device_match(soc_rcar_gen3))
|
|
return true;
|
|
|
|
/* Check whether this R-Car Gen3 can use the IPMMU correctly or not */
|
|
if (!soc_device_match(soc_rcar_gen3_whitelist))
|
|
return false;
|
|
|
|
/* Check whether this slave device can work with the IPMMU */
|
|
for (i = 0; i < ARRAY_SIZE(rcar_gen3_slave_whitelist); i++) {
|
|
if (!strcmp(dev_name(dev), rcar_gen3_slave_whitelist[i]))
|
|
return true;
|
|
}
|
|
|
|
/* Otherwise, do not allow use of IPMMU */
|
|
return false;
|
|
}
|
|
|
|
static int ipmmu_of_xlate(struct device *dev,
|
|
struct of_phandle_args *spec)
|
|
{
|
|
if (!ipmmu_slave_whitelist(dev))
|
|
return -ENODEV;
|
|
|
|
iommu_fwspec_add_ids(dev, spec->args, 1);
|
|
|
|
/* Initialize once - xlate() will call multiple times */
|
|
if (to_ipmmu(dev))
|
|
return 0;
|
|
|
|
return ipmmu_init_platform_device(dev, spec);
|
|
}
|
|
|
|
static int ipmmu_init_arm_mapping(struct device *dev)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = to_ipmmu(dev);
|
|
int ret;
|
|
|
|
/*
|
|
* Create the ARM mapping, used by the ARM DMA mapping core to allocate
|
|
* VAs. This will allocate a corresponding IOMMU domain.
|
|
*
|
|
* TODO:
|
|
* - Create one mapping per context (TLB).
|
|
* - Make the mapping size configurable ? We currently use a 2GB mapping
|
|
* at a 1GB offset to ensure that NULL VAs will fault.
|
|
*/
|
|
if (!mmu->mapping) {
|
|
struct dma_iommu_mapping *mapping;
|
|
|
|
mapping = arm_iommu_create_mapping(&platform_bus_type,
|
|
SZ_1G, SZ_2G);
|
|
if (IS_ERR(mapping)) {
|
|
dev_err(mmu->dev, "failed to create ARM IOMMU mapping\n");
|
|
ret = PTR_ERR(mapping);
|
|
goto error;
|
|
}
|
|
|
|
mmu->mapping = mapping;
|
|
}
|
|
|
|
/* Attach the ARM VA mapping to the device. */
|
|
ret = arm_iommu_attach_device(dev, mmu->mapping);
|
|
if (ret < 0) {
|
|
dev_err(dev, "Failed to attach device to VA mapping\n");
|
|
goto error;
|
|
}
|
|
|
|
return 0;
|
|
|
|
error:
|
|
if (mmu->mapping)
|
|
arm_iommu_release_mapping(mmu->mapping);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct iommu_device *ipmmu_probe_device(struct device *dev)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = to_ipmmu(dev);
|
|
|
|
/*
|
|
* Only let through devices that have been verified in xlate()
|
|
*/
|
|
if (!mmu)
|
|
return ERR_PTR(-ENODEV);
|
|
|
|
return &mmu->iommu;
|
|
}
|
|
|
|
static void ipmmu_probe_finalize(struct device *dev)
|
|
{
|
|
int ret = 0;
|
|
|
|
if (IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_IOMMU_DMA))
|
|
ret = ipmmu_init_arm_mapping(dev);
|
|
|
|
if (ret)
|
|
dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
|
|
}
|
|
|
|
static void ipmmu_release_device(struct device *dev)
|
|
{
|
|
arm_iommu_detach_device(dev);
|
|
}
|
|
|
|
static struct iommu_group *ipmmu_find_group(struct device *dev)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = to_ipmmu(dev);
|
|
struct iommu_group *group;
|
|
|
|
if (mmu->group)
|
|
return iommu_group_ref_get(mmu->group);
|
|
|
|
group = iommu_group_alloc();
|
|
if (!IS_ERR(group))
|
|
mmu->group = group;
|
|
|
|
return group;
|
|
}
|
|
|
|
static const struct iommu_ops ipmmu_ops = {
|
|
.domain_alloc = ipmmu_domain_alloc,
|
|
.domain_free = ipmmu_domain_free,
|
|
.attach_dev = ipmmu_attach_device,
|
|
.detach_dev = ipmmu_detach_device,
|
|
.map = ipmmu_map,
|
|
.unmap = ipmmu_unmap,
|
|
.flush_iotlb_all = ipmmu_flush_iotlb_all,
|
|
.iotlb_sync = ipmmu_iotlb_sync,
|
|
.iova_to_phys = ipmmu_iova_to_phys,
|
|
.probe_device = ipmmu_probe_device,
|
|
.release_device = ipmmu_release_device,
|
|
.probe_finalize = ipmmu_probe_finalize,
|
|
.device_group = IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_IOMMU_DMA)
|
|
? generic_device_group : ipmmu_find_group,
|
|
.pgsize_bitmap = SZ_1G | SZ_2M | SZ_4K,
|
|
.of_xlate = ipmmu_of_xlate,
|
|
};
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Probe/remove and init
|
|
*/
|
|
|
|
static void ipmmu_device_reset(struct ipmmu_vmsa_device *mmu)
|
|
{
|
|
unsigned int i;
|
|
|
|
/* Disable all contexts. */
|
|
for (i = 0; i < mmu->num_ctx; ++i)
|
|
ipmmu_ctx_write(mmu, i, IMCTR, 0);
|
|
}
|
|
|
|
static const struct ipmmu_features ipmmu_features_default = {
|
|
.use_ns_alias_offset = true,
|
|
.has_cache_leaf_nodes = false,
|
|
.number_of_contexts = 1, /* software only tested with one context */
|
|
.num_utlbs = 32,
|
|
.setup_imbuscr = true,
|
|
.twobit_imttbcr_sl0 = false,
|
|
.reserved_context = false,
|
|
.cache_snoop = true,
|
|
.ctx_offset_base = 0,
|
|
.ctx_offset_stride = 0x40,
|
|
.utlb_offset_base = 0,
|
|
};
|
|
|
|
static const struct ipmmu_features ipmmu_features_rcar_gen3 = {
|
|
.use_ns_alias_offset = false,
|
|
.has_cache_leaf_nodes = true,
|
|
.number_of_contexts = 8,
|
|
.num_utlbs = 48,
|
|
.setup_imbuscr = false,
|
|
.twobit_imttbcr_sl0 = true,
|
|
.reserved_context = true,
|
|
.cache_snoop = false,
|
|
.ctx_offset_base = 0,
|
|
.ctx_offset_stride = 0x40,
|
|
.utlb_offset_base = 0,
|
|
};
|
|
|
|
static const struct of_device_id ipmmu_of_ids[] = {
|
|
{
|
|
.compatible = "renesas,ipmmu-vmsa",
|
|
.data = &ipmmu_features_default,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a774a1",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a774b1",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a774c0",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a774e1",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a7795",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a7796",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a77961",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a77965",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a77970",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a77990",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
.compatible = "renesas,ipmmu-r8a77995",
|
|
.data = &ipmmu_features_rcar_gen3,
|
|
}, {
|
|
/* Terminator */
|
|
},
|
|
};
|
|
|
|
static int ipmmu_probe(struct platform_device *pdev)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu;
|
|
struct resource *res;
|
|
int irq;
|
|
int ret;
|
|
|
|
mmu = devm_kzalloc(&pdev->dev, sizeof(*mmu), GFP_KERNEL);
|
|
if (!mmu) {
|
|
dev_err(&pdev->dev, "cannot allocate device data\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
mmu->dev = &pdev->dev;
|
|
spin_lock_init(&mmu->lock);
|
|
bitmap_zero(mmu->ctx, IPMMU_CTX_MAX);
|
|
mmu->features = of_device_get_match_data(&pdev->dev);
|
|
memset(mmu->utlb_ctx, IPMMU_CTX_INVALID, mmu->features->num_utlbs);
|
|
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));
|
|
if (ret)
|
|
return ret;
|
|
|
|
/* Map I/O memory and request IRQ. */
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
mmu->base = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(mmu->base))
|
|
return PTR_ERR(mmu->base);
|
|
|
|
/*
|
|
* The IPMMU has two register banks, for secure and non-secure modes.
|
|
* The bank mapped at the beginning of the IPMMU address space
|
|
* corresponds to the running mode of the CPU. When running in secure
|
|
* mode the non-secure register bank is also available at an offset.
|
|
*
|
|
* Secure mode operation isn't clearly documented and is thus currently
|
|
* not implemented in the driver. Furthermore, preliminary tests of
|
|
* non-secure operation with the main register bank were not successful.
|
|
* Offset the registers base unconditionally to point to the non-secure
|
|
* alias space for now.
|
|
*/
|
|
if (mmu->features->use_ns_alias_offset)
|
|
mmu->base += IM_NS_ALIAS_OFFSET;
|
|
|
|
mmu->num_ctx = min(IPMMU_CTX_MAX, mmu->features->number_of_contexts);
|
|
|
|
/*
|
|
* Determine if this IPMMU instance is a root device by checking for
|
|
* the lack of has_cache_leaf_nodes flag or renesas,ipmmu-main property.
|
|
*/
|
|
if (!mmu->features->has_cache_leaf_nodes ||
|
|
!of_find_property(pdev->dev.of_node, "renesas,ipmmu-main", NULL))
|
|
mmu->root = mmu;
|
|
else
|
|
mmu->root = ipmmu_find_root();
|
|
|
|
/*
|
|
* Wait until the root device has been registered for sure.
|
|
*/
|
|
if (!mmu->root)
|
|
return -EPROBE_DEFER;
|
|
|
|
/* Root devices have mandatory IRQs */
|
|
if (ipmmu_is_root(mmu)) {
|
|
irq = platform_get_irq(pdev, 0);
|
|
if (irq < 0)
|
|
return irq;
|
|
|
|
ret = devm_request_irq(&pdev->dev, irq, ipmmu_irq, 0,
|
|
dev_name(&pdev->dev), mmu);
|
|
if (ret < 0) {
|
|
dev_err(&pdev->dev, "failed to request IRQ %d\n", irq);
|
|
return ret;
|
|
}
|
|
|
|
ipmmu_device_reset(mmu);
|
|
|
|
if (mmu->features->reserved_context) {
|
|
dev_info(&pdev->dev, "IPMMU context 0 is reserved\n");
|
|
set_bit(0, mmu->ctx);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Register the IPMMU to the IOMMU subsystem in the following cases:
|
|
* - R-Car Gen2 IPMMU (all devices registered)
|
|
* - R-Car Gen3 IPMMU (leaf devices only - skip root IPMMU-MM device)
|
|
*/
|
|
if (!mmu->features->has_cache_leaf_nodes || !ipmmu_is_root(mmu)) {
|
|
ret = iommu_device_sysfs_add(&mmu->iommu, &pdev->dev, NULL,
|
|
dev_name(&pdev->dev));
|
|
if (ret)
|
|
return ret;
|
|
|
|
iommu_device_set_ops(&mmu->iommu, &ipmmu_ops);
|
|
iommu_device_set_fwnode(&mmu->iommu,
|
|
&pdev->dev.of_node->fwnode);
|
|
|
|
ret = iommu_device_register(&mmu->iommu);
|
|
if (ret)
|
|
return ret;
|
|
|
|
#if defined(CONFIG_IOMMU_DMA)
|
|
if (!iommu_present(&platform_bus_type))
|
|
bus_set_iommu(&platform_bus_type, &ipmmu_ops);
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* We can't create the ARM mapping here as it requires the bus to have
|
|
* an IOMMU, which only happens when bus_set_iommu() is called in
|
|
* ipmmu_init() after the probe function returns.
|
|
*/
|
|
|
|
platform_set_drvdata(pdev, mmu);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ipmmu_remove(struct platform_device *pdev)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = platform_get_drvdata(pdev);
|
|
|
|
iommu_device_sysfs_remove(&mmu->iommu);
|
|
iommu_device_unregister(&mmu->iommu);
|
|
|
|
arm_iommu_release_mapping(mmu->mapping);
|
|
|
|
ipmmu_device_reset(mmu);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int ipmmu_resume_noirq(struct device *dev)
|
|
{
|
|
struct ipmmu_vmsa_device *mmu = dev_get_drvdata(dev);
|
|
unsigned int i;
|
|
|
|
/* Reset root MMU and restore contexts */
|
|
if (ipmmu_is_root(mmu)) {
|
|
ipmmu_device_reset(mmu);
|
|
|
|
for (i = 0; i < mmu->num_ctx; i++) {
|
|
if (!mmu->domains[i])
|
|
continue;
|
|
|
|
ipmmu_domain_setup_context(mmu->domains[i]);
|
|
}
|
|
}
|
|
|
|
/* Re-enable active micro-TLBs */
|
|
for (i = 0; i < mmu->features->num_utlbs; i++) {
|
|
if (mmu->utlb_ctx[i] == IPMMU_CTX_INVALID)
|
|
continue;
|
|
|
|
ipmmu_utlb_enable(mmu->root->domains[mmu->utlb_ctx[i]], i);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct dev_pm_ops ipmmu_pm = {
|
|
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(NULL, ipmmu_resume_noirq)
|
|
};
|
|
#define DEV_PM_OPS &ipmmu_pm
|
|
#else
|
|
#define DEV_PM_OPS NULL
|
|
#endif /* CONFIG_PM_SLEEP */
|
|
|
|
static struct platform_driver ipmmu_driver = {
|
|
.driver = {
|
|
.name = "ipmmu-vmsa",
|
|
.of_match_table = of_match_ptr(ipmmu_of_ids),
|
|
.pm = DEV_PM_OPS,
|
|
},
|
|
.probe = ipmmu_probe,
|
|
.remove = ipmmu_remove,
|
|
};
|
|
|
|
static int __init ipmmu_init(void)
|
|
{
|
|
struct device_node *np;
|
|
static bool setup_done;
|
|
int ret;
|
|
|
|
if (setup_done)
|
|
return 0;
|
|
|
|
np = of_find_matching_node(NULL, ipmmu_of_ids);
|
|
if (!np)
|
|
return 0;
|
|
|
|
of_node_put(np);
|
|
|
|
ret = platform_driver_register(&ipmmu_driver);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA)
|
|
if (!iommu_present(&platform_bus_type))
|
|
bus_set_iommu(&platform_bus_type, &ipmmu_ops);
|
|
#endif
|
|
|
|
setup_done = true;
|
|
return 0;
|
|
}
|
|
subsys_initcall(ipmmu_init);
|