From patchwork Mon Dec 28 12:48:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352751 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp10027181ejs; Mon, 28 Dec 2020 08:26:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJzEX0+dXCdauGihC5G63fg6vNqzxdNzQcnEl+Pb2aNaYqTeNsvU5kevjFfs6JRJtJK4igzO X-Received: by 2002:a17:906:5002:: with SMTP id s2mr40981438ejj.16.1609172810048; Mon, 28 Dec 2020 08:26:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609172810; cv=none; d=google.com; s=arc-20160816; b=w85XruTPw3D4AKSFrQF8Qt8pyyC+Oh7zTWXEDh7qIebEGOUMwWPS9c7AZqSt4Nu8Q3 zarmtl/cxdLSWtSbbKVjAELkMbMw3hP179QJjKlnDozcHutSn92Hzf4FSCFwjVfPTrxg kD/tSYTM7qec0nGppX1SvPRcBOD8iwBTp1zMkbYD2o7dbBw4VheK2yolstPVMRFdyjL0 zmPkAjApaJ5W1AxOPw8RchgGYCGP1bjyW8/QmvHjgJxbHm88s1nvAEVxeir3azFdoE+R fYuE/Pgi9ZgfbCRCiKGgAP4N4ZqF6afKsr7mgqHu4GMxD1U/cOGJp2p1+DiyNUUnxfbS /eFA== 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=8we534FWsUN5eWH5Dakprv99cg63MCRSYuW+SO9fMdo=; b=tgtRSvBlsbc0FKrhkHuYeWn47XJpoScvM9kDWy0i5WADZ9T9Zw0UoKEkr4lAUEDh/c WWyP0XK2e2/1b+ZF5t/6m7T8eRkLfEblBfZhPbMO87l8E1GS7RGmou5Xmb9Qdhl8hNGQ 85uQ07q03xbHpwdei/3CXtmIB33AnfHNuqeWSy1Aqu7cScrkiu2sQ5RnIcebQ+taCM+R hV8CkYGsnEliKRSExQUujXmwx2rcHThj9SdkgX4Tl0/XyzLFCc2T9sQgeC7MF8mHgX/4 8clFT33EmAiHhdKjThzC1uCmA7niAxKNMMasg4M4UMOriixI/D83a9imvvo3v3G8jeGq lOAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Ksb/cA71"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 by4si18948613ejc.732.2020.12.28.08.26.49; Mon, 28 Dec 2020 08:26:50 -0800 (PST) Received-SPF: pass (google.com: domain of stable-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="Ksb/cA71"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S1731845AbgL1NLt (ORCPT + 14 others); Mon, 28 Dec 2020 08:11:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:39688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731852AbgL1NLs (ORCPT ); Mon, 28 Dec 2020 08:11:48 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C389322AAD; Mon, 28 Dec 2020 13:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609161067; bh=hyiAsy6c7eBpZHIvv+FZ5sk0u/tMYGT42n1KA2RuZMk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ksb/cA71mMOBcXqcyJPI+WtvWCq4KaxcPtw+9qt22shzVkKJZj8mGpQmPmtM7LVSz 2FjhLImWp/5k/w2matbnI9VXnwrrjO1fLA/YjK67xiFB4kfjn+N987i8Vww9AaEvqm +j6iGbkdl9slUmoeyiiX5lJLJvqS7LoJNcPDtv/I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.14 090/242] RDMa/mthca: Work around -Wenum-conversion warning Date: Mon, 28 Dec 2020 13:48:15 +0100 Message-Id: <20201228124909.128272773@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124904.654293249@linuxfoundation.org> References: <20201228124904.654293249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit fbb7dc5db6dee553b5a07c27e86364a5223e244c ] gcc points out a suspicious mixing of enum types in a function that converts from MTHCA_OPCODE_* values to IB_WC_* values: drivers/infiniband/hw/mthca/mthca_cq.c: In function 'mthca_poll_one': drivers/infiniband/hw/mthca/mthca_cq.c:607:21: warning: implicit conversion from 'enum ' to 'enum ib_wc_opcode' [-Wenum-conversion] 607 | entry->opcode = MTHCA_OPCODE_INVALID; Nothing seems to ever check for MTHCA_OPCODE_INVALID again, no idea if this is meaningful, but it seems harmless as it deals with an invalid input. Remove MTHCA_OPCODE_INVALID and set the ib_wc_opcode to 0xFF, which is still bogus, but at least doesn't make compiler warnings. Fixes: 2a4443a69934 ("[PATCH] IB/mthca: fill in opcode field for send completions") Link: https://lore.kernel.org/r/20201026211311.3887003-1-arnd@kernel.org Signed-off-by: Arnd Bergmann Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- drivers/infiniband/hw/mthca/mthca_dev.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.27.0 diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c index a5694dec3f2ee..098653b8157ed 100644 --- a/drivers/infiniband/hw/mthca/mthca_cq.c +++ b/drivers/infiniband/hw/mthca/mthca_cq.c @@ -609,7 +609,7 @@ static inline int mthca_poll_one(struct mthca_dev *dev, entry->byte_len = MTHCA_ATOMIC_BYTE_LEN; break; default: - entry->opcode = MTHCA_OPCODE_INVALID; + entry->opcode = 0xFF; break; } } else { diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h index 5508afbf1c677..b487e1339c7fb 100644 --- a/drivers/infiniband/hw/mthca/mthca_dev.h +++ b/drivers/infiniband/hw/mthca/mthca_dev.h @@ -105,7 +105,6 @@ enum { MTHCA_OPCODE_ATOMIC_CS = 0x11, MTHCA_OPCODE_ATOMIC_FA = 0x12, MTHCA_OPCODE_BIND_MW = 0x18, - MTHCA_OPCODE_INVALID = 0xff }; enum {