From patchwork Sat Sep 2 15:21:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 809096 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="xwiQuyNp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xl0H749dVz9sRY for ; Sun, 3 Sep 2017 01:22:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752837AbdIBPWx (ORCPT ); Sat, 2 Sep 2017 11:22:53 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:37351 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752660AbdIBPVj (ORCPT ); Sat, 2 Sep 2017 11:21:39 -0400 Received: by mail-wr0-f195.google.com with SMTP id y15so852255wrc.4 for ; Sat, 02 Sep 2017 08:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0AQoveP55S/NwRLoUTDk31U6EymBMKbbx7uDXhapXck=; b=xwiQuyNpcT79Tc5BWPu1iu9AJao1dtZkAkJEtKD4Y5kWvHsKS2LIQIF+F0j7Wu1qqo JT53jOSo1Hg90RNXqVPdSGprvWENFhSfgtyXylp7v0KG205ARfG1qT0ZzKryN0j5w+KZ VcQzWFi75NsJVARPVHCurB/E4qqEtECf4kvXMmGSF5n2xtvjpvGNtTTFW8zS+pjM7dCx DIy58w3alDri5sGHpXss3ImrdD/OnwlYYsCOopLngIw5W0ZRxNifj1+toFY7++ngXfAl LVe3m6ARySh+2yAYHuBrE5YFs4bNJdX/j37iN8taEZgc3Fo2icUgSktl6amZU9O1XKMo Ixqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0AQoveP55S/NwRLoUTDk31U6EymBMKbbx7uDXhapXck=; b=jm+6SPsjmYa5/p42IUGzoSdVlXb4gwKpFn7kgGPgPAcVmgQAPC42OQn1+PLdADOEig rcUWo/XZMKT/1Hj8yr7AJQccgz03iSJgwNPY3zsugkcLE2/dnfJdmzdlb64v7bfbuPqe isxH6m+Ba1u6WTkqorTdQl9saM1YBwCPH9a/BLldMaE4sZo8SWqR2mSBd6+lm2AwUlYG q8Elge4N1JPU40VwkrAlJ1nQzFEbW675gny5GlzOxZhoCAmHXMarmrQaSBepRlgSDL1q 8umF01ms1Pg1vxw00g5GimH7PfQT1PKsa0u9lktsZra5BoDMTYw5q/4HraXbyllsue+J jh9A== X-Gm-Message-State: AHPjjUh3b0seU1XsOrUxwj9MnXjF7F0dsqduD7yx9k0ghOudBO7AnYpF YQ5CoXch4tcd3WJBd3o= X-Google-Smtp-Source: ADKCNb7kHDEYJ/P5gJrfHU5ZB0jNTlB1PA1KgQTrhXwhQDKtOvCSOZbnU9Z4/JjHXaYjPE/U9vwY7A== X-Received: by 10.223.150.35 with SMTP id b32mr2923962wra.87.1504365698245; Sat, 02 Sep 2017 08:21:38 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id m16sm1882993wrg.16.2017.09.02.08.21.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Sep 2017 08:21:37 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com, mlxsw@mellanox.com Subject: [patch net-next 06/21] mlxsw: reg: Give mlxsw_reg_ratr_pack a type parameter Date: Sat, 2 Sep 2017 17:21:11 +0200 Message-Id: <20170902152126.17286-7-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170902152126.17286-1-jiri@resnulli.us> References: <20170902152126.17286-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata To support IPIP, the driver needs to be able to construct an IPIP adjacency. Change mlxsw_reg_ratr_pack to take an adjacency type as an argument. Adjust the one existing caller. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 ++ drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h index 27a378d..680bc7e 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h @@ -4482,11 +4482,13 @@ MLXSW_ITEM32(reg, ratr, ipip_ipv6_ptr, 0x1C, 0, 24); static inline void mlxsw_reg_ratr_pack(char *payload, enum mlxsw_reg_ratr_op op, bool valid, + enum mlxsw_reg_ratr_type type, u32 adjacency_index, u16 egress_rif) { MLXSW_REG_ZERO(ratr, payload); mlxsw_reg_ratr_op_set(payload, op); mlxsw_reg_ratr_v_set(payload, valid); + mlxsw_reg_ratr_type_set(payload, type); mlxsw_reg_ratr_adjacency_index_low_set(payload, adjacency_index); mlxsw_reg_ratr_adjacency_index_high_set(payload, adjacency_index >> 16); mlxsw_reg_ratr_egress_router_interface_set(payload, egress_rif); diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 3ddfbe3..4e47d45 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -1928,7 +1928,8 @@ static int mlxsw_sp_nexthop_mac_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index, char ratr_pl[MLXSW_REG_RATR_LEN]; mlxsw_reg_ratr_pack(ratr_pl, MLXSW_REG_RATR_OP_WRITE_WRITE_ENTRY, - true, adj_index, neigh_entry->rif); + true, MLXSW_REG_RATR_TYPE_ETHERNET, + adj_index, neigh_entry->rif); mlxsw_reg_ratr_eth_entry_pack(ratr_pl, neigh_entry->ha); return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ratr), ratr_pl); }