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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E37F3C432C3 for ; Wed, 27 Nov 2019 20:40:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB37C21781 for ; Wed, 27 Nov 2019 20:40:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887205; bh=lugFMPJ1DzJF5JJ73kFrDkZQ7895HclbYHXx7hxytII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oa4+CJwYTWn7eYh/yHzCKOSPFwgoGTo95YBrVQYe8HcLbYQIX+X58bEnuY76iGFCN Ho4/Rdyk86mOEBa1kKnQTBKf+6yoS+oW0CI8eBFIBBmw+4nlK4mS6fqpS2THMdhSHl cNjEChBgalCFa7mQ5iUsO0sGfxLyR8N8xyWeTzyc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728415AbfK0Uj7 (ORCPT ); Wed, 27 Nov 2019 15:39:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:44376 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728980AbfK0Uj7 (ORCPT ); Wed, 27 Nov 2019 15:39:59 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 00AF621774; Wed, 27 Nov 2019 20:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887198; bh=lugFMPJ1DzJF5JJ73kFrDkZQ7895HclbYHXx7hxytII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c1vQc3dPLvQ2nF2ktzJKRyP+dbFndzkELvoute2TzwpyZOfcdgyrhA0jHS5Mj6v0C /sYjzanfevo+BL1QUZ59L2ZcSJtgEGWpg9G7++9ZKattGJ2ndYh+wFAeSVWttfJycv l3CRUuXIeVoHIo2tFT9YXXUWWWVJ7PVtK4dCknnc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Habets , "David S. Miller" Subject: [PATCH 4.9 003/151] sfc: Only cancel the PPS workqueue if it exists Date: Wed, 27 Nov 2019 21:29:46 +0100 Message-Id: <20191127203002.675141354@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203000.773542911@linuxfoundation.org> References: <20191127203000.773542911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Martin Habets [ Upstream commit 723eb53690041740a13ac78efeaf6804f5d684c9 ] The workqueue only exists for the primary PF. For other functions we hit a WARN_ON in kernel/workqueue.c. Fixes: 7c236c43b838 ("sfc: Add support for IEEE-1588 PTP") Signed-off-by: Martin Habets Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/sfc/ptp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -1320,7 +1320,8 @@ void efx_ptp_remove(struct efx_nic *efx) (void)efx_ptp_disable(efx); cancel_work_sync(&efx->ptp_data->work); - cancel_work_sync(&efx->ptp_data->pps_work); + if (efx->ptp_data->pps_workwq) + cancel_work_sync(&efx->ptp_data->pps_work); skb_queue_purge(&efx->ptp_data->rxq); skb_queue_purge(&efx->ptp_data->txq);