From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (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 9D7274A43F6 for ; Mon, 21 Sep 2026 13:39:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789997987; cv=none; b=UIDPVyEKP7vebVgziHcqFJkyfEjS84RBDkrDW25I/9Jtc3aOvddND3vE72fKub41CKTDy65NXpTBnw8Q80a4vbFXR8lw9WxvScjS5+o6LUdkmKWRbjxgt/d3EtvglHZlu6ZD+QFwmh+J4DkuS74ixpwIzjh52uV5PZdcMkbv2ws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789997987; c=relaxed/simple; bh=smDKQevZZNHOYCALAT7ddU35ycdlQd+jI7KY7MHT/MI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qmmt1eum4eQ+T/szv5s9WWX7xDcoTrfAsVPh4Yd9Er3aEwKmknxSw4LBzfneJvXq9IszllyS1QdZVYJLle9i/cTFrvZJKwxwZcKxwEEA8DjMmlMDMB9xYE8k6u8B72ki/WzL9PQo21bCFjypGNnWlfQ4lASg5jgBKM8J4eDft0E= 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=WjBxfpz+; arc=none smtp.client-ip=74.125.225.141 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="WjBxfpz+" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49e8185e037so17078945e9.3 for ; Mon, 21 Sep 2026 06:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789997984; x=1790602784; 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=EHTjFNHsfPkUevAeFTZNd93AhuEIP81I0y/DmV6dihY=; b=WjBxfpz+Z59BT444gfGRH3Mtq36vASFYOARX3FT6YjCghKwWC/pXcTF9wK+Ub3vqBC Sc4dhztOy6cixWLJTdmnW6aAAdKy6TPhMsPXXeutJhvrLzPjLqgtQiZ/zqfnBxCoUEeo EgLHekMf8Whef56EqGaYHtNlXeHKNnxM3wA1LbUHwyWakaZ++biQR//LT7RcYO3npvW9 SrP/iKtyrib9w9UzVAEsPN7zVMbNF6NcA+QrrmokozaB0DMuC94DsYPRf/Krt0l6+z9r nvOpE25tQCq/X/7/Tg+hp4Ccl3nkS9CWkMQgEOeLKAo4Eh3RG9wpVUSStGcSORqd1XWa YPPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789997984; x=1790602784; 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=EHTjFNHsfPkUevAeFTZNd93AhuEIP81I0y/DmV6dihY=; b=zffjXFTc9V3cl7IjNtTiz58ZXIYiyWk4EHKqc87+iordvX+/vSOZhaawBAOttcZy7r BX1Z3gmC3RjDlU1svUI6bGYnuG5wrC2KiV+k91/RCjAGZfgjl/GxaRX6tQi2Hw8Zzugk djx5GS0h9fdtX7eTeJBhQJRPqSNXnsuzTcCTo1ehUGk1gKfK5F9oj7i/HAJRFcgcMS5R LCQykIGadg2Ck1mcNj/k8jTFxun9sB34cqTOvttnDA8mAIOG0uP+vB7ghO0dVICR3O5F WXpUcrT00U220Nh2lKOFgUA/zgK7okAio714j5+JGtA7UqZEwoVs8mysh3VV8ackhPnV ZTXA== X-Gm-Message-State: AFuF++nIIcQKGZXbIudRr/tPD5lwmqDvx4TWWnifa3ShRSCW7q2Cjvbb DsWKC7to9BMVsXKul01vUC9KKosHy3FdqUILeYBQKprDesCEibuSE23t4j46oQ== X-Gm-Gg: AYBFou3PYxQeZks4nEOdDTOu8D8FEl+waHzCtb8vWWbOwpY2A/B1ei/JtRiwyo474Q/ +doWDCc3aeuD00dkbXnP4PfZ3WASo5BjsQqufi6AYhZ44+VMbFq7p1Qbnhm9UK5pn1dbDofZpig mV0/GLwyASGUQJz3NucIdUzVfm+j+kshe1Bjcrjek+5c1fz1Z5XROLYXpGYMwG3yP/GwHg4bNMD NNmS+q4Wd8golQi5e+ZOvRhwBlwm3f5puME3Gqshit1PU7an+tS1VVjqohn1NYMtjwYAia0TvSk FoHlb67Hcs5a5wOIktnzVE2I8YEAA43Qjs5qLmAv22O5piLEloSjbbwv2S1lDmRRLBZnBhjHuLk 0qNp3FuE9MwCnCoJHMwHUftSnziOWL8CSpcoOhhwqVdzrSFsJAZGZFfH7hkwm4FIRdhO5FJu4IJ hyx3I58rhZf+YDHcwkKmjJu5g/XkHVs73MWUjnBGaZoNswLc3keOEuxjCFSAi9NfFTnQpMLPSO0 XOayfQDmbx7PfhvE09P05FCG2+JKUIgnbXHyOu+ykoxy/z/sXcqngVMSlnRJzSgCusxrmiMiJT0 6W7FtmBIo6XV3zm+Cnnkrv/Wgen81Q== X-Received: by 2002:a05:600c:4505:b0:49a:a101:4157 with SMTP id 5b1f17b1804b1-49fc56db92fmr154368075e9.7.1789997983642; Mon, 21 Sep 2026 06:39:43 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-213-26.dab.02.net. [82.132.213.26]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc585920fsm617171605e9.4.2026.09.21.06.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2026 06:39:43 -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 , Phil Cayton , Matthew Brost , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , dm-devel@lists.linux.dev Subject: [PATCH v6 07/13] nvme-pci: rename nvme_pci_sgl_set_data to nvme_pci_dma_iter_set_sgl Date: Mon, 21 Sep 2026 14:38:51 +0100 Message-ID: <114bc2087c7811c849fafbf1392abd7edfb24471.1789997898.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-block@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 3d645324f04e..8dc4002fa696 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1297,7 +1297,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); @@ -1327,7 +1327,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; } @@ -1349,7 +1349,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)); @@ -1512,13 +1512,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