mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge android-5.4.7 (861433ef) into msm-5.4
* refs/heads/tmp-861433ef: ANDROID: Kconfig.gki: Remove most of the built in qcom clks ANDROID: serdev: Fix platform device support Revert "rpmsg: glink: Set tail pointer to 0 at end of FIFO" Revert "PM / QoS: Redefine FREQ_QOS_MAX_DEFAULT_VALUE to S32_MAX" Revert "UPSTREAM: firmware/qcom_scm: Add scm call to handle smmu errata" Revert "UPSTREAM: firmware: qcom_scm-64: Add atomic version of qcom_scm_call" Revert "UPSTREAM: cpufreq: qcom-hw: Move driver initialization earlier" Linux 5.4.7 iwlwifi: pcie: move power gating workaround earlier in the flow nbd: fix shutdown and recv work deadlock v2 mmc: sdhci: Add a quirk for broken command queuing mmc: sdhci: Workaround broken command queuing on Intel GLK mmc: sdhci-of-esdhc: fix P2020 errata handling mmc: sdhci: Update the tuning failed messages to pr_debug level mmc: sdhci-of-esdhc: Revert "mmc: sdhci-of-esdhc: add erratum A-009204 support" mmc: sdhci-msm: Correct the offset and value for DDR_CONFIG register ocxl: Fix concurrent AFU open and device removal powerpc/irq: fix stack overflow verification powerpc/vcpu: Assume dedicated processors as non-preempt x86/mce: Fix possibly incorrect severity calculation on AMD x86/MCE/AMD: Allow Reserved types to be overwritten in smca_banks[] x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in smca_configure() x86/intel: Disable HPET on Intel Coffee Lake H platforms KVM: arm64: Ensure 'params' is initialised when looking up sys register KVM: arm/arm64: Properly handle faulting of device mappings kvm: x86: Host feature SSBD doesn't imply guest feature AMD_SSBD kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD KVM: PPC: Book3S HV: Fix regression on big endian hosts iocost: over-budget forced IOs should schedule async delay ext4: validate the debug_want_extra_isize mount option at parse time ext4: unlock on error in ext4_expand_extra_isize() ext4: check for directory entries too close to block end ext4: fix ext4_empty_dir() for directories with holes clk: imx: pll14xx: fix clk_pll14xx_wait_lock clk: imx: clk-composite-8m: add lock to gate/mux clk: imx: clk-imx7ulp: Add missing sentinel of ulp_div_table pinctrl: baytrail: Really serialize all register accesses serial: sprd: Add clearing break interrupt operation tty/serial: atmel: fix out of range clock divider handling staging: comedi: gsc_hpdi: check dma_alloc_coherent() return value platform/x86: hp-wmi: Make buffer for HPWMI_FEATURE2_QUERY 128 bytes intel_th: msu: Fix window switching without windows intel_th: Fix freeing IRQs intel_th: pci: Add Elkhart Lake SOC support intel_th: pci: Add Comet Lake PCH-V support USB: EHCI: Do not return -EPIPE when hub is disconnected mm: vmscan: protect shrinker idr replace with CONFIG_MEMCG KEYS: asymmetric: return ENOMEM if akcipher_request_alloc() fails cpufreq: Avoid leaving stale IRQ work items during CPU offline efi/memreserve: Register reservations as 'reserved' in /proc/iomem spi: fsl: use platform_get_irq() instead of of_irq_to_resource() spi: fsl: don't map irq during probe usbip: Fix error path of vhci_recv_ret_submit() usbip: Fix receive error in vhci-hcd when using scatter-gather can: flexcan: add low power enter/exit acknowledgment helper ARM: dts: Fix vcsi regulator to be always-on for droid4 to prevent hangs s390/ftrace: fix endless recursion in function_graph tracer md: avoid invalid memory access for array sb->dev_roles RDMA/siw: Fix post_recv QP state locking ath10k: Revert "ath10k: add cleanup in ath10k_sta_state()" drm/amdgpu: fix uninitialized variable pasid_mapping_needed usb: xhci: Fix build warning seen with CONFIG_PM=n spi: cadence: Correct handling of native chipselect spi: dw: Correct handling of native chipselect selftests: net: tls: remove recv_rcvbuf test can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices can: flexcan: poll MCR_LPM_ACK instead of GPR ACK for stop mode acknowledgment can: flexcan: fix possible deadlock and out-of-order reception after wakeup can: j1939: j1939_sk_bind(): take priv after lock is held can: m_can: tcan4x5x: add required delay after reset can: xilinx_can: Fix missing Rx can packets on CANFD2.0 iommu/vt-d: Allocate reserved region for ISA with correct permission iommu/vt-d: Set ISA bridge reserved region as relaxable iommu/vt-d: Fix dmar pte read access not set error iommu: set group default domain before creating direct mappings iommu: fix KASAN use-after-free in iommu_insert_resv_region tpm: fix invalid locking in NONBLOCKING mode tpm_tis: reserve chip for duration of tpm_tis_core_init mmc: mediatek: fix CMD_TA to 2 for MT8173 HS200/HS400 mode Revert "mmc: sdhci: Fix incorrect switch to HS mode" btrfs: don't prematurely free work in scrub_missing_raid56_worker() btrfs: don't prematurely free work in reada_start_machine_worker() MIPS: futex: Restore \n after sync instructions net: wireless: intel: iwlwifi: fix GRO_NORMAL packet stalling ibmvnic: Fix completion structure initialization RDMA/bnxt_re: Fix chip number validation Broadcom's Gen P5 series bpf: Provide better register bounds after jmp32 instructions RDMA/bnxt_re: Fix stat push into dma buffer on gen p5 devices RDMA/bnxt_re: Fix missing le16_to_cpu tools, bpf: Fix build for 'make -s tools/bpf O=<dir>' net: phy: initialise phydev speed and duplex sanely ice: Fix setting coalesce to handle DCB configuration ice: Only disable VF state when freeing each VF resources drm/amdgpu: fix bad DMA from INTERRUPT_CNTL2 mips: fix build when "48 bits virtual memory" is enabled libtraceevent: Fix memory leakage in copy_filter_type crypto: vmx - Avoid weird build failures mac80211: consider QoS Null frames for STA_NULLFUNC_ACKED crypto: sun4i-ss - Fix 64-bit size_t warnings on sun4i-ss-hash.c crypto: sun4i-ss - Fix 64-bit size_t warnings s390/cpumf: Adjust registration of s390 PMU device drivers mt76: fix possible out-of-bound access in mt7615_fill_txs/mt7603_fill_txs net: ethernet: ti: ale: clean ale tbl on init and intf restart ASoC: soc-pcm: check symmetry before hw_params fbtft: Make sure string is NULL terminated iwlwifi: check kasprintf() return value bnxt_en: Improve RX buffer error handling. s390/kasan: support memcpy_real with TRACE_IRQFLAGS s390/crypto: Fix unsigned variable compared with zero perf probe: Fix to show function entry line as probe-able perf session: Fix decompression of PERF_RECORD_COMPRESSED records brcmfmac: remove monitor interface when detaching net-af_xdp: Use correct number of channels from ethtool x86/insn: Add some Intel instructions to the opcode map ASoC: Intel: bytcr_rt5640: Update quirk for Acer Switch 10 SW5-012 2-in-1 firmware_loader: Fix labels with comma for builtin firmware net: phy: avoid matching all-ones clause 45 PHY IDs bnxt_en: Return proper error code for non-existent NVM variable selftests, bpf: Workaround an alu32 sub-register spilling issue selftests, bpf: Fix test_tc_tunnel hanging perf/core: Fix the mlock accounting, again ASoC: wm5100: add missed pm_runtime_disable spi: st-ssc4: add missed pm_runtime_disable ASoC: wm2200: add missed operations in remove and probe failure sched/uclamp: Fix overzealous type replacement btrfs: don't prematurely free work in run_ordered_work() btrfs: don't prematurely free work in end_workqueue_fn() mmc: tmio: Add MMC_CAP_ERASE to allow erase/discard/trim requests crypto: virtio - deal with unsupported input sizes xhci-pci: Allow host runtime PM as default also for Intel Ice Lake xHCI tun: fix data-race in gro_normal_list() spi: tegra20-slink: add missed clk_unprepare regulator: core: Let boot-on regulators be powered off ASoC: wm8904: fix regcache handling iwlwifi: mvm: fix unaligned read of rx_pkt_status bcache: fix deadlock in bcache_allocator tracing/kprobe: Check whether the non-suffixed symbol is notrace MIPS: ralink: enable PCI support only if driver for mt7621 SoC is selected tracing: use kvcalloc for tgid_map array allocation RDMA/efa: Clear the admin command buffer prior to its submission qtnfmac: fix using skb after free x86/crash: Add a forward declaration of struct kimage qtnfmac: fix invalid channel information output qtnfmac: fix debugfs support for multiple cards cpufreq: Register drivers only after CPU devices have been registered bcache: fix static checker warning in bcache_device_free() parport: load lowlevel driver if ports not found nvme: Discard workaround for non-conformant devices net: ethernet: ti: Add dependency for TI_DAVINCI_EMAC s390/disassembler: don't hide instruction addresses r8169: respect EEE user setting when restarting network net: dsa: sja1105: Disallow management xmit during switch reset ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic format constraint bpf, testing: Workaround a verifier failure for test_progs iio: dac: ad5446: Add support for new AD5600 DAC ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile spi: pxa2xx: Add missed security checks media: vim2m: media_device_cleanup was called too early media: vicodec: media_device_cleanup was called too early EDAC/ghes: Fix grain calculation iio: cros_ec_baro: set info_mask_shared_by_all_available field media: v4l2-ctrl: Lock main_hdl on operations of requests_queued. media: cedrus: Use helpers to access capture queue media: si470x-i2c: add missed operations in remove ice: delay less crypto: atmel - Fix authenc support when it is set to m soundwire: intel: fix PDI/stream mapping for Bulk media: pvrusb2: Fix oops on tear-down when radio support is not present selftests: net: Fix printf format warnings on arm fsi: core: Fix small accesses and unaligned offsets via sysfs ath10k: fix get invalid tx rate for Mesh metric media: exynos4-is: fix wrong mdev and v4l2 dev order in error path drm/amdgpu: Avoid accidental thread reactivation. selftests: proc: Make va_max 1MB cgroup: freezer: don't change task and cgroups status unnecessarily s390/bpf: Use kvcalloc for addrs array libbpf: Fix negative FD close() in xsk_setup_xdp_prog() perf probe: Filter out instances except for inlined subroutine and subprogram perf probe: Skip end-of-sequence and non statement lines perf probe: Fix to show calling lines of inlined functions perf probe: Return a better scope DIE if there is no best scope net: avoid potential false sharing in neighbor related code perf probe: Skip overlapped location on searching variables perf parse: If pmu configuration fails free terms xen/gntdev: Use select for DMA_SHARED_BUFFER ice: Check for null pointer dereference when setting rings drm/amdgpu: fix potential double drop fence reference drm/amd/powerplay: fix struct init in renoir_print_clk_levels drm/amdgpu: disallow direct upload save restore list from gfx driver perf tools: Splice events onto evlist even on error perf tools: Fix cross compile for ARM64 perf probe: Fix to probe a function which has no entry pc libsubcmd: Use -O0 with DEBUG=1 perf probe: Fix to show inlined function callsite without entry_pc perf probe: Fix to show ranges of variables in functions without entry_pc perf probe: Fix to probe an inline function which has no entry pc perf probe: Walk function lines in lexical blocks perf jevents: Fix resource leak in process_mapfile() and main() perf probe: Fix to list probe event with correct line number perf cs-etm: Fix definition of macro TO_CS_QUEUE_NR perf probe: Fix to find range-only function instance rtlwifi: fix memory leak in rtl92c_set_fw_rsvdpagepkt() drm: msm: a6xx: fix debug bus register configuration RDMA/core: Fix return code when modify_port isn't supported ALSA: timer: Limit max amount of slave instances spi: img-spfi: fix potential double release bnx2x: Fix PF-VF communication over multi-cos queues. spi: dw: Fix Designware SPI loopback media: vivid: media_device_cleanup was called too early ASoC: SOF: topology: set trigger order for FE DAI link nvmem: core: fix nvmem_cell_write inline function nvmem: imx-ocotp: reset error status on probe media: staging/imx: Use a shorter name for driver nvme: introduce "Command Aborted By host" status code media: v4l2-core: fix touch support in v4l_g_fmt media: rcar_drif: fix a memory disclosure cpufreq: sun50i: Fix CPU speed bin detection ixgbe: protect TX timestamping from API misuse pinctrl: amd: fix __iomem annotation in amd_gpio_irq_handler() pinctrl: qcom: sc7180: Add missing tile info in SDC_QDSD_PINGROUP/UFS_RESET ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency spi: sifive: disable clk when probe fails and remove ALSA: pcm: Fix missing check of the new non-cached buffer type Bluetooth: Fix advertising duplicated flags libbpf: Fix error handling in bpf_map__reuse_fd() iio: dln2-adc: fix iio_triggered_buffer_postenable() position ALSA: bebob: expand sleep just after breaking connections for protocol version 1 pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B net/mlx5e: Verify that rule has at least one fwd/drop action loop: fix no-unmap write-zeroes request behavior libata: Ensure ata_port probe has completed before detach net: hns3: add struct netdev_queue debug info for TX timeout s390/mm: add mm_pxd_folded() checks to pxd_free() s390: add error handling to perf_callchain_kernel s390/time: ensure get_clock_monotonic() returns monotonic values phy: qcom-usb-hs: Fix extcon double register after power cycle phy: renesas: phy-rcar-gen2: Fix the array off by one warning net: dsa: LAN9303: select REGMAP when LAN9303 enable gpu: host1x: Allocate gather copy for host1x staging: wilc1000: check if device is initialzied before changing vif RDMA/core: Set DMA parameters correctly RDMA/qedr: Fix srqs xarray initialization RDMA/hns: Fix memory leak on 'context' on error return path RDMA/qedr: Fix memory leak in user qp and mr ACPI: button: Add DMI quirk for Medion Akoya E2215T spi: sprd: adi: Add missing lock protection when rebooting ubsan, x86: Annotate and allow __ubsan_handle_shift_out_of_bounds() in uaccess regions regulator: core: Release coupled_rdevs on regulator_init_coupling() error drm/tegra: sor: Use correct SOR index on Tegra210 net: phy: dp83867: enable robust auto-mdix i40e: Wrong 'Advertised FEC modes' after set FEC to AUTO drm/amd/display: correctly populate dpp refclk in fpga i40e: initialize ITRN registers with correct values drm/amd/display: setting the DIG_MODE to the correct value. arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill() EDAC/amd64: Set grain per DIMM drm: Don't free jobs in wait_event_interruptible() md/bitmap: avoid race window between md_bitmap_resize and bitmap_file_clear_bit staging: wilc1000: potential corruption in wilc_parse_join_bss_param() md: no longer compare spare disk superblock events in super_load media: smiapp: Register sensor after enabling runtime PM on the device media: aspeed: clear garbage interrupts media: imx7-mipi-csis: Add a check for devm_regulator_get media: st-mipid02: add a check for devm_gpiod_get_optional media: ov5640: Make 2592x1944 mode only available at 15 fps media: ad5820: Define entity function media: ov6650: Fix stored frame interval not in sync with hardware drm/nouveau: Don't grab runtime PM refs for HPD IRQs media: aspeed: set hsync and vsync polarities to normal before starting mode detection media: cedrus: Fix undefined shift with a SHIFT_AND_MASK_BITS macro x86/ioapic: Prevent inconsistent state when moving an interrupt ipmi: Don't allow device module unload when in use RDMA/siw: Fix SQ/RQ drain logic rtl8xxxu: fix RTL8723BU connection failure issue after warm reboot ASoC: soc-pcm: fixup dpcm_prune_paths() loop continue drm/gma500: fix memory disclosures due to uninitialized bytes RDMA/hns: Fix wrong parameters when initial mtt of srq->idx_que net: hns3: log and clear hardware error after reset complete selftests/bpf: Make a copy of subtest name perf tests: Disable bp_signal testing for arm64 power: supply: cpcap-battery: Check voltage before orderly_poweroff staging: iio: ad9834: add a check for devm_clk_get drm/amdgpu: fix amdgpu trace event print string format error drm/amd/display: fix header for RN clk mgr drm/amd/display: enable hostvm based on roimmu active for dcn2.1 x86/mce: Lower throttling MCE messages' priority to warning bpf/stackmap: Fix deadlock with rq_lock in bpf_get_stack() Bluetooth: hci_core: fix init for HCI_USER_CHANNEL Bluetooth: Workaround directed advertising bug in Broadcom controllers Bluetooth: missed cpu_to_le16 conversion in hci_init4_req Bluetooth: btusb: avoid unused function warning iio: adc: max1027: Reset the device at probe time drm/amd/powerplay: avoid disabling ECC if RAS is enabled for VEGA20 usb: usbfs: Suppress problematic bind and unbind uevents. perf vendor events arm64: Fix Hisi hip08 DDRC PMU eventname perf test: Avoid infinite loop for task exit case perf report: Add warning when libunwind not compiled in perf test: Report failure for mmap events drm/bridge: dw-hdmi: Restore audio when setting a mode rtw88: coex: Set 4 slot mode for A2DP ath10k: Correct error handling of dma_map_single() x86/mm: Use the correct function type for native_set_fixmap() drm/amd/display: Program DWB watermarks from correct state extcon: sm5502: Reset registers during initialization drm/amd/display: Fix dongle_caps containing stale information. syscalls/x86: Use the correct function type in SYSCALL_DEFINE0 drm/amd/display: add new active dongle to existent w/a media: ti-vpe: vpe: fix a v4l2-compliance failure about invalid sizeimage drm/amd/display: wait for set pipe mcp command completion drm/amd/display: Properly round nominal frequency for SPD media: ti-vpe: vpe: ensure buffers are cleaned up properly in abort cases media: ti-vpe: vpe: fix a v4l2-compliance failure causing a kernel panic media: ti-vpe: vpe: Make sure YUYV is set as default format media: ti-vpe: vpe: fix a v4l2-compliance failure about frame sequence number media: ti-vpe: vpe: fix a v4l2-compliance warning about invalid pixel format media: ti-vpe: vpe: Fix Motion Vector vpdma stride ASoC: SOF: enable sync_write in hdac_bus misc: fastrpc: fix memory leak from miscdev->name crypto: aegis128/simd - build 32-bit ARM for v8 architecture explicitly crypto: inside-secure - Fix a maybe-uninitialized warning media: cx88: Fix some error handling path in 'cx8800_initdev()' team: call RCU read lock when walking the port_list net/smc: increase device refcount for added link group libbpf: Fix passing uninitialized bytes to setsockopt libbpf: Fix struct end padding in btf_dump selftests/bpf: Fix btf_dump padding test case drm/drm_vblank: Change EINVAL by the correct errno mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring MIPS: futex: Emit Loongson3 sync workarounds within asm drm/amdkfd: Fix MQD size calculation block: Fix writeback throttling W=1 compiler warnings samples: pktgen: fix proc_cmd command result check logic drm/bridge: dw-hdmi: Refuse DDC/CI transfers on the internal I2C controller media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup media: cec-funcs.h: add status_req checks media: flexcop-usb: fix NULL-ptr deref in flexcop_usb_transfer_init() tools/memory-model: Fix data race detection for unordered store and load regulator: max8907: Fix the usage of uninitialized variable in max8907_regulator_probe() hwrng: omap3-rom - Call clk_disable_unprepare() on exit only if not idled crypto: aegis128-neon - use Clang compatible cflags for ARM usb: renesas_usbhs: add suspend event support in gadget mode drm/amd/display: fix struct init in update_bounding_box rtw88: fix NSS of hw_cap media: venus: Fix occasionally failures to suspend drm/amd/display: set minimum abm backlight level selftests/bpf: Correct path to include msg + path drm/amd/powerplay: A workaround to GPU RESET on APU x86/math-emu: Check __copy_from_user() result drm/amdkfd: fix a potential NULL pointer dereference (v2) drm/sun4i: dsi: Fix TCON DRQ set bits pinctrl: devicetree: Avoid taking direct reference to device name string drm/amd/display: Set number of pipes to 1 if the second pipe was disabled media: vimc: Fix gpf in rmmod path when stream is active ath10k: fix offchannel tx failure when no ath10k_mac_tx_frm_has_freq media: venus: core: Fix msm8996 frequency table tools/power/cpupower: Fix initializer override in hsw_ext_cstates media: ov6650: Fix stored crop rectangle not in sync with hardware media: ov6650: Fix stored frame format not in sync with hardware media: i2c: ov2659: Fix missing 720p register config media: ov6650: Fix crop rectangle alignment not passed back media: i2c: ov2659: fix s_stream return value media: ov6650: Fix control handler not freed on init error media: max2175: Fix build error without CONFIG_REGMAP_I2C media: vim2m: Fix BUG_ON in vim2m_device_release() media: vim2m: Fix abort issue media: seco-cec: Add a missing 'release_region()' in an error handling path media: cedrus: fill in bus_info for media device media: am437x-vpfe: Setting STD to current value is not an error spi: gpio: prevent memory leak in spi_gpio_probe drm/komeda: Workaround for broken FLIP_COMPLETE timestamps IB/iser: bound protection_sg size by data_sg size ath10k: fix backtrace on coredump Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D" Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit30 when using SSI_SCK2 and SSI_WS2" libertas: fix a potential NULL pointer dereference rtlwifi: prevent memory leak in rtl_usb_probe staging: rtl8188eu: fix possible null dereference staging: rtl8192u: fix multiple memory leaks on error path drm/meson: vclk: use the correct G12A frac max value spi: Add call to spi_slave_abort() function when spidev driver is released ath10k: Check if station exists before forwarding tx airtime report drm/amd/display: Handle virtual signal type in disable_link() ath10k: add cleanup in ath10k_sta_state() drm/amd/display: Rebuild mapped resources after pipe split drm/ttm: return -EBUSY on pipelining with no_gpu_wait (v2) drm/amdgpu: grab the id mgr lock while accessing passid_mapping drm/amdgpu/sriov: add ring_stop before ring_create in psp v11 code iio: light: bh1750: Resolve compiler warning and make code more readable iio: max31856: add missing of_node and parent references to iio_dev drm/amd/display: OTC underflow fix drm/bridge: analogix-anx78xx: silence -EPROBE_DEFER warnings drm/amd/display: verify stream link before link test drm: Use EOPNOTSUPP, not ENOTSUPP drm: exynos: exynos_hdmi: use cec_notifier_conn_(un)register drm/panel: Add missing drm_panel_init() in panel drivers drm/mipi-dbi: fix a loop in debugfs code drm: mst: Fix query_payload ack reply struct drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper. drm/vc4/vc4_hdmi: fill in connector info ALSA: hda/ca0132 - Fix work handling in delayed HP detection ALSA: hda/ca0132 - Avoid endless loop ALSA: hda/ca0132 - Keep power on during processing DSP response ALSA: pcm: Avoid possible info leaks from PCM stream buffers Btrfs: fix removal logic of the tree mod log that leads to use-after-free issues btrfs: handle ENOENT in btrfs_uuid_tree_iterate btrfs: do not leak reloc root if we fail to read the fs root btrfs: skip log replay on orphaned roots btrfs: abort transaction after failed inode updates in create_subvol btrfs: send: remove WARN_ON for readonly mount Btrfs: fix missing data checksums after replaying a log tree btrfs: return error pointer from alloc_test_extent_buffer Btrfs: make tree checker detect checksum items with overlapping ranges btrfs: do not call synchronize_srcu() in inode_tree_del btrfs: don't double lock the subvol_sem for rename exchange NFC: nxp-nci: Fix probing without ACPI net: dsa: b53: Fix egress flooding settings net: stmmac: platform: Fix MDIO init for platforms without PHY net: ethernet: ti: davinci_cpdma: fix warning "device driver frees DMA memory with different size" mlxsw: spectrum_router: Remove unlikely user-triggerable warning dpaa2-ptp: fix double free of the ptp_qoriq IRQ net: ena: fix issues in setting interrupt moderation params in ethtool net: ena: fix default tx interrupt moderation interval bonding: fix bond_neigh_init() neighbour: remove neigh_cleanup() method selftests: forwarding: Delete IPv6 address at the end sctp: fully initialize v4 addr in some functions sctp: fix memleak on err handling of stream initialization qede: Fix multicast mac configuration qede: Disable hardware gro when xdp prog is installed nfp: flower: fix stats id allocation net: usb: lan78xx: Fix suspend/resume PHY register access error net-sysfs: Call dev_hold always in rx_queue_add_kobject net: qlogic: Fix error paths in ql_alloc_large_buffers() net: phy: ensure that phy IDs are correctly typed net: nfc: nci: fix a possible sleep-in-atomic-context bug in nci_uart_tty_receive() net: hisilicon: Fix a BUG trigered by wrong bytes_compl net: gemini: Fix memory leak in gmac_setup_txqs net: dst: Force 4-byte alignment of dst_metrics mod_devicetable: fix PHY module format fjes: fix missed check in fjes_acpi_add af_packet: set defaule value for tmo ANDROID: Kconfig.gki: Add Hidden SPRD DRM configs ANDROID: Add a tracepoint for mapping inode to full path Revert "drm/virtio: fix DRM_FORMAT_* handling" ANDROID: gki_defconfig: Disable TRANSPARENT_HUGEPAGE staging: android: ion: Remove unused rbtree for ion_buffer Linux 5.4.6 ALSA: hda: Fix regression by strip mask fix drm/amdgpu: add invalidate semaphore limit for SRIOV and picasso in gmc9 drm/amdgpu: avoid using invalidate semaphore for picasso drm/i915/gvt: Fix cmd length check for MI_ATOMIC drm/amdgpu/gfx10: re-init clear state buffer after gpu reset drm/amdgpu/gfx10: explicitly wait for cp idle after halt/unhalt drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10 drm/amdgpu: initialize vm_inv_eng0_sem for gfxhub and mmhub drm/amd/display: add default clocks if not able to fetch them drm/amd/display: re-enable wait in pipelock, but add timeout drm/dp_mst: Correct the bug in drm_dp_update_payload_part1() drm/radeon: fix r1xx/r2xx register checker for POT textures drm/i915/fbc: Disable fbc by default on all glk+ drm/nouveau/kms/nv50-: Limit MST BPC to 8 drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd scsi: qla2xxx: Correctly retrieve and interpret active flash region scsi: qla2xxx: Change discovery state before PLOGI scsi: qla2xxx: Added support for MPI and PEP regions for ISP28XX scsi: qla2xxx: Initialize free_work before flushing it scsi: qla2xxx: Ignore NULL pointer in tcm_qla2xxx_free_mcmd scsi: iscsi: Fix a potential deadlock in the timeout handler scsi: ufs: Disable autohibern8 feature in Cadence UFS dm thin: Flush data device before committing metadata dm thin metadata: Add support for a pre-commit callback dm clone: Flush destination device before committing metadata dm clone metadata: Use a two phase commit dm clone metadata: Track exact changes per transaction dm btree: increase rebalance threshold in __rebalance2() dm mpath: remove harmful bio-based optimization drm: meson: venc: cvbs: fix CVBS mode matching drm/mgag200: Flag all G200 SE A machines as broken wrt <startadd> drm/mgag200: Add workaround for HW that does not support 'startadd' drm/mgag200: Store flags from PCI driver data in device structure drm/mgag200: Extract device type from flags drm/panfrost: Fix a race in panfrost_gem_free_object() drm/panfrost: Fix a BO leak in panfrost_ioctl_mmap_bo() drm/panfrost: Fix a race in panfrost_ioctl_madvise() dma-buf: Fix memory leak in sync_file_merge() vfio/pci: call irq_bypass_unregister_producer() before freeing irq ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume() ARM: dts: s3c64xx: Fix init order of clock providers cifs: Fix retrieval of DFS referrals in cifs_mount() CIFS: Fix NULL pointer dereference in mid callback CIFS: Do not miss cancelled OPEN responses CIFS: Close open handle after interrupted close CIFS: Respect O_SYNC and O_DIRECT flags during reconnect cifs: Don't display RDMA transport on reconnect cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE cifs: smbd: Add messages on RDMA session destroy and reconnection cifs: smbd: Only queue work for error recovery on memory registration cifs: smbd: Return -EAGAIN when transport is reconnecting rpmsg: glink: Free pending deferred work on remove rpmsg: glink: Don't send pending rx_done during remove rpmsg: glink: Fix rpmsg_register_device err handling rpmsg: glink: Put an extra reference during cleanup rpmsg: glink: Fix use after free in open_ack TIMEOUT case rpmsg: glink: Fix reuse intents memory leak issue rpmsg: glink: Set tail pointer to 0 at end of FIFO xtensa: fix syscall_set_return_value xtensa: fix TLB sanity checker gfs2: fix glock reference problem in gfs2_trans_remove_revoke gfs2: Multi-block allocations in gfs2_page_mkwrite xtensa: use MEMBLOCK_ALLOC_ANYWHERE for KASAN shadow map block: fix "check bi_size overflow before merge" PM / QoS: Redefine FREQ_QOS_MAX_DEFAULT_VALUE to S32_MAX PCI: Apply Cavium ACS quirk to ThunderX2 and ThunderX3 PCI: rcar: Fix missing MACCTLR register setting in initialization sequence PCI: Do not use bus number zero from EA capability PCI/MSI: Fix incorrect MSI-X masking on resume PCI: Fix Intel ACS quirk UPDCR register address PCI: pciehp: Avoid returning prematurely from sysfs requests PCI/PM: Always return devices to D0 when thawing PCI/switchtec: Read all 64 bits of part_event_bitmap mmc: core: Re-work HW reset for SDIO cards mmc: core: Drop check for mmc_card_is_removable() in mmc_rescan() mmc: block: Add CMD13 polling for MMC IOCTLS with R1B response mmc: block: Make card_busy_detect() a bit more generic USB: Fix incorrect DMA allocations for local memory pool drivers ANDROID: update ABI for db845c changes BACKPORT: iommu: arm-smmu-impl: Add sdm845 implementation hook UPSTREAM: firmware/qcom_scm: Add scm call to handle smmu errata UPSTREAM: firmware: qcom_scm-64: Add atomic version of qcom_scm_call UPSTREAM: cpufreq: qcom-hw: Move driver initialization earlier UPSTREAM: cpufreq: Initialize cpufreq-dt driver earlier UPSTREAM: cpufreq: Initialize the governors in core_initcall ANDROID: tty: serial_core: Export uart_console_device so it can be used by modules ANDROID: gki_defconfig: Add qcom pcie options to gki_defconfig ANDROID: Kconfig.gki: Add entries for qcom clk drivers ANDROID: Kconfig.gki: Add PINCTRL_MSM to QCOM Hidden configs ANDROID: Kconfig.gki: Add hidden CONFIG_WANT_DEV_COREDUMP for DRM_MSM driver ANDROID: PCI: qcom: Add support for SDM845 PCIe controller ANDROID: PCI: qcom: Fix the fixup of PCI_VENDOR_ID_QCOM ANDROID: phy: qcom: qmp: Add SDM845 QHP PCIe PHY ANDROID: phy: qcom: qmp: Add SDM845 PCIe QMP PHY support ANDROID: phy: qcom: qmp: Use power_on/off ops for PCIe ANDROID: phy: qcom-qmp: Increase PHY ready timeout ANDROID: gki_defconfig: Enable CONFIG_GNSS_CMDLINE_SERIAL ANDROID: gnss: Add command line test driver ANDROID: serdev: add platform device support ANDROID: usb: gadget: Add configfs attribuite for controling match_existing_only ANDROID: gki_defconfig: enable ARM64_SW_TTBR0_PAN ANDROID: gki_defconfig: Set BINFMT_MISC as =m FROMLIST: ARM: Remove arm_pm_restart() FROMLIST: ARM64: Remove arm_pm_restart() FROMLIST: ARM: Register with kernel restart handler FROMLIST: drivers: firmware: psci: Register with kernel restart handler FROMLIST: ARM: xen: Register with kernel restart handler FROMLIST: ARM: prima2: Register with kernel restart handler ANDROID: ASoC: add hikey960-i2s DT bindings ANDROID: sound: Add hikey960 i2s audio driver ANDROID: HACK: adv7511: Add poweron delay to allow for EDID probing to work ANDROID: drm: kirin: Fix Makefile to correct for module builds ANDROID: drm: kirin960: Remove one mode-line that seems to be causing trouble ANDROID: drm: kirin: remove wait for VACTIVE IRQ ANDROID: drm: kirin: Add kirin960 dpe driver support ANDROID: drm: kirin: Introduce kirin960 ANDROID: arm64: dts: hi3660: Add support for usb on Hikey960 ANDROID: arm64: dts: hikey960: Fix bootwarning on mapping reboot reason syscon ANDROID: arm64: dts: hi3660: adb reboot node ANDROID: arm64: dts: hi3660: enable gpu ANDROID: arm64: dts: hi3660-hikey960: Add i2s & sound device ANDROID: arm64: dts: hi3660: add display driver dts ANDROID: arm64: dts: hikey960: Add CMA entry for ION/framebuffers ANDROID: mm/memory.c: export mm_trace_rss_stat ANDROID: update ABI for 5.4.5 Conflicts: Documentation/devicetree/bindings drivers/iommu/Makefile drivers/rpmsg/qcom_glink_native.c drivers/usb/gadget/configfs.c kernel/sched/cpufreq_schedutil.c Change-Id: I70a4b65be7a0c8be589f13d1fd2ce05207a972f0 Signed-off-by: Blagovest Kolenichev <[email protected]>
This commit is contained in:
Blagovest Kolenichev
commit
ab4d1ca6f4
573 changed files with 69804 additions and 61782 deletions
|
|
@ -66,7 +66,7 @@
|
|||
/* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */
|
||||
#define CLAMP_EN BIT(0) /* enables i/o clamp_n */
|
||||
|
||||
#define PHY_INIT_COMPLETE_TIMEOUT 1000
|
||||
#define PHY_INIT_COMPLETE_TIMEOUT 10000
|
||||
#define POWER_DOWN_DELAY_US_MIN 10
|
||||
#define POWER_DOWN_DELAY_US_MAX 11
|
||||
|
||||
|
|
@ -160,6 +160,18 @@ static const unsigned int qmp_v3_usb3phy_regs_layout[] = {
|
|||
[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170,
|
||||
};
|
||||
|
||||
static const unsigned int sdm845_qmp_pciephy_regs_layout[] = {
|
||||
[QPHY_SW_RESET] = 0x00,
|
||||
[QPHY_START_CTRL] = 0x08,
|
||||
[QPHY_PCS_STATUS] = 0x174,
|
||||
};
|
||||
|
||||
static const unsigned int sdm845_qhp_pciephy_regs_layout[] = {
|
||||
[QPHY_SW_RESET] = 0x00,
|
||||
[QPHY_START_CTRL] = 0x08,
|
||||
[QPHY_PCS_STATUS] = 0x2ac,
|
||||
};
|
||||
|
||||
static const unsigned int sdm845_ufsphy_regs_layout[] = {
|
||||
[QPHY_START_CTRL] = 0x00,
|
||||
[QPHY_PCS_READY_STATUS] = 0x160,
|
||||
|
|
@ -475,6 +487,229 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_pcs_tbl[] = {
|
|||
QMP_PHY_INIT_CFG_L(QPHY_START_CTRL, 0x3),
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qmp_pcie_serdes_tbl[] = {
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN, 0x14),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_IVCO, 0x007),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CMN_CONFIG, 0x06),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP_EN, 0x01),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_RESETSM_CNTRL, 0x20),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x00),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE0, 0x01),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE0, 0xc9),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_TIMER1, 0xff),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_TIMER2, 0x3f),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SVS_MODE_CLK_SEL, 0x01),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CORE_CLK_EN, 0x00),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CORECLK_DIV_MODE0, 0x0a),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_EP_DIV, 0x19),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_ENABLE1, 0x90),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE0, 0x82),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_DIV_FRAC_START3_MODE0, 0x02),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_DIV_FRAC_START2_MODE0, 0xea),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_DIV_FRAC_START1_MODE0, 0xab),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP3_MODE0, 0x00),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE0, 0x0d),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE0, 0x04),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_HSCLK_SEL, 0x00),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE0, 0x06),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE0, 0x16),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE0, 0x36),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CMN_MODE, 0x01),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x33),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYS_CLK_CTRL, 0x02),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_BUF_ENABLE, 0x06),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_EN_SEL, 0x04),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE0, 0x00),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE0, 0x3f),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_BG_TIMER, 0x09),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_EN_CENTER, 0x01),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_PER1, 0x40),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_PER2, 0x01),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_ADJ_PER1, 0x02),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_ADJ_PER2, 0x00),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_STEP_SIZE1, 0x7e),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SSC_STEP_SIZE2, 0x15),
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qmp_pcie_tx_tbl[] = {
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_TX_RES_CODE_LANE_OFFSET_TX, 0x02),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_TX_RCV_DETECT_LVL_2, 0x12),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_TX_HIGHZ_DRVR_EN, 0x10),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_TX_LANE_MODE_1, 0x06),
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qmp_pcie_rx_tbl[] = {
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_CNTRL, 0x03),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_ENABLES, 0x10),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_DEGLITCH_CNTRL, 0x14),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL2, 0x0e),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL3, 0x04),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL4, 0x1a),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4b),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_GAIN, 0x04),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_GAIN_HALF, 0x04),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQ_OFFSET_ADAPTOR_CNTRL1, 0x71),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_MODE_00, 0x59),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_MODE_01, 0x59),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_OFFSET_ADAPTOR_CNTRL2, 0x80),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_INTERFACE_MODE, 0x40),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_PI_CONTROLS, 0x71),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW, 0x40),
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qmp_pcie_pcs_tbl[] = {
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_ENDPOINT_REFCLK_DRIVE, 0x04),
|
||||
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_FLL_CNTRL2, 0x83),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_FLL_CNT_VAL_L, 0x09),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_FLL_CNT_VAL_H_TOL, 0xa2),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_FLL_MAN_CODE, 0x40),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_FLL_CNTRL1, 0x02),
|
||||
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_OSC_DTCT_ACTIONS, 0x00),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_PWRUP_RESET_DLY_TIME_AUXCLK, 0x01),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_L1SS_WAKEUP_DLY_TIME_AUXCLK_MSB, 0x00),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_L1SS_WAKEUP_DLY_TIME_AUXCLK_LSB, 0x20),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_LP_WAKEUP_DLY_TIME_AUXCLK_MSB, 0x00),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_LP_WAKEUP_DLY_TIME_AUXCLK, 0x01),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_PLL_LOCK_CHK_DLY_TIME, 0x73),
|
||||
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_RX_SIGDET_LVL, 0xbb),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_SIGDET_CNTRL, 0x03),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_REFGEN_REQ_CONFIG1, 0x0d),
|
||||
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_POWER_STATE_CONFIG4, 0x00),
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qmp_pcie_pcs_misc_tbl[] = {
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_MISC_OSC_DTCT_CONFIG2, 0x52),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG2, 0x10),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG4, 0x1a),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG5, 0x06),
|
||||
QMP_PHY_INIT_CFG(QPHY_V3_PCS_MISC_PCIE_INT_AUX_CLK_CONFIG1, 0x00),
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qhp_pcie_serdes_tbl[] = {
|
||||
{ 0x0dc, 0x27 },
|
||||
{ 0x014, 0x01 },
|
||||
{ 0x020, 0x31 },
|
||||
{ 0x024, 0x01 },
|
||||
{ 0x028, 0xde },
|
||||
{ 0x02c, 0x07 },
|
||||
{ 0x034, 0x4c },
|
||||
{ 0x038, 0x06 },
|
||||
{ 0x054, 0x18 },
|
||||
{ 0x058, 0xb0 },
|
||||
{ 0x06c, 0x8c },
|
||||
{ 0x070, 0x20 },
|
||||
{ 0x078, 0x14 },
|
||||
{ 0x07c, 0x34 },
|
||||
{ 0x0b4, 0x06 },
|
||||
{ 0x0b8, 0x06 },
|
||||
{ 0x0c0, 0x16 },
|
||||
{ 0x0c4, 0x16 },
|
||||
{ 0x0cc, 0x36 },
|
||||
{ 0x0d0, 0x36 },
|
||||
{ 0x0f0, 0x05 },
|
||||
{ 0x0f8, 0x42 },
|
||||
{ 0x100, 0x82 },
|
||||
{ 0x108, 0x68 },
|
||||
{ 0x11c, 0x55 },
|
||||
{ 0x120, 0x55 },
|
||||
{ 0x124, 0x03 },
|
||||
{ 0x128, 0xab },
|
||||
{ 0x12c, 0xaa },
|
||||
{ 0x130, 0x02 },
|
||||
{ 0x150, 0x3f },
|
||||
{ 0x158, 0x3f },
|
||||
{ 0x178, 0x10 },
|
||||
{ 0x1cc, 0x04 },
|
||||
{ 0x1d0, 0x30 },
|
||||
{ 0x1e0, 0x04 },
|
||||
{ 0x1e8, 0x73 },
|
||||
{ 0x1f0, 0x0c },
|
||||
{ 0x1fc, 0x15 },
|
||||
{ 0x21c, 0x04 },
|
||||
{ 0x224, 0x01 },
|
||||
{ 0x228, 0x22 },
|
||||
{ 0x22c, 0x00 },
|
||||
{ 0x098, 0x20 },
|
||||
{ 0x1c8, 0x07 },
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qhp_pcie_tx_tbl[] = {
|
||||
{ 0x00c, 0x00 },
|
||||
{ 0x018, 0x0d },
|
||||
{ 0x060, 0x01 },
|
||||
{ 0x064, 0x1a },
|
||||
{ 0x07c, 0x2f },
|
||||
{ 0x0c0, 0x09 },
|
||||
{ 0x0c4, 0x09 },
|
||||
{ 0x0c8, 0x1b },
|
||||
{ 0x0d0, 0x01 },
|
||||
{ 0x0d4, 0x07 },
|
||||
{ 0x0d8, 0x31 },
|
||||
{ 0x0dc, 0x31 },
|
||||
{ 0x0e0, 0x03 },
|
||||
{ 0x0fc, 0x02 },
|
||||
{ 0x100, 0x00 },
|
||||
{ 0x108, 0x12 },
|
||||
{ 0x114, 0x25 },
|
||||
{ 0x118, 0x00 },
|
||||
{ 0x11c, 0x05 },
|
||||
{ 0x120, 0x01 },
|
||||
{ 0x124, 0x26 },
|
||||
{ 0x128, 0x12 },
|
||||
{ 0x130, 0x04 },
|
||||
{ 0x134, 0x04 },
|
||||
{ 0x138, 0x09 },
|
||||
{ 0x154, 0x15 },
|
||||
{ 0x160, 0x28 },
|
||||
{ 0x168, 0x7f },
|
||||
{ 0x16c, 0x07 },
|
||||
{ 0x178, 0x04 },
|
||||
{ 0x180, 0x70 },
|
||||
{ 0x184, 0x8b },
|
||||
{ 0x188, 0x08 },
|
||||
{ 0x18c, 0x0a },
|
||||
{ 0x190, 0x03 },
|
||||
{ 0x194, 0x04 },
|
||||
{ 0x198, 0x04 },
|
||||
{ 0x19c, 0x0c },
|
||||
{ 0x1a4, 0x02 },
|
||||
{ 0x1c0, 0x5c },
|
||||
{ 0x1c4, 0x3e },
|
||||
{ 0x1c8, 0x3f },
|
||||
{ 0x230, 0x01 },
|
||||
{ 0x234, 0xa0 },
|
||||
{ 0x238, 0x08 },
|
||||
{ 0x2a4, 0x01 },
|
||||
{ 0x2ac, 0xc3 },
|
||||
{ 0x2b0, 0x00 },
|
||||
{ 0x2b8, 0xbc },
|
||||
{ 0x2c0, 0x7f },
|
||||
{ 0x2c4, 0x15 },
|
||||
{ 0x010, 0x0c },
|
||||
{ 0x014, 0x0f },
|
||||
{ 0x2cc, 0x04 },
|
||||
{ 0x13c, 0x20 },
|
||||
{ 0x2a8, 0x01 },
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qhp_pcie_rx_tbl[] = {
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl sdm845_qhp_pcie_pcs_tbl[] = {
|
||||
{ 0x15c, 0x3f },
|
||||
{ 0x174, 0x50 },
|
||||
{ 0x02c, 0x19 },
|
||||
{ 0x040, 0x07 },
|
||||
{ 0x054, 0x17 },
|
||||
{ 0x068, 0x09 },
|
||||
{ 0x16c, 0x9f },
|
||||
};
|
||||
|
||||
static const struct qmp_phy_init_tbl qmp_v3_usb3_serdes_tbl[] = {
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_IVCO, 0x07),
|
||||
QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_EN_SEL, 0x14),
|
||||
|
|
@ -896,6 +1131,8 @@ struct qmp_phy_cfg {
|
|||
int rx_tbl_num;
|
||||
const struct qmp_phy_init_tbl *pcs_tbl;
|
||||
int pcs_tbl_num;
|
||||
const struct qmp_phy_init_tbl *pcs_misc_tbl;
|
||||
int pcs_misc_tbl_num;
|
||||
|
||||
/* clock ids to be requested */
|
||||
const char * const *clk_list;
|
||||
|
|
@ -1034,6 +1271,10 @@ static const char * const qmp_v3_phy_clk_l[] = {
|
|||
"aux", "cfg_ahb", "ref", "com_aux",
|
||||
};
|
||||
|
||||
static const char * const sdm845_pciephy_clk_l[] = {
|
||||
"aux", "cfg_ahb", "ref", "refgen",
|
||||
};
|
||||
|
||||
static const char * const sdm845_ufs_phy_clk_l[] = {
|
||||
"ref", "ref_aux",
|
||||
};
|
||||
|
|
@ -1047,6 +1288,10 @@ static const char * const msm8996_usb3phy_reset_l[] = {
|
|||
"phy", "common",
|
||||
};
|
||||
|
||||
static const char * const sdm845_pciephy_reset_l[] = {
|
||||
"phy",
|
||||
};
|
||||
|
||||
/* list of regulators */
|
||||
static const char * const qmp_phy_vreg_l[] = {
|
||||
"vdda-phy", "vdda-pll",
|
||||
|
|
@ -1142,6 +1387,64 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = {
|
|||
.pwrdn_delay_max = 1005, /* us */
|
||||
};
|
||||
|
||||
static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = {
|
||||
.type = PHY_TYPE_PCIE,
|
||||
.nlanes = 1,
|
||||
|
||||
.serdes_tbl = sdm845_qmp_pcie_serdes_tbl,
|
||||
.serdes_tbl_num = ARRAY_SIZE(sdm845_qmp_pcie_serdes_tbl),
|
||||
.tx_tbl = sdm845_qmp_pcie_tx_tbl,
|
||||
.tx_tbl_num = ARRAY_SIZE(sdm845_qmp_pcie_tx_tbl),
|
||||
.rx_tbl = sdm845_qmp_pcie_rx_tbl,
|
||||
.rx_tbl_num = ARRAY_SIZE(sdm845_qmp_pcie_rx_tbl),
|
||||
.pcs_tbl = sdm845_qmp_pcie_pcs_tbl,
|
||||
.pcs_tbl_num = ARRAY_SIZE(sdm845_qmp_pcie_pcs_tbl),
|
||||
.pcs_misc_tbl = sdm845_qmp_pcie_pcs_misc_tbl,
|
||||
.pcs_misc_tbl_num = ARRAY_SIZE(sdm845_qmp_pcie_pcs_misc_tbl),
|
||||
.clk_list = sdm845_pciephy_clk_l,
|
||||
.num_clks = ARRAY_SIZE(sdm845_pciephy_clk_l),
|
||||
.reset_list = sdm845_pciephy_reset_l,
|
||||
.num_resets = ARRAY_SIZE(sdm845_pciephy_reset_l),
|
||||
.vreg_list = qmp_phy_vreg_l,
|
||||
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
|
||||
.regs = sdm845_qmp_pciephy_regs_layout,
|
||||
|
||||
.start_ctrl = PCS_START | SERDES_START,
|
||||
.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
|
||||
|
||||
.has_pwrdn_delay = true,
|
||||
.pwrdn_delay_min = 995, /* us */
|
||||
.pwrdn_delay_max = 1005, /* us */
|
||||
};
|
||||
|
||||
static const struct qmp_phy_cfg sdm845_qhp_pciephy_cfg = {
|
||||
.type = PHY_TYPE_PCIE,
|
||||
.nlanes = 1,
|
||||
|
||||
.serdes_tbl = sdm845_qhp_pcie_serdes_tbl,
|
||||
.serdes_tbl_num = ARRAY_SIZE(sdm845_qhp_pcie_serdes_tbl),
|
||||
.tx_tbl = sdm845_qhp_pcie_tx_tbl,
|
||||
.tx_tbl_num = ARRAY_SIZE(sdm845_qhp_pcie_tx_tbl),
|
||||
.rx_tbl = sdm845_qhp_pcie_rx_tbl,
|
||||
.rx_tbl_num = ARRAY_SIZE(sdm845_qhp_pcie_rx_tbl),
|
||||
.pcs_tbl = sdm845_qhp_pcie_pcs_tbl,
|
||||
.pcs_tbl_num = ARRAY_SIZE(sdm845_qhp_pcie_pcs_tbl),
|
||||
.clk_list = sdm845_pciephy_clk_l,
|
||||
.num_clks = ARRAY_SIZE(sdm845_pciephy_clk_l),
|
||||
.reset_list = sdm845_pciephy_reset_l,
|
||||
.num_resets = ARRAY_SIZE(sdm845_pciephy_reset_l),
|
||||
.vreg_list = qmp_phy_vreg_l,
|
||||
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
|
||||
.regs = sdm845_qhp_pciephy_regs_layout,
|
||||
|
||||
.start_ctrl = PCS_START | SERDES_START,
|
||||
.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
|
||||
|
||||
.has_pwrdn_delay = true,
|
||||
.pwrdn_delay_min = 995, /* us */
|
||||
.pwrdn_delay_max = 1005, /* us */
|
||||
};
|
||||
|
||||
static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = {
|
||||
.type = PHY_TYPE_USB3,
|
||||
.nlanes = 1,
|
||||
|
|
@ -1447,6 +1750,7 @@ static int qcom_qmp_phy_enable(struct phy *phy)
|
|||
void __iomem *tx = qphy->tx;
|
||||
void __iomem *rx = qphy->rx;
|
||||
void __iomem *pcs = qphy->pcs;
|
||||
void __iomem *pcs_misc = qphy->pcs_misc;
|
||||
void __iomem *dp_com = qmp->dp_com;
|
||||
void __iomem *status;
|
||||
unsigned int mask, val, ready;
|
||||
|
|
@ -1517,6 +1821,9 @@ static int qcom_qmp_phy_enable(struct phy *phy)
|
|||
if (ret)
|
||||
goto err_lane_rst;
|
||||
|
||||
qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
|
||||
cfg->pcs_misc_tbl_num);
|
||||
|
||||
/*
|
||||
* Pull out PHY from POWER DOWN state.
|
||||
* This is active low enable signal to power-down PHY.
|
||||
|
|
@ -1851,7 +2158,7 @@ static const struct phy_ops qcom_qmp_phy_gen_ops = {
|
|||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static const struct phy_ops qcom_qmp_ufs_ops = {
|
||||
static const struct phy_ops qcom_qmp_pcie_ufs_ops = {
|
||||
.power_on = qcom_qmp_phy_enable,
|
||||
.power_off = qcom_qmp_phy_disable,
|
||||
.set_mode = qcom_qmp_phy_set_mode,
|
||||
|
|
@ -1951,8 +2258,8 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)
|
|||
}
|
||||
}
|
||||
|
||||
if (qmp->cfg->type == PHY_TYPE_UFS)
|
||||
ops = &qcom_qmp_ufs_ops;
|
||||
if (qmp->cfg->type == PHY_TYPE_UFS || qmp->cfg->type == PHY_TYPE_PCIE)
|
||||
ops = &qcom_qmp_pcie_ufs_ops;
|
||||
|
||||
generic_phy = devm_phy_create(dev, np, ops);
|
||||
if (IS_ERR(generic_phy)) {
|
||||
|
|
@ -1986,6 +2293,12 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {
|
|||
}, {
|
||||
.compatible = "qcom,ipq8074-qmp-pcie-phy",
|
||||
.data = &ipq8074_pciephy_cfg,
|
||||
}, {
|
||||
.compatible = "qcom,sdm845-qhp-pcie-phy",
|
||||
.data = &sdm845_qhp_pciephy_cfg,
|
||||
}, {
|
||||
.compatible = "qcom,sdm845-qmp-pcie-phy",
|
||||
.data = &sdm845_qmp_pciephy_cfg,
|
||||
}, {
|
||||
.compatible = "qcom,sdm845-qmp-usb3-phy",
|
||||
.data = &qmp_v3_usb3phy_cfg,
|
||||
|
|
|
|||
|
|
@ -158,8 +158,8 @@ static int qcom_usb_hs_phy_power_on(struct phy *phy)
|
|||
/* setup initial state */
|
||||
qcom_usb_hs_phy_vbus_notifier(&uphy->vbus_notify, state,
|
||||
uphy->vbus_edev);
|
||||
ret = devm_extcon_register_notifier(&ulpi->dev, uphy->vbus_edev,
|
||||
EXTCON_USB, &uphy->vbus_notify);
|
||||
ret = extcon_register_notifier(uphy->vbus_edev, EXTCON_USB,
|
||||
&uphy->vbus_notify);
|
||||
if (ret)
|
||||
goto err_ulpi;
|
||||
}
|
||||
|
|
@ -180,6 +180,9 @@ static int qcom_usb_hs_phy_power_off(struct phy *phy)
|
|||
{
|
||||
struct qcom_usb_hs_phy *uphy = phy_get_drvdata(phy);
|
||||
|
||||
if (uphy->vbus_edev)
|
||||
extcon_unregister_notifier(uphy->vbus_edev, EXTCON_USB,
|
||||
&uphy->vbus_notify);
|
||||
regulator_disable(uphy->v3p3);
|
||||
regulator_disable(uphy->v1p8);
|
||||
clk_disable_unprepare(uphy->sleep_clk);
|
||||
|
|
|
|||
|
|
@ -71,6 +71,7 @@ struct rcar_gen2_phy_driver {
|
|||
struct rcar_gen2_phy_data {
|
||||
const struct phy_ops *gen2_phy_ops;
|
||||
const u32 (*select_value)[PHYS_PER_CHANNEL];
|
||||
const u32 num_channels;
|
||||
};
|
||||
|
||||
static int rcar_gen2_phy_init(struct phy *p)
|
||||
|
|
@ -271,11 +272,13 @@ static const u32 usb20_select_value[][PHYS_PER_CHANNEL] = {
|
|||
static const struct rcar_gen2_phy_data rcar_gen2_usb_phy_data = {
|
||||
.gen2_phy_ops = &rcar_gen2_phy_ops,
|
||||
.select_value = pci_select_value,
|
||||
.num_channels = ARRAY_SIZE(pci_select_value),
|
||||
};
|
||||
|
||||
static const struct rcar_gen2_phy_data rz_g1c_usb_phy_data = {
|
||||
.gen2_phy_ops = &rz_g1c_phy_ops,
|
||||
.select_value = usb20_select_value,
|
||||
.num_channels = ARRAY_SIZE(usb20_select_value),
|
||||
};
|
||||
|
||||
static const struct of_device_id rcar_gen2_phy_match_table[] = {
|
||||
|
|
@ -389,7 +392,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev)
|
|||
channel->selected_phy = -1;
|
||||
|
||||
error = of_property_read_u32(np, "reg", &channel_num);
|
||||
if (error || channel_num > 2) {
|
||||
if (error || channel_num >= data->num_channels) {
|
||||
dev_err(dev, "Invalid \"reg\" property\n");
|
||||
of_node_put(np);
|
||||
return error;
|
||||
|
|
|
|||
Loading…
Reference in a new issue