Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2909516iog; Mon, 27 Jun 2022 05:34:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sS+vTtc5YaR+aJF2o5sYCeRrQ3rmlSLJb/ICenc9sy6zy22BTVPL7XUvDoYHagA2P+ESvm X-Received: by 2002:a05:6402:27cf:b0:435:dae6:26aa with SMTP id c15-20020a05640227cf00b00435dae626aamr16075468ede.323.1656333252680; Mon, 27 Jun 2022 05:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656333252; cv=none; d=google.com; s=arc-20160816; b=n7KpOHNRWkfFJbnaKLVqJqSNUVwCM+7wyfchEIwDNzhcfFxtrxh7qZ0e4voZKua2If 6KuTr2u1pth7d5sVTSFZ+6K67qXRnDYC4gFgIVaJPgr+APVC4cJ7LVS3MCrHbnzWYG3p EslMhxYKpsA0XLdwl7/OQenRUk67iAoEbgmr+eVIwBXv6043c0Zr9sZR38GaNuWGy+iT +b1mAVpxThCPTFPv5I/cLoE8rHocNRgsmLEG+cgIQJnPgyYnnYUa9WgABHWvGUY5VPdF 2SMDyZB7HBEPWvFpiViLX83BHRc9guK52+xulJcNdyv+jOHTDL+hrE2EiyEv9R5ljHRX ZobA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xKZhhy2kNQvJgtx+BViPieIB3DEFYIGORN7JxmO/sqc=; b=rd9ePlLgEanfmpQy54tGtL0QuUnuktXkEbZrjUsVPrJKaqnqubLvocfkFxVUXMaBR6 sznOTzQoxakyKtbwT1lTU3oQjSdG+kWA4bjrrixXgbhR7hb5eRonZNu7+KOgr6nG1iRF 2L9cgo1QEr0Fk2yzAi7gyzQ5gWGRmNwDQi+gtPWGLfT5JzG76eJg2Rp/LlEEayR3BH90 A+J9waZiW/xssZqoFSrpBHqgxpHai2IlPHZItCCpI9g3bvVfWCJ+5w8WNPZ2s66oO8jl RNObhC6uG85zrQWfFF79s39vp7Xi+Qpd0Fkt1pIz/pyIbGQWw0bTMuJG3I2bkuYM+QOJ HjRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WexEQ5OF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a5-20020a50c305000000b0043573713b49si11602269edb.220.2022.06.27.05.33.48; Mon, 27 Jun 2022 05:34:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WexEQ5OF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238601AbiF0Ly2 (ORCPT + 99 others); Mon, 27 Jun 2022 07:54:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238481AbiF0Lsb (ORCPT ); Mon, 27 Jun 2022 07:48:31 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5705F101CF; Mon, 27 Jun 2022 04:41:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E7F8E611BC; Mon, 27 Jun 2022 11:41:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E019CC3411D; Mon, 27 Jun 2022 11:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1656330107; bh=+MTcTGLmL1ls4vYJq1txutHe5T3fDX/u5MDCemtlDP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WexEQ5OFso0i6fm0kWpjca0Y3gqY6BNc3WHqEisWaTZI2WnjowbtHPCDvJhaCo0s8 +Lu59JC8HTua6sdopy6SRiB00voe7O8+4jFVLz50kHtGp5zbaPWfjMbgHlnuY+5Hhc ktjhQl31O8dqAv9ypAk+e9FKsW/UZ0hzSp2wgdg0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Marek , Rob Clark , Sasha Levin Subject: [PATCH 5.18 049/181] drm/msm: use for_each_sgtable_sg to iterate over scatterlist Date: Mon, 27 Jun 2022 13:20:22 +0200 Message-Id: <20220627111945.988598001@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220627111944.553492442@linuxfoundation.org> References: <20220627111944.553492442@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonathan Marek [ Upstream commit 62b5e322fb6cc5a5a91fdeba0e4e57e75d9f4387 ] The dma_map_sgtable() call (used to invalidate cache) overwrites sgt->nents with 1, so msm_iommu_pagetable_map maps only the first physical segment. To fix this problem use for_each_sgtable_sg(), which uses orig_nents. Fixes: b145c6e65eb0 ("drm/msm: Add support to create a local pagetable") Signed-off-by: Jonathan Marek Link: https://lore.kernel.org/r/20220613221019.11399-1-jonathan@marek.ca Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index bcaddbba564d..a54ed354578b 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -58,7 +58,7 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu, u64 iova, u64 addr = iova; unsigned int i; - for_each_sg(sgt->sgl, sg, sgt->nents, i) { + for_each_sgtable_sg(sgt, sg, i) { size_t size = sg->length; phys_addr_t phys = sg_phys(sg); -- 2.35.1