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 4136EC432C0 for ; Wed, 27 Nov 2019 20:34:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A8DF215F1 for ; Wed, 27 Nov 2019 20:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574886862; bh=lugFMPJ1DzJF5JJ73kFrDkZQ7895HclbYHXx7hxytII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aFHuGuUI2iEZMpmrQvNnM9d3olH+6ckjJvh0mobXC8Qi49Pv6sHI7XW2Gh7Z+J+H5 4mGm2gDNMzyO/MS0LNiWCCGwxuLI2FTGf+jQ/cCDHWDU+KzXVVOVpSWOdbmI08cTT3 b1x7PfGOL+CMBl65ItVLF9NyHq5zdRhdkMLPL08I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727553AbfK0UeR (ORCPT ); Wed, 27 Nov 2019 15:34:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:34574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727519AbfK0UeQ (ORCPT ); Wed, 27 Nov 2019 15:34:16 -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 DBD2B2158A; Wed, 27 Nov 2019 20:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574886856; bh=lugFMPJ1DzJF5JJ73kFrDkZQ7895HclbYHXx7hxytII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uc/GrptGQOGfn9kdvGw8GleImTngj+kWzzCzR5ChKwBZLQZ/Rq++DC5X84lVXnaGc vdt6k11d5TFbF4qBUIUY/OYJduDgNciaKpJsWOt2Oc4lB0ZhePMey8NTyXEoj990kF 3RaUjJ3qcqGuZsoVpvMUNXqp9snE/yEnWe7Xic5g= 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.4 002/132] sfc: Only cancel the PPS workqueue if it exists Date: Wed, 27 Nov 2019 21:29:53 +0100 Message-Id: <20191127202858.800627551@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202857.270233486@linuxfoundation.org> References: <20191127202857.270233486@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);