From patchwork Sat Jan 20 06:35:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oza Pawandeep X-Patchwork-Id: 863930 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b="OghvF43b"; dkim=pass (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="AFv2Zki0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zNnyc3v3Cz9sCZ for ; Sat, 20 Jan 2018 17:36:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754217AbeATGfr (ORCPT ); Sat, 20 Jan 2018 01:35:47 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:45472 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754051AbeATGfm (ORCPT ); Sat, 20 Jan 2018 01:35:42 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4859860A60; Sat, 20 Jan 2018 06:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516430142; bh=AsvJ+SOFQRslN6hmcHEEPHLzEs1VFTOYfij4cYW9OVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OghvF43bstnu4+tfRxdE2MC3zcg6KyHp1JMYhAyQHpStr6N1tieJ6u0POm+O2HFZ6 xFFvbHx9lmxDJxsJKSbWnSdZPn6JOxrEeNxY0cWMcSSzw5+TM/wgqBO4zPffsjeFem PquqWg2Dp5jUB8DAQFPPdpZrUNNICBme/x475hq8= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from blr-ubuntu-poza.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: poza@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 240C360452; Sat, 20 Jan 2018 06:35:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516430141; bh=AsvJ+SOFQRslN6hmcHEEPHLzEs1VFTOYfij4cYW9OVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AFv2Zki0hp1ArQVdGUX8ueEypv9BbnsSu8fp+slX4G0nG9pbIcq1V9adLs6dUhtFb kTY2+42g4yajHHr0lolENf/vEdFJqtZQ7yrIbj5TDswJzhPTXJrJFqKC6TDcI2cDlI SRp3ZTV/1LiyN1b/GnT7N+2wYl7pv27u40qw6D4o= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 240C360452 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=poza@codeaurora.org From: Oza Pawandeep To: Bjorn Helgaas , Philippe Ombredanne , Thomas Gleixner , Greg Kroah-Hartman , Kate Stewart , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Dongdong Liu , Keith Busch , Wei Zhang , Sinan Kaya , Timur Tabi Cc: Oza Pawandeep Subject: [PATCH v7 3/7] PCI/ERR: add mutex to synchronize recovery Date: Sat, 20 Jan 2018 12:05:15 +0530 Message-Id: <1516430119-3825-4-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516430119-3825-1-git-send-email-poza@codeaurora.org> References: <1516430119-3825-1-git-send-email-poza@codeaurora.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch protects pci_do_recovery with mutex. Signed-off-by: Oza Pawandeep diff --git a/drivers/pci/pcie/pcie-err.c b/drivers/pci/pcie/pcie-err.c index a532fe0..8318c84 100644 --- a/drivers/pci/pcie/pcie-err.c +++ b/drivers/pci/pcie/pcie-err.c @@ -20,6 +20,8 @@ #include #include "portdrv.h" +static DEFINE_MUTEX(pci_err_recovery_lock); + struct aer_broadcast_data { enum pci_channel_state state; enum pci_ers_result result; @@ -283,6 +285,8 @@ void pci_do_recovery(struct pci_dev *dev, int severity) pci_ers_result_t status, result = PCI_ERS_RESULT_RECOVERED; enum pci_channel_state state; + mutex_lock(&pci_err_recovery_lock); + if (severity == AER_FATAL) state = pci_channel_io_frozen; else @@ -326,9 +330,11 @@ void pci_do_recovery(struct pci_dev *dev, int severity) report_resume); dev_info(&dev->dev, "Device recovery successful\n"); + mutex_unlock(&pci_err_recovery_lock); return; failed: /* TODO: Should kernel panic here? */ dev_info(&dev->dev, "Device recovery failed\n"); + mutex_unlock(&pci_err_recovery_lock); }