From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D5E9C3A5A3 for ; Tue, 27 Aug 2019 07:54:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12A9D20828 for ; Tue, 27 Aug 2019 07:54:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892445; bh=iIPdtioa6VJqh1JiZmHvzr5AJKPyqSAxW9VvwPEVqYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CYJ0UUhvCjX4Jx7Inc6HleJmclnFW6OgiiX+bhfgIfVP7f9ZYfd7UWgX1il8l8JK/ u8Nht7MVFfQtUaZRNP5+++1ueZu0MB4iqA0C57jozrjdIpGqA9A4QO8tF6Ki6YYMTb PNSW8nHSAiWQsJqxC4DAg1QgX/ELxuTTLDZwsdlE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729966AbfH0HyE (ORCPT ); Tue, 27 Aug 2019 03:54:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:45566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729361AbfH0Hx7 (ORCPT ); Tue, 27 Aug 2019 03:53:59 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 1EF3D206BF; Tue, 27 Aug 2019 07:53:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892438; bh=iIPdtioa6VJqh1JiZmHvzr5AJKPyqSAxW9VvwPEVqYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ee5xcfIOGfUVtm8CssPtjJ46n4ihz3j6+sWuDJRrLFsTnenqyO25C78PfM+3cig4f uKXbhqBYQZsh5ex0luZCjlJQdjbGVZjSJZtNHQuilu5ompWx7q7g1d3NAE5TwdqJ+C 0LBQOZQjWJNx2NtSDwtEck1rU2fkBfeSLSZGjbOA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Kalderon , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 13/62] qed: RDMA - Fix the hw_ver returned in device attributes Date: Tue, 27 Aug 2019 09:50:18 +0200 Message-Id: <20190827072701.144567158@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072659.803647352@linuxfoundation.org> References: <20190827072659.803647352@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 [ Upstream commit 81af04b432fdfabcdbd2c06be2ee647e3ca41a22 ] The hw_ver field was initialized to zero. Return the chip revision. This is relevant for rdma driver. Signed-off-by: Michal Kalderon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_rdma.c b/drivers/net/ethernet/qlogic/qed/qed_rdma.c index 1e13dea66989e..c9258aabca2d4 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c +++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c @@ -398,7 +398,7 @@ static void qed_rdma_init_devinfo(struct qed_hwfn *p_hwfn, /* Vendor specific information */ dev->vendor_id = cdev->vendor_id; dev->vendor_part_id = cdev->device_id; - dev->hw_ver = 0; + dev->hw_ver = cdev->chip_rev; dev->fw_ver = (FW_MAJOR_VERSION << 24) | (FW_MINOR_VERSION << 16) | (FW_REVISION_VERSION << 8) | (FW_ENGINEERING_VERSION); -- 2.20.1