From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbdBFW3A (ORCPT ); Mon, 6 Feb 2017 17:29:00 -0500 Received: from mail-bl2nam02on0060.outbound.protection.outlook.com ([104.47.38.60]:51360 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752411AbdBFW25 (ORCPT ); Mon, 6 Feb 2017 17:28:57 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=David.Daney@cavium.com; From: David Daney To: , Matt Mackall , Herbert Xu CC: , Omer Khaliq , Ananth Jasty , David Daney Subject: [PATCH] hwrng: cavium: Use per device name to allow for multiple devices. Date: Mon, 6 Feb 2017 14:28:46 -0800 Message-ID: <20170206222846.22493-1-david.daney@cavium.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: DM2PR07CA0042.namprd07.prod.outlook.com (10.141.52.170) To BN4PR07MB2131.namprd07.prod.outlook.com (10.164.63.13) X-MS-Office365-Filtering-Correlation-Id: 4ae38cf7-cbed-4204-b820-08d44edf882f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN4PR07MB2131; X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2131;3:mQTJQlZCGm/LFzIakZG4YbVHL3ZRsM3LI8sUbf2tJ0YLmvjshFiyDwyxtGa/nhaE8acO/OHPfCmdlLTXkhlFtoYLPhWqSep1Pwk94c/iWSYho4VqvafTYcmiShIxiGao05Jmj1D/9ENEHuOKyh8cE9Je1MlEo6n75BqetH5G4Excf886YeGjqW4phDbpYNwqU0ZeTLbfwHoSvZ6UzjEfep6pnSUgClvggGiH9qpWnCBM33PChPTYmFW4/TWreMIf9fqVpRP0mtQtUlVzKsY5CQ==;25:G/nmyH2aQSGEVaV0QsJX06n/Jp1JfQT63gZOfWPATOYOOSibVJtyJnUtEtUXcUTYmOeMzy7AwtxlgixI0aVW+vHWO+e1p1eHtcsE97w8HJhjTQtVNA1V4aX/kLQB7M9SSW8hByCpjf9yS/n/m4ED8d1pDQNHbB1w+Sb3Of3FTq6i+nqqx/TbaVvjDJXQCe0bD3dM8y7eYgMRVj7VS1yQ/DeMoDfpQGrN0YTm3+6S0svbVtlceU/xziOT1JqOXxgFUGdbnCGFVZUGfldZ5wG5PMFSf59SuKjQ2G3/JtOmnEQI/FFQ8ZwCxPWKqFnUi2Jo2Xk/aufOej/+2xkJd2dgqnt8RTqieQeNUH0MmDIrM9A7i5LT3cklM02p/7dV4k28FPgIzexJoPcK41KuaxPjYWCFiVbRoBk0/+99PcA87l86iNQbr8k3Ysuvvy0d5lv3vF13sJoyb26d1w1h53e3GQ== X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2131;31:8SeUxuFv2ate4iib4N9Xv3S+mrzC+1KTd3Mehj1tztLAe2eoOOu34NMBiBHVputAbWAWwgCrsFEmhIl5zfRXUZvr8FIgDNczW5fjjHEzOxIfdQW1/ZAmSTgEso5gq7xbKiZ5TVdbw2zocAjJGpMG+EAzBc201howHepczhmjgu2I/prWt+W+4Bte8Vi2+kHX/TWXTkhDEKdAQ8/fHdEH4H2kZZm0XxEbAiNIoWlehu9b8gKruDNsbLLhhfiN9WxzGaqwIKYlMV7LT0US3GcDFg==;20:lFeUZTsfxctqQlm2nm2Mefv4bA95EY66yqth1XceI6kME2eQa1CXfMbBhCgYMcfbnkhDTmuwWxXLWmxZevkunR01CbMAOcOmWaI4XuvXgcP1SeGV7Y2SmzUL/O08Ua6I+32MUJ50TXr7x0c3JAGEda8btoYYSRtiUfhYY0FjYjMdHPbWG4g5xt4joYetUzxlv77RLa/XyVZ2DmmC51xYhIZK8fndIGDH3dpdm+DkNHDnkx+by4VSHyoomNz8FtG6YTRe1Q1XMw0q6HBFCUNQTSzopYGdcQq4AfV/WgVZYwAw5ajPhn/q1jrwMfsXROOwzsr6SssmNNqD+sSgBANTsoD2rBh7QQ8yN3/w1Pp99J09/3fANbk23SjSjeQRoQHpMGbDOnpwn3yMrXRjAx+X1WWVraQ6zWXfO3lE3UNEeNNGs43RYje1OX0/VdqYjrWYuBoreITeu0VvY0DkCNvJwGQ+xza96iI61OEDnd5hlxaMPiVRkKxkZCEQEDDvgl8K X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(20170203043)(3002001)(10201501046)(6041248)(20161123562025)(20161123560025)(20161123558025)(20161123564025)(20161123555025)(6072148);SRVR:BN4PR07MB2131;BCL:0;PCL:0;RULEID:;SRVR:BN4PR07MB2131; X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2131;4:2VDPqETTvxaks37KZUSDyNaroWJ2Picj2iWg8yLkPNiyUWywU65NOpO5pGfNv61Uv17PH7V84CQl2WTKDSsJQg+2cR+VOUH57Y/g0nk5nFTHTtBQvzt5msW/6hSELiOqc4K1IMxhUdwAQtftBdNa7tG4m/8/mbKqrthtelTyYOzb6xuJIWycTCnLI0vWVuPlPGMAcU8EVB/JIiiqfYVYv9ZONzCO3sNWK9eXZuu+biJW89Nn6b45oNQT7q2MeHuLk7qWXhrf/AFdV/w9WFUHbaqqhGn2Mp/zx1DIT509IhZ4+RxyrzJLc2m/e0rpfZnKUHylqjnQAvsEYF1D5QFi9NNexBkbhJgfmmhYoLkupk+51Ac+PwU31GTDGZEjaxFZXe115hrH3qF+xYw1ciLF9QgVkVrdcbpRTnhvqnqffVeiaHBL3gf+JUF3TImvtbvCw8lpycsSfCAOX+QKNbWEtuaSwHd7aDzrxFJGlv5kcdHKRWLAxuX99N8z+p5Zihk/orWN3mfDeC4sIqSeL809h+Y3/6QIGiw4db0SFWs4XksgaxiUozE57dvH3Nj7V3rAz4filzLLTEVXKTXXhlMMOO3dyqmcIvBFKay3SxmZI3dTev9XDZMJ9h7mQR2MYxiztLNklBXGP79ZUofRxiRDow== X-Forefront-PRVS: 0210479ED8 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(47776003)(106356001)(50986999)(97736004)(69596002)(92566002)(48376002)(101416001)(50466002)(105586002)(6666003)(107886003)(54906002)(42186005)(66066001)(6512007)(6116002)(6506006)(1076002)(6486002)(5003940100001)(2906002)(4326007)(53416004)(38730400002)(3846002)(7736002)(33646002)(36756003)(305945005)(189998001)(81156014)(68736007)(8676002)(50226002)(575784001)(81166006)(25786008)(5660300001)(86362001)(53936002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN4PR07MB2131;H:ddl.caveonetworks.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN4PR07MB2131;23:N7alQ/dRlVQ0DuIiYb9S/BBUmgCG48fcgvkIi6YEU?= =?us-ascii?Q?jBEaWhEBV3MLQvDAyRZfrNmM1yVuFefFyLXK8ZvPjI6vcQF4hb5x2mVJdW5r?= =?us-ascii?Q?9Ni7XfHdApjiWrlSBWyhk2ewyfUtC/qtA3jjOfbk9hlHD35YYuhDsr1+Hjq7?= =?us-ascii?Q?XwRxGmI1/1I8nqs4EnLIgKuaSs3JNyqhLOSoi6AIPreYU3vIQWFoZbVpRUPo?= =?us-ascii?Q?YGLulLEZmJeiqAJFF/mb4oiM4ziEppkYjGama3rMi2RCTFw5ckPucfMZGkhq?= =?us-ascii?Q?CjfHRx503M9JbEtoQAvGgGsjGC0y/LTQINYu3wvdQ6ohIXdsSwBxeCus2Srq?= =?us-ascii?Q?wrYOI9mzi82KNsgnliu5uLmEZCIrM1FWC85ODS2hByfxxGYzI/yMCShjuw7M?= =?us-ascii?Q?M3OeSMv4pSDHWVphWhbdcKeRCqCgMKLybvWOWiVtXMjGGzowxvLFD3vKnVBx?= =?us-ascii?Q?6JcPSl5kdS6O4bIIPZqcr6fxsxQ8ICEi0R0jNmd1Rwk3LEWiLdTDrB2x3chi?= =?us-ascii?Q?DiG/hbVboXzH3KGMTuUJ4FAfUlz241vBdrGMcQVzF9yaCiMr86AJESNH9pY9?= =?us-ascii?Q?qgHcL6DhvJFp5CH+XnX4sZHFZFPXJgMf5b3f4yv1WTmS4qENklxHbGt/8mOf?= =?us-ascii?Q?Z6IoCoVAbDO703hRoBPdyv3upSsF79Wrh2k5Fm9xczm/ZhCROjCwauMkUvwm?= =?us-ascii?Q?kX7hLOVKX0zzii4BXmqaKkWLW6ujOTPvYuGapSr0d4Ytxczwo7hLb0WDwsTF?= =?us-ascii?Q?H4XsSq51GqKi4R6+lNBunPnOWxT/iNVfiJrLUPWAk66BefM/mlEi6Kuangf/?= =?us-ascii?Q?VRucpmJXrOa/v55nFsMM/FXf1gYmeaCfwlHXIbKt8nCEadTDEFuJWnkoVvis?= =?us-ascii?Q?u++SstX8LUlVzYhdaAP07VkkmLqeUbjj83JbK439VtHDzanabG6UxikX8fUb?= =?us-ascii?Q?iSRNNyD70QaFkjzFuoxSVHRUAnvebq5LM5s+ipyLtm8owyZYg1sRjh5mMlVt?= =?us-ascii?Q?icJkR4OwOaP0ahPisbrIfangHGav5W2ei3wPFEx7C60oFSaQe1zsqrsDOkhy?= =?us-ascii?Q?FNrQMI3jVOATNOV4cPqqFY1QWi0Tq6y+6t9g9yTpKQ40p9AW2y+/fFBNijKh?= =?us-ascii?Q?NMn54k/QNdx85oprQDWp+odz8Md3ObP?= X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2131;6:INaYpiPf/NC0s/pRi9TBXLXFIxZ2yEeTTedBVcE27RVxhBsT9hU3hJZJ/pNBRTy2c/ZfoKfy6q2JsIr+HCKPFUnZy3pOzU9AQvR+nkWxmXEG0afEgUeNVuTFgysMSz06Oov8uGLDc8NEupVXbsIjjAVoSWgXGmy2jFDnOqtz0HBXodcosgmnNlIJiEJeTD6pDWwK6Mznajvaf3SwRuujaIQlklISKZFQSqiYttt6H979JRpqr3hDPb5criZ2929X2xBXib1GMlDZgXHCceuObgaLzANtzXgyQXlVHGASaCYOCk2hqIfOnqSmNdYxe6r6tyJD16ZXsdeDFG7eUvfe4xwkkP0/ChSTcN2ZSwqkZDmXlllKQCkZiVZDU8TxDGXhRXu8X722/as6u5GL7inBYw==;5:/HD9PJg01M2ROwmJFgLF7JpOipkoTPWZcmTY6DnOOp/Zj6CC5tceIwQM0nS6J+S/zm5/Y1AU/ZIXsT6SjQfNnqvS+xDxEBhoUiprfPjbasd2u//rNj2tg+hAmY90dgp0DXpEKIPGbvfKtUSzQayN43Xm5Htv8LGzS+H8Lfe8qfg=;24:KH6l7qwUY+urW7YUKiYRyrDX/9htzE6fJ+9TTh4ID10FRuTrHyOYeibTgKCFMYscGBR4FT4UpcVH0AlEdz6EJlV3cOB1FV5TxioJtOouNpk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN4PR07MB2131;7:l1YrahzOOaY5fi0rwO8E8rIa4WgknJAFSf5WA3pmEW+hYaWfAdnzbO2uM9YTVHXOJZruemUPKBWf400wYER9Td/fRhyEPBvuUKwYDZFeniW5gwnHr4xKO2IjJijSPj69OeJMj+YkkoWltXiHyPvTf2rPCFTOnKsb7GD4scB972X1VbMCJXBEt3u75CNQZDERzQwG7DjnYji/CIDhGSfOSzp/bXM80VEzJo13ksqYNRge0ux2KHpXz3/MJynAJzH7kfJBGoFYmz2ma7Vny06WSMwpx1LJEfpPzABfgKmcofHZZ5WE18bmGxd8O1XWzHKiVGaLAUZH2CZ9C1nPkHIVCHnya0cIyF8uj7kbg2Dz8PRYm3BnrRMTPDdDdPvQyoJppjX1x5Y1MCUmpUa+Y+KJHF5rWWU/o6ZVOHGmg8ocUWpjzORX99zLuhzxc2qLHNKLQpSQ+YlSWujx81KNIJSrzXc4cyY/gngXPxn+nvX9XmNWzpLYl2MtYy70KIR1sd1m5UX3z5A48ZVlPabfq3oQMg== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2017 22:28:52.8278 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2131 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Systems containing the Cavium HW RNG may have one device per NUMA node. A typical configuration is a 2-node NUMA system, which results in 2 RNG devices. The hwrng subsystem refuses (and rightly so) to register more than one device with he same name, so we get failure messages on these systems. Make the hwrng name unique by including the underlying device name. Also remove spaces from the name to make it possible to switch devices via the sysfs knobs. Signed-off-by: David Daney --- drivers/char/hw_random/cavium-rng-vf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/char/hw_random/cavium-rng-vf.c b/drivers/char/hw_random/cavium-rng-vf.c index 066ae0e..dd1007a 100644 --- a/drivers/char/hw_random/cavium-rng-vf.c +++ b/drivers/char/hw_random/cavium-rng-vf.c @@ -57,7 +57,11 @@ static int cavium_rng_probe_vf(struct pci_dev *pdev, return -ENOMEM; } - rng->ops.name = "cavium rng"; + rng->ops.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "cavium-rng-%s", dev_name(&pdev->dev)); + if (!rng->ops.name) + return -ENOMEM; + rng->ops.read = cavium_rng_read; rng->ops.quality = 1000; -- 1.8.3.1