Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5976515ybc; Wed, 27 Nov 2019 12:44:43 -0800 (PST) X-Google-Smtp-Source: APXvYqyArgRK+LKI7Qs6d18Xhh6uD+JjX5nf5RsH3wQoCvHMjj/I6sLjm0P1GW2AgobU1eNMuTgb X-Received: by 2002:aa7:dd4f:: with SMTP id o15mr33995163edw.189.1574887483150; Wed, 27 Nov 2019 12:44:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574887483; cv=none; d=google.com; s=arc-20160816; b=E9apAC3ksIAk9sGQ+Mv443GO8NFainbeoTzqBA1fgN/ZyUCgBrGQAu03YD1p+eXn1t 9CiCpgswWu3hopBhBqYVS+dPlKKkLPXMpjqU1PWfc8KH6mJqbqHVNlV97+u3HOe6p+fv YKJG8d+VEFnw63unMaELouDN/EKSwbd7Vv03/lyfYlL8BMpkdIMWbKYdc2/4Qp4XJQ33 fzYyQ9cDHTA9tCpVstcI00l4vBwB88wnt8eKOz4CcfcCihG+xpwBI+gexBWJ8XWP1xZ9 YeUdAI+fZ7wozpnVzol4VyI+tzb/4IEqwzduxggy+x67ReXlIv3kSmNxgGvGnqKedFfx FU+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VhbOV21VIo+/t+9eBgPVPwSaiveb9yIDR15Tfo0QuAU=; b=llEHlx712aTe0Zz8LTpK82nMyBsoqoyDmWXv83UYAgN407rJPCRjHpsDNJy+XEg/mO Jxq0PCH/qQ4+lIxphdya3GHuzvQj3lc3n452so9DFUVbypSvnzw1Dtv0HA3n2QXQmriZ u87K7qZbEn2nWglX/4oKEPU+8YdxOaeRXtJ4aGMN8L4Ir276dqxqmhtSSRT8X95xayQa ATlRLrOSGFTJjn2896HbM2xtRExIgC+aGz5JvZA5Fdw1GHm2wWK2JGEcuWi3hHD81Bn+ BBmHi0JLukWYwwvS/GzSxARK4Sa0AXzO9UrA7ZIdDUx+HKxzROHdKoq2dRYaIgvX7OHA ExEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c1vQc3dP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ca23si9903569ejb.341.2019.11.27.12.44.18; Wed, 27 Nov 2019 12:44:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c1vQc3dP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728425AbfK0UkB (ORCPT + 99 others); Wed, 27 Nov 2019 15:40:01 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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);