Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4148976pxb; Mon, 27 Sep 2021 10:23:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxC8g7TJs1ySAYdbOMJTArCPU6+6ScKdz2LqrtohUyp63uO12utENS+aT1JiJAU6r0jDich X-Received: by 2002:a62:8fce:0:b0:442:ba88:ea54 with SMTP id n197-20020a628fce000000b00442ba88ea54mr808179pfd.80.1632763386206; Mon, 27 Sep 2021 10:23:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632763386; cv=none; d=google.com; s=arc-20160816; b=eYEbx4dU9w+Ciu00Ep5dcmjmjPjXil7LgCgeXIOIL82S9F5xTGsMkTloO3yl/DHRrE cBX717WKaXTf5YKnD2c6mQX4feW13j3oWuLufvApwaL8JvjiuLqXMKEqUkIXZZPf+PF4 Xs7fy9Vi5ApSSBUkveHQ0s/zMT/QzsgCC9jRauDuzLMgzdTIWQ9JEyOXwKWAslieEK1p fTcNe4+vNmkJK7bbK5oBimJXxRwgsr8BaU/zyDnKL9QCVGhi6cMJZaug1K3rzAVnlo1n PNAgz+wiS3o4SmBBVLp7GPqp6s9/rz2RDKHyu2bxigLXO1t8CTEnt3yiQ3nPqqpp704O gwOA== 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=b5kCGap0qUEOX8qBlC8Q3wdypeDL4EEQVdB3nN73oPg=; b=RNgohINngJkKLlXnULPBiOeBfX8t0dA7XuFGjFaAt1tBYhbaaOm2z7Zuh5niPgYlxW LoG+LNsYASOW8lE7NnpKmFAYShubxpj1inAngJhOBAWF+PEO5tfoRpKSKaLsSiDFC+cV gQuqlBGvlZGLZTzY+7YbpSZ5fo6dyXcKp/ZbFDUyKB3zyY10tt+mXChml8HatL+O8TCu +3tAzWyq+oAv/AF9GACcTHNQsBwXfWVAe3wu6Y7vLz34BS0M4ZhG96DryagBiNb4htem SeWF3e3ntHyLhmbNvvSYZhJ7XassDiMmClWp3jA6VfIEpATymolsMzGaQmIa0dwkrm6c XJYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=osd250ng; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v70si12412480pgd.631.2021.09.27.10.22.53; Mon, 27 Sep 2021 10:23:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=osd250ng; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S236791AbhI0RVm (ORCPT + 99 others); Mon, 27 Sep 2021 13:21:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:56362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237170AbhI0RRy (ORCPT ); Mon, 27 Sep 2021 13:17:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EA0F26139D; Mon, 27 Sep 2021 17:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762731; bh=9QA+X0F6UwdUy5WYqhUxyWvqZLL76OoYjh5K0cD0d1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=osd250ngvkGsThhDVh7gcQbFdGdlL7PbhDKUCHzD2pBe2e+gGeHW+BhfrUpSXL/mr iUGMmgSAfdv5JzVs47kTQlNtXmDuOeodv/PSyd3/H1TAWrfECHSSTAaSUIOan9q268 facovntqW7mO6wvhEUwkPEl+6XNvyldF9h18TeHU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET Subject: [PATCH 5.14 031/162] misc: genwqe: Fixes DMA mask setting Date: Mon, 27 Sep 2021 19:01:17 +0200 Message-Id: <20210927170234.555086902@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170233.453060397@linuxfoundation.org> References: <20210927170233.453060397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe JAILLET commit 8d753db5c227d1f403c4bc9cae4ae02c862413cd upstream. Commit 505b08777d78 ("misc: genwqe: Use dma_set_mask_and_coherent to simplify code") changed the logic in the code. Instead of a ||, a && should have been used to keep the code the same. Fixes: 505b08777d78 ("misc: genwqe: Use dma_set_mask_and_coherent to simplify code") Cc: stable Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/be49835baa8ba6daba5813b399edf6300f7fdbda.1631130862.git.christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman --- drivers/misc/genwqe/card_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/misc/genwqe/card_base.c +++ b/drivers/misc/genwqe/card_base.c @@ -1090,7 +1090,7 @@ static int genwqe_pci_setup(struct genwq /* check for 64-bit DMA address supported (DAC) */ /* check for 32-bit DMA address supported (SAC) */ - if (dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(64)) || + if (dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(64)) && dma_set_mask_and_coherent(&pci_dev->dev, DMA_BIT_MASK(32))) { dev_err(&pci_dev->dev, "err: neither DMA32 nor DMA64 supported\n");