From nobody Sat Apr 4 03:26:57 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2B6A3CB2FE; Fri, 20 Mar 2026 22:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774046448; cv=none; b=FtHo4lDeYroZzScLp2Zqd0Ujc0fnG99EaX6a7rBAxE883+uTjIP9OzRBCa6936OFtThvjAM4S4G1HoyY0RBR7o0rZheS9qg+cxRYX3bvKVScOzo21dB7wBMR4SEALHqiJ9TKEThV3kL7u1uYos2eoATniFzEFhlX2NmLzPjBdsc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774046448; c=relaxed/simple; bh=rC8UhPo2hXOr5FxBAlmEyrOxvDFCNwpWMS0HCPMZ5xQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KbD4ZbXH546WLR3HmFI5OHZEiNYqpJ1tt6HK2/w/BW0ujgwTCjgMhYcKTLKM0VAhqQ7NR+8A8wge4i6o5KByKZRCwZsdZ3FDuNw+dQ8HOJnFcceIUv/9itQe20M2UYjxPqtuibOpE2gIF6zpc1gzhh0+F2jreUhfCHvU1HH6/Qs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jDWrE0wg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jDWrE0wg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 063CBC4CEF7; Fri, 20 Mar 2026 22:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774046448; bh=rC8UhPo2hXOr5FxBAlmEyrOxvDFCNwpWMS0HCPMZ5xQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jDWrE0wgPddZzCp/6MXK6JtMRXwDHcncD6Pj3A0RlrLa9zNX5JGIJM0U9t1UwvBN6 twzxYKnGdtV88a0F3yVb7GNg44xifk+XFDGN25B3mLjNPX8FneUvbLeJEQNdtUt+WZ /WH9NUWNCW6kMFTyjb+FmMKLFX2G4JaHL5+eGKdLNhbt7+v595DrvFQy6V7DTdK6hP V0/SMtHmbCkPbpX0kqrB4ikg8rPlyLYqzH6GDsIeQ1eCh6Fq+mPmF+bPpeusN4e5RB MrJLikSOWypIy40O2GVpU9qtXFTnNtyqLTtrhGWOpRG0RADI3LlJbe2hP9kqnW/0Ky XEbXUHAUYlzGA== From: "Lorenzo Stoakes (Oracle)" To: Andrew Morton Cc: Jonathan Corbet , Clemens Ladisch , Arnd Bergmann , Greg Kroah-Hartman , "K . Y . Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Long Li , Alexander Shishkin , Maxime Coquelin , Alexandre Torgue , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Bodo Stroesser , "Martin K . Petersen" , David Howells , Marc Dionne , Alexander Viro , Christian Brauner , Jan Kara , David Hildenbrand , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jann Horn , Pedro Falcato , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-mtd@lists.infradead.org, linux-staging@lists.linux.dev, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Ryan Roberts Subject: [PATCH v4 15/21] stm: replace deprecated mmap hook with mmap_prepare Date: Fri, 20 Mar 2026 22:39:41 +0000 Message-ID: <9f3d559a264a83cf45518fcf35cc7ef1d7dfd500.1774045440.git.ljs@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The f_op->mmap interface is deprecated, so update driver to use its successor, mmap_prepare. The driver previously used vm_iomap_memory(), so this change replaces it with its mmap_prepare equivalent, mmap_action_simple_ioremap(). Also, in order to correctly maintain reference counting, add a vm_ops->mapped callback to increment the reference count when successfully mapped. Reviewed-by: Suren Baghdasaryan Signed-off-by: Lorenzo Stoakes (Oracle) Acked-by: Vlastimil Babka (SUSE) --- drivers/hwtracing/stm/core.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c index 37584e786bb5..f48c6a8a0654 100644 --- a/drivers/hwtracing/stm/core.c +++ b/drivers/hwtracing/stm/core.c @@ -666,6 +666,16 @@ static ssize_t stm_char_write(struct file *file, const= char __user *buf, return count; } =20 +static int stm_mmap_mapped(unsigned long start, unsigned long end, pgoff_t= pgoff, + const struct file *file, void **vm_private_data) +{ + struct stm_file *stmf =3D file->private_data; + struct stm_device *stm =3D stmf->stm; + + pm_runtime_get_sync(&stm->dev); + return 0; +} + static void stm_mmap_open(struct vm_area_struct *vma) { struct stm_file *stmf =3D vma->vm_file->private_data; @@ -684,12 +694,14 @@ static void stm_mmap_close(struct vm_area_struct *vma) } =20 static const struct vm_operations_struct stm_mmap_vmops =3D { + .mapped =3D stm_mmap_mapped, .open =3D stm_mmap_open, .close =3D stm_mmap_close, }; =20 -static int stm_char_mmap(struct file *file, struct vm_area_struct *vma) +static int stm_char_mmap_prepare(struct vm_area_desc *desc) { + struct file *file =3D desc->file; struct stm_file *stmf =3D file->private_data; struct stm_device *stm =3D stmf->stm; unsigned long size, phys; @@ -697,10 +709,10 @@ static int stm_char_mmap(struct file *file, struct vm= _area_struct *vma) if (!stm->data->mmio_addr) return -EOPNOTSUPP; =20 - if (vma->vm_pgoff) + if (desc->pgoff) return -EINVAL; =20 - size =3D vma->vm_end - vma->vm_start; + size =3D vma_desc_size(desc); =20 if (stmf->output.nr_chans * stm->data->sw_mmiosz !=3D size) return -EINVAL; @@ -712,13 +724,12 @@ static int stm_char_mmap(struct file *file, struct vm= _area_struct *vma) if (!phys) return -EINVAL; =20 - pm_runtime_get_sync(&stm->dev); - - vma->vm_page_prot =3D pgprot_noncached(vma->vm_page_prot); - vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP); - vma->vm_ops =3D &stm_mmap_vmops; - vm_iomap_memory(vma, phys, size); + desc->page_prot =3D pgprot_noncached(desc->page_prot); + vma_desc_set_flags(desc, VMA_IO_BIT, VMA_DONTEXPAND_BIT, + VMA_DONTDUMP_BIT); + desc->vm_ops =3D &stm_mmap_vmops; =20 + mmap_action_simple_ioremap(desc, phys, size); return 0; } =20 @@ -836,7 +847,7 @@ static const struct file_operations stm_fops =3D { .open =3D stm_char_open, .release =3D stm_char_release, .write =3D stm_char_write, - .mmap =3D stm_char_mmap, + .mmap_prepare =3D stm_char_mmap_prepare, .unlocked_ioctl =3D stm_char_ioctl, .compat_ioctl =3D compat_ptr_ioctl, }; --=20 2.53.0