From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0198EC433F5 for ; Fri, 22 Apr 2022 15:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1449139AbiDVPGK (ORCPT ); Fri, 22 Apr 2022 11:06:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1449224AbiDVPFm (ORCPT ); Fri, 22 Apr 2022 11:05:42 -0400 Received: from mint-fitpc2.mph.net (unknown [81.168.73.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DAC125D5E2 for ; Fri, 22 Apr 2022 08:02:45 -0700 (PDT) Received: from palantir17.mph.net (unknown [192.168.0.4]) by mint-fitpc2.mph.net (Postfix) with ESMTP id 32119320133; Fri, 22 Apr 2022 16:02:45 +0100 (BST) Received: from localhost ([::1] helo=palantir17.mph.net) by palantir17.mph.net with esmtp (Exim 4.89) (envelope-from ) id 1nhuo0-0007Fo-VC; Fri, 22 Apr 2022 16:02:45 +0100 Subject: [PATCH net-next 27/28] sfc/siena: Make PTP and reset support specific for Siena From: Martin Habets To: kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net Cc: netdev@vger.kernel.org, ecree.xilinx@gmail.com Date: Fri, 22 Apr 2022 16:02:44 +0100 Message-ID: <165063976481.27138.16338765780955164021.stgit@palantir17.mph.net> In-Reply-To: <165063937837.27138.6911229584057659609.stgit@palantir17.mph.net> References: <165063937837.27138.6911229584057659609.stgit@palantir17.mph.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Martin Habets Change the clock name and work queue names to differentiate them from the names used in sfc.ko. Signed-off-by: Martin Habets --- drivers/net/ethernet/sfc/siena/efx_common.c | 2 +- drivers/net/ethernet/sfc/siena/ptp.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/siena/efx_common.c b/drivers/net/ethernet/sfc/siena/efx_common.c index a615bffcbad4..954daf464abb 100644 --- a/drivers/net/ethernet/sfc/siena/efx_common.c +++ b/drivers/net/ethernet/sfc/siena/efx_common.c @@ -112,7 +112,7 @@ static struct workqueue_struct *reset_workqueue; int efx_siena_create_reset_workqueue(void) { - reset_workqueue = create_singlethread_workqueue("sfc_reset"); + reset_workqueue = create_singlethread_workqueue("sfc_siena_reset"); if (!reset_workqueue) { printk(KERN_ERR "Failed to create reset workqueue\n"); return -ENOMEM; diff --git a/drivers/net/ethernet/sfc/siena/ptp.c b/drivers/net/ethernet/sfc/siena/ptp.c index 8e18da096595..7c46752e6eae 100644 --- a/drivers/net/ethernet/sfc/siena/ptp.c +++ b/drivers/net/ethernet/sfc/siena/ptp.c @@ -1422,7 +1422,7 @@ static void efx_ptp_worker(struct work_struct *work) static const struct ptp_clock_info efx_phc_clock_info = { .owner = THIS_MODULE, - .name = "sfc", + .name = "sfc_siena", .max_adj = MAX_PPB, .n_alarm = 0, .n_ext_ts = 0, @@ -1458,7 +1458,7 @@ static int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel) skb_queue_head_init(&ptp->rxq); skb_queue_head_init(&ptp->txq); - ptp->workwq = create_singlethread_workqueue("sfc_ptp"); + ptp->workwq = create_singlethread_workqueue("sfc_siena_ptp"); if (!ptp->workwq) { rc = -ENOMEM; goto fail2; @@ -1502,7 +1502,8 @@ static int efx_ptp_probe(struct efx_nic *efx, struct efx_channel *channel) goto fail3; } else if (ptp->phc_clock) { INIT_WORK(&ptp->pps_work, efx_ptp_pps_worker); - ptp->pps_workwq = create_singlethread_workqueue("sfc_pps"); + ptp->pps_workwq = + create_singlethread_workqueue("sfc_siena_pps"); if (!ptp->pps_workwq) { rc = -ENOMEM; goto fail4;