From patchwork Fri Oct 21 14:07:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 685130 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3t0nZ66bzlz9t0J for ; Sat, 22 Oct 2016 01:07:42 +1100 (AEDT) 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=dwGDk/U5; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933000AbcJUOHk (ORCPT ); Fri, 21 Oct 2016 10:07:40 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33269 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755755AbcJUOHf (ORCPT ); Fri, 21 Oct 2016 10:07:35 -0400 Received: by mail-lf0-f68.google.com with SMTP id l131so5840014lfl.0 for ; Fri, 21 Oct 2016 07:07:34 -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=WFU14PG+aOe+ecB7dfd627d6FBBKPA2hPInXqofzxFo=; b=dwGDk/U5ItPjTWjUaYP9iu77DRJl2Lu8kQXHS0FCYqFE1gdHppL9dmgkPAHXaV73Ei M2x+4fDaEN4R87vtDRwUKK4T6gsGpn+SmaAKdmOe3qoBdWJCh4b0Xr43TllVw4EJ/1pI a5NWXyRTYrbUTwd6o+y6HcQEddxBIGoBg5Mvg+VCZF2ZJwbwk/O3Tu7SXC082aHudP6S 5R+ev660VhjcSXI3Oo7ZMZy5HVcJRlKXV8UU+neXFpUU7s43NHLchRru8YftwReBtCmF zlnejG+B1yICsdlC1vyaKo7/iIY6+lthlKkAeGIiIJ60fPDD9ejTEPbDHX6CD+eomJAF RGTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WFU14PG+aOe+ecB7dfd627d6FBBKPA2hPInXqofzxFo=; b=SpIrcV1EwiBwfZPqUxmvQuw8UrNRVQxWrHbU3UsoKxjBuOKxLIFuxR/v81XR/nGcN0 p+pE0q+QCBe+1LZlQxbiqEodqWzAhALI1AYU7NzdMjENZOOwcsVxRzAa5s5hugRqxhKM NkXq8m5kTpfSwAz3leoT3v+EMNGKbPfVFAwyuc9ZC11/4S2BruCp86TLGXikAIcRkpYS 6o97uzWM8wvOSgognaH0uVZCefzFKJ9MEHyrBdeeCgBbNkHqw0v4u/PLESqq7VSOErbT UJrbTHOYCwHzVRdcDO5FPl3P48M/MQplbupNV35nuKQnaHSHOP1Supx8PYL9VIksHfg/ b+9Q== X-Gm-Message-State: ABUngveP88m6stvm6Tvu8z1A1UEGjMv0yyYe9B8y9hbAhbBR3F+6NxvlYaI4qyso2AxACg== X-Received: by 10.194.82.163 with SMTP id j3mr957446wjy.56.1477058853565; Fri, 21 Oct 2016 07:07:33 -0700 (PDT) Received: from localhost ([84.16.102.21]) by smtp.gmail.com with ESMTPSA id k74sm4339397wmd.18.2016.10.21.07.07.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Oct 2016 07:07:33 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, eladr@mellanox.com, yotamg@mellanox.com, nogahf@mellanox.com, ogerlitz@mellanox.com Subject: [patch net-next 5/6] mlxsw: cmd: Push resource query defines to cmd.h Date: Fri, 21 Oct 2016 16:07:22 +0200 Message-Id: <1477058843-9981-6-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1477058843-9981-1-git-send-email-jiri@resnulli.us> References: <1477058843-9981-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Push cmd resource query related defines to cmd.h where they belong. Signed-off-by: Jiri Pirko Reviewed-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/cmd.h | 5 +++++ drivers/net/ethernet/mellanox/mlxsw/pci.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/cmd.h b/drivers/net/ethernet/mellanox/mlxsw/cmd.h index 28271be..56e19b0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/cmd.h +++ b/drivers/net/ethernet/mellanox/mlxsw/cmd.h @@ -513,6 +513,11 @@ static inline int mlxsw_cmd_unmap_fa(struct mlxsw_core *mlxsw_core) * are no more sources in the table, will return resource id 0xFFF to indicate * it. */ + +#define MLXSW_CMD_QUERY_RESOURCES_TABLE_END_ID 0xffff +#define MLXSW_CMD_QUERY_RESOURCES_MAX_QUERIES 100 +#define MLXSW_CMD_QUERY_RESOURCES_PER_QUERY 32 + static inline int mlxsw_cmd_query_resources(struct mlxsw_core *mlxsw_core, char *out_mbox, int index) { diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 6f36806..c3b1663 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -1155,7 +1155,6 @@ mlxsw_pci_config_profile_swid_config(struct mlxsw_pci *mlxsw_pci, mlxsw_cmd_mbox_config_profile_swid_config_mask_set(mbox, index, mask); } -#define MLXSW_RESOURCES_TABLE_END_ID 0xffff #define MLXSW_MAX_SPAN_ID 0x2420 #define MLXSW_MAX_LAG_ID 0x2520 #define MLXSW_MAX_PORTS_IN_LAG_ID 0x2521 @@ -1167,8 +1166,6 @@ mlxsw_pci_config_profile_swid_config(struct mlxsw_pci *mlxsw_pci, #define MLXSW_MAX_VLAN_GROUPS_ID 0x2906 #define MLXSW_MAX_REGIONS_ID 0x2901 #define MLXSW_MAX_RIF_ID 0x2C02 -#define MLXSW_RESOURCES_QUERY_MAX_QUERIES 100 -#define MLXSW_RESOURCES_PER_QUERY 32 static void mlxsw_pci_resources_query_parse(int id, u64 val, struct mlxsw_resources *resources) @@ -1238,16 +1235,17 @@ static int mlxsw_pci_resources_query(struct mlxsw_pci *mlxsw_pci, char *mbox, mlxsw_cmd_mbox_zero(mbox); - for (index = 0; index < MLXSW_RESOURCES_QUERY_MAX_QUERIES; index++) { + for (index = 0; index < MLXSW_CMD_QUERY_RESOURCES_MAX_QUERIES; + index++) { err = mlxsw_cmd_query_resources(mlxsw_pci->core, mbox, index); if (err) return err; - for (i = 0; i < MLXSW_RESOURCES_PER_QUERY; i++) { + for (i = 0; i < MLXSW_CMD_QUERY_RESOURCES_PER_QUERY; i++) { id = mlxsw_cmd_mbox_query_resource_id_get(mbox, i); data = mlxsw_cmd_mbox_query_resource_data_get(mbox, i); - if (id == MLXSW_RESOURCES_TABLE_END_ID) + if (id == MLXSW_CMD_QUERY_RESOURCES_TABLE_END_ID) return 0; mlxsw_pci_resources_query_parse(id, data, resources);