Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp678149ybv; Thu, 13 Feb 2020 07:37:30 -0800 (PST) X-Google-Smtp-Source: APXvYqyqBO+lNLSSdbu/3k1l0VKfgNPJFNk4clc/ldeZeDngvJydF+JVT9ezPat533VxFXfe1I9c X-Received: by 2002:a05:6830:14c3:: with SMTP id t3mr13444952otq.213.1581608249840; Thu, 13 Feb 2020 07:37:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581608249; cv=none; d=google.com; s=arc-20160816; b=mPOuQ8mpBL3K9IniyT6O3AhD2cdbamruFGhbuDB49aWnSmVJH/fAtuKmgBBaKLyWWs zZyOW184c3j3TqhWQSPHvhKblB/SedFwg3ZLGQDKgEu5hD6WA5N8FiR+mgsCWQMtqANP qpXz/1WEK8V7t2nD5zL56yLFI0/QC0oIydyhuuGmw2IRQsQuRap5H88o4a2WbtHpeYZc IEXhKsELhLaB4HuvRiigMu09/V7mpIOVYFv+C1c5lK+ob5lNb7Ciu4NMiFf9Fm3/nmp4 Zy1fCju8Augmqpnz/MOOe9A416Rx4W2Yke6g5GoOLSqhkZqkUOprOd+oWQE5cY5h9hH/ IR5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pgQ4IRujXbiuQ5yDLK5SajCQ5O2fd4bY5K4coDOsCcc=; b=ejQgiGnzSLWcHXl3dtEYncuDToS6VOHEG0ekyZSLL89ULEeIcKHpzbu34/SFpuxmuk M0SU84YrpsP45cVIJUqD4KKT1WNVZE7cC32w/YzAsSmZ2B5QH4WAE3zrii+AjLH/qW2q sC/KxNOAm/0uYQ7Qc06boTILfxBNmDFg63/jzj+W35XgDU5793Svce5f5B6TeSY23E9Q 266sKdqhh/dKUMvClCLcyKt2RljnDmW3qOIlGXEHRfbQDIMOpGEGYoLY+0HS8Lu3p2zw BO9LPoW4GMKvw/dJm/XuG0BdXQKi81ovw3/2IkPPfYM+mrfPBRb3O3WV/bKJsUIjkxWu ZtwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=132T4Gls; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6si1229677otn.172.2020.02.13.07.37.17; Thu, 13 Feb 2020 07:37:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=132T4Gls; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729192AbgBMPaA (ORCPT + 99 others); Thu, 13 Feb 2020 10:30:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:48356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387638AbgBMP1B (ORCPT ); Thu, 13 Feb 2020 10:27:01 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A87D824676; Thu, 13 Feb 2020 15:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607620; bh=p6JrbT3CgbN40TmXB28kT1XvH8v/sceqsNnGlOEqp48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=132T4Gls7UQ1PjAnW172ogKLcv1RGC9EgH5PKoDsdehieiKFotHQMvOFVYEbUUfhB lr2z/6LYaI9ECjJxJ5L+C7dv6U3p1SL0RsIH6Mj8k6rbiewnXnN6EGPposiHbmaS+I WIUqOr7Y2P9CnTBbNY3xs0a8V0n33CGKwyepWnvw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wesley Sheng , Logan Gunthorpe , Bjorn Helgaas Subject: [PATCH 5.4 15/96] PCI/switchtec: Use dma_set_mask_and_coherent() Date: Thu, 13 Feb 2020 07:20:22 -0800 Message-Id: <20200213151845.371550113@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151839.156309910@linuxfoundation.org> References: <20200213151839.156309910@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wesley Sheng commit aa82130a22f77c1aa5794703730304d035a0c1f4 upstream. Use dma_set_mask_and_coherent() instead of dma_set_coherent_mask() as the Switchtec hardware fully supports 64bit addressing and we should set both the streaming and coherent masks the same. [logang@deltatee.com: reworked commit message] Fixes: aff614c6339c ("switchtec: Set DMA coherent mask") Link: https://lore.kernel.org/r/20200106190337.2428-2-logang@deltatee.com Signed-off-by: Wesley Sheng Signed-off-by: Logan Gunthorpe Signed-off-by: Bjorn Helgaas Signed-off-by: Greg Kroah-Hartman --- drivers/pci/switch/switchtec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c @@ -1349,7 +1349,7 @@ static int switchtec_init_pci(struct swi if (rc) return rc; - rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (rc) return rc;