From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F27C55820E for ; Tue, 13 Oct 2026 20:55:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924935; cv=none; b=HpqFS87vfQUtUycVNZd7V2Qloc5mKbwaoTfS3BCclpR+Mmix/t5omQmfe8kBR/2nJAFJ5EPqWUaBwDnd035vWlP8jyxTvVPKX82or4XxS0+qiqFOn7+ToH3fg04j2tJC6eHUd9HdlMu3C7W7NiuqnYMLdRcz61uzaWO96tFAA6A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791924935; c=relaxed/simple; bh=0a99AkCdYYlGDSLNyvcoHvxyA0h7cLM0HZDY04APdmg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U8GqH2ZWLzpYKEyjjB5f5ojWSBkEtLKSXAbYA/Si1Vsaa1w+7OBlAGC1wIYagwSExYR81GomxiCJaVKwt0X3VG1P6O3Aw0rafjwOENHVBKpyIe4eL8P9n8mVmNtviXOabCysWyJlJR88KILvU8+jWoyrcRJAlKcUwgkaKj1NqBI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LwcO8KdU; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LwcO8KdU" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-48c6955a7c3so906746f8f.1 for ; Tue, 13 Oct 2026 13:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791924928; x=1792529728; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=SVgIYOF9sl5M4BcUqDAxFWbO5yiW+j2eX94ter+J4Q4=; b=LwcO8KdUHyYrdKQ/8j7tAKiNFwHbDujT8GdFEX2KNcqlHFfG/Na5K5kxM9B1aG/3XM UopK6UUi7ijG+DVl0L5VdYAdDQ9I5KVXnl9K4yNUsLrXbjkdYgCeUmeM2orJUZ6wJk49 V4XRyAyXaQo9AbwQMG55LhvqPfWwjfWLV0rVhmLJSkuS9+HyZWRmeJUcwdQMGRw8KYaN zVivHMHc0OobZ548LI1ZHAplQU9CqVRAzggD5J04MEBpto8/6C9n3vYEmdGSXmvc2Z39 B21/xy+LGe9qvbbIKlqo2VKgw5gmXchSSo40VSvJn/J2OQQYl/waRhyPMtrNBQiMToSh FT0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791924928; x=1792529728; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=SVgIYOF9sl5M4BcUqDAxFWbO5yiW+j2eX94ter+J4Q4=; b=1xiAa10UGlAm9jxu+K7JV1AN9lS3be5YVYJuEhjzQ9t3bqocsg7EN8wjbdedB8+7Vc hlKH5l/rcO+SQtLtIXECTnrdbkk3UxvL4NrAq1wcQzLimA6JlNzuaMDwtusgikCmnafV CUBudtiiE9F5WjPDXpADcn7O0hfFkwyuRiqXnO/2qUvSQK/+encmG/T9Ic0pYag/aL5x v8SaS0M14p153VtmASNFh9mgn414xfCzJ4i/pp7By7POA2jOMS3EAaLH1KoxTahBfoRr ygOa60qDsnMpayLvcXL0r79DsuWF4dfHYOeWpCdP6YltEpSdJA5FEyZ3ZFqfbOhQ+iZu uaEw== X-Forwarded-Encrypted: i=1; AKwUvBz2+jhnTW9f+6ODM4u+A0Auza6itCAEJbh+X3h3gfoavruO3twu3orFCX1Be8Tzd3xPF5E/7oPQXZlDTf8=@vger.kernel.org X-Gm-Message-State: AFq9FYLmF8m+Rfqv5hy9sENHc/mRT2r60KlZ7NXrEdgTZMMru56obm8H e1xZXAyYDJYITeSn+JwzSHiA9Qmh3Eds+iFJBLVjP++d5q3OReV8zj7p X-Gm-Gg: AYBFou07iTc0zdhUuFGvK26f4hfLJ4ZfwXLbRXEu21LwQ6fneSlYznvXleUtDiUinb/ lSN54rqFw1lFn6lZun320mNELR8Wxr1Mn2BogWi5Gg9RVvoPgDedgINOhNHyL/7UiH+ivWfVSHD 8dtH5uPjCzVOPPNHmylNZmMvgy0qrnuFHjPg3Wvh+iAE9pWQwCJ9zTQD8yYeiD7xm9VZ89b23St 8EBZw2xcCaYpWtcdPvl4AfPolP+VeAHWbBs6Kx4TQbwommFTxyglnJ+KSFBS/Ya8OkY0pVvd+lC 3xFGJjathxdl5gs/0MPDhVHW6dl2JT9Tivp6iKQvixovpWUPejvJiOJQrdMFxWVkIYE2upFzZO4 Bi1U1nmMJ5Ji4NOdUaEZl8nKRs+nyV14Gzucc6NAYL4ICuGtYsU3zE/Mb8FhKXX9zLWguW+ixlD kcYaM+0qW2GA2NEYOf/aV5qVYeuK7uyJxIDi5Qrm9Pz7FHmjp2fjopwgToE7GzBldJeI6bsrKtW ja8jSBcCMisDRE27qltjBPtT/sbVFw41LQ4RCfx3WaL55lbs66XBAFfGW72Vz3aDLU0QjCs6tY7 X-Received: by 2002:a05:6000:186f:b0:48c:7c69:2dce with SMTP id ffacd0b85a97d-48dbace9dfemr26073729f8f.16.1791924928152; Tue, 13 Oct 2026 13:55:28 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48de7273a0esm2380730f8f.29.2026.10.13.13.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 13:55:27 -0700 (PDT) From: Pavel Begunkov To: linux-block@vger.kernel.org Cc: asml.silence@gmail.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, Christoph Hellwig , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , Keith Busch , Sagi Grimberg , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , Jens Axboe , Nitesh Shetty , Kanchan Joshi , Anuj Gupta , Tushar Gohad , William Power , Matthew Brost , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , dm-devel@lists.linux.dev Subject: [PATCH v10 06/13] nvme-pci: rename nvme_pci_sgl_set_data to nvme_pci_dma_iter_set_sgl Date: Tue, 13 Oct 2026 21:54:50 +0100 Message-ID: <54f1186d20a7c24075dd38eda1dfc7ac3705a13e.1791924581.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.54.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: 8bit From: Anuj Gupta Rename the blk_dma_iter based nvme_pci_sgl_set_data() to nvme_pci_dma_iter_set_sgl(). Suggested-by: Christoph Hellwig Reviewed-by: Christoph Hellwig Signed-off-by: Anuj Gupta Signed-off-by: Pavel Begunkov --- drivers/nvme/host/pci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 77317e5d00f9..a65b77726e4b 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1147,7 +1147,7 @@ static blk_status_t nvme_pci_setup_data_prp(struct request *req, return BLK_STS_IOERR; } -static void nvme_pci_sgl_set_data(struct nvme_sgl_desc *sge, +static void nvme_pci_dma_iter_set_sgl(struct nvme_sgl_desc *sge, struct blk_dma_iter *iter) { sge->addr = cpu_to_le64(iter->addr); @@ -1177,7 +1177,7 @@ static blk_status_t nvme_pci_setup_data_sgl(struct request *req, iod->cmd.common.flags = NVME_CMD_SGL_METABUF; if (entries == 1 || blk_rq_dma_map_coalesce(&iod->dma_state)) { - nvme_pci_sgl_set_data(&iod->cmd.common.dptr.sgl, iter); + nvme_pci_dma_iter_set_sgl(&iod->cmd.common.dptr.sgl, iter); iod->total_len += iter->len; return BLK_STS_OK; } @@ -1199,7 +1199,7 @@ static blk_status_t nvme_pci_setup_data_sgl(struct request *req, iter->status = BLK_STS_IOERR; break; } - nvme_pci_sgl_set_data(&sg_list[mapped++], iter); + nvme_pci_dma_iter_set_sgl(&sg_list[mapped++], iter); iod->total_len += iter->len; } while (blk_rq_dma_map_iter_next(req, nvmeq->dev->dev, iter)); @@ -1359,13 +1359,13 @@ static blk_status_t nvme_pci_setup_meta_iter(struct request *req) iod->cmd.common.metadata = cpu_to_le64(sgl_dma); if (entries == 1) { iod->meta_total_len = iter.len; - nvme_pci_sgl_set_data(sg_list, &iter); + nvme_pci_dma_iter_set_sgl(sg_list, &iter); return BLK_STS_OK; } sgl_dma += sizeof(*sg_list); do { - nvme_pci_sgl_set_data(&sg_list[++i], &iter); + nvme_pci_dma_iter_set_sgl(&sg_list[++i], &iter); iod->meta_total_len += iter.len; } while (blk_rq_integrity_dma_map_iter_next(req, dev->dev, &iter)); -- 2.54.0