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 E1908C432C0 for ; Wed, 27 Nov 2019 21:19:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B65CC21736 for ; Wed, 27 Nov 2019 21:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889588; bh=L8aRv7ycqcPvlF2G9PsE5v607yzax2Iy56FWegSJKhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Jso6eBkrSyaOxukE/CIzWOty7uiU4Ev4+u3+Ka8/v/sQDQfvNsrYsTQ2/qayP58re Ec3aatKRpuKybwCHfhsc8l2D8aJdiIWvRY9LB+QIokkH9q66KCXxLTeQ4bQgobBH// wO4ThvpmB5BnvvCF/33xrFnm6C0IKaoFBATT7g+4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732972AbfK0VKE (ORCPT ); Wed, 27 Nov 2019 16:10:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:37058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732316AbfK0VKE (ORCPT ); Wed, 27 Nov 2019 16:10:04 -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 87C952176D; Wed, 27 Nov 2019 21:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889004; bh=L8aRv7ycqcPvlF2G9PsE5v607yzax2Iy56FWegSJKhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gMsMfKp+6Ilikqon3sBeGfB/lIGy9SRpZXIBG+rUp+wGKHU+0gHj1OEDcJ9mGrl0m IrmjE2Mtaw/BWKd7bwXgwozwgFzi7Wc7kR0stb/K+0G0bcp+UQ1cMoeQtTa7HUg9rw cIXIZgoTrFelp2JN4oEVZHQhv1GlI3wYtdCYrBYE= 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 5.3 07/95] sfc: Only cancel the PPS workqueue if it exists Date: Wed, 27 Nov 2019 21:31:24 +0100 Message-Id: <20191127202849.760279022@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202845.651587549@linuxfoundation.org> References: <20191127202845.651587549@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 @@ -1531,7 +1531,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);