Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp757951ybl; Wed, 4 Dec 2019 10:21:14 -0800 (PST) X-Google-Smtp-Source: APXvYqwfM1lnmqLI10vWiqT8cTF6PYf7cXVZ3VaZ+4wPbhWttkDSRyLTBQTEpn9Og//TXRKGzYAo X-Received: by 2002:aca:4ad1:: with SMTP id x200mr3581214oia.104.1575483674344; Wed, 04 Dec 2019 10:21:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575483674; cv=none; d=google.com; s=arc-20160816; b=xDodvXhvd1pRdCcshMUx4xK65301k1/LG1dFVdqTwDZh1mNnllDSUg3/UPYnQT1Iau rQJZXmZenG/fJ7Z9xwYddE+OMVxE+gBPEsfU81LgTuWtehCe8huDQ6iiHK16YGetzyp9 qyrUBuDlpj2VNB3Vqmf7aHG8QRyTkHz0kPwemvVPkwGxvwngf/c1pKYb7ElcwccbPClE REL2MIfKFLq5fs+jvpCs8m0ZTxn6GrGWUblFx/uXd51gq9GkAzahomQJ4mQYaczHcin5 mBH8t+234qz1tvdhSS0LcoDuig+zGuAR1bvdcvPZ1q4y/PnpOHeh3X3OkWtlpJ4oUzbX XUhA== 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=ZKwnuv65Zpr1bB+WduGimGpVA5yUec19sI9eyDiVCYs=; b=b50nKL5M3SEGzNYEQYlUlrwq4sBmeZba73m3NUXVXuMrmEP31x+FY4WKc4D6HNEyvf VxwqFpmdxJDfSBSF5I8rkNJtTAT9qU6x14jp+gPLEDxA/EdvhgZEZRnTIOPPYSYYc2uX r0FMVyRxdLZIRvWpJBg6VcKU5MwiX5tp5bwcbwtGoYGs8KTVWWUxUipCCx+lJge2K9qs WjTYnRglpgrD8xICZGYHuOGxdIqgF6irsVn3YWfDs6cIEzBD602lQcUN2HYxfmZ8eGNW P7RQN6M9Uv9GWZa5Mrzt1tb7LiIjlUGH82JIlDjZObkp07bCdBQz1J1Fqsaixqq5VDBt zkjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=B5Q7La79; 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 185si3642077oii.256.2019.12.04.10.21.01; Wed, 04 Dec 2019 10:21:14 -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=B5Q7La79; 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 S1730325AbfLDSI5 (ORCPT + 99 others); Wed, 4 Dec 2019 13:08:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:33228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730620AbfLDSIq (ORCPT ); Wed, 4 Dec 2019 13:08:46 -0500 Received: from localhost (unknown [217.68.49.72]) (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 301D720674; Wed, 4 Dec 2019 18:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482925; bh=fartVLOhnNSRIT/tr81MwxpOnOPAeQcYz5Tr9R0c+A4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B5Q7La798DdQPXutOpAupg2iXV7qyyAtar5WCuTf9QzNthm7pQty40190Ja06Is5Y I/lNNEGVC+pMwNTD2hXu40W+HaPHHpW5Nu9o44/fNfs9ekwQ/H6sjts97SV0bewXCC WtNqcH0G3AO3fW8EVBWWw8IntvvYpik0AeYxQCHI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yunsheng Lin , Peng Li , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 146/209] net: hns3: Change fw error code NOT_EXEC to NOT_SUPPORTED Date: Wed, 4 Dec 2019 18:55:58 +0100 Message-Id: <20191204175333.578192217@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@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: Yunsheng Lin [ Upstream commit 4a402f47cfce904051cd8b31bef4fe2910d9dce9 ] According to firmware error code definition, the error code of 2 means NOT_SUPPORTED, this patch changes it to NOT_SUPPORTED. Signed-off-by: Yunsheng Lin Signed-off-by: Peng Li Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 2 ++ drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c index 8b511e6e0ce9d..396ea0db71023 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c @@ -251,6 +251,8 @@ int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num) if ((enum hclge_cmd_return_status)desc_ret == HCLGE_CMD_EXEC_SUCCESS) retval = 0; + else if (desc_ret == HCLGE_CMD_NOT_SUPPORTED) + retval = -EOPNOTSUPP; else retval = -EIO; hw->cmq.last_status = (enum hclge_cmd_status)desc_ret; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h index 758cf39481312..3823ae6303ad6 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h @@ -52,7 +52,7 @@ struct hclge_cmq_ring { enum hclge_cmd_return_status { HCLGE_CMD_EXEC_SUCCESS = 0, HCLGE_CMD_NO_AUTH = 1, - HCLGE_CMD_NOT_EXEC = 2, + HCLGE_CMD_NOT_SUPPORTED = 2, HCLGE_CMD_QUEUE_FULL = 3, }; -- 2.20.1