Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2916655pxb; Tue, 24 Aug 2021 10:31:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNDpafQ1IQ7P2zYx/ZCcodGf+kY+H/ur+s9OozasecMwPMXdeUCwYLIIMw/clffqmDWo8z X-Received: by 2002:a6b:905:: with SMTP id t5mr31775719ioi.209.1629826317914; Tue, 24 Aug 2021 10:31:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629826317; cv=none; d=google.com; s=arc-20160816; b=EHTsMtQQn6F+LHM/n+sCBtr87AyiCdjFP/O2AIvMSt2mCFOofriHWW7L/AAnlVbr2w QCg8tg6FhTbyE8wwOEOB0vD+jsrD9sGgZP5IPYD4NK3dhxR/gIOLZfgaZ1ztd9umnUEY FyDurKROEjUWkemNi6Nr2Efos79iKJhPbA/lLGsSs/JTlA10F9owBIVvkYDLSAd4HEp3 DFESGi1rSk/V1ejkJEY9X3lmeHjJQvRYXHrL8Ua1Bbo+P8IWr9Ks6wSnLt8J59XLZQhN cflCyozfQTaaDF9Ipo2apBbEnWqWrnf36CYLDESTiiBQEBI0UhTsFimD/ZrOAYG0tD3i 6pnA== 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=y2Xx27S2HHKW0IlYzqHhAJQSpdC/2J73vmSuqnLOGGQ=; b=WKjj75+ti3kH1mP5fUuTHwscPF7QW4RFiJWE3itb//SBSYsng/dG2RHuzyPOJuhYJK HEtEKcK6oK0G11PYRrZ+jflMOvKItq0VRLtnEf4dp3muP4meDBe3ThD/NLgjQgg81yxA YFMPRnCmXtsjvXU1ZoccyF8Cq2boFSt5hebJVCs6Hgbobykvu8tzfqEdYM3JO9VBI5N4 lBSZduprGb8Asn4IbzwCctqt9RPd1nsQ5db7cGlNBnKhojQ+8lYmoHTt9meJQJkXjxWM ygR67lYKySCmT92Ooe4vDauJBtpMUuMFPpD0uu1ffIlW7e+gQExoq3m5SIubDhEhZ8wA zr0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LPZEkoRp; 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 m39si1848074jav.28.2021.08.24.10.31.45; Tue, 24 Aug 2021 10:31:57 -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=LPZEkoRp; 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 S241139AbhHXRbK (ORCPT + 99 others); Tue, 24 Aug 2021 13:31:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:35536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240197AbhHXR2m (ORCPT ); Tue, 24 Aug 2021 13:28:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6863661B68; Tue, 24 Aug 2021 17:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824722; bh=1mDLm/B2jQap7FqEtkMnp8RQKxaulQQyqv0Yf1e6pdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LPZEkoRpI94yM9K6x4wuQU0241cf9ANteZv4y5JPU5H0JYsSKLKFcwciX7fzbowI/ +sIZlJQYHlZGvNsIgQDVzKUziK+rE/BSqhFOS2gaD0MpiAuNIocNdRGAPGVDImqrE3 OWx3IkaD8aCfXnFwe+KyE5GwmRmM1KmrxFQNe2tG6eITHTYQBgD+aj4cK3m+epQdds WL1SMpJpzPZAIt79vVcEhe8YpcOru0Sg8AQtvrLPS7vQyjTcM3/vtZP+gb91o0Cv1H o55yxmh/5LAFkdhjJFDE+/c/1A38JmeGcNX4FaFojyuqgIo1vFPy9zbe7fosMpojGk g7LqCn/eUBwAQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Gleixner , Marc Zyngier , Greg Kroah-Hartman Subject: [PATCH 4.14 24/64] PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() Date: Tue, 24 Aug 2021 13:04:17 -0400 Message-Id: <20210824170457.710623-25-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824170457.710623-1-sashal@kernel.org> References: <20210824170457.710623-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.245-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.14.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.14.245-rc1 X-KernelTest-Deadline: 2021-08-26T17:04+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 93dd4c69cc46..034f60b75a6e 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -896,7 +896,7 @@ static 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