Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2920440pxb; Tue, 24 Aug 2021 10:37:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrsIe61AGPlQLt0gcLm5SP6Z/lv9fssbnuW0TX10kt+tn94YYVh5lv+FS3Psj7OyvjAbFX X-Received: by 2002:a92:d606:: with SMTP id w6mr27918857ilm.28.1629826653585; Tue, 24 Aug 2021 10:37:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629826653; cv=none; d=google.com; s=arc-20160816; b=Wl9tIsev1EwtaH+ptQpYQwQ84h0lMM6dB2gDHfkY2W2epTCJOdH1JGUewTaQxHI4ZB TZFigiycDDxtL8yxJ8eLrUhBhI7fX6/BkQm3bjISAeJe3s27b475KNHsYQvAXtmf4x4k wOnZLP8xzhu1ACa6ClCfRqVcqi0HU2XnuiEme0Ls0n4O8q5CxTqnZGRlLBpw47JZz8sG OJ5fEb6tyLUXMGaJPryOCxJlNj6soAknZleIp7V+mhfYHXN3OxtZy1Xk/lXnM2VJ2fwP QCY+XxbmK0Czsmvdgb7DavgyYds0ru5sGtjNTo031jymM8JwNEi3J/60St8+t/zSK26/ V2Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0HPomTNGzz+d+NBgkhpnvnxhzLyQdcenXpPj5pgBLLQ=; b=JLH7z+rBc1zR9ReFj5GHmFqw1xLCBbYvU70GKIuE4fg7bBQH42KjDYMZGwBxkHv169 AO9zdiyQGRDfX8WwPArfXAlpGH40T1jVZi/yWpK1Z/vm48GXz31btZNwLN0LeBWZ6eI7 C5p4nmsZ9sUljv8d/TGr//1vMjzicUVOZ9WfmFL4Gg+Nj7zmFfpPlifgaRoSl4tmoucK 8FtwysLRvwy6CyS9SC5fDwC+yUzksaO5D3MnZQgAItEI0U79amxZvgv/QfbkDDj6w9vc 2DbCKUwuvY56mrmm/HlYLMv+Wk0iooZxP99WEJNCFfvS+1IT9MdUsrGdfo23gn/WM8ze Zf2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JAo+ECWH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y26si17974096jan.75.2021.08.24.10.37.21; Tue, 24 Aug 2021 10:37:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JAo+ECWH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239351AbhHXRhX (ORCPT + 99 others); Tue, 24 Aug 2021 13:37:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:39916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239512AbhHXRd7 (ORCPT ); Tue, 24 Aug 2021 13:33:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0586C61BA3; Tue, 24 Aug 2021 17:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824790; bh=ElZTbyKQCVzHhYltIz5Tp0a6wPDVCbM4AUuCHbnO7i4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JAo+ECWH3BQcr1OG5DXTHVXavsI1BbmYUTQp65BfnJbLjt+whhAcNBvWiOY2cpiPa RNZfSWSiK5yjmkG5DYAtUDA8K99FEDuDfD95OblbXZyYd1++GX7LdEN5Rz3Ukkil+J 8mTmDNs/RdRvMUwpduxNgurmOlavwnChMRViX3DCmXBMNlRWNIvBPJrW36E4pczfNH Aw5S3wEuvvqJ1XAZDz+vNz6hwyET2v2dagC1OJSpPlEs1MI3v2p46mJHxPrm+zxKPB vS9OPKCITZlN8Gg16yKIQtmE+p8eB7RzbkrXhyKMDDU84y6yxSoJhDwSHqPYHf7aXO QxdOl9XG/09Ug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Gleixner , Marc Zyngier , Greg Kroah-Hartman Subject: [PATCH 4.9 14/43] PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() Date: Tue, 24 Aug 2021 13:05:45 -0400 Message-Id: <20210824170614.710813-15-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824170614.710813-1-sashal@kernel.org> References: <20210824170614.710813-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.281-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.9.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.9.281-rc1 X-KernelTest-Deadline: 2021-08-26T17:06+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner commit d28d4ad2a1aef27458b3383725bb179beb8d015c upstream. No point in using the raw write function from shutdown. Preparatory change to introduce proper serialization for the msi_desc::masked cache. Signed-off-by: Thomas Gleixner Tested-by: Marc Zyngier Reviewed-by: Marc Zyngier Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210729222542.674391354@linutronix.de Signed-off-by: Greg Kroah-Hartman --- drivers/pci/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 481f1a1884e6..b3977b4c51b6 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -919,7 +919,7 @@ void pci_msi_shutdown(struct pci_dev *dev) /* Return the device with MSI unmasked as initial states */ mask = msi_mask(desc->msi_attrib.multi_cap); - __pci_msi_desc_mask_irq(desc, mask, 0); + msi_mask_irq(desc, mask, 0); /* Restore dev->irq to its default pin-assertion irq */ dev->irq = desc->msi_attrib.default_irq; -- 2.30.2