From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755132AbeEANYP (ORCPT ); Tue, 1 May 2018 09:24:15 -0400 Received: from mail.netline.ch ([148.251.143.178]:36780 "EHLO netline-mail3.netline.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbeEANYO (ORCPT ); Tue, 1 May 2018 09:24:14 -0400 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= To: Konrad Rzeszutek Wilk , Christoph Hellwig Cc: iommu@lists.linux-foundation.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] swiotlb: Fix inversed DMA_ATTR_NO_WARN test Date: Tue, 1 May 2018 15:24:11 +0200 Message-Id: <20180501132411.2311-1-michel@daenzer.net> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michel Dänzer The result was printing the warning only when we were explicitly asked not to. Cc: stable@vger.kernel.org Fixes: 0176adb004065d6815a8e67946752df4cd947c5b "swiotlb: refactor coherent buffer allocation" Signed-off-by: Michel Dänzer --- lib/swiotlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/swiotlb.c b/lib/swiotlb.c index c43ec2271469..e9ac21540628 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -750,7 +750,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle, swiotlb_tbl_unmap_single(dev, phys_addr, size, DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); out_warn: - if ((attrs & DMA_ATTR_NO_WARN) && printk_ratelimit()) { + if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit()) { dev_warn(dev, "swiotlb: coherent allocation failed, size=%zu\n", size); -- 2.17.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH] swiotlb: Fix inversed DMA_ATTR_NO_WARN test Date: Tue, 1 May 2018 15:24:11 +0200 Message-ID: <20180501132411.2311-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Konrad Rzeszutek Wilk , Christoph Hellwig Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: iommu@lists.linux-foundation.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpUaGUgcmVzdWx0 IHdhcyBwcmludGluZyB0aGUgd2FybmluZyBvbmx5IHdoZW4gd2Ugd2VyZSBleHBsaWNpdGx5IGFz a2VkCm5vdCB0by4KCkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCkZpeGVzOiAwMTc2YWRiMDA0 MDY1ZDY4MTVhOGU2Nzk0Njc1MmRmNGNkOTQ3YzViICJzd2lvdGxiOiByZWZhY3RvcgogY29oZXJl bnQgYnVmZmVyIGFsbG9jYXRpb24iClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxtaWNo ZWwuZGFlbnplckBhbWQuY29tPgotLS0KIGxpYi9zd2lvdGxiLmMgfCAyICstCiAxIGZpbGUgY2hh bmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9saWIvc3dp b3RsYi5jIGIvbGliL3N3aW90bGIuYwppbmRleCBjNDNlYzIyNzE0NjkuLmU5YWMyMTU0MDYyOCAx MDA2NDQKLS0tIGEvbGliL3N3aW90bGIuYworKysgYi9saWIvc3dpb3RsYi5jCkBAIC03NTAsNyAr NzUwLDcgQEAgc3dpb3RsYl9hbGxvY19idWZmZXIoc3RydWN0IGRldmljZSAqZGV2LCBzaXplX3Qg c2l6ZSwgZG1hX2FkZHJfdCAqZG1hX2hhbmRsZSwKIAlzd2lvdGxiX3RibF91bm1hcF9zaW5nbGUo ZGV2LCBwaHlzX2FkZHIsIHNpemUsIERNQV9UT19ERVZJQ0UsCiAJCQlETUFfQVRUUl9TS0lQX0NQ VV9TWU5DKTsKIG91dF93YXJuOgotCWlmICgoYXR0cnMgJiBETUFfQVRUUl9OT19XQVJOKSAmJiBw cmludGtfcmF0ZWxpbWl0KCkpIHsKKwlpZiAoIShhdHRycyAmIERNQV9BVFRSX05PX1dBUk4pICYm IHByaW50a19yYXRlbGltaXQoKSkgewogCQlkZXZfd2FybihkZXYsCiAJCQkic3dpb3RsYjogY29o ZXJlbnQgYWxsb2NhdGlvbiBmYWlsZWQsIHNpemU9JXp1XG4iLAogCQkJc2l6ZSk7Ci0tIAoyLjE3 LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=