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,USER_AGENT_GIT autolearn=unavailable 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 D0D32C2D0DB for ; Fri, 24 Jan 2020 11:14:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B96E20708 for ; Fri, 24 Jan 2020 11:14:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864456; bh=JSYqf9UNdV7udgc9jrlSqdeo2E25WTgSVlEeMfRl1qI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gPH0h/bjGAQ+MHt8tiOeZ4QdeGTr8W9E0ZQKRsuLriXYJcBWJW0dNNfyGylXeMh7H +I79Xh/6PZbubVeLobS0+MmaTXghTos6yPTZEdKuD4hH/2KNowV5AYgsSJ8LrCOBF/ MysZYvawKzk4RzUUIJu/uZJStEgamoQr4diuq3X0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390118AbgAXLOP (ORCPT ); Fri, 24 Jan 2020 06:14:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:50592 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389526AbgAXLOM (ORCPT ); Fri, 24 Jan 2020 06:14:12 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 F202E20708; Fri, 24 Jan 2020 11:14:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864451; bh=JSYqf9UNdV7udgc9jrlSqdeo2E25WTgSVlEeMfRl1qI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ScT2KxNg5O/D7RbwR1bx1UMbLGe26rEc0jfn1gL3uXipkF1MjW2hHqlbo0YWS/6v3 U9urtDRqG2Udrk8v45E/Smw81hUAo0uU/+yz8miAF1ukAZO7AqCshicKbuxRuDUMGx WSsT914YmflHtgVCn28+dIYAhhWXfGNu+dMR8ESA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dirk van der Merwe , Jakub Kicinski , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 256/639] nfp: fix simple vNIC mailbox length Date: Fri, 24 Jan 2020 10:27:06 +0100 Message-Id: <20200124093118.771044665@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: Dirk van der Merwe [ Upstream commit eaab2d2d0fe4393b040dbf3922e18cd2ab7d6b85 ] The simple vNIC mailbox length should be 12 decimal and not 0x12. Using a decimal also makes it clear this is a length value and not another field within the simple mailbox defines. Found by code inspection, there are no known firmware configurations where this would cause issues. Fixes: 527d7d1b9949 ("nfp: read mailbox address from TLV caps") Signed-off-by: Dirk van der Merwe Reviewed-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h index 44d3ea75d043a..ab602a79b084d 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h @@ -423,7 +423,7 @@ #define NFP_NET_CFG_MBOX_SIMPLE_CMD 0x0 #define NFP_NET_CFG_MBOX_SIMPLE_RET 0x4 #define NFP_NET_CFG_MBOX_SIMPLE_VAL 0x8 -#define NFP_NET_CFG_MBOX_SIMPLE_LEN 0x12 +#define NFP_NET_CFG_MBOX_SIMPLE_LEN 12 #define NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_ADD 1 #define NFP_NET_CFG_MBOX_CMD_CTAG_FILTER_KILL 2 -- 2.20.1