Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2912073pxb; Tue, 24 Aug 2021 10:26:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVk/xFXefLX/Uj/e94KcZYptGHdEz3jVDuxuuSlBAJF4ADBJoA8+fo1H/81sMZmbmOEjS5 X-Received: by 2002:a17:906:6c8f:: with SMTP id s15mr4922494ejr.52.1629825963809; Tue, 24 Aug 2021 10:26:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629825963; cv=none; d=google.com; s=arc-20160816; b=di7D7Hyby7gfiHZbTeksWsvynBL0kLiDlUh5g4csPaiLSdSSd9iR8SBQdGMvLXWh3K wjoSkHvSiWzER8SaJvBbYBJ8AqwIxTT58N0K41ye3Qwyacnmtftks/rZHoZ4Ah38LVT6 isQ4bH0recS+pDQIMS5QFk5dRg0Bdh8kmIBLkw9pL6cLpXAqVvOtAo50Yn/SkJAMYSYW FEAOb4MHGMDDZm3GWoCYETqb7eJKlG9wMED6m3bwWyBRvb86ZiH+x0olajBJIGU+jxNr BNMH1OiqroIFVV8BSONS0qDLZrWgrIdQpvdPFgFUJBQawhkN92mi7cUqf5bYCSLPgYaD +Q0A== 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=2baM4p+lmQtNlML+RNXQ0sLd9/FvLh6EsRFbPfZeprE=; b=Wj3eN/UpEyORMTn3Gjz9bcarQoyLJqW/NmlFmIrlaaoD8EEZYVY2z/UcEXlo1a312k 1sZCNNTyFWK0L0lco62HsHBPJGwWIaN2ACUsvHvoovSGCQS0ofaJE5L2xozi++ZVo++y TwGoJ6VgG5ZDDI/fEC80wm99HHoOBoKu1nydshapIZQ8vbWtyHsfI+gQNnk2KrU+c9bH LoD/JunHigGd4Vbq+IMOp934tghNWOi6SLL+UysmE8nfG/xhNTt5Ug9qe3Ih0qkYOQcF a08B0z7Smg7ie6pnLOYjcJ+2mWrvkFm1YGmmF4OFpmQRYTFM9PTBvH0xXvpjr8TjNCYC DIrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YbzxEIhy; 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 b26si17912068ejq.659.2021.08.24.10.25.37; Tue, 24 Aug 2021 10:26:03 -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=YbzxEIhy; 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 S241109AbhHXRYI (ORCPT + 99 others); Tue, 24 Aug 2021 13:24:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:60112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240132AbhHXRV2 (ORCPT ); Tue, 24 Aug 2021 13:21:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1234C61B07; Tue, 24 Aug 2021 17:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824604; bh=4p3WLwklBKIMvl65mCoVD9cR4bmDXFDSvkopUxno+3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YbzxEIhyh6mnwwBlnBuZ21vm3X91JPNa/VjVpwhTt8wXS0fCuTsL1yHDIOT2TJ2Z3 1lItUL7SzJKozinjF94ggUXSTIRLjBMVk8hBtsaw7m1tFGdbVflOdF/EEL5l9Ntzxq TYV0UQWQP9ywcZyN3tPCHv7oEO9lWmgnbwiEUVqj/vFkD1YAa8WTbX1glsWQq5I1Vb 4uZbSTiDI7KSJdxrVb8l0XgGNdygO3wSN0hBiAv9QVyivPcWKSTzTZcxt0hPFH8uMB H3POJnAWEIifUdXH9ImztRdIqkRrsqRWZbDn6JMhHplirsH8k4eKxQ09yVWiA3QRli EaqeWD7deRMxg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Gleixner , Marc Zyngier , Greg Kroah-Hartman Subject: [PATCH 4.19 34/84] PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() Date: Tue, 24 Aug 2021 13:02:00 -0400 Message-Id: <20210824170250.710392-35-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824170250.710392-1-sashal@kernel.org> References: <20210824170250.710392-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.205-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.205-rc1 X-KernelTest-Deadline: 2021-08-26T17:02+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 758223252cd4..677b58670011 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