Changes in Makefile

0fc8f6200d2313278fbf4539bbab74677c685531 - Merge drm/drm-fixes into drm-misc-fixes

Mon, 27 Apr 2026 10:26:49 +0200

Merge drm/drm-fixes into drm-misc-fixesGetting fixes and updates from v7.1-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/ufs/core/Makefile

f4b369c6fe0ceaba2da2daff8c9eb415f85926dd - Merge branch 'next' into for-linus

Mon, 20 Apr 2026 03:28:57 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.1 merge window. List of files: /linux/drivers/ufs/core/Makefile

0421ccdfad0d92713a812a5aeb7d07b0ea7213c8 - Merge tag 'v7.0-rc3' into next

Thu, 12 Mar 2026 18:44:42 +0100

Merge tag 'v7.0-rc3' into nextSync up with the mainline to brig up the latest changes, specificallychanges to ALPS driver. List of files: /linux/drivers/ufs/core/Makefile

a85d6ff99411eb21536a750ad02205e8a97894c6 - Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Tue, 21 Apr 2026 17:22:18 +0200

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsiPull SCSI updates from James Bottomley: "Usual driver updates (ufs, lpfc, fnic, target, mpi3mr). The substantive core changes are adding a 'serial' sysfs attribute and getting sd to support > PAGE_SIZE sectors"* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (98 commits) scsi: target: Don't validate ignored fields in PROUT PREEMPT scsi: qla2xxx: Use nr_cpu_ids instead of NR_CPUS for qp_cpu_map allocation scsi: ufs: core: Disable timestamp for Kioxia THGJFJT0E25BAIP scsi: mpi3mr: Fix typo scsi: sd: fix missing put_disk() when device_add(&disk_dev) fails scsi: libsas: Delete unused to_dom_device() and to_dev_attr() scsi: storvsc: Handle PERSISTENT_RESERVE_IN truncation for Hyper-V vFC scsi: iscsi_tcp: Remove unneeded selections of CRYPTO and CRYPTO_MD5 scsi: lpfc: Update lpfc version to 15.0.0.0 scsi: lpfc: Add PCI ID support for LPe42100 series adapters scsi: lpfc: Introduce 128G link speed selection and support scsi: lpfc: Check ASIC_ID register to aid diagnostics during failed fw updates scsi: lpfc: Update construction of SGL when XPSGL is enabled scsi: lpfc: Remove deprecated PBDE feature scsi: lpfc: Add REG_VFI mailbox cmd error handling scsi: lpfc: Log MCQE contents for mbox commands with no context scsi: lpfc: Select mailbox rq_create cmd version based on SLI4 if_type scsi: lpfc: Break out of IRQ affinity assignment when mask reaches nr_cpu_ids scsi: ufs: core: Make the header files self-contained scsi: ufs: core: Remove an include directive from ufshcd-crypto.h ... List of files: /linux/drivers/ufs/core/Makefile

2dfb80cc3580dc02be83246bcd5446e6f3a231b9 - Merge patch series "scsi: ufs: Add TX Equalization support for UFS 5.0"

Fri, 27 Mar 2026 22:21:28 +0100

Merge patch series "scsi: ufs: Add TX Equalization support for UFS 5.0"Can Guo says:Hi,The UFS v5.0 and UFSHCI v5.0 standards have published, introducing supportfor HS-G6 (46.6 Gbps per lane) through the new UniPro V3.0 interconnectlayer and M-PHY V6.0 physical layer specifications. To achieve reliableoperation at these higher speeds, UniPro V3.0 introduces TX Equalizationand Pre-Coding mechanisms that are essential for signal integrity.This patch series implements TX Equalization support in the UFS coredriver as specified in UFSHCI v5.0, along with the necessary vendoroperations and a reference implementation for Qualcomm UFS hostcontrollers.Background==========TX Equalization is a signal conditioning technique that compensates forchannel impairments at high data rates (HS-G4 through HS-G6). It worksby adjusting two key parameters:- PreShoot: Pre-emphasis applied before the main signal transition- DeEmphasis: De-emphasis applied after the main signal transitionUniPro V3.0 defines TX Equalization Training (EQTR) procedure toautomatically discover optimal TX Equalization settings. The EQTRprocedure:1. Starts from the most reliable link state (HS-G1)2. Iterates through all possible PreShoot and DeEmphasis combinations3. Evaluates signal quality using Figure of Merit (FOM) measurements4. Selects the best settings for both host and device TX lanesFor HS-G6, Pre-Coding is also introduced to further improve signalquality. Pre-Coding must be enabled on both transmitter and receiverwhen the RX_FOM indicates it is required.Implementation Overview=======================The implementation follows the UFSHCI v5.0 specification and consists of:Core Infrastructure (Patches 1-6):- New vops callback negotiate_pwr_mode() to allow vendors to negotiate power mode parameters before applying TX Equalization settings- Support for HS-G6 gear enumeration- Complete TX EQTR procedure implementation in ufs-txeq.c- Debugfs interface for TX Equalization parameter inspection and manual retraining- Module parameters for adaptive TX Equalization controlQualcomm Implementation (Patches 7-11):- PHY-specific configurations for TX EQTR procedure- Vendor-specific FOM measurement support- TX Equalization settings application- Enable TX Equalization for HW version 0x7 and onwardsThe implementation is designed to be vendor-agnostic, with platform-specific details handled through the vops callbacks. Other vendors canadd support by implementing the three new vops:- tx_eqtr_notify(): Called before/after TX EQTR for vendor setup- apply_tx_eqtr_settings(): Apply vendor-specific PHY configurations- get_rx_fom(): Retrieve vendor-specific FOM measurements if neededModule Parameters=================The implementation provides several module parameters for flexibility:- use_adaptive_txeq: Enable/disable adaptive TX Equalization (default: false)- adaptive_txeq_gear: Minimum gear for adaptive TX EQ (default: HS-G6)- use_txeq_presets: Use only the 8 standaird presets (default: false)- txeq_presets_selected[]: Select specific presets for EQTRTesting=======This patch series has been tested on Qualcomm platforms with UFS 5.0devices, validating:- Successful TX EQTR completion for HS-G6- Proper FOM evaluation and optimal settings selection- Pre-Coding enablement for HS-G6- Power mode changes with TX Equalization settings applied- Report of TX Equalization settings via debugfs entries- Report of TX EQTR histories via debug entries (see next section)- Re-training TX Equalization via debugfs entryExample of TX EQTR history==========================Device TX EQTR record summary -Target Power Mode: HS-G6, Rate-BMost recent record index: 2Most recent record timestamp: 219573378 usTX Lane 0 FOM - PreShoot\DeEmphasis\ 0 1 2 3 4 5 6 70 50 70 65 - - - - x1 x x x x x x x x2 100 90 70 - - - - x3 x x x x x x x x4 95 90 - - - - - x5 - - - - - - - x6 x x x x x x x x7 x x x x x x x xTX Lane 1 FOM - PreShoot\DeEmphasis\ 0 1 2 3 4 5 6 70 50 70 60 - - - - x1 x x x x x x x x2 100 80 65 - - - - x3 x x x x x x x x4 95 85 - - - - - x5 - - - - - - - x6 x x x x x x x x7 x x x x x x x xPatch Structure===============Patches 1-3: Preparatory changes for power mode negotiation and HS-G6Patch 4: Core TX Equalization and EQTR implementationPatches 5-7: Debugfs support for TX EqualizationPatches 8-12: Qualcomm vendor implementationNext====One more series has been developed to enhance TX Equalization support,which will be submitted for review after this series is accepted:- Provide board specific (static) TX Equalization settings from DTS- Parse static TX Equalization settings from DTS if provided- Apply static TX Equalization settings if use_adaptive_txeq is disabled- Add support for UFS v5.0 attributes qTxEQGnSettings & wTxEQGnSettingsExt- Enable persistent storage and retrieval of optimal TX Equalization settingsLink: https://patch.msgid.link/20260325152154.1604082-1-can.guo@oss.qualcomm.comSigned-off-by: Martin K. Petersen List of files: /linux/drivers/ufs/core/Makefile

03e5d38e2f985d8d0b0a60508c0b422f664808e3 - scsi: ufs: core: Add support for TX Equalization

Wed, 25 Mar 2026 16:21:46 +0100

scsi: ufs: core: Add support for TX EqualizationMIPI Unipro3.0 introduced PA_TxEQGnSetting and PA_PreCodeEn attributes forTX Equalization and Pre-Coding. It is Host Software's responsibility toconfigure these attributes for both host and device before initiating PowerMode Change to High-Speed Gears.MIPI Unipro3.0 also introduced TX Equalization Training (EQTR) to identifyoptimal TX Equalization settings for use by both Host's and Device'sUniPro. TX EQTR shall be initiated from the most reliable High-Speed Gear(HS-G1) targeting High-Speed Gears (HS-G4 to HS-G6).Implement TX Equalization configuration and TX EQTR procedure as definedin UFSHCI v5.0 specification. The TX EQTR procedure determines the optimalTX Equalization settings by iterating through all possible PreShoot andDeEmphasis combinations and selecting the best combinations for both Hostand Device based on Figure of Merit (FOM) evaluation.Reviewed-by: Bean Huo Reviewed-by: Bart Van Assche Signed-off-by: Can Guo Reviewed-by: Peter Wang Link: https://patch.msgid.link/20260325152154.1604082-5-can.guo@oss.qualcomm.comSigned-off-by: Martin K. Petersen List of files: /linux/drivers/ufs/core/Makefile

ec496f77b4c11036cc835d6f045fb5e5ef1e6530 - Merge branch 'for-6.20/sony' into for-linus

Mon, 09 Feb 2026 17:33:26 +0100

Merge branch 'for-6.20/sony' into for-linus- Support for Rock band 4 PS4 and PS5 guitars (Rosalie Wanders) List of files: /linux/drivers/ufs/core/Makefile

cc4adab164b772a34b3340d644b7c4728498581e - Merge tag 'v6.19-rc1' into msm-next

Tue, 20 Jan 2026 23:06:55 +0100

Merge tag 'v6.19-rc1' into msm-nextMerge Linux 6.19-rc1 in order to catch up with other changes (e.g. UBWCconfig database defining UBWC_6).Signed-off-by: Dmitry Baryshkov List of files: /linux/drivers/ufs/core/Makefile

5add3c3c280a35f7e258e9cef7607db5a2e56fdc - Merge drm/drm-next into drm-xe-next

Fri, 19 Dec 2025 11:51:22 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 6.19-rc1. An important upstream bugfix andto help unblock PTL CI.Signed-off-by: Thomas Hellström List of files: /linux/drivers/ufs/core/Makefile

ec439c38013550420aecc15988ae6acb670838c1 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1

Wed, 17 Dec 2025 06:29:38 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1Cross-merge BPF and other fixes after downstream PR.Signed-off-by: Alexei Starovoitov List of files: /linux/drivers/ufs/core/Makefile

b8304863a3990d0f18c38e5b94191830a63ee1af - Merge drm/drm-next into drm-intel-next

Mon, 15 Dec 2025 14:24:02 +0100

Merge drm/drm-next into drm-intel-nextSync-up some display code needed for Async flips refactor.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/ufs/core/Makefile

7f790dd21a931c61167f7bdc327aecf2cebad327 - Merge drm/drm-next into drm-misc-next

Mon, 15 Dec 2025 09:27:39 +0100

Merge drm/drm-next into drm-misc-nextLet's kickstart the v6.20 (7.0?) release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/ufs/core/Makefile

24f171c7e145f43b9f187578e89b0982ce87e54c - Merge tag 'asoc-fix-v6.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Sun, 21 Dec 2025 11:11:11 +0100

Merge tag 'asoc-fix-v6.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.19We've been quite busy with fixes since the merge window, though not inany particularly exciting ways - the standout thing is the fix for _SXcontrols which were broken by a change to how we do clamping, otherwiseit's all fairly run of the mill fixes and quirks. List of files: /linux/drivers/ufs/core/Makefile

84318277d6334c6981ab326d4acc87c6a6ddc9b8 - Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes

Mon, 15 Dec 2025 12:53:27 +0100

Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixesPull in rc1 to include all changes since the merge window closed,and grab all fixes and changes from drm/drm-next.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/ufs/core/Makefile

7eb7f5723df50a7d5564aa609e4c147f669a5cb4 - Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Sat, 06 Dec 2025 04:56:50 +0100

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsiPull SCSI updates from James Bottomley: "Usual driver updates (ufs, lpfc, target, qla2xxx) plus assorted cleanups and fixes including the WQ_PERCPU series. The biggest core change is the new allocation of pseudo-devices which allow the sending of internal commands to a given SCSI target"* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (147 commits) scsi: MAINTAINERS: Add the UFS include directory scsi: scsi_debug: Support injecting unaligned write errors scsi: qla2xxx: Fix improper freeing of purex item scsi: ufs: rockchip: Fix compile error without CONFIG_GPIOLIB scsi: ufs: rockchip: Reset controller on PRE_CHANGE of hce enable notify scsi: ufs: core: Use scsi_device_busy() scsi: ufs: core: Fix single doorbell mode support scsi: pm80xx: Add WQ_PERCPU to alloc_workqueue() users scsi: target: Add WQ_PERCPU to alloc_workqueue() users scsi: qedi: Add WQ_PERCPU to alloc_workqueue() users scsi: target: ibmvscsi: Add WQ_PERCPU to alloc_workqueue() users scsi: qedf: Add WQ_PERCPU to alloc_workqueue() users scsi: bnx2fc: Add WQ_PERCPU to alloc_workqueue() users scsi: be2iscsi: Add WQ_PERCPU to alloc_workqueue() users scsi: message: fusion: Add WQ_PERCPU to alloc_workqueue() users scsi: lpfc: WQ_PERCPU added to alloc_workqueue() users scsi: scsi_transport_fc: WQ_PERCPU added to alloc_workqueue users() scsi: scsi_dh_alua: WQ_PERCPU added to alloc_workqueue() users scsi: qla2xxx: WQ_PERCPU added to alloc_workqueue() users scsi: target: sbp: Replace use of system_unbound_wq with system_dfl_wq ... List of files: /linux/drivers/ufs/core/Makefile

82f78acd5a9270370ef4aa3f032ede25f3dc91ee - Merge patch series "Add OP-TEE based RPMB driver for UFS devices"

Thu, 20 Nov 2025 16:26:13 +0100

Merge patch series "Add OP-TEE based RPMB driver for UFS devices"Bean Huo says:This patch series introduces OP-TEE based RPMB (Replay ProtectedMemory Block) support for UFS devices, extending the kernel-levelsecure storage capabilities that are currently available for eMMCdevices.Previously, OP-TEE required a userspace supplicant to access RPMBpartitions, which created complex dependencies and reliability issues,especially during early boot scenarios. Recent work by Linaro hasmoved core supplicant functionality directly into the Linux kernel foreMMC devices, eliminating userspace dependencies and enablingimmediate secure storage access. This series extends the same approachto UFS devices, which are used in enterprise and mobile applicationsthat require secure storage capabilities.Benefits: - Eliminates dependency on userspace supplicant for UFS RPMB access - Enables early boot secure storage access (e.g., fTPM, secure UEFI variables) - Provides kernel-level RPMB access as soon as UFS driver is initialized - Removes complex initramfs dependencies and boot ordering requirements - Ensures reliable and deterministic secure storage operations - Supports both built-in and modular fTPM configurations.Prerequisites:--------------This patch series depends on commit 7e8242405b94 ("rpmb: move structrpmb_frame to common header") which has been merged into mainlinev6.18-rc2.Link: https://patch.msgid.link/20251107230518.4060231-1-beanhuo@iokpp.deSigned-off-by: Martin K. Petersen List of files: /linux/drivers/ufs/core/Makefile

b06b8c421485e0e96d7fd6aa614fb0b6f2778a03 - scsi: ufs: core: Add OP-TEE based RPMB driver for UFS devices

Sat, 08 Nov 2025 00:05:18 +0100

scsi: ufs: core: Add OP-TEE based RPMB driver for UFS devicesAdd OP-TEE based RPMB support for UFS devices. This enables secure RPMBoperations on UFS devices through OP-TEE, providing the samefunctionality available for eMMC devices and extending kernel-basedsecure storage support to UFS-based systems.Benefits of OP-TEE based RPMB implementation: - Eliminates dependency on userspace supplicant for RPMB access - Enables early boot secure storage access (e.g., fTPM, secure UEFI variables) - Provides kernel-level RPMB access as soon as UFS driver is initialized - Removes complex initramfs dependencies and boot ordering requirements - Ensures reliable and deterministic secure storage operations - Supports both built-in and modular fTPM configurations[mkp: make this build as a module]Co-developed-by: Can Guo Signed-off-by: Can Guo Reviewed-by: Avri Altman Reviewed-by: Bart Van Assche Signed-off-by: Bean Huo Link: https://patch.msgid.link/20251107230518.4060231-4-beanhuo@iokpp.deSigned-off-by: Martin K. Petersen List of files: /linux/drivers/ufs/core/Makefile

a23e1966932464e1c5226cb9ac4ce1d5fc10ba22 - Merge branch 'next' into for-linus

Mon, 15 Jul 2024 23:03:44 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.11 merge window. List of files: /linux/drivers/ufs/core/Makefile

6f47c7ae8c7afaf9ad291d39f0d3974f191a7946 - Merge tag 'v6.9' into next

Tue, 28 May 2024 06:37:18 +0200

Merge tag 'v6.9' into nextSync up with the mainline to bring in the new cleanup API. List of files: /linux/drivers/ufs/core/Makefile

a1c613ae4c322ddd58d5a8539dbfba2a0380a8c0 - Merge drm/drm-next into drm-intel-gt-next

Tue, 24 Oct 2023 10:50:22 +0200

Merge drm/drm-next into drm-intel-gt-nextWork that needs to land in drm-intel-gt-next depends on two patches onlypresent in drm-intel-next, absence of which is causing a merge conflict: 3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/ufs/core/Makefile