From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 4FDC337D5C8 for ; Thu, 21 Aug 2025 20:08:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806918; cv=none; b=X8hyRBbrehqckL4swQcZvLNw9WdJTYdjzleuIdQl7u6a0J+WRkwiirZ4PFKzFy94wwj2ByWBqaeAAzVZE5RN1PUatlICzltkpJDaEPQt6jL6pkdmDArriV2qjoWddmenSw8TUSJH2YFExWt7uQ5EBrE5YJZwm3EO95l4CGIUBqs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755806918; c=relaxed/simple; bh=SsQg42O77qinr7crb+JX5LkctmenW7x9L4AwEMidQkI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bPpKbn1f/xpzfmJ5jCP4fNJhnHtcieV4p/hYAdJVfd04oQroa/9QnUKo4OH9YcexRLIcVi36fBVkYZOVzwO4c7+nO2LQxNI4hbg25gQGzVxkb1kczFBQ9+WEL2j9m87EWwUEzz2imOc9s/NbcbKL/a/sEiEZn2ajXAUvo8GiK04= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=huvZ+tDW; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="huvZ+tDW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755806914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yKmA6ti8X8/YIeKKq4I8EEiHVsObQn302mzSXytdc/A=; b=huvZ+tDWYHZ2YCNDG48r+7h1v3uYqBAL/bYoN5chZGyjA4V1PLWYxYNAXeH0omws3yfihe AeSwa+HO0Tyf6z29vNEfBGD6oebZFUfTJ2wMezoBd4Ka1btBgfA13Nc3vF1lbo6SoCFNaq 7mzm1YFA5bGwoAHU96+kVkQ/lkbtYCg= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-124-WWlFA55AMjCcEW8dO-JvdQ-1; Thu, 21 Aug 2025 16:08:29 -0400 X-MC-Unique: WWlFA55AMjCcEW8dO-JvdQ-1 X-Mimecast-MFC-AGG-ID: WWlFA55AMjCcEW8dO-JvdQ_1755806907 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3b9d41b88ffso838608f8f.0 for ; Thu, 21 Aug 2025 13:08:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755806907; x=1756411707; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yKmA6ti8X8/YIeKKq4I8EEiHVsObQn302mzSXytdc/A=; b=PyLFfBahrUP0OrgaymbN5aWnQz5vKLMBHnUEZHZb8r6qNDqJT8CH9H+fgejGt7Q8g4 ScrAgRl/N3wiI6nKDJXCEoIYSHUY9i3q0HLblQ+EhaEzH8o4j01HKPmr6Q1yh1Mv8dVV 3E1NB+bkWBWxP8JFespVGwecEscG0VkuLs3y8eqtefdfprWtO4IimKMaOrFD3YfozoAW HycC5+UkZA69QBQvyxZ8YhOjdGvsEw2uPUy6DQVqdXzR17Ov2LlC00EoNgvf1OcVAQHj wf+Qc26Gnussy8tERawY+eKP4VapCWyKQVpcLaSTLje3Pu01RCujaiuO5/B4ZpipzLIL xGFA== X-Forwarded-Encrypted: i=1; AJvYcCX85v4hGXTtl+Vn8DMnlzeAxpZTSb8l/jtGd2nFKrw5duJJneVBLhuS6nv22HGvxcOLu2IUlT6hHQ==@vger.kernel.org X-Gm-Message-State: AOJu0YzbT8NTatQsK7evmSjWyA6nZ5XrHlist4ct8Cyi3g/EApOIToD2 rnVIpOER6zbVG6KM2Zm6jAzUX5B9yQo4hMnhhOA6pZRKdbeCLZ+hwd+wDvL4RMV255vAv4akkca FmUV/GPsiuC2KyCK6mk1Ee85PX4oedwbql3LzpBPb2OZcxZzR3HK6UZ8M87VK X-Gm-Gg: ASbGnctO/NRNf9oDAs7IEhYUdPtr8Xr2v6Ww/HJLiPIRoBBzFLz/YE/PEZb4mSLhW8w qLpf5sM0K/MEyY3OldwRC6nks2YQYVfRLnN3W/UvrINELLtrhx+50PckDY4273ahjG6G3i33MHx FQJm1tFlz9iz1XBdfPrrK33+zX4LUDxeuJB15WZXzHeZRc582euFQyidj3tdRHRf6ir5zncXUvW wFwZzb9RzqHfREnHZPBpCkYj+ukeoa5h5vMY1t6LkB+cB5LJcPTiHWlttsJ28p+oE+aFscWDWD0 h8PYF9H4TcwDBgMexf/2ONho5AerZT05U/9nOncx8pUa7SwVu2EGGcfce42/g16AMuBgaw05WGX LRjxHULL/ULsf8e5Uu2ehCA== X-Received: by 2002:a05:6000:288a:b0:3c3:f134:28ba with SMTP id ffacd0b85a97d-3c5db2dcc73mr210139f8f.28.1755806906758; Thu, 21 Aug 2025 13:08:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFquQDwTQ7641wc0kBtooMvxSzqNfE3+XbhkCNDvunKpGE2abRVQ6uRBkb0Dc/grDWRh0uIiA== X-Received: by 2002:a05:6000:288a:b0:3c3:f134:28ba with SMTP id ffacd0b85a97d-3c5db2dcc73mr210077f8f.28.1755806906301; Thu, 21 Aug 2025 13:08:26 -0700 (PDT) Received: from localhost (p200300d82f26ba0008036ec5991806fd.dip0.t-ipconnect.de. [2003:d8:2f26:ba00:803:6ec5:9918:6fd]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3c077789d12sm12702699f8f.54.2025.08.21.13.08.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Aug 2025 13:08:25 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: David Hildenbrand , Alex Dubov , Ulf Hansson , Jesper Nilsson , Lars Persson , Alexander Potapenko , Andrew Morton , Brendan Jackman , Christoph Lameter , Dennis Zhou , Dmitry Vyukov , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, iommu@lists.linux.dev, io-uring@vger.kernel.org, Jason Gunthorpe , Jens Axboe , Johannes Weiner , John Hubbard , kasan-dev@googlegroups.com, kvm@vger.kernel.org, "Liam R. Howlett" , Linus Torvalds , linux-arm-kernel@axis.com, linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, linux-ide@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mips@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, Lorenzo Stoakes , Marco Elver , Marek Szyprowski , Michal Hocko , Mike Rapoport , Muchun Song , netdev@vger.kernel.org, Oscar Salvador , Peter Xu , Robin Murphy , Suren Baghdasaryan , Tejun Heo , virtualization@lists.linux.dev, Vlastimil Babka , wireguard@lists.zx2c4.com, x86@kernel.org, Zi Yan Subject: [PATCH RFC 28/35] mmc: drop nth_page() usage within SG entry Date: Thu, 21 Aug 2025 22:06:54 +0200 Message-ID: <20250821200701.1329277-29-david@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250821200701.1329277-1-david@redhat.com> References: <20250821200701.1329277-1-david@redhat.com> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit It's no longer required to use nth_page() when iterating pages within a single SG entry, so let's drop the nth_page() usage. Cc: Alex Dubov Cc: Ulf Hansson Cc: Jesper Nilsson Cc: Lars Persson Signed-off-by: David Hildenbrand --- drivers/mmc/host/tifm_sd.c | 4 ++-- drivers/mmc/host/usdhi6rol0.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c index ac636efd911d3..f1ede2b39b505 100644 --- a/drivers/mmc/host/tifm_sd.c +++ b/drivers/mmc/host/tifm_sd.c @@ -191,7 +191,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host) } off = sg[host->sg_pos].offset + host->block_pos; - pg = nth_page(sg_page(&sg[host->sg_pos]), off >> PAGE_SHIFT); + pg = sg_page(&sg[host->sg_pos]) + off / PAGE_SIZE; p_off = offset_in_page(off); p_cnt = PAGE_SIZE - p_off; p_cnt = min(p_cnt, cnt); @@ -240,7 +240,7 @@ static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data) } off = sg[host->sg_pos].offset + host->block_pos; - pg = nth_page(sg_page(&sg[host->sg_pos]), off >> PAGE_SHIFT); + pg = sg_page(&sg[host->sg_pos]) + off / PAGE_SIZE; p_off = offset_in_page(off); p_cnt = PAGE_SIZE - p_off; p_cnt = min(p_cnt, cnt); diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c index 85b49c07918b3..3bccf800339ba 100644 --- a/drivers/mmc/host/usdhi6rol0.c +++ b/drivers/mmc/host/usdhi6rol0.c @@ -323,7 +323,7 @@ static void usdhi6_blk_bounce(struct usdhi6_host *host, host->head_pg.page = host->pg.page; host->head_pg.mapped = host->pg.mapped; - host->pg.page = nth_page(host->pg.page, 1); + host->pg.page = host->pg.page + 1; host->pg.mapped = kmap(host->pg.page); host->blk_page = host->bounce_buf; @@ -503,7 +503,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host) /* We cannot get here after crossing a page border */ /* Next page in the same SG */ - host->pg.page = nth_page(sg_page(host->sg), host->page_idx); + host->pg.page = sg_page(host->sg) + host->page_idx; host->pg.mapped = kmap(host->pg.page); host->blk_page = host->pg.mapped; -- 2.50.1