From patchwork Fri Feb 23 13:15:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 129363 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp593652lja; Fri, 23 Feb 2018 05:16:04 -0800 (PST) X-Google-Smtp-Source: AH8x226KMVDCvZPeSvqhuoOpFtR12R7hY4baT2CjUgX7XxlpaRd7cYOTAjU0DBVafStdDttp44yx X-Received: by 10.101.70.133 with SMTP id h5mr1476907pgr.166.1519391764452; Fri, 23 Feb 2018 05:16:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519391764; cv=none; d=google.com; s=arc-20160816; b=Ozv++w6PndxxS+e1WoWOxe3w7EKdCtdgMUT3WiNSHhiNr/B1NEDkuYQmh4iSCqYsn9 G7EfAb2a+XPWIYUjTJN7o4c/zItEfA+uVdmtl0qxaObbekIXpqdwp9ARxMICxzUyvJbd cUV1oxjvP18Efy8JZQF4N2XEy21SzPmH1LKYVzB3shvMxKldWFoVSMg+1NKu7aQLZmhq UpAJ3Ck2tTgkuxyBkB9Gvhs2dajDcj3W5+4LZdUCErTgA3ryJqFTuyYqsKjgZwUU4oGS U1owGgXnpwOClBadeeO6hDMKGxy+ec2rURZmZ19kSuqiT9B13ENXEChggN0Wr9Jr79/4 BlhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=dxavHwBB87447awt/2jIUq+OI+lcAZeFn9xzyT8O8Tw=; b=thRJiMmir8RRo9N4Blweb+ggBZp/+/61RhIpETGynUuTqMPobusAqltEA315PuDalR z7bHhr9nVpUqon1tWTUL6RkuDf6u3aeuQqKvG/qyG3GGOaXNY6V0JsU4fu2ixTBA6Aya Y0E02YM4KqXqSkHo+1dlQniGy+ofYORjkEjClCu1U9fjLVjWjKSLx5BNL9jyvJ7lni56 m+dLqKxZ3zET/whAw/M9KaDpXnDK/vBnkf+o/bV0v+NRF9c44Tl9TtQ2RhzUYEi+g7aT iJtOfd+rONv/EIvcBg17JIlM+7ugtqAAa1Wdi2hEgciYfukmkopcZ6LuBDPLUse4EYh3 Oy1Q== ARC-Authentication-Results: i=1; mx.google.com; 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 b89-v6si1769221plb.809.2018.02.23.05.16.04; Fri, 23 Feb 2018 05:16:04 -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; 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 S1751597AbeBWNQA (ORCPT + 28 others); Fri, 23 Feb 2018 08:16:00 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:35797 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751351AbeBWNP6 (ORCPT ); Fri, 23 Feb 2018 08:15:58 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0LeQDB-1eO9dC3NUr-00q8Zd; Fri, 23 Feb 2018 14:15:43 +0100 From: Arnd Bergmann To: Arkadi Sharshevsky , Jiri Pirko , Ido Schimmel Cc: Arnd Bergmann , "David S. Miller" , Wei Yongjun , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next PATCH 1/2] mlxsw: spectrum_kvdl: use div_u64() for 64-bit division Date: Fri, 23 Feb 2018 14:15:31 +0100 Message-Id: <20180223131540.1065413-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:oQgd2ylLPcq/v1LKdIP9kk2CkWxRUpxc0Y2CL9ZKRRNDkcFwZJ7 3bzxmI/3M13FjdJ+yE++nmRZD4lP5LYM2HkW9tFlhEwCe49n8zrDEL9IId9YgdfysHhqwX2 2Xya5WwY+A0gs16h0maZ6U8AftDPQTy/sdD+MNjaNGLitnD2c+5RHIOaeYkTFxQlM9toGAm 6npCfMeHYdpyCFkHI0FXg== X-UI-Out-Filterresults: notjunk:1; V01:K0:lMfKzRS7n5I=:3Ea98XO4r5qotC3VoaSrfg wbncFagmKnK8cmgjMmg4F+LxYe0KsUXh0ycwDqUhRxt9cGxQTw2iv8u5wA424q+jBMveWabca 2/U2zufssuMRP0mma7gDNTGJYb1W7Cmo1NdAMGyKdJIeE9qTo6HqlmM/mUfGBJyxd2LXCL2nu z7iducm79AmFmIW6wRUYRubGhWLDlk+pVIZm/TkzjbfBXcnPny7q4nTZpBH7tdIiaq0Dkle4b kbEU4TtH8fNsrpytsNVZHij/9GbS4rhTRN39KEiXW7vWJJv2uXXkp8mXjpgbVZvYWUUUUWMgb P82JaPT9W/MxJCilyggEXfgH2sQTnEEOcCnLo0rVXATrJd9YRtNjqg6SkDoY+vKJ7Bkn4xhYI PnVPJ5pGSOfJyrAuPNu0/L2uVwZvpeDMeYGU0716hRU7hiqmJQq2NFLoNAp4g6EzUDm1n0DDQ WenxbQER72aNWpRQ8VUHscDMfBJURYAF9AWHxAFlhNhxdYjslQ3wgD2kSHqPuqZvxoXXTF+p8 zG5xM8BRwXyETXiDQpsZ9GJVwsh1q/STZ1taayMjjLv1j3ogja+R0SSJlyuRPoZb1J2tK6LmY /Er6ZBFOng/TvJgBp8zrZDHQMEw08ZHR/0rPtprd2Rl65XwGOQf6FHvMUUEk52k3Y3BJEzLZ+ Mco0s9BvNeM2nYp2aWXQlm+wh7bpl72ZnOZHBRbVmUTY2Sot3WB9iYuo8v8ZQ5BgX0tmu/2Ou rArcInFvHf6fFU9quBGaEjj3/XT4T6hk8EoGKw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calculating the number of entries now uses 64-bit arithmetic that causes a link error on 32-bit architectures: drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.o: In function `mlxsw_sp_kvdl_init': spectrum_kvdl.c:(.text+0x51c): undefined reference to `__aeabi_uldivmod' We could probably use a 32-bit division here as before, but since this is not in a performance critical path, div_u64() seems cleaner here. Fixes: 887839e6960d ("mlxsw: spectrum_kvdl: Add support for dynamic partition set") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 Acked-by: Arkadi Sharshevsky diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c index d27fa57ad3c3..6fd701db90c9 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c @@ -278,7 +278,7 @@ static int mlxsw_sp_kvdl_part_init(struct mlxsw_sp *mlxsw_sp, resource_size = info->end_index - info->start_index + 1; } - nr_entries = resource_size / info->alloc_size; + nr_entries = div_u64(resource_size, info->alloc_size); usage_size = BITS_TO_LONGS(nr_entries) * sizeof(unsigned long); part = kzalloc(sizeof(*part) + usage_size, GFP_KERNEL); if (!part) From patchwork Fri Feb 23 13:15:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 129364 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp593681lja; Fri, 23 Feb 2018 05:16:06 -0800 (PST) X-Google-Smtp-Source: AH8x227Acq0SrGct90rc4pJ1IVG7ngp/7lyZo1/5GioA4FmJviOLUqPiBRxlFWbQfxmF6S1B2EYo X-Received: by 10.99.121.131 with SMTP id u125mr1437534pgc.263.1519391766076; Fri, 23 Feb 2018 05:16:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519391766; cv=none; d=google.com; s=arc-20160816; b=szsl3j7vo8rK8CVhcLZf5EBtywoLfpxqoNkUclap8drk/ox4KEpr3vO+PwMi4R6G34 sMnV+1u7s8hWjxoPg0Waz1YmRZGn+ND9BvParYne4qyuNEMIZoJAXq97ICZKudGWokVE /dPXjncKhrz/0NGzYVk9c5nPlGW6k3BBpsILU1EhkIyABYfKT3bSCQ1NlOvr0szQResi kw0owEDqtIXF8dWhODMIVAE3gu4m0IT/+iW6ww0snOUEmpmu4GWHStD+82S973UgIrx5 5cUAL/7BxdOdb/Joxzu4kT3K+BHPvt8ETPIAl/2twJOaW0rsYn8tmuf+rIsbq7W2nz+Y Jbjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=vl6llu6EW9mWUC/3NU3ff0Wf5kWvURRuXmaK0eQqW7M=; b=JTqaUy3smic1YEnr6eDNzF3CYt1chIIwYfGHv5xJpkHmHDlwWQfkKs2qQ+rea8THbF gS5mJrvPlevkAtqE1hCriMZmdpeJr+eZUWxk/A2y5QIzBa0bc6wH4zXPezDAsJKOv8fK T9HGJTz2XVI5g8nj974laPy2h0t88cvFfPnN6AUBrW2S0DXgsatcrxqC3TPHJDtikjdo RduzCex0R+jAavox7uTSmT2FIn4vua3FKNXAOx6m+go2rzvdkQ3ck7QC4nl7SmwBtJ7K 2abyGVK5lq3yz5l/P9JGN6UIOUvgI9+D8e8SHImAvyDkk4Ljl/0M9fT36OGs3FnZmnE4 cN2A== ARC-Authentication-Results: i=1; mx.google.com; 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 b89-v6si1769221plb.809.2018.02.23.05.16.05; Fri, 23 Feb 2018 05:16:06 -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; 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 S1751758AbeBWNQD (ORCPT + 28 others); Fri, 23 Feb 2018 08:16:03 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:52811 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751408AbeBWNQA (ORCPT ); Fri, 23 Feb 2018 08:16:00 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MGE0B-1evYKv3Lb5-00F8rj; Fri, 23 Feb 2018 14:15:50 +0100 From: Arnd Bergmann To: Arkadi Sharshevsky , Jiri Pirko , Ido Schimmel Cc: Arnd Bergmann , "David S. Miller" , Wei Yongjun , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [net-next PATCH 2/2] mlxsw: spectrum_kvdl: avoid uninitialized variable warning Date: Fri, 23 Feb 2018 14:15:32 +0100 Message-Id: <20180223131540.1065413-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180223131540.1065413-1-arnd@arndb.de> References: <20180223131540.1065413-1-arnd@arndb.de> X-Provags-ID: V03:K0:5tE+at3L2r/OxIBtc2gUVbMk3eZuqPOmENWlSIq+RaWHUaPWjDL 7XrH3l5XdM6hWRy0uwDiv49YO3NCvD7qXit+wjf/0hYudbzfcKyEjvua94rvFIRbblfPc/8 kL12JXWxew7RX7qTwFJ0mPh5CxdZ6ffkPW6CeX8jwyJEh+tEe+rngLzThzAAPzf0z7zouUP 76AztMtD/H0axLF2sg1KA== X-UI-Out-Filterresults: notjunk:1; V01:K0:LOGF/6oN0UE=:bbpFSrnGP08TqsrgSkibes li66B1ijPwexIl6KKjTJ0xeHe7JeGW5fOncNUdHCMcQj1IZN6DlQW4yxDndCPhfOt4OT8GltO muV4V5nX8ljgE2aZJJixpkQJ/3bLX1VCWhRpOs4EUgaMH87L5emKN09amA/1EaeKW4zz+KH25 uorr6mpBk82SxgGwl6URgZdb2ZnrAinMw9FeopWCzUT2AiyhrN/roQvU/xxf5nSdk/tJZk22z RlrI7Db5Os7oe3flzrY9djQvfa47gmjiWqOYUiWNUY0ZW89WoSNz6eKd5NAmtMlbd4V+YOq0x 781qanyKEFhG3/P6tdTLOYb9POeJvc3NbFrFPD+eClwgIqomLrBd0EE4/zcX0PW6II3iEvqFj z++khdTxwgXspkL77mHamuksRMLTsKN6gAW/SeSNGbDsFZhHa1X5hYR4fqP4AJjSR1Q04r1dS xaTKYqgOlip7XOfzq0LqwviK/Pngx0AfH/lIjMGLiEuvkpQMr1a1VeokfyJolx4MDq0/cM+63 lfvp9TFHtRvzh2693QzpuWzMYI1xNuSBwRF3GQRJ+GjnCTGhWhy1fsXE46xIkGSjzE8k5KUM8 S5vLLX8J/9vjowGw5XMDgycPcEOCsIyBu39FoLgENxD6+eIzRkDPqQtRTFhbFkFAd/ct6OamT 4MWRKtCdF7CSaMCd2G40XTr039eODgaUgb3CJie+FVgajE/fyDF8JxTGvJJwTcgwHOl6sRN8i JKrQdlM4psS6AH1t8nkYVUjPbyuy0lRBB0ElxQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc warns that 'resource_id' is not initialized if we don't come though any of the three 'case' statements before: drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c: In function 'mlxsw_sp_kvdl_part_init': drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c:275:8: error: 'resource_id' may be used uninitialized in this function [-Werror=maybe-uninitialized] In the current code, that won't happen, but it's more robust to explicitly handle this by returning a failure from mlxsw_sp_kvdl_part_init. Fixes: 887839e6960d ("mlxsw: spectrum_kvdl: Add support for dynamic partition set") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 Acked-by: Arkadi Sharshevsky diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c index 6fd701db90c9..059eb3214328 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c @@ -270,6 +270,8 @@ static int mlxsw_sp_kvdl_part_init(struct mlxsw_sp *mlxsw_sp, case MLXSW_SP_KVDL_PART_LARGE_CHUNKS: resource_id = MLXSW_SP_RESOURCE_KVD_LINEAR_LARGE_CHUNKS; break; + default: + return -EINVAL; } err = devlink_resource_size_get(devlink, resource_id, &resource_size);