From: Martin Habets <habetsm.xilinx@gmail.com>
Date: Wed, 11 May 2022 17:20:13 +0100
Subject: sfc/siena: Make PTP and reset support specific for Siena
Patch-mainline: v5.19-rc1
Git-commit: ef9b5770945ddc296a68080ab7a79aedbf0b0151
References: jsc#PED-1565
Change the clock name and work queue names to differentiate them from
the names used in sfc.ko.
Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/sfc/siena/efx_common.c | 2 +-
drivers/net/ethernet/sfc/siena/ptp.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
--- 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_wo
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;
--- 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_s
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
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
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;