From patchwork Thu Aug 3 22:10:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 797500 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 (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="UA46c0iA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xNkl564Sqz9s76 for ; Fri, 4 Aug 2017 08:10:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752076AbdHCWKX (ORCPT ); Thu, 3 Aug 2017 18:10:23 -0400 Received: from mail-by2nam01on0042.outbound.protection.outlook.com ([104.47.34.42]:10464 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751891AbdHCWKW (ORCPT ); Thu, 3 Aug 2017 18:10:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1hjwvTde+zE6zICfNFyM54XijgOGWeGWsXqANamhssI=; b=UA46c0iA//lT6nk7wMf3m2POluZKVBpNeuoY4WycR7QarpE5UwyrxqCcOWsjRJQJzoVQBmdlItdxgOMf+SVHqvTjpPPF9ynTAyXK7sD2OkK3uWpeLcM1dg7+8YVKAjgE/U3SeI2Z3zAz2w4GuaIbLUVGZ6+s9R2pM5nlBG6EMwQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by CY4PR07MB3173.namprd07.prod.outlook.com (10.172.115.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1304.22; Thu, 3 Aug 2017 22:10:20 +0000 Date: Thu, 3 Aug 2017 15:10:17 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next] liquidio: moved console_bitmask module param to lio_main.c Message-ID: <20170803221017.GA2469@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CY4PR2201CA0009.namprd22.prod.outlook.com (10.171.208.147) To CY4PR07MB3173.namprd07.prod.outlook.com (10.172.115.139) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff130403-10a2-4f05-76c8-08d4dabc6e54 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR07MB3173; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3173; 3:3EQk7ELCqeRwEtwqzoj13l7ckIyBuw6plBZ+bZd3chzxP7HL1UMPj1GXufjrAjYQ1frvxCBYuyxVO62RYSXT7iU16McKcT7VWMCI3/9DJOWYAMJrJ6ceDwdKmGv6jEvBokCUuYrWn84o/pU1cr877c7nqrF/9nHG44aMiKXEv30CYpX75JPHQ666nOnMLcQVvFruc5ecKBavDqemL3NHjkWyNTcdAr0k1X7yH4oSJyO9uIsdZA55N4FN2S2l3eJG; 25:aQ8i4l4DDPvD+ECZj04jhGGccRk/xetq9Oa6nWsquheYCZkyD6nLdj0boI8o7uKSdjmkkUpxWJc2NUC+5jYzgc4Uuom/9X3NLq9kq3QYkx7tfyvm4UCwpkzPnYrYyFsDsgSLRC9786HYuaev/nSYeTqXK0zvTd1hrnwkuDufVVfijn+9bj8lF6oPuWp4hJ5i/+1Vba1UFkx02RaSEHrNTmyRlK6mXqnUeHiks8rhuGD1nvupZqRQLg0hKP8+Dj7Z9VWhknAxBdQ/F28klOJ1X62NYjA1PMTCBG6r2Kb3oAoJnSX3+7j9no6KkrBsOgvCduUtDoBEFTa9oHATvgBu4g==; 31:FXeUjslcsgw4XSmuKLP7z0Uyj3+PMBopYlbKAUcoDQM6g7RaAeXWmA6kjlFohUrT22gIlgkl6TA0sPAJRk2ZE7QWixZUKWNpBHUsnO369zPe9yuvger4CXBb70GnJG/KU94bCFzdn7s4WG9M5vjAOvqWe/MQ76fA3OEtwnDEuSevgFzYXJRloZBDIE5Th6Ml9Z/BaiZoMPi9O8BDBMmdLF4GVG5qABn9ZNFiQGMB5JA= X-MS-TrafficTypeDiagnostic: CY4PR07MB3173: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3173; 20:ZwgGk/tgCzTiUTCNWmK3vU4AwZzOVAIzA2c/VozYipvsyX5X1czZJ/FiMatZMhBjpBaVdtSHEbxLnU2vbHIrUVmiuYpaBBLyhUmo12ROykO0EeETil9fNDSivmK03JIQLBvblghOqlzQouVtRQjE2nUxe5gDi4zaUA5dKzbd4AxSCVYtBfhrxHAgon9ZDtG57i6ItHHKxTEAIkkWeeHjnvbuNyhT7Ipa8hvHlhCxnW7iE1MgjccJeq040ZomNgkRowd1KStyJ1hAwowBYIz6Rj1EFzfjnBegm5rAKZ1gMOT+JEyF0IYpNnbIlEwEd/d5M4v5wDR07g/Ux5CFtIfFjaUyc0vNI+fHgCKHhSK4lXyDF9yBvGX3y21c+cJuDCISbZdu/hiwohsTQk6pEFrUTxMYwtDEoxiAoTdXdRZXaOQYgKG1pemres8YJ2ALrzXCun8wA55W3+AUKg8NznK5ref9NrOmTy7RUDKgUM4Aoraw82AkXIJtUtSt+FAZe+1S; 4:t7JmEvIdhIqhWKG3morLYdZ7dXTgJR9yCdUPjBt2/wu8F1v3BShgLpizpPbhqggDAhGr8yYtk2/nP4manQqA1SnEQR/dAFuuAkl4T7tlvPZcwknRcy94a+WpGMIJTONdcEMl05ctBsVLHbnKCpDGHiNT7m7abVtLDIU04sb6NT/xz7oZNKYL4j7w9C+cFEQlEFSLZw30dJXrdkFB01YZoJXKKL+5v/RO79akF7fr4lYd6gSFvcAoc2OTzt1aGvTS X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6041248)(20161123560025)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3173; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3173; X-Forefront-PRVS: 03883BD916 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6069001)(6009001)(39450400003)(39840400002)(39410400002)(39400400002)(39850400002)(189002)(199003)(50466002)(5660300001)(101416001)(72206003)(575784001)(86362001)(42186005)(189998001)(33656002)(7350300001)(2361001)(2351001)(68736007)(6486002)(76506005)(25786009)(105586002)(478600001)(38730400002)(107886003)(6496005)(4326008)(53936002)(106356001)(110136004)(47776003)(66066001)(54356999)(50986999)(4001350100001)(2906002)(6666003)(97736004)(305945005)(7736002)(3846002)(81166006)(81156014)(6916009)(8676002)(23726003)(1076002)(6116002)(83506001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3173; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3173; 23:IWnklM7Cx8ZTwrfbo9suYlQwmM2fNlPkz33MYOcxd?= =?us-ascii?Q?WV00fTq280RDe8K3EF9DvimyUpEK2SHqJCd9aM8WcfAB1P92vdgk7G7Rvw4b?= =?us-ascii?Q?WtSB4cksphnp69VfafRyeu22mN3A+xGipm6rpCm2ScYiATuev2gHyjDOWoBn?= =?us-ascii?Q?0dFpzNaRmLaqT5YpOmMeJw5uIThEml9/8xho4Ye4UNdOcaZtGHJ4rXW8Biiz?= =?us-ascii?Q?BGL02cKCQwjIF7b9m+VfTxmfhxc2/lMg1JUZWiJn0LNpsrKZwmkIFOp1w55n?= =?us-ascii?Q?/TCd110Add7mvTvPqfpZ1lB0PFGiOKKtpQnAC9wu6N7UKMJGkw0DaTWb4Njk?= =?us-ascii?Q?jQs/o8QCoHnazi85uEL3UEf7cjr5QqMPgHW80uNkBMK0+cD32IRbLH3cACVz?= =?us-ascii?Q?AIPHIsIf8MEpZXIi1h5zUSdev7PgnbcNOSvdFDQcRtWljn96oFr0GZW+5EBf?= =?us-ascii?Q?BFkbF1QhEKkVA80GBRLp0ABsee7pBRMKZewi9uQ3qb99c17o6Li5Nwf1vKUV?= =?us-ascii?Q?fuObIcz8M+cKKnx7psksMdXsHt+V16TvpSWSKrllnPjGfSnSd4cjzs81UekZ?= =?us-ascii?Q?cHNr5kyZPgpSMNFt+AZGLooq+oyu0juIS3GUfdfKk+LmYpAT019D24Z04ANj?= =?us-ascii?Q?dg1C/cOkWUu+2ZvfcgJNVp9V0RvhwXjxTzviEaMXDb2WEU4Gdeu6hoQM9kMn?= =?us-ascii?Q?e56w4SFsavg2E/fA/sb0rtJ/Re4yM8o/YPyuY0/XO0pCj2e2AkNF8jX/yrQe?= =?us-ascii?Q?/3I8P7cFVnUX8iwLIXmwpth3PhNr5IU03SKIxbjlTCXPHKYEq04Tju0PvDRo?= =?us-ascii?Q?X/970AY2v2uXlWda6kj6hOraUYSslU8YDXiIh90HS1oBnAuwN8ZymD1RGEq9?= =?us-ascii?Q?K4bDSfjw6HB/DYErS/v8WVXvuljSBYZhQDUDuNxQSG/M8twlOL3onY1ckGFs?= =?us-ascii?Q?/K2p9nAKPtWS1xVpHq6XZ5PYBbZb9QG8xh7XmefYoJ/P5yHCqHaklw4qDext?= =?us-ascii?Q?LN0OE/SXPMRxMNz29+ObtnzefFYPjhkAdcxea8QjtWfIlKQWv8OvhITAT+qV?= =?us-ascii?Q?Jhm0AC4Kb4Vdwh1XxYUpOksnbeh6EfuSNKc23WCHZzf+bYsEatBJD1dAm6vo?= =?us-ascii?Q?Ru+3iU3bmEbd1Tb/OxkGjsslCE4u4WP08BqHJ74wR/CRI1je18/tClGGFp7Y?= =?us-ascii?Q?d5QbHKaawZKus3z0ZjwOuvY1FAqohYDVgB/SHvDFh0ZmTsI+2oFHPE8sQ9WD?= =?us-ascii?Q?avh9Rm1bAmEfZUJl1SMTmaGfaeXG0/3YKWzTT88ZitovgsdX9xfbvP1Ifhp1?= =?us-ascii?Q?faj3UiJF2rMwjyLS7trNpv5fUtuLSZDj2pfoq8NSVT57s+Gb35R5WchdtUfd?= =?us-ascii?Q?kUy8ez9qGvxUXvHb89JQ5ELN6c=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3173; 6:ViIt2eGOW079xzVxngusamUIHkfnl5+E4lqAokuGuXz5gQAxYxXAbbQBVHv9DJDZ2nVeMPGMtu7sU7Uwqx8UOCgCavbRkYsNDBiMQrFXs/6eSMHf7lFT6MOk6Q1Wct5jA10yZ05isuRpwsmLzyJNoYcpec1tu+X1YT1MjxTwnFSZKWGdF15P+sNgwUcg6IFgYb3UILvE8Ad6lyAOkw8efou+qq4jxHcJFruDQAr3D6u+1mtqpi1exsf5iJrjFfCoWH0N9lIi1njQx1hOHRan7SvLrTqpNHRiDcoW6IFB2lxlbXDveSCDMryUAapGX+MkaxxiXWKySURjH+c8iLLDRg==; 5:SauOpUHqG2y5/Q+1cvHpwLghZvIcBJ3ne/cKdPMC9B0QHPk7ZASVEBmCm7WB3azZiQTv7KAeyHDzb/OSHXKGSFM9CDDzqA9TwSFb41coko2Jnap5gXQCoAvAufQyZJ9EfkdBKcBJ/xnub0a9UH9X8w==; 24:x9SebKiEP5xFrzHwNmmZ+taiywkae7sEVsbf13jKXrj7UycltGZ+R7QSlh48QsoSZ7d0/The1Mys2yPacl8o8dGWKXJuWqwq96jaBsN/nq0=; 7:ttUW0klE00hbnJK27NPw4jGlLVNxN7zxbPXsMGQyuWqdXy+df4h5mxcAJwCCbaNLNvssafmYIVn+5XnHpap7MAfIAvvSFRFdZR1Cojx7HLo9fKyUoS9vnn3JY/fcQHbYMenk+Zx1qMuj1BYwtniohgmz/V0wXaURB2l/ibITRJ3MjRNMqg8TdNwaSdUf8Zxo//DxpP+um6EKYpKLV3v0HMLHVY3zs9DinJO200Mi1Pw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2017 22:10:20.4568 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3173 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Moving PF module param console_bitmask to lio_main.c for consistency. Signed-off-by: Intiyaz Basha Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 15 +++++++++++++++ drivers/net/ethernet/cavium/liquidio/octeon_console.c | 14 -------------- drivers/net/ethernet/cavium/liquidio/octeon_device.h | 2 ++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 39a8dca..8c2cd80 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -59,6 +59,21 @@ static char fw_type[LIO_MAX_FW_TYPE_LEN]; module_param_string(fw_type, fw_type, sizeof(fw_type), 0000); MODULE_PARM_DESC(fw_type, "Type of firmware to be loaded. Default \"nic\""); +static u32 console_bitmask; +module_param(console_bitmask, int, 0644); +MODULE_PARM_DESC(console_bitmask, + "Bitmask indicating which consoles have debug output redirected to syslog."); + +/** + * \brief determines if a given console has debug enabled. + * @param console console to check + * @returns 1 = enabled. 0 otherwise + */ +int octeon_console_debug_enabled(u32 console) +{ + return (console_bitmask >> (console)) & 0x1; +} + static int ptp_enable = 1; /* Polling interval for determining when NIC application is alive */ diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c index 15ad1ab..dd0efc9 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c @@ -37,10 +37,6 @@ static u64 cvmx_bootmem_phy_named_block_find(struct octeon_device *oct, u32 flags); static int octeon_console_read(struct octeon_device *oct, u32 console_num, char *buffer, u32 buf_size); -static u32 console_bitmask; -module_param(console_bitmask, int, 0644); -MODULE_PARM_DESC(console_bitmask, - "Bitmask indicating which consoles have debug output redirected to syslog."); #define BOOTLOADER_PCI_READ_BUFFER_DATA_ADDR 0x0006c008 #define BOOTLOADER_PCI_READ_BUFFER_LEN_ADDR 0x0006c004 @@ -136,16 +132,6 @@ struct octeon_pci_console_desc { }; /** - * \brief determines if a given console has debug enabled. - * @param console console to check - * @returns 1 = enabled. 0 otherwise - */ -static int octeon_console_debug_enabled(u32 console) -{ - return (console_bitmask >> (console)) & 0x1; -} - -/** * This function is the implementation of the get macros defined * for individual structure members. The argument are generated * by the macros inorder to read only the needed memory. diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.h b/drivers/net/ethernet/cavium/liquidio/octeon_device.h index ad46478..31efdef 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_device.h +++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.h @@ -739,6 +739,8 @@ int octeon_wait_for_bootloader(struct octeon_device *oct, */ int octeon_init_consoles(struct octeon_device *oct); +int octeon_console_debug_enabled(u32 console); + /** * Adds access to a console to the device. *